* src/frontends/GuiDocument.{cpp,h}:

[lyx.git] / src / LaTeXFeatures.cpp

diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index 3abf35872cb18ff54e82feee8c565b1bdf907767..8340940ef9be365760302e0eb7ca4ebd3048dcb8 100644 (file)
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -519,10 +519,8 @@ char const * simplefeatures[] = {
        "units",
        "tipa",
        "framed",
-       "pdfcolmk",
        "soul",
        "textcomp",
-       "xcolor",
        "pmboxdraw",
        "bbding",
        "ifsym",
@@ -590,14 +588,21 @@ string const LaTeXFeatures::getPackages() const
            (params_.use_esint != BufferParams::package_off || !isRequired("esint")))
                packages << "\\usepackage{wasysym}\n";
 
-       // color.sty
-       if (mustProvide("color")) {
+       // [x]color.sty
+       if (mustProvide("color") || mustProvide("xcolor")) {
+               string const package =
+                       (mustProvide("xcolor") ? "xcolor" : "color");
                if (params_.graphicsDriver == "default")
-                       packages << "\\usepackage{color}\n";
+                       packages << "\\usepackage{" << package << "}\n";
                else
                        packages << "\\usepackage["
                                 << params_.graphicsDriver
-                                << "]{color}\n";
+                                << "]{" << package << "}\n";
+       }
+
+       // pdfcolmk must be loaded after color
+       if (mustProvide("pdfcolmk")) {
+               packages << "\\usepackage{pdfcolmk}\n";
        }
 
        // makeidx.sty
@@ -637,11 +642,13 @@ string const LaTeXFeatures::getPackages() const
        }
 
        // setspace.sty
-       if ((params_.spacing().getSpace() != Spacing::Single
-            && !params_.spacing().isDefault())
-           || isRequired("setspace")) {
-               packages << "\\usepackage{setspace}\n";
+       if ((isRequired("setspace") 
+            || ((params_.spacing().getSpace() != Spacing::Single
+                 && !params_.spacing().isDefault())))
+           && !tclass.provides("SetSpace")) {
+                   packages << "\\usepackage{setspace}\n";
        }
+       bool const upcase = tclass.provides("SetSpace");
        switch (params_.spacing().getSpace()) {
        case Spacing::Default:
        case Spacing::Single:
@@ -649,13 +656,13 @@ string const LaTeXFeatures::getPackages() const
                //packages += "\\singlespacing\n";
                break;
        case Spacing::Onehalf:
-               packages << "\\onehalfspacing\n";
+               packages << (upcase ? "\\OnehalfSpacing\n" : "\\onehalfspacing\n");
                break;
        case Spacing::Double:
-               packages << "\\doublespacing\n";
+               packages << (upcase ? "\\DoubleSpacing\n" : "\\doublespacing\n");
                break;
        case Spacing::Other:
-               packages << "\\setstretch{"
+               packages << (upcase ? "\\setSingleSpace{" : "\\setstretch{")
                         << params_.spacing().getValue() << "}\n";
                break;
        }