float2string #4 (Spacing)

[lyx.git] / src / Spacing.h

diff --git a/src/Spacing.h b/src/Spacing.h
index ba8e530628d3d8632e98f5d6ce30ebac684c9007..5c9d2c653492e32930432d8bb561bee6245c3d1c 100644 (file)
--- a/src/Spacing.h
+++ b/src/Spacing.h
@@ -1,24 +1,20 @@
 // -*- C++ -*-
-/* This file is part of
- * ======================================================
- * 
- *           LyX, The Document Processor
- *        
- *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2000 The LyX Team.
+/**
+ * \file src/Spacing.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- * ====================================================== */
+ * \author Lars Gullik Bjønnes
+ *
+ * Full author contact details are available in file CREDITS.
+ */
 
 #ifndef SPACING_H
 #define SPACING_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
 #include <iosfwd>
+#include <string>
 
-#include "LString.h"
 
 ///
 class Spacing {
@@ -37,12 +33,12 @@ public:
                Default
        };
        ///
-       Spacing() : space(Single), value(1.0) {}
+       Spacing() : space(Default), value("1.0") {}
        ///
        Spacing(Spacing::Space sp, float val = 1.0) {
                set(sp, val);
        }
-       Spacing(Spacing::Space sp, string const & val) {
+       Spacing(Spacing::Space sp, std::string const & val) {
                set(sp, val);
        }
        ///
@@ -50,24 +46,29 @@ public:
                return space == Default;
        }
        ///
-       float getValue() const;
+       std::string const getValueAsString() const;
+       ///
+       double getValue() const;
        ///
        Spacing::Space getSpace() const { return space; }
        ///
        void set(Spacing::Space sp, float val = 1.0);
        ///
-       void set(Spacing::Space sp, string const & val) ;
+       void set(Spacing::Space sp, std::string const & val);
        ///
        void writeFile(std::ostream &, bool para = false) const;
        ///
-       string const writeEnvirBegin() const;
+       std::string const writeEnvirBegin() const;
        ///
-       string const writeEnvirEnd() const;
+       std::string const writeEnvirEnd() const;
+
 private:
        ///
        Space space;
        ///
-       float value;
+       std::string value;
+       /// names of line spacing
+       static std::string const spacing_string[];
 };
 
 
@@ -76,7 +77,7 @@ inline
 bool operator==(Spacing const & a, Spacing const & b)
 {
        return a.getSpace() == b.getSpace()
-               && a.getValue() == b.getValue();
+               && a.getValueAsString() == b.getValueAsString();
 }
 
 ///