X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftex2lyx%2FPreamble.cpp;h=6dcbd5097c6ee4204a7c68b34d9515760c48aaf8;hb=3628ceec480c3d8fa9673f80f781eb1153fb9e1f;hp=9d72a5e77bfeed4dd4397e0608598a745c9df24e;hpb=9dd1b7c578153b7138f27600a93a1dbedec48af9;p=lyx.git diff --git a/src/tex2lyx/Preamble.cpp b/src/tex2lyx/Preamble.cpp index 9d72a5e77b..6dcbd5097c 100644 --- a/src/tex2lyx/Preamble.cpp +++ b/src/tex2lyx/Preamble.cpp @@ -21,6 +21,7 @@ #include "Layout.h" #include "Lexer.h" #include "TextClass.h" +#include "version.h" #include "support/convert.h" #include "support/FileName.h" @@ -38,9 +39,6 @@ using namespace lyx::support; namespace lyx { -// special columntypes -extern map special_columns; - Preamble preamble; namespace { @@ -58,14 +56,15 @@ const char * const known_languages[] = {"acadian", "afrikaans", "albanian", "bulgarian", "canadian", "canadien", "catalan", "croatian", "czech", "danish", "dutch", "english", "esperanto", "estonian", "farsi", "finnish", "francais", "french", "frenchb", "frenchle", "frenchpro", "galician", "german", "germanb", -"greek", "hebrew", "hungarian", "icelandic", "indon", "indonesian", "interlingua", -"irish", "italian", "japanese", "kazakh", "kurmanji", "latin", "latvian", "lithuanian", -"lowersorbian", "lsorbian", "magyar", "malay", "meyalu", "mongolian", "naustrian", -"newzealand", "ngerman", "ngermanb", "norsk", "nynorsk", "polutonikogreek", "polish", -"portuges", "portuguese", "romanian", "russian", "russianb", "samin", -"scottish", "serbian", "serbian-latin", "slovak", "slovene", "spanish", -"swedish", "thai", "turkish", "turkmen", "ukraineb", "ukrainian", -"uppersorbian", "UKenglish", "USenglish", "usorbian", "vietnam", "welsh", +"georgian", "greek", "hebrew", "hungarian", "icelandic", "indon", "indonesian", +"interlingua", "irish", "italian", "japanese", "kazakh", "kurmanji", "latin", +"latvian", "lithuanian", "lowersorbian", "lsorbian", "magyar", "malay", "meyalu", +"mongolian", "naustrian", "newzealand", "ngerman", "ngermanb", "norsk", "nswissgerman", +"nynorsk", "polutonikogreek", "polish", "portuges", "portuguese", "romanian", "russian", +"russianb", "samin", "scottish", "serbian", "serbian-latin", "slovak", +"slovene", "spanish", "swedish", "swissgerman", "thai", "turkish", "turkmen", +"ukraineb", "ukrainian", "uppersorbian", "UKenglish", "USenglish", "usorbian", +"vietnam", "welsh", 0}; /** @@ -78,14 +77,15 @@ const char * const known_coded_languages[] = {"french", "afrikaans", "albanian", "bulgarian", "canadian", "canadien", "catalan", "croatian", "czech", "danish", "dutch", "english", "esperanto", "estonian", "farsi", "finnish", "french", "french", "french", "french", "french", "galician", "german", "german", -"greek", "hebrew", "magyar", "icelandic", "bahasa", "bahasa", "interlingua", -"irish", "italian", "japanese", "kazakh", "kurmanji", "latin", "latvian", "lithuanian", -"lowersorbian", "lowersorbian", "magyar", "bahasam", "bahasam", "mongolian", "naustrian", -"newzealand", "ngerman", "ngerman", "norsk", "nynorsk", "polutonikogreek", "polish", -"portuguese", "portuguese", "romanian", "russian", "russian", "samin", -"scottish", "serbian", "serbian-latin", "slovak", "slovene", "spanish", -"swedish", "thai", "turkish", "turkmen", "ukrainian", "ukrainian", -"uppersorbian", "uppersorbian", "english", "english", "vietnamese", "welsh", +"georgian", "greek", "hebrew", "magyar", "icelandic", "bahasa", "bahasa", +"interlingua", "irish", "italian", "japanese", "kazakh", "kurmanji", "latin", +"latvian", "lithuanian", "lowersorbian", "lowersorbian", "magyar", "bahasam", "bahasam", +"mongolian", "naustrian", "newzealand", "ngerman", "ngerman", "norsk", "german-ch", +"nynorsk", "polutonikogreek", "polish", "portuguese", "portuguese", "romanian", "russian", +"russian", "samin", "scottish", "serbian", "serbian-latin", "slovak", +"slovene", "spanish", "swedish", "german-ch-old", "thai", "turkish", "turkmen", +"ukrainian", "ukrainian", "uppersorbian", "english", "english", "uppersorbian", +"vietnamese", "welsh", 0}; /// languages with danish quotes (.lyx names) @@ -106,7 +106,7 @@ const char * const known_french_quotes_languages[] = {"albanian", /// languages with german quotes (.lyx names) const char * const known_german_quotes_languages[] = {"austrian", "bulgarian", -"czech", "german", "icelandic", "lithuanian", "lowersorbian", "naustrian", +"czech", "german", "georgian", "icelandic", "lithuanian", "lowersorbian", "naustrian", "ngerman", "serbian", "serbian-latin", "slovak", "slovene", "uppersorbian", 0}; /// languages with polish quotes (.lyx names) @@ -129,14 +129,12 @@ const char * const known_roman_fonts[] = { "ae", "beraserif", "bookman", "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}; - -const char * const known_kurier_fonts[] = { "kurier", "kurierl", -"kurier-condensed", "kurier-light-condensed", 0}; +"cmbr", "cmss", "helvet", "iwona", "iwonac", "iwonal", "iwonalc", "kurier", +"kurierc", "kurierl", "kurierlc", "lmss", "tgadventor", "tgheros", 0}; const char * const known_typewriter_fonts[] = { "beramono", "cmtl", "cmtt", -"courier", "lmtt", "luximono", "fourier", "lmodern", "mathpazo", "mathptmx", -"newcent", "tgcursor", "txtt", 0}; +"courier", "lmtt", "luximono", "fourier", "libertineMono-type1", "lmodern", +"mathpazo", "mathptmx", "newcent", "tgcursor", "txtt", 0}; const char * const known_math_fonts[] = { "eulervm", "newtxmath", 0}; @@ -161,11 +159,13 @@ const char * const known_if_commands[] = {"if", "ifarydshln", "ifbraket", "ifcancel", "ifcolortbl", "ifeurosym", "ifmarginnote", "ifmmode", "ifpdf", "ifsidecap", "ifupgreek", 0}; -const char * const known_basic_colors[] = {"blue", "black", "cyan", "green", -"magenta", "red", "white", "yellow", 0}; +const char * const known_basic_colors[] = {"black", "blue", "brown", "cyan", + "darkgray", "gray", "green", "lightgray", "lime", "magenta", "orange", "olive", + "pink", "purple", "red", "teal", "violet", "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[] = {"#000000", "#0000ff", "#964B00", "#00ffff", + "#a9a9a9", "#808080", "#00ff00", "#d3d3d3", "#bfff00", "#ff00ff", "#ff7f00", "#808000", + "#ffc0cb", "#800080", "#ff0000", "#008080", "#8f00ff", "#ffffff", "#ffff00", 0}; /// conditional commands with three arguments like \@ifundefined{}{}{} const char * const known_if_3arg_commands[] = {"@ifundefined", "IfFileExists", @@ -180,13 +180,10 @@ const char * const known_xetex_packages[] = {"arabxetex", "fixlatvian", /// 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", "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; +"float", "fontspec", "framed", "graphicx", "hhline", "ifthen", "longtable", +"makeidx", "multirow", "nomencl", "pdfpages", "prettyref", "refstyle", "rotating", +"rotfloat", "splitidx", "setspace", "subscript", "textcomp", "tipa", "tipx", +"tone", "ulem", "url", "varioref", "verbatim", "wrapfig", "xcolor", "xunicode", 0}; // codes used to remove packages that are loaded automatically by LyX. // Syntax: package_beg_seppackage_mid_seppackage_end_sep @@ -296,6 +293,7 @@ string process_keyval_opt(vector & options, string name) /** * known polyglossia language names (including variants) + * FIXME: support spelling=old for german variants (german vs. ngerman LyX names etc) */ const char * const Preamble::polyglossia_languages[] = { "albanian", "croatian", "hebrew", "norsk", "swedish", "amharic", "czech", "hindi", @@ -303,11 +301,11 @@ const char * const Preamble::polyglossia_languages[] = { "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", -"marathi", "spanish", +"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", "austrian", "american", "ancient", "australian", "british", "monotonic", "newzealand", "polytonic", 0}; @@ -321,15 +319,21 @@ const char * const Preamble::coded_polyglossia_languages[] = { "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", -"marathi", "spanish", +"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", "naustrian", "american", "ancientgreek", "australian", "british", "greek", "newzealand", "polutonikogreek", 0}; +bool Preamble::usePolyglossia() const +{ + return h_use_non_tex_fonts && h_language_package == "default"; +} + + bool Preamble::indentParagraphs() const { return h_paragraph_separation == "indent"; @@ -394,6 +398,15 @@ Author const & Preamble::getAuthor(std::string const & name) const } +int Preamble::getSpecialTableColumnArguments(char c) const +{ + map::const_iterator it = special_columns_.find(c); + if (it == special_columns_.end()) + return -1; + return it->second; +} + + void Preamble::add_package(string const & name, vector & options) { // every package inherits the global options @@ -422,7 +435,8 @@ bool scale_as_percentage(string const & scale, string & percentage) if (pos != string::npos) { string value = scale.substr(pos + 1); if (isStrDbl(value)) { - percentage = convert(100 * convert(value)); + percentage = convert( + static_cast(100 * convert(value))); return true; } } @@ -443,29 +457,35 @@ string remove_braces(string const & value) Preamble::Preamble() : one_language(true), explicit_babel(false), - title_layout_found(false), h_font_cjk_set(false) + title_layout_found(false), index_number(0), 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_fontcolor; h_fontencoding = "default"; - h_font_roman = "default"; - h_font_sans = "default"; - h_font_typewriter = "default"; - h_font_math = "auto"; + h_font_roman[0] = "default"; + h_font_roman[1] = "default"; + h_font_sans[0] = "default"; + h_font_sans[1] = "default"; + h_font_typewriter[0] = "default"; + h_font_typewriter[1] = "default"; + h_font_math[0] = "auto"; + h_font_math[1] = "auto"; h_font_default_family = "default"; - h_use_non_tex_fonts = "false"; + h_use_non_tex_fonts = false; h_font_sc = "false"; h_font_osf = "false"; - h_font_sf_scale = "100"; - h_font_tt_scale = "100"; + h_font_sf_scale[0] = "100"; + h_font_sf_scale[1] = "100"; + h_font_tt_scale[0] = "100"; + h_font_tt_scale[1] = "100"; //h_font_cjk h_graphics = "default"; h_default_output_format = "default"; @@ -498,7 +518,7 @@ Preamble::Preamble() : one_language(true), explicit_babel(false), //h_pdf_author; //h_pdf_subject; //h_pdf_keywords; - h_pdf_bookmarks = "1"; + h_pdf_bookmarks = "0"; h_pdf_bookmarksnumbered = "0"; h_pdf_bookmarksopen = "0"; h_pdf_bookmarksopenlevel = "1"; @@ -506,13 +526,14 @@ Preamble::Preamble() : one_language(true), explicit_babel(false), h_pdf_pdfborder = "0"; h_pdf_colorlinks = "0"; h_pdf_backref = "section"; - h_pdf_pdfusetitle = "1"; + h_pdf_pdfusetitle = "0"; //h_pdf_pagemode; //h_pdf_quoted_options; h_quotes_language = "english"; h_secnumdepth = "3"; h_shortcut[0] = "idx"; h_spacing = "single"; + h_save_transient_properties = "true"; h_suppress_date = "false"; h_textclass = "article"; h_tocdepth = "3"; @@ -522,9 +543,10 @@ Preamble::Preamble() : one_language(true), explicit_babel(false), 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"; @@ -650,7 +672,8 @@ void Preamble::handle_geometry(vector & options) void Preamble::handle_package(Parser &p, string const & name, - string const & opts, bool in_lyx_preamble) + string const & opts, bool in_lyx_preamble, + bool detectEncoding) { vector options = split_options(opts); add_package(name, options); @@ -658,7 +681,7 @@ void Preamble::handle_package(Parser &p, string const & name, if (is_known(name, known_xetex_packages)) { xetex = true; - h_use_non_tex_fonts = "true"; + h_use_non_tex_fonts = true; registerAutomaticallyLoadedPackage("fontspec"); if (h_inputencoding == "auto") p.setEncoding("UTF-8"); @@ -666,25 +689,25 @@ void Preamble::handle_package(Parser &p, string const & name, // roman fonts if (is_known(name, known_roman_fonts)) - h_font_roman = name; + h_font_roman[0] = name; if (name == "fourier") { - h_font_roman = "utopia"; + h_font_roman[0] = "utopia"; // when font uses real small capitals if (opts == "expert") h_font_sc = "true"; } if (name == "garamondx") { - h_font_roman = "garamondx"; + h_font_roman[0] = "garamondx"; if (opts == "osfI") h_font_osf = "true"; } if (name == "libertine") { - h_font_roman = "libertine"; + h_font_roman[0] = "libertine"; // this automatically invokes biolinum - h_font_sans = "biolinum"; + h_font_sans[0] = "biolinum"; if (opts == "osf") h_font_osf = "true"; else if (opts == "lining") @@ -692,7 +715,7 @@ void Preamble::handle_package(Parser &p, string const & name, } if (name == "libertine-type1") { - h_font_roman = "libertine"; + h_font_roman[0] = "libertine"; // NOTE: contrary to libertine.sty, libertine-type1 // does not automatically invoke biolinum if (opts == "lining") @@ -700,14 +723,14 @@ void Preamble::handle_package(Parser &p, string const & name, else if (opts == "osf") h_font_osf = "true"; } - + if (name == "mathdesign") { if (opts.find("charter") != string::npos) - h_font_roman = "md-charter"; + h_font_roman[0] = "md-charter"; if (opts.find("garamond") != string::npos) - h_font_roman = "md-garamond"; + h_font_roman[0] = "md-garamond"; if (opts.find("utopia") != string::npos) - h_font_roman = "md-utopia"; + h_font_roman[0] = "md-utopia"; if (opts.find("expert") != string::npos) { h_font_sc = "true"; h_font_osf = "true"; @@ -715,62 +738,79 @@ void Preamble::handle_package(Parser &p, string const & name, } else if (name == "mathpazo") - h_font_roman = "palatino"; + h_font_roman[0] = "palatino"; else if (name == "mathptmx") - h_font_roman = "times"; + h_font_roman[0] = "times"; // sansserif fonts if (is_known(name, known_sans_fonts)) { - h_font_sans = name; - if (options.size() == 1) { - if (scale_as_percentage(opts, h_font_sf_scale)) + h_font_sans[0] = name; + if (options.size() >= 1) { + if (scale_as_percentage(opts, h_font_sf_scale[0])) options.clear(); } } - if (name == "biolinum-type1") - h_font_sans = "biolinum"; + if (name == "biolinum-type1") { + h_font_sans[0] = "biolinum"; + // biolinum can have several options, e.g. [osf,scaled=0.97] + string::size_type pos = opts.find("osf"); + if (pos != string::npos) + h_font_osf = "true"; + } // typewriter fonts if (is_known(name, known_typewriter_fonts)) { // fourier can be set as roman font _only_ // fourier as typewriter is handled in handling of \ttdefault if (name != "fourier") { - h_font_typewriter = name; - if (options.size() == 1) { - if (scale_as_percentage(opts, h_font_tt_scale)) + h_font_typewriter[0] = name; + if (options.size() >= 1) { + if (scale_as_percentage(opts, h_font_tt_scale[0])) options.clear(); } } } + if (name == "libertineMono-type1") { + h_font_typewriter[0] = "libertine-mono"; + } + // font uses old-style figure if (name == "eco") h_font_osf = "true"; // math fonts if (is_known(name, known_math_fonts)) - h_font_math = name; + h_font_math[0] = name; if (name == "newtxmath") { if (opts.empty()) - h_font_math = "newtxmath"; + h_font_math[0] = "newtxmath"; else if (opts == "garamondx") - h_font_math = "garamondx-ntxm"; + h_font_math[0] = "garamondx-ntxm"; else if (opts == "libertine") - h_font_math = "libertine-ntxm"; + h_font_math[0] = "libertine-ntxm"; else if (opts == "minion") - h_font_math = "minion-ntxm"; + h_font_math[0] = "minion-ntxm"; } + if (name == "iwona") + if (opts == "math") + h_font_math[0] = "iwona-math"; + + if (name == "kurier") + if (opts == "math") + h_font_math[0] = "kurier-math"; + // 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") @@ -828,7 +868,7 @@ void Preamble::handle_package(Parser &p, string const & name, else if (name == "polyglossia") { h_language_package = "default"; h_default_output_format = "pdf4"; - h_use_non_tex_fonts = "true"; + h_use_non_tex_fonts = true; xetex = true; registerAutomaticallyLoadedPackage("xunicode"); if (h_inputencoding == "auto") @@ -870,9 +910,11 @@ void Preamble::handle_package(Parser &p, string const & name, 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) { + if (!detectEncoding) + 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()); @@ -897,9 +939,6 @@ void Preamble::handle_package(Parser &p, string const & name, 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}; @@ -910,7 +949,9 @@ void Preamble::handle_package(Parser &p, string const & name, if (name == "splitidx") h_use_indices = "true"; if (name == "refstyle") - h_use_refstyle = "1"; + 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{" @@ -955,9 +996,24 @@ void Preamble::handle_package(Parser &p, string const & name, h_cite_engine_type = "authoryear"; } + else if (name == "bibtopic") + h_use_bibtopic = "true"; + else if (name == "hyperref") handle_hyperref(options); + else if (name == "algorithm2e") { + // Load "algorithm2e" module + addModule("algorithm2e"); + // Add the package options to the global document options + if (!options.empty()) { + if (h_options.empty()) + h_options = join(options, ","); + else + h_options += ',' + join(options, ","); + } + } + else if (!in_lyx_preamble) { if (options.empty()) h_preamble << "\\usepackage{" << name << '}'; @@ -973,7 +1029,7 @@ void Preamble::handle_package(Parser &p, string const & name, } // We need to do something with the options... - if (!options.empty()) + if (!options.empty() && !detectEncoding) cerr << "Ignoring options '" << join(options, ",") << "' of package " << name << '.' << endl; @@ -999,7 +1055,7 @@ void Preamble::handle_if(Parser & p, bool in_lyx_preamble) } -bool Preamble::writeLyXHeader(ostream & os, bool subdoc) +bool Preamble::writeLyXHeader(ostream & os, bool subdoc, string const & outfiledir) { // set the quote language // LyX only knows the following quotes languages: @@ -1039,10 +1095,16 @@ bool Preamble::writeLyXHeader(ostream & os, bool subdoc) } // output the LyX file settings - os << "#LyX file created by tex2lyx " << PACKAGE_VERSION << "\n" + // Important: Keep the version formatting in sync with LyX and + // lyx2lyx (bug 7951) + string const origin = roundtripMode() ? "roundtrip" : outfiledir; + os << "#LyX file created by tex2lyx " << lyx_version_major << '.' + << lyx_version_minor << '\n' << "\\lyxformat " << LYX_FORMAT << '\n' << "\\begin_document\n" << "\\begin_header\n" + << "\\save_transient_properties " << h_save_transient_properties << "\n" + << "\\origin " << origin << "\n" << "\\textclass " << h_textclass << "\n"; string const raw = subdoc ? empty_string() : h_preamble.str(); if (!raw.empty()) { @@ -1084,16 +1146,20 @@ bool Preamble::writeLyXHeader(ostream & os, bool subdoc) << "\\language_package " << h_language_package << "\n" << "\\inputencoding " << h_inputencoding << "\n" << "\\fontencoding " << h_fontencoding << "\n" - << "\\font_roman " << h_font_roman << "\n" - << "\\font_sans " << h_font_sans << "\n" - << "\\font_typewriter " << h_font_typewriter << "\n" - << "\\font_math " << h_font_math << "\n" + << "\\font_roman \"" << h_font_roman[0] + << "\" \"" << h_font_roman[1] << "\"\n" + << "\\font_sans \"" << h_font_sans[0] << "\" \"" << h_font_sans[1] << "\"\n" + << "\\font_typewriter \"" << h_font_typewriter[0] + << "\" \"" << h_font_typewriter[1] << "\"\n" + << "\\font_math \"" << h_font_math[0] << "\" \"" << h_font_math[1] << "\"\n" << "\\font_default_family " << h_font_default_family << "\n" - << "\\use_non_tex_fonts " << h_use_non_tex_fonts << "\n" + << "\\use_non_tex_fonts " << (h_use_non_tex_fonts ? "true" : "false") << '\n' << "\\font_sc " << h_font_sc << "\n" << "\\font_osf " << h_font_osf << "\n" - << "\\font_sf_scale " << h_font_sf_scale << "\n" - << "\\font_tt_scale " << h_font_tt_scale << '\n'; + << "\\font_sf_scale " << h_font_sf_scale[0] + << ' ' << h_font_sf_scale[1] << '\n' + << "\\font_tt_scale " << h_font_tt_scale[0] + << ' ' << h_font_tt_scale[1] << '\n'; if (!h_font_cjk.empty()) os << "\\font_cjk " << h_font_cjk << '\n'; os << "\\graphics " << h_graphics << '\n' @@ -1110,13 +1176,13 @@ bool Preamble::writeLyXHeader(ostream & os, bool subdoc) << "\\use_hyperref " << h_use_hyperref << '\n'; if (h_use_hyperref == "true") { if (!h_pdf_title.empty()) - os << "\\pdf_title \"" << h_pdf_title << "\"\n"; + os << "\\pdf_title " << Lexer::quoteString(h_pdf_title) << '\n'; if (!h_pdf_author.empty()) - os << "\\pdf_author \"" << h_pdf_author << "\"\n"; + os << "\\pdf_author " << Lexer::quoteString(h_pdf_author) << '\n'; if (!h_pdf_subject.empty()) - os << "\\pdf_subject \"" << h_pdf_subject << "\"\n"; + os << "\\pdf_subject " << Lexer::quoteString(h_pdf_subject) << '\n'; if (!h_pdf_keywords.empty()) - os << "\\pdf_keywords \"" << h_pdf_keywords << "\"\n"; + os << "\\pdf_keywords " << Lexer::quoteString(h_pdf_keywords) << '\n'; os << "\\pdf_bookmarks " << h_pdf_bookmarks << "\n" "\\pdf_bookmarksnumbered " << h_pdf_bookmarksnumbered << "\n" "\\pdf_bookmarksopen " << h_pdf_bookmarksopen << "\n" @@ -1129,7 +1195,7 @@ bool Preamble::writeLyXHeader(ostream & os, bool subdoc) if (!h_pdf_pagemode.empty()) os << "\\pdf_pagemode " << h_pdf_pagemode << '\n'; if (!h_pdf_quoted_options.empty()) - os << "\\pdf_quoted_options \"" << h_pdf_quoted_options << "\"\n"; + os << "\\pdf_quoted_options " << Lexer::quoteString(h_pdf_quoted_options) << '\n'; } os << "\\papersize " << h_papersize << "\n" << "\\use_geometry " << h_use_geometry << '\n'; @@ -1196,7 +1262,14 @@ void Preamble::parse(Parser & p, string const & forceclass, TeX2LyXDocClass & tc) { // initialize fixed types - special_columns['D'] = 3; + special_columns_['D'] = 3; + parse(p, forceclass, false, tc); +} + + +void Preamble::parse(Parser & p, string const & forceclass, + bool detectEncoding, TeX2LyXDocClass & tc) +{ bool is_full_document = false; bool is_lyx_file = false; bool in_lyx_preamble = false; @@ -1212,11 +1285,19 @@ void Preamble::parse(Parser & p, string const & forceclass, } p.reset(); + if (detectEncoding && !is_full_document) + return; + while (is_full_document && p.good()) { + if (detectEncoding && h_inputencoding != "auto" && + h_inputencoding != "default") + return; + Token const & t = p.get_token(); #ifdef FILEDEBUG - cerr << "t: " << t << "\n"; + if (!detectEncoding) + cerr << "t: " << t << '\n'; #endif // @@ -1251,7 +1332,8 @@ void Preamble::parse(Parser & p, string const & forceclass, if (comment.size() > magicXeLaTeX.size() && comment.substr(0, magicXeLaTeX.size()) == magicXeLaTeX && h_inputencoding == "auto") { - cerr << "XeLaTeX comment found, switching to UTF8\n"; + if (!detectEncoding) + cerr << "XeLaTeX comment found, switching to UTF8\n"; h_inputencoding = "utf8"; } smatch sub; @@ -1303,7 +1385,7 @@ void Preamble::parse(Parser & p, string const & forceclass, else if (t.cs() == "setmainfont") { // we don't care about the option p.hasOpt() ? p.getOpt() : string(); - h_font_roman = p.getArg('{', '}'); + h_font_roman[1] = p.getArg('{', '}'); } else if (t.cs() == "setsansfont" || t.cs() == "setmonofont") { @@ -1323,12 +1405,12 @@ void Preamble::parse(Parser & p, string const & forceclass, } if (t.cs() == "setsansfont") { if (!scale.empty()) - h_font_sf_scale = scale; - h_font_sans = p.getArg('{', '}'); + h_font_sf_scale[1] = scale; + h_font_sans[1] = p.getArg('{', '}'); } else { if (!scale.empty()) - h_font_tt_scale = scale; - h_font_typewriter = p.getArg('{', '}'); + h_font_tt_scale[1] = scale; + h_font_typewriter[1] = p.getArg('{', '}'); } } @@ -1347,9 +1429,9 @@ void Preamble::parse(Parser & p, string const & forceclass, // check the case that a standard color is used if (space.empty() && is_known(argument, known_basic_colors)) { h_fontcolor = rgbcolor2code(argument); - preamble.registerAutomaticallyLoadedPackage("color"); + registerAutomaticallyLoadedPackage("color"); } else if (space.empty() && argument == "document_fontcolor") - preamble.registerAutomaticallyLoadedPackage("color"); + registerAutomaticallyLoadedPackage("color"); // check the case that LyX's document_fontcolor is defined // but not used for \color else { @@ -1369,7 +1451,7 @@ void Preamble::parse(Parser & p, string const & forceclass, if (is_known(argument, known_basic_colors)) { h_backgroundcolor = rgbcolor2code(argument); } else if (argument == "page_backgroundcolor") - preamble.registerAutomaticallyLoadedPackage("color"); + registerAutomaticallyLoadedPackage("color"); // check the case that LyX's page_backgroundcolor is defined // but not used for \pagecolor else { @@ -1411,17 +1493,11 @@ void Preamble::parse(Parser & p, string const & forceclass, string const name = p.verbatim_item(); string const body1 = p.verbatim_item(); string const body2 = p.verbatim_item(); - // store the in_lyx_preamble setting - bool const was_in_lyx_preamble = in_lyx_preamble; - if (name == "subref" - || name == "thmref" - || name == "lemref") { - p.skip_spaces(); - preamble.registerAutomaticallyLoadedPackage("refstyle"); - in_lyx_preamble = true; - } // only non-lyxspecific stuff - if (!in_lyx_preamble) { + if (in_lyx_preamble && + (name == "subsecref" || name == "thmref" || name == "lemref")) + p.skip_spaces(); + else { ostringstream ss; ss << '\\' << t.cs(); ss << '{' << name << '}' @@ -1429,18 +1505,16 @@ void Preamble::parse(Parser & p, string const & forceclass, << '{' << body2 << '}'; h_preamble << ss.str(); } - // restore the in_lyx_preamble setting - in_lyx_preamble = was_in_lyx_preamble; } - + else if (t.cs() == "AtBeginDocument") { string const name = p.verbatim_item(); - // store the in_lyx_preamble setting - bool const was_in_lyx_preamble = in_lyx_preamble; - if (name == "\\providecommand\\partref[1]{\\ref{part:#1}}" + // 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\\subsecref[1]{\\ref{subsec:#1}}" || name == "\\providecommand\\parref[1]{\\ref{par:#1}}" || name == "\\providecommand\\figref[1]{\\ref{fig:#1}}" || name == "\\providecommand\\tabref[1]{\\ref{tab:#1}}" @@ -1451,20 +1525,14 @@ void Preamble::parse(Parser & p, string const & forceclass, || 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}}") { + || name == "\\providecommand\\propref[1]{\\ref{prop:#1}}")) p.skip_spaces(); - preamble.registerAutomaticallyLoadedPackage("refstyle"); - in_lyx_preamble = true; - } - // only non-lyxspecific stuff - if (!in_lyx_preamble) { + else { ostringstream ss; ss << '\\' << t.cs(); ss << '{' << name << '}'; h_preamble << ss.str(); } - // restore the in_lyx_preamble setting - in_lyx_preamble = was_in_lyx_preamble; } else if (t.cs() == "newcommand" || t.cs() == "newcommandx" @@ -1488,19 +1556,19 @@ void Preamble::parse(Parser & p, string const & forceclass, // font settings if (name == "\\rmdefault") if (is_known(body, known_roman_fonts)) { - h_font_roman = body; + h_font_roman[0] = body; p.skip_spaces(); in_lyx_preamble = true; } if (name == "\\sfdefault") if (is_known(body, known_sans_fonts)) { - h_font_sans = body; + h_font_sans[0] = body; p.skip_spaces(); in_lyx_preamble = true; } if (name == "\\ttdefault") if (is_known(body, known_typewriter_fonts)) { - h_font_typewriter = body; + h_font_typewriter[0] = body; p.skip_spaces(); in_lyx_preamble = true; } @@ -1511,16 +1579,13 @@ void Preamble::parse(Parser & p, string const & forceclass, p.skip_spaces(); 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 + // remove LyX-specific definitions that are re-added by LyX // if necessary - if (name == "\\lyxdot") { + // \lyxline is an ancient command that is converted by tex2lyx into + // a \rule therefore remove its preamble code + if (name == "\\lyxdot" || name == "\\lyxarrow" + || name == "\\lyxline" || name == "\\LyX") { p.skip_spaces(); in_lyx_preamble = true; } @@ -1547,22 +1612,6 @@ void Preamble::parse(Parser & p, string const & forceclass, 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::iterator it; vector opts = split_options(p.getArg('[', ']')); @@ -1627,16 +1676,18 @@ void Preamble::parse(Parser & p, string const & forceclass, vector::const_iterator end = vecnames.end(); for (; it != end; ++it) handle_package(p, trimSpaceAndEol(*it), options, - in_lyx_preamble); + in_lyx_preamble, detectEncoding); } else if (t.cs() == "inputencoding") { string const encoding = p.getArg('{','}'); Encoding const * const enc = encodings.fromLaTeXName( encoding, Encoding::inputenc, true); - if (!enc) - cerr << "Unknown encoding " << encoding << ". Ignoring." << std::endl; - else { + if (!enc) { + if (!detectEncoding) + cerr << "Unknown encoding " << encoding + << ". Ignoring." << std::endl; + } else { if (!enc->unsafe()) h_inputencoding = enc->name(); p.setEncoding(enc->iconvName()); @@ -1660,19 +1711,25 @@ void Preamble::parse(Parser & p, string const & forceclass, } else if (t.cs() == "newtheorem") { + bool star = false; + if (p.next_token().character() == '*') { + p.get_token(); + star = true; + } string const name = p.getArg('{', '}'); string const opt1 = p.getFullOpt(); string const opt2 = p.getFullOpt(); string const body = p.verbatim_item(); string const opt3 = p.getFullOpt(); + string const cmd = star ? "\\newtheorem*" : "\\newtheorem"; + + string const complete = cmd + "{" + name + '}' + + opt1 + opt2 + '{' + body + '}' + opt3; - add_known_theorem(name, opt1, !opt2.empty(), - from_utf8("\\newtheorem{" + name + '}' + - opt1 + opt2 + '{' + body + '}' + opt3)); + add_known_theorem(name, opt1, !opt2.empty(), from_utf8(complete)); if (!in_lyx_preamble) - h_preamble << "\\newtheorem{" << name << '}' - << opt1 << opt2 << '{' << '}' << opt3; + h_preamble << complete; } else if (t.cs() == "def") { @@ -1697,7 +1754,7 @@ void Preamble::parse(Parser & p, string const & forceclass, istringstream is(string(opts, 1)); is >> nargs; } - special_columns[name[0]] = nargs; + special_columns_[name[0]] = nargs; h_preamble << "\\newcolumntype{" << name << "}"; if (nargs) h_preamble << "[" << nargs << "]"; @@ -1732,7 +1789,7 @@ void Preamble::parse(Parser & p, string const & forceclass, else if (content == "\\bigskipamount") h_defskip = "bigskip"; else - h_defskip = content; + h_defskip = translate_len(content); } else h_preamble << "\\setlength{" << name << "}{" << content << "}"; } @@ -1919,6 +1976,16 @@ void Preamble::parse(Parser & p, string const & forceclass, } +string Preamble::parseEncoding(Parser & p, string const & forceclass) +{ + TeX2LyXDocClass dummy; + parse(p, forceclass, true, dummy); + if (h_inputencoding != "auto" && h_inputencoding != "default") + return h_inputencoding; + return ""; +} + + string babel2lyx(string const & language) { char const * const * where = is_known(language, known_languages);