X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLexer.cpp;h=c4b738f119bcf13fe903d8a74df6e53e1514bc28;hb=f5b829bc8abf2e777d8dfc93400ae603d26d3a22;hp=b0fabc29ad68ef673fc840e32c1562f8975b228e;hpb=f1cba8ff64b369792fd49f5ddf90e8126ab476ac;p=lyx.git

diff --git a/src/Lexer.cpp b/src/Lexer.cpp
index b0fabc29ad..c4b738f119 100644
--- a/src/Lexer.cpp
+++ b/src/Lexer.cpp
@@ -14,12 +14,14 @@
 #include <config.h>
 
 #include "Lexer.h"
+#include "Format.h"
 
 #include "support/convert.h"
 #include "support/debug.h"
 #include "support/FileName.h"
 #include "support/filetools.h"
 #include "support/gzstream.h"
+#include "support/lassert.h"
 #include "support/lstrings.h"
 #include "support/lyxalgo.h"
 #include "support/types.h"
@@ -237,9 +239,7 @@ void Lexer::Pimpl::popTable()
 bool Lexer::Pimpl::setFile(FileName const & filename)
 {
 	// Check the format of the file.
-	string const format = filename.guessFormatFromContents();
-
-	if (format == "gzip" || format == "zip" || format == "compress") {
+	if (formats.isZippedFile(filename)) {
 		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
@@ -249,9 +249,10 @@ bool Lexer::Pimpl::setFile(FileName const & filename)
 				"file or stream already set.");
 		gz_.open(filename.toFilesystemEncoding().c_str(), ios::in);
 		is.rdbuf(&gz_);
-		name = filename.absFilename();
+		name = filename.absFileName();
 		lineno = 0;
-		return gz_.is_open() && is.good();
+		if (!gz_.is_open() || !is.good())
+			return false;
 	} else {
 		LYXERR(Debug::LYXLEX, "lyxlex: UNcompressed");
 
@@ -262,12 +263,25 @@ bool Lexer::Pimpl::setFile(FileName const & filename)
 			LYXERR(Debug::LYXLEX, "Error in Lexer::setFile: "
 				"file or stream already set.");
 		}
-		fb_.open(filename.toFilesystemEncoding().c_str(), ios::in);
+		fb_.open(filename.toSafeFilesystemEncoding().c_str(), ios::in);
 		is.rdbuf(&fb_);
-		name = filename.absFilename();
+		name = filename.absFileName();
 		lineno = 0;
-		return fb_.is_open() && is.good();
+		if (!fb_.is_open() || !is.good())
+			return false;
+	}
+
+	// Skip byte order mark.
+	if (is.peek() == 0xef) {
+		is.get();
+		if (is.peek() == 0xbb) {
+			is.get();
+			LASSERT(is.get() == 0xbf, /**/);
+		} else
+			is.unget();
 	}
+
+	return true;
 }
 
 
@@ -458,7 +472,7 @@ bool Lexer::Pimpl::eatLine()
 		is.get(cc);
 		c = cc;
 		//LYXERR(Debug::LYXLEX, "Lexer::EatLine read char: `" << c << '\'');
-		if (c != '\r')
+		if (c != '\r' && is)
 			buff.push_back(c);
 	}
 
@@ -555,7 +569,7 @@ void Lexer::Pimpl::pushToken(string const & pt)
 //////////////////////////////////////////////////////////////////////
 
 Lexer::Lexer()
-	: pimpl_(new Pimpl(0, 0))
+	: pimpl_(new Pimpl(0, 0)), lastReadOk_(false)
 {}
 
 
@@ -901,6 +915,18 @@ string Lexer::quoteString(string const & arg)
 }
 
 
+// same for docstring
+docstring Lexer::quoteString(docstring const & arg)
+{
+	docstring res;
+	res += '"';
+	res += subst(subst(arg, from_ascii("\\"), from_ascii("\\\\")), 
+		     from_ascii("\""), from_ascii("\\\""));
+	res += '"';
+	return res;
+}
+
+
 Lexer & Lexer::operator>>(char const * required)
 {
 	string token;