ws changes only

[lyx.git] / src / vspace.C

diff --git a/src/vspace.C b/src/vspace.C
index c0628df06e70ed14495a3fe80048eb1c076c2912..a3b8c5a41a3d314b0c3fb77513252642f2483bf1 100644 (file)
--- a/src/vspace.C
+++ b/src/vspace.C
@@ -1,31 +1,33 @@
 /**
  * \file vspace.C
- * Copyright 1995-2002 the LyX Team
- * Read the file COPYING
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
  * \author Matthias Ettrich
+ *
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include "vspace.h"
-#include "lengthcommon.h"
 #include "buffer.h"
-#include "lyxrc.h"
+#include "bufferparams.h"
 #include "BufferView.h"
-#include "support/LAssert.h"
+#include "lengthcommon.h"
+#include "lyxtext.h"
 
 #include "support/lstrings.h"
 
-#include <cstdio>
+using lyx::support::compare;
+using lyx::support::isStrDbl;
+using lyx::support::ltrim;
+using lyx::support::prefixIs;
+using lyx::support::rtrim;
+using lyx::support::strToDbl;
+
+using std::string;
 
-#ifndef CXX_GLOBAL_CSTD
-using std::sscanf;
-#endif
 
 namespace {
 
@@ -359,7 +361,8 @@ VSpace::VSpace(string const & data)
        else if (prefixIs (input, "bigskip"))    kind_ = BIGSKIP;
        else if (prefixIs (input, "vfill"))      kind_ = VFILL;
        else if (isValidGlueLength(input, &len_)) kind_ = LENGTH;
-       else if (sscanf(input.c_str(), "%lf", &value) == 1) {
+       else if (isStrDbl(input)) {
+               value = strToDbl(input);
                // This last one is for reading old .lyx files
                // without units in added_space_top/bottom.
                // Let unit default to centimeters here.
@@ -375,7 +378,7 @@ VSpace::vspace_kind VSpace::kind() const
 }
 
 
-LyXGlueLength VSpace::length() const
+LyXGlueLength const & VSpace::length() const
 {
        return len_;
 }
@@ -468,10 +471,10 @@ string const VSpace::asLatexCommand(BufferParams const & params) const
 
 
 
-int VSpace::inPixels(BufferView const * bv) const
+int VSpace::inPixels(BufferView const & bv) const
 {
        // Height of a normal line in pixels (zoom factor considered)
-       int const default_height = bv->defaultHeight(); // [pixels]
+       int const default_height = defaultRowHeight(); // [pixels]
 
        int retval = 0;
 
@@ -482,10 +485,10 @@ int VSpace::inPixels(BufferView const * bv) const
                break;
 
        case DEFSKIP:
-               retval = bv->buffer()->params.getDefSkip().inPixels(bv);
+               retval = bv.buffer()->params().getDefSkip().inPixels(bv);
                break;
 
-       // This is how the skips are normally defined by LateX. 
+       // This is how the skips are normally defined by LateX.
        // But there should be some way to change this per document.
        case SMALLSKIP:
                retval = default_height / 4;
@@ -505,7 +508,7 @@ int VSpace::inPixels(BufferView const * bv) const
                break;
 
        case LENGTH:
-               retval = len_.len().inPixels(bv->workWidth());
+               retval = len_.len().inPixels(bv.workWidth());
                break;
 
        }