Add GraphicsTypes.h to libgraphics_la_SOURCES

[lyx.git] / src / language.C

diff --git a/src/language.C b/src/language.C
index 09e4c0e8079c8c4e21973a6c7a2db6692dde7805..7208e3564a23588db2a4a8721fd3b2c47294402a 100644 (file)
--- a/src/language.C
+++ b/src/language.C
@@ -29,8 +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()
 {
@@ -45,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) {