X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxlex.C;h=4dc6bbfa51db87b5c22b78e0c8a557e6df234ca0;hb=2b300d130c21037e9ae9cb547024be53111d2014;hp=7bb8ea59c2d6bd2b941dbde4374305a871c767c9;hpb=45a03f4f67bb00f8142e465c615f348f0622eb32;p=lyx.git

diff --git a/src/lyxlex.C b/src/lyxlex.C
index 7bb8ea59c2..4dc6bbfa51 100644
--- a/src/lyxlex.C
+++ b/src/lyxlex.C
@@ -20,6 +20,7 @@
 #include "lyxlex.h"
 #include "lyxlex_pimpl.h"
 #include "support/filetools.h"
+#include "support/lstrings.h"
 
 using std::ostream;
 using std::istream;
@@ -111,8 +112,8 @@ int LyXLex::lex()
 
 int LyXLex::GetInteger() const
 {
-	if (pimpl_->buff[0] > ' ')   
-		return atoi(pimpl_->buff);
+	if (isStrInt(pimpl_->GetString()))
+		return strToInt(pimpl_->GetString());
 	else {
 		pimpl_->printError("Bad integer `$$Token'");
 		return -1;
@@ -122,12 +123,16 @@ int LyXLex::GetInteger() const
 
 float LyXLex::GetFloat() const
 {
-   if (pimpl_->buff[0] > ' ')
-       return atof(pimpl_->buff);
-   else {
-	pimpl_->printError("Bad float `$$Token'");
-	return -1;
-   }
+	// replace comma with dot in case the file was written with
+	// the wrong locale (should be rare, but is easy enough to
+	// avoid). 
+	string str = subst(pimpl_->GetString(), ",", ".");
+	if (isStrDbl(str))
+		return strToDbl(str);
+	else {
+		pimpl_->printError("Bad float `$$Token'");
+		return -1;
+	}
 }
 
 
@@ -172,7 +177,7 @@ string const LyXLex::getLongString(string const & endtoken)
 			} 
 
 			if (!prefix.empty() 
-			    && prefixIs(tmpstr, prefix.c_str())) {
+			    && prefixIs(tmpstr, prefix)) {
 				tmpstr.erase(0, prefix.length() - 1);
 			}
 			str += frontStrip(tmpstr, "\t") + '\n';