X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLexer.cpp;h=25d337a0793287e3ac6ba8e532dc74ca821b076f;hb=0430132aa049f2a97280bcbcff69f71d42ed7d98;hp=df2ce6913100ef292cb1c5f8f22f16fe92acff33;hpb=c6c07d28ae99a0dee5fc4b76aae2827d3d09cf93;p=lyx.git

diff --git a/src/Lexer.cpp b/src/Lexer.cpp
index df2ce69131..25d337a079 100644
--- a/src/Lexer.cpp
+++ b/src/Lexer.cpp
@@ -320,12 +320,11 @@ bool Lexer::Pimpl::next(bool esc /* = false */)
 	}
 
 
-	unsigned char c = 0; // getc() returns an int
 	char cc = 0;
 	status = 0;
 	while (is && !status) {
 		is.get(cc);
-		c = cc;
+		unsigned char c = cc;
 
 		if (c == commentChar) {
 			// Read rest of line (fast :-)
@@ -348,9 +347,8 @@ bool Lexer::Pimpl::next(bool esc /* = false */)
 
 			if (esc) {
 
-				bool escaped = false;
 				do {
-					escaped = false;
+					bool escaped = false;
 					is.get(cc);
 					c = cc;
 					if (c == '\r') continue;
@@ -569,7 +567,7 @@ void Lexer::Pimpl::pushToken(string const & pt)
 //////////////////////////////////////////////////////////////////////
 
 Lexer::Lexer()
-	: pimpl_(new Pimpl(0, 0))
+	: pimpl_(new Pimpl(0, 0)), lastReadOk_(false)
 {}
 
 
@@ -695,23 +693,23 @@ double Lexer::getFloat() const
 }
 
 
-string const Lexer::getString() const
+string const Lexer::getString(bool trim) const
 {
 	lastReadOk_ = pimpl_->status == LEX_DATA || pimpl_->status == LEX_TOKEN;
 
 	if (lastReadOk_)
-	return pimpl_->getString();
+		return trim ? support::trim(pimpl_->getString(), "\t ") : pimpl_->getString();
 
 	return string();
 }
 
 
-docstring const Lexer::getDocString() const
+docstring const Lexer::getDocString(bool trim) const
 {
 	lastReadOk_ = pimpl_->status == LEX_DATA || pimpl_->status == LEX_TOKEN;
 
 	if (lastReadOk_)
-		return pimpl_->getDocString();
+		return trim ? support::trim(pimpl_->getDocString(), "\t ") : pimpl_->getDocString();
 
 	return docstring();
 }