fixes. polishing: add spaces and dots.

diff --git a/ChangeLog b/ChangeLog
index 19f6dc40f2e2a7373d3b5c8dfacb9532e042c8e6..2b303b20f19a7ed24b1f54d9d44bf4460737ce2c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-07-29  Heikki Junes <hjunes@cc.hut.fi>
+
+       * buildscripts/{ many }, lily/main.cc, po/{ all }, scripts{ many },
+       stepmake/bin{ many }: polish the `--help's of different scripts;
+       model taken from the core-utils of Linux.
+
+       * flower/getopt-long.cc: add space, see above.
+
 2003-07-29  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
        * flower/parse-afm.cc (parseCharMetrics): add warnings.
@@ -6,6 +14,14 @@
 
        * flower/include/libc-extension.hh: protect against isinf macros.
 
+2003-07-29  Heikki Junes <hjunes@cc.hut.fi>
+
+        * { many }: Use two uppercase letters in LilyPond.
+
+       * lily/main.cc, po/{ many }, scripts/{ many }: add verbs.
+
+       * VERSION: 1.7.29 released.
+       
 2003-07-29  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
        * lily/tie.cc: add TODO comment.
@@ -16,14 +32,6 @@
        linejoins and linecaps. This fixes problems with occasional spikes
        on slur/tie endings.
        
-2003-07-29  Heikki Junes <hjunes@cc.hut.fi>
-
-        * { many }: Use two uppercase letters in LilyPond.
-
-       * lily/main.cc, po/{ many }, scripts/{ many }: add verbs.
-
-       * VERSION: 1.7.29 released.
-       
        * input/regression/font-name.ly: don't use PS fonts for
        compatibility reasons. 
 
@@ -164,7 +172,7 @@
 2003-07-24  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * ly/performer-init.ly (TabStaffContext, TabVoiceContext): Add.
-       This fixes core dump on MIDI ouput (Simon Weatherill).
+       This fixes core dump on MIDI output (Simon Weatherill).
 
        * stepmake/stepmake/generic-targets.make (WWW-post): Oops, depend
        on local-WWW-post.

diff --git a/buildscripts/help2man.pl b/buildscripts/help2man.pl
index f8522b0d519997d263e5e7e76c1f4dcfa45c72e1..9cb09c4859921da605d4303b1fe44e2dedc7c015 100644 (file)
--- a/buildscripts/help2man.pl
+++ b/buildscripts/help2man.pl
@@ -42,7 +42,7 @@ EOT
 my $help_info = <<EOT;
 `$this_program' generates a man page out of `--help' and `--version' output.
 
-Usage: $this_program [OPTION]... EXECUTABLE
+Usage: $this_program [OPTIONS]... EXECUTABLE
 
  -n, --name=STRING       description for the NAME paragraph
  -s, --section=SECTION   section number for manual page (1, 6, 8)
@@ -182,7 +182,7 @@ for my $hash (\(%include, %append))
     for (keys %$hash) { $hash->{$_} =~ s/\n+$/\n/ }
 }
 
-# Turn off localisation of executable's ouput.
+# Turn off localisation of executable's output.
 @ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3;
 
 # Turn off localisation of date (for strftime).

diff --git a/buildscripts/install-info-html.sh b/buildscripts/install-info-html.sh
index 79e8289ec9e7ab34faa287e509f8a1c1a19fadee..cc5f19dbf2f1031fb21bc0040f9cc7de352f2ee5 100644 (file)
--- a/buildscripts/install-info-html.sh
+++ b/buildscripts/install-info-html.sh
@@ -21,14 +21,14 @@ help ()
 $name $version
 Install HTML info document.
 
-Usage: $name [OPTION]... [DOCUMENT-DIR]...
+Usage: $name [OPTIONS]... [DOCUMENT-DIR]...
 
 Options:
-  -a,--all             assume all subdirectories of index to be DOCUMENT-DIRs
-  -d,--dir=DIR         set index directory to DIR (default=.)
-  -D,--debug           print debugging info
-  -h,--help            this help text
-  -v,--version         show version
+  -a, --all            assume all subdirectories of index to be DOCUMENT-DIRs
+  -d, --dir=DIR        set index directory to DIR (default=.)
+  -D, --debug          print debugging info
+  -h, --help           show this help text
+  -v, --version        show version
 EOF
 }
  
@@ -153,4 +153,4 @@ cat >> $index_file <<EOF
 </body>
 </html>
 EOF
-echo
\ No newline at end of file
+echo

diff --git a/buildscripts/lys-to-tely.py b/buildscripts/lys-to-tely.py
index 24884f6dbb08d95c0db042dcf1cdaeb0ff44a2d4..8069deaba8a8de86f1fae9a9e8ef0e8a08fc2cfb 100644 (file)
--- a/buildscripts/lys-to-tely.py
+++ b/buildscripts/lys-to-tely.py
@@ -19,13 +19,14 @@ import getopt
 program_name = 'lys-to-tely'
 
 def help ():
-       sys.stdout.write (r"""Usage: lys-to-tely [OPTION]... LY-FILE...
+       sys.stdout.write (r"""Usage: lys-to-tely [OPTIONS]... LY-FILE...
 Construct tely doc from LY-FILEs.
 
 Options:
   -h, --help                print this help
-  -o,output=NAME            write tely doc to NAME
-  -t,title=TITLE            set tely tely doc title TITLE
+  -o, --output=NAME         write tely doc to NAME
+  -t, --title=TITLE         set tely doc title TITLE
+
 """)
        sys.exit (0)
 

diff --git a/buildscripts/mf-to-table.py b/buildscripts/mf-to-table.py
index 188a0d3dfb6cb9542b26b2c45681b8efb11b81f6..cf3d4b08c2873ea45bfd33e656840ce51f9f7a89 100644 (file)
--- a/buildscripts/mf-to-table.py
+++ b/buildscripts/mf-to-table.py
@@ -210,16 +210,19 @@ def write_deps (file, deps, targets):
        file.write ('\n')
 
 def help():
-    sys.stdout.write(r"""Usage: mf-to-table [options] LOGFILEs
-Generate feta metrics table from preparated feta log\n
+    sys.stdout.write(r"""Usage: mf-to-table [OPTIONS] LOGFILEs
+Generate feta metrics table from preparated feta log.
+
 Options:
-  -a, --afm=FILE         .afm file
+  -a, --afm=FILE         specify .afm file
   -d, --dep=FILE         print dependency info to FILE
   -h, --help             print this help
   -l, --ly=FILE          name output table
   -o, --outdir=DIR       prefix for dependency info
   -p, --package=DIR      specify package
-  -t, --tex=FILE         name output tex chardefs"""
+  -t, --tex=FILE         name output tex chardefs
+
+  """
 )
     sys.exit (0)
 

diff --git a/buildscripts/mutopia-index.py b/buildscripts/mutopia-index.py
index ca23fe6452fb6b521f61b0e8669bd6e9ec835d4a..130a6814ada0ec6c6d068811677b6813d04e29b7 100644 (file)
--- a/buildscripts/mutopia-index.py
+++ b/buildscripts/mutopia-index.py
@@ -101,13 +101,16 @@ def read_lilypond_header (fn):
        return dict
 
 def help ():
-       sys.stdout.write (r"""Usage: mutopia-index [options] INFILE OUTFILE
-Generate index for mutopia\n
+       sys.stdout.write (r"""Usage: mutopia-index [OPTIONS] INFILE OUTFILE
+Generate index for mutopia.
+
 Options:
   -h, --help                 print this help
-  -o,-output=FILE            write output to file.
+  -o, --output=FILE          write output to file
   -s, --subdirs=DIR         add subdir
-  --suffix=SUF                  specify suffix"""
+      --suffix=SUF          specify suffix
+      
+"""
                                          )
        sys.exit (0)
 

diff --git a/buildscripts/wiki-slurp.py b/buildscripts/wiki-slurp.py
index b841b0ebdaf4e6eb1860339c0b55d0e843103ca9..90efea4d13dceee14238ec74794bd765abed47ff 100644 (file)
--- a/buildscripts/wiki-slurp.py
+++ b/buildscripts/wiki-slurp.py
@@ -15,25 +15,26 @@ if program_version == '@' + 'TOPLEVEL_VERSION' + '@':
 
 
 def help ():
-       print """Usage: wiki-slurp.py [OPTION]... ENTRY-PATTERN...
+       print """Usage: wiki-slurp.py [OPTIONS]... ENTRY-PATTERN...
 
 Download a WikiWiki site and convert to local html.
 
 Example: wiki-slurp.py -d /tmp/output 'http://c2.com/cgi-bin/wiki?'
 
 Options:
-  -h,--help          this help
-  -m,--mangle        mangle file names to be shorter 
-  -d,--outdir=DIR    set output directory to DIR
-  -v,--version       version information
+  -h, --help         show this help
+  -m, --mangle       mangle file names to be shorter 
+  -d, --outdir=DIR   set output directory to DIR
+  -v, --version      show version information
 
 Warning: downloading an entire Wiki site generates a huge amount of
 traffic and server load.  Consider asking for a copy of the database.
-See also http://c2.com/cgi-bin/wiki?WikiSlurp
+See also http://c2.com/cgi-bin/wiki?WikiSlurp.
 
 Report bugs to bug-lilypond@gnu.org.
 
-Written by Han-Wen Nienhuys <hanwen@cs.uu.nl>
+Written by Han-Wen Nienhuys <hanwen@cs.uu.nl>.
+
 """
 
 def print_version ():

diff --git a/flower/getopt-long.cc b/flower/getopt-long.cc
index a3134cc764804c408d650874be875a34b43cfd05..a70acba4180d63edb03449703dd9d784e160e0bc 100644 (file)
--- a/flower/getopt-long.cc
+++ b/flower/getopt-long.cc
@@ -113,7 +113,7 @@ Long_option_init::str_for_help () const
   else
     s = "  ";
 
-  s = s + ((shortname_char_ && longname_str0_) ? "," : " ");
+  s = s + ((shortname_char_ && longname_str0_) ? ", " : "  ");
 
   if (longname_str0_)
     s = s + "--" + longname_str0_;

diff --git a/lily/main.cc b/lily/main.cc
index ff333e2b113138f6c06fe1593205bf110a1a3c90..e6c4055a5ec9a026c79560c02bb10fabee514b31 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -152,7 +152,7 @@ usage ()
 {
   printf ("\n");
   /* No version number or newline here. It confuses help2man.  */
-  printf (_f ("Usage: %s [OPTION]... FILE...", "lilypond").to_str0 ());
+  printf (_f ("Usage: %s [OPTIONS]... FILE...", "lilypond").to_str0 ());
   printf ("\n\n");
   printf (_ ("Typeset music and or play MIDI from FILE.").to_str0 ());
   printf ("\n\n");

diff --git a/po/cs.po b/po/cs.po
index 42d2f1c1bac49a4711ba6891171fc6324eee46e5..08b5d9268de9d323c16b60cdb90ab73133f06314 100644 (file)
--- a/po/cs.po
+++ b/po/cs.po
@@ -90,7 +90,7 @@ msgstr "Kon
 
 #: lilylib.py:194 midi2ly.py:224 mup2ly.py:220
 #, python-format
-msgid "Usage: %s [OPTION]... FILE"
+msgid "Usage: %s [OPTIONS]... FILE"
 msgstr "Pou¾ití: %s [PØEPÍNAÈ]... SOUBOR"
 
 #: lilylib.py:198 midi2ly.py:228 mup2ly.py:224 main.cc:166
@@ -714,7 +714,7 @@ msgid "produce MIDI output only"
 msgstr "vytváøí pouze MIDI výstup"
 
 #: ly2dvi.py:135 midi2ly.py:102
-msgid "write ouput to FILE"
+msgid "write output to FILE"
 msgstr "zapisuje výstup do SOUBORu"
 
 #: ly2dvi.py:136
@@ -952,8 +952,8 @@ msgstr "v
 #. original_dir = os.getcwd ()
 #. keep_temp_dir_p = 0
 #: midi2ly.py:94
-msgid "Convert MIDI to LilyPond source"
-msgstr "Pøevádí MIDI na zdrojový text pro LilyPond"
+msgid "Convert MIDI to LilyPond source."
+msgstr "Pøevádí MIDI na zdrojový text pro LilyPond."
 
 #: midi2ly.py:97
 msgid "print absolute pitches"
@@ -1095,8 +1095,8 @@ msgstr "na p
 #. if set, LILYPONDPREFIX must take prevalence
 #. if datadir is not set, we're doing a build and LILYPONDPREFIX
 #: mup2ly.py:70
-msgid "Convert mup to LilyPond source"
-msgstr "Pøevede soubor mup na zdrojový text LilyPondu"
+msgid "Convert mup to LilyPond source."
+msgstr "Pøevede soubor mup na zdrojový text LilyPondu."
 
 #: mup2ly.py:73
 msgid "debug"
@@ -1693,7 +1693,7 @@ msgstr "zakazuje pojmenov
 #. No version number or newline here. It confuses help2man.
 #: main.cc:155
 #, c-format
-msgid "Usage: %s [OPTION]... FILE..."
+msgid "Usage: %s [OPTIONS]... FILE..."
 msgstr "Pou¾ití: %s [PØEPÍNAÈ]... SOUBOR..."
 
 #: main.cc:157

diff --git a/po/da.po b/po/da.po
index 53575c220d6a4d777565ab06cbd83015a566b3c6..ba6f79d319e5b42c893f5391611c847c100f2109 100644 (file)
--- a/po/da.po
+++ b/po/da.po
@@ -89,7 +89,7 @@ msgstr "Afslutter... "
 
 #: lilylib.py:194 midi2ly.py:224 mup2ly.py:220
 #, python-format
-msgid "Usage: %s [OPTION]... FILE"
+msgid "Usage: %s [OPTIONS]... FILE"
 msgstr "Brug: %s [FLAG]... FIL"
 
 #: lilylib.py:198 midi2ly.py:228 mup2ly.py:224 main.cc:166
@@ -713,7 +713,7 @@ msgid "produce MIDI output only"
 msgstr "lav kun MIDI-uddata"
 
 #: ly2dvi.py:135 midi2ly.py:102
-msgid "write ouput to FILE"
+msgid "write output to FILE"
 msgstr "skriv uddata til FIL"
 
 #: ly2dvi.py:136
@@ -955,8 +955,8 @@ msgstr "%s udskrevet til \"%s\"..."
 #. original_dir = os.getcwd ()
 #. keep_temp_dir_p = 0
 #: midi2ly.py:94
-msgid "Convert MIDI to LilyPond source"
-msgstr "Konvertér MIDI til LilyPond-klide"
+msgid "Convert MIDI to LilyPond source."
+msgstr "Konvertér MIDI til LilyPond-klide."
 
 #: midi2ly.py:97
 msgid "print absolute pitches"
@@ -1098,8 +1098,8 @@ msgstr "ingen filer angivne p
 #. if set, LILYPONDPREFIX must take prevalence
 #. if datadir is not set, we're doing a build and LILYPONDPREFIX
 #: mup2ly.py:70
-msgid "Convert mup to LilyPond source"
-msgstr "Konvertér mup til LilyPond-kilde"
+msgid "Convert mup to LilyPond source."
+msgstr "Konvertér mup til LilyPond-kilde."
 
 #: mup2ly.py:73
 msgid "debug"
@@ -1692,7 +1692,7 @@ msgstr "hindr navngivning af filuddata og eksportering"
 #. No version number or newline here. It confuses help2man.
 #: main.cc:155
 #, c-format
-msgid "Usage: %s [OPTION]... FILE..."
+msgid "Usage: %s [OPTIONS]... FILE..."
 msgstr "Brug: %s [FLAG]... FIL..."
 
 #: main.cc:157
@@ -2611,7 +2611,7 @@ msgstr "Overvej at konvertere inddata med skriptet \"convert-ly\""
 #~ msgid "assume no double dotted notes"
 #~ msgstr "antag ingen dobbeltpunktede noder"
 
-#~ msgid "Usage: %s [OPTION]... [FILE]"
+#~ msgid "Usage: %s [OPTIONS]... [FILE]"
 #~ msgstr "Brug: %s [FLAG]... [FIL]"
 
 #~ msgid "Translate MIDI-file to lilypond"

diff --git a/po/de.po b/po/de.po
index b9c1c0c963223d9243e76b15904eaf5820d24de8..f0bd20929386f6d774fa2a9fcebeaf16e507b194 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -89,8 +89,8 @@ msgstr "Beende (%d)..."
 
 #: lilylib.py:194 midi2ly.py:224 mup2ly.py:220
 #, python-format
-msgid "Usage: %s [OPTION]... FILE"
-msgstr "Aufruf: %s [OPTION]... DATEI"
+msgid "Usage: %s [OPTIONS]... FILE"
+msgstr "Aufruf: %s [OPTIONS]... DATEI"
 
 #: lilylib.py:198 midi2ly.py:228 mup2ly.py:224 main.cc:166
 msgid "Options:"
@@ -703,7 +703,7 @@ msgid "produce MIDI output only"
 msgstr "nur MIDI-Ausgabe erzeugen"
 
 #: ly2dvi.py:135 midi2ly.py:102
-msgid "write ouput to FILE"
+msgid "write output to FILE"
 msgstr "Ausgabe in DATEI schreiben"
 
 #: ly2dvi.py:136
@@ -940,8 +940,8 @@ msgstr "Ausgabe von %s nach %s..."
 #. original_dir = os.getcwd ()
 #. keep_temp_dir_p = 0
 #: midi2ly.py:94
-msgid "Convert MIDI to LilyPond source"
-msgstr "MIDI nach LilyPond-Quelltext konvertieren"
+msgid "Convert MIDI to LilyPond source."
+msgstr "MIDI nach LilyPond-Quelltext konvertieren."
 
 #: midi2ly.py:97
 msgid "print absolute pitches"
@@ -1084,8 +1084,8 @@ msgstr "Keine Dateien auf der Kommandozeile angegeben."
 #. if set, LILYPONDPREFIX must take prevalence
 #. if datadir is not set, we're doing a build and LILYPONDPREFIX
 #: mup2ly.py:70
-msgid "Convert mup to LilyPond source"
-msgstr "mup nach LilyPond-Quelltext konvertieren"
+msgid "Convert mup to LilyPond source."
+msgstr "mup nach LilyPond-Quelltext konvertieren."
 
 #: mup2ly.py:73
 msgid "debug"
@@ -1660,8 +1660,8 @@ msgstr "verhindere Dateiausgabe-Benennung und -Export"
 #. No version number or newline here. It confuses help2man.
 #: main.cc:155
 #, c-format
-msgid "Usage: %s [OPTION]... FILE..."
-msgstr "Aufruf: %s [OPTION]... DATEI..."
+msgid "Usage: %s [OPTIONS]... FILE..."
+msgstr "Aufruf: %s [OPTIONS]... DATEI..."
 
 #: main.cc:157
 msgid "Typeset music and or play MIDI from FILE."

diff --git a/po/es.po b/po/es.po
index 4e39891067db04d361ee2fb06634fe1ad1e7107c..44abe8f1a84806582282ad7fcf691109b0bf987e 100644 (file)
--- a/po/es.po
+++ b/po/es.po
@@ -87,8 +87,8 @@ msgstr "Saliendo..."
 
 #: lilylib.py:194 midi2ly.py:224 mup2ly.py:220
 #, python-format
-msgid "Usage: %s [OPTION]... FILE"
-msgstr "Sintaxis: %s [OPTION]... FICHERO"
+msgid "Usage: %s [OPTIONS]... FILE"
+msgstr "Sintaxis: %s [OPTIONS]... FICHERO"
 
 #: lilylib.py:198 midi2ly.py:228 mup2ly.py:224 main.cc:166
 msgid "Options:"
@@ -709,7 +709,7 @@ msgid "produce MIDI output only"
 msgstr "producir solamente una salida MIDI"
 
 #: ly2dvi.py:135 midi2ly.py:102
-msgid "write ouput to FILE"
+msgid "write output to FILE"
 msgstr "escribir la salida en el FICHERO"
 
 #: ly2dvi.py:136
@@ -947,7 +947,7 @@ msgstr "%s producidos en `%s'..."
 #. original_dir = os.getcwd ()
 #. keep_temp_dir_p = 0
 #: midi2ly.py:94
