InsetInfo: enable inset dissolve

[lyx.git] / src / Language.cpp

diff --git a/src/Language.cpp b/src/Language.cpp
index 3061df313074b33ec159354d81dbfe451b4ee342..12c79a04193fa8964c7c3b69b1d0a25eb348d3eb 100644 (file)
--- 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"
 
@@ -71,11 +72,51 @@ 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<string> 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,
@@ -98,6 +139,7 @@ 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 },
@@ -157,9 +199,20 @@ bool Language::readLanguage(Lexer & lex)
                case LA_ENCODING:
                        lex >> encodingStr_;
                        break;
-               case LA_FONTENC:
-                       lex >> fontenc_;
+               case LA_FONTENC: {
+                       lex.eatLine();
+                       vector<string> const fe =
+                               getVectorFromString(lex.getString(true), "|");
+                       fontenc_.insert(fontenc_.end(), fe.begin(), fe.end());
+                       break;
+               }
+               case LA_DATEFORMATS: {
+                       lex.eatLine();
+                       vector<string> const df =
+                               getVectorFromString(trim(lex.getString(true), "\""), "|");
+                       dateformats_.insert(dateformats_.end(), df.begin(), df.end());
                        break;
+               }
                case LA_GUINAME:
                        lex >> display_;
                        break;
@@ -223,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;
 }
 
@@ -337,6 +397,26 @@ Match match(string const & code, Language const & lang)
 } // 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;
+}
+
+
 void Languages::readLayoutTranslations(support::FileName const & filename)
 {
        Lexer lex;
@@ -357,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;