Language const * reset_language = 0;
+bool Language::isPolyglossiaExclusive() const
+{
+ return babel().empty() && !polyglossia().empty() && requires().empty();
+}
+
+
+bool Language::isBabelExclusive() const
+{
+ return !babel().empty() && polyglossia().empty() && requires().empty();
+}
+
+
docstring const Language::translateLayout(string const & m) const
{
if (m.empty())
if (it != layoutTranslations_.end())
return it->second;
- return from_ascii(m);
+ docstring t = from_ascii(m);
+ cleanTranslation(t);
+ return t;
}
LA_BABELNAME,
LA_ENCODING,
LA_END,
+ LA_FONTENC,
LA_GUINAME,
+ LA_HAS_GUI_SUPPORT,
LA_INTERNAL_ENC,
LA_LANG_CODE,
LA_LANG_VARIETY,
LA_POLYGLOSSIANAME,
LA_POLYGLOSSIAOPTS,
LA_POSTBABELPREAMBLE,
+ LA_QUOTESTYLE,
LA_PREBABELPREAMBLE,
+ LA_REQUIRES,
LA_RTL
};
{ "babelname", LA_BABELNAME },
{ "encoding", LA_ENCODING },
{ "end", LA_END },
+ { "fontencoding", LA_FONTENC },
{ "guiname", LA_GUINAME },
+ { "hasguisupport", LA_HAS_GUI_SUPPORT },
{ "internalencoding", LA_INTERNAL_ENC },
{ "langcode", LA_LANG_CODE },
{ "langvariety", LA_LANG_VARIETY },
{ "polyglossiaopts", LA_POLYGLOSSIAOPTS },
{ "postbabelpreamble", LA_POSTBABELPREAMBLE },
{ "prebabelpreamble", LA_PREBABELPREAMBLE },
+ { "quotestyle", LA_QUOTESTYLE },
+ { "requires", LA_REQUIRES },
{ "rtl", LA_RTL }
};
error = true;
continue;
- default:
+ default:
break;
}
switch (static_cast<LanguageTags>(le)) {
case LA_POLYGLOSSIAOPTS:
lex >> polyglossia_opts_;
break;
+ case LA_QUOTESTYLE:
+ lex >> quote_style_;
+ break;
case LA_ENCODING:
lex >> encodingStr_;
break;
+ case LA_FONTENC:
+ lex >> fontenc_;
+ break;
case LA_GUINAME:
lex >> display_;
break;
+ case LA_HAS_GUI_SUPPORT:
+ lex >> has_gui_support_;
+ break;
case LA_INTERNAL_ENC:
lex >> internal_enc_;
break;
break;
case LA_POSTBABELPREAMBLE:
babel_postsettings_ =
- lex.getLongString("EndPostBabelPreamble");
+ lex.getLongString(from_ascii("EndPostBabelPreamble"));
break;
case LA_PREBABELPREAMBLE:
babel_presettings_ =
- lex.getLongString("EndPreBabelPreamble");
+ lex.getLongString(from_ascii("EndPreBabelPreamble"));
+ break;
+ case LA_REQUIRES:
+ lex >> requires_;
break;
case LA_RTL:
lex >> rightToLeft_;
encoding_ = encodings.fromLyXName("iso8859-1");
LYXERR0("Unknown encoding " << encodingStr_);
}
- // cache translation status. Calling getMessages() directly in
- // PrefLanguage::PrefLanguage() did only work if the gui language
- // was set to auto (otherwise all languages would be marked as available).
- translated_ = getMessages(code()).available();
return true;
}
languagelist[l.lang()] = l;
}
- default_language = getLanguage(lyxrc.default_language);
+ default_language = getLanguage("english");
if (!default_language) {
- LYXERR0("Default language \"" << lyxrc.default_language
- << "\" not found!");
- default_language = getLanguage("english");
- if (!default_language)
- default_language = &(*languagelist.begin()).second;
+ LYXERR0("Default language \"english\" not found!");
+ default_language = &(*languagelist.begin()).second;
LYXERR0("Using \"" << default_language->lang() << "\" instead!");
}
if (!lex.next(true))
break;
string const code = lex.getString();
- bool readit = false;
+ bool found = false;
for (LanguageList::iterator lit = lbeg; lit != lend; ++lit) {
if (match(code, lit->second) != NoMatch) {
- if (readTranslations(lex, trans[code]))
- readit = true;
- else
- lex.printError("Could not read layout "
- "translations for language "
- "`" + code + "'");
+ found = true;
break;
}
}
- if (!readit) {
+ if (!found) {
lex.printError("Unknown language `" + code + "'");
break;
}
+ if (!readTranslations(lex, trans[code])) {
+ lex.printError("Could not read layout translations for language `"
+ + code + "'");
+ break;
+ }
}
// 2) merge all translations into the languages
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 m = match(tit->first, lit->second);
+ Match const m = match(tit->first, lit->second);
if (m == NoMatch)
continue;
lit->second.readLayoutTranslations(tit->second,