X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flanguage.C;h=bc45d9e3119e0991948b45a44c699844d07f8d64;hb=74784ee97b67490c7bb82128bff76f0e8f94a139;hp=909768ba079a3e840dee4664c84a72931134a140;hpb=bd659b25fb6e2df5d02273ee1ce4699aa5723e2e;p=lyx.git

diff --git a/src/language.C b/src/language.C
index 909768ba07..bc45d9e311 100644
--- a/src/language.C
+++ b/src/language.C
@@ -25,8 +25,9 @@
 using std::endl;
 
 Languages languages;
+Language const * english_language;
 Language const * default_language;
-Language ignore_lang("ignore", "ignore", "Ignore", false, 0, "ignore");
+Language ignore_lang("ignore", "ignore", "Ignore", false, 0, "ignore", "");
 Language const * ignore_language = &ignore_lang;
 
 void Languages::setDefaults()
@@ -34,8 +35,8 @@ void Languages::setDefaults()
 	languagelist["english"] = Language("english", "english", N_("English"),
 					   false, 
 					   encodings.getEncoding("iso8859-1"),
-					   "en");
-	default_language = &languagelist["english"];
+					   "en", "");
+	english_language = default_language = &languagelist["english"];
 }
 
 void Languages::read(string const & filename)
@@ -43,7 +44,7 @@ void Languages::read(string const & filename)
 	LyXLex lex(0, 0);
 	lex.setFile(filename);
 	while (lex.IsOK()) {
-		string lang, babel, display, encoding_str, code;
+		string lang, babel, display, encoding_str, code, latex_options;
 		bool rtl = false;
 
 		if (lex.next())
@@ -62,6 +63,8 @@ void Languages::read(string const & filename)
 			encoding_str = lex.GetString();
 		if (lex.next())
 			code = lex.GetString();
+		if (lex.next())
+			latex_options = lex.GetString();
 
 		Encoding const * encoding = encodings.getEncoding(encoding_str);
 		if (!encoding) {
@@ -69,14 +72,10 @@ void Languages::read(string const & filename)
 			lyxerr << "Unknown encoding " << encoding_str << endl; 
 		}
 
-		languagelist[lang] = Language(lang, babel, display, rtl, encoding, code);
+		languagelist[lang] = Language(lang, babel, display, rtl, 
+					      encoding, code, latex_options);
 	}
 
-#ifdef DO_USE_DEFAULT_LANGUAGE
-	languagelist["default"] = Language("default", "default",
-					   N_("Document wide language"),
-					   false, &iso8859_1, "");
-#endif
 	default_language = getLanguage(lyxrc.default_language);
 	if (!default_language) {
 		lyxerr << "Default language \"" << lyxrc.default_language
@@ -87,6 +86,9 @@ void Languages::read(string const & filename)
 		lyxerr << "Using \"" << default_language->lang()
 		       << "\" instead!" << endl;
 	}
+	english_language = getLanguage("english");
+	if (!english_language)
+		english_language = default_language;
 }
 
 Language const * Languages::getLanguage(string const & language) const