X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftex2lyx%2FPreamble.cpp;h=96df0a0f70cc1f540dfab76d7933acd9aa481b23;hb=0d6c64a4eb0a3b6f1e27ba7fd342bf5cff0314a8;hp=7af0ad37a4c6327a746f3e3fd43e822123069cd9;hpb=fe542e79898005dff02e1bdc2fd7d48f5824bb09;p=lyx.git

diff --git a/src/tex2lyx/Preamble.cpp b/src/tex2lyx/Preamble.cpp
index 7af0ad37a4..96df0a0f70 100644
--- a/src/tex2lyx/Preamble.cpp
+++ b/src/tex2lyx/Preamble.cpp
@@ -99,10 +99,10 @@ 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", "friulan",
-"galician", "greek", "italian", "norsk", "nynorsk", "piedmontese", "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",
@@ -297,36 +297,38 @@ string process_keyval_opt(vector<string> & options, string name)
  * FIXME: support spelling=old for german variants (german vs. ngerman LyX names etc)
  */
 const char * const Preamble::polyglossia_languages[] = {
-"albanian", "american", "ancient", "arabic", "armenian",  "australian",
+"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", "galician", "greek", "monotonic",
-"hebrew", "hindi", "icelandic", "interlingua", "irish", "italian",
+"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",
-"polish", "polytonic", "portuges", "romanian", "russian",
-"samin", "sanskrit", "scottish", "serbian", "slovak", "slovenian", "spanish", "swedish",
+"piedmontese", "polish", "polytonic", "portuges", "romanian", "romansh", "russian",
+"samin", "sanskrit", "scottish", "serbian", "slovak", "slovenian", "spanish", "swedish", "syriac",
 "tamil", "telugu", "thai", "tibetan", "turkish", "turkmen",
-"ukrainian", "usorbian", "vietnamese", "welsh", 0};
-// not yet supported by LyX: "amharic", "asturian", "syriac", "urdu"
+"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", "american", "ancientgreek", "arabic_arabi", "armenian",  "australian",
+"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", "galician", "greek", "greek",
-"hebrew", "hindi", "icelandic", "interlingua", "irish", "italian",
+"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",
-"polish", "polutonikogreek", "portuges", "romanian", "russian",
-"samin", "sanskrit", "scottish", "serbian", "slovak", "slovene", "spanish", "swedish",
+"piedmontese", "polish", "polutonikogreek", "portuges", "romanian", "romansh", "russian",
+"samin", "sanskrit", "scottish", "serbian", "slovak", "slovene", "spanish", "swedish", "syriac",
 "tamil", "telugu", "thai", "tibetan", "turkish", "turkmen",
-"ukrainian", "uppersorbian", "vietnamese", "welsh", 0};
-// not yet supported by LyX: "amharic", "asturian", "syriac", "urdu"
+"ukrainian", "urdu", "uppersorbian", "vietnamese", "welsh", 0};
+// not yet supported by LyX: "korean-polyglossia", "nko"
 
 
 bool Preamble::usePolyglossia() const
@@ -531,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";
@@ -1077,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");
@@ -1251,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";