X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FSpacing.h;h=274cfc20f220ef5682da932170af294f750ecc1d;hb=28be7d552f62cc02fa86d7f79201d089bfb2d7b5;hp=c9e4be9e41f486b1c2fbeda7ec3f1622cc1eb2ba;hpb=9d711c62fc352193ef2873000b872ebd203143f3;p=lyx.git

diff --git a/src/Spacing.h b/src/Spacing.h
index c9e4be9e41..274cfc20f2 100644
--- 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,17 +12,12 @@
 #ifndef SPACING_H
 #define SPACING_H
 
-#ifdef TEX2LYX
-#include "tex2lyx/Spacing.h"
-#else
+#include "support/strfwd.h"
 
-#include <iosfwd>
 #include <string>
 
-
 namespace lyx {
 
-
 ///
 class Spacing {
 public:
@@ -42,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); }
+	///
+	Spacing(Spacing::Space sp, std::string const & val) { set(sp, val); }
 	///
-	bool isDefault() const {
-		return space == Default;
-	}
+	bool isDefault() const { return space == Default; }
 	///
 	std::string const getValueAsString() const;
 	///
@@ -64,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:
 	///
@@ -96,5 +91,4 @@ bool operator!=(Spacing const & a, Spacing const & b)
 
 } // namespace lyx
 
-#endif // TEX2LYX
 #endif // SPACING_H