When ignoring an update, request one for later

[lyx.git] / src / Language.cpp

diff --git a/src/Language.cpp b/src/Language.cpp
index dc38bfcf242fb8d50a208a0037a813339faf4ac5..31212cba2894c1e624d45fb7ec9cbbd6eabe4553 100644 (file)
--- a/src/Language.cpp
+++ b/src/Language.cpp
@@ -44,6 +44,12 @@ bool Language::isPolyglossiaExclusive() const
 }
 
 
+bool Language::isBabelExclusive() const
+{
+       return !babel().empty() && polyglossia().empty() && requires().empty();
+}
+
+
 docstring const Language::translateLayout(string const & m) const
 {
        if (m.empty())
@@ -169,11 +175,11 @@ bool Language::readLanguage(Lexer & lex)
                        break;
                case LA_POSTBABELPREAMBLE:
                        babel_postsettings_ =
-                               lex.getLongString("EndPostBabelPreamble");
+                               lex.getLongString(from_ascii("EndPostBabelPreamble"));
                        break;
                case LA_PREBABELPREAMBLE:
                        babel_presettings_ =
-                               lex.getLongString("EndPreBabelPreamble");
+                               lex.getLongString(from_ascii("EndPreBabelPreamble"));
                        break;
                case LA_REQUIRES:
                        lex >> requires_;
@@ -323,7 +329,7 @@ Match match(string const & code, Language const & lang)
        return NoMatch;
 }
 
-}
+} // namespace
 
 
 void Languages::readLayoutTranslations(support::FileName const & filename)