X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flanguage.C;h=7208e3564a23588db2a4a8721fd3b2c47294402a;hb=9dafe9b9a5cb12e19e0f3a1a9669d81dc140b0e3;hp=6d58ee29cc821980c80b6ae97cabc11b55f9fea3;hpb=eb09176297ee41f6969a9a0ccb70e295698042d9;p=lyx.git

diff --git a/src/language.C b/src/language.C
index 6d58ee29cc..7208e3564a 100644
--- a/src/language.C
+++ b/src/language.C
@@ -4,7 +4,7 @@
  *           LyX, The Document Processor
  *        
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2000 The LyX Team.
+ *           Copyright 1995-2001 The LyX Team.
  *
  * ====================================================== */
 
@@ -29,6 +29,12 @@ Language const * english_language;
 Language const * default_language;
 Language ignore_lang("ignore", "ignore", "Ignore", false, 0, "ignore", "");
 Language const * ignore_language = &ignore_lang;
+Language latex_lang("latex", "latex", "Latex", false, 0, "latex", "");
+Language const * latex_language = &latex_lang;
+#ifdef INHERIT_LANG
+Language inherit_lang("inherit", "inherit", "Inherit", false, 0, "inherit", "");
+Language const * inherit_language = &inherit_lang;
+#endif
 
 void Languages::setDefaults()
 {
@@ -43,28 +49,33 @@ void Languages::read(string const & filename)
 {
 	LyXLex lex(0, 0);
 	lex.setFile(filename);
-	while (lex.IsOK()) {
-		string lang, babel, display, encoding_str, code, latex_options;
+	while (lex.isOK()) {
+		string lang;
+		string babel;
+		string display;
+		string encoding_str;
+		string code;
+		string latex_options;
 		bool rtl = false;
 
 		if (lex.next())
-			lang = lex.GetString();
+			lang = lex.getString();
 		else
 			break;
 		lyxerr[Debug::INIT] << "Reading language " << lang << endl;
 
 		if (lex.next())
-			babel = lex.GetString();
+			babel = lex.getString();
 		if (lex.next())
-			display = lex.GetString();
+			display = lex.getString();
 		if (lex.next())
-			rtl = lex.GetBool();
+			rtl = lex.getBool();
 		if (lex.next())
-			encoding_str = lex.GetString();
+			encoding_str = lex.getString();
 		if (lex.next())
-			code = lex.GetString();
+			code = lex.getString();
 		if (lex.next())
-			latex_options = lex.GetString();
+			latex_options = lex.getString();
 
 		Encoding const * encoding = encodings.getEncoding(encoding_str);
 		if (!encoding) {
@@ -76,11 +87,6 @@ void Languages::read(string const & filename)
 					      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
@@ -100,7 +106,7 @@ Language const * Languages::getLanguage(string const & language) const
 {
        	const_iterator it = languagelist.find(language);
 	if (it != languagelist.end())
-		return &(*it).second;
+		return &it->second;
 	else
 		return 0;
 }