X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLanguage.cpp;h=31212cba2894c1e624d45fb7ec9cbbd6eabe4553;hb=ba3ff646db52efc8faaa735107c5580eae82b29d;hp=8e5f86fa83afa4250c3a71528445be109a991818;hpb=dba4f28b6269c0ebd7a4e70a82ca10cf6c4a6ff8;p=lyx.git diff --git a/src/Language.cpp b/src/Language.cpp index 8e5f86fa83..31212cba28 100644 --- a/src/Language.cpp +++ b/src/Language.cpp @@ -22,6 +22,7 @@ #include "support/debug.h" #include "support/FileName.h" #include "support/filetools.h" +#include "support/lassert.h" #include "support/lstrings.h" #include "support/Messages.h" @@ -31,14 +32,24 @@ 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()) @@ -54,7 +65,9 @@ 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; } @@ -65,14 +78,18 @@ bool Language::readLanguage(Lexer & lex) 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 }; @@ -82,7 +99,9 @@ bool Language::readLanguage(Lexer & lex) { "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 }, @@ -90,6 +109,8 @@ bool Language::readLanguage(Lexer & lex) { "polyglossiaopts", LA_POLYGLOSSIAOPTS }, { "postbabelpreamble", LA_POSTBABELPREAMBLE }, { "prebabelpreamble", LA_PREBABELPREAMBLE }, + { "quotestyle", LA_QUOTESTYLE }, + { "requires", LA_REQUIRES }, { "rtl", LA_RTL } }; @@ -109,7 +130,7 @@ bool Language::readLanguage(Lexer & lex) error = true; continue; - default: + default: break; } switch (static_cast(le)) { @@ -128,12 +149,21 @@ 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 >> 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; @@ -145,11 +175,14 @@ 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_RTL: lex >> rightToLeft_; @@ -185,10 +218,6 @@ 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(); return true; } @@ -226,21 +255,24 @@ void Languages::read(FileName const & filename) l.read(lex); if (!lex) break; - if (l.lang() == "latex") - latex_lang = l; - else if (l.lang() == "ignore") - ignore_lang = l; - else + 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(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!"); } @@ -297,7 +329,7 @@ Match match(string const & code, Language const & lang) return NoMatch; } -} +} // namespace void Languages::readLayoutTranslations(support::FileName const & filename) @@ -320,22 +352,22 @@ void Languages::readLayoutTranslations(support::FileName const & filename) 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 @@ -344,7 +376,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,