X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLanguage.cpp;h=60b897c134c289f33225e1421dcef5e2e54d89d9;hb=a4d9315bc49445e4419b3b59fd238a13c5f7be31;hp=52c1c4fcfc2324e93a74c2af15bb0577cc2aee85;hpb=b8b5ed8b315590a220342119efc01e5d02edfb0c;p=lyx.git

diff --git a/src/Language.cpp b/src/Language.cpp
index 52c1c4fcfc..60b897c134 100644
--- a/src/Language.cpp
+++ b/src/Language.cpp
@@ -15,58 +15,64 @@
 
 #include "Language.h"
 
+#include "BufferParams.h"
 #include "Encoding.h"
 #include "LaTeXFonts.h"
-#include "Lexer.h"
 #include "LyXRC.h"
 
 #include "support/debug.h"
+#include "support/docstring.h"
 #include "support/FileName.h"
 #include "support/filetools.h"
 #include "support/lassert.h"
+#include "support/Lexer.h"
 #include "support/lstrings.h"
+#include "support/qstring_helpers.h"
 #include "support/Messages.h"
 
+#include <QLocale>
+#include <QString>
+
 using namespace std;
 using namespace lyx::support;
 
 namespace lyx {
 
 Languages languages;
-Language const * ignore_language = 0;
-Language const * default_language = 0;
-Language const * latex_language = 0;
-Language const * reset_language = 0;
+Language const * ignore_language = nullptr;
+Language const * default_language = nullptr;
+Language const * latex_language = nullptr;
+Language const * reset_language = nullptr;
 
 
 bool Language::isPolyglossiaExclusive() const
 {
-	return babel().empty() && !polyglossia().empty() && requires().empty();
+	return babel().empty() && !polyglossia().empty() && required().empty();
 }
 
 
 bool Language::isBabelExclusive() const
 {
-	return !babel().empty() && polyglossia().empty() && requires().empty();
+	return !babel().empty() && polyglossia().empty() && required().empty();
 }
 
 
-docstring const Language::translateLayout(string const & m) const
+docstring const Language::translateLayout(string const & msg) const
 {
-	if (m.empty())
+	if (msg.empty())
 		return docstring();
 
-	if (!isAscii(m)) {
-		lyxerr << "Warning: not translating `" << m
+	if (!isAscii(msg)) {
+		lyxerr << "Warning: not translating `" << msg
 		       << "' because it is not pure ASCII.\n";
-		return from_utf8(m);
+		return from_utf8(msg);
 	}
 
-	TranslationMap::const_iterator it = layoutTranslations_.find(m);
+	TranslationMap::const_iterator it = layoutTranslations_.find(msg);
 	if (it != layoutTranslations_.end())
 		return it->second;
 
-	docstring t = from_ascii(m);
+	docstring t = from_ascii(msg);
 	cleanTranslation(t);
 	return t;
 }
@@ -83,7 +89,7 @@ string Language::fontenc(BufferParams const & params) const
 	// 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();
+	vector<string> const & lfe = lf.fontencs();
 	for (auto & fe : fontenc_) {
 		// ASCII means: support all T* encodings plus OT1
 		if (fe == "ASCII") {
@@ -111,6 +117,16 @@ string Language::dateFormat(size_t i) const
 }
 
 
+docstring Language::decimalSeparator() const
+{
+	if (lyxrc.default_decimal_sep == "locale") {
+		QLocale loc = QLocale(toqstr(code()));
+		return qstring_to_ucs4(QString(loc.decimalPoint()));
+	}
+	return from_utf8(lyxrc.default_decimal_sep);
+}
+
+
 bool Language::readLanguage(Lexer & lex)
 {
 	enum LanguageTags {
@@ -126,17 +142,20 @@ bool Language::readLanguage(Lexer & lex)
 		LA_LANG_VARIETY,
 		LA_POLYGLOSSIANAME,
 		LA_POLYGLOSSIAOPTS,
+		LA_XINDYNAME,
 		LA_POSTBABELPREAMBLE,
 		LA_PREBABELPREAMBLE,
 		LA_PROVIDES,
 		LA_REQUIRES,
 		LA_QUOTESTYLE,
 		LA_RTL,
-		LA_WORDWRAP
+		LA_WORDWRAP,
+		LA_ACTIVECHARS
 	};
 
 	// Keep these sorted alphabetically!
 	LexerKeyword languageTags[] = {
+		{ "activechars",          LA_ACTIVECHARS },
 		{ "babelname",            LA_BABELNAME },
 		{ "dateformats",          LA_DATEFORMATS },
 		{ "encoding",             LA_ENCODING },
@@ -155,7 +174,8 @@ bool Language::readLanguage(Lexer & lex)
 		{ "quotestyle",           LA_QUOTESTYLE },
 		{ "requires",             LA_REQUIRES },
 		{ "rtl",                  LA_RTL },
-		{"wordwrap",              LA_WORDWRAP }
+		{ "wordwrap",             LA_WORDWRAP },
+		{ "xindyname",            LA_XINDYNAME }
 	};
 
 	bool error = false;
@@ -190,9 +210,15 @@ bool Language::readLanguage(Lexer & lex)
 		case LA_POLYGLOSSIAOPTS:
 			lex >> polyglossia_opts_;
 			break;
+		case LA_XINDYNAME:
+			lex >> xindy_;
+			break;
 		case LA_QUOTESTYLE:
 			lex >> quote_style_;
 			break;
+		case LA_ACTIVECHARS:
+			lex >> active_chars_;
+			break;
 		case LA_ENCODING:
 			lex >> encodingStr_;
 			break;
@@ -234,7 +260,7 @@ bool Language::readLanguage(Lexer & lex)
 				lex.getLongString(from_ascii("EndPreBabelPreamble"));
 			break;
 		case LA_REQUIRES:
-			lex >> requires_;
+			lex >> required_;
 			break;
 		case LA_PROVIDES:
 			lex >> provides_;
@@ -254,9 +280,9 @@ bool Language::readLanguage(Lexer & lex)
 
 bool Language::read(Lexer & lex)
 {
-	encoding_ = 0;
-	internal_enc_ = 0;
-	rightToLeft_ = 0;
+	encoding_ = nullptr;
+	internal_enc_ = false;
+	rightToLeft_ = false;
 
 	if (!lex.next()) {
 		lex.printError("No name given for language: `$$Token'.");
@@ -320,12 +346,12 @@ void Languages::read(FileName const & filename)
 			break;
 		if (l.lang() == "latex") {
 			// Check if latex language was not already defined.
-			LASSERT(latex_language == 0, continue);
+			LASSERT(latex_language == nullptr, continue);
 			static const Language latex_lang = l;
 			latex_language = &latex_lang;
 		} else if (l.lang() == "ignore") {
 			// Check if ignore language was not already defined.
-			LASSERT(ignore_language == 0, continue);
+			LASSERT(ignore_language == nullptr, continue);
 			static const Language ignore_lang = l;
 			ignore_language = &ignore_lang;
 		} else
@@ -367,6 +393,7 @@ bool readTranslations(Lexer & lex, Language::TranslationMap & trans)
 enum Match {
 	NoMatch,
 	ApproximateMatch,
+	VeryApproximateMatch,
 	ExactMatch
 };
 
@@ -389,6 +416,8 @@ Match match(string const & code, Language const & lang)
 	if ((code.size() == 2) && (langcode.size() > 2)
 		&& (code + '_' == langcode.substr(0, 3)))
 		return ApproximateMatch;
+	if (code.substr(0,2) == langcode.substr(0,2))
+		return VeryApproximateMatch;
 	return NoMatch;
 }
 
@@ -398,18 +427,42 @@ Match match(string const & code, Language const & lang)
 
 Language const * Languages::getFromCode(string const & code) const
 {
-	// Try for exact match first
+	// 1/ exact match with any known language
 	for (auto const & l : languagelist_) {
 		if (match(code, l.second) == ExactMatch)
 			return &l.second;
 	}
-	// If not found, look for lang prefix (without country) instead
+
+	// 2/ approximate with any known language
 	for (auto const & l : languagelist_) {
 		if (match(code, l.second) == ApproximateMatch)
 			return &l.second;
 	}
-	LYXERR0("Unknown language `" + code + "'");
-	return 0;
+	return nullptr;
+}
+
+
+Language const * Languages::getFromCode(string const & code,
+			set<Language const *> const & tryfirst) const
+{
+	// 1/ exact match with tryfirst list
+	for (auto const * lptr : tryfirst) {
+		if (match(code, *lptr) == ExactMatch)
+			return lptr;
+	}
+
+	// 2/ approximate match with tryfirst list
+	for (auto const * lptr : tryfirst) {
+		Match const m = match(code, *lptr);
+		if (m == ApproximateMatch || m == VeryApproximateMatch)
+			return lptr;
+	}
+
+	// 3/ stricter match in all languages
+	return getFromCode(code);
+
+	LYXERR0("Unknown language `" << code << "'");
+	return nullptr;
 }