X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flyx2lyx%2FLyX.py;h=187a30821322fa0edc13db30ac5aff2ac16c7eb4;hb=b8227ebda0a2a8127731749d2caaa5dae45ef5d7;hp=b08fce2abd03753a3d84e1c4c2a2f10276d1c917;hpb=4bd289f1e34301fbc352d188380d1cd808154873;p=lyx.git diff --git a/lib/lyx2lyx/LyX.py b/lib/lyx2lyx/LyX.py index b08fce2abd..187a308213 100644 --- a/lib/lyx2lyx/LyX.py +++ b/lib/lyx2lyx/LyX.py @@ -16,14 +16,16 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -from parser_tools import get_value, check_token, find_token, find_tokens, find_end_of, find_end_of_inset +from parser_tools import get_value, check_token, find_token,\ + find_tokens, find_end_of, find_end_of_inset import os.path import gzip import sys import re import string +import time -version = "1.4.0cvs" +version_lyx2lyx = "1.4.0cvs" default_debug_level = 2 # Regular expressions used @@ -43,8 +45,8 @@ format_relation = [("0_10", [210], ["0.10.7","0.10"]), ("1_1_6", [217], ["1.1.6","1.1.6fix1","1.1.6fix2","1.1"]), ("1_1_6fix3", [218], ["1.1.6fix3","1.1.6fix4","1.1"]), ("1_2", [220], ["1.2.0","1.2.1","1.2.3","1.2.4","1.2"]), - ("1_3", [221], ["1.3.0","1.3.1","1.3.2","1.3.3","1.3.4","1.3.5","1.3"]), - ("1_4", range(223,239), ["1.4.0cvs","1.4"])] + ("1_3", [221], ["1.3.0","1.3.1","1.3.2","1.3.3","1.3.4","1.3.5","1.3.6","1.3"]), + ("1_4", range(222,246), ["1.4.0cvs","1.4"])] def formats_list(): @@ -71,12 +73,20 @@ def get_backend(textclass): return "latex" +def trim_eol(line): + " Remove end of line char(s)." + if line[-2:-1] == '\r': + return line[:-2] + else: + return line[:-1] + + ## # Class # class LyX_Base: """This class carries all the information of the LyX file.""" - def __init__(self, end_format = 0, input = "", output = "", error = "", debug = default_debug_level): + def __init__(self, end_format = 0, input = "", output = "", error = "", debug = default_debug_level, try_hard = 0): """Arguments: end_format: final format that the file should be converted. (integer) input: the name of the input source, if empty resort to standard input. @@ -84,14 +94,7 @@ class LyX_Base: error: the name of the error file, if empty use the standard error. debug: debug level, O means no debug, as its value increases be more verbose. """ - if input and input != '-': - self.input = self.open(input) - else: - self.input = sys.stdin - if output: - self.output = open(output, "w") - else: - self.output = sys.stdout + self.choose_io(input, output) if error: self.err = open(error, "w") @@ -99,6 +102,7 @@ class LyX_Base: self.err = sys.stderr self.debug = debug + self.try_hard = try_hard if end_format: self.end_format = self.lyxformat(end_format) @@ -107,46 +111,66 @@ class LyX_Base: self.backend = "latex" self.textclass = "article" + # This is a hack: We use '' since we don't know the default + # layout of the text class. LyX will parse it as default layout. + # FIXME: Read the layout file and use the real default layout + self.default_layout = '' self.header = [] + self.preamble = [] self.body = [] + self.status = 0 def warning(self, message, debug_level= default_debug_level): " Emits warning to self.error, if the debug_level is less than the self.debug." if debug_level <= self.debug: - self.err.write(message + "\n") + self.err.write("Warning: " + message + "\n") def error(self, message): - " Emits a warning and exist incondicionally." + " Emits a warning and exits if not in try_hard mode." self.warning(message) - self.warning("Quiting.") - sys.exit(1) + if not self.try_hard: + self.warning("Quiting.") + sys.exit(1) + + self.status = 2 def read(self): """Reads a file into the self.header and self.body parts, from self.input.""" - preamble = 0 while 1: line = self.input.readline() if not line: self.error("Invalid LyX file.") - line = line[:-1] - # remove '\r' from line's end, if present - if line[-1:] == '\r': - line = line[:-1] - + line = trim_eol(line) if check_token(line, '\\begin_preamble'): - preamble = 1 + while 1: + line = self.input.readline() + if not line: + self.error("Invalid LyX file.") + + line = trim_eol(line) + if check_token(line, '\\end_preamble'): + break + + if string.split(line)[:0] in ("\\layout", "\\begin_layout", "\\begin_body"): + self.warning("Malformed LyX file: Missing '\\end_preamble'.") + self.warning("Adding it now and hoping for the best.") + + self.preamble.append(line) + if check_token(line, '\\end_preamble'): - preamble = 0 + continue - if not preamble: - line = string.strip(line) + line = string.strip(line) + if not line: + continue - if not line and not preamble: + if string.split(line)[0] in ("\\layout", "\\begin_layout", "\\begin_body"): + self.body.append(line) break self.header.append(line) @@ -155,11 +179,7 @@ class LyX_Base: line = self.input.readline() if not line: break - # remove '\r' from line's end, if present - if line[-2:-1] == '\r': - self.body.append(line[:-2]) - else: - self.body.append(line[:-1]) + self.body.append(trim_eol(line)) self.textclass = get_value(self.header, "\\textclass", 0) self.backend = get_backend(self.textclass) @@ -175,23 +195,39 @@ class LyX_Base: self.set_version() self.set_format() - for line in self.header: - self.output.write(line+"\n") - self.output.write("\n") - for line in self.body: + if self.preamble: + i = find_token(self.header, '\\textclass', 0) + 1 + preamble = ['\\begin_preamble'] + self.preamble + ['\\end_preamble'] + if i == 0: + self.error("Malformed LyX file: Missing '\\textclass'.") + else: + header = self.header[:i] + preamble + self.header[i:] + else: + header = self.header + + for line in header + [''] + self.body: self.output.write(line+"\n") - def open(self, file): - """Transparently deals with compressed files.""" + def choose_io(self, input, output): + """Choose input and output streams, dealing transparently with + compressed files.""" + + if output: + self.output = open(output, "wb") + else: + self.output = sys.stdout - self.dir = os.path.dirname(os.path.abspath(file)) - try: - gzip.open(file).readline() - self.output = gzip.GzipFile("","wb",6,self.output) - return gzip.open(file) - except: - return open(file) + if input and input != '-': + self.dir = os.path.dirname(os.path.abspath(input)) + try: + gzip.open(input).readline() + self.input = gzip.open(input) + self.output = gzip.GzipFile(mode="wb", fileobj=self.output) + except: + self.input = open(input) + else: + self.input = sys.stdin def lyxformat(self, format): @@ -224,7 +260,7 @@ class LyX_Base: def set_version(self): " Set the header with the version used." - self.header[0] = "#LyX %s created this file. For more info see http://www.lyx.org/" % version + self.header[0] = "#LyX %s created this file. For more info see http://www.lyx.org/" % version_lyx2lyx if self.header[1][0] == '#': del self.header[1] @@ -254,19 +290,55 @@ class LyX_Base: " Set the value of the header parameter." i = find_token(self.header, '\\' + param, 0) if i == -1: - self.warning(3, 'Parameter not found in the header: %s' % param) + self.warning('Parameter not found in the header: %s' % param, 3) return self.header[i] = '\\%s %s' % (param, str(value)) + def is_default_layout(self, layout): + " Check whether a layout is the default layout of this class." + # FIXME: Check against the real text class default layout + if layout == 'Standard' or layout == self.default_layout: + return 1 + return 0 + + def convert(self): "Convert from current (self.format) to self.end_format." mode, convertion_chain = self.chain() self.warning("convertion chain: " + str(convertion_chain), 3) for step in convertion_chain: - convert_step = getattr(__import__("lyx_" + step), mode) - convert_step(self) + steps = getattr(__import__("lyx_" + step), mode) + + self.warning("Convertion step: %s - %s" % (step, mode), default_debug_level + 1) + if not steps: + self.error("The convertion to an older format (%s) is not implemented." % self.format) + + multi_conv = len(steps) != 1 + for version, table in steps: + if multi_conv and \ + (self.format >= version and mode == "convert") or\ + (self.format <= version and mode == "revert"): + continue + + for conv in table: + init_t = time.time() + try: + conv(self) + except: + self.warning("An error ocurred in %s, %s" % (version, str(conv)), + default_debug_level) + if not self.try_hard: + raise + self.status = 2 + else: + self.warning("%lf: Elapsed time on %s" % (time.time() - init_t, str(conv)), + default_debug_level + 1) + + self.format = version + if self.end_format == self.format: + return def chain(self): @@ -317,7 +389,7 @@ class LyX_Base: steps.append(step[0]) else: mode = "revert" - relation_format = format_relation + relation_format = format_relation[:] relation_format.reverse() last_step = None @@ -336,6 +408,7 @@ class LyX_Base: " Returns the TOC of this LyX document." paragraphs_filter = {'Title' : 0,'Chapter' : 1, 'Section' : 2, 'Subsection' : 3, 'Subsubsection': 4} allowed_insets = ['Quotes'] + allowed_parameters = '\\paragraph_spacing', '\\noindent', '\\align', '\\labelwidthstring', "\\start_of_appendix", "\\leftindent" sections = [] for section in paragraphs_filter.keys(): @@ -361,7 +434,7 @@ class LyX_Base: k = i + 1 # skip paragraph parameters - while not self.body[k] or self.body[k][0] == '\\': + while not string.strip(self.body[k]) or string.split(self.body[k])[0] in allowed_parameters: k = k +1 while k < j: @@ -391,8 +464,8 @@ class LyX_Base: class File(LyX_Base): " This class reads existing LyX files." - def __init__(self, end_format = 0, input = "", output = "", error = "", debug = default_debug_level): - LyX_Base.__init__(self, end_format, input, output, error, debug) + def __init__(self, end_format = 0, input = "", output = "", error = "", debug = default_debug_level, try_hard = 0): + LyX_Base.__init__(self, end_format, input, output, error, debug, try_hard) self.read() @@ -412,7 +485,6 @@ class NewFile(LyX_Base): "\\graphics default", "\\paperfontsize default", "\\papersize default", - "\\paperpackage none", "\\use_geometry false", "\\use_amsmath 1", "\\cite_engine basic", @@ -423,7 +495,6 @@ class NewFile(LyX_Base): "\\paragraph_separation indent", "\\defskip medskip", "\\quotes_language english", - "\\quotes_times 2", "\\papercolumns 1", "\\papersides 1", "\\paperpagestyle default",