X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLanguage.cpp;h=60b897c134c289f33225e1421dcef5e2e54d89d9;hb=a4d9315bc49445e4419b3b59fd238a13c5f7be31;hp=c96928adc06db12a25695279f4a5aab729049aa4;hpb=bf88ad495cead6e97a05fee59e41414648145fc1;p=lyx.git diff --git a/src/Language.cpp b/src/Language.cpp index c96928adc0..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 +#include + 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 const lfe = lf.fontencs(); + vector 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'."); @@ -288,11 +314,10 @@ bool Language::read(Lexer & lex) void Language::readLayoutTranslations(Language::TranslationMap const & trans, bool replace) { - TranslationMap::const_iterator const end = trans.end(); - for (TranslationMap::const_iterator it = trans.begin(); it != end; ++it) { + for (auto const & t : trans) { if (replace - || layoutTranslations_.find(it->first) == layoutTranslations_.end()) - layoutTranslations_[it->first] = it->second; + || layoutTranslations_.find(t.first) == layoutTranslations_.end()) + layoutTranslations_[t.first] = t.second; } } @@ -321,22 +346,22 @@ 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 - languagelist[l.lang()] = l; + languagelist_[l.lang()] = l; } default_language = getLanguage("english"); if (!default_language) { LYXERR0("Default language \"english\" not found!"); - default_language = &(*languagelist.begin()).second; + default_language = &(*languagelist_.begin()).second; LYXERR0("Using \"" << default_language->lang() << "\" instead!"); } @@ -368,6 +393,7 @@ bool readTranslations(Lexer & lex, Language::TranslationMap & trans) enum Match { NoMatch, ApproximateMatch, + VeryApproximateMatch, ExactMatch }; @@ -390,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; } @@ -399,20 +427,42 @@ Match match(string const & code, Language const & lang) 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; + // 1/ exact match with any known language + for (auto const & l : languagelist_) { + if (match(code, l.second) == ExactMatch) + return &l.second; + } + + // 2/ approximate with any known language + for (auto const & l : languagelist_) { + if (match(code, l.second) == ApproximateMatch) + return &l.second; + } + return nullptr; +} + + +Language const * Languages::getFromCode(string const & code, + set const & tryfirst) const +{ + // 1/ exact match with tryfirst list + for (auto const * lptr : tryfirst) { + if (match(code, *lptr) == ExactMatch) + return lptr; } - // 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; + + // 2/ approximate match with tryfirst list + for (auto const * lptr : tryfirst) { + Match const m = match(code, *lptr); + if (m == ApproximateMatch || m == VeryApproximateMatch) + return lptr; } - LYXERR0("Unknown language `" + code + "'"); - return 0; + + // 3/ stricter match in all languages + return getFromCode(code); + + LYXERR0("Unknown language `" << code << "'"); + return nullptr; } @@ -423,10 +473,7 @@ void Languages::readLayoutTranslations(support::FileName const & filename) lex.setContext("Languages::read"); // 1) read all translations (exact and approximate matches) into trans - typedef std::map TransMap; - TransMap trans; - LanguageList::iterator const lbeg = languagelist.begin(); - LanguageList::iterator const lend = languagelist.end(); + std::map trans; while (lex.isOK()) { if (!lex.checkFor("Translation")) { if (lex.isOK()) @@ -450,15 +497,12 @@ void Languages::readLayoutTranslations(support::FileName const & filename) // 2) merge all translations into the languages // exact translations overwrite approximate ones - TransMap::const_iterator const tbeg = trans.begin(); - 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 const m = match(tit->first, lit->second); + for (auto & tr : trans) { + for (auto & lang : languagelist_) { + Match const m = match(tr.first, lang.second); if (m == NoMatch) continue; - lit->second.readLayoutTranslations(tit->second, - m == ExactMatch); + lang.second.readLayoutTranslations(tr.second, m == ExactMatch); } } @@ -471,8 +515,8 @@ Language const * Languages::getLanguage(string const & language) const return reset_language; if (language == "ignore") return ignore_language; - const_iterator it = languagelist.find(language); - return it == languagelist.end() ? reset_language : &it->second; + const_iterator it = languagelist_.find(language); + return it == languagelist_.end() ? reset_language : &it->second; }