X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLanguage.cpp;h=9801668846b998b1377535eff9f77cd01eb4f6ef;hb=d9c52c7a3f06ec892cd2e36d0d20998bc99b2fd8;hp=cbe425d3b9dcc6a3a092e03a5ef4c74652282c2b;hpb=8995a8387a03361b6a7ff44b447a90a6187b1a14;p=lyx.git

diff --git a/src/Language.cpp b/src/Language.cpp
index cbe425d3b9..9801668846 100644
--- 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())
@@ -66,14 +72,18 @@ 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,
 		LA_POLYGLOSSIANAME,
 		LA_POLYGLOSSIAOPTS,
 		LA_POSTBABELPREAMBLE,
+		LA_QUOTESTYLE,
 		LA_PREBABELPREAMBLE,
+		LA_REQUIRES,
 		LA_RTL
 	};
 
@@ -83,7 +93,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 },
@@ -91,6 +103,8 @@ bool Language::readLanguage(Lexer & lex)
 		{ "polyglossiaopts",      LA_POLYGLOSSIAOPTS },
 		{ "postbabelpreamble",    LA_POSTBABELPREAMBLE },
 		{ "prebabelpreamble",     LA_PREBABELPREAMBLE },
+		{ "quotestyle",           LA_QUOTESTYLE },
+		{ "requires",             LA_REQUIRES },
 		{ "rtl",                  LA_RTL }
 	};
 
@@ -110,7 +124,7 @@ bool Language::readLanguage(Lexer & lex)
 			error = true;
 			continue;
 
-		default: 
+		default:
 			break;
 		}
 		switch (static_cast<LanguageTags>(le)) {
@@ -129,12 +143,21 @@ 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;
+		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;
@@ -146,11 +169,14 @@ 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_;
 			break;
 		case LA_RTL:
 			lex >> rightToLeft_;
@@ -186,10 +212,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;
 }
 
@@ -241,13 +263,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!");
 	}