X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FLanguage.cpp;h=31212cba2894c1e624d45fb7ec9cbbd6eabe4553;hb=ba3ff646db52efc8faaa735107c5580eae82b29d;hp=34ab1f0caf538862d51d809fcfdfc0d0e0120f8e;hpb=9c55af4a223ce4db29d643251109e245665344bd;p=lyx.git

diff --git a/src/Language.cpp b/src/Language.cpp
index 34ab1f0caf..31212cba28 100644
--- 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())
@@ -72,7 +78,9 @@ bool Language::readLanguage(Lexer & lex)
 		LA_BABELNAME,
 		LA_ENCODING,
 		LA_END,
+		LA_FONTENC,
 		LA_GUINAME,
+		LA_HAS_GUI_SUPPORT,
 		LA_INTERNAL_ENC,
 		LA_LANG_CODE,
 		LA_LANG_VARIETY,
@@ -91,7 +99,9 @@ bool Language::readLanguage(Lexer & lex)
 		{ "babelname",            LA_BABELNAME },
 		{ "encoding",             LA_ENCODING },
 		{ "end",                  LA_END },
+		{ "fontencoding",         LA_FONTENC },
 		{ "guiname",              LA_GUINAME },
+		{ "hasguisupport",        LA_HAS_GUI_SUPPORT },
 		{ "internalencoding",     LA_INTERNAL_ENC },
 		{ "langcode",             LA_LANG_CODE },
 		{ "langvariety",          LA_LANG_VARIETY },
@@ -145,9 +155,15 @@ bool Language::readLanguage(Lexer & lex)
 		case LA_ENCODING:
 			lex >> encodingStr_;
 			break;
+		case LA_FONTENC:
+			lex >> fontenc_;
+			break;
 		case LA_GUINAME:
 			lex >> display_;
 			break;
+		case LA_HAS_GUI_SUPPORT:
+			lex >> has_gui_support_;
+			break;
 		case LA_INTERNAL_ENC:
 			lex >> internal_enc_;
 			break;
@@ -159,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_;
@@ -313,7 +329,7 @@ Match match(string const & code, Language const & lang)
 	return NoMatch;
 }
 
-}
+} // namespace
 
 
 void Languages::readLayoutTranslations(support::FileName const & filename)