Add a Buffer::fully_loaded member function, returning true only when

[lyx.git] / src / Spacing.C

diff --git a/src/Spacing.C b/src/Spacing.C
index 6014dea5cb5f8a9fadfdf49c747179c0dd949ce5..0987e337bd6638280578d0b169ae1558dbaefbd5 100644 (file)
--- a/src/Spacing.C
+++ b/src/Spacing.C
@@ -1,34 +1,32 @@
-/* This file is part of
- * ====================================================== 
- * 
- *           LyX, The Document Processor
- *        
- *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2000 The LyX Team.
+/**
+ * \file Spacing.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- * ====================================================== */
+ * \author Lars Gullik Bjønnes
+ * \author Jean-Marc Lasgouttes
+ *
+ * Full author contact details are available in file CREDITS.
+ */
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 #include "Spacing.h"
-#include "LString.h"
 
 using std::ios;
+using std::istringstream;
 using std::ostream;
+using std::ostringstream;
+using std::string;
 
-/// how can I put this inside of Spacing (class)
-static
-char const * spacing_string[] = {"single", "onehalf", "double", "other"};
 
+string const Spacing::spacing_string[]
+       = {"single", "onehalf", "double", "other"};
 
-float Spacing::getValue() const 
+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;
@@ -43,7 +41,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;
@@ -55,8 +53,8 @@ void Spacing::set(Spacing::Space sp, float val)
 
 void Spacing::set(Spacing::Space sp, string const & val)
 {
-       float fval;
-       istringstream istr(val);
+       float fval = 0.0;
+       istringstream istr(val.c_str());
        istr >> fval;
        set(sp, fval);
 }
@@ -65,23 +63,23 @@ void Spacing::set(Spacing::Space sp, string const & val)
 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 << cmd << spacing_string[getSpace()]
-                  << " " << getValue() << " \n";
+                  << ' ' << getValue() << " \n";
        } else {
                os << cmd << spacing_string[getSpace()] << " \n";
-       }       
+       }
 }
 
 
 string const Spacing::writeEnvirBegin() const
 {
-       switch(space) {
+       switch (space) {
        case Default: break; // do nothing
        case Single:
                return "\\begin{singlespace}";
@@ -93,8 +91,8 @@ string const Spacing::writeEnvirBegin() const
        {
                ostringstream ost;
                ost << "\\begin{spacing}{"
-                   << getValue() << "}";
-               return ost.str().c_str();
+                   << getValue() << '}';
+               return ost.str();
        }
        }
        return string();
@@ -103,7 +101,7 @@ string const Spacing::writeEnvirBegin() const
 
 string const Spacing::writeEnvirEnd() const
 {
-       switch(space) {
+       switch (space) {
        case Default: break; // do nothing
        case Single:
                return "\\end{singlespace}";