* Documentation/user/invoking.itely: add note about MacOS X scripts.

* scripts/convert-ly.py (do_options): don't print help for
--show-rules rule.

diff --git a/ChangeLog b/ChangeLog
index 4d5bda337819b5448cb41293998a5357106760b0..0e27e41a9f5ebfe8e7f0cd33707e9f0eaf0e2ef9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2006-03-09  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * Documentation/user/invoking.itely: add note about MacOS X scripts.
+
+       * scripts/convert-ly.py (do_options): don't print help for
+       --show-rules rule.
+
        * tex/texinfo.tex: patch texinfo.tex to leave single quotes in
        @code and @example. Update from texinfo.tex from CVS.
 

diff --git a/Documentation/user/invoking.itely b/Documentation/user/invoking.itely
index eb28a41526e7bd53a0ebc027abfcedf3a885e6b5..82e9cefdb76325b8e6dd1d73b015e2bcf9d323ab 100644 (file)
--- a/Documentation/user/invoking.itely
+++ b/Documentation/user/invoking.itely
@@ -7,6 +7,7 @@ This chapter details the technicalities of running LilyPond.
 
 @menu
 * Invoking lilypond::           
+* Notes for the MacOS X app::   
 * Error messages::              
 * Updating files with convert-ly::  
 * Reporting bugs::              
@@ -300,6 +301,17 @@ uses more CPU time. The default value is @code{70}.
 @end table
 
 
+@node Notes for the MacOS X app
+@section Notes for the MacOS X app
+
+The scripts (such as lilypond-book, convert-ly, abc2ly, etc.) are also
+included inside MacOS X .app. They can be run from the command line by
+invoking them directly, e.g. 
+
+@example
+@var{path/to}/LilyPond.app/Contents/Resources/bin/convert-ly
+@end example 
+
 @node Error messages
 @section Error messages
 

diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py
index 149b9130415e893ba2411a95b9a56c202af2af3c..5e63396afb342df6cdb39ccef1c1615da93be132 100644 (file)
--- a/scripts/convert-ly.py
+++ b/scripts/convert-ly.py
@@ -110,6 +110,7 @@ def get_option_parser ():
        
        p.add_option ("-s", '--show-rules',
                      help=_('print rules [default: --from=0, --to=@TOPLEVEL_VERSION@]'),
+                     dest='show_rules',
                      action='store_true', default=False)
        
        p.add_option ('-t', '--to',
@@ -265,7 +266,7 @@ def do_options ():
        global global_options
        global_options = options
 
-       if not args:
+       if not args and not options.show_rules:
                opt_parser.print_help ()
                sys.exit (2)