0};
/// packages that work only in xetex
+/// polyglossia is handled separately
const char * const known_xetex_packages[] = {"arabxetex", "fixlatvian",
-"fontbook", "fontwrap", "mathspec", "philokalia", "polyglossia", "unisugar",
+"fontbook", "fontwrap", "mathspec", "philokalia", "unisugar",
"xeCJK", "xecolor", "xecyr", "xeindex", "xepersian", "xunicode", 0};
/// packages that are automatically skipped if loaded by LyX
-const char * const known_lyx_packages[] = {"array", "booktabs", "calc",
-"color", "float", "graphicx", "hhline", "ifthen", "longtable", "makeidx",
-"multirow", "nomencl", "pdfpages", "rotfloat", "splitidx", "setspace",
+const char * const known_lyx_packages[] = {"amsbsy", "amsmath", "amssymb",
+"amstext", "amsthm", "array", "booktabs", "calc", "color", "float",
+"graphicx", "hhline", "ifthen", "longtable", "makeidx", "multirow",
+"nomencl", "pdfpages", "rotating", "rotfloat", "splitidx", "setspace",
"subscript", "textcomp", "ulem", "url", "varioref", "verbatim", "wrapfig", 0};
// codes used to remove packages that are loaded automatically by LyX.
{
Author author(from_utf8(name), empty_docstring());
for (AuthorList::Authors::const_iterator it = authors_.begin();
- it != authors_.end(); it++)
+ it != authors_.end(); ++it)
if (*it == author)
return *it;
static Author const dummy;
} // anonymous namespace
-Preamble::Preamble() : one_language(true)
+Preamble::Preamble() : one_language(true), title_layout_found(false)
{
//h_backgroundcolor;
//h_boxbgcolor;
h_font_sf_scale = "100";
h_font_tt_scale = "100";
h_graphics = "default";
+ h_default_output_format = "default";
h_html_be_strict = "false";
h_html_css_as_file = "0";
h_html_math_output = "0";
h_use_hyperref = "0";
h_use_refstyle = "0";
h_use_packages["amsmath"] = "1";
+ h_use_packages["amssymb"] = "0";
h_use_packages["esint"] = "1";
h_use_packages["mhchem"] = "0";
h_use_packages["mathdots"] = "0";
|| is_known(name, known_typewriter_fonts))
;
- else if (name == "amsmath" || name == "amssymb")
- h_use_packages["amsmath"] = "2";
-
- else if (name == "esint" || name == "mhchem" || name == "mathdots" ||
+ else if (name == "amsmath" || name == "amssymb" ||
+ name == "esint" || name == "mhchem" || name == "mathdots" ||
name == "mathtools" || name == "undertilde")
h_use_packages[name] = "2";
h_preamble << "\\usepackage{babel}\n";
}
+ else if (name == "polyglossia") {
+ h_language_package = "default";
+ h_default_output_format = "pdf4";
+ h_use_non_tex_fonts = "true";
+ xetex = true;
+ if (h_inputencoding == "auto")
+ p.setEncoding("utf8");
+ }
+
else if (name == "fontenc") {
h_fontencoding = getStringFromVector(options, ",");
/* We could do the following for better round trip support,
}
else if (is_known(name, known_lyx_packages) && options.empty()) {
+ if (name == "splitidx")
+ h_use_indices = "true";
if (!in_lyx_preamble)
h_preamble << package_beg_sep << name
<< package_mid_sep << "\\usepackage{"
else if (!in_lyx_preamble) {
if (options.empty())
- h_preamble << "\\usepackage{" << name << "}";
+ h_preamble << "\\usepackage{" << name << "}\n";
else {
h_preamble << "\\usepackage[" << opts << "]{"
- << name << "}";
+ << name << "}\n";
options.clear();
}
}
registerAutomaticallyLoadedPackage("float");
if (h_spacing != "single" && h_spacing != "default")
registerAutomaticallyLoadedPackage("setspace");
+ if (h_use_packages["amsmath"] == "2") {
+ // amsbsy and amstext are already provided by amsmath
+ registerAutomaticallyLoadedPackage("amsbsy");
+ registerAutomaticallyLoadedPackage("amstext");
+ }
// output the LyX file settings
os << "#LyX file created by tex2lyx " << PACKAGE_VERSION << "\n"
os << "\\begin_modules\n";
vector<string>::const_iterator const end = used_modules.end();
vector<string>::const_iterator it = used_modules.begin();
- for (; it != end; it++)
+ for (; it != end; ++it)
os << *it << '\n';
os << "\\end_modules\n";
}
<< "\\font_osf " << h_font_osf << "\n"
<< "\\font_sf_scale " << h_font_sf_scale << "\n"
<< "\\font_tt_scale " << h_font_tt_scale << "\n"
- << "\\graphics " << h_graphics << "\n";
+ << "\\graphics " << h_graphics << "\n"
+ << "\\default_output_format " << h_default_output_format << "\n";
if (!h_float_placement.empty())
os << "\\float_placement " << h_float_placement << "\n";
os << "\\paperfontsize " << h_paperfontsize << "\n"
os << "\\papersize " << h_papersize << "\n"
<< "\\use_geometry " << h_use_geometry << '\n';
for (map<string, string>::const_iterator it = h_use_packages.begin();
- it != h_use_packages.end(); it++)
+ it != h_use_packages.end(); ++it)
os << "\\use_package " << it->first << ' ' << it->second << '\n';
os << "\\cite_engine " << h_cite_engine << '\n'
<< "\\cite_engine_type " << h_cite_engine_type << '\n'
else if (t.cs() == "pagestyle")
h_paperpagestyle = p.verbatim_item();
+ else if (t.cs() == "setdefaultlanguage")
+ h_language = p.verbatim_item();
+
+ else if (t.cs() == "setotherlanguage")
+ ;
+
+ else if (t.cs() == "setmainfont") {
+ // we don't care about the option
+ p.hasOpt() ? p.getOpt() : string();
+ h_font_roman = p.getArg('{', '}');
+ }
+
+ else if (t.cs() == "setsansfont") {
+ // we don't care about the option
+ p.hasOpt() ? p.getOpt() : string();
+ h_font_sans = p.getArg('{', '}');
+ }
+
+ else if (t.cs() == "setmonofont") {
+ // we don't care about the option
+ p.hasOpt() ? p.getOpt() : string();
+ h_font_typewriter = p.getArg('{', '}');
+ }
+
else if (t.cs() == "date") {
string argument = p.getArg('{', '}');
if (argument.empty())
else if (t.cs() == "def") {
string name = p.get_token().cs();
+ // In fact, name may be more than the name:
+ // In the test case of bug 8116
+ // name == "csname SF@gobble@opt \endcsname".
+ // Therefore, we need to use asInput() instead of cs().
while (p.next_token().cat() != catBegin)
- name += p.get_token().cs();
+ name += p.get_token().asInput();
if (!in_lyx_preamble)
h_preamble << "\\def\\" << name << '{'
<< p.verbatim_item() << "}";
projects / lyx.git / blobdiff