]> git.lyx.org Git - lyx.git/blobdiff - src/LaTeXFeatures.cpp
Do not overwrite read-only files. We now move the file to the backup directory and...
[lyx.git] / src / LaTeXFeatures.cpp
index 172dfdadca7363001753443f0f2d66be106f4ccf..52a69bdc78e6daf448e5e6b4d26b07d027bcd510 100644 (file)
@@ -257,23 +257,16 @@ static docstring const ogonek_def = from_ascii(
        "\\newcommand{\\ogonek}[1]{\\mathpalette\\doogonek{#1}}\n");
 
 static docstring const lyxref_def = from_ascii(
-       "\\makeatletter\n"
-       "\\def\\lyxref#1{\\@lyxref#1:@@@@@:}\n"
-       "\\def\\@lyxref#1:#2:{%\n"
-       "\\ifthenelse{\\equal{#2}{@@@@@}}%\n"
-       "       {\\ref{#1}}%\n"
-       "       {\\@@lyxref#1:#2:}%\n"
-       "}\n"
-       "\\def\\@@lyxref#1:#2:@@@@@:{%\n"
-       "       \\RS@ifundefined{#1ref}%\n"
-       "       {\\ref{#1:#2}}%\n"
-       "       {\\RS@nameuse{#1ref}{#2}}%\n"
-       "}\n"
-       "\\RS@ifundefined{\thmref}\n"
-       "  {\\def\\RSthmtxt{theorem~}\\newref{thm}{name = \\RSthmtxt}}\n"
-       "  {}\n"
-       "\\makeatother\n"
-       );
+               "\\RS@ifundefined{subref}\n"
+               "  {\\def\\RSsubtxt{section~}\\newref{sub}{name = \\RSsubtxt}}\n" 
+               "  {}\n"
+               "\\RS@ifundefined{thmref}\n"
+               "  {\\def\\RSthmtxt{theorem~}\\newref{thm}{name = \\RSthmtxt}}\n" 
+               "  {}\n"
+               "\\RS@ifundefined{lemref}\n"
+               "  {\\def\\RSlemtxt{lemma~}\\newref{lem}{name = \\RSlemtxt}}\n" 
+               "  {}\n");
+
 
 /////////////////////////////////////////////////////////////////////
 //
@@ -292,10 +285,21 @@ LaTeXFeatures::LaTeXFeatures(Buffer const & b, BufferParams const & p,
 
 bool LaTeXFeatures::useBabel() const
 {
-       return lyxrc.language_use_babel ||
-               (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();
 }
 
 
@@ -481,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;
@@ -497,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
@@ -544,6 +575,7 @@ char const * simplefeatures[] = {
        "framed",
        "soul",
        "textcomp",
+       "subscript",
        "pmboxdraw",
        "bbding",
        "ifsym",
@@ -563,7 +595,8 @@ char const * simplefeatures[] = {
        "pdfpages",
        "amscd",
        "slashed",
-       "multirow"
+       "multirow",
+       "tfrupee"
 };
 
 int const nb_simplefeatures = sizeof(simplefeatures) / sizeof(char const *);
@@ -639,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.
 
        //
@@ -773,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";
 
@@ -829,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")
@@ -843,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"))
@@ -921,15 +955,15 @@ docstring const LaTeXFeatures::getMacros() const
        // floats
        getFloatDefinitions(macros);
        
-       if (mustProvide("refstyle"))
-               macros << lyxref_def << '\n';
-
+       if (mustProvide("refstyle")) 
+               macros << lyxref_def << '\n';   
+       
        // change tracking
        if (mustProvide("ct-dvipost"))
                macros << changetracking_dvipost_def;
-
+       
        if (mustProvide("ct-xcolor-ulem")) {
-               int const prec = macros.precision(2);
+               streamsize const prec = macros.precision(2);
        
                RGBColor cadd = rgbFromHexName(lcolor.getX11Name(Color_addedtext));
                macros << "\\providecolor{lyxadded}{rgb}{"
@@ -954,22 +988,53 @@ docstring const LaTeXFeatures::getMacros() const
 }
 
 
-string const LaTeXFeatures::getBabelOptions() const
+string const LaTeXFeatures::getBabelPresettings() const
 {
        ostringstream tmp;
 
        LanguageList::const_iterator it  = UsedLanguages_.begin();
-       LanguageList::const_iterator end =  UsedLanguages_.end();
+       LanguageList::const_iterator end = UsedLanguages_.end();
        for (; it != end; ++it)
-               if (!(*it)->latex_options().empty())
-                       tmp << (*it)->latex_options() << '\n';
-       if (!params_.language->latex_options().empty())
-               tmp << params_.language->latex_options() << '\n';
+               if (!(*it)->babel_presettings().empty())
+                       tmp << (*it)->babel_presettings() << '\n';
+       if (!params_.language->babel_presettings().empty())
+               tmp << params_.language->babel_presettings() << '\n';
 
        return tmp.str();
 }
 
 
+string const LaTeXFeatures::getBabelPostsettings() const
+{
+       ostringstream tmp;
+
+       LanguageList::const_iterator it  = UsedLanguages_.begin();
+       LanguageList::const_iterator end = UsedLanguages_.end();
+       for (; it != end; ++it)
+               if (!(*it)->babel_postsettings().empty())
+                       tmp << (*it)->babel_postsettings() << '\n';
+       if (!params_.language->babel_postsettings().empty())
+               tmp << params_.language->babel_postsettings() << '\n';
+
+       return tmp.str();
+}
+
+
+bool LaTeXFeatures::needBabelLangOptions() const
+{
+       if (!lyxrc.language_global_options || params_.language->asBabelOptions())
+               return true;
+
+       LanguageList::const_iterator it  = UsedLanguages_.begin();
+       LanguageList::const_iterator end = UsedLanguages_.end();
+       for (; it != end; ++it)
+               if ((*it)->asBabelOptions())
+                       return true;
+
+       return false;
+}
+
+
 docstring const LaTeXFeatures::getTClassPreamble() const
 {
        // the text class specific preamble