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

[lyx.git] / src / LaTeXFeatures.cpp

diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index b383f0fb10f3b219795aa68366d9cab1f9200813..8340940ef9be365760302e0eb7ca4ebd3048dcb8 100644 (file)
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -642,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:
@@ -654,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;
        }