New \cite_engine_type default.

[lyx.git] / src / Language.cpp

diff --git a/src/Language.cpp b/src/Language.cpp
index ddb63e3b28f2983e10bd3392c84e04d46878ab3c..e6f7f9ed6a940a261b6a604b9c54b210936527d7 100644 (file)
--- a/src/Language.cpp
+++ b/src/Language.cpp
@@ -38,6 +38,12 @@ Language const * latex_language = 0;
 Language const * reset_language = 0;
 
 
+bool Language::isPolyglossiaExclusive() const
+{
+       return babel().empty() && !polyglossia().empty() && requires().empty();
+}
+
+
 docstring const Language::translateLayout(string const & m) const
 {
        if (m.empty())
@@ -73,6 +79,7 @@ bool Language::readLanguage(Lexer & lex)
                LA_POLYGLOSSIANAME,
                LA_POLYGLOSSIAOPTS,
                LA_POSTBABELPREAMBLE,
+               LA_QUOTESTYLE,
                LA_PREBABELPREAMBLE,
                LA_REQUIRES,
                LA_RTL
@@ -92,6 +99,7 @@ bool Language::readLanguage(Lexer & lex)
                { "polyglossiaopts",      LA_POLYGLOSSIAOPTS },
                { "postbabelpreamble",    LA_POSTBABELPREAMBLE },
                { "prebabelpreamble",     LA_PREBABELPREAMBLE },
+               { "quotestyle",           LA_QUOTESTYLE },
                { "requires",             LA_REQUIRES },
                { "rtl",                  LA_RTL }
        };
@@ -131,6 +139,9 @@ bool Language::readLanguage(Lexer & lex)
                case LA_POLYGLOSSIAOPTS:
                        lex >> polyglossia_opts_;
                        break;
+               case LA_QUOTESTYLE:
+                       lex >> quote_style_;
+                       break;
                case LA_ENCODING:
                        lex >> encodingStr_;
                        break;
@@ -191,10 +202,6 @@ bool Language::read(Lexer & lex)
                encoding_ = encodings.fromLyXName("iso8859-1");
                LYXERR0("Unknown encoding " << encodingStr_);
        }
-       // cache translation status. Calling getMessages() directly in
-       // PrefLanguage::PrefLanguage() did only work if the gui language
-       // was set to auto (otherwise all languages would be marked as available).
-       translated_ = getMessages(code()).available();
        return true;
 }
 
@@ -246,13 +253,10 @@ void Languages::read(FileName const & filename)
                        languagelist[l.lang()] = l;
        }
 
-       default_language = getLanguage(lyxrc.default_language);
+       default_language = getLanguage("english");
        if (!default_language) {
-               LYXERR0("Default language \"" << lyxrc.default_language
-                      << "\" not found!");
-               default_language = getLanguage("english");
-               if (!default_language)
-                       default_language = &(*languagelist.begin()).second;
+               LYXERR0("Default language \"english\" not found!");
+               default_language = &(*languagelist.begin()).second;
                LYXERR0("Using \"" << default_language->lang() << "\" instead!");
        }