X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FSpacing.h;h=0395b3e0cf53a7d355bd260727b89f71f5cedc83;hb=98c966c64594611e469313314abd1e59524adb4a;hp=8d466864a24dfa1a42d6d42e6ba8fbfa94abb652;hpb=2889b5fd3e8987d0c265ff4726a7fb6c6cb6c034;p=lyx.git

diff --git a/src/Spacing.h b/src/Spacing.h
index 8d466864a2..0395b3e0cf 100644
--- a/src/Spacing.h
+++ b/src/Spacing.h
@@ -1,17 +1,21 @@
 // -*- C++ -*-
 /* This file is part of
  * ======================================================
- * 
+ *
  *           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,25 +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 const writeEnvirBegin() const;
 	///
-	string writeEnvirEnd() const;
-	///
-	friend bool operator==(Spacing const & a, Spacing const & b) {
-		return a.space == b.space && a.getValue() == b.getValue();
-	}
-	///
-	friend bool operator!=(Spacing const & a, Spacing const & b) {
-		return !(a == b);
-	}
+	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