X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftex2lyx%2FPreamble.cpp;h=96df0a0f70cc1f540dfab76d7933acd9aa481b23;hb=0d6c64a4eb0a3b6f1e27ba7fd342bf5cff0314a8;hp=a52927f2a2b43812494dba4db4bad095682c0dc1;hpb=d5933fc5b54a0d8022ffc59e3423dd7db5326561;p=lyx.git diff --git a/src/tex2lyx/Preamble.cpp b/src/tex2lyx/Preamble.cpp index a52927f2a2..96df0a0f70 100644 --- a/src/tex2lyx/Preamble.cpp +++ b/src/tex2lyx/Preamble.cpp @@ -52,17 +52,17 @@ namespace { */ const char * const known_languages[] = {"acadian", "afrikaans", "albanian", "american", "arabic", "arabtex", "australian", "austrian", "bahasa", "bahasai", -"bahasam", "basque", "belarusian", "brazil", "brazilian", "breton", "british", +"bahasam", "basque", "belarusian", "bosnian", "brazil", "brazilian", "breton", "british", "bulgarian", "canadian", "canadien", "catalan", "croatian", "czech", "danish", "dutch", "english", "esperanto", "estonian", "farsi", "finnish", "francais", -"french", "frenchb", "frenchle", "frenchpro", "galician", "german", "germanb", +"french", "frenchb", "frenchle", "frenchpro", "friulan", "galician", "german", "germanb", "georgian", "greek", "hebrew", "hungarian", "icelandic", "indon", "indonesian", "interlingua", "irish", "italian", "japanese", "kazakh", "kurmanji", "latin", -"latvian", "lithuanian", "lowersorbian", "lsorbian", "magyar", "malay", "meyalu", +"latvian", "lithuanian", "lowersorbian", "lsorbian", "macedonian", "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", +"nynorsk", "piedmontese", "polutonikogreek", "polish", "portuges", "portuguese", +"romanian", "romansh", "russian", "russianb", "samin", "scottish", "serbian", "serbian-latin", +"slovak", "slovene", "spanish", "swedish", "swissgerman", "thai", "turkish", "turkmen", "ukraineb", "ukrainian", "uppersorbian", "UKenglish", "USenglish", "usorbian", "vietnam", "welsh", 0}; @@ -73,17 +73,17 @@ const char * const known_languages[] = {"acadian", "afrikaans", "albanian", */ const char * const known_coded_languages[] = {"french", "afrikaans", "albanian", "american", "arabic_arabi", "arabic_arabtex", "australian", "austrian", "bahasa", "bahasa", -"bahasam", "basque", "belarusian", "brazilian", "brazilian", "breton", "british", +"bahasam", "basque", "belarusian", "bosnian", "brazilian", "brazilian", "breton", "british", "bulgarian", "canadian", "canadien", "catalan", "croatian", "czech", "danish", "dutch", "english", "esperanto", "estonian", "farsi", "finnish", "french", -"french", "french", "french", "french", "galician", "german", "german", +"french", "french", "french", "french", "friulan", "galician", "german", "german", "georgian", "greek", "hebrew", "magyar", "icelandic", "bahasa", "bahasa", "interlingua", "irish", "italian", "japanese", "kazakh", "kurmanji", "latin", -"latvian", "lithuanian", "lowersorbian", "lowersorbian", "magyar", "bahasam", "bahasam", +"latvian", "lithuanian", "lowersorbian", "lowersorbian", "macedonian", "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", +"nynorsk", "piedmontese", "polutonikogreek", "polish", "portuguese", "portuguese", +"romanian", "romansh", "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}; @@ -99,18 +99,19 @@ const char * const known_english_quotes_languages[] = {"american", "australian", /// languages with french quotes (.lyx names) const char * const known_french_quotes_languages[] = {"albanian", -"arabic_arabi", "arabic_arabtex", "basque", "canadien", "catalan", "french", -"galician", "greek", "italian", "norsk", "nynorsk", "polutonikogreek", -"russian", "spanish", "spanish-mexico", "turkish", "turkmen", "ukrainian", -"vietnamese", 0}; +"arabic_arabi", "arabic_arabtex", "asturian", "basque", "canadien", "catalan", +"french", "friulan", "galician", "greek", "italian", "norsk", "nynorsk", +"piedmontese", "polutonikogreek", "russian", "spanish", "spanish-mexico", +"turkish", "turkmen", "ukrainian", "vietnamese", 0}; /// languages with german quotes (.lyx names) const char * const known_german_quotes_languages[] = {"austrian", "bulgarian", -"czech", "german", "georgian", "icelandic", "lithuanian", "lowersorbian", "naustrian", -"ngerman", "serbian", "serbian-latin", "slovak", "slovene", "uppersorbian", 0}; +"czech", "german", "georgian", "icelandic", "lithuanian", "lowersorbian", "macedonian", +"naustrian", "ngerman", "romansh", "serbian", "serbian-latin", "slovak", "slovene", +"uppersorbian", 0}; /// languages with polish quotes (.lyx names) -const char * const known_polish_quotes_languages[] = {"afrikaans", "croatian", +const char * const known_polish_quotes_languages[] = {"afrikaans", "bosnian", "croatian", "dutch", "estonian", "magyar", "polish", "romanian", 0}; /// languages with swedish quotes (.lyx names) @@ -296,36 +297,38 @@ string process_keyval_opt(vector & options, string name) * 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", -"nynorsk", "syriac", "arabic", "danish", "icelandic", "occitan", "tamil", -"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", "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}; +"albanian", "american", "amharic", "ancient", "arabic", "armenian", "asturian", "australian", +"bahasai", "bahasam", "basque", "bengali", "brazil", "brazilian", "breton", "british", "bulgarian", +"catalan", "coptic", "croatian", "czech", "danish", "divehi", "dutch", +"english", "esperanto", "estonian", "farsi", "finnish", "french", "friulan", +"galician", "greek", "monotonic", "hebrew", "hindi", +"icelandic", "interlingua", "irish", "italian", "kannada", "khmer", +"lao", "latin", "latvian", "lithuanian", "lsorbian", "magyar", "malayalam", "marathi", +"austrian", "newzealand", "german", "norsk", "nynorsk", "occitan", +"piedmontese", "polish", "polytonic", "portuges", "romanian", "romansh", "russian", +"samin", "sanskrit", "scottish", "serbian", "slovak", "slovenian", "spanish", "swedish", "syriac", +"tamil", "telugu", "thai", "tibetan", "turkish", "turkmen", +"ukrainian", "urdu", "usorbian", "vietnamese", "welsh", 0}; +// not yet supported by LyX: "korean", "nko" /** * the same as polyglossia_languages with .lyx names * please keep this in sync with polyglossia_languages line by line! */ const char * const Preamble::coded_polyglossia_languages[] = { -"albanian", "croatian", "hebrew", "norsk", "swedish", "amharic", "czech", "hindi", -"nynorsk", "syriac", "arabic_arabi", "danish", "icelandic", "occitan", "tamil", -"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", "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}; +"albanian", "american", "amharic", "ancientgreek", "arabic_arabi", "armenian", "asturian", "australian", +"bahasa", "bahasam", "basque", "bengali", "brazilian", "brazilian", "breton", "british", "bulgarian", +"catalan", "coptic", "croatian", "czech", "danish", "divehi", "dutch", +"english", "esperanto", "estonian", "farsi", "finnish", "french", "friulan", +"galician", "greek", "greek", "hebrew", "hindi", +"icelandic", "interlingua", "irish", "italian", "kannada", "khmer", +"lao", "latin", "latvian", "lithuanian", "lowersorbian", "magyar", "malayalam", "marathi", +"naustrian","newzealand", "ngerman", "norsk", "nynorsk", "occitan", +"piedmontese", "polish", "polutonikogreek", "portuges", "romanian", "romansh", "russian", +"samin", "sanskrit", "scottish", "serbian", "slovak", "slovene", "spanish", "swedish", "syriac", +"tamil", "telugu", "thai", "tibetan", "turkish", "turkmen", +"ukrainian", "urdu", "uppersorbian", "vietnamese", "welsh", 0}; +// not yet supported by LyX: "korean-polyglossia", "nko" bool Preamble::usePolyglossia() const @@ -530,7 +533,7 @@ Preamble::Preamble() : one_language(true), explicit_babel(false), h_pdf_pdfusetitle = "0"; //h_pdf_pagemode; //h_pdf_quoted_options; - h_quotes_language = "english"; + h_quotes_style = "english"; h_secnumdepth = "3"; h_shortcut[0] = "idx"; h_spacing = "single"; @@ -1076,22 +1079,22 @@ bool Preamble::writeLyXHeader(ostream & os, bool subdoc, string const & outfiled // (quotes for kazakh and interlingua are unknown) // danish if (is_known(h_language, known_danish_quotes_languages)) - h_quotes_language = "danish"; + h_quotes_style = "danish"; // french else if (is_known(h_language, known_french_quotes_languages)) - h_quotes_language = "french"; + h_quotes_style = "french"; // german else if (is_known(h_language, known_german_quotes_languages)) - h_quotes_language = "german"; + h_quotes_style = "german"; // polish else if (is_known(h_language, known_polish_quotes_languages)) - h_quotes_language = "polish"; + h_quotes_style = "polish"; // swedish else if (is_known(h_language, known_swedish_quotes_languages)) - h_quotes_language = "swedish"; + h_quotes_style = "swedish"; //english else if (is_known(h_language, known_english_quotes_languages)) - h_quotes_language = "english"; + h_quotes_style = "english"; if (contains(h_float_placement, "H")) registerAutomaticallyLoadedPackage("float"); @@ -1250,7 +1253,7 @@ bool Preamble::writeLyXHeader(ostream & os, bool subdoc, string const & outfiled os << "\\defskip " << h_defskip << "\n"; else os << "\\paragraph_indentation " << h_paragraph_indentation << "\n"; - os << "\\quotes_language " << h_quotes_language << "\n" + os << "\\quotes_style " << h_quotes_style << "\n" << "\\papercolumns " << h_papercolumns << "\n" << "\\papersides " << h_papersides << "\n" << "\\paperpagestyle " << h_paperpagestyle << "\n";