X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLanguage.cpp;h=12c79a04193fa8964c7c3b69b1d0a25eb348d3eb;hb=1b6ce0e827d58258e84ba2bf0754c6b273b123db;hp=9f8c57e6f4e659d656cf29220cb5d0bb20320616;hpb=ed1515ef69d0381e9b0657cf1966f9d86e0cb25f;p=lyx.git diff --git a/src/Language.cpp b/src/Language.cpp index 9f8c57e6f4..12c79a0419 100644 --- a/src/Language.cpp +++ b/src/Language.cpp @@ -16,6 +16,7 @@ #include "Language.h" #include "Encoding.h" +#include "LaTeXFonts.h" #include "Lexer.h" #include "LyXRC.h" @@ -38,6 +39,18 @@ 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()) @@ -59,23 +72,66 @@ docstring const Language::translateLayout(string const & m) const } +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); +} + + 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, LA_POLYGLOSSIANAME, LA_POLYGLOSSIAOPTS, LA_POSTBABELPREAMBLE, - LA_QUOTESTYLE, LA_PREBABELPREAMBLE, + LA_PROVIDES, LA_REQUIRES, + LA_QUOTESTYLE, LA_RTL }; @@ -83,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 }, @@ -93,6 +152,7 @@ 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 } @@ -114,7 +174,7 @@ bool Language::readLanguage(Lexer & lex) error = true; continue; - default: + default: break; } switch (static_cast(le)) { @@ -139,9 +199,26 @@ bool Language::readLanguage(Lexer & lex) 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; @@ -153,15 +230,18 @@ 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_; break; @@ -196,6 +276,13 @@ bool Language::read(Lexer & lex) encoding_ = encodings.fromLyXName("iso8859-1"); LYXERR0("Unknown encoding " << encodingStr_); } + 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; } @@ -247,23 +334,16 @@ void Languages::read(FileName const & filename) 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!"); } // Read layout translations - FileName path = libFileSearch(string(), "layouttranslations"); + FileName const path = libFileSearch(string(), "layouttranslations"); readLayoutTranslations(path); - - // Read installed translations - path = libFileSearch(string(), "installed_translations"); - readInstalledTranslations(path); } @@ -314,6 +394,26 @@ Match match(string const & code, Language const & lang) return NoMatch; } +} // namespace + + + +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; + } + // 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; + } + LYXERR0("Unknown language `" + code + "'"); + return 0; } @@ -337,13 +437,7 @@ void Languages::readLayoutTranslations(support::FileName const & filename) 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; @@ -372,32 +466,6 @@ void Languages::readLayoutTranslations(support::FileName const & filename) } -void Languages::readInstalledTranslations(support::FileName const & filename) -{ - Lexer lex; - lex.setFile(filename); - lex.setContext("Languages::read"); - - // 1) read all installed gmo files names - set installed_translations; - string lang_code; - while (lex.isOK()) { - lex >> lang_code; - installed_translations.insert(lang_code); - } - - // 2) mark all corresponding languages as translated. - LanguageList::iterator lit = languagelist.begin(); - LanguageList::iterator const lend = languagelist.end(); - for ( ; lit != lend ; ++lit) { - if (installed_translations.count(lit->second.code()) - || installed_translations.count(token(lit->second.code(), '_', 0))) - lit->second.translated(true); - } - -} - - Language const * Languages::getLanguage(string const & language) const { if (language == "reset")