#include "support/filetools.h"
#include "support/lassert.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;
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 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_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[] = {
+ { "activechars", LA_ACTIVECHARS },
{ "babelname", LA_BABELNAME },
{ "dateformats", LA_DATEFORMATS },
{ "encoding", LA_ENCODING },
{ "provides", LA_PROVIDES },
{ "quotestyle", LA_QUOTESTYLE },
{ "requires", LA_REQUIRES },
- { "rtl", LA_RTL }
+ { "rtl", LA_RTL },
+ { "wordwrap", LA_WORDWRAP },
+ { "xindyname", LA_XINDYNAME }
};
bool error = false;
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;
lex.getLongString(from_ascii("EndPreBabelPreamble"));
break;
case LA_REQUIRES:
- lex >> requires_;
+ lex >> required_;
break;
case LA_PROVIDES:
lex >> provides_;
case LA_RTL:
lex >> rightToLeft_;
break;
+ case LA_WORDWRAP:
+ lex >> word_wrap_;
+ break;
}
}
lex.popTable();
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'.");
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;
}
}
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!");
}
enum Match {
NoMatch,
ApproximateMatch,
+ VeryApproximateMatch,
ExactMatch
};
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;
}
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<Language const *> 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;
}
lex.setContext("Languages::read");
// 1) read all translations (exact and approximate matches) into trans
- typedef std::map<string, Language::TranslationMap> TransMap;
- TransMap trans;
- LanguageList::iterator const lbeg = languagelist.begin();
- LanguageList::iterator const lend = languagelist.end();
+ std::map<string, Language::TranslationMap> trans;
while (lex.isOK()) {
if (!lex.checkFor("Translation")) {
if (lex.isOK())
// 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);
}
}
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;
}
projects / lyx.git / blobdiff