-msgid "Convert MIDI to LilyPond source"
+msgid "Convert MIDI to LilyPond source."
 msgstr ""
 
 #: midi2ly.py:97
@@ -1089,8 +1089,8 @@ msgstr "no se ha especificado ning
 #. if datadir is not set, we're doing a build and LILYPONDPREFIX
 #: mup2ly.py:70
 #, fuzzy
-msgid "Convert mup to LilyPond source"
-msgstr "Convertir mup a ly"
+msgid "Convert mup to LilyPond source."
+msgstr "Convertir mup a ly."
 
 #: mup2ly.py:73
 msgid "debug"
@@ -1677,7 +1677,7 @@ msgstr "inhibir la denominaci
 #. No version number or newline here. It confuses help2man.
 #: main.cc:155
 #, c-format
-msgid "Usage: %s [OPTION]... FILE..."
+msgid "Usage: %s [OPTIONS]... FILE..."
 msgstr "Sintaxis: %s [OPCIÓN]... FICHERO..."
 
 #: main.cc:157

diff --git a/po/fi.po b/po/fi.po
index c2d372a2031e63ed8d6205ba259c242569dc1e6d..afa7cba4351f6ac1e3ec5bff5e28ab3cb818db8f 100644 (file)
--- a/po/fi.po
+++ b/po/fi.po
@@ -89,7 +89,7 @@ msgstr "Lopetetaan (%d)..."
 
 #: lilylib.py:194 midi2ly.py:224 mup2ly.py:220
 #, python-format
