* Doxy: fix \vars

[lyx.git] / src / Spacing.cpp

diff --git a/src/Spacing.cpp b/src/Spacing.cpp
index d2ed1acd80dee85017672f17af7b4eb088d7d4ec..1f226cae41dfb8e696dc090d7607cbb42eb3b433 100644 (file)
--- a/src/Spacing.cpp
+++ b/src/Spacing.cpp
@@ -18,15 +18,11 @@
 #include <sstream>
 #include <string>
 
+using namespace std;
 
 namespace lyx {
 
 
-using std::ostream;
-using std::ostringstream;
-using std::string;
-
-
 string const Spacing::spacing_string[]
        = {"single", "onehalf", "double", "other"};
 
@@ -93,20 +89,24 @@ void Spacing::writeFile(ostream & os, bool para) const
 }
 
 
-string const Spacing::writeEnvirBegin() const
+string const Spacing::writeEnvirBegin(bool useSetSpace) const
 {
        switch (space) {
        case Default: break; // do nothing
        case Single:
-               return "\\begin{singlespace}";
+               return (useSetSpace ? "\\begin{SingleSpace}"
+                       : "\\begin{singlespace}");
        case Onehalf:
-               return "\\begin{onehalfspace}";
+               return (useSetSpace ? "\\begin{OnehalfSpace}"
+                       : "\\begin{onehalfspace}");
        case Double:
-               return "\\begin{doublespace}";
+               return (useSetSpace ? "\\begin{DoubleSpace}" 
+                       : "\\begin{doublespace}");
        case Other:
        {
                ostringstream ost;
-               ost << "\\begin{spacing}{"
+               ost << (useSetSpace ? "\\begin{Spacing}{"
+                       : "\\begin{spacing}{" )
                    << getValueAsString() << '}';
                return ost.str();
        }
@@ -115,18 +115,21 @@ string const Spacing::writeEnvirBegin() const
 }
 
 
-string const Spacing::writeEnvirEnd() const
+string const Spacing::writeEnvirEnd(bool useSetSpace) const
 {
        switch (space) {
        case Default: break; // do nothing
        case Single:
-               return "\\end{singlespace}";
+               return (useSetSpace ? "\\end{SingleSpace}"
+                       : "\\end{singlespace}");
        case Onehalf:
-               return "\\end{onehalfspace}";
+               return (useSetSpace ? "\\end{OnehalfSpace}"
+                       : "\\end{onehalfspace}");
        case Double:
-               return "\\end{doublespace}";
+               return (useSetSpace ? "\\end{DoubleSpace}" 
+                       : "\\end{doublespace}");
        case Other:
-               return "\\end{spacing}";
+               return (useSetSpace ? "\\end{Spacing}" : "\\end{spacing}") ;
        }
        return string();
 }