X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FSpacing.h;h=7311f792b5a3b5ae7ec98e90430db607a30ac52c;hb=a4d9315bc49445e4419b3b59fd238a13c5f7be31;hp=617ec9269e2d92e57bec69118705395de12b90a5;hpb=342cdf432246110db37bee4e0aebb4b72c933ddb;p=lyx.git

diff --git a/src/Spacing.h b/src/Spacing.h
index 617ec9269e..7311f792b5 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,9 +12,11 @@
 #ifndef SPACING_H
 #define SPACING_H
 
-#include <iosfwd>
+#include "support/strfwd.h"
+
 #include <string>
 
+namespace lyx {
 
 ///
 class Spacing {
@@ -35,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;
 	///
@@ -57,10 +54,18 @@ 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 writeCmd(bool useSetSpace) const;
+	/// useSetSpace is true when using the variant supported by
+	/// the memoir class.
+	std::string const writePreamble(bool useSetSpace) const;
 
 private:
 	///
@@ -86,4 +91,7 @@ bool operator!=(Spacing const & a, Spacing const & b)
 {
 	return !(a == b);
 }
-#endif
+
+} // namespace lyx
+
+#endif // SPACING_H