architectural changes to tex2lyx

[lyx.git] / src / language.C

diff --git a/src/language.C b/src/language.C
index 7f7562fb7f9f9080bcaa6b3a61e67720acf56601..24cb2b6a1fa7d56ce019ef29d67c5304e5b886f0 100644 (file)
--- 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,15 +10,10 @@
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include "language.h"
 #include "gettext.h"
 #include "encoding.h"
 #include "lyxrc.h"
-#include "lyx_gui_misc.h"
 #include "lyxlex.h"
 #include "debug.h"
 
@@ -29,20 +24,16 @@ Language const * english_language;
 Language const * default_language;
 Language ignore_lang("ignore", "ignore", "Ignore", false, 0, "ignore", "");
 Language const * ignore_language = &ignore_lang;
-Language inherit_lang("inherit", "inherit", "Inherit", false, 0, "inherit", "");
-Language const * inherit_language = &inherit_lang;
-
-void Languages::setDefaults()
-{
-       languagelist["english"] = Language("english", "english", N_("English"),
-                                          false, 
-                                          encodings.getEncoding("iso8859-1"),
-                                          "en", "");
-       english_language = default_language = &languagelist["english"];
-}
+Language latex_lang("latex", "latex", "Latex", false, 0, "latex", "");
+Language const * latex_language = &latex_lang;
 
 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()) {
@@ -76,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);
        }
 
@@ -100,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