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

diff --git a/src/Spacing.h b/src/Spacing.h
index f3e27123f4..617ec9269e 100644
--- a/src/Spacing.h
+++ b/src/Spacing.h
@@ -1,20 +1,20 @@
 // -*- C++ -*-
-/* This file is part of
- * ======================================================
- * 
- *           LyX, The Document Processor
- *        
- *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2000 The LyX Team.
+/**
+ * \file src/Spacing.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- * ====================================================== */
+ * \author Lars Gullik Bjønnes
+ *
+ * Full author contact details are available in file CREDITS.
+ */
 
 #ifndef SPACING_H
 #define SPACING_H
 
 #include <iosfwd>
+#include <string>
 
-#include "LString.h"
 
 ///
 class Spacing {
@@ -33,41 +33,57 @@ public:
 		Default
 	};
 	///
-	Spacing() : space(Single), value(1.0) {}
+	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);
+	}
 	///
 	bool isDefault() const {
 		return space == Default;
 	}
 	///
-	float getValue() const;
+	std::string const getValueAsString() const;
+	///
+	double getValue() const;
 	///
 	Spacing::Space getSpace() const { return space; }
 	///
-	void set(Spacing::Space sp, float val = 1.0);
+	void set(Spacing::Space sp, double val = 1.0);
 	///
-	void set(Spacing::Space sp, char const * val) ;
+	void set(Spacing::Space sp, std::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;
-	}
+	std::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;
-	}
+	std::string const writeEnvirEnd() const;
+
 private:
 	///
 	Space space;
 	///
-	float value;
+	std::string value;
+	/// names of line spacing
+	static std::string const spacing_string[];
 };
+
+
+///
+inline
+bool operator==(Spacing const & a, Spacing const & b)
+{
+	return a.getSpace() == b.getSpace()
+		&& a.getValueAsString() == b.getValueAsString();
+}
+
+///
+inline
+bool operator!=(Spacing const & a, Spacing const & b)
+{
+	return !(a == b);
+}
 #endif