removed a warning from screen and added CFLAGS in lyx.spec.in.

[lyx.git] / src / vspace.C

diff --git a/src/vspace.C b/src/vspace.C
index 57e8cfc127dbc84e25eb11810b0b0079c2109e91..dfb2c3b3886df71361dcdd348f69549e92f3f7cb 100644 (file)
--- a/src/vspace.C
+++ b/src/vspace.C
@@ -94,11 +94,10 @@ static char nextToken (string & data)
                // I really mean assignment ("=") below, not equality!
                if ((i = data.find_last_of("0123456789.")) != string::npos) {
                        if (number_index > 3) return 'E';  // Error
-                       ++i;
-                        string buffer = data.substr(0, i);
+                        string buffer = data.substr(0, i + 1);
                        if (sscanf (buffer.c_str(),
                                    "%f", &number[number_index]) == 1) {
-                               advance (data, i);
+                               advance (data, i + 1);
                                ++number_index;
                                return 'n';
                        } else 
@@ -106,11 +105,10 @@ static char nextToken (string & data)
                } else if ((i=data.find_last_of("abcdefghijklmnopqrstuvwxyz"))
                           != string::npos) {
                        if (unit_index > 3) return 'E';  // Error
-                       ++i;
-                       string buffer = data.substr(0, i);
+                       string buffer = data.substr(0, i + 1);
                        unit[unit_index] = unitFromString (buffer);
                        if (unit[unit_index] != LyXLength::UNIT_NONE) {
-                               advance (data, i);
+                               advance (data, i + 1);
                                ++unit_index;
                                return 'u';
                        } else