X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLanguage.cpp;h=34ab1f0caf538862d51d809fcfdfc0d0e0120f8e;hb=dae8555234f0e5c8358b91c307d91b219c664617;hp=85fb383993addf03dbe6bb5301b62f032ca10820;hpb=fcb2cce53f566f8e349ded600ceedd40482e453c;p=lyx.git

diff --git a/src/Language.cpp b/src/Language.cpp
index 85fb383993..34ab1f0caf 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())
@@ -53,7 +59,9 @@ docstring const Language::translateLayout(string const & m) const
 	if (it != layoutTranslations_.end())
 		return it->second;
 
-	return from_ascii(m);
+	docstring t = from_ascii(m);
+	cleanTranslation(t);
+	return t;
 }
 
 
@@ -71,7 +79,9 @@ bool Language::readLanguage(Lexer & lex)
 		LA_POLYGLOSSIANAME,
 		LA_POLYGLOSSIAOPTS,
 		LA_POSTBABELPREAMBLE,
+		LA_QUOTESTYLE,
 		LA_PREBABELPREAMBLE,
+		LA_REQUIRES,
 		LA_RTL
 	};
 
@@ -89,6 +99,8 @@ bool Language::readLanguage(Lexer & lex)
 		{ "polyglossiaopts",      LA_POLYGLOSSIAOPTS },
 		{ "postbabelpreamble",    LA_POSTBABELPREAMBLE },
 		{ "prebabelpreamble",     LA_PREBABELPREAMBLE },
+		{ "quotestyle",           LA_QUOTESTYLE },
+		{ "requires",             LA_REQUIRES },
 		{ "rtl",                  LA_RTL }
 	};
 
@@ -108,7 +120,7 @@ bool Language::readLanguage(Lexer & lex)
 			error = true;
 			continue;
 
-		default: 
+		default:
 			break;
 		}
 		switch (static_cast<LanguageTags>(le)) {
@@ -127,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;
@@ -150,6 +165,9 @@ bool Language::readLanguage(Lexer & lex)
 			babel_presettings_ =
 				lex.getLongString("EndPreBabelPreamble");
 			break;
+		case LA_REQUIRES:
+			lex >> requires_;
+			break;
 		case LA_RTL:
 			lex >> rightToLeft_;
 			break;
@@ -184,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;
 }
 
@@ -239,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!");
 	}
 
@@ -325,22 +336,22 @@ void Languages::readLayoutTranslations(support::FileName const & filename)
 		if (!lex.next(true))
 			break;
 		string const code = lex.getString();
-		bool readit = false;
+		bool found = false;
 		for (LanguageList::iterator lit = lbeg; lit != lend; ++lit) {
 			if (match(code, lit->second) != NoMatch) {
-				if (readTranslations(lex, trans[code]))
-					readit = true;
-				else
-					lex.printError("Could not read layout "
-					               "translations for language "
-					               "`" + code + "'");
+				found = true;
 				break;
 			}
 		}
-		if (!readit) {
+		if (!found) {
 			lex.printError("Unknown language `" + code + "'");
 			break;
 		}
+		if (!readTranslations(lex, trans[code])) {
+			lex.printError("Could not read layout translations for language `"
+				+ code + "'");
+			break;
+		}
 	}
 
 	// 2) merge all translations into the languages
@@ -349,7 +360,7 @@ void Languages::readLayoutTranslations(support::FileName const & filename)
 	TransMap::const_iterator const tend = trans.end();
 	for (TransMap::const_iterator tit = tbeg; tit != tend; ++tit) {
 		for (LanguageList::iterator lit = lbeg; lit != lend; ++lit) {
-			Match m = match(tit->first, lit->second);
+			Match const m = match(tit->first, lit->second);
 			if (m == NoMatch)
 				continue;
 			lit->second.readLayoutTranslations(tit->second,