X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flanguage.C;h=24cb2b6a1fa7d56ce019ef29d67c5304e5b886f0;hb=c544107e324090c6eafb4c56749da2624b9b1122;hp=55c89e8ca7c8fbcf510cd687caccbdc4a883c7eb;hpb=eb6a0ad551e44d23f9bc3a346e3484b2f89720ef;p=lyx.git

diff --git a/src/language.C b/src/language.C
index 55c89e8ca7..24cb2b6a1f 100644
--- a/src/language.C
+++ b/src/language.C
@@ -1,8 +1,8 @@
 /* This file is part of
- * ====================================================== 
- * 
+ * ======================================================
+ *
  *           LyX, The Document Processor
- *        
+ *
  *           Copyright 1995 Matthias Ettrich
  *           Copyright 1995-2001 The LyX Team.
  *
@@ -10,10 +10,6 @@
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include "language.h"
 #include "gettext.h"
 #include "encoding.h"
@@ -30,22 +26,14 @@ 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()
-{
-	languagelist["english"] = Language("english", "english", N_("English"),
-					   false, 
-					   encodings.getEncoding("iso8859-1"),
-					   "en", "");
-	english_language = default_language = &languagelist["english"];
-}
 
 void Languages::read(string const & filename)
 {
+	// We need to set the encoding of latex_lang
+	latex_lang = Language("latex", "latex", "Latex", false,
+			      encodings.getEncoding("iso8859-1"),
+			      "latex", "");
+
 	LyXLex lex(0, 0);
 	lex.setFile(filename);
 	while (lex.isOK()) {
@@ -79,10 +67,10 @@ void Languages::read(string const & filename)
 		Encoding const * encoding = encodings.getEncoding(encoding_str);
 		if (!encoding) {
 			encoding = encodings.getEncoding("iso8859-1");
-			lyxerr << "Unknown encoding " << encoding_str << endl; 
+			lyxerr << "Unknown encoding " << encoding_str << endl;
 		}
 
-		languagelist[lang] = Language(lang, babel, display, rtl, 
+		languagelist[lang] = Language(lang, babel, display, rtl,
 					      encoding, code, latex_options);
 	}
 
@@ -103,7 +91,7 @@ void Languages::read(string const & filename)
 
 Language const * Languages::getLanguage(string const & language) const
 {
-       	const_iterator it = languagelist.find(language);
+	const_iterator it = languagelist.find(language);
 	if (it != languagelist.end())
 		return &it->second;
 	else