-msgid "Usage: %s [OPTION]... FILE"
+msgid "Usage: %s [OPTIONS]... FILE"
 msgstr "Käyttö: %s [OPTIOT]... TIEDOSTO"
 
 #: lilylib.py:198 midi2ly.py:228 mup2ly.py:224 main.cc:166
@@ -703,7 +703,7 @@ msgid "produce MIDI output only"
 msgstr "tuota vain MIDI -tuloste"
 
 #: ly2dvi.py:135 midi2ly.py:102
-msgid "write ouput to FILE"
+msgid "write output to FILE"
 msgstr "tulosta tiedostoon TIEDOSTO"
 
 #: ly2dvi.py:136
@@ -941,8 +941,8 @@ msgstr "%s -tuloste paikkaan %s..."
 #. original_dir = os.getcwd ()
 #. keep_temp_dir_p = 0
 #: midi2ly.py:94
-msgid "Convert MIDI to LilyPond source"
-msgstr "Muunna MIDI LilyPond -koodiksi"
+msgid "Convert MIDI to LilyPond source."
+msgstr "Muunna MIDI LilyPond -muotoon."
 
 #: midi2ly.py:97
 msgid "print absolute pitches"
@@ -1086,8 +1086,8 @@ msgstr "tiedostoja ei annettu komentorivill
 #. if set, LILYPONDPREFIX must take prevalence
 #. if datadir is not set, we're doing a build and LILYPONDPREFIX
 #: mup2ly.py:70
