Ignore ligature breaks and hyphenations during simple search (fixes #1468).

[lyx.git] / src / LaTeXFeatures.cpp

diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index 8820e1c412bca088e5654ab6645523ba2b161217..c6516995c9b4d0cbb9742e32f1db6e2680890e0c 100644 (file)
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -285,10 +285,10 @@ LaTeXFeatures::LaTeXFeatures(Buffer const & b, BufferParams const & p,
 
 bool LaTeXFeatures::useBabel() const
 {
-       return lyxrc.language_use_babel ||
-               (bufferParams().language->lang() != lyxrc.default_language &&
+       return (lyxrc.language_package_selection != LyXRC::LP_NONE) &&
+               ((bufferParams().language->lang() != lyxrc.default_language &&
                 !bufferParams().language->babel().empty()) ||
-               this->hasLanguages();
+               this->hasLanguages());
 }
 
 
@@ -537,6 +537,7 @@ char const * simplefeatures[] = {
        "framed",
        "soul",
        "textcomp",
+       "subscript",
        "pmboxdraw",
        "bbding",
        "ifsym",
@@ -556,7 +557,8 @@ char const * simplefeatures[] = {
        "pdfpages",
        "amscd",
        "slashed",
-       "multirow"
+       "multirow",
+       "tfrupee"
 };
 
 int const nb_simplefeatures = sizeof(simplefeatures) / sizeof(char const *);
@@ -632,7 +634,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.
 
        //
@@ -766,8 +768,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";