]> git.lyx.org Git - lyx.git/blobdiff - src/Language.cpp
Update fr.po
[lyx.git] / src / Language.cpp
index 33b7303df19587a5c912948d2b34f5435cb7be5f..31212cba2894c1e624d45fb7ec9cbbd6eabe4553 100644 (file)
 #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 +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;
 }
 
 
@@ -66,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
        };
 
@@ -83,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 },
@@ -91,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 }
        };
 
@@ -110,7 +130,7 @@ bool Language::readLanguage(Lexer & lex)
                        error = true;
                        continue;
 
-               default: 
+               default:
                        break;
                }
                switch (static_cast<LanguageTags>(le)) {
@@ -129,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;
@@ -146,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_;
@@ -186,35 +218,18 @@ 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;
 }
 
 
-bool Language::readLayoutTranslations(Lexer & lex)
+void Language::readLayoutTranslations(Language::TranslationMap const & trans, bool replace)
 {
-       layoutTranslations_.clear();
-       while (lex.isOK()) {
-               if (lex.checkFor("End"))
-                       break;
-               if (!lex.next(true))
-                       return false;
-               string const key = lex.getString();
-               if (!lex.next(true))
-                       return false;
-               docstring const val = lex.getDocString();
-               layoutTranslations_[key] = val;
+       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;
        }
-       return true;
-}
-
-
-void Language::readLayoutTranslations(Language const & lang)
-{
-       layoutTranslations_ = lang.layoutTranslations_;
 }
 
 
@@ -240,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!");
        }
 
@@ -264,11 +282,67 @@ void Languages::read(FileName const & filename)
 }
 
 
+namespace {
+
+bool readTranslations(Lexer & lex, Language::TranslationMap & trans)
+{
+       while (lex.isOK()) {
+               if (lex.checkFor("End"))
+                       break;
+               if (!lex.next(true))
+                       return false;
+               string const key = lex.getString();
+               if (!lex.next(true))
+                       return false;
+               docstring const val = lex.getDocString();
+               trans[key] = val;
+       }
+       return true;
+}
+
+
+enum Match {
+       NoMatch,
+       ApproximateMatch,
+       ExactMatch
+};
+
+
+Match match(string const & code, Language const & lang)
+{
+       // we need to mimic gettext: code can be a two-letter code, which
+       // should match all variants, e.g. "de" should match "de_DE",
+       // "de_AT" etc.
+       // special case for chinese:
+       // simplified  => code == "zh_CN", langcode == "zh_CN"
+       // traditional => code == "zh_TW", langcode == "zh_CN"
+       string const variety = lang.variety();
+       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"))
+               return ExactMatch;
+       if ((code.size() == 2) && (langcode.size() > 2)
+               && (code + '_' == langcode.substr(0, 3)))
+               return ApproximateMatch;
+       return NoMatch;
+}
+
+} // namespace
+
+
 void Languages::readLayoutTranslations(support::FileName const & filename)
 {
        Lexer lex;
        lex.setFile(filename);
        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();
        while (lex.isOK()) {
                if (!lex.checkFor("Translation")) {
                        if (lex.isOK())
@@ -278,40 +352,38 @@ void Languages::readLayoutTranslations(support::FileName const & filename)
                if (!lex.next(true))
                        break;
                string const code = lex.getString();
-               // we need to mimic gettext: code can be a two-letter code,
-               // which should match all variants, e.g. "de" should match
-               // "de_DE", "de_AT" etc.
-               Language * firstlang = 0;
-               LanguageList::iterator const end = languagelist.end();
-               for (LanguageList::iterator it = languagelist.begin(); it != end; ++it) {
-                       // special case for chinese:
-                       // simplified  => code == "zh_CN", langcode == "zh_CN"
-                       // traditional => code == "zh_TW", langcode == "zh_CN"
-                       string const langcode = it->second.code();
-                       string const name = it->second.lang();
-                       if ((code == langcode && name != "chinese-traditional") ||
-                           (code == "zh_TW" && name == "chinese-traditional") ||
-                           (code.size() == 2 && langcode.size() > 2 &&
-                            code + '_' == langcode.substr(0, 3))) {
-                               if (firstlang)
-                                       it->second.readLayoutTranslations(*firstlang);
-                               else {
-                                       if (!it->second.readLayoutTranslations(lex)) {
-                                               lex.printError("Could not read "
-                                                              "layout translations "
-                                                              "for language `" +
-                                                              code + "'");
-                                               break;
-                                       }
-                                       firstlang = &(it->second);
-                               }
+               bool found = false;
+               for (LanguageList::iterator lit = lbeg; lit != lend; ++lit) {
+                       if (match(code, lit->second) != NoMatch) {
+                               found = true;
+                               break;
                        }
                }
-               if (!firstlang) {
+               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
+       // 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);
+                       if (m == NoMatch)
+                               continue;
+                       lit->second.readLayoutTranslations(tit->second,
+                                                          m == ExactMatch);
+               }
+       }
+
 }