X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FSpacing.h;h=2a3bb755dddade3ccf61f49bcd8df3f9428fde11;hb=21226de2b87a86be19fff025cace3d286a75aa76;hp=f3e27123f4a41d205057f4ecbc314bf9969cf359;hpb=d0950acedaa91320340af398bb06d790486a2207;p=lyx.git

diff --git a/src/Spacing.h b/src/Spacing.h
index f3e27123f4..2a3bb755dd 100644
--- a/src/Spacing.h
+++ b/src/Spacing.h
@@ -5,13 +5,17 @@
  *           LyX, The Document Processor
  *        
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2000 The LyX Team.
+ *           Copyright 1995-2001 The LyX Team.
  *
  * ====================================================== */
 
 #ifndef SPACING_H
 #define SPACING_H
 
+#ifdef __GNUG__
+#pragma interface
+#endif
+
 #include <iosfwd>
 
 #include "LString.h"
@@ -33,7 +37,14 @@ public:
 		Default
 	};
 	///
-	Spacing() : space(Single), 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);
+	}
 	///
 	bool isDefault() const {
 		return space == Default;
@@ -45,29 +56,36 @@ public:
 	///
 	void set(Spacing::Space sp, float val = 1.0);
 	///
-	void set(Spacing::Space sp, char const * val) ;
+	void set(Spacing::Space sp, string const & val) ;
 	///
 	void writeFile(std::ostream &, bool para = false) const;
 	///
-	string writeEnvirBegin() const;
-	///
-	string writeEnvirEnd() const;
-	///
-	friend bool operator==(Spacing const & a, Spacing const & b) {
-		if (a.space == b.space && a.getValue() == b.getValue())
-			return true;
-		return false;
-	}
+	string const writeEnvirBegin() const;
 	///
-	friend bool operator!=(Spacing const & a, Spacing const & b) {
-		if (a.space == b.space && a.getValue() == b.getValue())
-			return false;
-		return true;
-	}
+	string const writeEnvirEnd() const;
+ 
 private:
 	///
 	Space space;
 	///
 	float value;
+	/// names of line spacing
+	static string const spacing_string[];
 };
+
+
+///
+inline
+bool operator==(Spacing const & a, Spacing const & b)
+{
+	return a.getSpace() == b.getSpace()
+		&& a.getValue() == b.getValue();
+}
+
+///
+inline
+bool operator!=(Spacing const & a, Spacing const & b)
+{
+	return !(a == b);
+}
 #endif