"smallcaps", "up", 0};
/// Known special characters which need skip_spaces_braces() afterwards
-char const * const known_special_chars[] = {"ldots", "lyxarrow",
-"textcompwordmark", "slash", 0};
+char const * const known_special_chars[] = {"ldots",
+"lyxarrow", "textcompwordmark",
+"slash", "textasciitilde", "textasciicircum", "textbackslash", 0};
/// the same as known_special_chars with .lyx names
-char const * const known_coded_special_chars[] = {"ldots{}", "menuseparator",
-"textcompwordmark{}", "slash{}", 0};
+char const * const known_coded_special_chars[] = {"\\SpecialChar \\ldots{}\n",
+"\\SpecialChar \\menuseparator\n", "\\SpecialChar \\textcompwordmark{}\n",
+"\\SpecialChar \\slash{}\n", "~", "^", "\n\\backslash\n", 0};
/*!
* Graphics file extensions known by the dvips driver of the graphics package.
width_unit = "in";
width_special = "width";
} else if (latex_width.empty() && outer_type == "framebox") {
- use_ert = true;
+ width_value.clear();
+ width_unit.clear();
+ width_special = "none";
}
if (use_ert) {
ostringstream ss;
if (outer_flags & FLAG_END)
output_ert_inset(os, "\\end{" + outer_type + '}',
parent_context);
- else if (inner_type.empty() && outer_type == "framebox")
- // in this case it is already closed later
- ;
else
output_ert_inset(os, "}", parent_context);
}
begin_inset(os, "Box ");
if (outer_type == "framed")
os << "Framed\n";
- else if (outer_type == "framebox")
+ else if (outer_type == "framebox" || outer_type == "fbox")
os << "Boxed\n";
else if (outer_type == "shadowbox")
os << "Shadowbox\n";
preamble.registerAutomaticallyLoadedPackage("color");
} else if (outer_type == "doublebox")
os << "Doublebox\n";
- else if (outer_type.empty())
+ else if (outer_type.empty() || outer_type == "mbox")
os << "Frameless\n";
else
os << outer_type << '\n';
os << "position \"" << position << "\"\n";
os << "hor_pos \"" << hor_pos << "\"\n";
- os << "has_inner_box " << !inner_type.empty() << "\n";
+ if (outer_type == "mbox")
+ os << "has_inner_box 1\n";
+ else
+ os << "has_inner_box " << !inner_type.empty() << "\n";
os << "inner_pos \"" << inner_pos << "\"\n";
os << "use_parbox " << (inner_type == "parbox" || shadedparbox)
<< '\n';
- os << "use_makebox " << (inner_type == "makebox") << '\n';
- os << "width \"" << width_value << width_unit << "\"\n";
+ if (outer_type == "mbox")
+ os << "use_makebox 1\n";
+ else
+ os << "use_makebox " << (inner_type == "makebox") << '\n';
+ if (outer_type == "fbox" || outer_type == "mbox")
+ os << "width \"\"\n";
+ else
+ os << "width \"" << width_value << width_unit << "\"\n";
os << "special \"" << width_special << "\"\n";
os << "height \"" << height_value << height_unit << "\"\n";
os << "height_special \"" << height_special << "\"\n";
p.skip_spaces(true);
}
}
- if (outer_type == "shaded") {
+ if (outer_type == "shaded" || outer_type == "fbox"
+ || outer_type == "mbox") {
// These boxes never have an inner box
;
} else if (p.next_token().asInput() == "\\parbox") {
if (!rem.empty())
output_ert_inset(os,
to_utf8(rem), context);
+ for (set<string>::const_iterator it = req.begin();
+ it != req.end(); ++it)
+ preamble.registerAutomaticallyLoadedPackage(*it);
} else
// we did not find a non-ert version
output_ert_inset(os, name, context);
// control sequences
//
- else if (t.cs() == "(") {
- context.check_layout(os);
- begin_inset(os, "Formula");
- os << " \\(";
- parse_math(p, os, FLAG_SIMPLE2, MATH_MODE);
- os << "\\)";
- end_inset(os);
- }
-
- else if (t.cs() == "[") {
+ else if (t.cs() == "(" || t.cs() == "[") {
+ bool const simple = t.cs() == "(";
context.check_layout(os);
begin_inset(os, "Formula");
- os << " \\[";
- parse_math(p, os, FLAG_EQUATION, MATH_MODE);
- os << "\\]";
+ os << " \\" << t.cs();
+ parse_math(p, os, simple ? FLAG_SIMPLE2 : FLAG_EQUATION, MATH_MODE);
+ os << '\\' << (simple ? ')' : ']');
end_inset(os);
- // Prevent the conversion of a line break to a space
- // (bug 7668). This does not change the output, but
- // looks ugly in LyX.
- eat_whitespace(p, os, context, false);
+ if (!simple) {
+ // Prevent the conversion of a line break to a
+ // space (bug 7668). This does not change the
+ // output, but looks ugly in LyX.
+ eat_whitespace(p, os, context, false);
+ }
}
else if (t.cs() == "begin")
}
else if (t.cs() == "caption") {
+ bool starred = false;
+ if (p.next_token().asInput() == "*") {
+ p.get_token();
+ starred = true;
+ }
p.skip_spaces();
context.check_layout(os);
p.skip_spaces();
- begin_inset(os, "Caption Standard\n");
+ if (starred)
+ begin_inset(os, "Caption LongTableNoNumber\n");
+ else
+ begin_inset(os, "Caption Standard\n");
Context newcontext(true, context.textclass, 0, 0, context.font);
newcontext.check_layout(os);
// FIXME InsetArgument is now properly implemented in InsetLayout
preamble.registerAutomaticallyLoadedPackage("listings");
}
- else if (t.cs() == "listoffigures") {
+ else if (t.cs() == "listoffigures" || t.cs() == "listoftables") {
context.check_layout(os);
- begin_inset(os, "FloatList figure\n");
- end_inset(os);
- skip_spaces_braces(p);
- }
-
- else if (t.cs() == "listoftables") {
- context.check_layout(os);
- begin_inset(os, "FloatList table\n");
+ if (t.cs() == "listoffigures")
+ begin_inset(os, "FloatList figure\n");
+ else
+ begin_inset(os, "FloatList table\n");
end_inset(os);
skip_spaces_braces(p);
}
os << to_utf8(s);
if (!rem.empty())
output_ert_inset(os, to_utf8(rem), context);
+ for (set<string>::const_iterator it = req.begin();
+ it != req.end(); ++it)
+ preamble.registerAutomaticallyLoadedPackage(*it);
} else
// we did not find a non-ert version
output_ert_inset(os, command, context);
else if ((where = is_known(t.cs(), known_special_chars))) {
context.check_layout(os);
- os << "\\SpecialChar \\"
- << known_coded_special_chars[where - known_special_chars]
- << '\n';
+ os << known_coded_special_chars[where - known_special_chars];
skip_spaces_braces(p);
}
- else if (t.cs() == "nobreakdash" && p.next_token().asInput() == "-") {
+ else if ((t.cs() == "nobreakdash" && p.next_token().asInput() == "-") ||
+ (t.cs() == "@" && p.next_token().asInput() == ".")) {
context.check_layout(os);
- os << "\\SpecialChar \\nobreakdash-\n";
- p.get_token();
+ os << "\\SpecialChar \\" << t.cs()
+ << p.get_token().asInput() << '\n';
}
else if (t.cs() == "textquotedbl") {
skip_braces(p);
}
- else if (t.cs() == "@" && p.next_token().asInput() == ".") {
- context.check_layout(os);
- os << "\\SpecialChar \\@.\n";
- p.get_token();
- }
-
- else if (t.cs() == "-") {
- context.check_layout(os);
- os << "\\SpecialChar \\-\n";
- }
-
- else if (t.cs() == "textasciitilde") {
- context.check_layout(os);
- os << '~';
- skip_spaces_braces(p);
- }
-
- else if (t.cs() == "textasciicircum") {
- context.check_layout(os);
- os << '^';
- skip_spaces_braces(p);
- }
-
- else if (t.cs() == "textbackslash") {
- context.check_layout(os);
- os << "\n\\backslash\n";
- skip_spaces_braces(p);
- }
-
else if (t.cs() == "_" || t.cs() == "&" || t.cs() == "#"
|| t.cs() == "$" || t.cs() == "{" || t.cs() == "}"
- || t.cs() == "%") {
+ || t.cs() == "%" || t.cs() == "-") {
context.check_layout(os);
- os << t.cs();
+ if (t.cs() == "-")
+ os << "\\SpecialChar \\-\n";
+ else
+ os << t.cs();
}
else if (t.cs() == "char") {
string const absfigname =
changeExtension(abstexname, ".fig");
fix_child_filename(filename);
- string const lyxname =
- changeExtension(filename, ".lyx");
+ string const lyxname = changeExtension(filename,
+ roundtripMode() ? ".lyx.lyx" : ".lyx");
string const abslyxname = makeAbsPath(
lyxname, getParentFilePath(false)).absFileName();
bool xfig = false;
"", "", t.cs());
}
- else if (t.cs() == "ovalbox" || t.cs() == "Ovalbox" ||
+ else if (t.cs() == "fbox" || t.cs() == "mbox" ||
+ t.cs() == "ovalbox" || t.cs() == "Ovalbox" ||
t.cs() == "shadowbox" || t.cs() == "doublebox")
parse_outer_box(p, os, FLAG_ITEM, outer, context, t.cs(), "");
parse_text(p, os, FLAG_ITEM, outer, context);
output_ert_inset(os, "}", context);
} else {
+ //the syntax is: \framebox[width][position]{content}
string special = p.getFullOpt();
special += p.getOpt();
- // LyX does not yet support \framebox without any option
- if (!special.empty())
- parse_outer_box(p, os, FLAG_ITEM, outer,
- context, t.cs(), special);
- else {
- eat_whitespace(p, os, context, false);
- output_ert_inset(os, "\\framebox{", context);
- parse_text(p, os, FLAG_ITEM, outer, context);
- output_ert_inset(os, "}", context);
- }
+ parse_outer_box(p, os, FLAG_ITEM, outer,
+ context, t.cs(), special);
}
}
projects / lyx.git / blobdiff