Real fix from Bernhard Roider

[lyx.git] / src / Spacing.C

diff --git a/src/Spacing.C b/src/Spacing.C
index 6bb0170d60eca740c7c0a37af9cb2ef81d04efb5..35eecde79e0d2b268d4e26fdaa1ea6cb8f9ecb56 100644 (file)
--- a/src/Spacing.C
+++ b/src/Spacing.C
@@ -11,49 +11,70 @@
 
 #include <config.h>
 
-#include "Lsstream.h"
 #include "Spacing.h"
-#include "LString.h"
+#include "support/lstrings.h"
+#include "support/convert.h"
+
+#include <sstream>
+#include <string>
+
+
+namespace lyx {
+
 
-using std::ios;
 using std::ostream;
+using std::ostringstream;
+using std::string;
+
 
 string const Spacing::spacing_string[]
        = {"single", "onehalf", "double", "other"};
 
-float Spacing::getValue() const
+
+string const Spacing::getValueAsString() const
 {
        switch (space) {
        case Default: // nothing special should happen with this...
-       case Single: return 1.0;
-       case Onehalf: return 1.25;
-       case Double: return 1.667;
+       case Single: return "1.0";
+       case Onehalf: return "1.25";
+       case Double: return "1.667";
        case Other: return value;
        }
-       return 1.0;
+       return "1.0";
 }
 
 
-void Spacing::set(Spacing::Space sp, float val)
+double Spacing::getValue() const
 {
-       space = sp;
-       if (sp == Other) {
-               switch (int(val * 1000 + 0.5)) {
-               case 1000: space = Single; break;
-               case 1250: space = Onehalf; break;
-               case 1667: space = Double; break;
-               default: value = val; break;
-               }
-       }
+       return convert<double>(getValueAsString());
+}
+
+
+void Spacing::set(Spacing::Space sp, double val)
+{
+       set(sp, convert<string>(val));
 }
 
 
 void Spacing::set(Spacing::Space sp, string const & val)
 {
-       float fval = 0.0;
-       istringstream istr(val.c_str());
-       istr >> fval;
-       set(sp, fval);
+       space = sp;
+       if (sp == Other) {
+               switch (int(convert<double>(val) * 1000 + 0.5)) {
+               case 1000:
+                       space = Single;
+                       break;
+               case 1250:
+                       space = Onehalf;
+                       break;
+               case 1667:
+                       space = Double;
+                       break;
+               default:
+                       value = val;
+                       break;
+               }
+       }
 }
 
 
@@ -64,12 +85,10 @@ void Spacing::writeFile(ostream & os, bool para) const
        string cmd = para ? "\\paragraph_spacing " : "\\spacing ";
 
        if (getSpace() == Spacing::Other) {
-               os.setf(ios::showpoint|ios::fixed);
-               os.precision(2);
                os << cmd << spacing_string[getSpace()]
-                  << ' ' << getValue() << " \n";
+                  << ' ' << getValueAsString() << "\n";
        } else {
-               os << cmd << spacing_string[getSpace()] << " \n";
+               os << cmd << spacing_string[getSpace()] << "\n";
        }
 }
 
@@ -88,8 +107,8 @@ string const Spacing::writeEnvirBegin() const
        {
                ostringstream ost;
                ost << "\\begin{spacing}{"
-                   << getValue() << '}';
-               return STRCONV(ost.str());
+                   << getValueAsString() << '}';
+               return ost.str();
        }
        }
        return string();
@@ -111,3 +130,6 @@ string const Spacing::writeEnvirEnd() const
        }
        return string();
 }
+
+
+} // namespace lyx