X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLexer.cpp;h=78bf9f49c23394c86c265eabbadebd911d349b67;hb=bf56e2c8e1afa857cd5e313c19948040e41b8227;hp=06a3408f41e9591d77afabfbb3074d2f3b18d9de;hpb=26e5f1a8ec3eb2952e49c87c91395fdcdceddfe9;p=lyx.git

diff --git a/src/Lexer.cpp b/src/Lexer.cpp
index 06a3408f41..78bf9f49c2 100644
--- a/src/Lexer.cpp
+++ b/src/Lexer.cpp
@@ -238,14 +238,8 @@ void Lexer::Pimpl::popTable()
 
 bool Lexer::Pimpl::setFile(FileName const & filename)
 {
-#ifdef TEX2LYX
-	// tex2lyx does not read lyxrc and therefore can't really check for
-	// zipped formats.
-	if (false) {
-#else
 	// Check the format of the file.
 	if (formats.isZippedFile(filename)) {
-#endif
 		LYXERR(Debug::LYXLEX, "lyxlex: compressed");
 		// The check only outputs a debug message, because it triggers
 		// a bug in compaq cxx 6.2, where is_open() returns 'true' for
@@ -326,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 :-)
@@ -354,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;
@@ -575,7 +567,7 @@ void Lexer::Pimpl::pushToken(string const & pt)
 //////////////////////////////////////////////////////////////////////
 
 Lexer::Lexer()
-	: pimpl_(new Pimpl(0, 0))
+	: pimpl_(new Pimpl(0, 0)), lastReadOk_(false)
 {}
 
 
@@ -701,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();
 }
@@ -726,28 +718,27 @@ docstring const Lexer::getDocString() const
 // I would prefer to give a tag number instead of an explicit token
 // here, but it is not possible because Buffer::readDocument uses
 // explicit tokens (JMarc)
-string const Lexer::getLongString(string const & endtoken)
+docstring Lexer::getLongString(docstring const & endtoken)
 {
-	string str;
-	string prefix;
+	docstring str;
+	docstring prefix;
 	bool firstline = true;
 
 	while (pimpl_->is) { //< eatLine only reads from is, not from pushTok
 		if (!eatLine())
 			// blank line in the file being read
 			continue;
+		docstring tmpstr = getDocString();
+		docstring const token = trim(tmpstr, " \t");
 
-		string const token = trim(getString(), " \t");
-
-		LYXERR(Debug::PARSER, "LongString: `" << getString() << '\'');
+		LYXERR(Debug::PARSER, "LongString: `" << tmpstr << '\'');
 
 		// We do a case independent comparison, like searchKeyword does.
-		if (compare_ascii_no_case(token, endtoken) == 0)
+		if (compare_no_case(token, endtoken) == 0)
 			break;
 
-		string tmpstr = getString();
 		if (firstline) {
-			size_t i = tmpstr.find_first_not_of(' ');
+			size_t i = tmpstr.find_first_not_of(char_type(' '));
 			if (i != string::npos)
 				prefix = tmpstr.substr(0, i);
 			firstline = false;
@@ -763,7 +754,7 @@ string const Lexer::getLongString(string const & endtoken)
 	}
 
 	if (!pimpl_->is)
-		printError("Long string not ended by `" + endtoken + '\'');
+		printError("Long string not ended by `" + to_utf8(endtoken) + '\'');
 
 	return str;
 }