Improve readability of the lyx2lyx help output.

Also some small clean-up edits

diff --git a/lib/lyx2lyx/LyX.py b/lib/lyx2lyx/LyX.py
index 7adbe829ecc522a2f1329f99614a742bbb10c2f7..5ea84b7963ff63d45b6aeb9cf4942eb85fbcffea 100644 (file)
--- a/lib/lyx2lyx/LyX.py
+++ b/lib/lyx2lyx/LyX.py
@@ -447,8 +447,8 @@ class LyX_base:
         else:
             header = self.header
 
-        for line in header + [''] + self.body:
-            self.output.write(line+u"\n")
+        for line in header + [u''] + self.body:
+            self.output.write(line+u'\n')
 
 
     def choose_output(self, output):

diff --git a/lib/lyx2lyx/lyx2lyx b/lib/lyx2lyx/lyx2lyx
index 174bcd7492011f25de6197c03eb4bdae0759b1ad..badedbc7512f254344d26d7755f60764806da4b0 100755 (executable)
--- a/lib/lyx2lyx/lyx2lyx
+++ b/lib/lyx2lyx/lyx2lyx
@@ -56,26 +56,27 @@ def main():
     parser.add_argument("--noisy",
                       action="store_const", const=10, dest="debug")
     parser.add_argument("-c", "--encoding", type=cmd_arg, dest="cjk_encoding",
-                      help="files in format 413 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.")
+                           " If encoding is not given or 'auto' the encoding"
+                           " is determined from the locale.")
     parser.add_argument("-e", "--err", type=cmd_arg, dest="error",
-                      help= "file name of the error file else goes to stderr")
+                      help= "File name of the error file else goes to stderr.")
     parser.add_argument("-o", "--output", type=cmd_arg, dest="output",
-                      help= "name of the output file else goes to stdout")
+                      help= "Name of the output file else goes to stdout.")
     parser.add_argument("-t", "--to", type=cmd_arg, dest= "end_format",
-                      help= "destination file format, default (latest)")
+                      help= "Destination file format, default <latest>.")
     parser.add_argument("-V", "--final_version", type=cmd_arg, dest= "final_version",
-                      help= "destination version, default (latest)")
+                      help= "Destination version, default <latest>.")
     parser.add_argument("-l", "--list", action="store_true",
-                      help = "list all available formats and supported versions")
+                      help = "List all available formats and supported versions.")
     parser.add_argument("-n", "--try-hard", action="store_true",
-                      help = "try hard (ignore any convertion errors)")
+                      help = "Try hard (ignore any convertion errors).")
     parser.add_argument("-s", "--systemlyxdir", type=cmd_arg, dest= "systemlyxdir",
-                      help= "LyX system directory for conversion from version 489 or older")
+                      help= "LyX system directory for conversion from" 
+                           " version 489 or older.")
     parser.add_argument('--version', action='version', version="""lyx2lyx, version %s
-Copyright (C) 2011 The LyX Team, José Matos and Dekel Tsur""" % LyX.version__)
+                       Copyright (C) 2011 The LyX Team, José Matos and Dekel Tsur""" % LyX.version__)
     parser.add_argument("input", nargs='?', type=cmd_arg, default=None)
 
     options = parser.parse_args()

diff --git a/lib/lyx2lyx/lyx_2_3.py b/lib/lyx2lyx/lyx_2_3.py
index fd029d557bd3b39b27df64f24829b549a51ea3b2..ef79484f96df4f31902b8eea0b416d5ad84a91c9 100644 (file)
--- a/lib/lyx2lyx/lyx_2_3.py
+++ b/lib/lyx2lyx/lyx_2_3.py
@@ -33,8 +33,6 @@ from parser_tools import (del_token, del_value, del_complete_lines,
 
 from lyx2lyx_tools import (add_to_preamble, put_cmd_in_ert, revert_font_attrs,
                            insert_to_preamble, latex_length)
-#  get_ert, lyx2latex, lyx2verbatim, length_in_bp, convert_info_insets
-#  revert_flex_inset, hex2ratio, str2bool
 
 ####################################################################
 # Private helper functions