anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-11 19:14:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bug #6030: LyX does not take into account BOM in user layout files.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30213 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Enrico Forestieri 2009-06-21 18:23:10 +00:00
parent f4f5178d4f
commit e31e71a7a9
2 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/scripts/layout2layout.py
View File

@ -91,13 +91,25 @@ def trim_eol(line):
return line return line
def trim_bom(line):
" Remove byte order mark."
if line[0:3] == "\357\273\277":
return line[3:]
else:
return line
def read(input): def read(input):
" Read input file and strip lineendings." " Read input file and strip lineendings."
lines = list() lines = list()
first_line = 1
while 1: while 1:
line = input.readline() line = input.readline()
if not line: if not line:
break break
if (first_line):
line = trim_bom(line)
first_line = 0
lines.append(trim_eol(line)) lines.append(trim_eol(line))
return lines return lines

19
src/Lexer.cpp
View File

@ -20,6 +20,7 @@
#include "support/FileName.h" #include "support/FileName.h"
#include "support/filetools.h" #include "support/filetools.h"
#include "support/gzstream.h" #include "support/gzstream.h"
#include "support/lassert.h"
#include "support/lstrings.h" #include "support/lstrings.h"
#include "support/lyxalgo.h" #include "support/lyxalgo.h"
#include "support/types.h" #include "support/types.h"
@ -251,7 +252,8 @@ bool Lexer::Pimpl::setFile(FileName const & filename)
is.rdbuf(&gz_); is.rdbuf(&gz_);
name = filename.absFilename(); name = filename.absFilename();
lineno = 0; lineno = 0;
return gz_.is_open() && is.good(); if (!gz_.is_open() || !is.good())
return false;
} else { } else {
LYXERR(Debug::LYXLEX, "lyxlex: UNcompressed"); LYXERR(Debug::LYXLEX, "lyxlex: UNcompressed");
@ -266,8 +268,21 @@ bool Lexer::Pimpl::setFile(FileName const & filename)
is.rdbuf(&fb_); is.rdbuf(&fb_);
name = filename.absFilename(); name = filename.absFilename();
lineno = 0; lineno = 0;
return fb_.is_open() && is.good(); if (!fb_.is_open() || !is.good())
return false;
} }
// Skip byte order mark.
if (is.peek() == 0xef) {
int c = is.get();
if (is.peek() == 0xbb) {
c = is.get();
LASSERT(is.get() == 0xbf, /**/);
} else
is.unget();
}
return true;
} }