X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxlex.C;h=824173ed83e3f76026d5b89db45b5528201fa0e9;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=afda6e35ebf616a77a9bfe2911950278290a5e4f;hpb=51fa9803d336848b91306997d3ba61b1a4b9f78b;p=lyx.git

diff --git a/src/lyxlex.C b/src/lyxlex.C
index afda6e35eb..824173ed83 100644
--- a/src/lyxlex.C
+++ b/src/lyxlex.C
@@ -18,17 +18,21 @@
 #include "debug.h"
 #include "lyxlex_pimpl.h"
 
+#include "support/convert.h"
 #include "support/lstrings.h"
 
-using lyx::support::compare_ascii_no_case;
-using lyx::support::isStrDbl;
-using lyx::support::isStrInt;
-using lyx::support::ltrim;
-using lyx::support::prefixIs;
-using lyx::support::strToDbl;
-using lyx::support::strToInt;
-using lyx::support::subst;
-using lyx::support::trim;
+#include <sstream>
+
+
+namespace lyx {
+
+using support::compare_ascii_no_case;
+using support::isStrDbl;
+using support::isStrInt;
+using support::ltrim;
+using support::prefixIs;
+using support::subst;
+using support::trim;
 
 using std::endl;
 using std::string;
@@ -121,20 +125,20 @@ int LyXLex::lex()
 int LyXLex::getInteger() const
 {
 	if (isStrInt(pimpl_->getString()))
-		return strToInt(pimpl_->getString());
+		return convert<int>(pimpl_->getString());
 	pimpl_->printError("Bad integer `$$Token'");
 	return -1;
 }
 
 
-float LyXLex::getFloat() const
+double LyXLex::getFloat() const
 {
 	// 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(), ",", ".");
+	string const str = subst(pimpl_->getString(), ",", ".");
 	if (isStrDbl(str))
-		return strToDbl(str);
+		return convert<double>(str);
 	pimpl_->printError("Bad float `$$Token'");
 	return -1;
 }
@@ -146,8 +150,14 @@ string const LyXLex::getString() const
 }
 
 
+docstring const LyXLex::getDocString() const
+{
+	return pimpl_->getDocString();
+}
+
+
 // I would prefer to give a tag number instead of an explicit token
-// here, but it is not possible because Buffer::readBody uses
+// here, but it is not possible because Buffer::readDocument uses
 // explicit tokens (JMarc)
 string const LyXLex::getLongString(string const & endtoken)
 {
@@ -230,32 +240,6 @@ void LyXLex::pushToken(string const & pt)
 	pimpl_->pushToken(pt);
 }
 
-
-int LyXLex::findToken(char const * str[])
-{
-	if (!next()) {
-		pimpl_->printError("file ended while scanning string token");
-		return -1;
-	}
-
-	int i = 0;
-
-	string const search_token = pimpl_->getString();
-
-	if (search_token != "default") {
-		while (str[i][0] && str[i] != search_token) {
-			++i;
-		}
-		if (!str[i][0]) {
-			pimpl_->printError("Unknown argument `$$Token'");
-			i = -1;
-		}
-	}
-
-	return i;
-}
-
-
 LyXLex::operator void const *() const
 {
 	// This behaviour is NOT the same as the std::streams which would
@@ -282,7 +266,17 @@ LyXLex & LyXLex::operator>>(std::string & s)
 }
 
 
-LyXLex & LyXLex::operator>>(float & s)
+LyXLex & LyXLex::operator>>(docstring & s)
+{
+	if (isOK()) {
+		next();
+		s = getDocString();
+	}
+	return *this;
+}
+
+
+LyXLex & LyXLex::operator>>(double & s)
 {
 	if (isOK()) {
 		next();
@@ -321,3 +315,14 @@ LyXLex & LyXLex::operator>>(bool & s)
 	return *this;
 }
 
+
+/// quotes a string, e.g. for use in preferences files or as an argument of the "log" dialog
+string const LyXLex::quoteString(string const & arg)
+{
+	std::ostringstream os;
+	os << '"' << subst(subst(arg, "\\", "\\\\"), "\"", "\\\"") << '"';
+	return os.str();
+}
+
+
+} // namespace lyx