From bc7f66b2b73ca205423d1d19025c6a3f858dcee3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Matox?= Date: Wed, 14 Apr 2004 08:45:46 +0000 Subject: [PATCH] The big lyx2lyx rewrite. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8653 a592a061-630c-0410-9148-cb99ea01b6c8 --- lib/lyx2lyx/ChangeLog | 9 + lib/lyx2lyx/error.py | 30 - lib/lyx2lyx/lyx2lyx | 170 +-- .../{lyxconvert_210.py => lyx_0_12.py} | 39 +- .../{lyxconvert_231.py => lyx_1_0_0.py} | 12 +- .../{lyxconvert_229.py => lyx_1_0_1.py} | 12 +- .../{lyxrevert_230.py => lyx_1_1_4.py} | 12 +- .../{lyxconvert_215.py => lyx_1_1_5.py} | 23 +- .../{lyxconvert_216.py => lyx_1_1_6.py} | 28 +- .../{lyxconvert_217.py => lyx_1_1_6fix3.py} | 27 +- lib/lyx2lyx/{lyxconvert_218.py => lyx_1_2.py} | 46 +- lib/lyx2lyx/{lyxconvert_220.py => lyx_1_3.py} | 18 +- lib/lyx2lyx/lyx_1_4.py | 1243 +++++++++++++++++ lib/lyx2lyx/lyxconvert_221.py | 49 - lib/lyx2lyx/lyxconvert_223.py | 126 -- lib/lyx2lyx/lyxconvert_224.py | 232 --- lib/lyx2lyx/lyxconvert_225.py | 37 - lib/lyx2lyx/lyxconvert_226.py | 40 - lib/lyx2lyx/lyxconvert_227.py | 88 -- lib/lyx2lyx/lyxconvert_228.py | 103 -- lib/lyx2lyx/lyxconvert_230.py | 29 - lib/lyx2lyx/lyxrevert_223.py | 64 - lib/lyx2lyx/lyxrevert_224.py | 60 - lib/lyx2lyx/lyxrevert_225.py | 306 ---- lib/lyx2lyx/lyxrevert_226.py | 36 - lib/lyx2lyx/lyxrevert_227.py | 53 - lib/lyx2lyx/lyxrevert_228.py | 89 -- lib/lyx2lyx/lyxrevert_229.py | 25 - lib/lyx2lyx/lyxrevert_231.py | 29 - lib/lyx2lyx/lyxrevert_232.py | 29 - lib/lyx2lyx/parser_tools.py | 169 ++- 31 files changed, 1624 insertions(+), 1609 deletions(-) delete mode 100644 lib/lyx2lyx/error.py rename lib/lyx2lyx/{lyxconvert_210.py => lyx_0_12.py} (93%) rename lib/lyx2lyx/{lyxconvert_231.py => lyx_1_0_0.py} (78%) rename lib/lyx2lyx/{lyxconvert_229.py => lyx_1_0_1.py} (78%) rename lib/lyx2lyx/{lyxrevert_230.py => lyx_1_1_4.py} (78%) rename lib/lyx2lyx/{lyxconvert_215.py => lyx_1_1_5.py} (93%) rename lib/lyx2lyx/{lyxconvert_216.py => lyx_1_1_6.py} (95%) rename lib/lyx2lyx/{lyxconvert_217.py => lyx_1_1_6fix3.py} (91%) rename lib/lyx2lyx/{lyxconvert_218.py => lyx_1_2.py} (95%) rename lib/lyx2lyx/{lyxconvert_220.py => lyx_1_3.py} (88%) create mode 100644 lib/lyx2lyx/lyx_1_4.py delete mode 100644 lib/lyx2lyx/lyxconvert_221.py delete mode 100644 lib/lyx2lyx/lyxconvert_223.py delete mode 100644 lib/lyx2lyx/lyxconvert_224.py delete mode 100644 lib/lyx2lyx/lyxconvert_225.py delete mode 100644 lib/lyx2lyx/lyxconvert_226.py delete mode 100644 lib/lyx2lyx/lyxconvert_227.py delete mode 100644 lib/lyx2lyx/lyxconvert_228.py delete mode 100644 lib/lyx2lyx/lyxconvert_230.py delete mode 100644 lib/lyx2lyx/lyxrevert_223.py delete mode 100644 lib/lyx2lyx/lyxrevert_224.py delete mode 100644 lib/lyx2lyx/lyxrevert_225.py delete mode 100644 lib/lyx2lyx/lyxrevert_226.py delete mode 100644 lib/lyx2lyx/lyxrevert_227.py delete mode 100644 lib/lyx2lyx/lyxrevert_228.py delete mode 100644 lib/lyx2lyx/lyxrevert_229.py delete mode 100644 lib/lyx2lyx/lyxrevert_231.py delete mode 100644 lib/lyx2lyx/lyxrevert_232.py diff --git a/lib/lyx2lyx/ChangeLog b/lib/lyx2lyx/ChangeLog index a3d7ace5a0..46b9183bd9 100644 --- a/lib/lyx2lyx/ChangeLog +++ b/lib/lyx2lyx/ChangeLog @@ -1,3 +1,12 @@ +2004-03-31 Georg Baum + + * lyxconvert_229.py (convert_jurabib): new, add use_jurabib flag + * lyxrevert_230.py (convert_jurabib): new, remove use_jurabib flag + * lyxconvert_230.py (convert_float): new, add sideways flag + * lyxrevert_231.py (convert_float): new, remove sideways flag + * lyxconvert_231.py (convert_bibtopic): new, add use_bibtopic flag + * lyxrevert_232.py (convert_bibtopic): new, remove use_bibtopic flag + 2004-03-29 Jürgen Spitzmüller * lyx2lyx: up the format to 232. diff --git a/lib/lyx2lyx/error.py b/lib/lyx2lyx/error.py deleted file mode 100644 index 79eec9fa3a..0000000000 --- a/lib/lyx2lyx/error.py +++ /dev/null @@ -1,30 +0,0 @@ -# This file is part of lyx2lyx -# -*- coding: iso-8859-1 -*- -# Copyright (C) 2002-2003 José Matos -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -class Error: - invalid_file = "Invalid LyX file\n" - invalid_format = "Invalid LyX format\n" - format_not_supported = "Format not supported\n" - same_format = "No convertion because start and ending formats are the same\n" - newer_format = "Starting format is newer than end format\n" - -class Warning: - dont_match = "Proposed and input file formats do not match" - -error = Error() -warning = Warning() diff --git a/lib/lyx2lyx/lyx2lyx b/lib/lyx2lyx/lyx2lyx index 535ba1d97e..b96af09b11 100755 --- a/lib/lyx2lyx/lyx2lyx +++ b/lib/lyx2lyx/lyx2lyx @@ -1,6 +1,6 @@ #! /usr/bin/env python # -*- coding: iso-8859-1 -*- -# Copyright (C) 2002-2003 José Matos +# Copyright (C) 2002-2004 José Matos # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -16,32 +16,31 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -import getopt, sys, string, re -from error import error, warning -from parser_tools import set_comment, set_format, check_token +import getopt import gzip - -version = "1.4.0cvs" +import sys +from parser_tools import read_file, write_file, read_version, set_version, \ + read_format, set_format, chain, lyxformat, get_value # Allow the dummy object to be able to carry related data # like a C struct class struct: - pass - -# options object, with default values -opt = struct() - -opt.output = sys.stdout -opt.input = sys.stdin -opt.err = sys.stderr -opt.start = None -opt.end = None -opt.quiet = 0 - -format = re.compile(r"(\d)[\.,]?(\d\d)") -fileformat = re.compile(r"\\lyxformat\s*(\S*)") -lst_ft = [210, 215, 216, 217, 218, 220, 221, 223, 224, 225, 226, 227, 228, 229, - 230, 231, 232] + def __init__(self): + self.output = sys.stdout + self.input = sys.stdin + self.err = sys.stderr + self.debug = 1 + self.start = None + self.end = None + + def warning(self, message, debug_level= 10): + if debug_level <= self.debug: + self.err.write(message + "\n") + + def error(self, message): + self.warning(message) + self.warning("Quiting.") + sys.exit(1) def usage(): print """Usage: lyx2lyx [options] [file] @@ -52,7 +51,7 @@ Options: -h, --help this information -v, --version output version information and exit -l, --list list all available formats - -d, --debug level level=0..2 (O_ no debug information,2_verbose) + -d, --debug level level=0..2 (O_ no debug information, 2_verbose) default: level=1 -e, --err error_file name of the error file or else goes to stderr -f, --from version initial version (optional) @@ -61,7 +60,7 @@ Options: -q, --quiet same as --debug=0""" -def parse_options(argv): +def parse_options(argv, version, opt): _options = ["help", "version", "list", "debug=", "err=", "from=", "to=", "output=", "quiet"] try: opts, args = getopt.getopt(argv[1:], "d:e:f:hlo:qt:v", _options) @@ -74,28 +73,25 @@ def parse_options(argv): usage() sys.exit() if o in ("-v", "--version"): - print "lyxconvert, version %s" %(version) - print "Copyright (C) 2002-2003 José Matos and Dekel Tsur" + print "lyx2lyx, version %s" %(version) + print "Copyright (C) 2002-2004 José Matos and Dekel Tsur" sys.exit() if o in ("-d", "--debug"): opt.debug = int(a) if o in ("-q", "--quiet"): opt.debug = 0 if o in ("-l", "--list"): - print lst_ft + # list available formats sys.exit() if o in ("-o", "--output"): opt.output = open(a, "w") if o in ("-f", "--from"): - opt.start = lyxformat(a) + opt.start = lyxformat(a, opt) if o in ("-t", "--to"): - opt.end = lyxformat(a) + opt.end = lyxformat(a, opt) if o in ("-e","--err"): opt.err = open(a, "w") - if not opt.end: - opt.end = lst_ft[len(lst_ft)-1] - if args: file = args[0] try: @@ -105,94 +101,34 @@ def parse_options(argv): except: opt.input = open(file) -def lyxformat(fmt): - result = format.match(fmt) - if result: - fmt = int(result.group(1) + result.group(2)) - else: - opt.err.write(str(fmt) + ": " + error.invalid_format) - sys.exit(2) - - if fmt in lst_ft: - return fmt - - opt.err.write(str(fmt) + ": " + error.format_not_supported) - sys.exit(1) - -def read_file(file, header, body): - """Reads a file into the header and body parts""" - fmt = None - preamble = 0 - - while 1: - line = file.readline() - if not line: - opt.err.write(error.invalid_file) - sys.exit(3) - - line = line[:-1] - if check_token(line, '\\begin_preamble'): - preamble = 1 - if check_token(line, '\\end_preamble'): - preamble = 0 - - if not preamble: - line = string.strip(line) - - if not line and not preamble: - break - - header.append(line) - result = fileformat.match(line) - if result: - fmt = lyxformat(result.group(1)) - - while 1: - line = file.readline() - if not line: - break - body.append(line[:-1]) - - if not fmt: - opt.err.write(error.invalid_file) - sys.exit(3) - return fmt - -def write_file(file, header, body): - for line in header: - file.write(line+"\n") - file.write("\n") - for line in body: - file.write(line+"\n") - def main(argv): - parse_options(argv) + version = "1.4.0cvs" + + # options object, with default values + opt = struct() + + parse_options(argv, version, opt) header, body = [], [] - fmt = read_file(opt.input, header, body) - - if opt.start: - if opt.start != fmt: - opt.err.write("%s: %s %s\n" % (warning.dont_match, opt.start, fmt)) - else: - opt.start = fmt - - # Convertion chain - if opt.start < opt.end: - mode = "lyxconvert_" - else: - lst_ft.reverse() - mode = "lyxrevert_" - - start = lst_ft.index(opt.start) - end = lst_ft.index(opt.end) - - for fmt in lst_ft[start:end]: - __import__(mode + str(fmt)).convert(header,body) - - set_comment(header, version) - set_format(header, opt.end) - write_file(opt.output, header, body) + + read_file(header, body, opt) + + initial_version = read_version(header) + opt.format = read_format(header, opt) + opt.language = get_value(header, "\\language", 0) + if opt.language == "": + opt.language = "english" + + mode, convertion_chain = chain(opt, initial_version) + opt.warning("convertion chain: " + str(convertion_chain), 3) + + for step in convertion_chain: + convert = getattr(__import__("lyx_" + step), mode) + convert(header,body, opt) + + set_version(header, version) + set_format(header, opt.format) + write_file(header, body, opt) if __name__ == "__main__": main(sys.argv) diff --git a/lib/lyx2lyx/lyxconvert_210.py b/lib/lyx2lyx/lyx_0_12.py similarity index 93% rename from lib/lyx2lyx/lyxconvert_210.py rename to lib/lyx2lyx/lyx_0_12.py index 885050bf1a..9a44e1da37 100644 --- a/lib/lyx2lyx/lyxconvert_210.py +++ b/lib/lyx2lyx/lyx_0_12.py @@ -1,6 +1,6 @@ # This file is part of lyx2lyx # -*- coding: iso-8859-1 -*- -# Copyright (C) 2003 José Matos +# Copyright (C) 2003-2004 José Matos # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -18,7 +18,8 @@ import re import string -from parser_tools import * +from parser_tools import find_token, find_re, check_token + def space_before_layout(lines): i = 2 # skip first layout @@ -31,6 +32,7 @@ def space_before_layout(lines): del lines[i-1] i = i + 1 + def formula_inset_space_eat(lines): i=0 while 1: @@ -41,6 +43,7 @@ def formula_inset_space_eat(lines): lines[i] = lines[i][:20] + lines[i][21:] i = i + 1 + # Update from tabular format 2 to 4 def update_tabular(lines): lyxtable_re = re.compile(r".*\\LyXTable$") @@ -72,6 +75,7 @@ def update_tabular(lines): lines[i] = lines[i] + ' 0 0 0' i = i + 1 + def final_dot(lines): i = 0 while i < len(lines): @@ -81,6 +85,7 @@ def final_dot(lines): else: i = i + 1 + def update_inset_label(lines): i = 0 while 1: @@ -90,6 +95,7 @@ def update_inset_label(lines): lines[i] = '\\begin_inset LatexCommand \label{' + lines[i][19:] + '}' i = i + 1 + def update_latexdel(lines): i = 0 while 1: @@ -99,11 +105,13 @@ def update_latexdel(lines): lines[i] = string.replace(lines[i],'\\begin_inset LatexDel', '\\begin_inset LatexCommand') i = i + 1 + def update_vfill(lines): for i in range(len(lines)): lines[i] = string.replace(lines[i],'\\fill_top','\\added_space_top vfill') lines[i] = string.replace(lines[i],'\\fill_bottom','\\added_space_bottom vfill') + def update_space_units(lines): added_space_bottom = re.compile(r'\\added_space_bottom ([^ ]*)') added_space_top = re.compile(r'\\added_space_top ([^ ]*)') @@ -120,9 +128,11 @@ def update_space_units(lines): new = '\\added_space_top ' + str(float(result.group(1))) + 'cm' lines[i] = string.replace(lines[i], old, new) + def update_inset_accent(lines): pass + def remove_cursor(lines): i = 0 cursor_re = re.compile(r'.*(\\cursor \d*)') @@ -134,6 +144,7 @@ def remove_cursor(lines): lines[i]= string.replace(lines[i], cursor, '') i = i + 1 + def remove_empty_insets(lines): i = 0 while 1: @@ -145,6 +156,7 @@ def remove_empty_insets(lines): del lines[i] i = i + 1 + def remove_formula_latex(lines): i = 0 while 1: @@ -158,18 +170,21 @@ def remove_formula_latex(lines): break del lines[i] + def add_end_document(lines): - lines.append('\\the_end') + i = find_token(lines, '\\the_end', 0) + if i == -1: + lines.append('\\the_end') -def header_update(lines): + +def header_update(lines, opt): i = 0 l = len(lines) while i < l: if check_token(lines[i], '\\begin_preamble'): i = find_token(lines, '\\end_preamble', i) if i == -1: - sys.stderr.write('Unfinished preamble') - sys.exit(1) + opt.error('Unfinished preamble') i = i + 1 continue @@ -220,8 +235,9 @@ def header_update(lines): i = i + 1 -def convert(header,body): - header_update(header) + +def convert(header,body, opt): + header_update(header, opt) add_end_document(body) remove_cursor(body) final_dot(body) @@ -235,7 +251,12 @@ def convert(header,body): update_vfill(body) remove_empty_insets(body) remove_formula_latex(body) + opt.format = 215 + + +def revert(header, body, opt): + opt.error("The convertion to an older format (%s) is not implemented." % opt.format) + if __name__ == "__main__": pass - diff --git a/lib/lyx2lyx/lyxconvert_231.py b/lib/lyx2lyx/lyx_1_0_0.py similarity index 78% rename from lib/lyx2lyx/lyxconvert_231.py rename to lib/lyx2lyx/lyx_1_0_0.py index 22c7fc658b..af35201b76 100644 --- a/lib/lyx2lyx/lyxconvert_231.py +++ b/lib/lyx2lyx/lyx_1_0_0.py @@ -1,6 +1,6 @@ # This file is part of lyx2lyx # -*- coding: iso-8859-1 -*- -# Copyright (C) 2003 José Matos +# Copyright (C) 2004 José Matos # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -16,14 +16,14 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +def convert(header, body, opt): + opt.format = 215 -import sys -from parser_tools import find_token +def revert(header, body, opt): + opt.error("The convertion to an older format (%s) is not implemented." % opt.format) -def convert(header, body): - pass - if __name__ == "__main__": pass + diff --git a/lib/lyx2lyx/lyxconvert_229.py b/lib/lyx2lyx/lyx_1_0_1.py similarity index 78% rename from lib/lyx2lyx/lyxconvert_229.py rename to lib/lyx2lyx/lyx_1_0_1.py index 22c7fc658b..af35201b76 100644 --- a/lib/lyx2lyx/lyxconvert_229.py +++ b/lib/lyx2lyx/lyx_1_0_1.py @@ -1,6 +1,6 @@ # This file is part of lyx2lyx # -*- coding: iso-8859-1 -*- -# Copyright (C) 2003 José Matos +# Copyright (C) 2004 José Matos # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -16,14 +16,14 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +def convert(header, body, opt): + opt.format = 215 -import sys -from parser_tools import find_token +def revert(header, body, opt): + opt.error("The convertion to an older format (%s) is not implemented." % opt.format) -def convert(header, body): - pass - if __name__ == "__main__": pass + diff --git a/lib/lyx2lyx/lyxrevert_230.py b/lib/lyx2lyx/lyx_1_1_4.py similarity index 78% rename from lib/lyx2lyx/lyxrevert_230.py rename to lib/lyx2lyx/lyx_1_1_4.py index 22c7fc658b..af35201b76 100644 --- a/lib/lyx2lyx/lyxrevert_230.py +++ b/lib/lyx2lyx/lyx_1_1_4.py @@ -1,6 +1,6 @@ # This file is part of lyx2lyx # -*- coding: iso-8859-1 -*- -# Copyright (C) 2003 José Matos +# Copyright (C) 2004 José Matos # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -16,14 +16,14 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +def convert(header, body, opt): + opt.format = 215 -import sys -from parser_tools import find_token +def revert(header, body, opt): + opt.error("The convertion to an older format (%s) is not implemented." % opt.format) -def convert(header, body): - pass - if __name__ == "__main__": pass + diff --git a/lib/lyx2lyx/lyxconvert_215.py b/lib/lyx2lyx/lyx_1_1_5.py similarity index 93% rename from lib/lyx2lyx/lyxconvert_215.py rename to lib/lyx2lyx/lyx_1_1_5.py index 9bbb2daab8..d147b96bc3 100644 --- a/lib/lyx2lyx/lyxconvert_215.py +++ b/lib/lyx2lyx/lyx_1_1_5.py @@ -1,6 +1,6 @@ # This file is part of lyx2lyx # -*- coding: iso-8859-1 -*- -# Copyright (C) 2002 José Matos +# Copyright (C) 2002-2004 José Matos # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -17,10 +17,11 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. import re -from parser_tools import * +import string +from parser_tools import find_token, find_token_backwards, find_re -layout_exp = re.compile(r"\\layout (\S*)") +layout_exp = re.compile(r"\\layout (\S*)") math_env = ["\\[","\\begin{eqnarray*}","\\begin{eqnarray}","\\begin{equation}"] def replace_protected_separator(lines): @@ -45,6 +46,7 @@ def replace_protected_separator(lines): del lines[i] + def merge_formula_inset(lines): i=0 while 1: @@ -55,6 +57,7 @@ def merge_formula_inset(lines): del lines[i+1] i = i + 1 + # Update from tabular format 4 to 5 if necessary def update_tabular(lines): lyxtable_re = re.compile(r".*\\LyXTable$") @@ -86,6 +89,7 @@ def update_tabular(lines): lines[i] = lines[i] + ' "" ""' i = i + 1 + def update_toc(lines): i = 0 while 1: @@ -95,11 +99,13 @@ def update_toc(lines): lines[i] = lines[i] + '{}' i = i + 1 + def remove_cursor(lines): i = find_token(lines, '\\cursor', 0) if i != -1: del lines[i] + def remove_vcid(lines): i = find_token(lines, '\\lyxvcid', 0) if i != -1: @@ -108,12 +114,14 @@ def remove_vcid(lines): if i != -1: del lines[i] + def first_layout(lines): while (lines[0] == ""): del lines[0] if lines[0][:7] != "\\layout": lines[:0] = ["\\layout Standard"] + def remove_space_in_units(lines): margins = ["\\topmargin","\\rightmargin", "\\leftmargin","\\bottommargin"] @@ -138,7 +146,8 @@ def remove_space_in_units(lines): lines[i] = margin + " " + result.group(1) + result.group(2) i = i + 1 -def convert(header,body): + +def convert(header, body, opt): first_layout(body) remove_vcid(header) remove_cursor(body) @@ -147,7 +156,11 @@ def convert(header,body): merge_formula_inset(body) update_tabular(body) remove_space_in_units(header) + opt.format = 216 + + +def revert(header, body, opt): + opt.error("The convertion to an older format (%s) is not implemented." % opt.format) if __name__ == "__main__": pass - diff --git a/lib/lyx2lyx/lyxconvert_216.py b/lib/lyx2lyx/lyx_1_1_6.py similarity index 95% rename from lib/lyx2lyx/lyxconvert_216.py rename to lib/lyx2lyx/lyx_1_1_6.py index 1b0a6c75d9..ce043abcc6 100644 --- a/lib/lyx2lyx/lyxconvert_216.py +++ b/lib/lyx2lyx/lyx_1_1_6.py @@ -1,6 +1,6 @@ # This file is part of lyx2lyx # -*- coding: iso-8859-1 -*- -# Copyright (C) 2002 José Matos +# Copyright (C) 2002-2004 José Matos # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -16,11 +16,13 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -import re, string, sys -from parser_tools import * +import re +import string +from parser_tools import find_re, find_tokens, find_token, check_token + lyxtable_re = re.compile(r".*\\LyXTable$") -def update_tabular(lines): +def update_tabular(lines, opt): i=0 while 1: i = find_re(lines, lyxtable_re, i) @@ -103,8 +105,7 @@ def update_tabular(lines): end = find_token(lines, '\\newline', i) if end == -1: - sys.stderr.write("Malformed lyx file\n") - sys.exit(1) + opt.error("Malformed LyX file.") end = end - i while end > 0: @@ -175,7 +176,9 @@ def update_tabular(lines): i = i + len(tmp) + prop_exp = re.compile(r"\\(\S*)\s*(\S*)") + def set_paragraph_properties(lines, prop_dict): # we need to preserve the order of options properties = ["family","series","shape","size", @@ -258,6 +261,7 @@ def set_paragraph_properties(lines, prop_dict): return result[:] + def update_language(header): i = find_token(header, "\\language", 0) if i == -1: @@ -269,10 +273,16 @@ def update_language(header): header[i] = '\\language english' return -def convert(header,body): - update_tabular(body) + +def convert(header, body, opt): + update_tabular(body, opt) update_language(header) + opt.format = 217 + + +def revert(header, body, opt): + opt.error("The convertion to an older format (%s) is not implemented." % opt.format) + if __name__ == "__main__": pass - diff --git a/lib/lyx2lyx/lyxconvert_217.py b/lib/lyx2lyx/lyx_1_1_6fix3.py similarity index 91% rename from lib/lyx2lyx/lyxconvert_217.py rename to lib/lyx2lyx/lyx_1_1_6fix3.py index 784debdeb4..b38f0047e1 100644 --- a/lib/lyx2lyx/lyxconvert_217.py +++ b/lib/lyx2lyx/lyx_1_1_6fix3.py @@ -1,6 +1,6 @@ # This file is part of lyx2lyx # -*- coding: iso-8859-1 -*- -# Copyright (C) 2002 José Matos +# Copyright (C) 2002-2004 José Matos # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -16,8 +16,9 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -import re, string, sys -from parser_tools import * +import re +import string +from parser_tools import find_token def bool_table(item): if item == "0": @@ -25,11 +26,12 @@ def bool_table(item): # should emit a warning if item != "1" return "true" + align_table = {"0": "top", "2": "left", "4": "right", "8": "center"} use_table = {"0": "none", "1": "parbox"} - table_meta_re = re.compile(r'') -def update_tabular(lines): + +def update_tabular(lines, opt): i=0 while 1: i = find_token(lines, '\\begin_inset Tabular', i) @@ -46,13 +48,14 @@ def update_tabular(lines): j = find_token(lines, '', i) + 1 if j == 0: - sys.stderr.write( "Error: Bad lyx format i=%d j=%d\n" % (i,j)) + opt.warning( "Error: Bad lyx format i=%d j=%d" % (i,j)) break new_table = table_update(lines[i:j]) lines[i:j] = new_table i = i + len(new_table) + col_re = re.compile(r'') cell_re = re.compile(r'') features_re = re.compile(r'') @@ -109,9 +112,15 @@ def table_update(lines): return lines[:2] + col_info + lines[2:] -def convert(header,body): - update_tabular(body) + +def convert(header, body, opt): + update_tabular(body, opt) + opt.format = 218 + + +def revert(header, body, opt): + opt.error("The convertion to an older format (%s) is not implemented." % opt.format) + if __name__ == "__main__": pass - diff --git a/lib/lyx2lyx/lyxconvert_218.py b/lib/lyx2lyx/lyx_1_2.py similarity index 95% rename from lib/lyx2lyx/lyxconvert_218.py rename to lib/lyx2lyx/lyx_1_2.py index 91af9d898d..6849c25735 100644 --- a/lib/lyx2lyx/lyxconvert_218.py +++ b/lib/lyx2lyx/lyx_1_2.py @@ -1,6 +1,7 @@ # This file is part of lyx2lyx # -*- coding: iso-8859-1 -*- # Copyright (C) 2002 Dekel Tsur +# Copyright (C) 2004 José Matos # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -16,9 +17,13 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +import string +import re -import sys,string,re -from parser_tools import * +from parser_tools import find_token, find_token_backwards, get_next_paragraph,\ + find_tokens, find_end_of_inset, find_re, \ + is_nonempty_line, get_paragraph, find_nonempty_line, \ + get_value, get_tabular_lines, check_token floats = { "footnote": ["\\begin_inset Foot", @@ -52,6 +57,7 @@ pextra_rexp = re.compile(r"\\pextra_type\s+(\S+)"+\ r"(\s+\\pextra_start_minipage\s+(\S+))?"+\ r"(\s+(\\pextra_widthp?)\s+(\S*))?") + def get_width(mo): if mo.group(10): if mo.group(9) == "\\pextra_widthp": @@ -61,11 +67,11 @@ def get_width(mo): else: return "100col%" + # # Change \begin_float .. \end_float into \begin_inset Float .. \end_inset # - -def remove_oldfloat(lines, language): +def remove_oldfloat(lines, opt): i = 0 while 1: i = find_token(lines, "\\begin_float", i) @@ -76,7 +82,7 @@ def remove_oldfloat(lines, language): floattype = string.split(lines[i])[1] if not floats.has_key(floattype): - sys.stderr.write("Error! Unknown float type "+floattype+"\n") + opt.warning("Error! Unknown float type " + floattype) floattype = "fig" # skip \end_deeper tokens @@ -119,13 +125,14 @@ def remove_oldfloat(lines, language): flag = 1 new.append("") if token == "\\lang": - new.append(token+" "+language) + new.append(token+" "+ opt.language) else: new.append(token+" default ") lines[i:j+1] = new i = i+1 + pextra_type2_rexp = re.compile(r".*\\pextra_type\s+[12]") pextra_type2_rexp2 = re.compile(r".*(\\layout|\\pextra_type\s+2)") @@ -192,9 +199,11 @@ def remove_pextra(lines): lines[j0:j] = start+mid+end i = i+1 + def is_empty(lines): return filter(is_nonempty_line, lines) == [] + move_rexp = re.compile(r"\\(family|series|shape|size|emph|numeric|bar|noun|end_deeper)") ert_rexp = re.compile(r"\\begin_inset|\\hfill|.*\\SpecialChar") spchar_rexp = re.compile(r"(.*)(\\SpecialChar.*)") @@ -203,6 +212,7 @@ ert_begin = ["\\begin_inset ERT", "", "\\layout Standard"] + def remove_oldert(lines): i = 0 while 1: @@ -310,6 +320,7 @@ def remove_oldert(lines): break del lines[i] + # ERT insert are hidden feature of lyx 1.1.6. This might be removed in the future. def remove_oldertinset(lines): i = 0 @@ -326,6 +337,7 @@ def remove_oldertinset(lines): lines[i:j+1] = new i = i+1 + def is_ert_paragraph(lines, i): if not check_token(lines[i], "\\layout Standard"): return 0 @@ -338,6 +350,7 @@ def is_ert_paragraph(lines, i): k = find_nonempty_line(lines, j+1) return check_token(lines[k], "\\layout") + def combine_ert(lines): i = 0 while 1: @@ -363,6 +376,7 @@ def combine_ert(lines): i = i+1 + oldunits = ["pt", "cm", "in", "text%", "col%"] def get_length(lines, name, start, end): @@ -372,10 +386,12 @@ def get_length(lines, name, start, end): x = string.split(lines[i]) return x[2]+oldunits[int(x[1])] + def write_attribute(x, token, value): if value != "": x.append("\t"+token+" "+value) + def remove_figinset(lines): i = 0 while 1: @@ -443,6 +459,7 @@ def remove_figinset(lines): new = new + ["\end_inset"] lines[i:j+1] = new + attr_re = re.compile(r' \w*="(false|0|)"') line_re = re.compile(r'<(features|column|row|cell)') @@ -464,6 +481,7 @@ def update_tabular(lines): i = i+1 + # Figure insert are hidden feature of lyx 1.1.6. This might be removed in the future. def fix_oldfloatinset(lines): i = 0 @@ -476,6 +494,7 @@ def fix_oldfloatinset(lines): lines[j:j] = ["wide false"] i = i+1 + def change_listof(lines): i = 0 while 1: @@ -486,6 +505,7 @@ def change_listof(lines): lines[i] = "\\begin_inset FloatList "+type i = i+1 + def change_infoinset(lines): i = 0 while 1: @@ -511,6 +531,7 @@ def change_infoinset(lines): lines[i:j] = new i = i+5 + def change_preamble(lines): i = find_token(lines, "\\use_amsmath", 0) if i == -1: @@ -518,22 +539,25 @@ def change_preamble(lines): lines[i+1:i+1] = ["\\use_natbib 0", "\use_numerical_citations 0"] -def convert(header, body): - language = get_value(header, "\\language", 0) - if language == "": - language = "english" +def convert(header, body, opt): change_preamble(header) change_listof(body) fix_oldfloatinset(body) update_tabular(body) remove_pextra(body) - remove_oldfloat(body, language) + remove_oldfloat(body, opt) remove_figinset(body) remove_oldertinset(body) remove_oldert(body) combine_ert(body) change_infoinset(body) + opt.format = 220 + + +def revert(header, body, opt): + opt.error("The convertion to an older format (%s) is not implemented." % opt.format) + if __name__ == "__main__": pass diff --git a/lib/lyx2lyx/lyxconvert_220.py b/lib/lyx2lyx/lyx_1_3.py similarity index 88% rename from lib/lyx2lyx/lyxconvert_220.py rename to lib/lyx2lyx/lyx_1_3.py index 9f0d4fe55f..ffb3c431db 100644 --- a/lib/lyx2lyx/lyxconvert_220.py +++ b/lib/lyx2lyx/lyx_1_3.py @@ -1,6 +1,7 @@ # This file is part of lyx2lyx # -*- coding: iso-8859-1 -*- # Copyright (C) 2002 Dekel Tsur +# Copyright (C) 2004 José Matos # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -16,9 +17,10 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -import sys,string,re -from parser_tools import * +import string +import re +from parser_tools import find_token, find_end_of_inset, get_value,\ + find_token2, del_token def change_insetgraphics(lines): i = 0 @@ -76,6 +78,7 @@ def change_insetgraphics(lines): i = i+1 + def change_tabular(lines): i = 0 while 1: @@ -86,9 +89,16 @@ def change_tabular(lines): lines[i] = re.sub(' alignment=".*?"',' alignment="block"',lines[i]) i = i+1 -def convert(header, body): + +def convert(header, body, opt): change_insetgraphics(body) change_tabular(body) + opt.format = 221 + + +def revert(header, body, opt): + opt.error("The convertion to an older format (%s) is not implemented." % opt.format) + if __name__ == "__main__": pass diff --git a/lib/lyx2lyx/lyx_1_4.py b/lib/lyx2lyx/lyx_1_4.py new file mode 100644 index 0000000000..4ad3c15346 --- /dev/null +++ b/lib/lyx2lyx/lyx_1_4.py @@ -0,0 +1,1243 @@ +# This file is part of lyx2lyx +# -*- coding: iso-8859-1 -*- +# Copyright (C) 2002 Dekel Tsur +# Copyright (C) 2002-2004 José Matos +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +import re +from parser_tools import find_token, find_end_of_inset, get_next_paragraph, \ + get_paragraph, get_value, del_token, is_nonempty_line,\ + find_tokens, find_end_of +from string import replace, split, find, strip, join + +## +# Add \end_header +# +def add_end_header(header): + header.append("\\end_header"); + + +def rm_end_header(lines): + i = find_token(lines, "\\end_header", 0) + if i == -1: + return + del lines[i] + + +## +# \SpecialChar ~ -> \InsetSpace ~ +# +def convert_spaces(lines): + for i in range(len(lines)): + lines[i] = replace(lines[i],"\\SpecialChar ~","\\InsetSpace ~") + + +def revert_spaces(lines): + for i in range(len(lines)): + lines[i] = replace(lines[i],"\\InsetSpace ~", "\\SpecialChar ~") + + +## +# BibTeX changes +# +def convert_bibtex(lines): + for i in range(len(lines)): + lines[i] = replace(lines[i],"\\begin_inset LatexCommand \\BibTeX", + "\\begin_inset LatexCommand \\bibtex") + + +def revert_bibtex(lines): + for i in range(len(lines)): + lines[i] = replace(lines[i], "\\begin_inset LatexCommand \\bibtex", + "\\begin_inset LatexCommand \\BibTeX") + + +## +# Remove \lyxparent +# +def remove_insetparent(lines): + i = 0 + while 1: + i = find_token(lines, "\\begin_inset LatexCommand \\lyxparent", i) + if i == -1: + break + del lines[i:i+3] + + +## +# Inset External +# +def convert_external(lines): + external_rexp = re.compile(r'\\begin_inset External ([^,]*),"([^"]*)",') + external_header = "\\begin_inset External" + i = 0 + while 1: + i = find_token(lines, external_header, i) + if i == -1: + break + look = external_rexp.search(lines[i]) + args = ['',''] + if look: + args[0] = look.group(1) + args[1] = look.group(2) + #FIXME: if the previous search fails then warn + + if args[0] == "RasterImage": + # Convert a RasterImage External Inset to a Graphics Inset. + top = "\\begin_inset Graphics" + if args[1]: + filename = "\tfilename " + args[1] + lines[i:i+1] = [top, filename] + i = i + 1 + else: + # Convert the old External Inset format to the new. + top = external_header + template = "\ttemplate " + args[0] + if args[1]: + filename = "\tfilename " + args[1] + lines[i:i+1] = [top, template, filename] + i = i + 2 + else: + lines[i:i+1] = [top, template] + i = i + 1 + + +def revert_external_1(lines): + external_header = "\\begin_inset External" + i = 0 + while 1: + i = find_token(lines, external_header, i) + if i == -1: + break + + template = split(lines[i+1]) + template.reverse() + del lines[i+1] + + filename = split(lines[i+1]) + filename.reverse() + del lines[i+1] + + params = split(lines[i+1]) + params.reverse() + if lines[i+1]: del lines[i+1] + + lines[i] = lines[i] + " " + template[0]+ ', "' + filename[0] + '", " '+ join(params[1:]) + '"' + i = i + 1 + + +def revert_external_2(lines): + draft_token = '\tdraft' + i = 0 + while 1: + i = find_token(lines, '\\begin_inset External', i) + if i == -1: + break + j = find_end_of_inset(lines, i + 1) + if j == -1: + #this should not happen + break + k = find_token(lines, draft_token, i+1, j-1) + if (k != -1 and len(draft_token) == len(lines[k])): + del lines[k] + i = j + 1 + + +## +# Comment +# +def convert_comment(lines): + i = 0 + comment = "\\layout Comment" + while 1: + i = find_token(lines, comment, i) + if i == -1: + return + + lines[i:i+1] = ["\\layout Standard","","", + "\\begin_inset Comment", + "collapsed true","", + "\\layout Standard"] + i = i + 7 + + while 1: + old_i = i + i = find_token(lines, "\\layout", i) + if i == -1: + i = len(lines) - 1 + lines[i:i] = ["\\end_inset ","",""] + return + + j = find_token(lines, '\\begin_deeper', old_i, i) + if j == -1: j = i + 1 + k = find_token(lines, '\\begin_inset', old_i, i) + if k == -1: k = i + 1 + + if j < i and j < k: + i = j + del lines[i] + i = find_end_of( lines, i, "\\begin_deeper","\\end_deeper") + if i == -1: + #This case should not happen + #but if this happens deal with it greacefully adding + #the missing \end_deeper. + i = len(lines) - 1 + lines[i:i] = ["\end_deeper","","","\\end_inset ","",""] + return + else: + del lines[i] + continue + + if k < i: + i = k + i = find_end_of( lines, i, "\\begin_inset","\\end_inset") + if i == -1: + #This case should not happen + #but if this happens deal with it greacefully adding + #the missing \end_inset. + i = len(lines) - 1 + lines[i:i] = ["\\end_inset ","","","\\end_inset ","",""] + return + else: + i = i + 1 + continue + + if find(lines[i], comment) == -1: + lines[i:i] = ["\\end_inset"] + i = i + 1 + break + lines[i:i+1] = ["\\layout Standard"] + i = i + 1 + + +def revert_comment(lines): + i = 0 + while 1: + i = find_tokens(lines, ["\\begin_inset Comment", "\\begin_inset Greyedout"], i) + + if i == -1: + return + lines[i] = "\\begin_inset Note" + i = i + 1 + + +## +# Add \end_layout +# +def add_end_layout(lines): + i = find_token(lines, '\\layout', 0) + + if i == -1: + return + + i = i + 1 + struct_stack = ["\\layout"] + while 1: + i = find_tokens(lines, ["\\begin_inset", "\\end_inset", "\\layout", + "\\begin_deeper", "\\end_deeper", "\\the_end"], i) + + token = split(lines[i])[0] + + if token == "\\begin_inset": + struct_stack.append(token) + i = i + 1 + continue + + if token == "\\end_inset": + tail = struct_stack.pop() + if tail == "\\layout": + lines.insert(i,"\\end_layout") + i = i + 1 + #Check if it is the correct tag + struct_stack.pop() + i = i + 1 + continue + + if token == "\\layout": + tail = struct_stack.pop() + if tail == token: + lines.insert(i,"\\end_layout") + i = i + 2 + else: + struct_stack.append(tail) + i = i + 1 + struct_stack.append(token) + continue + + if token == "\\begin_deeper" or token == "\\end_deeper": + lines.insert(i,"\\end_layout") + i = i + 2 + continue + + #case \end_document + lines.insert(i, "\\end_layout") + return + + +def rm_end_layout(lines): + i = 0 + while 1: + i = find_token(lines, '\\end_layout', i) + + if i == -1: + return + + del lines[i] + + +## +# Remove change tracking keywords +# +def rm_tracking_changes(lines): + i = find_token(lines, "\\author", 0) + if i != -1: + del lines[i] + + i = find_token(lines, "\\tracking_changes", 0) + if i == -1: + return + del lines[i] + + +def rm_body_changes(lines): + i = 0 + while 1: + i = find_token(lines, "\\change_", i) + if i == -1: + return + + del lines[i] + + +## +# \layout -> \begin_layout +# +def layout2begin_layout(lines): + i = 0 + while 1: + i = find_token(lines, '\\layout', i) + if i == -1: + return + + lines[i] = replace(lines[i], '\\layout', '\\begin_layout') + i = i + 1 + + +def begin_layout2layout(lines): + i = 0 + while 1: + i = find_token(lines, '\\begin_layout', i) + if i == -1: + return + + lines[i] = replace(lines[i], '\\begin_layout', '\\layout') + i = i + 1 + + +## +# valignment="center" -> valignment="middle" +# +def convert_valignment_middle(lines, start, end): + for i in range(start, end): + if re.search('^<(column|cell) .*valignment="center".*>$', lines[i]): + lines[i] = replace(lines[i], 'valignment="center"', 'valignment="middle"') + + +def convert_table_valignment_middle(lines): + i = 0 + while 1: + i = find_token(lines, '\\begin_inset Tabular', i) + if i == -1: + return + j = find_end_of_inset(lines, i + 1) + if j == -1: + #this should not happen + convert_valignment_middle(lines, i + 1, len(lines)) + return + convert_valignment_middle(lines, i + 1, j) + i = j + 1 + + +def revert_table_valignment_middle(lines, start, end): + for i in range(start, end): + if re.search('^<(column|cell) .*valignment="middle".*>$', lines[i]): + lines[i] = replace(lines[i], 'valignment="middle"', 'valignment="center"') + + +def revert_valignment_middle(lines): + i = 0 + while 1: + i = find_token(lines, '\\begin_inset Tabular', i) + if i == -1: + return + j = find_end_of_inset(lines, i + 1) + if j == -1: + #this should not happen + revert_table_valignment_middle(lines, i + 1, len(lines)) + return + revert_table_valignment_middle(lines, i + 1, j) + i = j + 1 + + +## +# \the_end -> \end_document +# +def convert_end_document(lines): + i = find_token(lines, "\\the_end", 0) + if i == -1: + lines.append("\\end_document") + return + lines[i] = "\\end_document" + + +def revert_end_document(lines): + i = find_token(lines, "\\end_document", 0) + if i == -1: + lines.append("\\the_end") + return + lines[i] = "\\the_end" + + +## +# Convert line and page breaks +# Old: +#\layout Standard +#\line_top \line_bottom \pagebreak_top \pagebreak_bottom \added_space_top xxx \added_space_bottom yyy +#0 +# +# New: +#\begin layout Standard +# +#\newpage +# +#\lyxline +#\begin_inset VSpace xxx +#\end_inset +# +#\end_layout +#\begin_layout Standard +# +#0 +#\end_layout +#\begin_layout Standard +# +#\begin_inset VSpace xxx +#\end_inset +#\lyxline +# +#\newpage +# +#\end_layout +def convert_breaks(lines): + i = 0 + while 1: + i = find_token(lines, "\\begin_layout", i) + if i == -1: + return + i = i + 1 + line_top = find(lines[i],"\\line_top") + line_bot = find(lines[i],"\\line_bottom") + pb_top = find(lines[i],"\\pagebreak_top") + pb_bot = find(lines[i],"\\pagebreak_bottom") + vspace_top = find(lines[i],"\\added_space_top") + vspace_bot = find(lines[i],"\\added_space_bottom") + + if line_top == -1 and line_bot == -1 and pb_bot == -1 and pb_top == -1 and vspace_top == -1 and vspace_bot == -1: + continue + + for tag in "\\line_top", "\\line_bottom", "\\pagebreak_top", "\\pagebreak_bottom": + lines[i] = replace(lines[i], tag, "") + + if vspace_top != -1: + # the position could be change because of the removal of other + # paragraph properties above + vspace_top = find(lines[i],"\\added_space_top") + tmp_list = split(lines[i][vspace_top:]) + vspace_top_value = tmp_list[1] + lines[i] = lines[i][:vspace_top] + join(tmp_list[2:]) + + if vspace_bot != -1: + # the position could be change because of the removal of other + # paragraph properties above + vspace_bot = find(lines[i],"\\added_space_bottom") + tmp_list = split(lines[i][vspace_bot:]) + vspace_bot_value = tmp_list[1] + lines[i] = lines[i][:vspace_bot] + join(tmp_list[2:]) + + lines[i] = strip(lines[i]) + i = i + 1 + + # Create an empty paragraph for line and page break that belong + # above the paragraph + if pb_top !=-1 or line_top != -1 or vspace_bot != -1: + + paragraph_above = ['','\\begin_layout Standard','',''] + + if pb_top != -1: + paragraph_above.extend(['\\newpage ','']) + + if vspace_top != -1: + paragraph_above.extend(['\\begin_inset VSpace ' + vspace_top_value,'\\end_inset ','','']) + + if line_top != -1: + paragraph_above.extend(['\\lyxline ','']) + + paragraph_above.extend(['\\end_layout','']) + + #inset new paragraph above the current paragraph + lines[i-2:i-2] = paragraph_above + i = i + len(paragraph_above) + + # Ensure that nested style are converted later. + k = find_end_of(lines, i, "\\begin_layout", "\\end_layout") + + if k == -1: + return + + if pb_top !=-1 or line_top != -1 or vspace_bot != -1: + + paragraph_bellow = ['','\\begin_layout Standard','',''] + + if line_bot != -1: + paragraph_bellow.extend(['\\lyxline ','']) + + if vspace_bot != -1: + paragraph_bellow.extend(['\\begin_inset VSpace ' + vspace_bot_value,'\\end_inset ','','']) + + if pb_bot != -1: + paragraph_bellow.extend(['\\newpage ','']) + + paragraph_bellow.extend(['\\end_layout','']) + + #inset new paragraph above the current paragraph + lines[k + 1: k + 1] = paragraph_bellow + + +## +# Notes +# +def convert_note(lines): + i = 0 + while 1: + i = find_tokens(lines, ["\\begin_inset Note", + "\\begin_inset Comment", + "\\begin_inset Greyedout"], i) + if i == -1: + break + + lines[i] = lines[i][0:13] + 'Note ' + lines[i][13:] + i = i + 1 + + +def revert_note(lines): + note_header = "\\begin_inset Note " + i = 0 + while 1: + i = find_token(lines, note_header, i) + if i == -1: + break + + lines[i] = "\\begin_inset " + lines[i][len(note_header):] + i = i + 1 + + +## +# Box +# +def convert_box(lines): + i = 0 + while 1: + i = find_tokens(lines, ["\\begin_inset Boxed", + "\\begin_inset Doublebox", + "\\begin_inset Frameless", + "\\begin_inset ovalbox", + "\\begin_inset Ovalbox", + "\\begin_inset Shadowbox"], i) + if i == -1: + break + + lines[i] = lines[i][0:13] + 'Box ' + lines[i][13:] + i = i + 1 + + +def revert_box(lines): + box_header = "\\begin_inset Box " + i = 0 + while 1: + i = find_token(lines, box_header, i) + if i == -1: + break + + lines[i] = "\\begin_inset " + lines[i][len(box_header):] + i = i + 1 + + +## +# Collapse +# +def convert_collapsable(lines, opt): + i = 0 + while 1: + i = find_tokens(lines, ["\\begin_inset Box", + "\\begin_inset Branch", + "\\begin_inset CharStyle", + "\\begin_inset Float", + "\\begin_inset Foot", + "\\begin_inset Marginal", + "\\begin_inset Note", + "\\begin_inset OptArg", + "\\begin_inset Wrap"], i) + if i == -1: + break + + # Seach for a line starting 'collapsed' + # If, however, we find a line starting '\begin_layout' + # (_always_ present) then break with a warning message + i = i + 1 + while 1: + if (lines[i] == "collapsed false"): + lines[i] = "status open" + break + elif (lines[i] == "collapsed true"): + lines[i] = "status collapsed" + break + elif (lines[i][:13] == "\\begin_layout"): + opt.warning("Malformed LyX file.") + break + i = i + 1 + + i = i + 1 + + +def revert_collapsable(lines, opt): + i = 0 + while 1: + i = find_tokens(lines, ["\\begin_inset Box", + "\\begin_inset Branch", + "\\begin_inset CharStyle", + "\\begin_inset Float", + "\\begin_inset Foot", + "\\begin_inset Marginal", + "\\begin_inset Note", + "\\begin_inset OptArg", + "\\begin_inset Wrap"], i) + if i == -1: + break + + # Seach for a line starting 'status' + # If, however, we find a line starting '\begin_layout' + # (_always_ present) then break with a warning message + i = i + 1 + while 1: + if (lines[i] == "status open"): + lines[i] = "collapsed false" + break + elif (lines[i] == "status collapsed" or + lines[i] == "status inlined"): + lines[i] = "collapsed true" + break + elif (lines[i][:13] == "\\begin_layout"): + opt.warning("Malformed LyX file.") + break + i = i + 1 + + i = i + 1 + + +## +# ERT +# +def convert_ert(lines, opt): + i = 0 + while 1: + i = find_token(lines, "\\begin_inset ERT", i) + if i == -1: + break + + # Seach for a line starting 'status' + # If, however, we find a line starting '\begin_layout' + # (_always_ present) then break with a warning message + i = i + 1 + while 1: + if (lines[i] == "status Open"): + lines[i] = "status open" + break + elif (lines[i] == "status Collapsed"): + lines[i] = "status collapsed" + break + elif (lines[i] == "status Inlined"): + lines[i] = "status inlined" + break + elif (lines[i][:13] == "\\begin_layout"): + opt.warning("Malformed LyX file.") + break + i = i + 1 + + i = i + 1 + + +def revert_ert(lines, opt): + i = 0 + while 1: + i = find_token(lines, "\\begin_inset ERT", i) + if i == -1: + break + + # Seach for a line starting 'status' + # If, however, we find a line starting '\begin_layout' + # (_always_ present) then break with a warning message + i = i + 1 + while 1: + if (lines[i] == "status open"): + lines[i] = "status Open" + break + elif (lines[i] == "status collapsed"): + lines[i] = "status Collapsed" + break + elif (lines[i] == "status inlined"): + lines[i] = "status Inlined" + break + elif (lines[i][:13] == "\\begin_layout"): + opt.warning("Malformed LyX file.") + break + i = i + 1 + + i = i + 1 + + +## +# Minipages +# +def convert_minipage(lines): + """ Convert minipages to the box inset. + We try to use the same order of arguments as lyx does. + """ + pos = ["t","c","b"] + inner_pos = ["c","t","b","s"] + + i = 0 + while 1: + i = find_token(lines, "\\begin_inset Minipage", i) + if i == -1: + return + + lines[i] = "\\begin_inset Box Frameless" + i = i + 1 + + # convert old to new position using the pos list + if lines[i][:8] == "position": + lines[i] = 'position "%s"' % pos[int(lines[i][9])] + else: + lines.insert(i, 'position "%s"' % pos[0]) + i = i + 1 + + lines.insert(i, 'hor_pos "c"') + i = i + 1 + lines.insert(i, 'has_inner_box 1') + i = i + 1 + + # convert the inner_position + if lines[i][:14] == "inner_position": + lines[i] = 'inner_pos "%s"' % inner_pos[int(lines[i][15])] + else: + lines.insert('inner_pos "%s"' % inner_pos[0]) + i = i + 1 + + # We need this since the new file format has a height and width + # in a different order. + if lines[i][:6] == "height": + height = lines[i][6:] + # test for default value of 221 and convert it accordingly + if height == ' "0pt"': + height = ' "1pt"' + del lines[i] + else: + height = ' "1pt"' + + if lines[i][:5] == "width": + width = lines[i][5:] + del lines[i] + else: + width = ' "0"' + + if lines[i][:9] == "collapsed": + if lines[i][9:] == "true": + status = "collapsed" + else: + status = "open" + del lines[i] + else: + status = "collapsed" + + lines.insert(i, 'use_parbox 0') + i = i + 1 + lines.insert(i, 'width' + width) + i = i + 1 + lines.insert(i, 'special "none"') + i = i + 1 + lines.insert(i, 'height' + height) + i = i + 1 + lines.insert(i, 'height_special "totalheight"') + i = i + 1 + lines.insert(i, 'status ' + status) + i = i + 1 + + +# ------------------------------------------------------------------------------------------- +# Convert backslashes into valid ERT code, append the converted text to +# lines[i] and return the (maybe incremented) line index i +def convert_ertbackslash(lines, i, ert): + for c in ert: + if c == '\\': + lines[i] = lines[i] + '\\backslash ' + lines.insert(i, '') + i = i + 1 + else: + lines[i] = lines[i] + c + return i + + +def convert_vspace(header, lines, opt): + + # Get default spaceamount + i = find_token(header, '\\defskip', 0) + if i == -1: + defskipamount = 'medskip' + else: + defskipamount = split(header[i])[1] + + # Convert the insets + i = 0 + while 1: + i = find_token(lines, '\\begin_inset VSpace', i) + if i == -1: + return + spaceamount = split(lines[i])[2] + + # Are we at the beginning or end of a paragraph? + paragraph_start = 1 + start = get_paragraph(lines, i) + 1 + for k in range(start, i): + if is_nonempty_line(lines[k]): + paragraph_start = 0 + break + paragraph_end = 1 + j = find_end_of_inset(lines, i) + if j == -1: + opt.warning("Malformed LyX file: Missing '\\end_inset'.") + i = i + 1 + continue + end = get_next_paragraph(lines, i) + for k in range(j + 1, end): + if is_nonempty_line(lines[k]): + paragraph_end = 0 + break + + # Convert to paragraph formatting if we are at the beginning or end + # of a paragraph and the resulting paragraph would not be empty + if ((paragraph_start and not paragraph_end) or + (paragraph_end and not paragraph_start)): + # The order is important: del and insert invalidate some indices + del lines[j] + del lines[i] + if paragraph_start: + lines.insert(start, '\\added_space_top ' + spaceamount + ' ') + else: + lines.insert(start, '\\added_space_bottom ' + spaceamount + ' ') + continue + + # Convert to ERT + lines[i:i+1] = ['\\begin_inset ERT', 'status Collapsed', '', + '\\layout Standard', '', '\\backslash '] + i = i + 6 + if spaceamount[-1] == '*': + spaceamount = spaceamount[:-1] + keep = 1 + else: + keep = 0 + + # Replace defskip by the actual value + if spaceamount == 'defskip': + spaceamount = defskipamount + + # LaTeX does not know \\smallskip* etc + if keep: + if spaceamount == 'smallskip': + spaceamount = '\\smallskipamount' + elif spaceamount == 'medskip': + spaceamount = '\\medskipamount' + elif spaceamount == 'bigskip': + spaceamount = '\\bigskipamount' + elif spaceamount == 'vfill': + spaceamount = '\\fill' + + # Finally output the LaTeX code + if (spaceamount == 'smallskip' or spaceamount == 'medskip' or + spaceamount == 'bigskip' or spaceamount == 'vfill'): + lines.insert(i, spaceamount) + else : + if keep: + lines.insert(i, 'vspace*{') + else: + lines.insert(i, 'vspace{') + i = convert_ertbackslash(lines, i, spaceamount) + lines[i] = lines[i] + '}' + i = i + 1 + + +# Convert a LyX length into valid ERT code and append it to lines[i] +# Return the (maybe incremented) line index i +def convert_ertlen(lines, i, len, special): + units = {"text%":"\\textwidth", "col%":"\\columnwidth", + "page%":"\\pagewidth", "line%":"\\linewidth", + "theight%":"\\textheight", "pheight%":"\\pageheight"} + + # Convert special lengths + if special != 'none': + len = '%f\\' % len2value(len) + special + + # Convert LyX units to LaTeX units + for unit in units.keys(): + if find(len, unit) != -1: + len = '%f' % (len2value(len) / 100) + units[unit] + break + + # Convert backslashes and insert the converted length into lines + return convert_ertbackslash(lines, i, len) + + +# Return the value of len without the unit in numerical form +def len2value(len): + result = re.search('([+-]?[0-9.]+)', len) + if result: + return float(result.group(1)) + # No number means 1.0 + return 1.0 + + +def convert_frameless_box(lines, opt): + pos = ['t', 'c', 'b'] + inner_pos = ['c', 't', 'b', 's'] + i = 0 + while 1: + i = find_token(lines, '\\begin_inset Frameless', i) + if i == -1: + return + j = find_end_of_inset(lines, i) + if j == -1: + opt.warning("Malformed LyX file: Missing '\\end_inset'\n") + i = i + 1 + continue + del lines[i] + + # Gather parameters + params = {'position':'0', 'hor_pos':'c', 'has_inner_box':'1', + 'inner_pos':'1', 'use_parbox':'0', 'width':'100col%', + 'special':'none', 'height':'1in', + 'height_special':'totalheight', 'collapsed':'false'} + for key in params.keys(): + value = replace(get_value(lines, key, i, j), '"', '') + if value != "": + if key == 'position': + # convert new to old position: 'position "t"' -> 0 + value = find_token(pos, value, 0) + if value != -1: + params[key] = value + elif key == 'inner_pos': + # convert inner position + value = find_token(inner_pos, value, 0) + if value != -1: + params[key] = value + else: + params[key] = value + j = del_token(lines, key, i, j) + i = i + 1 + + # Convert to minipage or ERT? + # Note that the inner_position and height parameters of a minipage + # inset are ignored and not accessible for the user, although they + # are present in the file format and correctly read in and written. + # Therefore we convert to ERT if they do not have their LaTeX + # defaults. These are: + # - the value of "position" for "inner_pos" + # - "\totalheight" for "height" + if (params['use_parbox'] != '0' or + params['has_inner_box'] != '1' or + params['special'] != 'none' or + inner_pos[params['inner_pos']] != pos[params['position']] or + params['height_special'] != 'totalheight' or + len2value(params['height']) != 1.0): + + # Convert to ERT + if params['collapsed'] == 'true': + params['collapsed'] = 'Collapsed' + else: + params['collapsed'] = 'Open' + lines[i : i] = ['\\begin_inset ERT', 'status ' + params['collapsed'], + '', '\\layout Standard', '', '\\backslash '] + i = i + 6 + if params['use_parbox'] == '1': + lines.insert(i, 'parbox') + else: + lines.insert(i, 'begin{minipage}') + lines[i] = lines[i] + '[' + pos[params['position']] + '][' + i = convert_ertlen(lines, i, params['height'], params['height_special']) + lines[i] = lines[i] + '][' + inner_pos[params['inner_pos']] + ']{' + i = convert_ertlen(lines, i, params['width'], params['special']) + if params['use_parbox'] == '1': + lines[i] = lines[i] + '}{' + else: + lines[i] = lines[i] + '}' + i = i + 1 + lines[i:i] = ['', '\\end_inset '] + i = i + 2 + j = find_end_of_inset(lines, i) + if j == -1: + opt.warning("Malformed LyX file: Missing '\\end_inset'.") + break + lines[j-1:j-1] += ['\\begin_inset ERT', 'status ' + params['collapsed'], + '', '\\layout Standard', ''] + j = j + 4 + if params['use_parbox'] == '1': + lines.insert(j, '}') + else: + lines[j:j] = ['\\backslash ', 'end{minipage}'] + else: + + # Convert to minipage + lines[i:i] = ['\\begin_inset Minipage', + 'position %d' % params['position'], + 'inner_position %d' % params['inner_pos'], + 'height "' + params['height'] + '"', + 'width "' + params['width'] + '"', + 'collapsed ' + params['collapsed']] + i = i + 6 + +## +# Convert jurabib +# + +def convert_jurabib(header, opt): + i = find_token(header, '\\use_numerical_citations', 0) + if i == -1: + opt.warning("Malformed lyx file: Missing '\\use_numerical_citations'") + return + header.insert(i + 1, '\\use_jurabib 0') + + +def revert_jurabib(header, opt): + i = find_token(header, '\\use_jurabib', 0) + if i == -1: + opt.warning("Malformed lyx file: Missing '\\use_jurabib'") + return + if get_value(header, '\\use_jurabib', 0) != "0": + opt.warning("Conversion of '\\use_jurabib = 1' not yet implemented.") + # Don't remove '\\use_jurabib' so that people will get warnings by lyx + return + del header[i] + +## +# Convert bibtopic +# + +def convert_bibtopic(header, opt): + i = find_token(header, '\\use_jurabib', 0) + if i == -1: + opt.warning("Malformed lyx file: Missing '\\use_jurabib'") + return + header.insert(i + 1, '\\use_bibtopic 0') + + +def revert_bibtopic(header, opt): + i = find_token(header, '\\use_bibtopic', 0) + if i == -1: + opt.warning("Malformed lyx file: Missing '\\use_bibtopic'") + return + if get_value(header, '\\use_bibtopic', 0) != "0": + opt.warning("Conversion of '\\use_bibtopic = 1' not yet implemented.") + # Don't remove '\\use_jurabib' so that people will get warnings by lyx + del header[i] + +## +# Sideway Floats +# + +def convert_float(lines, opt): + i = 0 + while 1: + i = find_token(lines, '\\begin_inset Float', i) + if i == -1: + return + # Seach for a line starting 'wide' + # If, however, we find a line starting '\begin_layout' + # (_always_ present) then break with a warning message + i = i + 1 + while 1: + if (lines[i][:4] == "wide"): + lines.insert(i + 1, 'sideways false') + break + elif (lines[i][:13] == "\\begin_layout"): + opt.warning("Malformed lyx file") + break + i = i + 1 + i = i + 1 + + +def revert_float(lines, opt): + i = 0 + while 1: + i = find_token(lines, '\\begin_inset Float', i) + if i == -1: + return + j = find_end_of_inset(lines, i) + if j == -1: + opt.warning("Malformed lyx file: Missing '\\end_inset'") + i = i + 1 + continue + if get_value(lines, 'sideways', i, j) != "false": + opt.warning("Conversion of 'sideways true' not yet implemented.") + # Don't remove 'sideways' so that people will get warnings by lyx + i = i + 1 + continue + del_token(lines, 'sideways', i, j) + i = i + 1 + +## +# Convertion hub +# + +def convert(header, body, opt): + if opt.format < 223: + add_end_header(header) + convert_spaces(body) + convert_bibtex(body) + remove_insetparent(body) + opt.format = 223 + if opt.end == opt.format: return + + if opt.format < 224: + convert_external(body) + convert_comment(body) + opt.format = 224 + if opt.end == opt.format: return + + if opt.format < 225: + add_end_layout(body) + layout2begin_layout(body) + convert_end_document(body) + convert_table_valignment_middle(body) + convert_breaks(body) + opt.format = 225 + if opt.end == opt.format: return + + if opt.format < 226: + convert_note(body) + opt.format = 226 + if opt.end == opt.format: return + + if opt.format < 227: + convert_box(body) + opt.format = 227 + if opt.end == opt.format: return + + if opt.format < 228: + convert_collapsable(body, opt) + convert_ert(body, opt) + opt.format = 228 + if opt.end == opt.format: return + + if opt.format < 229: + convert_minipage(body) + opt.format = 229 + if opt.end == opt.format: return + + if opt.format < 230: + convert_jurabib(header, opt) + opt.format = 230 + if opt.end == opt.format: return + + if opt.format < 231: + convert_float(body, opt) + opt.format = 231 + if opt.end == opt.format: return + + if opt.format < 232: + convert_bibtopic(header, opt) + opt.format = 232 + +def revert(header, body, opt): + if opt.format > 231: + revert_bibtopic(header, opt) + opt.format = 231 + if opt.end == opt.format: return + + if opt.format > 230: + revert_float(body, opt) + opt.format = 230 + if opt.end == opt.format: return + + if opt.format > 229: + revert_jurabib(header, opt) + opt.format = 229 + if opt.end == opt.format: return + + if opt.format > 228: + opt.format = 228 + if opt.end == opt.format: return + + if opt.format > 227: + revert_collapsable(body, opt) + revert_ert(body, opt) + opt.format = 227 + if opt.end == opt.format: return + + if opt.format > 226: + revert_box(body) + revert_external_2(body) + opt.format = 226 + if opt.end == opt.format: return + + if opt.format > 225: + revert_note(body) + opt.format = 225 + if opt.end == opt.format: return + + if opt.format > 224: + rm_end_layout(body) + begin_layout2layout(body) + revert_end_document(body) + revert_valignment_middle(body) + convert_vspace(header, body, opt) + convert_frameless_box(body, opt) + if opt.end == opt.format: return + + if opt.format > 223: + revert_external_2(body) + revert_comment(body) + opt.format = 223 + if opt.end == opt.format: return + + if opt.format > 221: + rm_end_header(header) + revert_spaces(body) + revert_bibtex(body) + rm_tracking_changes(header) + rm_body_changes(body) + opt.format = 221 + + +if __name__ == "__main__": + pass diff --git a/lib/lyx2lyx/lyxconvert_221.py b/lib/lyx2lyx/lyxconvert_221.py deleted file mode 100644 index 2b809b1f36..0000000000 --- a/lib/lyx2lyx/lyxconvert_221.py +++ /dev/null @@ -1,49 +0,0 @@ -# This file is part of lyx2lyx -# -*- coding: iso-8859-1 -*- -# Copyright (C) 2002 Dekel Tsur -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -import string -from parser_tools import find_token - -def add_end(header): - header.append("\\end_header"); - -def convert_spaces(lines): - for i in range(len(lines)): - lines[i] = string.replace(lines[i],"\\SpecialChar ~","\\InsetSpace ~") - -def convert_bibtex(lines): - for i in range(len(lines)): - lines[i] = string.replace(lines[i],"\\begin_inset LatexCommand \\BibTeX", - "\\begin_inset LatexCommand \\bibtex") - -def remove_insetparent(lines): - i = 0 - while 1: - i = find_token(lines, "\\begin_inset LatexCommand \\lyxparent", i) - if i == -1: - break - del lines[i:i+3] - -def convert(header, body): - add_end(header) - convert_spaces(body) - convert_bibtex(body) - remove_insetparent(body) - -if __name__ == "__main__": - pass diff --git a/lib/lyx2lyx/lyxconvert_223.py b/lib/lyx2lyx/lyxconvert_223.py deleted file mode 100644 index 99b4a85d90..0000000000 --- a/lib/lyx2lyx/lyxconvert_223.py +++ /dev/null @@ -1,126 +0,0 @@ -# This file is part of lyx2lyx -# -*- coding: iso-8859-1 -*- -# Copyright (C) 2002 Dekel Tsur -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -import string -import re -from parser_tools import find_token, find_end_of - -def convert_external(lines): - external_rexp = re.compile(r'\\begin_inset External ([^,]*),"([^"]*)",') - external_header = "\\begin_inset External" - i = 0 - while 1: - i = find_token(lines, external_header, i) - if i == -1: - break - look = external_rexp.search(lines[i]) - args = ['',''] - if look: - args[0] = look.group(1) - args[1] = look.group(2) - #FIXME: if the previous search fails then warn - - if args[0] == "RasterImage": - # Convert a RasterImage External Inset to a Graphics Inset. - top = "\\begin_inset Graphics" - if args[1]: - filename = "\tfilename " + args[1] - lines[i:i+1] = [top, filename] - i = i + 1 - else: - # Convert the old External Inset format to the new. - top = external_header - template = "\ttemplate " + args[0] - if args[1]: - filename = "\tfilename " + args[1] - lines[i:i+1] = [top, template, filename] - i = i + 2 - else: - lines[i:i+1] = [top, template] - i = i + 1 - - -def convert_comment(lines): - i = 0 - comment = "\\layout Comment" - while 1: - i = find_token(lines, comment, i) - if i == -1: - return - - lines[i:i+1] = ["\\layout Standard","","", - "\\begin_inset Comment", - "collapsed true","", - "\\layout Standard"] - i = i + 7 - - while 1: - old_i = i - i = find_token(lines, "\\layout", i) - if i == -1: - i = len(lines) - 1 - lines[i:i] = ["\\end_inset ","",""] - return - - j = find_token(lines, '\\begin_deeper', old_i, i) - if j == -1: j = i + 1 - k = find_token(lines, '\\begin_inset', old_i, i) - if k == -1: k = i + 1 - - if j < i and j < k: - i = j - del lines[i] - i = find_end_of( lines, i, "\\begin_deeper","\\end_deeper") - if i == -1: - #This case should not happen - #but if this happens deal with it greacefully adding - #the missing \end_deeper. - i = len(lines) - 1 - lines[i:i] = ["\end_deeper","","","\\end_inset ","",""] - return - else: - del lines[i] - continue - - if k < i: - i = k - i = find_end_of( lines, i, "\\begin_inset","\\end_inset") - if i == -1: - #This case should not happen - #but if this happens deal with it greacefully adding - #the missing \end_inset. - i = len(lines) - 1 - lines[i:i] = ["\\end_inset ","","","\\end_inset ","",""] - return - else: - i = i + 1 - continue - - if string.find(lines[i], comment) == -1: - lines[i:i] = ["\\end_inset"] - i = i + 1 - break - lines[i:i+1] = ["\\layout Standard"] - i = i + 1 - -def convert(header, body): - convert_external(body) - convert_comment(body) - -if __name__ == "__main__": - pass diff --git a/lib/lyx2lyx/lyxconvert_224.py b/lib/lyx2lyx/lyxconvert_224.py deleted file mode 100644 index 9b491cb179..0000000000 --- a/lib/lyx2lyx/lyxconvert_224.py +++ /dev/null @@ -1,232 +0,0 @@ -# This file is part of lyx2lyx -# -*- coding: iso-8859-1 -*- -# Copyright (C) 2003 José Matos -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -import re -from parser_tools import find_token, find_tokens, find_end_of_inset, find_end_of -from sys import stderr -from string import replace, split, find, replace, strip, join - -def add_end_layout(lines): - i = find_token(lines, '\\layout', 0) - - if i == -1: - return - - i = i + 1 - struct_stack = ["\\layout"] - while 1: - i = find_tokens(lines, ["\\begin_inset", "\\end_inset", "\\layout", - "\\begin_deeper", "\\end_deeper", "\\the_end"], i) - - token = split(lines[i])[0] - - if token == "\\begin_inset": - struct_stack.append(token) - i = i + 1 - continue - - if token == "\\end_inset": - tail = struct_stack.pop() - if tail == "\\layout": - lines.insert(i,"\\end_layout") - i = i + 1 - #Check if it is the correct tag - struct_stack.pop() - i = i + 1 - continue - - if token == "\\layout": - tail = struct_stack.pop() - if tail == token: - lines.insert(i,"\\end_layout") - i = i + 2 - else: - struct_stack.append(tail) - i = i + 1 - struct_stack.append(token) - continue - - if token == "\\begin_deeper" or token == "\\end_deeper": - lines.insert(i,"\\end_layout") - i = i + 2 - continue - - #case \end_document - lines.insert(i, "\\end_layout") - return - -def layout2begin_layout(lines): - i = 0 - while 1: - i = find_token(lines, '\\layout', i) - if i == -1: - return - - lines[i] = replace(lines[i], '\\layout', '\\begin_layout') - i = i + 1 - -def valignment_middle(lines, start, end): - for i in range(start, end): - if re.search('^<(column|cell) .*valignment="center".*>$', lines[i]): - lines[i] = replace(lines[i], 'valignment="center"', 'valignment="middle"') - -def table_valignment_middle(lines): - i = 0 - while 1: - i = find_token(lines, '\\begin_inset Tabular', i) - if i == -1: - return - j = find_end_of_inset(lines, i + 1) - if j == -1: - #this should not happen - valignment_middle(lines, i + 1, len(lines)) - return - valignment_middle(lines, i + 1, j) - i = j + 1 - -def end_document(lines): - i = find_token(lines, "\\the_end", 0) - if i == -1: - lines.append("\\end_document") - return - lines[i] = "\\end_document" - -## -# Convert line and page breaks -# Old: -#\layout Standard -#\line_top \line_bottom \pagebreak_top \pagebreak_bottom \added_space_top xxx \added_space_bottom yyy -#0 -# -# New: -#\begin layout Standard -# -#\newpage -# -#\lyxline -#\begin_inset VSpace xxx -#\end_inset -# -#\end_layout -#\begin_layout Standard -# -#0 -#\end_layout -#\begin_layout Standard -# -#\begin_inset VSpace xxx -#\end_inset -#\lyxline -# -#\newpage -# -#\end_layout - -def convert_breaks(lines): - i = 0 - while 1: - i = find_token(lines, "\\begin_layout", i) - if i == -1: - return - i = i + 1 - line_top = find(lines[i],"\\line_top") - line_bot = find(lines[i],"\\line_bottom") - pb_top = find(lines[i],"\\pagebreak_top") - pb_bot = find(lines[i],"\\pagebreak_bottom") - vspace_top = find(lines[i],"\\added_space_top") - vspace_bot = find(lines[i],"\\added_space_bottom") - - if line_top == -1 and line_bot == -1 and pb_bot == -1 and pb_top == -1 and vspace_top == -1 and vspace_bot == -1: - continue - - for tag in "\\line_top", "\\line_bottom", "\\pagebreak_top", "\\pagebreak_bottom": - lines[i] = replace(lines[i], tag, "") - - if vspace_top != -1: - # the position could be change because of the removal of other - # paragraph properties above - vspace_top = find(lines[i],"\\added_space_top") - tmp_list = split(lines[i][vspace_top:]) - vspace_top_value = tmp_list[1] - lines[i] = lines[i][:vspace_top] + join(tmp_list[2:]) - - if vspace_bot != -1: - # the position could be change because of the removal of other - # paragraph properties above - vspace_bot = find(lines[i],"\\added_space_bottom") - tmp_list = split(lines[i][vspace_bot:]) - vspace_bot_value = tmp_list[1] - lines[i] = lines[i][:vspace_bot] + join(tmp_list[2:]) - - lines[i] = strip(lines[i]) - i = i + 1 - - # Create an empty paragraph for line and page break that belong - # above the paragraph - if pb_top !=-1 or line_top != -1 or vspace_bot != -1: - - paragraph_above = ['','\\begin_layout Standard','',''] - - if pb_top != -1: - paragraph_above.extend(['\\newpage ','']) - - if vspace_top != -1: - paragraph_above.extend(['\\begin_inset VSpace ' + vspace_top_value,'\\end_inset ','','']) - - if line_top != -1: - paragraph_above.extend(['\\lyxline ','']) - - paragraph_above.extend(['\\end_layout','']) - - #inset new paragraph above the current paragraph - lines[i-2:i-2] = paragraph_above - i = i + len(paragraph_above) - - # Ensure that nested style are converted later. - k = find_end_of(lines, i, "\\begin_layout", "\\end_layout") - - if k == -1: - return - - if pb_top !=-1 or line_top != -1 or vspace_bot != -1: - - paragraph_bellow = ['','\\begin_layout Standard','',''] - - if line_bot != -1: - paragraph_bellow.extend(['\\lyxline ','']) - - if vspace_bot != -1: - paragraph_bellow.extend(['\\begin_inset VSpace ' + vspace_bot_value,'\\end_inset ','','']) - - if pb_bot != -1: - paragraph_bellow.extend(['\\newpage ','']) - - paragraph_bellow.extend(['\\end_layout','']) - - #inset new paragraph above the current paragraph - lines[k + 1: k + 1] = paragraph_bellow - -def convert(header, body): - add_end_layout(body) - layout2begin_layout(body) - end_document(body) - table_valignment_middle(body) - convert_breaks(body) - -if __name__ == "__main__": - pass diff --git a/lib/lyx2lyx/lyxconvert_225.py b/lib/lyx2lyx/lyxconvert_225.py deleted file mode 100644 index b14a5a3314..0000000000 --- a/lib/lyx2lyx/lyxconvert_225.py +++ /dev/null @@ -1,37 +0,0 @@ -# This file is part of lyx2lyx -# -*- coding: iso-8859-1 -*- -# Copyright (C) 2003 José Matos -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# 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 find_tokens - -def convert_note(lines): - i = 0 - while 1: - i = find_tokens(lines, ["\\begin_inset Note", - "\\begin_inset Comment", - "\\begin_inset Greyedout"], i) - if i == -1: - break - - lines[i] = lines[i][0:13] + 'Note ' + lines[i][13:] - i = i + 1 - -def convert(header, body): - convert_note(body) - -if __name__ == "__main__": - pass diff --git a/lib/lyx2lyx/lyxconvert_226.py b/lib/lyx2lyx/lyxconvert_226.py deleted file mode 100644 index 75135d8392..0000000000 --- a/lib/lyx2lyx/lyxconvert_226.py +++ /dev/null @@ -1,40 +0,0 @@ -# This file is part of lyx2lyx -# -*- coding: iso-8859-1 -*- -# Copyright (C) 2003 José Matos -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# 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 find_tokens - -def convert_box(lines): - i = 0 - while 1: - i = find_tokens(lines, ["\\begin_inset Boxed", - "\\begin_inset Doublebox", - "\\begin_inset Frameless", - "\\begin_inset ovalbox", - "\\begin_inset Ovalbox", - "\\begin_inset Shadowbox"], i) - if i == -1: - break - - lines[i] = lines[i][0:13] + 'Box ' + lines[i][13:] - i = i + 1 - -def convert(header, body): - convert_box(body) - -if __name__ == "__main__": - pass diff --git a/lib/lyx2lyx/lyxconvert_227.py b/lib/lyx2lyx/lyxconvert_227.py deleted file mode 100644 index 2081568384..0000000000 --- a/lib/lyx2lyx/lyxconvert_227.py +++ /dev/null @@ -1,88 +0,0 @@ -# This file is part of lyx2lyx -# -*- coding: iso-8859-1 -*- -# Copyright (C) 2003 José Matos -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -import sys -from parser_tools import find_token, find_tokens - -def convert_collapsable(lines): - i = 0 - while 1: - i = find_tokens(lines, ["\\begin_inset Box", - "\\begin_inset Branch", - "\\begin_inset CharStyle", - "\\begin_inset Float", - "\\begin_inset Foot", - "\\begin_inset Marginal", - "\\begin_inset Note", - "\\begin_inset OptArg", - "\\begin_inset Wrap"], i) - if i == -1: - break - - # Seach for a line starting 'collapsed' - # If, however, we find a line starting '\begin_layout' - # (_always_ present) then break with a warning message - i = i + 1 - while 1: - if (lines[i] == "collapsed false"): - lines[i] = "status open" - break - elif (lines[i] == "collapsed true"): - lines[i] = "status collapsed" - break - elif (lines[i][:13] == "\\begin_layout"): - sys.stderr.write("Malformed lyx file\n") - break - i = i + 1 - - i = i + 1 - -def convert_ert(lines): - i = 0 - while 1: - i = find_token(lines, "\\begin_inset ERT", i) - if i == -1: - break - - # Seach for a line starting 'status' - # If, however, we find a line starting '\begin_layout' - # (_always_ present) then break with a warning message - i = i + 1 - while 1: - if (lines[i] == "status Open"): - lines[i] = "status open" - break - elif (lines[i] == "status Collapsed"): - lines[i] = "status collapsed" - break - elif (lines[i] == "status Inlined"): - lines[i] = "status inlined" - break - elif (lines[i][:13] == "\\begin_layout"): - sys.stderr.write("Malformed lyx file\n") - break - i = i + 1 - - i = i + 1 - -def convert(header, body): - convert_collapsable(body) - convert_ert(body) - -if __name__ == "__main__": - pass diff --git a/lib/lyx2lyx/lyxconvert_228.py b/lib/lyx2lyx/lyxconvert_228.py deleted file mode 100644 index ec98444038..0000000000 --- a/lib/lyx2lyx/lyxconvert_228.py +++ /dev/null @@ -1,103 +0,0 @@ -# This file is part of lyx2lyx -# -*- coding: iso-8859-1 -*- -# Copyright (C) 2003 José Matos -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - - - -import sys -from parser_tools import find_token - - -def convert_minipage(lines): - """ Convert minipages to the box inset. - We try to use the same order of arguments as lyx does. - """ - pos = ["t","c","b"] - inner_pos = ["c","t","b","s"] - - i = 0 - while 1: - i = find_token(lines, "\\begin_inset Minipage", i) - if i == -1: - return - - lines[i] = "\\begin_inset Box Frameless" - i = i + 1 - - # convert old to new position using the pos list - if lines[i][:8] == "position": - lines[i] = 'position "%s"' % pos[int(lines[i][9])] - else: - lines.insert(i, 'position "%s"' % pos[0]) - i = i + 1 - - lines.insert(i, 'hor_pos "c"') - i = i + 1 - lines.insert(i, 'has_inner_box 1') - i = i + 1 - - # convert the inner_position - if lines[i][:14] == "inner_position": - lines[i] = 'inner_pos "%s"' % inner_pos[int(lines[i][15])] - else: - lines.insert('inner_pos "%s"' % inner_pos[0]) - i = i + 1 - - # We need this since the new file format has a height and width - # in a different order. - if lines[i][:6] == "height": - height = lines[i][6:] - # test for default value of 221 and convert it accordingly - if height == ' "0pt"': - height = ' "1pt"' - del lines[i] - else: - height = ' "1pt"' - - if lines[i][:5] == "width": - width = lines[i][5:] - del lines[i] - else: - width = ' "0"' - - if lines[i][:9] == "collapsed": - if lines[i][9:] == "true": - status = "collapsed" - else: - status = "open" - del lines[i] - else: - status = "collapsed" - - lines.insert(i, 'use_parbox 0') - i = i + 1 - lines.insert(i, 'width' + width) - i = i + 1 - lines.insert(i, 'special "none"') - i = i + 1 - lines.insert(i, 'height' + height) - i = i + 1 - lines.insert(i, 'height_special "totalheight"') - i = i + 1 - lines.insert(i, 'status ' + status) - i = i + 1 - -def convert(header, body): - convert_minipage(body) - -if __name__ == "__main__": - pass diff --git a/lib/lyx2lyx/lyxconvert_230.py b/lib/lyx2lyx/lyxconvert_230.py deleted file mode 100644 index 22c7fc658b..0000000000 --- a/lib/lyx2lyx/lyxconvert_230.py +++ /dev/null @@ -1,29 +0,0 @@ -# This file is part of lyx2lyx -# -*- coding: iso-8859-1 -*- -# Copyright (C) 2003 José Matos -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - - - -import sys -from parser_tools import find_token - - -def convert(header, body): - pass - -if __name__ == "__main__": - pass diff --git a/lib/lyx2lyx/lyxrevert_223.py b/lib/lyx2lyx/lyxrevert_223.py deleted file mode 100644 index c3e586d191..0000000000 --- a/lib/lyx2lyx/lyxrevert_223.py +++ /dev/null @@ -1,64 +0,0 @@ -# This file is part of lyx2lyx -# -*- coding: iso-8859-1 -*- -# Copyright (C) 2003 José Matos -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -import string -from parser_tools import find_token - -def rm_end_header(lines): - i = find_token(lines, "\\end_header", 0) - if i == -1: - return - del lines[i] - -def convert_spaces(lines): - for i in range(len(lines)): - lines[i] = string.replace(lines[i],"\\InsetSpace ~", "\\SpecialChar ~") - -def convert_bibtex(lines): - for i in range(len(lines)): - lines[i] = string.replace(lines[i], "\\begin_inset LatexCommand \\bibtex", - "\\begin_inset LatexCommand \\BibTeX") - -def rm_tracking_changes(lines): - i = find_token(lines, "\\author", 0) - if i != -1: - del lines[i] - - i = find_token(lines, "\\tracking_changes", 0) - if i == -1: - return - del lines[i] - -def rm_body_changes(lines): - i = 0 - while 1: - i = find_token(lines, "\\change_", i) - if i == -1: - return - - del lines[i] - -def convert(header, body): - rm_end_header(header) - convert_spaces(body) - convert_bibtex(body) - rm_tracking_changes(header) - rm_body_changes(body) - -if __name__ == "__main__": - pass diff --git a/lib/lyx2lyx/lyxrevert_224.py b/lib/lyx2lyx/lyxrevert_224.py deleted file mode 100644 index 99ea8b7b60..0000000000 --- a/lib/lyx2lyx/lyxrevert_224.py +++ /dev/null @@ -1,60 +0,0 @@ -# This file is part of lyx2lyx -# -*- coding: iso-8859-1 -*- -# Copyright (C) 2003 José Matos -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -from string import split, join -from parser_tools import find_token, find_tokens - -def convert_external(lines): - external_header = "\\begin_inset External" - i = 0 - while 1: - i = find_token(lines, external_header, i) - if i == -1: - break - - template = split(lines[i+1]) - template.reverse() - del lines[i+1] - - filename = split(lines[i+1]) - filename.reverse() - del lines[i+1] - - params = split(lines[i+1]) - params.reverse() - if lines[i+1]: del lines[i+1] - - lines[i] = lines[i] + " " + template[0]+ ', "' + filename[0] + '", " '+ join(params[1:]) + '"' - i = i + 1 - -def convert_comment(lines): - i = 0 - while 1: - i = find_tokens(lines, ["\\begin_inset Comment", "\\begin_inset Greyedout"], i) - - if i == -1: - return - lines[i] = "\\begin_inset Note" - i = i + 1 - -def convert(header, body): - convert_external(body) - convert_comment(body) - -if __name__ == "__main__": - pass diff --git a/lib/lyx2lyx/lyxrevert_225.py b/lib/lyx2lyx/lyxrevert_225.py deleted file mode 100644 index c2223fd54d..0000000000 --- a/lib/lyx2lyx/lyxrevert_225.py +++ /dev/null @@ -1,306 +0,0 @@ -# This file is part of lyx2lyx -# -*- coding: iso-8859-1 -*- -# Copyright (C) 2003 José Matos -# Copyright (C) 2003 Georg Baum -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -import re -from parser_tools import find_token, find_end_of_inset, get_next_paragraph, \ - get_paragraph, get_value, del_token, is_nonempty_line -from string import find, replace, split -import sys - -def rm_end_layout(lines): - i = 0 - while 1: - i = find_token(lines, '\\end_layout', i) - - if i == -1: - return - - del lines[i] - -def begin_layout2layout(lines): - i = 0 - while 1: - i = find_token(lines, '\\begin_layout', i) - if i == -1: - return - - lines[i] = replace(lines[i], '\\begin_layout', '\\layout') - i = i + 1 - -def table_valignment_middle(lines, start, end): - for i in range(start, end): - if re.search('^<(column|cell) .*valignment="middle".*>$', lines[i]): - lines[i] = replace(lines[i], 'valignment="middle"', 'valignment="center"') - -def valignment_middle(lines): - i = 0 - while 1: - i = find_token(lines, '\\begin_inset Tabular', i) - if i == -1: - return - j = find_end_of_inset(lines, i + 1) - if j == -1: - #this should not happen - valignment_middle(lines, i + 1, len(lines)) - return - valignment_middle(lines, i + 1, j) - i = j + 1 - -def end_document(lines): - i = find_token(lines, "\\end_document", 0) - if i == -1: - lines.append("\\the_end") - return - lines[i] = "\\the_end" - -# Convert backslashes into valid ERT code, append the converted text to -# lines[i] and return the (maybe incremented) line index i -def convert_ertbackslash(lines, i, ert): - for c in ert: - if c == '\\': - lines[i] = lines[i] + '\\backslash ' - lines.insert(i, '') - i = i + 1 - else: - lines[i] = lines[i] + c - return i - -def convert_vspace(header, lines): - - # Get default spaceamount - i = find_token(header, '\\defskip', 0) - if i == -1: - defskipamount = 'medskip' - else: - defskipamount = split(header[i])[1] - - # Convert the insets - i = 0 - while 1: - i = find_token(lines, '\\begin_inset VSpace', i) - if i == -1: - return - spaceamount = split(lines[i])[2] - - # Are we at the beginning or end of a paragraph? - paragraph_start = 1 - start = get_paragraph(lines, i) + 1 - for k in range(start, i): - if is_nonempty_line(lines[k]): - paragraph_start = 0 - break - paragraph_end = 1 - j = find_end_of_inset(lines, i) - if j == -1: - sys.stderr.write("Malformed lyx file: Missing '\\end_inset'\n") - i = i + 1 - continue - end = get_next_paragraph(lines, i) - for k in range(j + 1, end): - if is_nonempty_line(lines[k]): - paragraph_end = 0 - break - - # Convert to paragraph formatting if we are at the beginning or end - # of a paragraph and the resulting paragraph would not be empty - if ((paragraph_start and not paragraph_end) or - (paragraph_end and not paragraph_start)): - # The order is important: del and insert invalidate some indices - del lines[j] - del lines[i] - if paragraph_start: - lines.insert(start, '\\added_space_top ' + spaceamount + ' ') - else: - lines.insert(start, '\\added_space_bottom ' + spaceamount + ' ') - continue - - # Convert to ERT - lines[i:i+1] = ['\\begin_inset ERT', 'status Collapsed', '', - '\\layout Standard', '', '\\backslash '] - i = i + 6 - if spaceamount[-1] == '*': - spaceamount = spaceamount[:-1] - keep = 1 - else: - keep = 0 - - # Replace defskip by the actual value - if spaceamount == 'defskip': - spaceamount = defskipamount - - # LaTeX does not know \\smallskip* etc - if keep: - if spaceamount == 'smallskip': - spaceamount = '\\smallskipamount' - elif spaceamount == 'medskip': - spaceamount = '\\medskipamount' - elif spaceamount == 'bigskip': - spaceamount = '\\bigskipamount' - elif spaceamount == 'vfill': - spaceamount = '\\fill' - - # Finally output the LaTeX code - if (spaceamount == 'smallskip' or spaceamount == 'medskip' or - spaceamount == 'bigskip' or spaceamount == 'vfill'): - lines.insert(i, spaceamount) - else : - if keep: - lines.insert(i, 'vspace*{') - else: - lines.insert(i, 'vspace{') - i = convert_ertbackslash(lines, i, spaceamount) - lines[i] = lines[i] + '}' - i = i + 1 - -# Convert a LyX length into valid ERT code and append it to lines[i] -# Return the (maybe incremented) line index i -def convert_ertlen(lines, i, len, special): - units = {"text%":"\\textwidth", "col%":"\\columnwidth", - "page%":"\\pagewidth", "line%":"\\linewidth", - "theight%":"\\textheight", "pheight%":"\\pageheight"} - - # Convert special lengths - if special != 'none': - len = '%f\\' % len2value(len) + special - - # Convert LyX units to LaTeX units - for unit in units.keys(): - if find(len, unit) != -1: - len = '%f' % (len2value(len) / 100) + units[unit] - break - - # Convert backslashes and insert the converted length into lines - return convert_ertbackslash(lines, i, len) - -# Return the value of len without the unit in numerical form -def len2value(len): - result = re.search('([+-]?[0-9.]+)', len) - if result: - return float(result.group(1)) - # No number means 1.0 - return 1.0 - -def convert_frameless_box(lines): - pos = ['t', 'c', 'b'] - inner_pos = ['c', 't', 'b', 's'] - i = 0 - while 1: - i = find_token(lines, '\\begin_inset Frameless', i) - if i == -1: - return - j = find_end_of_inset(lines, i) - if j == -1: - sys.stderr.write("Malformed lyx file: Missing '\\end_inset'\n") - i = i + 1 - continue - del lines[i] - - # Gather parameters - params = {'position':'0', 'hor_pos':'c', 'has_inner_box':'1', - 'inner_pos':'1', 'use_parbox':'0', 'width':'100col%', - 'special':'none', 'height':'1in', - 'height_special':'totalheight', 'collapsed':'false'} - for key in params.keys(): - value = replace(get_value(lines, key, i, j), '"', '') - if value != "": - if key == 'position': - # convert new to old position: 'position "t"' -> 0 - value = find_token(pos, value, 0) - if value != -1: - params[key] = value - elif key == 'inner_pos': - # convert inner position - value = find_token(inner_pos, value, 0) - if value != -1: - params[key] = value - else: - params[key] = value - j = del_token(lines, key, i, j) - i = i + 1 - - # Convert to minipage or ERT? - # Note that the inner_position and height parameters of a minipage - # inset are ignored and not accessible for the user, although they - # are present in the file format and correctly read in and written. - # Therefore we convert to ERT if they do not have their LaTeX - # defaults. These are: - # - the value of "position" for "inner_pos" - # - "\totalheight" for "height" - if (params['use_parbox'] != '0' or - params['has_inner_box'] != '1' or - params['special'] != 'none' or - inner_pos[params['inner_pos']] != pos[params['position']] or - params['height_special'] != 'totalheight' or - len2value(params['height']) != 1.0): - - # Convert to ERT - if params['collapsed'] == 'true': - params['collapsed'] = 'Collapsed' - else: - params['collapsed'] = 'Open' - lines[i : i] = ['\\begin_inset ERT', 'status ' + params['collapsed'], - '', '\\layout Standard', '', '\\backslash '] - i = i + 6 - if params['use_parbox'] == '1': - lines.insert(i, 'parbox') - else: - lines.insert(i, 'begin{minipage}') - lines[i] = lines[i] + '[' + pos[params['position']] + '][' - i = convert_ertlen(lines, i, params['height'], params['height_special']) - lines[i] = lines[i] + '][' + inner_pos[params['inner_pos']] + ']{' - i = convert_ertlen(lines, i, params['width'], params['special']) - if params['use_parbox'] == '1': - lines[i] = lines[i] + '}{' - else: - lines[i] = lines[i] + '}' - i = i + 1 - lines[i:i] = ['', '\\end_inset '] - i = i + 2 - j = find_end_of_inset(lines, i) - if j == -1: - sys.stderr.write("Malformed lyx file: Missing '\\end_inset'\n") - break - lines[j-1:j-1] += ['\\begin_inset ERT', 'status ' + params['collapsed'], - '', '\\layout Standard', ''] - j = j + 4 - if params['use_parbox'] == '1': - lines.insert(j, '}') - else: - lines[j:j] = ['\\backslash ', 'end{minipage}'] - else: - - # Convert to minipage - lines[i:i] = ['\\begin_inset Minipage', - 'position %d' % params['position'], - 'inner_position %d' % params['inner_pos'], - 'height "' + params['height'] + '"', - 'width "' + params['width'] + '"', - 'collapsed ' + params['collapsed']] - i = i + 6 - -def convert(header, body): - rm_end_layout(body) - begin_layout2layout(body) - end_document(body) - valignment_middle(body) - convert_vspace(header, body) - convert_frameless_box(body) - -if __name__ == "__main__": - pass diff --git a/lib/lyx2lyx/lyxrevert_226.py b/lib/lyx2lyx/lyxrevert_226.py deleted file mode 100644 index 97ec2b9c66..0000000000 --- a/lib/lyx2lyx/lyxrevert_226.py +++ /dev/null @@ -1,36 +0,0 @@ -# This file is part of lyx2lyx -# -*- coding: iso-8859-1 -*- -# Copyright (C) 2003 José Matos -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# 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 find_token - -def convert_note(lines): - note_header = "\\begin_inset Note " - i = 0 - while 1: - i = find_token(lines, note_header, i) - if i == -1: - break - - lines[i] = "\\begin_inset " + lines[i][len(note_header):] - i = i + 1 - -def convert(header, body): - convert_note(body) - -if __name__ == "__main__": - pass diff --git a/lib/lyx2lyx/lyxrevert_227.py b/lib/lyx2lyx/lyxrevert_227.py deleted file mode 100644 index 53584e74fa..0000000000 --- a/lib/lyx2lyx/lyxrevert_227.py +++ /dev/null @@ -1,53 +0,0 @@ -# This file is part of lyx2lyx -# -*- coding: iso-8859-1 -*- -# Copyright (C) 2003 José Matos -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# 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 find_token, find_end_of_inset - -def convert_box(lines): - box_header = "\\begin_inset Box " - i = 0 - while 1: - i = find_token(lines, box_header, i) - if i == -1: - break - - lines[i] = "\\begin_inset " + lines[i][len(box_header):] - i = i + 1 - -def convert_external(lines): - draft_token = '\tdraft' - i = 0 - while 1: - i = find_token(lines, '\\begin_inset External', i) - if i == -1: - break - j = find_end_of_inset(lines, i + 1) - if j == -1: - #this should not happen - break - k = find_token(lines, draft_token, i+1, j-1) - if (k != -1 and len(draft_token) == len(lines[k])): - del lines[k] - i = j + 1 - -def convert(header, body): - convert_box(body) - convert_external(body) - -if __name__ == "__main__": - pass diff --git a/lib/lyx2lyx/lyxrevert_228.py b/lib/lyx2lyx/lyxrevert_228.py deleted file mode 100644 index 50d4583774..0000000000 --- a/lib/lyx2lyx/lyxrevert_228.py +++ /dev/null @@ -1,89 +0,0 @@ -# This file is part of lyx2lyx -# -*- coding: iso-8859-1 -*- -# Copyright (C) 2003 José Matos -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -import sys -from parser_tools import find_token, find_tokens - -def convert_collapsable(lines): - i = 0 - while 1: - i = find_tokens(lines, ["\\begin_inset Box", - "\\begin_inset Branch", - "\\begin_inset CharStyle", - "\\begin_inset Float", - "\\begin_inset Foot", - "\\begin_inset Marginal", - "\\begin_inset Note", - "\\begin_inset OptArg", - "\\begin_inset Wrap"], i) - if i == -1: - break - - # Seach for a line starting 'status' - # If, however, we find a line starting '\begin_layout' - # (_always_ present) then break with a warning message - i = i + 1 - while 1: - if (lines[i] == "status open"): - lines[i] = "collapsed false" - break - elif (lines[i] == "status collapsed" or - lines[i] == "status inlined"): - lines[i] = "collapsed true" - break - elif (lines[i][:13] == "\\begin_layout"): - sys.stderr.write("Malformed lyx file\n") - break - i = i + 1 - - i = i + 1 - -def convert_ert(lines): - i = 0 - while 1: - i = find_token(lines, "\\begin_inset ERT", i) - if i == -1: - break - - # Seach for a line starting 'status' - # If, however, we find a line starting '\begin_layout' - # (_always_ present) then break with a warning message - i = i + 1 - while 1: - if (lines[i] == "status open"): - lines[i] = "status Open" - break - elif (lines[i] == "status collapsed"): - lines[i] = "status Collapsed" - break - elif (lines[i] == "status inlined"): - lines[i] = "status Inlined" - break - elif (lines[i][:13] == "\\begin_layout"): - sys.stderr.write("Malformed lyx file\n") - break - i = i + 1 - - i = i + 1 - -def convert(header, body): - convert_collapsable(body) - convert_ert(body) - -if __name__ == "__main__": - pass diff --git a/lib/lyx2lyx/lyxrevert_229.py b/lib/lyx2lyx/lyxrevert_229.py deleted file mode 100644 index 6670c220ea..0000000000 --- a/lib/lyx2lyx/lyxrevert_229.py +++ /dev/null @@ -1,25 +0,0 @@ -# This file is part of lyx2lyx -# -*- coding: iso-8859-1 -*- -# Copyright (C) 2003 José Matos -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - - - -def convert(header, body): - pass - -if __name__ == "__main__": - pass diff --git a/lib/lyx2lyx/lyxrevert_231.py b/lib/lyx2lyx/lyxrevert_231.py deleted file mode 100644 index 22c7fc658b..0000000000 --- a/lib/lyx2lyx/lyxrevert_231.py +++ /dev/null @@ -1,29 +0,0 @@ -# This file is part of lyx2lyx -# -*- coding: iso-8859-1 -*- -# Copyright (C) 2003 José Matos -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - - - -import sys -from parser_tools import find_token - - -def convert(header, body): - pass - -if __name__ == "__main__": - pass diff --git a/lib/lyx2lyx/lyxrevert_232.py b/lib/lyx2lyx/lyxrevert_232.py deleted file mode 100644 index 22c7fc658b..0000000000 --- a/lib/lyx2lyx/lyxrevert_232.py +++ /dev/null @@ -1,29 +0,0 @@ -# This file is part of lyx2lyx -# -*- coding: iso-8859-1 -*- -# Copyright (C) 2003 José Matos -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - - - -import sys -from parser_tools import find_token - - -def convert(header, body): - pass - -if __name__ == "__main__": - pass diff --git a/lib/lyx2lyx/parser_tools.py b/lib/lyx2lyx/parser_tools.py index 4472a6e2d9..9b5a555909 100644 --- a/lib/lyx2lyx/parser_tools.py +++ b/lib/lyx2lyx/parser_tools.py @@ -1,6 +1,6 @@ # This file is part of lyx2lyx # -*- coding: iso-8859-1 -*- -# Copyright (C) 2002-2003 Dekel Tsur , José Matos +# Copyright (C) 2002-2004 Dekel Tsur , José Matos # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -17,6 +17,7 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. import string +import re def check_token(line, token): if line[:len(token)] == token: @@ -102,6 +103,7 @@ def get_paragraph(lines, i): if check_token(lines[i], "\\layout"): return i i = find_beginning_of_inset(lines, i) + return -1 # Finds the paragraph after the paragraph that contains line i. def get_next_paragraph(lines, i): @@ -110,6 +112,7 @@ def get_next_paragraph(lines, i): if not check_token(lines[i], "\\begin_inset"): return i i = find_end_of_inset(lines, i) + return -1 def find_end_of(lines, i, start_token, end_token): count = 1 @@ -174,13 +177,175 @@ def find_nonempty_line(lines, start, end = 0): return i return -1 -def set_comment(lines, version): +## +# Tools for file reading +# +def read_file(header, body, opt): + """Reads a file into the header and body parts""" + preamble = 0 + + while 1: + line = opt.input.readline() + if not line: + opt.error("Invalid LyX file.") + + line = line[:-1] + if check_token(line, '\\begin_preamble'): + preamble = 1 + if check_token(line, '\\end_preamble'): + preamble = 0 + + if not preamble: + line = string.strip(line) + + if not line and not preamble: + break + + header.append(line) + + while 1: + line = opt.input.readline() + if not line: + break + body.append(line[:-1]) + +def write_file(header, body, opt): + for line in header: + opt.output.write(line+"\n") + opt.output.write("\n") + for line in body: + opt.output.write(line+"\n") + +## +# lyx version +# +original_version = re.compile(r"\#LyX (\S*)") + +def read_version(header): + for line in header: + if line[0] != "#": + return None + + result = original_version.match(line) + if result: + return result.group(1) + return None + +def set_version(lines, version): lines[0] = "#LyX %s created this file. For more info see http://www.lyx.org/" % version if lines[1][0] == '#': del lines[1] +## +# file format version +# +format_re = re.compile(r"(\d)[\.,]?(\d\d)") +fileformat = re.compile(r"\\lyxformat\s*(\S*)") +lst_ft = [210, 215, 216, 217, 218, 220, 221, 223, 224, 225, 226, 227, 228, 229, + 230, 231, 232] + +format_relation = [("0_10", [210], ["0.10.7","0.10"]), + ("0_12", [215], ["0.12","0.12.1","0.12"]), + ("1_0_0", [215], ["1.0.0","1.0"]), + ("1_0_1", [215], ["1.0.1","1.0.2","1.0.3","1.0.4", "1.1.2","1.1"]), + ("1_1_4", [215], ["1.1.4","1.1"]), + ("1_1_5", [216], ["1.1.5","1.1.5fix1","1.1.5fix2","1.1"]), + ("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"]), + ("1_4", [223,224,225,226,227,228,229,230,231,232], ["1.4.0cvs","1.4"])] + +def lyxformat(format, opt): + result = format_re.match(format) + if result: + format = int(result.group(1) + result.group(2)) + else: + opt.error(str(format) + ": " + "Invalid LyX file.") + + if format in lst_ft: + return format + + opt.error(str(format) + ": " + "Format no supported.") + return None + +def read_format(header, opt): + for line in header: + result = fileformat.match(line) + if result: + return lyxformat(result.group(1), opt) + else: + opt.error("Invalid LyX File.") + return None + def set_format(lines, number): if int(number) <= 217: number = float(number)/100 i = find_token(lines, "\\lyxformat", 0) lines[i] = "\\lyxformat %s" % number + +def get_end_format(): + return format_relation[-1:][0][1][-1:][0] + +def chain(opt, initial_version): + """ This is where all the decisions related with the convertion are taken""" + + format = opt.format + if opt.start: + if opt.start != format: + opt.warning("%s: %s %s" % ("Proposed file format and input file formats do not match:", opt.start, format)) + else: + opt.start = format + + if not opt.end: + opt.end = get_end_format() + + correct_version = 0 + + for rel in format_relation: + if initial_version in rel[2]: + if format in rel[1]: + initial_step = rel[0] + correct_version = 1 + break + + if not correct_version: + if format <= 215: + opt.warning("Version does not match file format, discarding it.") + for rel in format_relation: + if format in rel[1]: + initial_step = rel[0] + break + else: + # This should not happen, really. + opt.error("Format not supported.") + + # Find the final step + for rel in format_relation: + if opt.end in rel[1]: + final_step = rel[0] + break + else: + opt.error("Format not supported.") + + # Convertion mode, back or forth + steps = [] + if (initial_step, opt.start) < (final_step, opt.end): + mode = "convert" + first_step = 1 + for step in format_relation: + if initial_step <= step[0] <= final_step: + if first_step and len(step[1]) == 1: + first_step = 0 + continue + steps.append(step[0]) + else: + mode = "revert" + for step in format_relation: + if final_step <= step[0] <= initial_step: + steps.insert(0, step[0]) + + if step[1][-1:] == opt.end: + del steps[0] + + return mode, steps -- 2.39.5