string Language::fontenc(BufferParams const & params) const
{
+ // Don't use LaTeX fonts, so just return the language's preferred
+ // (although this is not used with nonTeXFonts anyway).
+ if (params.useNonTeXFonts)
+ return fontenc_.front() == "ASCII" ? "T1" : fontenc_.front();
+
// Determine optimal font encoding
// 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();
for (auto & fe : fontenc_) {
- LaTeXFont const & lf = theLaTeXFonts().getLaTeXFont(from_ascii(params.fontsRoman()));
// ASCII means: support all T* encodings plus OT1
if (fe == "ASCII") {
- vector<string> const lfe = lf.fontencs();
for (auto & afe : lfe) {
if (afe == "OT1" || prefixIs(afe, "T"))
// we found a suitable one; return that.
}
+string Language::dateFormat(size_t i) const
+{
+ if (i > dateformats_.size())
+ return string();
+ return dateformats_.at(i);
+}
+
+
bool Language::readLanguage(Lexer & lex)
{
enum LanguageTags {
- LA_AS_BABELOPTS = 1,
- LA_BABELNAME,
+ LA_BABELNAME = 1,
+ LA_DATEFORMATS,
LA_ENCODING,
LA_END,
LA_FONTENC,
LA_PROVIDES,
LA_REQUIRES,
LA_QUOTESTYLE,
- LA_RTL
+ LA_RTL,
+ LA_WORDWRAP
};
// Keep these sorted alphabetically!
LexerKeyword languageTags[] = {
- { "asbabeloptions", LA_AS_BABELOPTS },
{ "babelname", LA_BABELNAME },
+ { "dateformats", LA_DATEFORMATS },
{ "encoding", LA_ENCODING },
{ "end", LA_END },
{ "fontencoding", LA_FONTENC },
{ "provides", LA_PROVIDES },
{ "quotestyle", LA_QUOTESTYLE },
{ "requires", LA_REQUIRES },
- { "rtl", LA_RTL }
+ { "rtl", LA_RTL },
+ {"wordwrap", LA_WORDWRAP }
};
bool error = false;
case LA_END: // end of structure
finished = true;
break;
- case LA_AS_BABELOPTS:
- lex >> as_babel_options_;
- break;
case LA_BABELNAME:
lex >> babel_;
break;
fontenc_.insert(fontenc_.end(), fe.begin(), fe.end());
break;
}
+ case LA_DATEFORMATS: {
+ lex.eatLine();
+ vector<string> const df =
+ getVectorFromString(trim(lex.getString(true), "\""), "|");
+ dateformats_.insert(dateformats_.end(), df.begin(), df.end());
+ break;
+ }
case LA_GUINAME:
lex >> display_;
break;
case LA_RTL:
lex >> rightToLeft_;
break;
+ case LA_WORDWRAP:
+ lex >> word_wrap_;
+ break;
}
}
lex.popTable();
bool Language::read(Lexer & lex)
{
- as_babel_options_ = 0;
encoding_ = 0;
internal_enc_ = 0;
rightToLeft_ = 0;
}
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;
}
}
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!");
}
} // namespace
+
+Language const * Languages::getFromCode(string const & code) const
+{
+ // Try for exact match first
+ for (auto const & l : languagelist_) {
+ if (match(code, l.second) == ExactMatch)
+ return &l.second;
+ }
+ // If not found, look for lang prefix (without country) instead
+ for (auto const & l : languagelist_) {
+ if (match(code, l.second) == ApproximateMatch)
+ return &l.second;
+ }
+ LYXERR0("Unknown language `" + code + "'");
+ return 0;
+}
+
+
void Languages::readLayoutTranslations(support::FileName const & filename)
{
Lexer lex;
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())
if (!lex.next(true))
break;
string const code = lex.getString();
- bool found = false;
- for (LanguageList::iterator lit = lbeg; lit != lend; ++lit) {
- if (match(code, lit->second) != NoMatch) {
- found = true;
- break;
- }
- }
+ bool found = getFromCode(code);
if (!found) {
lex.printError("Unknown language `" + code + "'");
break;
// 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