"tgbonum", "tgchorus", "tgpagella", "tgschola", "tgtermes", "utopia", 0};
const char * const known_sans_fonts[] = { "avant", "berasans", "biolinum-type1",
-"cmbr", "cmss", "helvet", "kurier", "kurierl", "lmss", "tgadventor", "tgheros", 0};
+"cmbr", "cmss", "helvet", "iwona", "iwonac", "iwonal", "iwonalc", "kurier",
+"kurierc", "kurierl", "kurierlc", "lmss", "tgadventor", "tgheros", 0};
-const char * const known_kurier_fonts[] = { "kurier", "kurierl", "kurier-condensed",
-"kurier-light-condensed", 0};
+const char * const known_kurier_fonts[] = { "kurier", "kurierl",
+"kurier-condensed", "kurier-light-condensed", 0};
const char * const known_typewriter_fonts[] = { "beramono", "cmtl", "cmtt",
"courier", "lmtt", "luximono", "fourier", "lmodern", "mathpazo", "mathptmx",
const char * const known_basic_colors[] = {"blue", "black", "cyan", "green",
"magenta", "red", "white", "yellow", 0};
-const char * const known_basic_color_codes[] = {"#0000ff", "#000000", "#00ffff", "#00ff00",
-"#ff00ff", "#ff0000", "#ffffff", "#ffff00", 0};
+const char * const known_basic_color_codes[] = {"#0000ff", "#000000", "#00ffff",
+"#00ff00", "#ff00ff", "#ff0000", "#ffffff", "#ffff00", 0};
/// conditional commands with three arguments like \@ifundefined{}{}{}
const char * const known_if_3arg_commands[] = {"@ifundefined", "IfFileExists",
/// packages that are automatically skipped if loaded by LyX
const char * const known_lyx_packages[] = {"amsbsy", "amsmath", "amssymb",
-"amstext", "amsthm", "array", "babel", "booktabs", "calc", "CJK", "color", "float",
-"fontspec", "graphicx", "hhline", "ifthen", "longtable", "makeidx", "multirow",
-"nomencl", "pdfpages", "rotating", "rotfloat", "splitidx", "setspace",
-"subscript", "textcomp", "ulem", "url", "varioref", "verbatim", "wrapfig",
-"xunicode", 0};
+"amstext", "amsthm", "array", "babel", "booktabs", "calc", "CJK", "color",
+"float", "fontspec", "graphicx", "hhline", "ifthen", "longtable", "makeidx",
+"multirow", "nomencl", "pdfpages", "prettyref", "refstyle", "rotating",
+"rotfloat", "splitidx", "setspace", "subscript", "textcomp", "tipa", "tipx",
+"tone", "ulem", "url", "varioref", "verbatim", "wrapfig", "xunicode", 0};
+
+// used for the handling of \newindex
+int index_number = 0;
// codes used to remove packages that are loaded automatically by LyX.
// Syntax: package_beg_sep<name>package_mid_sep<package loading code>package_end_sep
"armenian", "divehi", "interlingua", "polish", "telugu", "asturian", "dutch",
"irish", "portuges", "thai", "bahasai", "english", "italian", "romanian", "turkish",
"bahasam", "esperanto", "lao", "russian", "turkmen", "basque", "estonian", "latin",
-"samin", "ukrainian", "bengali", "farsi", "latvian", "sanskrit", "urdu", "brazil",
-"brazilian", "finnish", "lithuanian", "scottish", "usorbian", "breton", "french",
-"lsorbian", "serbian", "vietnamese", "bulgarian", "galician", "magyar", "slovak",
-"welsh", "catalan", "german", "malayalam", "slovenian", "coptic", "greek",
+"samin", "ukrainian", "bengali", "farsi", "latvian", "sanskrit", "tibetan", "urdu",
+"brazil", "brazilian", "finnish", "lithuanian", "scottish", "usorbian", "breton",
+"french", "lsorbian", "serbian", "vietnamese", "bulgarian", "galician", "magyar",
+"slovak", "welsh", "catalan", "german", "malayalam", "slovenian", "coptic", "greek",
"marathi", "spanish",
"american", "ancient", "australian", "british", "monotonic", "newzealand",
"polytonic", 0};
"armenian", "divehi", "interlingua", "polish", "telugu", "asturian", "dutch",
"irish", "portuges", "thai", "bahasa", "english", "italian", "romanian", "turkish",
"bahasam", "esperanto", "lao", "russian", "turkmen", "basque", "estonian", "latin",
-"samin", "ukrainian", "bengali", "farsi", "latvian", "sanskrit", "urdu", "brazilian",
-"brazilian", "finnish", "lithuanian", "scottish", "uppersorbian", "breton", "french",
-"lowersorbian", "serbian", "vietnamese", "bulgarian", "galician", "magyar", "slovak",
-"welsh", "catalan", "ngerman", "malayalam", "slovene", "coptic", "greek",
+"samin", "ukrainian", "bengali", "farsi", "latvian", "sanskrit", "tibetan", "urdu",
+"brazilian", "brazilian", "finnish", "lithuanian", "scottish", "uppersorbian", "breton",
+"french", "lowersorbian", "serbian", "vietnamese", "bulgarian", "galician", "magyar",
+"slovak", "welsh", "catalan", "ngerman", "malayalam", "slovene", "coptic", "greek",
"marathi", "spanish",
"american", "ancientgreek", "australian", "british", "greek", "newzealand",
"polutonikogreek", 0};
} // anonymous namespace
-Preamble::Preamble() : one_language(true), title_layout_found(false),
- h_font_cjk_set(false)
+Preamble::Preamble() : one_language(true), explicit_babel(false),
+ title_layout_found(false), h_font_cjk_set(false)
{
//h_backgroundcolor;
//h_boxbgcolor;
h_biblio_style = "plain";
h_bibtex_command = "default";
h_cite_engine = "basic";
- h_cite_engine_type = "numerical";
+ h_cite_engine_type = "default";
h_color = "#008000";
h_defskip = "medskip";
//h_float_placement;
h_html_be_strict = "false";
h_html_css_as_file = "0";
h_html_math_output = "0";
- h_index = "Index";
+ h_index[0] = "Index";
h_index_command = "default";
h_inputencoding = "auto";
h_justification = "true";
//h_pdf_quoted_options;
h_quotes_language = "english";
h_secnumdepth = "3";
- h_shortcut = "idx";
+ h_shortcut[0] = "idx";
h_spacing = "single";
h_suppress_date = "false";
h_textclass = "article";
h_use_geometry = "false";
h_use_default_options = "false";
h_use_hyperref = "false";
- h_use_refstyle = "0";
+ h_use_refstyle = false;
h_use_packages["amsmath"] = "1";
h_use_packages["amssymb"] = "0";
+ h_use_packages["cancel"] = "0";
h_use_packages["esint"] = "1";
h_use_packages["mhchem"] = "0";
h_use_packages["mathdots"] = "0";
}
if (name == "libertine") {
- h_font_roman = "libertine-legacy";
+ h_font_roman = "libertine";
+ // this automatically invokes biolinum
+ h_font_sans = "biolinum";
if (opts == "osf")
h_font_osf = "true";
+ else if (opts == "lining")
+ h_font_osf = "false";
}
if (name == "libertine-type1") {
h_font_roman = "libertine";
+ // NOTE: contrary to libertine.sty, libertine-type1
+ // does not automatically invoke biolinum
if (opts == "lining")
h_font_osf = "false";
- else
+ else if (opts == "osf")
h_font_osf = "true";
}
h_font_math = "minion-ntxm";
}
- if (name == "refstyle")
- h_use_refstyle = "1";
-
// after the detection and handling of special cases, we can remove the
// fonts, otherwise they would appear in the preamble, see bug #7856
if (is_known(name, known_roman_fonts) || is_known(name, known_sans_fonts)
|| is_known(name, known_typewriter_fonts) || is_known(name, known_math_fonts))
;
- else if (name == "amsmath" || name == "amssymb" ||
+ else if (name == "amsmath" || name == "amssymb" || name == "cancel" ||
name == "esint" || name == "mhchem" || name == "mathdots" ||
name == "mathtools" || name == "stackrel" ||
name == "stmaryrd" || name == "undertilde")
h_preamble << "\\usepackage[" << opts << "]{babel}\n";
}
delete_opt(options, known_languages);
- }
- else
+ } else {
h_preamble << "\\usepackage{babel}\n";
+ explicit_babel = true;
+ }
}
else if (name == "polyglossia") {
}
else if (name == "CJKutf8") {
- h_inputencoding = "UTF8";
+ h_inputencoding = "utf8-cjk";
p.setEncoding("UTF-8");
registerAutomaticallyLoadedPackage("CJKutf8");
}
// h_inputencoding is only set when there is not more than one
// inputenc option because otherwise h_inputencoding must be
// set to "auto" (the default encoding of the document language)
- // Therefore check for the "," character.
+ // Therefore check that exactly one option is passed to inputenc.
// It is also only set when there is not more than one babel
// language option.
- if (opts.find(",") == string::npos && one_language == true)
- h_inputencoding = opts;
- if (!options.empty())
- p.setEncoding(options.back(), Encoding::inputenc);
- options.clear();
+ if (!options.empty()) {
+ string const encoding = options.back();
+ Encoding const * const enc = encodings.fromLaTeXName(
+ encoding, Encoding::inputenc, true);
+ if (!enc)
+ cerr << "Unknown encoding " << encoding << ". Ignoring." << std::endl;
+ else {
+ if (!enc->unsafe() && options.size() == 1 && one_language == true)
+ h_inputencoding = enc->name();
+ p.setEncoding(enc->iconvName());
+ }
+ options.clear();
+ }
}
else if (name == "srcltx") {
h_language_package = "\\usepackage{" + name + "}";
}
- else if (name == "prettyref")
- ; // ignore this FIXME: Use the package separator mechanism instead
-
else if (name == "lyxskak") {
// ignore this and its options
const char * const o[] = {"ps", "mover", 0};
else if (is_known(name, known_lyx_packages) && options.empty()) {
if (name == "splitidx")
h_use_indices = "true";
+ if (name == "refstyle")
+ h_use_refstyle = true;
+ else if (name == "prettyref")
+ h_use_refstyle = false;
if (!in_lyx_preamble) {
h_preamble << package_beg_sep << name
<< package_mid_sep << "\\usepackage{"
os << "\\backgroundcolor " << h_backgroundcolor << '\n';
if (!h_boxbgcolor.empty())
os << "\\boxbgcolor " << h_boxbgcolor << '\n';
- os << "\\index " << h_index << '\n'
- << "\\shortcut " << h_shortcut << '\n'
- << "\\color " << h_color << '\n'
- << "\\end_index\n";
+ if (index_number != 0)
+ for (int i = 0; i < index_number; i++) {
+ os << "\\index " << h_index[i] << '\n'
+ << "\\shortcut " << h_shortcut[i] << '\n'
+ << "\\color " << h_color << '\n'
+ << "\\end_index\n";
+ }
+ else {
+ os << "\\index " << h_index[0] << '\n'
+ << "\\shortcut " << h_shortcut[0] << '\n'
+ << "\\color " << h_color << '\n'
+ << "\\end_index\n";
+ }
os << h_margins
<< "\\secnumdepth " << h_secnumdepth << "\n"
<< "\\tocdepth " << h_tocdepth << "\n"
p.setCatcode('@', catOther);
}
+ else if (t.cs() == "makeindex") {
+ // LyX will re-add this if a print index command is found
+ p.skip_spaces();
+ }
+
+ else if (t.cs() == "newindex") {
+ string const indexname = p.getArg('[', ']');
+ string const shortcut = p.verbatim_item();
+ if (!indexname.empty())
+ h_index[index_number] = indexname;
+ else
+ h_index[index_number] = shortcut;
+ h_shortcut[index_number] = shortcut;
+ index_number += 1;
+ p.skip_spaces();
+ }
+
+ else if (t.cs() == "RS@ifundefined") {
+ string const name = p.verbatim_item();
+ string const body1 = p.verbatim_item();
+ string const body2 = p.verbatim_item();
+ // only non-lyxspecific stuff
+ if (in_lyx_preamble &&
+ (name == "subref" || name == "thmref" || name == "lemref"))
+ p.skip_spaces();
+ else {
+ ostringstream ss;
+ ss << '\\' << t.cs();
+ ss << '{' << name << '}'
+ << '{' << body1 << '}'
+ << '{' << body2 << '}';
+ h_preamble << ss.str();
+ }
+ }
+
+ else if (t.cs() == "AtBeginDocument") {
+ string const name = p.verbatim_item();
+ // only non-lyxspecific stuff
+ if (in_lyx_preamble &&
+ (name == "\\providecommand\\partref[1]{\\ref{part:#1}}"
+ || name == "\\providecommand\\chapref[1]{\\ref{chap:#1}}"
+ || name == "\\providecommand\\secref[1]{\\ref{sec:#1}}"
+ || name == "\\providecommand\\subref[1]{\\ref{sub:#1}}"
+ || name == "\\providecommand\\parref[1]{\\ref{par:#1}}"
+ || name == "\\providecommand\\figref[1]{\\ref{fig:#1}}"
+ || name == "\\providecommand\\tabref[1]{\\ref{tab:#1}}"
+ || name == "\\providecommand\\algref[1]{\\ref{alg:#1}}"
+ || name == "\\providecommand\\fnref[1]{\\ref{fn:#1}}"
+ || name == "\\providecommand\\enuref[1]{\\ref{enu:#1}}"
+ || name == "\\providecommand\\eqref[1]{\\ref{eq:#1}}"
+ || name == "\\providecommand\\lemref[1]{\\ref{lem:#1}}"
+ || name == "\\providecommand\\thmref[1]{\\ref{thm:#1}}"
+ || name == "\\providecommand\\corref[1]{\\ref{cor:#1}}"
+ || name == "\\providecommand\\propref[1]{\\ref{prop:#1}}"))
+ p.skip_spaces();
+ else {
+ ostringstream ss;
+ ss << '\\' << t.cs();
+ ss << '{' << name << '}';
+ h_preamble << ss.str();
+ }
+ }
+
else if (t.cs() == "newcommand" || t.cs() == "newcommandx"
|| t.cs() == "renewcommand" || t.cs() == "renewcommandx"
|| t.cs() == "providecommand" || t.cs() == "providecommandx"
in_lyx_preamble = true;
}
- if (name == "\\bfdefault")
- // LyX re-adds this if a kurier font is used
- if (is_known(h_font_sans, known_kurier_fonts) && body == "b") {
- p.skip_spaces();
- in_lyx_preamble = true;
- }
-
// remove the lyxdot definition that is re-added by LyX
// if necessary
if (name == "\\lyxdot") {
in_lyx_preamble = was_in_lyx_preamble;
}
- else if (t.cs() == "edef"){
- // we only support this for kurier fonts
- string const command = p.next_token().asInput();
- p.get_token();
- if (command == "\\sfdefault") {
- p.getArg('{', '}');
- if (h_font_sans == "kurier")
- h_font_sans = "kurier-condensed";
- if (h_font_sans == "kurierl")
- h_font_sans = "kurier-light-condensed";
- p.skip_spaces();
- }
- else
- h_preamble << "\\edef" << command << "{" << p.getArg('{', '}') << "}\n";
- }
-
else if (t.cs() == "documentclass") {
vector<string>::iterator it;
vector<string> opts = split_options(p.getArg('[', ']'));
else if (t.cs() == "inputencoding") {
string const encoding = p.getArg('{','}');
- h_inputencoding = encoding;
- p.setEncoding(encoding, Encoding::inputenc);
+ Encoding const * const enc = encodings.fromLaTeXName(
+ encoding, Encoding::inputenc, true);
+ if (!enc)
+ cerr << "Unknown encoding " << encoding << ". Ignoring." << std::endl;
+ else {
+ if (!enc->unsafe())
+ h_inputencoding = enc->name();
+ p.setEncoding(enc->iconvName());
+ }
}
else if (t.cs() == "newenvironment") {
p.pushPosition();
h_language = guessLanguage(p, default_language);
p.popPosition();
+ if (explicit_babel && h_language != default_language) {
+ // We set the document language to a CJK language,
+ // but babel is explicitly called in the user preamble
+ // without options. LyX will not add the default
+ // language to the document options if it is either
+ // english, or no text is set as default language.
+ // Therefore we need to add a language option explicitly.
+ // FIXME: It would be better to remove all babel calls
+ // from the user preamble, but this is difficult
+ // without re-introducing bug 7861.
+ if (h_options.empty())
+ h_options = lyx2babel(default_language);
+ else
+ h_options += ',' + lyx2babel(default_language);
+ }
}
}
}
+string lyx2babel(string const & language)
+{
+ char const * const * where = is_known(language, known_coded_languages);
+ if (where)
+ return known_languages[where - known_coded_languages];
+ return language;
+}
+
+
string Preamble::polyglossia2lyx(string const & language)
{
char const * const * where = is_known(language, polyglossia_languages);