I forgot that the single line case is really OK.

[lyx.git] / lib / lyx2lyx / lyx2lyx

diff --git a/lib/lyx2lyx/lyx2lyx b/lib/lyx2lyx/lyx2lyx
index d2e5a090d9811da4c719d7a7ce29152eb19fb402..c1c9f188d66b26cfb26ccf72a28c1e4031fe3c02 100755 (executable)
--- a/lib/lyx2lyx/lyx2lyx
+++ b/lib/lyx2lyx/lyx2lyx
@@ -22,7 +22,7 @@ import optparse
 import sys
 import LyX
 
-if __name__ == "__main__":
+def main():
     args = {}
     args["usage"] = "usage: %prog [options] [file]"
 
@@ -38,13 +38,13 @@ Copyright (C) 2007 José Matos and Dekel Tsur""" % LyX.version__
 
     parser.set_defaults(debug=LyX.default_debug__, cjk_encoding = '')
     parser.add_option("-d", "--debug", type="int",
-                      help="level=0..2 (O_ quiet, 2_verbose) default: 1")
+                      help="level=0..2 (O_ quiet, 10_verbose) default: 2")
     parser.add_option("-q", "--quiet",
                       action="store_const", const=0, dest="debug")
     parser.add_option("-v", "--verbose",
                       action="store_const", const=1, dest="debug")
     parser.add_option("--noisy",
-                      action="store_const", const=2, dest="debug")
+                      action="store_const", const=10, dest="debug")
     parser.add_option("-c", "--encoding", dest="cjk_encoding",
                       help="files in format 248 and lower are read and"
                            " written in the format of CJK-LyX."
@@ -56,8 +56,10 @@ Copyright (C) 2007 José Matos and Dekel Tsur""" % LyX.version__
                       help= "name of the output file else goes to stdout")
     parser.add_option("-t", "--to", dest= "end_format",
                       help= "destination file format, default (latest)")
+    parser.add_option("-V", "--final_version", dest= "final_version",
+                      help= "destination version, default (latest)")
     parser.add_option("-l", "--list", action="store_true",
-                      help = "list all available formats")
+                      help = "list all available formats and supported versions")
     parser.add_option("-n", "--try-hard", action="store_true",
                       help = "try hard (ignore any convertion errors)")
 
@@ -68,7 +70,7 @@ Copyright (C) 2007 José Matos and Dekel Tsur""" % LyX.version__
         options.input = None
 
     if options.list:
-        print LyX.formats_list()
+        sys.stderr.write(LyX.format_info())
         sys.exit()
     else:
         del options.list
@@ -78,3 +80,6 @@ Copyright (C) 2007 José Matos and Dekel Tsur""" % LyX.version__
     doc.write()
 
     sys.exit(doc.status)
+
+if __name__ == "__main__":
+    main()