anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 10:00:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve comments and add missing decoding call

Browse Source 
We do already fill the first line of the body in the first pass, so the body
has to be converted to the correct encoding as well.
This commit is contained in:
Georg Baum 2016-06-11 14:45:18 +02:00
parent b170b6e40f
commit 72c6602b13
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/lyx2lyx/LyX.py
View File

@ -280,17 +280,20 @@ class LyX_base:
"""Reads a file into the self.header and """Reads a file into the self.header and
self.body parts, from self.input.""" self.body parts, from self.input."""
# First pass: Read header to determine file encoding
while True: while True:
line = self.input.readline() line = self.input.readline()
if not line: if not line:
self.error("Invalid LyX file.") # eof found before end of header
self.error("Invalid LyX file: Missing body.")
line = trim_eol(line) line = trim_eol(line)
if check_token(line, '\\begin_preamble'): if check_token(line, '\\begin_preamble'):
while 1: while 1:
line = self.input.readline() line = self.input.readline()
if not line: if not line:
self.error("Invalid LyX file.") # eof found before end of header
self.error("Invalid LyX file: Missing body.")
line = trim_eol(line) line = trim_eol(line)
if check_token(line, '\\end_preamble'): if check_token(line, '\\end_preamble'):
@ -345,6 +348,8 @@ class LyX_base:
self.header[i] = self.header[i].decode(self.encoding) self.header[i] = self.header[i].decode(self.encoding)
for i in range(len(self.preamble)): for i in range(len(self.preamble)):
self.preamble[i] = self.preamble[i].decode(self.encoding) self.preamble[i] = self.preamble[i].decode(self.encoding)
for i in range(len(self.body)):
self.body[i] = self.body[i].decode(self.encoding)
# Read document body # Read document body
while 1: while 1: