From 0dc3f4a9e0baa634f30e941465d3eae09f029ddc Mon Sep 17 00:00:00 2001 From: fred Date: Tue, 26 Mar 2002 22:25:29 +0000 Subject: [PATCH] lilypond-1.2.6 --- Documentation/GNUmakefile | 8 +- Documentation/index.texi | 71 +++++ Documentation/topdocs/INSTALL.texi | 7 +- Documentation/topdocs/PATCHES.texi | 3 +- configure | 378 +++--------------------- configure.in | 5 +- scripts/GNUmakefile | 6 +- scripts/abc2ly.py | 25 +- scripts/convert-mudela.py | 3 +- scripts/ly2dvi.py | 72 +++-- stepmake/stepmake/help2man-targets.make | 21 ++ 11 files changed, 208 insertions(+), 391 deletions(-) create mode 100644 Documentation/index.texi create mode 100644 stepmake/stepmake/help2man-targets.make diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile index fa76cc9124..ac24fa99c9 100644 --- a/Documentation/GNUmakefile +++ b/Documentation/GNUmakefile @@ -3,15 +3,15 @@ depth = .. NAME = documentation -SUBDIRS=man tex metadoc bibliography pictures topdocs ntweb -STEPMAKE_TEMPLATES=documentation +SUBDIRS= tex metadoc bibliography pictures topdocs ntweb +STEPMAKE_TEMPLATES=documentation texinfo README_TOP_FILES=NEWS DEDICATION TODO AIMS INFO_FILES = $(wildcard $(outdir)/$(package).info*) -EXTRA_DIST_FILES = COPYRIGHT +EXTRA_DIST_FILES = COPYRIGHT -BLURBS=BLURB COPERTINA FLAPTEKST +BLURBS=BLURB include $(depth)/make/stepmake.make diff --git a/Documentation/index.texi b/Documentation/index.texi new file mode 100644 index 0000000000..d1610b4ef7 --- /dev/null +++ b/Documentation/index.texi @@ -0,0 +1,71 @@ +\input texinfo @c -*-texinfo-*- +@setfilename index.info +@settitle index + +@node Top, , , (dir) +@top + + + + +@unnumberedsec NAME + + +The Documentation of LilyPond -- the GNU Project music typesetter + +@unnumberedsec DESCRIPTION + + +Note: These pages are created from the latest @strong{development snapshots} +of LilyPond. You can look at the bottom if you want to know which +version this was. + +@unnumberedsubsec Documentation: Introduction + +@itemize @bullet +@item @uref{DEDICATION.html,DEDICATION} +@item @uref{faq.html,FAQs} +@item @uref{../topdocs/out-www/README.html,The README} +@item @uref{../topdocs/out-www/INSTALL.html,The installation instructions} +@end itemize + +@unnumberedsubsec Why: Background Information + +@itemize @bullet +@item @uref{AIMS.html,Why?} +@item @uref{../pictures/out-www/lelieblond.png,The lilypond + logo (Big, format: .png)} +@item @uref{../pictures/out-www/lelie_logo.png,The lilypond + logo (medium size, format: .png)} +@end itemize + +@unnumberedsubsec Documentation: manuals + +@itemize @bullet +@item @uref{../tex/out-www/index.html,User documentation} +@item @uref{../metadoc/out-www/index.html,Hacker documentation} +@item @uref{../out-www/programs.html,`Manual pages'} +@item @uref{../bibliography/out-www/,Bibliography} +@item @uref{../tex/out-www/glossary.html,Musical vocabulary} +@end itemize + +@unnumberedsubsec The program + +@itemize @bullet +@item @uref{TODO.html,The TODO list} +@item @uref{NEWS.html,The Change log} +@item @uref{internals.html,About internal structures} +@item @uref{CodingStyle.html,The coding standards of the lilypond project} +@item @uref{../topdocs/out-www/AUTHORS.html,The Authors} +@item @uref{../topdocs/out-www/PATCHES.html,Sending and applying Patches} +@end itemize + +@unnumberedsubsec Links + +@itemize @bullet +@item @uref{../tex/out-www/index.html,Papers, books and online-resources on music typesetting} +@item @uref{../tex/out-www/index.html,Other packages for printing music} +@item @uref{links.html,bf(download) LilyPond and other interesting links} +@end itemize + +@bye diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi index c246ff1574..3ee7823855 100644 --- a/Documentation/topdocs/INSTALL.texi +++ b/Documentation/topdocs/INSTALL.texi @@ -2,7 +2,7 @@ @setfilename INSTALL.info @settitle INSTALL - compiling and installing GNU LilyPond -@node Top, , AUTHORS, (dir) +@node Top, , , (dir) @top @menu * INSTALL - compiling and installing GNU LilyPond::INSTALL - compiling and installing GNU LilyPond @@ -88,9 +88,6 @@ Check out @url{ftp://ftp.gnu.org/bison/}. @item Texinfo. Check out @url{ftp://ftp.gnu.org/pub/texinfo/}. Most documentation is in texinfo. -@item Yodl. Needed for obsolete docs (1.31.17) -@url{ftp://ftp.lilypond.org/pub/yodl}. - @item The geometry package for LaTeX is needed to use ly2dvi. Available at @url{ftp://ftp.ctan.org/tex-archive/macros/latex/contrib/supported/geometry} @@ -150,8 +147,6 @@ If you want to auto-generate Lily's website, you'll need some additional conversion tools. @itemize @bullet -@item YODL 1.31.15 or later. - @item xpmtoppm (from the Portable Bitmap Utilities) (For RedHat Linux users: it is included within the package libgr-progs). the original is at diff --git a/Documentation/topdocs/PATCHES.texi b/Documentation/topdocs/PATCHES.texi index d71dff6870..dfc61b3e5e 100644 --- a/Documentation/topdocs/PATCHES.texi +++ b/Documentation/topdocs/PATCHES.texi @@ -109,8 +109,7 @@ you'll need Python for other LilyPond scripts anyway. RedHat/SPECS releases/ # .tar.gz releases test/ # tarballs and diffs from current version - yodl -> yodl-1.30.17 - yodl-1.30.17 + @end example diff --git a/configure b/configure index 25bdbb0df3..ac9e93850f 100755 --- a/configure +++ b/configure @@ -2623,312 +2623,11 @@ echo "configure:2608: checking for TeX TFM directory" >&5 - if test "x$YODL" = "x"; then - for ac_prog in striproff -do -# Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2633: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_STRIPROFF'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$STRIPROFF"; then - ac_cv_prog_STRIPROFF="$STRIPROFF" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_STRIPROFF="$ac_prog" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -STRIPROFF="$ac_cv_prog_STRIPROFF" -if test -n "$STRIPROFF"; then - echo "$ac_t""$STRIPROFF" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -test -n "$STRIPROFF" && break -done -test -n "$STRIPROFF" || STRIPROFF="-echo no striproff" - - for ac_prog in yodl -do -# Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2668: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_YODL'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$YODL"; then - ac_cv_prog_YODL="$YODL" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_YODL="$ac_prog" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -YODL="$ac_cv_prog_YODL" -if test -n "$YODL"; then - echo "$ac_t""$YODL" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -test -n "$YODL" && break -done -test -n "$YODL" || YODL="-echo no yodl" - - for ac_prog in yodl2html -do -# Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2703: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_YODL2HTML'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$YODL2HTML"; then - ac_cv_prog_YODL2HTML="$YODL2HTML" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_YODL2HTML="$ac_prog" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -YODL2HTML="$ac_cv_prog_YODL2HTML" -if test -n "$YODL2HTML"; then - echo "$ac_t""$YODL2HTML" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -test -n "$YODL2HTML" && break -done -test -n "$YODL2HTML" || YODL2HTML="-echo no yodl" - - for ac_prog in yodl2latex -do -# Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2738: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_YODL2LATEX'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$YODL2LATEX"; then - ac_cv_prog_YODL2LATEX="$YODL2LATEX" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_YODL2LATEX="$ac_prog" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -YODL2LATEX="$ac_cv_prog_YODL2LATEX" -if test -n "$YODL2LATEX"; then - echo "$ac_t""$YODL2LATEX" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -test -n "$YODL2LATEX" && break -done - - for ac_prog in yodl2man -do -# Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2772: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_YODL2MAN'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$YODL2MAN"; then - ac_cv_prog_YODL2MAN="$YODL2MAN" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_YODL2MAN="$ac_prog" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -YODL2MAN="$ac_cv_prog_YODL2MAN" -if test -n "$YODL2MAN"; then - echo "$ac_t""$YODL2MAN" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -test -n "$YODL2MAN" && break -done -test -n "$YODL2MAN" || YODL2MAN="-echo no yodl" - - for ac_prog in yodl2msless -do -# Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2807: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_YODL2MSLESS'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$YODL2MSLESS"; then - ac_cv_prog_YODL2MSLESS="$YODL2MSLESS" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_YODL2MSLESS="$ac_prog" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -YODL2MSLESS="$ac_cv_prog_YODL2MSLESS" -if test -n "$YODL2MSLESS"; then - echo "$ac_t""$YODL2MSLESS" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -test -n "$YODL2MSLESS" && break -done -test -n "$YODL2MSLESS" || YODL2MSLESS="-echo no yodl" - - for ac_prog in yodl2texinfo -do -# Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2842: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_YODL2TEXINFO'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$YODL2TEXINFO"; then - ac_cv_prog_YODL2TEXINFO="$YODL2TEXINFO" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_YODL2TEXINFO="$ac_prog" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -YODL2TEXINFO="$ac_cv_prog_YODL2TEXINFO" -if test -n "$YODL2TEXINFO"; then - echo "$ac_t""$YODL2TEXINFO" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -test -n "$YODL2TEXINFO" && break -done -test -n "$YODL2TEXINFO" || YODL2TEXINFO="-echo no yodl" - - for ac_prog in yodl2txt -do -# Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2877: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_YODL2TXT'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$YODL2TXT"; then - ac_cv_prog_YODL2TXT="$YODL2TXT" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_YODL2TXT="$ac_prog" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -YODL2TXT="$ac_cv_prog_YODL2TXT" -if test -n "$YODL2TXT"; then - echo "$ac_t""$YODL2TXT" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -test -n "$YODL2TXT" && break -done -test -n "$YODL2TXT" || YODL2TXT="-echo no yodl" - - YODL2LESS_DIR='$(bindir)/' - else - - - - - - - - - - export STRIPROFF YODL YODL2HTML YODL2LATEX YODL2MAN YODL2MSLESS YODL2TEXINFO YODL2TXT - fi - if test "x$YODL" = "-echo no yodl"; then - - echo "configure: warning: Did not find YODL (Yodl is Yet Oneother Document Language, see http://www.cs.uu.nl/~hanwen/yodl)" 1>&2 - warn_b=yes - - fi - - ## The GUILE_FLAGS macro. ## First, let's just see if we can find Guile at all. echo $ac_n "checking for Guile""... $ac_c" 1>&6 -echo "configure:2932: checking for Guile" >&5 +echo "configure:2631: checking for Guile" >&5 guile-config link > /dev/null || { echo "configure: cannot find guile-config; is Guile installed?" 1>&2 exit 1 @@ -2949,7 +2648,7 @@ echo "configure:2932: checking for Guile" >&5 echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 -echo "configure:2953: checking for 8-bit clean memcmp" >&5 +echo "configure:2652: checking for 8-bit clean memcmp" >&5 if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2957,7 +2656,7 @@ else ac_cv_func_memcmp_clean=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_memcmp_clean=yes else @@ -2988,12 +2687,12 @@ echo "$ac_t""$ac_cv_func_memcmp_clean" 1>&6 test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}" echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:2992: checking for vprintf" >&5 +echo "configure:2691: checking for vprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -3043,12 +2742,12 @@ fi if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:3047: checking for _doprnt" >&5 +echo "configure:2746: checking for _doprnt" >&5 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else @@ -3101,12 +2800,12 @@ fi for ac_func in memmem snprintf vsnprintf gettext do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3105: checking for $ac_func" >&5 +echo "configure:2804: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3171,7 +2870,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3175: checking for $ac_word" >&5 +echo "configure:2874: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MAKEINFO'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3201,14 +2900,41 @@ test -n "$MAKEINFO" && break done test -n "$MAKEINFO" || MAKEINFO="error" +for ac_prog in perl +do +# Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:2909: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_PERL'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$PERL"; then + ac_cv_prog_PERL="$PERL" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_PERL="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +PERL="$ac_cv_prog_PERL" +if test -n "$PERL"; then + echo "$ac_t""$PERL" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi - result="`echo \"$YODL2TEXINFO\" | grep echo`" - if test "x$YODL2TEXINFO" = "xerror" -o "x$result" != "x"; then - - echo "configure: warning: can\'t find yodl. You should install Yodl 1.30.2 or newer" 1>&2 - warn_b=yes +test -n "$PERL" && break +done +test -n "$PERL" || PERL="error" - fi @@ -3399,19 +3125,11 @@ s%@INIMPOST@%$INIMPOST%g s%@MFMODE@%$MFMODE%g s%@KPSEWHICH@%$KPSEWHICH%g s%@TEX_TFMDIR@%$TEX_TFMDIR%g -s%@STRIPROFF@%$STRIPROFF%g -s%@YODL@%$YODL%g -s%@YODL2HTML@%$YODL2HTML%g -s%@YODL2LATEX@%$YODL2LATEX%g -s%@YODL2MAN@%$YODL2MAN%g -s%@YODL2MSLESS@%$YODL2MSLESS%g -s%@YODL2TEXINFO@%$YODL2TEXINFO%g -s%@YODL2TXT@%$YODL2TXT%g -s%@YODL2LESS_DIR@%$YODL2LESS_DIR%g s%@GUILE_CFLAGS@%$GUILE_CFLAGS%g s%@GUILE_LDFLAGS@%$GUILE_LDFLAGS%g s%@LIBOBJS@%$LIBOBJS%g s%@MAKEINFO@%$MAKEINFO%g +s%@PERL@%$PERL%g CEOF EOF diff --git a/configure.in b/configure.in index 1355b73bf5..bb3fa611c1 100644 --- a/configure.in +++ b/configure.in @@ -36,7 +36,6 @@ AC_STEPMAKE_GETTEXT AC_STEPMAKE_MSGFMT AC_STEPMAKE_TEXMF AC_STEPMAKE_TEXMF_DIRS -AC_STEPMAKE_YODL AC_STEPMAKE_GUILE dnl should check out -print @@ -51,8 +50,8 @@ AC_DEFINE_UNQUOTED(TOPLEVEL_VERSION, "${FULL_VERSION}") AC_DEFINE_UNQUOTED(FLOWER_VERSION, "${FULL_FLOWER_VERSION}") AC_CHECK_PROGS(MAKEINFO, makeinfo, error) -AC_CHECK_SEARCH_RESULT($YODL2TEXINFO, yodl, - You should install Yodl 1.30.2 or newer) +AC_CHECK_PROGS(PERL, perl, error) + AC_STEPMAKE_END diff --git a/scripts/GNUmakefile b/scripts/GNUmakefile index b954530259..46767793e7 100644 --- a/scripts/GNUmakefile +++ b/scripts/GNUmakefile @@ -1,9 +1,9 @@ # bin/Makefile depth = .. -SEXECUTABLES=convert-mudela mudela-book ly2dvi -STEPMAKE_TEMPLATES=script - +SEXECUTABLES=convert-mudela mudela-book ly2dvi abc2ly +STEPMAKE_TEMPLATES=script help2man +HELP2MAN_EXECS = $(SEXECUTABLES) include $(depth)/make/stepmake.make diff --git a/scripts/abc2ly.py b/scripts/abc2ly.py index 1b7b0687e5..7b075e727e 100644 --- a/scripts/abc2ly.py +++ b/scripts/abc2ly.py @@ -12,23 +12,18 @@ program_name = 'abc2ly' version = '@TOPLEVEL_VERSION@' if version == '@' + 'TOPLEVEL_VERSION' + '@': - version = '1.2.0' + version = '1.2.6' # uGUHGUHGHGUGH + import __main__ import getopt import sys import re import string import os -try: - import mpz -except: - sys.stderr.write ("This script needs Python 1.5.1\n") - sys.exit (1) - -voice_idx_dict = {} +voice_idx_dict = {} header = {} lyrics = [] voices = [] @@ -746,11 +741,15 @@ Usage: abc2ly [OPTION]... ABC-FILE Options: -h, --help this help -o, --output=FILE set output filename to FILE + -v, --version version information """ +def print_version (): + print r"""abc2ly (GNU lilypond) %s""" % version -identify() -(options, files) = getopt.getopt (sys.argv[1:], 'o:h', ['help', 'output=']) + + +(options, files) = getopt.getopt (sys.argv[1:], 'vo:h', ['help','version', 'output=']) out_filename = '' for opt in options: @@ -758,12 +757,18 @@ for opt in options: a = opt[1] if o== '--help' or o == '-h': help () + sys.exit (0) + if o == '--version' or o == '-v': + print_version () + sys.exit(0) + if o == '--output' or o == '-o': out_filename = a else: print o raise getopt.error +identify() header['tagline'] = 'Lily was here %s -- automatically converted from ABC' % version for f in files: diff --git a/scripts/convert-mudela.py b/scripts/convert-mudela.py index 983abe0adf..097642bf97 100644 --- a/scripts/convert-mudela.py +++ b/scripts/convert-mudela.py @@ -482,7 +482,8 @@ for opt in options: o = opt[0] a = opt[1] if o== '--help' or o == '-h': - help () + usage () + sys.exit (0) if o == '--version' or o == '-v': print_version () sys.exit (0) diff --git a/scripts/ly2dvi.py b/scripts/ly2dvi.py index b2d62ef9db..d3999a9834 100644 --- a/scripts/ly2dvi.py +++ b/scripts/ly2dvi.py @@ -14,7 +14,7 @@ Output: DVI file """ name = 'ly2dvi' -version = '0.0.13' +version = '@TOPLEVEL_VERSION@' errorlog = '' import sys @@ -30,7 +30,7 @@ import tempfile class Input: """ This class handles all ly2dvi.py input file methods - + Public methods: __init__() Constructor @@ -939,7 +939,7 @@ def unc2dos(path): def program_id (): - return name + ' ' + version; + return 'ly2dvi (GNU lilypond) ' + version; def mailaddress(): @@ -952,32 +952,36 @@ def mailaddress(): def identify (): sys.stderr.write (program_id () + '\n') +def print_version (): + sys.stdout.write (program_id ()) + def help (): - sys.stderr.write ( - 'Generate dvi file from mudela or lilypond output\n' - 'Usage: ' + name + ' [OPTION]... [FILE]...\n' - '\n' - 'Options:\n' - ' -D,--debug increase verbosity\n' - ' -F,--headers= name of additional LaTeX headers file\n' - ' -H,--Height= set paper height (points) (see manual page)\n' - ' -I,--include=DIR add DIR to LilyPond\'s search path\n' - ' -K,--keeplilypond keep lilypond output files\n' - ' -L,--landscape set landscape orientation\n' - ' -N,--nonumber switch off page numbering\n' - ' -O,--orientation= set orientation (obsolete - use -L instead)\n' - ' -P,--postscript generate postscript file\n' - ' -W,--Width= set paper width (points) (see manual page)\n' - ' -M,--dependencies tell lilypond make a dependencies file\n' - ' -h,--help this help text\n' - ' -k,--keeply2dvi keep ly2dvi output files\n' - ' -l,--language= give LaTeX language (babel)\n' - ' -o,--output= set output directory\n' - ' -p,--papersize= give LaTeX papersize (eg. a4)\n' - ' -s,--separate run all files separately through LaTeX\n' - '\n' - 'files may be (a mix of) input to or output from lilypond(1)\n' - ) + sys.stdout.write ( +"""Usage: %s [OPTION]... [FILE]... + +Generate dvi file from mudela or lilypond output + +Options: + -D,--debug increase verbosity + -F,--headers= name of additional LaTeX headers file + -H,--Height= set paper height (points) (see manual page) + -I,--include=DIR add DIR to LilyPond\'s search path + -K,--keeplilypond keep lilypond output files + -L,--landscape set landscape orientation + -N,--nonumber switch off page numbering + -O,--orientation= set orientation (obsolete - use -L instead) + -P,--postscript generate postscript file + -W,--Width= set paper width (points) (see manual page) + -M,--dependencies tell lilypond make a dependencies file + -h,--help this help text + -k,--keeply2dvi keep ly2dvi output files + -l,--language= give LaTeX language (babel) + -o,--output= set output directory + -p,--papersize= give LaTeX papersize (eg. a4) + -s,--separate run all files separately through LaTeX + +files may be (a mix of) input to or output from lilypond(1) +""" % name) @@ -999,7 +1003,7 @@ def main(): 'include=', 'keeplilypond', 'landscape', 'nonumber', 'Width=', 'dependencies', 'help', 'keeply2dvi', 'language=', - 'output=', 'papersize=', 'separate', + 'output=', 'version', 'papersize=', 'separate', 'postscript']) for opt in options: o = opt[0] @@ -1024,7 +1028,7 @@ def main(): Props.setDependencies(1,'commandline') elif o == '--help' or o == '-h': help() - return 0 + return 0 elif o == '--keeply2dvi' or o == '-k': Props.setKeeply2dvi(1,'commandline') elif o == '--language' or o == '-l': @@ -1037,7 +1041,12 @@ def main(): Props.setSeparate(1,'commandline') elif o == '--postscript' or o == '-P': Props.setPostscript(1,'commandline') - + elif o == '--version': + print_version () + return 0 + + identify() + if len(files): for file in files: infile.open(file) @@ -1132,7 +1141,6 @@ def cleanup(): os.remove(file) -identify() Props = Properties() try: diff --git a/stepmake/stepmake/help2man-targets.make b/stepmake/stepmake/help2man-targets.make new file mode 100644 index 0000000000..422357acee --- /dev/null +++ b/stepmake/stepmake/help2man-targets.make @@ -0,0 +1,21 @@ + +localinstall: install-help2man + +install-help2man: man + -$(INSTALL) -d $(mandir)/man1 + $(foreach a, $(HELP2MAN_GROFFS), \ + $(INSTALL) -m 644 $(a) $(mandir)/man1 && ) true + +man: $(HELP2MAN_GROFFS) + +localuninstall: uninstall-help2man + + +uninstall-help2man: + $(foreach a, $(notdir $(MANGROFFS)), rm -f $(a) && ) true + + + + + + -- 2.39.5