if (it != layoutTranslations_.end())
return it->second;
- return from_ascii(m);
+ docstring t = from_ascii(m);
+ cleanTranslation(t);
+ return t;
}
LA_POLYGLOSSIANAME,
LA_POLYGLOSSIAOPTS,
LA_POSTBABELPREAMBLE,
+ LA_QUOTESTYLE,
LA_PREBABELPREAMBLE,
+ LA_REQUIRES,
LA_RTL
};
{ "polyglossiaopts", LA_POLYGLOSSIAOPTS },
{ "postbabelpreamble", LA_POSTBABELPREAMBLE },
{ "prebabelpreamble", LA_PREBABELPREAMBLE },
+ { "quotestyle", LA_QUOTESTYLE },
+ { "requires", LA_REQUIRES },
{ "rtl", LA_RTL }
};
case LA_POLYGLOSSIAOPTS:
lex >> polyglossia_opts_;
break;
+ case LA_QUOTESTYLE:
+ lex >> quote_style_;
+ break;
case LA_ENCODING:
lex >> encodingStr_;
break;
babel_presettings_ =
lex.getLongString("EndPreBabelPreamble");
break;
+ case LA_REQUIRES:
+ lex >> requires_;
+ break;
case LA_RTL:
lex >> rightToLeft_;
break;
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,