Do not overwrite read-only files. We now move the file to the backup directory and...

[lyx.git] / src / LaTeXFeatures.cpp

diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index 08917b56649c5bfa03d954e70413ebd523c9965b..52a69bdc78e6daf448e5e6b4d26b07d027bcd510 100644 (file)
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -285,10 +285,21 @@ LaTeXFeatures::LaTeXFeatures(Buffer const & b, BufferParams const & p,
 
 bool LaTeXFeatures::useBabel() const
 {
-       return (lyxrc.language_package_selection != LyXRC::LP_NONE) &&
-               ((bufferParams().language->lang() != lyxrc.default_language &&
-                !bufferParams().language->babel().empty()) ||
-               this->hasLanguages());
+       if (usePolyglossia())
+               return false;
+       return (lyxrc.language_package_selection != LyXRC::LP_NONE)
+               || (bufferParams().language->lang() != lyxrc.default_language
+                   && !bufferParams().language->babel().empty())
+               || this->hasLanguages();
+}
+
+
+bool LaTeXFeatures::usePolyglossia() const
+{
+       return (lyxrc.language_package_selection == LyXRC::LP_AUTO)
+               && isRequired("polyglossia")
+               && isAvailable("polyglossia")
+               && this->hasPolyglossiaLanguages();
 }
 
 
@@ -474,6 +485,19 @@ bool LaTeXFeatures::hasLanguages() const
 }
 
 
+bool LaTeXFeatures::hasPolyglossiaLanguages() const
+{
+       LanguageList::const_iterator const begin = UsedLanguages_.begin();
+       for (LanguageList::const_iterator cit = begin;
+            cit != UsedLanguages_.end();
+            ++cit) {
+               if ((*cit)->polyglossia().empty())
+                       return false;
+       }
+       return true;
+}
+
+
 string LaTeXFeatures::getLanguages() const
 {
        ostringstream languages;
@@ -490,6 +514,20 @@ string LaTeXFeatures::getLanguages() const
 }
 
 
+std::map<std::string, std::string> LaTeXFeatures::getPolyglossiaLanguages() const
+{
+       std::map<std::string, std::string> languages;
+
+       LanguageList::const_iterator const begin = UsedLanguages_.begin();
+       for (LanguageList::const_iterator cit = begin;
+            cit != UsedLanguages_.end();
+            ++cit) {
+               languages[(*cit)->polyglossia()] = (*cit)->polyglossiaOpts();
+       }
+       return languages;
+}
+
+
 set<string> LaTeXFeatures::getEncodingSet(string const & doc_encoding) const
 {
        // This does only find encodings of languages supported by babel, but
@@ -537,6 +575,7 @@ char const * simplefeatures[] = {
        "framed",
        "soul",
        "textcomp",
+       "subscript",
        "pmboxdraw",
        "bbding",
        "ifsym",
@@ -633,7 +672,7 @@ string const LaTeXFeatures::getPackages() const
        // FIXME: currently, we can only load packages and macros known
        // to LyX.
        // However, with the Require tag of layouts/custom insets,
-       // also inknown packages can be requested. They are silently
+       // also unknown packages can be requested. They are silently
        // swallowed now. We should change this eventually.
 
        //
@@ -767,8 +806,9 @@ string const LaTeXFeatures::getPackages() const
                packages << "\\PassOptionsToPackage{normalem}{ulem}\n"
                            "\\usepackage{ulem}\n";
 
-       if (mustProvide("mhchem") &&
-               params_.use_mhchem != BufferParams::package_off)
+       if (params_.use_mhchem == BufferParams::package_on ||
+           (mustProvide("mhchem") &&
+            params_.use_mhchem != BufferParams::package_off))
                packages << "\\PassOptionsToPackage{version=3}{mhchem}\n"
                            "\\usepackage{mhchem}\n";
 
@@ -823,7 +863,7 @@ docstring const LaTeXFeatures::getMacros() const
        if (mustProvide("lyxarrow"))
                macros << lyxarrow_def << '\n';
 
-       if (mustProvide("textgreek")) {
+       if (!usePolyglossia() && mustProvide("textgreek")) {
                // Avoid a LaTeX error if times fonts are used and the grtimes
                // package is installed but actual fonts are not (bug 6469).
                if (params_.fontsRoman == "times")
@@ -837,7 +877,7 @@ docstring const LaTeXFeatures::getMacros() const
                        macros << textgreek_def << '\n';
        }
 
-       if (mustProvide("textcyr"))
+       if (!usePolyglossia() && mustProvide("textcyr"))
                macros << textcyr_def << '\n';
 
        if (mustProvide("lyxmathsym"))