Fix error message.

Print usage if no files on command line.
(usage): Add example usage.

diff --git a/ChangeLog b/ChangeLog
index ffd240ead9f4c1f352d58927b2801b1a4884748a..dd91b02e5fe8b445ce93219c8983951d5549f423 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2005-04-19  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * scripts/convert-ly.py: Fix error message.
+       Print usage if no files on command line.
+       (usage): Add example usage.
+
        * input/test/compound-time.ly: New file.
 
        * input/test/circle.ly: New file.

diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py
index 7226d9daff1e047c0642ae44c2a48f2b2c5bb30e..8a99c282c06738eec9e2315ba4b96f35a56cb744 100644 (file)
--- a/scripts/convert-ly.py
+++ b/scripts/convert-ly.py
@@ -64,6 +64,12 @@ version taken from the \\version command, to the current LilyPond version."""))
   -s, --show-rules       print rules [default: --from=0, --to=@TOPLEVEL_VERSION@]
   -t, --to=VERSION       convert to VERSION [default: @TOPLEVEL_VERSION@]
   -v, --version          print program version"""))
+       sys.stdout.write ('\n\n')
+       sys.stdout.write (_ ('Examples'))
+       sys.stdout.write ('\n')
+       sys.stdout.write ('  convert-ly -e *ly')
+       sys.stdout.write ('\n')
+       sys.stdout.write ('  convert-ly --from=2.4.0 -e $(find . -name "*ly")')
        sys.stdout.write ('\n\n')
        sys.stdout.write (_ ("Report bugs to %s.") % "bug-lilypond@gnu.org")
        sys.stdout.write ('\n')
@@ -2137,11 +2143,14 @@ conversions.append (((2, 3, 1), conv,
 def conv (str):
        if re.search ('textheight', str):
                sys.stderr.write ('\n')
-               sys.stderr.write (NOT_SMART % "tuning of textheight")
+               sys.stderr.write (NOT_SMART % "textheight")
                sys.stderr.write ('\n')
                sys.stderr.write (UPDATE_MANUALLY)
                sys.stderr.write ('\n')
-
+               sys.stderr.write (
+"""Page layout has been changed, using paper size and margins.
+textheight is no longer used.
+""")
        str = re.sub (r'\\OrchestralScoreContext', '\\Score', str)
        def func(m):
                if m.group(1) not in ['RemoveEmptyStaff',
@@ -2619,6 +2628,11 @@ if show_rules_p:
        sys.exit (0)
 
 identify ()
+
+if not files:
+       usage ()
+       sys.exit (2)
+
 for f in files:
        if f == '-':
                f = ''