lyx_advance(data, 5);
return '-';
} else {
- string::size_type i;
-
- // I really mean assignment ("=") below, not equality!
- if ((i = data.find_last_of("0123456789.")) != string::npos) {
- if (number_index > 3) return 'E'; // Error
- string buffer = data.substr(0, i + 1);
- double x = strToDbl(buffer);
- if (x || (buffer[0] == '0')) {
- number[number_index] = x;
- lyx_advance(data, i + 1);
+ string::size_type i = data.find_first_not_of("0123456789.");
+
+ if (i != 0) {
+ if (number_index > 3) return 'E';
+
+ string buffer;
+
+ // we have found some number
+ if (i == string::npos) {
+ buffer = data;
+ i = data.size() + 1;
+ } else
+ buffer = data.substr(0, i);
+
+ lyx_advance(data, i);
+
+ if (isStrDbl(buffer)) {
+ number[number_index] = strToDbl(buffer);
++number_index;
return 'n';
- } else
- return 'E'; // Error
- } else if ((i = data.find_last_of("abcdefghijklmnopqrstuvwxyz"))
- != string::npos) {
- if (unit_index > 3) return 'E'; // Error
- string buffer = data.substr(0, i + 1);
- unit[unit_index] = unitFromString(buffer);
+ } 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;
+ i = data.size() + 1;
+ } else
+ buffer = data.substr(0, i);
+
+ // possibly we have "mmplus" string or similar
+ if (buffer.size() > 5 && (buffer.substr(2,4) == string("plus") || buffer.substr(2,5) == string("minus"))) {
+ lyx_advance(data, 2);
+ unit[unit_index] = unitFromString(buffer.substr(0, 2));
+ } else {
+ lyx_advance(data, i);
+ unit[unit_index] = unitFromString(buffer);
+ }
+
if (unit[unit_index] != LyXLength::UNIT_NONE) {
- lyx_advance(data, i + 1);
++unit_index;
return 'u';
- } else
- return 'E'; // Error
- } else
- return 'E'; // Error
+ } else return 'E'; // Error
+ }
+ return 'E'; // Error
}
}
// To make isValidGlueLength recognize negative values as
// the first number this little hack is needed:
short val_sign = 1; // positive as default
- switch(buffer[0]) {
+ switch (buffer[0]) {
case '-':
lyx_advance(buffer, 1);
val_sign = -1;
// To make isValidLength recognize negative values
// this little hack is needed:
short val_sign = 1; // positive as default
- switch(buffer[0]) {
+ switch (buffer[0]) {
case '-':
lyx_advance(buffer, 1);
val_sign = -1;
string const LyXLength::asString() const
{
-//#ifdef HAVE_SSTREAM
std::ostringstream buffer;
buffer << val << unit_name[uni]; // setw?
return buffer.str().c_str();
-//#else
-// char tbuf[20];
-// ostrstream buffer(tbuf, 20);
-// buffer << val << unit_name[uni] << '\0'; // setw?
-// return buffer.str();
-//#endif
}
string const LyXGlueLength::asString() const
{
-//#ifdef HAVE_SSTREAM
std::ostringstream buffer;
-//#else
-// char tbuf[20];
-// ostrstream buffer(tbuf, 20);
-//#endif
+
if (plus_val != 0.0)
if (minus_val != 0.0)
if ((uni == plus_uni) && (uni == minus_uni))
<< unit_name[minus_uni];
else
buffer << val << unit_name[uni];
-//#ifdef HAVE_SSTREAM
+
return buffer.str().c_str();
-//#else
-// buffer << '\0';
-// return buffer.str();
-//#endif
}
string const LyXGlueLength::asLatexString() const
{
-//#ifdef HAVE_SSTREAM
std::ostringstream buffer;
-//#else
-// char tbuf[40];
-// ostrstream buffer(tbuf, 40);
-//#endif
if (plus_val != 0.0)
if (minus_val != 0.0)
<< minus_val << unit_name[minus_uni];
else
buffer << val << unit_name[uni];
-//#ifdef HAVE_SSTREAM
+
return buffer.str().c_str();
-//#else
-// buffer << '\0';
-// return buffer.str();
-//#endif
}
else if (prefixIs (input, "vfill")) kin = VFILL;
else if (isValidGlueLength (input, &len))
kin = LENGTH;
- else if (sscanf (input.c_str(), "%f", &value) == 1) {
+ else if (sscanf(input.c_str(), "%f", &value) == 1) {
// This last one is for reading old .lyx files
// without units in added_space_top/bottom.
// Let unit default to centimeters here.