X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flyx2lyx%2Flyx2lyx;h=ce0e45278d8a9ce536e24d399658763573082e50;hb=5bb791e8411d6ccbfaa23c6ee2a02c414d0c9593;hp=f1489147ce906dd988691f9931ab6f1ae26e7c5f;hpb=34b9ed8ac93b3d1e6c7ab0dda0aea88d15eeebc9;p=lyx.git

diff --git a/lib/lyx2lyx/lyx2lyx b/lib/lyx2lyx/lyx2lyx
index f1489147ce..ce0e45278d 100755
--- a/lib/lyx2lyx/lyx2lyx
+++ b/lib/lyx2lyx/lyx2lyx
@@ -17,36 +17,8 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 import getopt
-import gzip
 import sys
-import os.path
-from parser_tools import read_file, write_file, read_version, set_version, \
-     read_format, set_format, chain, lyxformat, get_value, get_backend
-
-
-# Allow the dummy object to be able to carry related data
-# like a C struct
-class struct:
-    def __init__(self):
-        self.output = sys.stdout
-        self.input = sys.stdin
-        self.err = sys.stderr
-        self.debug = 1
-        self.dir = ""
-        self.start = None
-        self.end = None
-        self.backend = "latex"
-        self.textclass = "article"
-
-    def warning(self, message, debug_level= 1):
-        if debug_level <= self.debug:
-            self.err.write(message + "\n")
-
-    def error(self, message):
-        self.warning(message)
-        self.warning("Quiting.")
-        sys.exit(1)
-
+import LyX
 
 def usage():
     print """Usage: lyx2lyx [options] [file]
@@ -63,84 +35,57 @@ Options:
     -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)
     -q, --quiet			same as --debug=0"""
 
 
-def parse_options(argv, version, opt):
-    _options =  ["help", "version", "list", "debug=", "err=", "from=", "to=", "output=", "quiet"]
+def parse_options(argv):
+    _options =  ["help", "version", "list", "debug=", "err=", "from=", "to=", "output=", "try-hard", "quiet"]
     try:
-       opts, args = getopt.getopt(argv[1:], "d:e:f:hlo:qt:v", _options)
+       opts, args = getopt.getopt(argv[1:], "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
     for o, a in opts:
         if o in ("-h", "--help"):
             usage()
             sys.exit()
         if o in ("-v", "--version"):
-            print "lyx2lyx, version %s" %(version)
+            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"):
-            # list available formats
+            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, opt)
+            output = a
         if o in ("-t", "--to"):
-            opt.end = lyxformat(a, opt)
+            end_format = a
         if o in ("-e","--err"):
-            opt.err = open(a, "w")
-
+            error = a
+        if o in ("-n", "--try-hard"):
+            try_hard = 1
     if args:
-        file = args[0]
-        opt.dir = os.path.dirname(os.path.abspath(file))
-        try:
-            gzip.open(file).readline()
-            opt.output = gzip.GzipFile("","wb",6,opt.output)
-            opt.input = gzip.open(file)
-        except:
-            opt.input = open(file)
+        input = args[0]
 
+    return end_format, input, output, error, debug, try_hard
 
-def main(argv):
-    version = "1.4.0cvs"
 
-    # options object, with default values
-    opt = struct()
-    
-    parse_options(argv, version, opt)
-
-    header, body = [], []
-
-    read_file(header, body, opt)
-
-    initial_version = read_version(header)
-
-    opt.textclass = get_value(header, "\\textclass", 0)
-    opt.backend = get_backend( opt.textclass)
-    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)
+def main(argv):
+    end_format, input, output, error, debug, try_hard = parse_options(argv)
+    file = LyX.File(end_format, input, output, error, debug, try_hard)
 
-    for step in convertion_chain:
-        convert = getattr(__import__("lyx_" + step), mode)
-        convert(header,body, opt)
+    file.convert()
+    file.write()
 
-    set_version(header, version)
-    set_format(header, opt.format)
-    write_file(header, body, opt)
+    return file.status
 
 
 if __name__ == "__main__":
-    main(sys.argv)
+    sys.exit(main(sys.argv))