change the file format number to 229 for the sake of a cleaner minipage/box conversion

[lyx.git] / lib / lyx2lyx / lyx2lyx

diff --git a/lib/lyx2lyx/lyx2lyx b/lib/lyx2lyx/lyx2lyx
index c7629b9c22533a006e51b3d884ac4b62255597cf..d4333283bcf76499ab339213020da8b3b7b758ee 100755 (executable)
--- a/lib/lyx2lyx/lyx2lyx
+++ b/lib/lyx2lyx/lyx2lyx
@@ -1,5 +1,6 @@
 #! /usr/bin/env python
-# Copyright (C) 2002 José Matos <jamatos@lyx.org>
+# -*- coding: iso-8859-1 -*-
+# Copyright (C) 2002-2003 José Matos <jamatos@lyx.org>
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -32,13 +33,14 @@ 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"]
+lst_ft = [210, 215, 216, 217,  218, 220, 221, 223, 224, 225, 226, 227, 228, 229]
 
 def usage():
     print """Usage: lyx2lyx [options] [file]
@@ -51,6 +53,7 @@ Options:
     -l, --list                 list all available formats
     -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
@@ -58,9 +61,9 @@ Options:
 
 
 def parse_options(argv):
-    _options =  ["help", "version", "list", "debug=", "from=", "to=", "output=", "quiet"]
+    _options =  ["help", "version", "list", "debug=", "err=", "from=", "to=", "output=", "quiet"]
     try:
-       opts, args = getopt.getopt(argv[1:], "d:f:hlo:qt:v", _options)
+       opts, args = getopt.getopt(argv[1:], "d:e:f:hlo:qt:v", _options)
     except getopt.error:
         usage()
         sys.exit(2)
@@ -71,7 +74,7 @@ def parse_options(argv):
             sys.exit()
         if o in ("-v", "--version"):
             print "lyxconvert, version %s" %(version)
-            print "Copyright (C) 2002-2003 LyX Team"
+            print "Copyright (C) 2002-2003 José Matos and Dekel Tsur"
             sys.exit()
         if o in ("-d", "--debug"):
             opt.debug = int(a)
@@ -86,18 +89,12 @@ def parse_options(argv):
             opt.start = lyxformat(a)
         if o in ("-t", "--to"):
             opt.end = lyxformat(a)
+        if o in ("-e","--err"):
+            opt.err = open(a, "w")
 
     if not opt.end:
         opt.end = lst_ft[len(lst_ft)-1]
 
-    if opt.start and opt.start == opt.end:
-        sys.stderr.write(error.same_format)
-        sys.exit()
-
-    if opt.start > opt.end:
-        sys.stderr.write(error.newer_format)
-        sys.exit(1)
-
     if args:
         file = args[0]
         try:
@@ -110,20 +107,15 @@ def parse_options(argv):
 def lyxformat(fmt):
     result = format.match(fmt)
     if result:
-        fmt = result.group(1)+result.group(2)
+        fmt = int(result.group(1) + result.group(2))
     else:
-        sys.stderr.write(fmt + ": " + error.invalid_format)
+        opt.err.write(str(fmt) + ": " + error.invalid_format)
         sys.exit(2)
 
     if fmt in lst_ft:
         return fmt
 
-    x = int(fmt)
-    if x < int(lst_ft[-1]) and x > int(lst_ft[-2]):
-        sys.stderr.write("lyx2lyx: A development version file.\n")
-        return lst_ft[-2]
-
-    sys.stderr.write(fmt + ": " + error.format_not_supported)
+    opt.err.write(str(fmt) + ": " + error.format_not_supported)
     sys.exit(1)
 
 def read_file(file, header, body):
@@ -134,7 +126,7 @@ def read_file(file, header, body):
     while 1:
         line = file.readline()
         if not line:
-            sys.stderr.write(error.invalid_file)
+            opt.err.write(error.invalid_file)
             sys.exit(3)
 
         line = line[:-1]
@@ -161,7 +153,7 @@ def read_file(file, header, body):
         body.append(line[:-1])
 
     if not fmt:
-        sys.stderr.write(error.invalid_file)
+        opt.err.write(error.invalid_file)
         sys.exit(3)
     return fmt
 
@@ -180,20 +172,26 @@ def main(argv):
 
     if opt.start:
         if opt.start != fmt:
-            sys.stderr.write("%s: %s %s\n" % (warning.dont_match, 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__("lyxconvert_" + fmt).convert(header,body)
+        __import__(mode + str(fmt)).convert(header,body)
 
     set_comment(header, version)
     set_format(header, opt.end)
     write_file(opt.output, header, body)
-    
+
 if __name__ == "__main__":
     main(sys.argv)