X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLanguage.cpp;h=12c79a04193fa8964c7c3b69b1d0a25eb348d3eb;hb=1b6ce0e827d58258e84ba2bf0754c6b273b123db;hp=d6a8fa3623da82a21865571a7897d2d12c7aec95;hpb=f63de41c4c2180705b44c3444718d7f35df89b8a;p=lyx.git

diff --git a/src/Language.cpp b/src/Language.cpp
index d6a8fa3623..12c79a0419 100644
--- a/src/Language.cpp
+++ b/src/Language.cpp
@@ -74,13 +74,19 @@ docstring const Language::translateLayout(string const & m) const
 
 string Language::fontenc(BufferParams const & params) const
 {
+	// Don't use LaTeX fonts, so just return the language's preferred
+	// (although this is not used with nonTeXFonts anyway).
+	if (params.useNonTeXFonts)
+		return fontenc_.front() == "ASCII" ? "T1" : fontenc_.front();
+
 	// Determine optimal font encoding
 	// We check whether the used rm font supports an encoding our language supports
+	LaTeXFont const & lf =
+		theLaTeXFonts().getLaTeXFont(from_ascii(params.fontsRoman()));
+	vector<string> const lfe = lf.fontencs();
 	for (auto & fe : fontenc_) {
-		LaTeXFont const & lf = theLaTeXFonts().getLaTeXFont(from_ascii(params.fontsRoman()));
 		// ASCII means: support all T* encodings plus OT1
 		if (fe == "ASCII") {
-			vector<string> const lfe = lf.fontencs();
 			for (auto & afe : lfe) {
 				if (afe == "OT1" || prefixIs(afe, "T"))
 					// we found a suitable one; return that.
@@ -97,11 +103,20 @@ string Language::fontenc(BufferParams const & params) const
 }
 
 
+string Language::dateFormat(size_t i) const
+{
+	if (i > dateformats_.size())
+		return string();
+	return dateformats_.at(i);
+}
+
+
 bool Language::readLanguage(Lexer & lex)
 {
 	enum LanguageTags {
 		LA_AS_BABELOPTS = 1,
 		LA_BABELNAME,
+		LA_DATEFORMATS,
 		LA_ENCODING,
 		LA_END,
 		LA_FONTENC,
@@ -124,6 +139,7 @@ bool Language::readLanguage(Lexer & lex)
 	LexerKeyword languageTags[] = {
 		{ "asbabeloptions",       LA_AS_BABELOPTS },
 		{ "babelname",            LA_BABELNAME },
+		{ "dateformats",          LA_DATEFORMATS },
 		{ "encoding",             LA_ENCODING },
 		{ "end",                  LA_END },
 		{ "fontencoding",         LA_FONTENC },
@@ -190,6 +206,13 @@ bool Language::readLanguage(Lexer & lex)
 			fontenc_.insert(fontenc_.end(), fe.begin(), fe.end());
 			break;
 		}
+		case LA_DATEFORMATS: {
+			lex.eatLine();
+			vector<string> const df =
+				getVectorFromString(trim(lex.getString(true), "\""), "|");
+			dateformats_.insert(dateformats_.end(), df.begin(), df.end());
+			break;
+		}
 		case LA_GUINAME:
 			lex >> display_;
 			break;
@@ -255,6 +278,11 @@ bool Language::read(Lexer & lex)
 	}
 	if (fontenc_.empty())
 		fontenc_.push_back("ASCII");
+	if (dateformats_.empty()) {
+		dateformats_.push_back("MMMM dd, yyyy");
+		dateformats_.push_back("MMM dd, yyyy");
+		dateformats_.push_back("M/d/yyyy");
+	}
 	return true;
 }
 
@@ -369,6 +397,26 @@ Match match(string const & code, Language const & lang)
 } // namespace
 
 
+
+Language const * Languages::getFromCode(string const & code) const
+{
+	LanguageList::const_iterator const lbeg = languagelist.begin();
+	LanguageList::const_iterator const lend = languagelist.end();
+	// Try for exact match first
+	for (LanguageList::const_iterator lit = lbeg; lit != lend; ++lit) {
+		if (match(code, lit->second) == ExactMatch)
+			return &lit->second;
+	}
+	// If not found, look for lang prefix (without country) instead
+	for (LanguageList::const_iterator lit = lbeg; lit != lend; ++lit) {
+		if (match(code, lit->second) == ApproximateMatch)
+			return &lit->second;
+	}
+	LYXERR0("Unknown language `" + code + "'");
+	return 0;
+}
+
+
 void Languages::readLayoutTranslations(support::FileName const & filename)
 {
 	Lexer lex;
@@ -389,13 +437,7 @@ void Languages::readLayoutTranslations(support::FileName const & filename)
 		if (!lex.next(true))
 			break;
 		string const code = lex.getString();
-		bool found = false;
-		for (LanguageList::iterator lit = lbeg; lit != lend; ++lit) {
-			if (match(code, lit->second) != NoMatch) {
-				found = true;
-				break;
-			}
-		}
+		bool found = getFromCode(code);
 		if (!found) {
 			lex.printError("Unknown language `" + code + "'");
 			break;