Amend 6c3447c8: FindAdv: sometimes a space is added on some math symbols

[lyx.git] / src / LaTeXFeatures.cpp

diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index ab2c846599d8e5188d65e83c39b9b78aeb7d70c3..20abc00c6cb94b55d4dc71fbf4c7f64581042500 100644 (file)
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -1213,10 +1213,6 @@ string const LaTeXFeatures::getColorOptions() const
                                 << "]{" << package << "}\n";
        }
 
-       // pdfcolmk must be loaded after color
-       if (mustProvide("pdfcolmk"))
-               colors << "\\usepackage{pdfcolmk}\n";
-
        // the following 3 color commands must be set after color
        // is loaded and before pdfpages, therefore add the command
        // here define the set color
@@ -1396,7 +1392,7 @@ string const LaTeXFeatures::getPackages() const
                params_.use_package("undertilde") != BufferParams::package_off)
                packages << "\\usepackage{undertilde}\n";
 
-       // [x]color and pdfcolmk are handled in getColorOptions() above
+       // [x]color is handled in getColorOptions() above
 
        // makeidx.sty
        if (isRequired("makeidx") || isRequired("splitidx")) {
@@ -1533,14 +1529,16 @@ string const LaTeXFeatures::getPackages() const
                            "\\usepackage{ulem}\n";
 
        if (mustProvide("nomencl")) {
+               packages << "\\usepackage{nomencl}\n";
                // Make it work with the new and old version of the package,
                // but don't use the compatibility option since it is
                // incompatible to other packages.
-               packages << "\\usepackage{nomencl}\n"
-                           "% the following is useful when we have the old nomencl.sty package\n"
-                           "\\providecommand{\\printnomenclature}{\\printglossary}\n"
-                           "\\providecommand{\\makenomenclature}{\\makeglossary}\n"
-                           "\\makenomenclature\n";
+               if (!LaTeXFeatures::isAvailableAtLeastFrom("nomencl", 2005, 3, 31)) {
+                       packages << "% Needed with nomencl < v4.1\n"
+                                   "\\providecommand{\\printnomenclature}{\\printglossary}\n"
+                                   "\\providecommand{\\makenomenclature}{\\makeglossary}\n";
+               }
+               packages << "\\makenomenclature\n";
        }
 
        // fixltx2e provides subscript