X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flyx2lyx%2Flyx2lyx;h=8c7b98b26320a229f31ff6822f49fd4538b8e1ee;hb=6bf6c8453d05105af9b49e29eacd0d20076872d6;hp=d4333283bcf76499ab339213020da8b3b7b758ee;hpb=260a79e3a569e67acaf38e4e48e8cd54b1fcc5b4;p=lyx.git diff --git a/lib/lyx2lyx/lyx2lyx b/lib/lyx2lyx/lyx2lyx index d4333283bc..8c7b98b263 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 +# -*- coding: utf-8 -*- +# 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,31 +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 getopt, sys, string, re -from error import error, warning -from parser_tools import set_comment, set_format, check_token -import gzip - -version = "1.4.0cvs" - -# 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] +import getopt +import sys +import LyX def usage(): print """Usage: lyx2lyx [options] [file] @@ -51,147 +29,73 @@ 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) -t, --to version final version (optional) -o, --output name name of the output file or else goes to stdout + -n, --try-hard try hard (ignore any convertion errors) + -c, --cjk [encoding] files in format 248 and lower are read and + written in the format of CJK-LyX. + If encoding is not given or 'auto' the encoding + is determined from the locale. -q, --quiet same as --debug=0""" def parse_options(argv): - _options = ["help", "version", "list", "debug=", "err=", "from=", "to=", "output=", "quiet"] + _options = ["help", "version", "list", "debug=", "err=", "from=", "to=", "output=", "try-hard", "cjk", "quiet"] try: - opts, args = getopt.getopt(argv[1:], "d:e:f:hlo:qt:v", _options) + opts, args = getopt.getopt(argv[1:], "c:d:e:f:hlno:qt:v", _options) except getopt.error: usage() sys.exit(2) + end_format, input, output, error, debug, try_hard = 0, "", "", "", LyX.default_debug_level, 0 + cjk_encoding = '' for o, a in opts: if o in ("-h", "--help"): 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" %(LyX.version_lyx2lyx) + print "Copyright (C) 2002-2004 José Matos and Dekel Tsur" sys.exit() if o in ("-d", "--debug"): - opt.debug = int(a) + debug = int(a) if o in ("-q", "--quiet"): - opt.debug = 0 + debug = 0 if o in ("-l", "--list"): - print lst_ft + print LyX.formats_list() sys.exit() if o in ("-o", "--output"): - opt.output = open(a, "w") - if o in ("-f", "--from"): - opt.start = lyxformat(a) + output = a if o in ("-t", "--to"): - opt.end = lyxformat(a) + end_format = a if o in ("-e","--err"): - opt.err = open(a, "w") - - if not opt.end: - opt.end = lst_ft[len(lst_ft)-1] - + error = a + if o in ("-n", "--try-hard"): + try_hard = 1 + if o in ("-c", "--cjk"): + if a == '': + cjk_encoding = 'auto' + else: + cjk_encoding = a if args: - file = args[0] - try: - gzip.open(file).readline() - opt.output = gzip.GzipFile("","wb",6,opt.output) - opt.input = gzip.open(file) - 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) + input = args[0] -def read_file(file, header, body): - """Reads a file into the header and body parts""" - fmt = None - preamble = 0 + return end_format, input, output, error, debug, try_hard, cjk_encoding - 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) - - 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_" + end_format, input, output, error, debug, try_hard, cjk_encoding = parse_options(argv) + file = LyX.File(end_format, input, output, error, debug, try_hard, cjk_encoding) - start = lst_ft.index(opt.start) - end = lst_ft.index(opt.end) + file.convert() + file.write() - for fmt in lst_ft[start:end]: - __import__(mode + str(fmt)).convert(header,body) + return file.status - set_comment(header, version) - set_format(header, opt.end) - write_file(opt.output, header, body) if __name__ == "__main__": - main(sys.argv) + sys.exit(main(sys.argv))