From 2389ee814c9e12233ad0ccdee077ffb336e08e04 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Fri, 29 Aug 2003 20:59:36 +0000 Subject: [PATCH] * scripts/lilypond.py: rename ly2dvi.py to lilypond.py * lily/GNUmakefile (SUBDIRS): rename binary to lilypond-bin --- ChangeLog | 8 ++++++++ Documentation/user/invoking.itexi | 6 +++--- lily/GNUmakefile | 2 +- lily/main.cc | 8 ++------ scripts/lilypond-book.py | 4 ++-- scripts/{ly2dvi.py => lilypond.py} | 4 ++-- 6 files changed, 18 insertions(+), 14 deletions(-) rename scripts/{ly2dvi.py => lilypond.py} (99%) diff --git a/ChangeLog b/ChangeLog index 3558a57ad5..2caec396a2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2003-08-29 Han-Wen Nienhuys + + * scripts/lilypond.py: rename ly2dvi.py to lilypond.py + + * lily/GNUmakefile (SUBDIRS): rename binary to lilypond-bin + 2003-08-29 Heikki Junes * ChangeLog lilypond.words Documentation/topdocs/NEWS.texi @@ -7,6 +13,8 @@ 2003-08-29 Han-Wen Nienhuys + * lily/main.cc (usage): adjust blurb, include url. + * input/regression/breathing-sign.ly (texidoc): transpose up 2003-08-28 Juergen Reuter diff --git a/Documentation/user/invoking.itexi b/Documentation/user/invoking.itexi index 43a3609948..4360324fff 100644 --- a/Documentation/user/invoking.itexi +++ b/Documentation/user/invoking.itexi @@ -24,11 +24,11 @@ This chapter details the technicalities of running LilyPond. The LilyPond system consists of two parts: a binary executable, which is responsible for the formatting functionality, and support scripts, which post-process the resulting output. Normally, the support scripts -are called, which in turn invoke the @code{lilypond} binary. However, -@code{lilypond} may be called directly as follows. +are called, which in turn invoke the @code{lilypond-bin} binary. However, +@code{lilypond-bin} may be called directly as follows. @example - lilypond [@var{option}]@dots{} @var{file}@dots{} + lilypond-bin [@var{option}]@dots{} @var{file}@dots{} @end example diff --git a/lily/GNUmakefile b/lily/GNUmakefile index e1be486358..6b7b293bb0 100644 --- a/lily/GNUmakefile +++ b/lily/GNUmakefile @@ -1,7 +1,7 @@ depth = .. -NAME = lilypond +NAME = lilypond-bin SUBDIRS = include MODULE_LIBS=$(depth)/flower diff --git a/lily/main.cc b/lily/main.cc index d85177f710..ef55cffc56 100644 --- a/lily/main.cc +++ b/lily/main.cc @@ -156,10 +156,8 @@ usage () printf ("\n\n"); printf (_ ("Typeset music and/or produce MIDI from FILE.").to_str0 ()); printf ("\n\n"); - printf(_ ( -"LilyPond is a music typesetter. It produces beautiful sheet music\n" -"using a high level description file as input. LilyPond is part of \n" -"the GNU Project.\n" + printf(_ ("LilyPond produces beautiful music notation.\n" + "For more information, see http://lilypond.org/" ).to_str0 ()); printf ("\n"); @@ -167,8 +165,6 @@ usage () printf ("\n"); printf (Long_option_init::table_string (options_static).to_str0 ()); printf ("\n"); - printf ("\n"); - printf (_f ("Report bugs to %s.", "bug-lilypond@gnu.org").to_str0 ()); printf ("\n"); printf ("\n"); diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py index 5411f8bc3b..92f42e96bf 100644 --- a/scripts/lilypond-book.py +++ b/scripts/lilypond-book.py @@ -151,11 +151,11 @@ include_path = [os.getcwd ()] #lilypond_binary = 'valgrind --suppressions=/home/hanwen/usr/src/guile-1.6.supp --num-callers=10 /home/hanwen/usr/src/lilypond/lily/out/lilypond' -lilypond_binary = os.path.join ('@bindir@', 'lilypond') +lilypond_binary = os.path.join ('@bindir@', 'lilypond-bin') # only use installed binary when we're installed too. if '@bindir@' == ('@' + 'bindir@') or not os.path.exists (lilypond_binary): - lilypond_binary = 'lilypond' + lilypond_binary = 'lilypond-bin' diff --git a/scripts/ly2dvi.py b/scripts/lilypond.py similarity index 99% rename from scripts/ly2dvi.py rename to scripts/lilypond.py index 1c5c6208eb..116c216c20 100644 --- a/scripts/ly2dvi.py +++ b/scripts/lilypond.py @@ -167,11 +167,11 @@ tex_extension = '.tex' ## yuk. #lilypond_binary = 'valgrind --suppressions=%(home)s/usr/src/guile-1.6.supp --num-callers=10 %(home)s/usr/src/lilypond/lily/out/lilypond '% { 'home' : '/home/hanwen' } -lilypond_binary = os.path.join ('@bindir@', 'lilypond') +lilypond_binary = os.path.join ('@bindir@', 'lilypond-bin') # only use installed binary when we're installed too. if '@bindir@' == ('@' + 'bindir@') or not os.path.exists (lilypond_binary): - lilypond_binary = 'lilypond' + lilypond_binary = 'lilypond-bin' layout_fields = ['dedication', 'title', 'subtitle', 'subsubtitle', -- 2.39.2