X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLanguage.cpp;h=12c79a04193fa8964c7c3b69b1d0a25eb348d3eb;hb=1b6ce0e827d58258e84ba2bf0754c6b273b123db;hp=8f984325d8448e4c252e2a0efde5f0e8f90ba79b;hpb=5bf72d6dca73410f99c270597f5faa8f7fd2c1e0;p=lyx.git diff --git a/src/Language.cpp b/src/Language.cpp index 8f984325d8..12c79a0419 100644 --- a/src/Language.cpp +++ b/src/Language.cpp @@ -16,30 +16,41 @@ #include "Language.h" #include "Encoding.h" +#include "LaTeXFonts.h" #include "Lexer.h" #include "LyXRC.h" #include "support/debug.h" #include "support/FileName.h" #include "support/filetools.h" +#include "support/lassert.h" #include "support/lstrings.h" #include "support/Messages.h" using namespace std; using namespace lyx::support; - namespace lyx { Languages languages; -Language ignore_lang; -Language latex_lang; -Language const * default_language; -Language const * ignore_language = &ignore_lang; -Language const * latex_language = &latex_lang; +Language const * ignore_language = 0; +Language const * default_language = 0; +Language const * latex_language = 0; 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()) @@ -55,7 +66,48 @@ docstring const Language::translateLayout(string const & m) const if (it != layoutTranslations_.end()) return it->second; - return from_ascii(m); + docstring t = from_ascii(m); + cleanTranslation(t); + return t; +} + + +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 const lfe = lf.fontencs(); + for (auto & fe : fontenc_) { + // ASCII means: support all T* encodings plus OT1 + if (fe == "ASCII") { + for (auto & afe : lfe) { + if (afe == "OT1" || prefixIs(afe, "T")) + // we found a suitable one; return that. + return afe; + } + } + // For other encodings, just check whether the font supports it + if (lf.hasFontenc(fe)) + return fe; + } + // We did not find a suitable one; just take the first in the list, + // the priorized one (which is "T1" for ASCII). + return fontenc_.front() == "ASCII" ? "T1" : fontenc_.front(); +} + + +string Language::dateFormat(size_t i) const +{ + if (i > dateformats_.size()) + return string(); + return dateformats_.at(i); } @@ -64,9 +116,12 @@ bool Language::readLanguage(Lexer & lex) enum LanguageTags { LA_AS_BABELOPTS = 1, LA_BABELNAME, + LA_DATEFORMATS, LA_ENCODING, LA_END, + LA_FONTENC, LA_GUINAME, + LA_HAS_GUI_SUPPORT, LA_INTERNAL_ENC, LA_LANG_CODE, LA_LANG_VARIETY, @@ -74,6 +129,9 @@ bool Language::readLanguage(Lexer & lex) LA_POLYGLOSSIAOPTS, LA_POSTBABELPREAMBLE, LA_PREBABELPREAMBLE, + LA_PROVIDES, + LA_REQUIRES, + LA_QUOTESTYLE, LA_RTL }; @@ -81,9 +139,12 @@ bool Language::readLanguage(Lexer & lex) LexerKeyword languageTags[] = { { "asbabeloptions", LA_AS_BABELOPTS }, { "babelname", LA_BABELNAME }, + { "dateformats", LA_DATEFORMATS }, { "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 }, @@ -91,6 +152,9 @@ bool Language::readLanguage(Lexer & lex) { "polyglossiaopts", LA_POLYGLOSSIAOPTS }, { "postbabelpreamble", LA_POSTBABELPREAMBLE }, { "prebabelpreamble", LA_PREBABELPREAMBLE }, + { "provides", LA_PROVIDES }, + { "quotestyle", LA_QUOTESTYLE }, + { "requires", LA_REQUIRES }, { "rtl", LA_RTL } }; @@ -110,7 +174,7 @@ bool Language::readLanguage(Lexer & lex) error = true; continue; - default: + default: break; } switch (static_cast(le)) { @@ -129,12 +193,32 @@ bool Language::readLanguage(Lexer & lex) case LA_POLYGLOSSIAOPTS: lex >> polyglossia_opts_; break; + case LA_QUOTESTYLE: + lex >> quote_style_; + break; case LA_ENCODING: lex >> encodingStr_; break; + case LA_FONTENC: { + lex.eatLine(); + vector const fe = + getVectorFromString(lex.getString(true), "|"); + 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; + case LA_HAS_GUI_SUPPORT: + lex >> has_gui_support_; + break; case LA_INTERNAL_ENC: lex >> internal_enc_; break; @@ -146,11 +230,17 @@ bool Language::readLanguage(Lexer & lex) 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_PROVIDES: + lex >> provides_; break; case LA_RTL: lex >> rightToLeft_; @@ -186,14 +276,77 @@ bool Language::read(Lexer & lex) 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(); + 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) { + if (replace + || layoutTranslations_.find(it->first) == layoutTranslations_.end()) + layoutTranslations_[it->first] = it->second; + } +} + + +void Languages::read(FileName const & filename) +{ + Lexer lex; + lex.setFile(filename); + lex.setContext("Languages::read"); + while (lex.isOK()) { + int le = lex.lex(); + switch (le) { + case Lexer::LEX_FEOF: + continue; + + default: + break; + } + if (lex.getString() != "Language") { + lex.printError("Unknown Language tag `$$Token'"); + continue; + } + Language l; + l.read(lex); + if (!lex) + break; + if (l.lang() == "latex") { + // Check if latex language was not already defined. + LASSERT(latex_language == 0, continue); + static const Language latex_lang = l; + latex_language = &latex_lang; + } else if (l.lang() == "ignore") { + // Check if ignore language was not already defined. + LASSERT(ignore_language == 0, continue); + static const Language ignore_lang = l; + ignore_language = &ignore_lang; + } else + languagelist[l.lang()] = l; + } + + default_language = getLanguage("english"); + if (!default_language) { + LYXERR0("Default language \"english\" not found!"); + default_language = &(*languagelist.begin()).second; + LYXERR0("Using \"" << default_language->lang() << "\" instead!"); + } + + // Read layout translations + FileName const path = libFileSearch(string(), "layouttranslations"); + readLayoutTranslations(path); +} + + namespace { bool readTranslations(Lexer & lex, Language::TranslationMap & trans) @@ -212,7 +365,13 @@ bool readTranslations(Lexer & lex, Language::TranslationMap & trans) return true; } -enum Match{NoMatch, ApproximateMatch, ExactMatch}; + +enum Match { + NoMatch, + ApproximateMatch, + ExactMatch +}; + Match match(string const & code, Language const & lang) { @@ -226,71 +385,35 @@ Match match(string const & code, Language const & lang) string const langcode = variety.empty() ? lang.code() : lang.code() + '_' + variety; string const name = lang.lang(); - if ((code == langcode && name != "chinese-traditional") || - (code == "zh_TW" && name == "chinese-traditional")) + if ((code == langcode && name != "chinese-traditional") + || (code == "zh_TW" && name == "chinese-traditional")) return ExactMatch; - if ((code.size() == 2 && langcode.size() > 2 && - code + '_' == langcode.substr(0, 3))) + if ((code.size() == 2) && (langcode.size() > 2) + && (code + '_' == langcode.substr(0, 3))) return ApproximateMatch; return NoMatch; } -} - +} // namespace -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) - if (replace || - layoutTranslations_.find(it->first) == layoutTranslations_.end()) - layoutTranslations_[it->first] = it->second; -} -void Languages::read(FileName const & filename) +Language const * Languages::getFromCode(string const & code) const { - Lexer lex; - lex.setFile(filename); - lex.setContext("Languages::read"); - while (lex.isOK()) { - int le = lex.lex(); - switch (le) { - case Lexer::LEX_FEOF: - continue; - - default: - break; - } - if (lex.getString() != "Language") { - lex.printError("Unknown Language tag `$$Token'"); - continue; - } - Language l; - l.read(lex); - if (!lex) - break; - if (l.lang() == "latex") - latex_lang = l; - else if (l.lang() == "ignore") - ignore_lang = l; - else - languagelist[l.lang()] = l; + 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; } - - default_language = getLanguage(lyxrc.default_language); - if (!default_language) { - LYXERR0("Default language \"" << lyxrc.default_language - << "\" not found!"); - default_language = getLanguage("english"); - if (!default_language) - default_language = &(*languagelist.begin()).second; - LYXERR0("Using \"" << default_language->lang() << "\" instead!"); + // 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; } - - // Read layout translations - FileName const path = libFileSearch(string(), "layouttranslations"); - readLayoutTranslations(path); + LYXERR0("Unknown language `" + code + "'"); + return 0; } @@ -314,22 +437,16 @@ void Languages::readLayoutTranslations(support::FileName const & filename) if (!lex.next(true)) break; string const code = lex.getString(); - bool readit = 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 + "'"); - break; - } - } - if (!readit) { + bool found = getFromCode(code); + 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 @@ -338,7 +455,7 @@ void Languages::readLayoutTranslations(support::FileName const & filename) 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,