Rename strip to rtrim

[lyx.git] / src / vspace.C

diff --git a/src/vspace.C b/src/vspace.C
index e4e01550f4a22f23ca25911eeabe099a0164cd6d..1444aa7de8da6f120a0044ced3f0e3a1c919e89d 100644 (file)
--- a/src/vspace.C
+++ b/src/vspace.C
@@ -25,6 +25,9 @@
 
 #include <cstdio>
 
+#ifndef CXX_GLOBAL_CSTD
+using std::sscanf;
+#endif
 
 namespace {
 
@@ -52,7 +55,7 @@ void lyx_advance(string & data, string::size_type n)
 inline
 bool isEndOfData(string const & data)
 {
-       return frontStrip(data).empty();
+       return ltrim(data).empty();
 }
 
 /**
@@ -60,8 +63,8 @@ bool isEndOfData(string const & data)
  * @param data input string
  * @return a char representing the type of token returned
  *
- * The possible return values are : 
- *     +       stretch indicator for glue length
+ * The possible return values are :
+ *     +       stretch indicator for glue length
  *     -       shrink indicator for glue length
  *     n       a numeric value (stored in number array)
  *     u       a unit type (stored in unit array)
@@ -69,7 +72,7 @@ bool isEndOfData(string const & data)
  */
 char nextToken(string & data)
 {
-       data = frontStrip(data);
+       data = ltrim(data);
        if (data.empty())
                return '\0';
        else if (data[0] == '+') {
@@ -91,7 +94,7 @@ char nextToken(string & data)
                        if (number_index > 3) return 'E';
 
                        string buffer;
-               
+
                        // we have found some number
                        if (i == string::npos) {
                                buffer = data;
@@ -107,13 +110,13 @@ char nextToken(string & data)
                                return 'n';
                        } else return 'E';
                }
-               
+
                i = data.find_first_not_of("abcdefghijklmnopqrstuvwxyz%");
                if (i != 0) {
                        if (unit_index > 3) return 'E';
 
                        string buffer;
-               
+
                        // we have found some alphabetical string
                        if (i == string::npos) {
                                buffer = data;
@@ -199,7 +202,7 @@ bool isValidGlueLength(string const & data, LyXGlueLength * result)
 
        if (data.empty())
                return true;
-       string buffer = frontStrip(data);
+       string buffer = ltrim(data);
 
        // To make isValidGlueLength recognize negative values as
        // the first number this little hack is needed:
@@ -217,7 +220,7 @@ bool isValidGlueLength(string const & data, LyXGlueLength * result)
                break;
        }
        // end of hack
-       
+
        int  pattern_index = 0;
        int  table_index = 0;
        char pattern[20];
@@ -241,7 +244,7 @@ bool isValidGlueLength(string const & data, LyXGlueLength * result)
                if (!*table[table_index].pattern)
                        return false;
        }
-       
+
        // Get the values from the appropriate places.  If an index
        // is zero, the corresponding array value is zero or UNIT_NONE,
        // so we needn't check this.
@@ -286,7 +289,7 @@ bool isValidLength(string const & data, LyXLength * result)
                break;
        }
        // end of hack
-       
+
        number_index = unit_index = 1;  // entries at index 0 are sentinels
 
        // construct "pattern" from "data"
@@ -301,8 +304,8 @@ bool isValidLength(string const & data, LyXLength * result)
        pattern[pattern_index] = '\0';
 
        // only the most basic pattern is accepted here
-       if (compare(pattern, "nu") != 0) return false;          
-       
+       if (compare(pattern, "nu") != 0) return false;
+
        // It _was_ a correct length string.
        // Store away the values we found.
        if (result) {
@@ -343,7 +346,7 @@ VSpace::VSpace(string const & data)
        if (data.empty())
                return;
        double value;
-       string input  = strip(data);
+       string input  = rtrim(data);
 
        string::size_type const length = input.length();
 
@@ -454,14 +457,14 @@ string const VSpace::asLatexCommand(BufferParams const & params) const
        case LENGTH:
        {
                string const lenstr = len_.asLatexString();
-               
+
                ret = keep_ ? "\\vspace*{" + lenstr + '}'
                        : "\\vspace{" + lenstr + '}';
        }
        break;
 
        }
-       
+
        return ret;
 }
 
@@ -473,7 +476,7 @@ int VSpace::inPixels(BufferView * bv) const
        int const default_height = bv->text->defaultHeight(); // [pixels]
 
        int retval = 0;
-       
+
        switch (kind_) {
        case NONE:
                // Value for this is already set
@@ -481,18 +484,18 @@ int VSpace::inPixels(BufferView * bv) const
        case DEFSKIP:
                retval = bv->buffer()->params.getDefSkip().inPixels(bv);
                break;
-                       
+
                // 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;
                break;
-                       
+
        case MEDSKIP:
                retval = default_height / 2;
                break;
-                       
+
        case BIGSKIP:
                retval = default_height;
                break;
@@ -501,13 +504,13 @@ int VSpace::inPixels(BufferView * bv) const
                // leave space for the vfill symbol
                retval = 3 * default_height;
                break;
-               
+
        case LENGTH: {
                int const default_width  = bv->workWidth();
                retval = len_.len().inPixels(default_width, default_height);
                break;
        }
-               
+
        }
        return retval;
 }