-msgid "Convert mup to LilyPond source"
-msgstr "Muunna mup LilyPond-koodiksi"
+msgid "Convert mup to LilyPond source."
+msgstr "Muunna mup LilyPond-muotoon."
 
 #: mup2ly.py:73
 msgid "debug"
@@ -1662,7 +1662,7 @@ msgstr "est
 #. No version number or newline here. It confuses help2man.
 #: main.cc:155
 #, c-format
-msgid "Usage: %s [OPTION]... FILE..."
+msgid "Usage: %s [OPTIONS]... FILE..."
 msgstr "Käyttö: %s [OPTIOT]... TIEDOSTO..."
 
 #: main.cc:157

diff --git a/po/fr.po b/po/fr.po
index d5ec8f98a074c7692e86364fe4f940c72cc157d9..a555aae45acc7dee406593163c7fbbc145c4f1d6 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -87,8 +87,8 @@ msgstr "Fin d'ex
 
 #: lilylib.py:194 midi2ly.py:224 mup2ly.py:220
 #, python-format
-msgid "Usage: %s [OPTION]... FILE"
-msgstr "Usage: %s [OPTION]... FICHIER"
+msgid "Usage: %s [OPTIONS]... FILE"
+msgstr "Usage: %s [OPTIONS]... FICHIER"
 
 #: lilylib.py:198 midi2ly.py:228 mup2ly.py:224 main.cc:166
 msgid "Options:"
@@ -701,7 +701,7 @@ msgid "produce MIDI output only"
 msgstr "produire une sortie MIDI seulement"
 
 #: ly2dvi.py:135 midi2ly.py:102
-msgid "write ouput to FILE"
+msgid "write output to FILE"
 msgstr "produire la sortie dans le FICHIER"
 
 #: ly2dvi.py:136
@@ -938,8 +938,8 @@ msgstr "%s sortie vers  %s..."
 #. original_dir = os.getcwd ()
 #. keep_temp_dir_p = 0
 #: midi2ly.py:94
-msgid "Convert MIDI to LilyPond source"
-msgstr "Convertir de MIDI en source LilyPond"
+msgid "Convert MIDI to LilyPond source."
+msgstr "Convertir de MIDI en source LilyPond."
 
 #: midi2ly.py:97
 msgid "print absolute pitches"
@@ -1080,8 +1080,8 @@ msgstr "aucun fichier sp
 #. if set, LILYPONDPREFIX must take prevalence
 #. if datadir is not set, we're doing a build and LILYPONDPREFIX
 #: mup2ly.py:70
-msgid "Convert mup to LilyPond source"
-msgstr "Conversion de mup en source LilyPond"
+msgid "Convert mup to LilyPond source."
+msgstr "Conversion de mup en source LilyPond."
 
 #: mup2ly.py:73
 msgid "debug"

diff --git a/po/it.po b/po/it.po
index 8f930b51e5ac38fc421bf7dfebb5cd1830d92ab0..273d3fa38299354ce4aaed51e873312a9f33d09d 100644 (file)
--- a/po/it.po
+++ b/po/it.po
@@ -87,8 +87,8 @@ msgstr "Genero le voci..."
 
 #: lilylib.py:194 midi2ly.py:224 mup2ly.py:220
 #, fuzzy, python-format
-msgid "Usage: %s [OPTION]... FILE"
-msgstr "Uso: %s [OPZIONE... [FILE]"
+msgid "Usage: %s [OPTIONS]... FILE"
+msgstr "Uso: %s [OPZIONE]... [FILE]"
 
 #: lilylib.py:198 midi2ly.py:228 mup2ly.py:224 main.cc:166
 msgid "Options:"
@@ -709,7 +709,7 @@ msgid "produce MIDI output only"
 msgstr "  -M, --no-paper         produce solo output midi\n"
 
 #: ly2dvi.py:135 midi2ly.py:102
-msgid "write ouput to FILE"
+msgid "write output to FILE"
 msgstr ""
 
 #: ly2dvi.py:136
@@ -948,7 +948,7 @@ msgstr "L'output MIDI 
 #. original_dir = os.getcwd ()
 #. keep_temp_dir_p = 0
 #: midi2ly.py:94
-msgid "Convert MIDI to LilyPond source"
+msgid "Convert MIDI to LilyPond source."
 msgstr ""
 
 #: midi2ly.py:97
@@ -1090,7 +1090,7 @@ msgstr ""
 #. if set, LILYPONDPREFIX must take prevalence
 #. if datadir is not set, we're doing a build and LILYPONDPREFIX
 #: mup2ly.py:70
-msgid "Convert mup to LilyPond source"
+msgid "Convert mup to LilyPond source."
 msgstr ""
 
 #: mup2ly.py:73
@@ -1690,7 +1690,7 @@ msgstr ""
 #. No version number or newline here. It confuses help2man.
 #: main.cc:155
 #, fuzzy, c-format
-msgid "Usage: %s [OPTION]... FILE..."
+msgid "Usage: %s [OPTIONS]... FILE..."
 msgstr "Uso: %s [OPZIONE]... [FILE]..."
 
 #: main.cc:157
@@ -2510,8 +2510,8 @@ msgstr ""
 #~ msgstr ""
 #~ " -x, --no-double-dots   assume che non ci siano note con doppio punto\n"
 
-#~ msgid "Usage: %s [OPTION]... [FILE]"
-#~ msgstr "Uso: %s [OPZIONE... [FILE]"
+#~ msgid "Usage: %s [OPTIONS]... [FILE]"
+#~ msgstr "Uso: %s [OPZIONE]... [FILE]"
 
 #, fuzzy
 #~ msgid "Translate MIDI-file to lilypond"
@@ -2582,8 +2582,8 @@ msgstr ""
 #~ msgstr "scrivo il file delle dipendenze: `%s'..."
 
 #, fuzzy
-#~ msgid "Usage: ly2dvi [OPTION]... FILE\n"
-#~ msgstr "Uso: %s [OPZIONE... [FILE]"
+#~ msgid "Usage: ly2dvi [OPTIONS]... FILE\n"
+#~ msgstr "Uso: %s [OPZIONE]... [FILE]"
 
 #~ msgid "unconventional key: flats: %d, sharps: %d"
 #~ msgstr "armatura non convenzionale: %d bemolli e %d diesis"

