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

diff --git a/lib/lyx2lyx/lyx2lyx b/lib/lyx2lyx/lyx2lyx
index f7a7ee6cf7..ce0e45278d 100755
--- a/lib/lyx2lyx/lyx2lyx
+++ b/lib/lyx2lyx/lyx2lyx
@@ -32,26 +32,28 @@ Options:
     -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)
     -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", "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 = 0, "", "", "", LyX.default_debug_level
+    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" %(LyX.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"):
@@ -67,24 +69,23 @@ def parse_options(argv):
             end_format = a
         if o in ("-e","--err"):
             error = a
+        if o in ("-n", "--try-hard"):
+            try_hard = 1
     if args:
         input = args[0]
 
-    return end_format, input, output, error, debug
+    return end_format, input, output, error, debug, try_hard
 
 
 def main(argv):
-    end_format, input, output, error, debug = parse_options(argv)
-    file = LyX.FileInfo(end_format, input, output, error, debug)
+    end_format, input, output, error, debug, try_hard = parse_options(argv)
+    file = LyX.File(end_format, input, output, error, debug, try_hard)
 
-    mode, convertion_chain = file.chain()
-    file.warning("convertion chain: " + str(convertion_chain), 3)
+    file.convert()
+    file.write()
 
-    for step in convertion_chain:
-        convert = getattr(__import__("lyx_" + step), mode)
-        convert(file)
+    return file.status
 
-    file.write()
 
 if __name__ == "__main__":
-    main(sys.argv)
+    sys.exit(main(sys.argv))