remove special TEX2LYX code in Spacing,h

[lyx.git] / src / Spacing.h

diff --git a/src/Spacing.h b/src/Spacing.h
index 273786aced0a77d2d2dddc84543b36063e749bf8..274cfc20f220ef5682da932170af294f750ecc1d 100644 (file)
--- a/src/Spacing.h
+++ b/src/Spacing.h
@@ -4,7 +4,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -12,13 +12,12 @@
 #ifndef SPACING_H
 #define SPACING_H
 
-#include <iosfwd>
-#include <string>
+#include "support/strfwd.h"
 
+#include <string>
 
 namespace lyx {
 
-
 ///
 class Spacing {
 public:
@@ -38,16 +37,11 @@ public:
        ///
        Spacing() : space(Default), value("1.0") {}
        ///
-       Spacing(Spacing::Space sp, double val = 1.0) {
-               set(sp, val);
-       }
-       Spacing(Spacing::Space sp, std::string const & val) {
-               set(sp, val);
-       }
+       Spacing(Spacing::Space sp, double val = 1.0) { set(sp, val); }
        ///
-       bool isDefault() const {
-               return space == Default;
-       }
+       Spacing(Spacing::Space sp, std::string const & val) { set(sp, val); }
+       ///
+       bool isDefault() const { return space == Default; }
        ///
        std::string const getValueAsString() const;
        ///
@@ -60,10 +54,15 @@ public:
        void set(Spacing::Space sp, std::string const & val);
        ///
        void writeFile(std::ostream &, bool para = false) const;
-       ///
-       std::string const writeEnvirBegin() const;
-       ///
-       std::string const writeEnvirEnd() const;
+       /// useSetSpace is true when using the variant supported by
+       /// the memoir class.
+       std::string const writeEnvirBegin(bool useSetSpace) const;
+       /// useSetSpace is true when using the variant supported by
+       /// the memoir class.
+       std::string const writeEnvirEnd(bool useSetSpace) const;
+       /// useSetSpace is true when using the variant supported by
+       /// the memoir class.
+       std::string const writePreamble(bool useSetSpace) const;
 
 private:
        ///
@@ -88,8 +87,8 @@ inline
 bool operator!=(Spacing const & a, Spacing const & b)
 {
        return !(a == b);
-
+}
 
 } // namespace lyx
-}
-#endif
+
+#endif // SPACING_H