X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLanguage.cpp;h=809e04bcfb8ebe1ec153f8141cfd11560d713da3;hb=62af7ee772f16f154225d2d0b65d77f4376b6001;hp=d7bcbd3c58a85adc1c9fd027b6f173ed0309d3b0;hpb=803a88f243120a9e349b9b33a233ad52a00dafa5;p=lyx.git diff --git a/src/Language.cpp b/src/Language.cpp index d7bcbd3c58..809e04bcfb 100644 --- a/src/Language.cpp +++ b/src/Language.cpp @@ -25,8 +25,12 @@ #include "support/filetools.h" #include "support/lassert.h" #include "support/lstrings.h" +#include "support/qstring_helpers.h" #include "support/Messages.h" +#include +#include + using namespace std; using namespace lyx::support; @@ -41,13 +45,13 @@ Language const * reset_language = 0; 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(); } @@ -103,11 +107,29 @@ string Language::fontenc(BufferParams const & params) const } +string Language::dateFormat(size_t i) const +{ + if (i > dateformats_.size()) + return string(); + return dateformats_.at(i); +} + + +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 { - LA_AS_BABELOPTS = 1, - LA_BABELNAME, + LA_BABELNAME = 1, + LA_DATEFORMATS, LA_ENCODING, LA_END, LA_FONTENC, @@ -118,18 +140,22 @@ 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_RTL, + LA_WORDWRAP, + LA_ACTIVECHARS }; // Keep these sorted alphabetically! LexerKeyword languageTags[] = { - { "asbabeloptions", LA_AS_BABELOPTS }, + { "activechars", LA_ACTIVECHARS }, { "babelname", LA_BABELNAME }, + { "dateformats", LA_DATEFORMATS }, { "encoding", LA_ENCODING }, { "end", LA_END }, { "fontencoding", LA_FONTENC }, @@ -145,7 +171,9 @@ bool Language::readLanguage(Lexer & lex) { "provides", LA_PROVIDES }, { "quotestyle", LA_QUOTESTYLE }, { "requires", LA_REQUIRES }, - { "rtl", LA_RTL } + { "rtl", LA_RTL }, + { "wordwrap", LA_WORDWRAP }, + { "xindyname", LA_XINDYNAME } }; bool error = false; @@ -171,9 +199,6 @@ bool Language::readLanguage(Lexer & lex) case LA_END: // end of structure finished = true; break; - case LA_AS_BABELOPTS: - lex >> as_babel_options_; - break; case LA_BABELNAME: lex >> babel_; break; @@ -183,9 +208,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; @@ -196,6 +227,13 @@ bool Language::readLanguage(Lexer & lex) fontenc_.insert(fontenc_.end(), fe.begin(), fe.end()); break; } + case LA_DATEFORMATS: { + lex.eatLine(); + vector const df = + getVectorFromString(trim(lex.getString(true), "\""), "|"); + dateformats_.insert(dateformats_.end(), df.begin(), df.end()); + break; + } case LA_GUINAME: lex >> display_; break; @@ -228,6 +266,9 @@ bool Language::readLanguage(Lexer & lex) case LA_RTL: lex >> rightToLeft_; break; + case LA_WORDWRAP: + lex >> word_wrap_; + break; } } lex.popTable(); @@ -237,7 +278,6 @@ bool Language::readLanguage(Lexer & lex) bool Language::read(Lexer & lex) { - as_babel_options_ = 0; encoding_ = 0; internal_enc_ = 0; rightToLeft_ = 0; @@ -261,17 +301,21 @@ 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; } 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; } } @@ -309,13 +353,13 @@ void Languages::read(FileName const & filename) 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!"); } @@ -347,6 +391,7 @@ bool readTranslations(Lexer & lex, Language::TranslationMap & trans) enum Match { NoMatch, ApproximateMatch, + VeryApproximateMatch, ExactMatch }; @@ -369,6 +414,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; } @@ -378,19 +425,41 @@ 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 0; +} + + +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 + "'"); + + // 3/ stricter match in all languages + return getFromCode(code); + + LYXERR0("Unknown language `" << code << "'"); return 0; } @@ -402,10 +471,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()) @@ -429,15 +495,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); } } @@ -450,8 +513,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; }