X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FSpacing.h;h=a78abb6c5a07668b416ac0840753c30d5f679ae2;hb=9aa6b8a8aa432d9a472943fd9eefffc3ed86c063;hp=5c51bb49f43e779c3cd266533e8cff3b091972cd;hpb=236ea81bc5c0ce7101c9460d1ee97b8f3c9be9df;p=lyx.git

diff --git a/src/Spacing.h b/src/Spacing.h
index 5c51bb49f4..a78abb6c5a 100644
--- a/src/Spacing.h
+++ b/src/Spacing.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file Spacing.h
+ * \file src/Spacing.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -12,9 +12,15 @@
 #ifndef SPACING_H
 #define SPACING_H
 
-#include <iosfwd>
+#ifdef TEX2LYX
+#include "tex2lyx/Spacing.h"
+#else
 
-#include "support/std_string.h"
+#include "support/strfwd.h"
+
+#include <string>
+
+namespace lyx {
 
 ///
 class Spacing {
@@ -33,40 +39,42 @@ public:
 		Default
 	};
 	///
-	Spacing() : space(Default), 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) {
-		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); }
 	///
-	float getValue() const;
+	bool isDefault() const { return space == Default; }
 	///
-	Spacing::Space getSpace() const { return space; }
+	std::string const getValueAsString() const;
 	///
-	void set(Spacing::Space sp, float val = 1.0);
+	double getValue() const;
 	///
-	void set(Spacing::Space sp, string const & val) ;
+	Spacing::Space getSpace() const { return space; }
 	///
-	void writeFile(std::ostream &, bool para = false) const;
+	void set(Spacing::Space sp, double val = 1.0);
 	///
-	string const writeEnvirBegin() const;
+	void set(Spacing::Space sp, std::string const & val);
 	///
-	string const writeEnvirEnd() const;
+	void writeFile(std::ostream &, bool para = false) 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:
 	///
 	Space space;
 	///
-	float value;
+	std::string value;
 	/// names of line spacing
-	static string const spacing_string[];
+	static std::string const spacing_string[];
 };
 
 
@@ -75,7 +83,7 @@ inline
 bool operator==(Spacing const & a, Spacing const & b)
 {
 	return a.getSpace() == b.getSpace()
-		&& a.getValue() == b.getValue();
+		&& a.getValueAsString() == b.getValueAsString();
 }
 
 ///
@@ -84,4 +92,8 @@ bool operator!=(Spacing const & a, Spacing const & b)
 {
 	return !(a == b);
 }
-#endif
+
+} // namespace lyx
+
+#endif // TEX2LYX
+#endif // SPACING_H