X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FSpacing.C;h=90d73d52f7ed9b7786b20fc9269d3a9471bfc3cc;hb=32ef0d04c48a1751abbb5e3b17d1bec25f22c255;hp=bd0f8818a7309a10fd13f9c1b0feb551e776998f;hpb=85798535a19919e82cc94a177a8414c542a9c5bf;p=lyx.git

diff --git a/src/Spacing.C b/src/Spacing.C
index bd0f8818a7..90d73d52f7 100644
--- a/src/Spacing.C
+++ b/src/Spacing.C
@@ -1,25 +1,38 @@
-#include <config.h>
+/* This file is part of
+ * ====================================================== 
+ * 
+ *           LyX, The Document Processor
+ *        
+ *           Copyright 1995 Matthias Ettrich
+ *           Copyright 1995-2001 The LyX Team.
+ *
+ * ====================================================== */
 
+#include <config.h>
 
-#ifdef HAVE_SSTREAM
-#include <sstream>
-using std::istringstream;
-#else
-#include <strstream>
+#ifdef __GNUG__
+#pragma implementation
 #endif
 
+#include "Lsstream.h"
 #include "Spacing.h"
+#include "LString.h"
 
 using std::ios;
+using std::ostream;
 
 /// how can I put this inside of Spacing (class)
-static
-char const * spacing_string[] = {"single", "onehalf", "double", "other"};
+namespace {
+
+char const * const spacing_string[] = {"single", "onehalf", "double", "other"};
+
+} // namespace anon
 
 
 float Spacing::getValue() const 
 {
-	switch(space) {
+	switch (space) {
+	case Default: // nothing special should happen with this...
 	case Single: return 1.0;
 	case Onehalf: return 1.25;
 	case Double: return 1.667;
@@ -33,7 +46,7 @@ void Spacing::set(Spacing::Space sp, float val)
 {
 	space = sp;
 	if (sp == Other) {
-		switch(int(val * 1000 + 0.5)) {
+		switch (int(val * 1000 + 0.5)) {
 		case 1000: space = Single; break;
 		case 1250: space = Onehalf; break;
 		case 1667: space = Double; break;
@@ -43,27 +56,66 @@ void Spacing::set(Spacing::Space sp, float val)
 }
 
 
-void Spacing::set(Spacing::Space sp, char const * val)
+void Spacing::set(Spacing::Space sp, string const & val)
 {
-	float fval;
-#ifdef HAVE_SSTREAM
-	istringstream istr(val);
-#else
-	istrstream istr(val);
-#endif
+	float fval = 0.0;
+	istringstream istr(val.c_str());
 	istr >> fval;
 	set(sp, fval);
 }
 
 
-void Spacing::writeFile(ostream & os) const
+void Spacing::writeFile(ostream & os, bool para) const
 {
+	if (space == Default) return;
+	
+	string cmd = para ? "\\paragraph_spacing " : "\\spacing ";
+	
 	if (getSpace() == Spacing::Other) {
 		os.setf(ios::showpoint|ios::fixed);
 		os.precision(2);
-		os << "\\spacing " << spacing_string[getSpace()]
+		os << cmd << spacing_string[getSpace()]
 		   << " " << getValue() << " \n";
 	} else {
-		os << "\\spacing " << spacing_string[getSpace()] << " \n";
+		os << cmd << spacing_string[getSpace()] << " \n";
 	}	
 }
+
+
+string const Spacing::writeEnvirBegin() const
+{
+	switch (space) {
+	case Default: break; // do nothing
+	case Single:
+		return "\\begin{singlespace}";
+	case Onehalf:
+		return "\\begin{onehalfspace}";
+	case Double:
+		return "\\begin{doublespace}";
+	case Other:
+	{
+		ostringstream ost;
+		ost << "\\begin{spacing}{"
+		    << getValue() << "}";
+		return ost.str().c_str();
+	}
+	}
+	return string();
+}
+
+
+string const Spacing::writeEnvirEnd() const
+{
+	switch (space) {
+	case Default: break; // do nothing
+	case Single:
+		return "\\end{singlespace}";
+	case Onehalf:
+		return "\\end{onehalfspace}";
+	case Double:
+		return "\\end{doublespace}";
+	case Other:
+		return "\\end{spacing}";
+	}
+	return string();
+}