diff --git a/po/ja.po b/po/ja.po
index b262b3d10fe513bccc4c4385270596ab5973daf6..3248a126e321e49bc293ee9731f454bc2c039a9b 100644 (file)
--- a/po/ja.po
+++ b/po/ja.po
@@ -87,7 +87,7 @@ msgstr "
 
 #: lilylib.py:194 midi2ly.py:224 mup2ly.py:220
 #, fuzzy, python-format
-msgid "Usage: %s [OPTION]... FILE"
+msgid "Usage: %s [OPTIONS]... FILE"
 msgstr "»È¤¤Êý: %s [¥ª¥×¥·¥ç¥ó]... [¥Õ¥¡¥¤¥ë]"
 
 #: lilylib.py:198 midi2ly.py:228 mup2ly.py:224 main.cc:166
@@ -708,7 +708,7 @@ msgstr "MIDI 
 
 #: ly2dvi.py:135 midi2ly.py:102
 #, fuzzy
-msgid "write ouput to FILE"
+msgid "write output to FILE"
 msgstr "BASENAME[-x].³ÈÄ¥»Ò ¤Ø½ÐÎϤò½ñ¤­¹þ¤à"
 
 #: ly2dvi.py:136
@@ -947,7 +947,7 @@ msgstr "%s 
 #. original_dir = os.getcwd ()
 #. keep_temp_dir_p = 0
 #: midi2ly.py:94
-msgid "Convert MIDI to LilyPond source"
+msgid "Convert MIDI to LilyPond source."
 msgstr ""
 
 #: midi2ly.py:97
@@ -1090,7 +1090,7 @@ msgstr ""
 #. if set, LILYPONDPREFIX must take prevalence
 #. if datadir is not set, we're doing a build and LILYPONDPREFIX
 #: mup2ly.py:70
-msgid "Convert mup to LilyPond source"
+msgid "Convert mup to LilyPond source."
 msgstr ""
 
 #: mup2ly.py:73
@@ -1693,7 +1693,7 @@ msgstr "̾
 #. No version number or newline here. It confuses help2man.
 #: main.cc:155
 #, fuzzy, c-format
-msgid "Usage: %s [OPTION]... FILE..."
+msgid "Usage: %s [OPTIONS]... FILE..."
 msgstr "»È¤¤Êý: %s [¥ª¥×¥·¥ç¥ó]... [¥Õ¥¡¥¤¥ë]..."
 
 #: main.cc:157
@@ -2540,7 +2540,7 @@ msgstr ""
 #~ msgid "assume no double dotted notes"
 #~ msgstr "Ê£ÉäÅÀ²»Éä¤ò̵¤¯¤¹¤è¤¦»î¤ß¤Þ¤¹"
 
-#~ msgid "Usage: %s [OPTION]... [FILE]"
+#~ msgid "Usage: %s [OPTIONS]... [FILE]"
 #~ msgstr "»È¤¤Êý: %s [¥ª¥×¥·¥ç¥ó]... [¥Õ¥¡¥¤¥ë]"
 
 #, fuzzy
@@ -2628,7 +2628,7 @@ msgstr ""
 #~ msgstr "¥Ð¥°¥ì¥Ý¡¼¥È¤Ï %s ¤Ø"
 
 #, fuzzy
-#~ msgid "Usage: ly2dvi [OPTION]... FILE\n"
+#~ msgid "Usage: ly2dvi [OPTIONS]... FILE\n"
 #~ msgstr "»È¤¤Êý: %s [¥ª¥×¥·¥ç¥ó]... [¥Õ¥¡¥¤¥ë]"
 
 #~ msgid "unconventional key: flats: %d, sharps: %d"

diff --git a/po/lilypond.pot b/po/lilypond.pot
index dbbc87b8ae4d766a83dfc2b0852d570d059e7d6c..18d938adf9082e84c34cff71d1de33cce6ab10cd 100644 (file)
--- a/po/lilypond.pot
+++ b/po/lilypond.pot
@@ -89,7 +89,7 @@ msgstr ""
 
 #: lilylib.py:194 midi2ly.py:224 mup2ly.py:220
 #, python-format
-msgid "Usage: %s [OPTION]... FILE"
+msgid "Usage: %s [OPTIONS]... FILE"
 msgstr ""
 
 #: lilylib.py:198 midi2ly.py:228 mup2ly.py:224 main.cc:166
@@ -703,7 +703,7 @@ msgid "produce MIDI output only"
 msgstr ""
 
 #: ly2dvi.py:135 midi2ly.py:102
-msgid "write ouput to FILE"
+msgid "write output to FILE"
 msgstr ""
 
 #: ly2dvi.py:136
@@ -938,7 +938,7 @@ msgstr ""
 #. original_dir = os.getcwd ()
 #. keep_temp_dir_p = 0
 #: midi2ly.py:94
-msgid "Convert MIDI to LilyPond source"
+msgid "Convert MIDI to LilyPond source."
 msgstr ""
 
 #: midi2ly.py:97
@@ -1078,7 +1078,7 @@ msgstr ""
 #. if set, LILYPONDPREFIX must take prevalence
 #. if datadir is not set, we're doing a build and LILYPONDPREFIX
 #: mup2ly.py:70
-msgid "Convert mup to LilyPond source"
+msgid "Convert mup to LilyPond source."
 msgstr ""
 
 #: mup2ly.py:73
@@ -1654,7 +1654,7 @@ msgstr ""
 #. No version number or newline here. It confuses help2man.
 #: main.cc:155
 #, c-format
-msgid "Usage: %s [OPTION]... FILE..."
+msgid "Usage: %s [OPTIONS]... FILE..."
 msgstr ""
 
 #: main.cc:157

diff --git a/po/nl.po b/po/nl.po
index 4bc411125eb715e88c1b837e2668641e8618225d..70d149d53ed88e5a96bc33e121bce13c30ee9329 100644 (file)
--- a/po/nl.po
+++ b/po/nl.po
@@ -97,7 +97,7 @@ msgstr "Be
 
 #: lilylib.py:194 midi2ly.py:224 mup2ly.py:220
 #, python-format
-msgid "Usage: %s [OPTION]... FILE"
+msgid "Usage: %s [OPTIONS]... FILE"
 msgstr "Gebruik: %s [OPTIE]... BESTAND"
 
 #: lilylib.py:198 midi2ly.py:228 mup2ly.py:224 main.cc:166
@@ -720,7 +720,7 @@ msgid "produce MIDI output only"
 msgstr "produceer alleen MIDI uitvoer"
 
 #: ly2dvi.py:135 midi2ly.py:102
-msgid "write ouput to FILE"
+msgid "write output to FILE"
 msgstr "schrijf uitvoer naar BESTAND"
 
 #: ly2dvi.py:136
@@ -958,7 +958,7 @@ msgstr "%s uitvoer naar `%s'..."
 #. original_dir = os.getcwd ()
 #. keep_temp_dir_p = 0
 #: midi2ly.py:94
-msgid "Convert MIDI to LilyPond source"
+msgid "Convert MIDI to LilyPond source."
 msgstr ""
 
 #: midi2ly.py:97
@@ -1101,8 +1101,8 @@ msgstr "geen bestanden gespecificeerd op de commandoregel."
 #. if datadir is not set, we're doing a build and LILYPONDPREFIX
 #: mup2ly.py:70
 #, fuzzy
