X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FSpacing.h;h=a78abb6c5a07668b416ac0840753c30d5f679ae2;hb=d145c2dc9f27666ca0ed9f8589f99f502d7b2a4d;hp=273786aced0a77d2d2dddc84543b36063e749bf8;hpb=6c300f72a217722652dc27db9108e1050028979c;p=lyx.git

diff --git a/src/Spacing.h b/src/Spacing.h
index 273786aced..a78abb6c5a 100644
--- a/src/Spacing.h
+++ b/src/Spacing.h
@@ -12,12 +12,15 @@
 #ifndef SPACING_H
 #define SPACING_H
 
-#include <iosfwd>
-#include <string>
+#ifdef TEX2LYX
+#include "tex2lyx/Spacing.h"
+#else
 
+#include "support/strfwd.h"
 
-namespace lyx {
+#include <string>
 
+namespace lyx {
 
 ///
 class Spacing {
@@ -38,16 +41,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;
 	///
@@ -60,10 +58,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 +91,9 @@ inline
 bool operator!=(Spacing const & a, Spacing const & b)
 {
 	return !(a == b);
-
+}
 
 } // namespace lyx
-}
-#endif
+
+#endif // TEX2LYX
+#endif // SPACING_H