X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flyx2lyx%2Flyx2lyx;h=dbb31264f2fbdbf2f698d96fb634975025c3ec41;hb=9da74fe2078e24e1e7891784ecbfe33ff77e7f85;hp=9c308f2c02231ff504b1624f14979f0fcfc76c5c;hpb=dbe7b13f6591d27608c3c6e38d77502c46dba5e6;p=lyx.git

diff --git a/lib/lyx2lyx/lyx2lyx b/lib/lyx2lyx/lyx2lyx
index 9c308f2c02..dbb31264f2 100755
--- a/lib/lyx2lyx/lyx2lyx
+++ b/lib/lyx2lyx/lyx2lyx
@@ -1,5 +1,6 @@
 #! /usr/bin/env python
 # -*- coding: utf-8 -*-
+# Copyright (C) 2002-2011 The LyX Team
 # Copyright (C) 2002-2007 José Matos <jamatos@lyx.org>
 # Copyright (C) 2002-2004 Dekel Tsur <dekel@lyx.org>
 #
@@ -15,20 +16,19 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 " Program used to convert between different versions of the lyx file format."
 import optparse
 import sys
 import LyX
 
-if __name__ == "__main__":
-
+def main():
     args = {}
     args["usage"] = "usage: %prog [options] [file]"
 
     args["version"] = """lyx2lyx, version %s
-Copyright (C) 2007 José Matos and Dekel Tsur""" % LyX.version__
+Copyright (C) 2011 The LyX Team, José Matos and Dekel Tsur""" % LyX.version__
 
     args["description"] = """Convert old lyx file <file> to newer format,
     files can be compressed with gzip.  If there no file is specified then
@@ -37,17 +37,17 @@ Copyright (C) 2007 José Matos and Dekel Tsur""" % LyX.version__
 
     parser = optparse.OptionParser(**args)
 
-    parser.set_defaults(debug=LyX.default_debug__, cjk_encoding = 'auto')
+    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"
+                      help="files in format 413 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.")
@@ -57,8 +57,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)")
 
@@ -69,7 +71,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
@@ -79,3 +81,6 @@ Copyright (C) 2007 José Matos and Dekel Tsur""" % LyX.version__
     doc.write()
 
     sys.exit(doc.status)
+
+if __name__ == "__main__":
+    main()