-msgid "Convert mup to LilyPond source"
-msgstr "Converteer mup naar ly"
+msgid "Convert mup to LilyPond source."
+msgstr "Converteer mup naar ly."
 
 #: mup2ly.py:73
 msgid "debug"
@@ -1693,7 +1693,7 @@ msgstr "verbied naamgeving van uitvoerbestand en exportering"
 #. No version number or newline here. It confuses help2man.
 #: main.cc:155
 #, c-format
-msgid "Usage: %s [OPTION]... FILE..."
+msgid "Usage: %s [OPTIONS]... FILE..."
 msgstr "Gebruik: %s [OPTIE]... BESTAND..."
 
 #: main.cc:157
@@ -2597,7 +2597,7 @@ msgstr "Overweeg de invoer te converteren met het convert-ly script"
 #~ msgid "assume no double dotted notes"
 #~ msgstr "ga niet uit van dubbel gepunteerde noten"
 
-#~ msgid "Usage: %s [OPTION]... [FILE]"
+#~ msgid "Usage: %s [OPTIONS]... [FILE]"
 #~ msgstr "Gebruik: %s [OPTIE]... [BESTAND]"
 
 #~ msgid "Translate MIDI-file to lilypond"

diff --git a/po/ru.po b/po/ru.po
index d756a11fe44205a1571dd04bd819f92cc0fefa8b..12fadfb94e3aede5024d82ba250271f4594989b4 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
@@ -88,7 +88,7 @@ msgstr "
 
 #: lilylib.py:194 midi2ly.py:224 mup2ly.py:220
 #, fuzzy, python-format
-msgid "Usage: %s [OPTION]... FILE"
+msgid "Usage: %s [OPTIONS]... FILE"
 msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ïðãéñ]... [æáêì]"
 
 #: lilylib.py:198 midi2ly.py:228 mup2ly.py:224 main.cc:166
@@ -709,7 +709,7 @@ msgstr "
 
 #: ly2dvi.py:135 midi2ly.py:102
 #, fuzzy
-msgid "write ouput to FILE"
+msgid "write output to FILE"
 msgstr "ÚÁÐÉÓÙ×ÁÔØ ×Ù×ÏÄ × ïóîï÷á[-x].ÒÁÓÛÉÒÅÎÉÅ"
 
 #: ly2dvi.py:136
@@ -945,7 +945,7 @@ msgstr "
 #. original_dir = os.getcwd ()
 #. keep_temp_dir_p = 0
 #: midi2ly.py:94
-msgid "Convert MIDI to LilyPond source"
+msgid "Convert MIDI to LilyPond source."
 msgstr ""
 
 #: midi2ly.py:97
@@ -1085,7 +1085,7 @@ msgstr ""
 #. if set, LILYPONDPREFIX must take prevalence
 #. if datadir is not set, we're doing a build and LILYPONDPREFIX
 #: mup2ly.py:70
-msgid "Convert mup to LilyPond source"
+msgid "Convert mup to LilyPond source."
 msgstr ""
 
 #: mup2ly.py:73
@@ -1676,7 +1676,7 @@ msgstr "
 #. No version number or newline here. It confuses help2man.
 #: main.cc:155
 #, fuzzy, c-format
-msgid "Usage: %s [OPTION]... FILE..."
+msgid "Usage: %s [OPTIONS]... FILE..."
 msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ïðãéñ]... [æáêì]..."
 
 #: main.cc:157
@@ -2458,7 +2458,7 @@ msgstr ""
 #~ msgid "don't timestamp the output"
 #~ msgstr "ÎÅ ÏÔÍÅÞÁÔØ ÄÁÔÕ É ×ÒÅÍÑ ×Ù×ÏÄÁ"
 
-#~ msgid "Usage: %s [OPTION]... [FILE]"
+#~ msgid "Usage: %s [OPTIONS]... [FILE]"
 #~ msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ïðãéñ]... [æáêì]"
 
 #, fuzzy
@@ -2535,7 +2535,7 @@ msgstr ""
 #~ msgstr "óÏÏÂÝÁÊÔÅ ÏÂ ÏÛÉÂËÁÈ ÐÏ %s."
 
 #, fuzzy
-#~ msgid "Usage: ly2dvi [OPTION]... FILE\n"
+#~ msgid "Usage: ly2dvi [OPTIONS]... FILE\n"
 #~ msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ïðãéñ]... [æáêì]"
 
 #~ msgid "unconventional key: flats: %d, sharps: %d"

diff --git a/po/sv.po b/po/sv.po
index 054413a8d7b532123b079cfb9b32b12afcbe2f9c..ebd78e4dc9101cc4fe059063fd4bb90ce382b7d8 100644 (file)
--- a/po/sv.po
+++ b/po/sv.po
@@ -88,7 +88,7 @@ msgstr "Avslutar... "
 
 #: lilylib.py:194 midi2ly.py:224 mup2ly.py:220
 #, python-format
-msgid "Usage: %s [OPTION]... FILE"
+msgid "Usage: %s [OPTIONS]... FILE"
 msgstr "Användning: %s [FLAGGA]... FIL"
 
 #: lilylib.py:198 midi2ly.py:228 mup2ly.py:224 main.cc:166
@@ -714,7 +714,7 @@ msgid "produce MIDI output only"
 msgstr "skapa enbart MIDI-utdata"
 
 #: ly2dvi.py:135 midi2ly.py:102
-msgid "write ouput to FILE"
+msgid "write output to FILE"
 msgstr "skriv utdata till FIL"
 
 #: ly2dvi.py:136
@@ -957,7 +957,7 @@ msgstr "%s skrivet till \"%s\"..."
 #. original_dir = os.getcwd ()
 #. keep_temp_dir_p = 0
 #: midi2ly.py:94
-msgid "Convert MIDI to LilyPond source"
+msgid "Convert MIDI to LilyPond source."
 msgstr ""
 
 #: midi2ly.py:97
@@ -1102,8 +1102,8 @@ msgstr "inga filer angivna p
 #. if datadir is not set, we're doing a build and LILYPONDPREFIX
 #: mup2ly.py:70
 #, fuzzy
-msgid "Convert mup to LilyPond source"
-msgstr "Konvertera mup till ly"
+msgid "Convert mup to LilyPond source."
+msgstr "Konvertera mup till ly."
 
 #: mup2ly.py:73
 msgid "debug"
@@ -1698,7 +1698,7 @@ msgstr "hindra namngivning av filutdata och exportering"
 #. No version number or newline here. It confuses help2man.
 #: main.cc:155
 #, c-format
-msgid "Usage: %s [OPTION]... FILE..."
+msgid "Usage: %s [OPTIONS]... FILE..."
 msgstr "Användning: %s [FLAGGA]... FIL..."
 
 #: main.cc:157
@@ -2604,7 +2604,7 @@ msgstr "Fundera p
 #~ msgid "assume no double dotted notes"
 #~ msgstr "anta inga dubbelpunkterade noter"
 
-#~ msgid "Usage: %s [OPTION]... [FILE]"
+#~ msgid "Usage: %s [OPTIONS]... [FILE]"
 #~ msgstr "Användning: %s [FLAGGA]... [FIL]"
 
 #~ msgid "Translate MIDI-file to lilypond"

diff --git a/python/lilylib.py b/python/lilylib.py
index 2133ea993b71bea9ce967208708c52946868f944..466d77447f4df88bc6cac63f201b4fe88b1cb735 100644 (file)
--- a/python/lilylib.py
+++ b/python/lilylib.py
@@ -187,7 +187,7 @@ def options_help_str (opts):
        return str
 
 def help ():
-       ls = [(_ ("Usage: %s [OPTION]... FILE") % __main__.program_name),
+       ls = [(_ ("Usage: %s [OPTIONS]... FILE") % __main__.program_name),
              ('\n\n'),
              (__main__.help_summary),
              ('\n\n'),

diff --git a/scripts/abc2ly.py b/scripts/abc2ly.py
index de7decda9666e62a5215bfee5cc925d261bac0be..73f59b3be4708f617563818e304bf54293862b52 100644 (file)
--- a/scripts/abc2ly.py
+++ b/scripts/abc2ly.py
@@ -1273,13 +1273,13 @@ Options:
   -s, --strict        be strict about succes
   
 This program converts ABC music files (see
-http://www.gre.ac.uk/~c.walshaw/abc2mtex/abc.txt) To LilyPond input.
+http://www.gre.ac.uk/~c.walshaw/abc2mtex/abc.txt) to LilyPond input.
 
 
 Report bugs to bug-lilypond@gnu.org.
 
 Written by Han-Wen Nienhuys <hanwen@cs.uu.nl>, Laura Conrad
-<lconrad@laymusic.org>, Roy Rankin <Roy.Rankin@@alcatel.com.au>
+<lconrad@laymusic.org>, Roy Rankin <Roy.Rankin@@alcatel.com.au>.
 """
 
 def print_version ():

diff --git a/scripts/as2text.scm b/scripts/as2text.scm
index 04f3c51e3653240dec9a56fcb94ca6bb05b9405a..1079528e9cc3054b59990eb0224ccd5a1483f040 100644 (file)
--- a/scripts/as2text.scm
+++ b/scripts/as2text.scm
@@ -37,13 +37,13 @@
 (define (show-help)
   (display "Convert AsciiScript to text.
 
-
-Usage: as2text [OPTION]... AS-FILE
+Usage: as2text [OPTIONS]... AS-FILE
 
 Options:
-  -h,--help          this help
+  -h,--help          show this help
   -o,--output=FILE   set output file
   -v,--version       show version
+
 "))
 
 ;;

diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py
index ac4f111a9a7e58cc37fbeb49b2f60dced3739916..92dcba69bf2c077adbd21e371a8e4c55c478e9de 100644 (file)
--- a/scripts/convert-ly.py
+++ b/scripts/convert-ly.py
@@ -41,15 +41,15 @@ def identify ():
 
 def usage ():
        sys.stdout.write (
-               r"""Usage: %s [OPTION]... [FILE]... 
+               r"""Usage: %s [OPTIONS]... [FILE]... 
 Try to convert to newer lilypond-versions.  The version number of the
-input is guessed by default from \version directive
+input is guessed by default from \version directive.
 
 Options:
   -h, --help             print this help
   -e, --edit             edit in place
   -f, --from=VERSION     start from version; overrides \version found in file
-  -s, --show-rules       print all rules.
+  -s, --show-rules       print all rules
   -t, --to=VERSION       show target version
   -n, --no-version       don't add new version stamp
       --version          print program version

diff --git a/scripts/etf2ly.py b/scripts/etf2ly.py
index 42e241200083caf7c4be6e27e9d832b4cd72b161..22e1e73177b51bcc66387446bb80b88c179e32a9 100644 (file)
--- a/scripts/etf2ly.py
+++ b/scripts/etf2ly.py
@@ -1113,7 +1113,7 @@ def identify():
        sys.stderr.write ("%s from LilyPond %s\n" % (program_name, version))
 
 def help ():
-       sys.stdout.write("""Usage: etf2ly [OPTION]... ETF-FILE
+       sys.stdout.write("""Usage: etf2ly [OPTIONS]... ETF-FILE
 
 Convert ETF to LilyPond.
 
@@ -1128,7 +1128,8 @@ ready-to-use lilypond file.
 
 Report bugs to bug-lilypond@gnu.org.
 
-Written by  Han-Wen Nienhuys <hanwen@cs.uu.nl>
+Written by  Han-Wen Nienhuys <hanwen@cs.uu.nl>.
+
 """)
 
 def print_version ():

diff --git a/scripts/ly2dvi.py b/scripts/ly2dvi.py
index aedf5ffa43e02c6f73fcb274918c7b7b3de90800..42a92415703d06793336bd5e73a8dcecfae7108a 100644 (file)
--- a/scripts/ly2dvi.py
+++ b/scripts/ly2dvi.py
@@ -134,7 +134,7 @@ option_definitions = [
         _ ("keep all output, output to directory %s.dir") % program_name),
        ('', '', 'no-lily', _ ("don't run LilyPond")),
        ('', 'm', 'no-paper', _ ("produce MIDI output only")),
-       (_ ("FILE"), 'o', 'output', _ ("write ouput to FILE")),
+       (_ ("FILE"), 'o', 'output', _ ("write output to FILE")),
        (_ ("FILE"), 'f', 'find-pfa', _ ("find pfa fonts used in FILE")),
        (_ ('RES'), '', 'preview-resolution',
         _ ("set the resolution of the preview to RES")),

diff --git a/scripts/midi2ly.py b/scripts/midi2ly.py
index eee6519e35eef3900fb7ec768855be5e045391e9..53baeb9e05e46ef4fac232adcaffe9845aea842e 100644 (file)
--- a/scripts/midi2ly.py
+++ b/scripts/midi2ly.py
@@ -91,7 +91,7 @@ verbose_p = 0
 # keep_temp_dir_p = 0
 
 
-help_summary = _ ("Convert MIDI to LilyPond source")
+help_summary = _ ("Convert MIDI to LilyPond source.")
 
 option_definitions = [
        ('', 'a', 'absolute-pitches', _ ("print absolute pitches")),
@@ -99,7 +99,7 @@ option_definitions = [
        ('', 'e', 'explicit-durations', _ ("print explicit durations")),
        ('', 'h', 'help', _ ("print this help")),
        (_ ("ALT[:MINOR]"), 'k', 'key', _ ("set key: ALT=+sharps|-flats; MINOR=1")),
-       (_ ("FILE"), 'o', 'output', _ ("write ouput to FILE")),
+       (_ ("FILE"), 'o', 'output', _ ("write output to FILE")),
        (_ ("DUR"), 's', 'start-quant', _ ("quantise note starts on DUR")),
        (_ ("DUR*NUM/DEN"), 't', 'allow-tuplet', _ ("allow tuplet durations DUR*NUM/DEN")),
        ('', 'V', 'verbose', _ ("be verbose")),
@@ -221,7 +221,7 @@ def options_help_str (opts):
        return str
 
 def help ():
-       ls = [(_ ("Usage: %s [OPTION]... FILE") % program_name),
+       ls = [(_ ("Usage: %s [OPTIONS]... FILE") % program_name),
                ('\n\n'),
                (help_summary),
                ('\n\n'),

diff --git a/scripts/mup2ly.py b/scripts/mup2ly.py
index 1780a20eb9c69e436f8071fb006b3ce49662ea29..958f889fcbf6c70cda0d79868e743f776d3e5dcb 100644 (file)
--- a/scripts/mup2ly.py
+++ b/scripts/mup2ly.py
@@ -67,7 +67,7 @@ except:
 
 
 program_name = 'mup2ly'
-help_summary = _ ("Convert mup to LilyPond source")
+help_summary = _ ("Convert mup to LilyPond source.")
 
 option_definitions = [
        ('', 'd', 'debug', _ ("debug")),
@@ -217,7 +217,7 @@ def options_help_str (opts):
        return str
 
 def help ():
-       ls = [(_ ("Usage: %s [OPTION]... FILE") % program_name),
+       ls = [(_ ("Usage: %s [OPTIONS]... FILE") % program_name),
                ('\n\n'),
                (help_summary),
                ('\n\n'),

diff --git a/scripts/musedata2ly.py b/scripts/musedata2ly.py
index 586dd26a4fd85aca749d89e2a201e9ecd29e4217..cd750857a1c43bf80dea23b83ec33519560014b1 100644 (file)
--- a/scripts/musedata2ly.py
+++ b/scripts/musedata2ly.py
@@ -526,7 +526,7 @@ class Parser:
 
 def help ():
        sys.stdout.write (
-"""Usage: musedata2ly [OPTION]... FILE1 [FILE2 ...]
+"""Usage: musedata2ly [OPTIONS]... FILE1 [FILE2 ...]
 
 Convert musedata to LilyPond.
 
@@ -541,13 +541,14 @@ classical music scores, currently comprising XXX scores.  The music is
 encoded in so-called Musedata format
 (http://www.ccarh.org/publications/books/beyondmidi/online/musedata).
 musedata2ly converts a set of musedata files to one .ly file, and will
-include a \header field if a .ref file is supplied 
+include a \header field if a .ref file is supplied.
 
 This converter is not complete -- this is left to the user as an excercise.
 
 Report bugs to bug-lilypond@gnu.org.
 
-Written by Han-Wen Nienhuys <hanwen@cs.uu.nl>
+Written by Han-Wen Nienhuys <hanwen@cs.uu.nl>.
+
 """)
 
 
@@ -558,7 +559,7 @@ This is free software.  It is covered by the GNU General Public License,
 and you are welcome to change it and/or distribute copies of it under
 certain conditions.  Invoke as `midi2ly --warranty' for more information.
 
-Copyright (c)  2000--2003 by Han-Wen Nienhuys <hanwen@cs.uu.nl>
+Copyright (c)  2000--2003 by Han-Wen Nienhuys <hanwen@cs.uu.nl>.
 """ % version)
 def identify():
        sys.stderr.write ("%s from LilyPond %s\n" % (program_name, version))

diff --git a/scripts/pmx2ly.py b/scripts/pmx2ly.py
index da83bc13ef7e47e8d6ebb42cfa01757d080a8fe2..060cf52731e5c825c10a741d63dc3def22500173 100644 (file)
--- a/scripts/pmx2ly.py
+++ b/scripts/pmx2ly.py
@@ -785,7 +785,7 @@ Huh? Unknown directive `%s', before `%s'""" % (c, left[:20] ))
 
 def help ():
        sys.stdout.write (
-"""Usage: pmx2ly [OPTION]... PMX-FILE
+"""Usage: pmx2ly [OPTIONS]... PMX-FILE
 
 Convert PMX to LilyPond.
 
@@ -795,11 +795,12 @@ Options:
   -v, --version       shown version information
 
 PMX is a Musixtex preprocessor written by Don Simons, see
-http://www.gmd.de/Misc/Music/musixtex/software/pmx/
+http://www.gmd.de/Misc/Music/musixtex/software/pmx/.
 
 Report bugs to bug-lilypond@gnu.org.
 
-Written by Han-Wen Nienhuys <hanwen@cs.uu.nl>
+Written by Han-Wen Nienhuys <hanwen@cs.uu.nl>.
+
 """)
 
 

diff --git a/stepmake/bin/add-html-footer.py b/stepmake/bin/add-html-footer.py
index 29c1d2dbc22ce49cb9f18bc754410e40f6730ba9..eb2b32df3e3acdf327b2e78270106876cf42db05 100644 (file)
--- a/stepmake/bin/add-html-footer.py
+++ b/stepmake/bin/add-html-footer.py
@@ -62,7 +62,7 @@ def gulp_file (f):
        return s
 
 def help ():
-       sys.stdout.write (r"""Usage: add-html-footer [OPTION]... HTML-FILE
+       sys.stdout.write (r"""Usage: add-html-footer [OPTIONS]... HTML-FILE
 Add header, footer and top of ChangLog file (up to the ********) to HTML-FILE
 
 Options:
@@ -73,6 +73,7 @@ Options:
   --index=URL               set homepage to URL
   --name=NAME               set package_name to NAME
   --version=VERSION         set package version to VERSION
+
 """)
        sys.exit (0)
 

diff --git a/stepmake/bin/config.guess b/stepmake/bin/config.guess
index ed2e03b7f2b96b4ab546dc63ff2f2d56c4cc116c..a1a58a86cc9c2a0346454a937a0fcce10e53e3d7 100755 (executable)
--- a/stepmake/bin/config.guess
+++ b/stepmake/bin/config.guess
@@ -38,7 +38,7 @@ timestamp='2002-03-20'
 me=`echo "$0" | sed -e 's,.*/,,'`
 
 usage="\
-Usage: $0 [OPTION]
+Usage: $0 [OPTIONS]
 
 Output the configuration name of the system \`$me' is run on.
 

diff --git a/stepmake/bin/config.sub b/stepmake/bin/config.sub
index f3657978c7401e6ea9216ab85e05c75adf0fdd25..c99bd1a79da510c4955cf1ef58938d2d9cab84a6 100755 (executable)
--- a/stepmake/bin/config.sub
+++ b/stepmake/bin/config.sub
@@ -55,8 +55,8 @@ timestamp='2002-03-07'
 me=`echo "$0" | sed -e 's,.*/,,'`
 
 usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
-       $0 [OPTION] ALIAS
+Usage: $0 [OPTIONS] CPU-MFR-OPSYS
+       $0 [OPTIONS] ALIAS
 
 Canonicalize a configuration name.
 

diff --git a/stepmake/bin/ls-latex.py b/stepmake/bin/ls-latex.py
index 93f9b5393789bb00b1897b662515477d44027791..4279b73148dc9234319ca61f07ac8a76cdaf5f8a 100644 (file)
--- a/stepmake/bin/ls-latex.py
+++ b/stepmake/bin/ls-latex.py
@@ -147,7 +147,7 @@ def print_html_head (l,o,h):
        l.write ('</li>\n')
 
 def help ():
-       sys.stdout.write (r"""Usage: ls-latex [OPTION]... FILE...
+       sys.stdout.write (r"""Usage: ls-latex [OPTIONS]... FILE...
 Generate html index file for FILE...
 
 Options:

diff --git a/stepmake/bin/release.py b/stepmake/bin/release.py
index 61a416f813f399d002c91029177e6928a9ac7e4d..cd9fbd50e100ca1da0366dd0a56b786ee0029a67 100755 (executable)
--- a/stepmake/bin/release.py
+++ b/stepmake/bin/release.py
@@ -11,11 +11,11 @@ outdir = '.'
 (options, files) = getopt.getopt(sys.argv[1:], 'ho:p:', ['help', 'outdir=', 'package=']) 
 
 def help ():
-       sys.stdout.write (r"""Usage: release [OPTION]...
-Make a tarball and patch
+       sys.stdout.write (r"""Usage: release [OPTIONS]...
+Make a tarball and patch.
 
 Options:
-  -o, --outdir=DIR       where to leave patches.
+  -o, --outdir=DIR       specify where to leave patches
   -h, --help             print this help
   -p, --package=DIR      specify package"""
 )