From 1c070612879fb4e74c30481d6db2529215a966c4 Mon Sep 17 00:00:00 2001 From: fred Date: Tue, 26 Mar 2002 21:47:12 +0000 Subject: [PATCH] lilypond-1.1.31 --- Documentation/man/convert-mudela.yo | 4 +- aclocal.m4 | 61 ++- configure | 488 ++++-------------- debian/GNUmakefile | 9 +- debian/changelog | 101 +++- debian/control.foka | 24 +- debian/control.in | 7 +- debian/copyright | 3 +- debian/preinst | 58 +++ debian/rules | 14 +- debian/watch | 4 +- input/star-spangled-banner.ly | 35 +- intl/GNUmakefile | 47 +- intl/libintl.h | 108 ++++ lily/atom.cc | 2 +- lily/auto-beam-engraver.cc | 3 + lily/chord.cc | 26 +- lily/dynamic-engraver.cc | 3 +- lily/extender-engraver.cc | 114 ++-- lily/extender-spanner.cc | 3 +- lily/hara-kiri-line-group-engraver.cc | 10 +- lily/hara-kiri-vertical-group-spanner.cc | 19 +- lily/include/atom.hh | 5 +- lily/include/extender-engraver.hh | 44 +- lily/include/extender-spanner.hh | 3 +- lily/include/hara-kiri-line-group-engraver.hh | 13 +- .../hara-kiri-vertical-group-spanner.hh | 15 +- lily/include/lyric-engraver.hh | 10 +- lily/include/molecule.hh | 4 + lily/include/musical-request.hh | 2 +- lily/include/my-lily-parser.hh | 21 +- lily/item.cc | 4 +- lily/lookup.cc | 17 +- lily/lyric-engraver.cc | 41 +- lily/multi-measure-rest-engraver.cc | 5 - lily/my-lily-parser.cc | 92 +--- lily/separating-group-spanner.cc | 2 - lily/tie-engraver.cc | 3 +- lily/translator-group.cc | 3 +- ly/paper20.ly | 4 +- stepmake/NEWS | 6 + stepmake/VERSION | 2 +- stepmake/aclocal.m4 | 61 ++- stepmake/stepmake/install-library-rules.make | 1 + .../stepmake/install-library-targets.make | 22 + stepmake/stepmake/install-library-vars.make | 1 + 46 files changed, 798 insertions(+), 726 deletions(-) create mode 100644 debian/preinst create mode 100644 intl/libintl.h create mode 100644 stepmake/stepmake/install-library-rules.make create mode 100644 stepmake/stepmake/install-library-targets.make create mode 100644 stepmake/stepmake/install-library-vars.make diff --git a/Documentation/man/convert-mudela.yo b/Documentation/man/convert-mudela.yo index 39a913b3d5..70b1222764 100644 --- a/Documentation/man/convert-mudela.yo +++ b/Documentation/man/convert-mudela.yo @@ -29,7 +29,7 @@ manpagesynopsis() manpageoptions() description( dit(--output) - The output file to write + The output file to write [FIXME, doesn't work] dit(--edit) Do an inline edit of the input file. override @samp{--output} dit(--show-rules) @@ -39,7 +39,7 @@ dit(--from=FROM_PATCHLEVEL) guess this, on the basis of code(\version) strings in the file dit(--to=TO_PATCHLEVEL) Set the goal version of the conversion. It defaults to the latest - available version. + available version. ) manpagesection(BUGS) diff --git a/aclocal.m4 b/aclocal.m4 index cb1ebe6cc0..cf4a69b433 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,9 +1,5 @@ dnl WARNING WARNING WARNING WARNING dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4 -dnl WARNING WARNING WARNING WARNING -dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4 -dnl WARNING WARNING WARNING WARNING -dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4 dnl aclocal.m4 -*-shell-script-*- dnl StepMake subroutines for configure.in @@ -169,18 +165,13 @@ AC_DEFUN(AC_STEPMAKE_GUILE, [ # to force new check iso reading from cache # gh_scm2doubles,gh_doubles2scm are new in 1.3 - AC_CHECK_LIB(guile, gh_scm2doubles, \ - LIBS="-lguile $LIBS"; AC_DEFINE(HAVE_LIBGUILE), \ - AC_CHECK_LIB(readline, readline) \ - AC_CHECK_LIB(dl, dlopen) \ - AC_CHECK_LIB(socket, socket)\ - AC_CHECK_LIB(termcap,tgetent)\ - AC_CHECK_LIB(m, fabs)\ - AC_CHECK_LIB(guile, gh_doubles2scm)\ + GUILE_FLAGS + AC_CHECK_LIB(guile, gh_scm2doubles, + LIBS="`echo $GUILE_LDFLAGS | sed -e 's/-L[[[/-_a-zA-Z0-9]]]\+ //g'` $LIBS"; + AC_DEFINE(HAVE_LIBGUILE), , $GUILE_LDFLAGS dnl ) - if test "$ac_cv_lib_guile_gh_scm2doubles" != yes -a \ - "$ac_cv_lib_guile_gh_doubles2scm" != yes ; then - AC_STEPMAKE_WARN(You should install guile 1.3 or newer) + if test "$ac_cv_lib_guile_gh_scm2doubles" != yes ; then + AC_STEPMAKE_WARN(You should install guile 1.3 or newer) fi ]) @@ -242,7 +233,12 @@ AC_DEFUN(AC_STEPMAKE_INIT, [ AC_DEFINE_UNQUOTED(PACKAGE, "${PACKAGE_NAME}") AC_DEFINE_UNQUOTED(TOPLEVEL_VERSION, "${FULL_VERSION}") - package_depth=`dirname $cache_file` + if test "$package_depth" = "" ; then + package_depth="." + else + package_depth="../$package_depth" + fi + export package_depth AC_SUBST(package_depth) AUTOGENERATE="This file was automatically generated by configure" @@ -987,3 +983,36 @@ main () AC_SUBST(GTK___LIBS) ]) +dnl GUILE_FLAGS --- set flags for compiling and linking with Guile +dnl +dnl This macro runs the `guile-config' script, installed with Guile, +dnl to find out where Guile's header files and libraries are +dnl installed. It sets two variables, marked for substitution, as +dnl by AC_SUBST. +dnl +dnl GUILE_CFLAGS --- flags to pass to a C or C++ compiler to build +dnl code that uses Guile header files. This is almost +dnl always just a -I flag. +dnl +dnl GUILE_LDFLAGS --- flags to pass to the linker to link a +dnl program against Guile. This includes `-lguile' for +dnl the Guile library itself, any libraries that Guile +dnl itself requires (like -lqthreads), and so on. It may +dnl also include a -L flag to tell the compiler where to +dnl find the libraries. + +AC_DEFUN([GUILE_FLAGS],[ +## The GUILE_FLAGS macro. + ## First, let's just see if we can find Guile at all. + AC_MSG_CHECKING(for Guile) + guile-config link > /dev/null || { + echo "configure: cannot find guile-config; is Guile installed?" 1>&2 + exit 1 + } + GUILE_CFLAGS="`guile-config compile`" + GUILE_LDFLAGS="`guile-config link`" + AC_SUBST(GUILE_CFLAGS) + AC_SUBST(GUILE_LDFLAGS) + AC_MSG_RESULT(yes) +]) + diff --git a/configure b/configure index 450066ecde..e1b187d738 100755 --- a/configure +++ b/configure @@ -54,6 +54,9 @@ fi + + + # Guess values for system-dependent variables and create Makefiles. # Generated automatically using autoconf version 2.12 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. @@ -721,7 +724,12 @@ EOF EOF - package_depth=`dirname $cache_file` + if test "$package_depth" = "" ; then + package_depth="." + else + package_depth="../$package_depth" + fi + export package_depth AUTOGENERATE="This file was automatically generated by configure" @@ -757,7 +765,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:761: checking host system type" >&5 +echo "configure:769: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -782,7 +790,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:786: checking for $ac_word" >&5 +echo "configure:794: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MAKE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -816,7 +824,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:820: checking for $ac_word" >&5 +echo "configure:828: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_FIND'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -852,7 +860,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:856: checking for $ac_word" >&5 +echo "configure:864: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_TAR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -886,7 +894,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:890: checking for $ac_word" >&5 +echo "configure:898: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_BASH'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -919,7 +927,7 @@ test -n "$BASH" || BASH="/bin/sh" # Extract the first word of "${PYTHON:-python}", so it can be a program name with args. set dummy ${PYTHON:-python}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:923: checking for $ac_word" >&5 +echo "configure:931: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PYTHON'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1148,7 +1156,7 @@ EOF # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1152: checking for $ac_word" >&5 +echo "configure:1160: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1177,7 +1185,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1181: checking for $ac_word" >&5 +echo "configure:1189: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1225,7 +1233,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1229: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1237: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1235,11 +1243,11 @@ ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1259,12 +1267,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1263: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1271: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1268: checking whether we are using GNU C" >&5 +echo "configure:1276: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1273,7 +1281,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1277: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1285: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1288,7 +1296,7 @@ if test $ac_cv_prog_gcc = yes; then ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1292: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1300: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1347,7 +1355,7 @@ EOF fi echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:1351: checking how to run the C++ preprocessor" >&5 +echo "configure:1359: checking how to run the C++ preprocessor" >&5 if test -z "$CXXCPP"; then if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1360,12 +1368,12 @@ ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $L cross_compiling=$ac_cv_prog_cxx_cross CXXCPP="${CXX-g++} -E" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1369: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1377: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1396,7 +1404,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:1400: checking for $ac_word" >&5 +echo "configure:1408: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1427,7 +1435,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1431: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:1439: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1437,11 +1445,11 @@ ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $L cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1453: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1461,12 +1469,12 @@ if test $ac_cv_prog_cxx_works = no; then { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1465: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1473: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:1470: checking whether we are using GNU C++" >&5 +echo "configure:1478: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1475,7 +1483,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1479: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1487: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -1490,7 +1498,7 @@ if test $ac_cv_prog_gxx = yes; then ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:1494: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:1502: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1520,17 +1528,17 @@ fi ac_safe=`echo "FlexLexer.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for FlexLexer.h""... $ac_c" 1>&6 -echo "configure:1524: checking for FlexLexer.h" >&5 +echo "configure:1532: checking for FlexLexer.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1534: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1542: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1581,12 +1589,12 @@ fi echo $ac_n "checking whether explicit instantiation is needed""... $ac_c" 1>&6 -echo "configure:1585: checking whether explicit instantiation is needed" >&5 +echo "configure:1593: checking whether explicit instantiation is needed" >&5 if eval "test \"`echo '$''{'lily_cv_need_explicit_instantiation'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < struct foo { static int baz; }; @@ -1596,7 +1604,7 @@ int main() { return foo::baz; ; return 0; } EOF -if { (eval echo configure:1600: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1608: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* lily_cv_need_explicit_instantiation=no else @@ -1623,7 +1631,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:1627: checking for $ac_word" >&5 +echo "configure:1635: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1665,7 +1673,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:1669: checking for $ac_word" >&5 +echo "configure:1677: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_BISON'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1699,7 +1707,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:1703: checking for $ac_word" >&5 +echo "configure:1711: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_FLEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1766,7 +1774,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:1770: checking for $ac_word" >&5 +echo "configure:1778: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1798,7 +1806,7 @@ test -n "$AR" || AR="error" # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1802: checking for $ac_word" >&5 +echo "configure:1810: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1853,7 +1861,7 @@ fi echo $ac_n "checking language""... $ac_c" 1>&6 -echo "configure:1857: checking language" >&5 +echo "configure:1865: checking language" >&5 case "$language" in En* | en* | Am* | am* | US* | us*) lang=English;; @@ -1889,7 +1897,7 @@ EOF echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6 -echo "configure:1893: checking for gettext in -lintl" >&5 +echo "configure:1901: checking for gettext in -lintl" >&5 ac_lib_var=`echo intl'_'gettext | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1897,7 +1905,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1941,12 +1949,12 @@ fi for ac_func in gettext do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1945: checking for $ac_func" >&5 +echo "configure:1953: 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; then +if { (eval echo configure:1984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2004,7 +2012,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:2008: checking for $ac_word" >&5 +echo "configure:2016: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2034,7 +2042,7 @@ done test -n "$MSGFMT" || MSGFMT="\$(SHELL) \$(step-bindir)/fake-msgfmt.sh " echo $ac_n "checking whether msgfmt accepts -o""... $ac_c" 1>&6 -echo "configure:2038: checking whether msgfmt accepts -o" >&5 +echo "configure:2046: checking whether msgfmt accepts -o" >&5 msgfmt_output="`msgfmt -o bla 2>&1 | grep usage`" if test "$msgfmt_output" = ""; then echo "$ac_t""yes" 1>&6 @@ -2061,7 +2069,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:2065: checking for $ac_word" >&5 +echo "configure:2073: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_METAFONT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2096,7 +2104,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:2100: checking for $ac_word" >&5 +echo "configure:2108: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MFONT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2133,7 +2141,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:2137: checking for $ac_word" >&5 +echo "configure:2145: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_METAPOST'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2168,7 +2176,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:2172: checking for $ac_word" >&5 +echo "configure:2180: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MPOST'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2211,7 +2219,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:2215: checking for $ac_word" >&5 +echo "configure:2223: 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 @@ -2245,7 +2253,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:2249: checking for $ac_word" >&5 +echo "configure:2257: 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 @@ -2279,7 +2287,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:2283: checking for $ac_word" >&5 +echo "configure:2291: 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 @@ -2313,7 +2321,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:2317: checking for $ac_word" >&5 +echo "configure:2325: 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 @@ -2346,7 +2354,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:2350: checking for $ac_word" >&5 +echo "configure:2358: 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 @@ -2380,7 +2388,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:2384: checking for $ac_word" >&5 +echo "configure:2392: 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 @@ -2414,7 +2422,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:2418: checking for $ac_word" >&5 +echo "configure:2426: 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 @@ -2448,7 +2456,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:2452: checking for $ac_word" >&5 +echo "configure:2460: 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 @@ -2504,16 +2512,31 @@ test -n "$YODL2TXT" || YODL2TXT="-echo no yodl" # to force new check iso reading from cache # gh_scm2doubles,gh_doubles2scm are new in 1.3 + +## 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:2520: checking for Guile" >&5 + guile-config link > /dev/null || { + echo "configure: cannot find guile-config; is Guile installed?" 1>&2 + exit 1 + } + GUILE_CFLAGS="`guile-config compile`" + GUILE_LDFLAGS="`guile-config link`" + + + echo "$ac_t""yes" 1>&6 + echo $ac_n "checking for gh_scm2doubles in -lguile""... $ac_c" 1>&6 -echo "configure:2509: checking for gh_scm2doubles in -lguile" >&5 +echo "configure:2532: checking for gh_scm2doubles in -lguile" >&5 ac_lib_var=`echo guile'_'gh_scm2doubles | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lguile $LIBS" +LIBS="-lguile $GUILE_LDFLAGS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2542,320 +2565,17 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - \ - LIBS="-lguile $LIBS"; cat >> confdefs.h <<\EOF + LIBS="`echo $GUILE_LDFLAGS | sed -e 's/-L[/-_a-zA-Z0-9]\+ //g'` $LIBS"; + cat >> confdefs.h <<\EOF #define HAVE_LIBGUILE 1 EOF else echo "$ac_t""no" 1>&6 -\ - echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6 -echo "configure:2555: checking for readline in -lreadline" >&5 -ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-lreadline $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo readline | sed -e 's/^a-zA-Z0-9_/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >> confdefs.h <&6 -fi - \ - echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:2605: checking for dlopen in -ldl" >&5 -ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-ldl $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo dl | sed -e 's/^a-zA-Z0-9_/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >> confdefs.h <&6 -fi - \ - echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:2655: checking for socket in -lsocket" >&5 -ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-lsocket $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" fi -rm -f conftest* -LIBS="$ac_save_LIBS" -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo socket | sed -e 's/^a-zA-Z0-9_/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >> confdefs.h <&6 -fi -\ - echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6 -echo "configure:2705: checking for tgetent in -ltermcap" >&5 -ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-ltermcap $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo termcap | sed -e 's/^a-zA-Z0-9_/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >> confdefs.h <&6 -fi -\ - echo $ac_n "checking for fabs in -lm""... $ac_c" 1>&6 -echo "configure:2755: checking for fabs in -lm" >&5 -ac_lib_var=`echo m'_'fabs | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-lm $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo m | sed -e 's/^a-zA-Z0-9_/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >> confdefs.h <&6 -fi -\ - echo $ac_n "checking for gh_doubles2scm in -lguile""... $ac_c" 1>&6 -echo "configure:2805: checking for gh_doubles2scm in -lguile" >&5 -ac_lib_var=`echo guile'_'gh_doubles2scm | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-lguile $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo guile | sed -e 's/^a-zA-Z0-9_/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >> confdefs.h <&6 -fi -\ - -fi - - if test "$ac_cv_lib_guile_gh_scm2doubles" != yes -a \ - "$ac_cv_lib_guile_gh_doubles2scm" != yes ; then - + if test "$ac_cv_lib_guile_gh_scm2doubles" != yes ; then + echo "configure: warning: You should install guile 1.3 or newer" 1>&2 warn_b=yes @@ -2864,7 +2584,7 @@ fi echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 -echo "configure:2868: checking for 8-bit clean memcmp" >&5 +echo "configure:2588: 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 @@ -2872,7 +2592,7 @@ else ac_cv_func_memcmp_clean=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2609: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_func_memcmp_clean=yes else @@ -2903,12 +2623,12 @@ echo "$ac_t""$ac_cv_func_memcmp_clean" 1>&6 test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.o" echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:2907: checking for vprintf" >&5 +echo "configure:2627: 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; then +if { (eval echo configure:2658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -2958,12 +2678,12 @@ fi if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:2962: checking for _doprnt" >&5 +echo "configure:2682: 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; then +if { (eval echo configure:2713: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else @@ -3016,12 +2736,12 @@ fi for ac_func in memmem snprintf vsnprintf gettext do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3020: checking for $ac_func" >&5 +echo "configure:2740: 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; then +if { (eval echo configure:2771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3086,7 +2806,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:3090: checking for $ac_word" >&5 +echo "configure:2810: 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 @@ -3313,6 +3033,8 @@ 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 diff --git a/debian/GNUmakefile b/debian/GNUmakefile index 6aac4c8221..b49c007234 100644 --- a/debian/GNUmakefile +++ b/debian/GNUmakefile @@ -2,15 +2,16 @@ depth = .. -NAME= debian -BLURBS=BLURB +NAME = debian +BLURBS = BLURB AT_FILES = $(BLURBS) # at-dir = $(outdir)/ at-ext = EXTRA_DIST_FILES = README.Debian TODO $(CONF_FILES) $(OUT_DIST_FILES) control.foka -CONF_FILES=changelog copyright postinst postrm rules watch -OUTCONF_FILES=$(addprefix $(outdir)/, $(basename $(CONF_FILES))) $(OUTIN_FILES) +CONF_FILES = changelog copyright preinst postinst postrm rules watch +#OUTCONF_FILES = $(addprefix $(outdir)/, $(basename $(CONF_FILES))) $(OUTIN_FILES) +OUTCONF_FILES = $(OUTIN_FILES) OUT_DIST_FILES = $(OUTIN_FILES) STEPMAKE_TEMPLATES = yolily-debian diff --git a/debian/changelog b/debian/changelog index 26392962b3..0cdc629af7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,88 @@ -lilypond (1.0.16-1) unstable; urgency=low +lilypond (1.1.29-1) unstable; urgency=low * New upstream release. + * [stepmake/aclocal.m4]: AC_STEPMAKE_GUILE now calls the GUILE_FLAGS + macro to set -lqthreads etc., otherwise Guile would not be detected + by the configure script. + + -- Anthony Fok Sun, 14 Feb 1999 09:05:00 -0700 + +lilypond (1.0.19.uu3-1) frozen unstable; urgency=low + + * New upstream bug-fix release. + + -- Anthony Fok Sat, 12 Dec 1998 04:23:15 -0700 + +lilypond (1.0.19.uu1-2) frozen unstable; urgency=low + + * [debian/rules]: Now builds the LilyPond documentation in dvi format. + Thanks to Roland Rosenfeld + for the bug report. (closes: Bug#30123). + * [debian/control]: Now also Recommends: tetex-extra (>= 0.9.981030-1) + because the .dvi documentation uses the EC fonts in that package. + + -- Anthony Fok Thu, 10 Dec 1998 17:43:57 -0700 + +lilypond (1.0.19.uu1-1) frozen unstable; urgency=low + + * New upstream bug-fix release. + + -- Anthony Fok Mon, 7 Dec 1998 13:12:02 -0700 + +lilypond (1.0.18-2) frozen unstable; urgency=low + + * [debian/rules]: Added symlink /usr/lib/texmf/fonts/afm/public/lilypond. + Thanks to Julian Gilbey for the bug report + (closes: Bug#29407). + * [scripts/ly2dvi.py]: Re-added a patch similar to the one in 1.0.17-1, + but teTeX's default search path is now placed *before* the ones that + ly2dvi adds. Thanks to Roland Rosenfeld + for the bug report. (closes: Bug#29459). + + -- Anthony Fok Mon, 23 Nov 1998 21:29:25 -0700 + +lilypond (1.0.18-1) frozen unstable; urgency=low + + * New upstream bug-fix release. + * [debian/control]: + - Upgraded to standards version 2.5.0.0 (no changes). + - Recommends: python-misc (>= 1.5.1) because ly2dvi needs the glob + module in the python-misc package (closes: Bug#29283). + - Updated dependencies on tetex* to the latest versions: + Depends: tetex-bin (>= 0.9.981031-2) + Recommends: tetex-base (>= 0.9.981030-1) + due to changes in tetex's directory structure. + * [debian/rules]: + - The symlink ../../../../../share/lilypond/mf is now named + /usr/lib/texmf/fonts/source/public/lilypond instead of + /usr/lib/texmf/fonts/source/public/mf (Bug#29284). + - In the latest tetex-base package, /usr/lib/texmf/doc is now a + symlink to /usr/doc/texmf. Therefore, we now install lilypond's + documentation into /usr/doc/texmf/musixtex/lilypond. + (closes: Bug#28999, Bug#29326) + * [debian/preinst]: + - The script now removes the directories + /var/spool/texmf/pk/*/public/mf and /var/spool/texmf/tfm/public/mf + created inadvertently by Debian's buggy lilypond 1.0.17-1. :-) + (Bug#29284) + - Since 1.0.17-1, /usr/lib/texmf/tex/lilypond has been changed to a + symbolic directory. The script now removes the old real directory + to prevent problems during upgrade (closes: Bug#29284). + * [debian/postinst]: I copied a few lines from tetex-nonfree's postinst + to remove the old directory /usr/lib/texmf/doc if lilypond is the + last package to use that directory, and create a symlink to + /usr/doc/texmf. :-) + * Rebuilt with yodl (1.31.7-1) installed to ensure the documentations + are compiled properly (closes: Bug#29285). + * Thanks to Fabien Ninoles , Roland Rosenfeld + and Julian Gilbey + for reporting the bugs listed above. :-) + + -- Anthony Fok Thu, 12 Nov 1998 03:14:25 -0700 + +lilypond (1.0.17-1) frozen unstable; urgency=low + + * New upstream "stable" release. * [debian/{copyright,control}]: pcnov095.win.tue.nl -> ftp.cs.uu.nl (New upstream master FTP site). Also updated JCN's web site URL. * [debian/rules]: @@ -11,9 +93,17 @@ lilypond (1.0.16-1) unstable; urgency=low run. Thanks to Roman Hodek for reporting the problem! (closes: Bug#27044) - Updated debian/rules according to the new debhelper rules example. - * [Documentation/topdocs/AUTHORS.yo]: Added a trailing "/" on URLs. - - -- Anthony Fok Thu, 15 Oct 1998 04:49:40 -0600 + - Now configures with --disable-optimise instead of --enable-optimise, + otherwise it would not compile. + - Added symlinks to directories under /usr/lib/texmf because lilypond + now puts everything under /usr/share/lilypond. + * [Documentation/topdocs/AUTHORS.yo]: Added a trailing "/" on URLs. + * [scripts/ly2dvi.py]: Added a hack to add an extra os.pathsep (":" on + Linux) to TEXINPUTS and MFINPUTS, otherwise ly2dvi and TeX would fail + to find the necessary files. + * Compiled with libstdc++2.9. :-) + + -- Anthony Fok Tue, 3 Nov 1998 14:31:18 -0700 lilypond (1.0.2-1) unstable; urgency=low @@ -73,8 +163,9 @@ lilypond (0.1.60-1) frozen unstable; urgency=medium * New upstream release with lots of bug fixes, including the MIDI generation bug in 0.1.48. Please put this in Hamm. - * debian/rules: + * debian/control: - Upgraded to standards version 2.4.1.0 (no changes). + * debian/rules: - lilypond now also depends on tetex-base (>= 0.9-5) and conflicts with tetex-base (<< 0.9). * Modified postinst and postrm to work with teTeX 0.9 / Web2C 7.2: diff --git a/debian/control.foka b/debian/control.foka index 1054ef466e..0dfe808530 100644 --- a/debian/control.foka +++ b/debian/control.foka @@ -2,31 +2,23 @@ Source: lilypond Section: tex Priority: optional Maintainer: Anthony Fok -Standards-Version: 2.4.1.0 +Standards-Version: 2.5.0.0 Package: lilypond Architecture: any -Depends: ${shlibs:Depends}, tetex-base (>= 0.9-5) -Recommends: python-base (>= 1.5.1) +Depends: ${shlibs:Depends}, tetex-bin (>= 0.9.981031-2) +Recommends: python-base (>= 1.5.1), python-misc (>= 1.5.1), tetex-base (>= 0.9.981030-1), tetex-extra (>= 0.9.981030-1) Conflicts: musixtex-fonts, tetex-base (<< 0.9) Description: The GNU Project music typesetter. LilyPond is the GNU Project music typesetter. This program can print beautiful sheet music from a music definition file. It can also play mechanical performances to a MIDI file. Features include multiple - staffs, meters, clefs, keys, lyrics, versatile input language, - cadenzas, beams, slurs, triplets, formatting scores, part extraction. - It includes a nice font of musical symbols. - . - LilyPond is de muziek typesetter van het GNU Project. - Het programma genereert prachtige bladmuziek uit een muziek definitie - bestand. Ook kan het (mechanische) uitvoeringen afspelen naar MIDI - bestanden. Bijzondere mogelijkheden omvatten verscheidene notenbalken, - maatsoorten, sleutels, toonsoorten, zangteksten, krachtige invoer taal, - cadensa, balken, boogjes, triolen, partituren, en losse partijen. Een - fraai font met muzikeksymbolen wordt meegeleverd. + staffs, meters, clefs, keys, lyrics, versatile input language, cadenzas, + beams, slurs, triplets, formatting scores, part extraction. It includes + a nice font of musical symbols. . URLs: http://www.cs.uu.nl/~hanwen/lilypond/ - http://www.digicash.com/~jan/lilypond/ - http://sca.uwaterloo.ca/lilypond/ + http://www.xs4all.nl/~jantien/lilypond/ + http://sca.uwaterloo.ca/~praetzel/lilypond/ Authors: Han-Wen Nienhuys Jan Nieuwenhuizen diff --git a/debian/control.in b/debian/control.in index 6cde23db40..e864f15973 100644 --- a/debian/control.in +++ b/debian/control.in @@ -2,17 +2,18 @@ Source: lilypond Section: tex Priority: optional Maintainer: Anthony Fok -Standards-Version: 2.4.1.0 +Standards-Version: 2.5.0.0 Package: lilypond Architecture: any -Depends: ${shlibs:Depends}, tetex-base (>= 0.9-5) -Recommends: python-base (>= 1.5.1) +Depends: ${shlibs:Depends}, tetex-bin (>= 0.9.981031-2) +Recommends: python-base (>= 1.5.1), python-misc (>= 1.5.1), tetex-base (>= 0.9.981030-1), tetex-extra (>= 0.9.981030-1) Conflicts: musixtex-fonts, tetex-base (<< 0.9) Description: The GNU Project music typesetter.@BLURB@ . URLs: http://www.cs.uu.nl/~hanwen/lilypond/ http://www.xs4all.nl/~jantien/lilypond/ http://sca.uwaterloo.ca/~praetzel/lilypond/ + http://www.lilypond.org/ Authors: Han-Wen Nienhuys Jan Nieuwenhuizen diff --git a/debian/copyright b/debian/copyright index 551e4d52e1..f27e69008b 100644 --- a/debian/copyright +++ b/debian/copyright @@ -2,7 +2,7 @@ This package was debianized by Anthony Fok on Wed, 6 Aug 1997 04:30:28 -0600 It was downloaded from - ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/development/lilypond-1.0.16.tar.gz + ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/development/lilypond-1.1.29.tar.gz It is also available from: @@ -11,6 +11,7 @@ It is also available from: For more information about GNU LilyPond, please visit: http://www.cs.uu.nl/~hanwen/lilypond/ or http://www.xs4all.nl/~jantien/ + or http://www.lilypond.org/ or http://sca.uwaterloo.ca/lilypond/ Authors: diff --git a/debian/preinst b/debian/preinst new file mode 100644 index 0000000000..cf27f6b936 --- /dev/null +++ b/debian/preinst @@ -0,0 +1,58 @@ +#!/bin/sh +# +# preinst script for the Debian GNU/Linux lilypond package +# by Anthony Fok +# This is free software; see the GNU General Public Licence +# version 2 or later for copying conditions. There is NO warranty. +# Last modified: Tue, 10 Nov 1998 23:47:00 -0700 + +set -e + +package=lilypond +font_supplier=public +font_typeface=lilypond +std_TEXMFMAIN=/usr/lib/texmf +std_VARTEXFONTS=/var/spool/texmf + +#DEBHELPER# + +TEXMFMAIN=`/usr/bin/kpsewhich -expand-var '$TEXMFMAIN'` +: ${TEXMFMAIN:=$std_TEXMFMAIN} +VARTEXFONTS=`/usr/bin/kpsewhich -expand-var '$VARTEXFONTS'` +: ${VARTEXFONTS=$std_VARTEXFONTS} + +LILYTEXINPUTS=$TEXMFMAIN/tex/$package +LILYMFINPUTS=$TEXMFMAIN/fonts/source/$font_supplier/$font_typeface + +case "$1" in + install|upgrade) + # Clear out the old TFM and PK files in case the fonts were + # left-over from previous installations + rm -rf $VARTEXFONTS/tfm/$font_supplier/$font_typeface + rm -rf $VARTEXFONTS/pk/*/$font_supplier/$font_typeface + + # Fix a silly bug in Debian's lilypond 1.0.17-1. :-) + if [ "$2" = "1.0.17-1" ]; then + rm -rf $VARTEXFONTS/tfm/$font_supplier/mf + rm -rf $VARTEXFONTS/pk/*/$font_supplier/mf + fi + + # Since 1.0.17-1, /usr/lib/texmf/tex/lilypond has been changed + # to a symbolic directory. Remove the old real directory to + # prevent problems during upgrade. + for i in $LILYTEXINPUTS $LILYMFINPUTS; do + if [ -d $i -a ! -L $i ]; then + rm -rf $i + fi + done + ;; + + abort-upgrade) + ;; + + *) + echo "$0 called with unknown argument \`$1'" >&2 + exit 0 + ;; + +esac diff --git a/debian/rules b/debian/rules index 3a78b27b07..adf3d4219c 100644 --- a/debian/rules +++ b/debian/rules @@ -20,8 +20,9 @@ build: build-stamp build-stamp: dh_testdir + # CC=egcc LIBS=-lqthreads CC=egcc ./configure --disable-checking --disable-debugging \ - --enable-printing --prefix=/usr --enable-optimise \ + --enable-printing --prefix=/usr --disable-optimise \ --enable-shared $(MAKE) all # $(MAKE) htmldoc @@ -36,9 +37,9 @@ clean: # Correct the owner of the out/dummy.dep files when built with sudo. if [ -n "$$SUDO_USER" -a -n "$$SUDO_GID" ]; then \ - find . -user root | xargs -r chown $$SUDO_USER.$$SUDO_GID; \ + find . -user root | xargs -r chown --dereference $$SUDO_USER.$$SUDO_GID; \ else \ - find . -user root | xargs -r chown $$LOGNAME; \ + find . -user root | xargs -r chown --dereference $$LOGNAME; \ fi # Remove the following line once the *.make files are fixed @@ -73,7 +74,7 @@ binary-arch: build install dh_testdir dh_testroot cp -av mudela-mode.el $(r)/usr/lib/emacs/site-lisp - dh_installdocs ANNOUNCEMENT ANNOUNCE-0.1 NEWS* DEDICATION \ + dh_installdocs ANNOUNCEMENT ANNOUNCE-0.1 NEWS-* DEDICATION \ BUGS TODO *.txt \ Documentation/pictures/*.xpm \ Documentation/out/*.txt \ @@ -89,12 +90,9 @@ binary-arch: build install # dh_installcron # dh_installmanpages # dh_undocumented - dh_installchangelogs + dh_installchangelogs -k NEWS # dh_strip dh_compress - ( cd $(r)/$(d) && \ - if [ -f NEWS ]; then gzip -9vf NEWS; fi ) - ln -s NEWS.gz $(r)/$(d)/changelog.gz dh_fixperms dh_suidregister dh_installdeb diff --git a/debian/watch b/debian/watch index 9b35470c7c..2d48c588b0 100644 --- a/debian/watch +++ b/debian/watch @@ -1,5 +1,5 @@ # Example watch control file for uscan # Rename this file to "watch" and then you can run the "uscan" command # to check for upstream updates and more. -# Site Directory Pattern Version Script -ftp.cs.uu.nl /pub/GNU/LilyPond/development lilypond-*.tar.gz debian uupdate +# Site Directory Pattern Version Script +ftp.cs.uu.nl /pub/GNU/LilyPond/v1.1 lilypond-*.tar.gz debian uupdate diff --git a/input/star-spangled-banner.ly b/input/star-spangled-banner.ly index f5b05d1e35..299c10b610 100644 --- a/input/star-spangled-banner.ly +++ b/input/star-spangled-banner.ly @@ -3,14 +3,15 @@ Converted from star.mup with the aid of mup-to-ly.py http://www.Arkkra.com/doc/star.html http://www.Arkkra.com/doc/star.ps %} + \header{ -title="The Star Spangled Banner"; -subtitle="(The United States National Anthem)"; -poet="Text by Francis Scott Key"; -composer="J. S. Smith"; -arranger="Arranged by William J. Krauss"; -enteredby="jcn"; -copyright="public domain"; + title="The Star Spangled Banner"; + subtitle="The United States National Anthem"; + poet="Text by Francis Scott Key"; + composer="J. S. Smith"; + arranger="Arranged by William J. Krauss"; + enteredby="jcn"; + copyright="public domain"; } $staff1_voice_1 = \notes { @@ -56,14 +57,16 @@ $staff2_voice_2 = \notes { g8. g16 fis4.~a,8 d8 e8 fis2 b8 b8 a4. a8 a,4 d2 s4 } -$text = \lyrics{ - Oh4 __ \repeat 2 { } +text = \lyrics +\type LyricVoice { Oh4 __ \repeat 2 { } \alternative < - { say. can you see,2 by8. the16 dawn's4 ear- ly light2 What8 - so8 proud-4. ly8 we4 hailed,2 At8. the16 twi-4 light's last gleam- - ing. Whose8. broad16 } - { stripes4 and bright stars,2 through8. the16 per-4 il- ous fight,2 - O'er8 the8 ram-4. parts8 we4 watched,2 were8. so16 gal-4 lant- ly } + { say. can you see,2 by8. the16 dawn's4 ear- ly light2 What8 + so8 proud-4. ly8 we4 hailed,2 At8. the16 twi-4 light's last gleam- + ing. Whose8. broad16 } + + \type LyricVoice = LVB + { stripes4 and bright stars,2 through8. the16 per-4 il- ous fight,2 + O'er8 the8 ram-4. parts8 we4 watched,2 were8. so16 gal-4 lant- ly } > stream-4 ing. And8. the16 rock-4 ets' red glare,2 the8 bombs8 burst-4 ing in air,2 gave4 proof4. through8 the4 night2 that8. @@ -92,9 +95,7 @@ global = \notes { \notes \transpose c'' {\voiceone \$staff1_voice_1 } \notes \transpose c'' {\voicetwo \$staff1_voice_2 } > - \type Lyrics = one \lyrics < - \$text - > + \type Lyrics = one \text \type Staff=staffB < \global \clef bass; diff --git a/intl/GNUmakefile b/intl/GNUmakefile index 45496fe22c..472d7bfa88 100644 --- a/intl/GNUmakefile +++ b/intl/GNUmakefile @@ -9,34 +9,37 @@ SED_FILES = $(wildcard *.sed) URG_DEFINES = -DGNULOCALEDIR=\"$(localedir)\" -DLOCALE_ALIAS_PATH=\"$(localedir):\" EXTRA_CFLAGS = -I. $(URG_DEFINES) -EXTRA_DIST_FILES = Makefile.in.dist cat-compat.c.dist ChangeLog libintl.inst $(SED_FILES) +EXTRA_DIST_FILES = Makefile.in.dist cat-compat.c.dist ChangeLog $(SED_FILES) -STEPMAKE_TEMPLATES=c library +ifeq ($(strip $(LIBINTL)),) +STEPMAKE_TEMPLATES=c +else +STEPMAKE_TEMPLATES=c library install-library +endif + +# catch default targets: don't make, install etc. +default: $(outdir) + @echo "*** To install libintl type 'make lib; make install-lib' ***" $(outdir)/library.a: @echo "*** To install libintl type 'make lib; make install-lib' ***" +localinstall: $(outdir) + @echo "*** To install libintl type 'make lib; make install-lib' ***" + +localuninstall: $(outdir) + @echo "*** To uninstall libintl type 'make uninstall-lib' ***" + include $(depth)/make/stepmake.make -lib: $(LIBRARY) -LIBINTL = $(LIBRARY) - -# localinstall: $(LIBINTL) -install-lib: $(LIBINTL) - $(INSTALL) -d $(includedir) -# $(INSTALL) libintl.h $(includedir) - $(INSTALL) libintl.inst $(includedir)/libintl.h -ifeq ($(LIB_SUFFIX),.so) - $(INSTALL) -d $(libdir) - $(INSTALL) $(LIBINTL).$(VERSION) $(libdir) - ln -s $(LIB_PREFIX)intl$(LIB_SUFFIX).$(VERSION) $(libdir)/$(LIB_PREFIX)intl$(LIB_SUFFIX).$(MAJOR_VERSION) - ln -s $(LIB_PREFIX)intl$(LIB_SUFFIX).$(VERSION) $(libdir)/$(LIB_PREFIX)intl$(LIB_SUFFIX) -else - $(INSTALL) -d $(libdir) - $(INSTALL) $(LIBINTL) $(libdir)/$(INSTALL_LIBRARY) -endif -localuninstall: - rm -f $(includedir)/libintl.h - rm -f $(libdir)/libintl.{so*,a} +# deferred targets +lib: + $(MAKE) LIBINTL=yes all + +install-lib: $(LIBRARY) + $(MAKE) LIBINTL=yes localinstall + +uninstall-lib: + $(MAKE) LIBINTL=yes localuninstall diff --git a/intl/libintl.h b/intl/libintl.h new file mode 100644 index 0000000000..4b91230f88 --- /dev/null +++ b/intl/libintl.h @@ -0,0 +1,108 @@ +/* libintl.h -- Message catalogs for internationalization. +Copyright (C) 1995 Free Software Foundation, Inc. + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +#ifndef _LIBINTL_H +#define _LIBINTL_H 1 + +#ifdef HAVE_LOCALE_H +# include +#endif + +/* We define an additional symbol to signal that we use the GNU + implementation of gettext. */ +#define __USE_GNU_GETTEXT 1 + +#ifndef __P +# if __STDC__ +# define __P(args) args +# else +# define __P(args) () +# endif +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +/* Look up MSGID in the current default message catalog for the current + LC_MESSAGES locale. If not found, returns MSGID itself (the default + text). */ +extern char *gettext __P ((const char *__msgid)); + +/* Look up MSGID in the DOMAINNAME message catalog for the current + LC_MESSAGES locale. */ +extern char *dgettext __P ((const char *__domainname, const char *__msgid)); + +/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY + locale. */ +extern char *dcgettext __P ((const char *__domainname, const char *__msgid, + int __category)); + + +/* Set the current default message catalog to DOMAINNAME. + If DOMAINNAME is null, return the current default. + If DOMAINNAME is "", reset to the default of "messages". */ +extern char *textdomain __P ((const char *__domainname)); + +/* Specify that the DOMAINNAME message catalog will be found + in DIRNAME rather than in the system locale data base. */ +extern char *bindtextdomain __P ((const char *__domainname, + const char *__dirname)); + + +/* Optimized version of the functions above. */ +#if defined __OPTIMIZED +/* These must be a macro. Inlined functions are useless because the + `__builtin_constant_p' predicate in dcgettext would always return + false. */ + +# define gettext(msgid) dgettext ((char *) 0, msgid) + +# define dgettext(domainname, msgid) \ + dcgettext (domainname, msgid, LC_MESSAGES) + +# if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7) +# define dcgettext(domainname, msgid, category) \ + (__extension__ \ + ({ \ + char *result; \ + if (__builtin_constant_p (msgid)) \ + { \ + extern int _nl_msg_cat_cntr; \ + static char *__translation__; \ + static int __catalog_counter__; \ + if (! __translation__ || __catalog_counter__ != _nl_msg_cat_cntr) \ + { \ + __translation__ = \ + (dcgettext) ((domainname), (msgid), (category)); \ + __catalog_counter__ = _nl_msg_cat_cntr; \ + } \ + result = __translation__; \ + } \ + else \ + result = (dcgettext) ((domainname), (msgid), (category)); \ + result; \ + })) +# endif +#endif /* Optimizing. */ + + +#ifdef __cplusplus +} +#endif + +#endif /* libintl.h */ diff --git a/lily/atom.cc b/lily/atom.cc index 6ad4adca04..7a336f524e 100644 --- a/lily/atom.cc +++ b/lily/atom.cc @@ -22,7 +22,7 @@ Atom::Atom(SCM s) } -#if 0 +#if ATOM_SMOB int Atom::smob_display (SCM smob, SCM port, scm_print_state*) { diff --git a/lily/auto-beam-engraver.cc b/lily/auto-beam-engraver.cc index 2ce8813b6d..9098cba68f 100644 --- a/lily/auto-beam-engraver.cc +++ b/lily/auto-beam-engraver.cc @@ -126,6 +126,9 @@ Auto_beam_engraver::consider_end_and_begin () begin_mom = begin_mult.to_rat (); } + /* UGH + Rational != Float + */ Real f; if (end_mom) f = fmod (time->whole_in_measure_, end_mom); diff --git a/lily/chord.cc b/lily/chord.cc index c85ea0610a..e08ce282e6 100644 --- a/lily/chord.cc +++ b/lily/chord.cc @@ -72,17 +72,12 @@ trap_i (Musical_pitch tonic, Musical_pitch p) static Array missing_triads_pitch_arr (Arrayconst* pitch_arr_p) { - Musical_pitch third (2); - Musical_pitch mthird (2, -1); - Array triads; - triads.push (third); // c e - triads.push (mthird); // d f - triads.push (mthird); // e g - triads.push (third); // f a - triads.push (third); // g b - triads.push (mthird); // a c - triads.push (mthird); // b d + + /* is the third c-e, d-f, etc. small or large? */ + int minormajor_a[] = {0, -1, -1, 0,0,-1,-1}; + for (int i=0; i < 7; i++) + triads.push (Musical_pitch( 2, minormajor_a[i])); Musical_pitch tonic = (*pitch_arr_p)[0]; Musical_pitch last = tonic; @@ -278,14 +273,11 @@ Chord::banter_str (Musical_pitch* inversion) const Array sub_arr; find_additions_and_subtractions (&add_arr, &sub_arr); + Array scale; - scale.push (Musical_pitch (0)); // c - scale.push (Musical_pitch (1)); // d - scale.push (Musical_pitch (2)); // e - scale.push (Musical_pitch (3)); // f - scale.push (Musical_pitch (4)); // g - scale.push (Musical_pitch (5)); // a - scale.push (Musical_pitch (6)); // b + for (int i=0; i < 7; i++) + scale.push (Musical_pitch (i)); + // 7 always means 7-... // scale.push (Musical_pitch (6, -1)); // b diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc index 3c17df9f43..45d73e7c37 100644 --- a/lily/dynamic-engraver.cc +++ b/lily/dynamic-engraver.cc @@ -115,7 +115,8 @@ Dynamic_engraver::do_process_requests() announce_element (Score_element_info (text_p_, dreq_l)); announce_element (Score_element_info (staff_side_p_, dreq_l)); } - else if (Span_dynamic_req *span_l = dynamic_cast (dreq_l)) + else if (Span_dynamic_req *span_l + = dynamic_cast (dreq_l)) { if (span_l->spantype_ == STOP) { diff --git a/lily/extender-engraver.cc b/lily/extender-engraver.cc index 3cf5b3455c..427faffcaa 100644 --- a/lily/extender-engraver.cc +++ b/lily/extender-engraver.cc @@ -17,41 +17,41 @@ ADD_THIS_TRANSLATOR (Extender_engraver); Extender_engraver::Extender_engraver () { extender_spanner_p_ = 0; - span_reqs_drul_[RIGHT] = span_reqs_drul_[LEFT] = 0; + req_l_ = 0; } void Extender_engraver::acknowledge_element (Score_element_info i) { - G_text_item* t = dynamic_cast (i.elem_l_); - if (!t) - return; - if (!extender_spanner_p_) - return; - if (!span_reqs_drul_[LEFT]) - return; - - if (!extender_spanner_p_->item_l_drul_[LEFT]) - extender_spanner_p_->set_textitem (LEFT, t); - else - if (span_reqs_drul_[RIGHT] && !extender_spanner_p_->item_l_drul_[RIGHT]) - extender_spanner_p_->set_textitem (RIGHT, t); + if (G_text_item* t = dynamic_cast (i.elem_l_)) + { + Rhythmic_req * rh = dynamic_cast (i.req_l_); + if (!rh) + return; + + now_lyrics_.push (Text_lyric_tuple (t, rh, now_mom () + rh->length_mom ())); + /* + UGH. What do we do in case of multiple alternatives? + */ + if (extender_spanner_p_ + && !extender_spanner_p_->spanned_drul_[RIGHT] + ) + { + extender_spanner_p_->set_textitem (RIGHT, t); + } + } } + bool Extender_engraver::do_try_music (Music* req_l) { if (Extender_req* p = dynamic_cast (req_l)) { - if (bool (extender_spanner_p_) == bool (p->spantype_ == START)) + if (req_l_) return false; - Direction d = (!extender_spanner_p_) ? LEFT : RIGHT; - if (span_reqs_drul_[d] && !span_reqs_drul_[d]->equal_b (p)) - return false; - - span_reqs_drul_[d] = p; - span_mom_drul_[d] = get_staff_info ().musical_l ()->when (); + req_l_ = p; return true; } return false; @@ -62,7 +62,7 @@ Extender_engraver::do_removal_processing () { if (extender_spanner_p_) { - span_reqs_drul_[LEFT]->warning (_ ("unterminated extender")); + req_l_->warning (_ ("unterminated extender")); extender_spanner_p_->set_bounds(RIGHT, get_staff_info ().command_l ()); } } @@ -70,23 +70,73 @@ Extender_engraver::do_removal_processing () void Extender_engraver::do_process_requests () { - if (extender_spanner_p_ || !span_reqs_drul_[LEFT]) - return; + Array stopped_texts; + Moment now = now_mom (); - extender_spanner_p_ = new Extender_spanner; + stopped_texts.clear (); + while (past_lyrics_pq_.size () + && past_lyrics_pq_.front ().end_ == now) + stopped_texts.push (past_lyrics_pq_.get ()); - announce_element (Score_element_info (extender_spanner_p_, span_reqs_drul_[LEFT])); + if (req_l_) + { + if (!stopped_texts.size ()) + { + req_l_->warning ("Nothing to connect extender to on the left. Ignoring extender request"); + return; + } + + extender_spanner_p_ = new Extender_spanner; + extender_spanner_p_->set_textitem (LEFT, stopped_texts[0].text_l_); + announce_element (Score_element_info (extender_spanner_p_, req_l_)); + } } + void Extender_engraver::do_pre_move_processing () { - if (!extender_spanner_p_ || !span_reqs_drul_[RIGHT]) - return; + for (int i=0; i < now_lyrics_.size (); i++) + { + past_lyrics_pq_.insert (now_lyrics_[i]); + } + now_lyrics_.clear (); - typeset_element (extender_spanner_p_); - - extender_spanner_p_ = 0; - span_reqs_drul_[RIGHT] = span_reqs_drul_[LEFT] = 0; + if (extender_spanner_p_) + { + typeset_element (extender_spanner_p_); + extender_spanner_p_ = 0; + } +} +void +Extender_engraver::do_post_move_processing () +{ + Moment now = now_mom (); + while (past_lyrics_pq_.size () && past_lyrics_pq_.front ().end_ < now) + past_lyrics_pq_.delmin (); + + req_l_ =0; +} + +/**********************************************************************/ +Text_lyric_tuple::Text_lyric_tuple () +{ + text_l_ =0; + req_l_ =0; + end_ = 0; } +Text_lyric_tuple::Text_lyric_tuple (G_text_item *h, Rhythmic_req*m, Moment mom) +{ + text_l_ = h; + req_l_ = m; + end_ = mom; +} + + +int +Text_lyric_tuple::time_compare (Text_lyric_tuple const&h1, + Text_lyric_tuple const &h2) +{ + return (h1.end_ - h2.end_ ).sign (); +} diff --git a/lily/extender-spanner.cc b/lily/extender-spanner.cc index 9be7106bef..4a06ed13f6 100644 --- a/lily/extender-spanner.cc +++ b/lily/extender-spanner.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998 Jan Nieuwenhuizen + (c) 1998, 1999 Jan Nieuwenhuizen */ @@ -14,7 +14,6 @@ #include "p-col.hh" #include "paper-def.hh" #include "extender-spanner.hh" -#include "text-def.hh" Extender_spanner::Extender_spanner () : Directional_spanner () diff --git a/lily/hara-kiri-line-group-engraver.cc b/lily/hara-kiri-line-group-engraver.cc index fac0a81ecf..5fc4ede7b3 100644 --- a/lily/hara-kiri-line-group-engraver.cc +++ b/lily/hara-kiri-line-group-engraver.cc @@ -3,12 +3,10 @@ source file of the GNU LilyPond music typesetter - (c) 1998 Jan Nieuwenhuizen + (c) 1998, 1999 Jan Nieuwenhuizen */ -#include "staff-sym.hh" -#include "command-request.hh" -#include "note-head.hh" +#include "rhythmic-head.hh" #include "hara-kiri-vertical-group-spanner.hh" #include "hara-kiri-line-group-engraver.hh" @@ -24,10 +22,10 @@ Hara_kiri_line_group_engraver::create_line_spanner () void Hara_kiri_line_group_engraver::typeset_element(Score_element * e) { - if (Note_head *h = dynamic_cast (e)) + if (Rhythmic_head *h = dynamic_cast (e)) { dynamic_cast (staffline_p_) - ->add_note (h); + ->add_interesting_item (h); } Line_group_engraver_group::typeset_element (e); } diff --git a/lily/hara-kiri-vertical-group-spanner.cc b/lily/hara-kiri-vertical-group-spanner.cc index c0628ad21a..fa95b295cc 100644 --- a/lily/hara-kiri-vertical-group-spanner.cc +++ b/lily/hara-kiri-vertical-group-spanner.cc @@ -4,31 +4,29 @@ source file of the GNU LilyPond music typesetter - (c) 1998 Jan Nieuwenhuizen + (c) 1998,1999 Jan Nieuwenhuizen + Han-Wen Nienhuys */ #include "hara-kiri-vertical-group-spanner.hh" #include "debug.hh" -#include "note-head.hh" -#include "bar.hh" - - +#include "item.hh" Hara_kiri_vertical_group_spanner::Hara_kiri_vertical_group_spanner() { } void -Hara_kiri_vertical_group_spanner::add_note (Note_head* n) +Hara_kiri_vertical_group_spanner::add_interesting_item (Item* n) { add_dependency (n); - head_l_arr_.push (n); + interesting_items_.push (n); } void Hara_kiri_vertical_group_spanner::do_post_processing () { - if (!head_l_arr_.empty ()) + if (!interesting_items_.empty ()) return; Link_array childs = get_children (); @@ -43,9 +41,8 @@ Hara_kiri_vertical_group_spanner::do_post_processing () void Hara_kiri_vertical_group_spanner::do_substitute_dependency (Score_element*o, Score_element*n) { - if (dynamic_cast (o)) - head_l_arr_.substitute (dynamic_cast (o), - (n)? dynamic_cast (n) : 0); + if (Item *it = dynamic_cast (o)) + interesting_items_.substitute (it, dynamic_cast (n)); } diff --git a/lily/include/atom.hh b/lily/include/atom.hh index b2e94f1359..52d17f88f2 100644 --- a/lily/include/atom.hh +++ b/lily/include/atom.hh @@ -15,7 +15,8 @@ #include "lily-proto.hh" #include "lily-guile.hh" -#if 0 +#ifdef ATOM_SMOB + /// a symbol which can be translated, and freely copied class Atom { static long smob_tag_; @@ -23,10 +24,10 @@ class Atom { static SCM smob_mark (SCM); static scm_sizet smob_free (SCM); static int smob_display (SCM, SCM, scm_print_state*); - Atom (SCM s); SCM make_smob () const; public: Offset off_; + Atom (SCM s); static SCM make_atom (SCM outputfunc); SCM copy_self () const; diff --git a/lily/include/extender-engraver.hh b/lily/include/extender-engraver.hh index c49043a8c2..1b6335bb51 100644 --- a/lily/include/extender-engraver.hh +++ b/lily/include/extender-engraver.hh @@ -12,13 +12,45 @@ #include "engraver.hh" #include "drul-array.hh" #include "extender-spanner.hh" +#include "pqueue.hh" + +struct Text_lyric_tuple { + Rhythmic_req *req_l_ ; + G_text_item *text_l_; + Moment end_; + + Text_lyric_tuple (); + Text_lyric_tuple (G_text_item*, Rhythmic_req*, Moment); + static int time_compare (Text_lyric_tuple const &, Text_lyric_tuple const &); +}; + +inline int compare (Text_lyric_tuple const &a, Text_lyric_tuple const &b) +{ + return Text_lyric_tuple::time_compare (a,b); +} + + + /** - Generate an extender. - Should make an Extender_spanner that typesets a nice extender line. - */ + Generate an extender. Should make an Extender_spanner that typesets + a nice extender line. + + We remember all G_text_items that come across, and store their + termination times. When we get a request, we create the spanner, and + attach the left point to the finished lyrics, and the right point to + any lyrics we receive by then. +*/ class Extender_engraver : public Engraver { + PQueue past_lyrics_pq_; + Array now_lyrics_; + Array stopped_lyrics_; + + Extender_req* req_l_; + Extender_spanner* extender_spanner_p_; + + public: Extender_engraver (); VIRTUAL_COPY_CONS (Translator); @@ -29,11 +61,9 @@ protected: virtual void do_process_requests(); virtual bool do_try_music (Music*); virtual void do_pre_move_processing(); - + virtual void do_post_move_processing (); private: - Drul_array span_reqs_drul_; - Drul_array span_mom_drul_; - Extender_spanner* extender_spanner_p_; + }; #endif // EXTENDER_ENGRAVER_HH diff --git a/lily/include/extender-spanner.hh b/lily/include/extender-spanner.hh index a69d10f3e8..ca061a2fc9 100644 --- a/lily/include/extender-spanner.hh +++ b/lily/include/extender-spanner.hh @@ -1,7 +1,7 @@ /* extender-spanner.hh -- part of GNU LilyPond - (c) 1998 Jan Nieuwenhuizen + (c) 1998, 1999 Jan Nieuwenhuizen */ #ifndef EXTENDER_SPANNER_HH @@ -27,7 +27,6 @@ extend beond, lasting the whole duration of the melissima (as in MUP, urg). */ - class Extender_spanner : public Directional_spanner { public: diff --git a/lily/include/hara-kiri-line-group-engraver.hh b/lily/include/hara-kiri-line-group-engraver.hh index f894439e9d..43439cadcf 100644 --- a/lily/include/hara-kiri-line-group-engraver.hh +++ b/lily/include/hara-kiri-line-group-engraver.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998 Jan Nieuwenhuizen + (c) 1998, 1999 Jan Nieuwenhuizen */ @@ -13,8 +13,15 @@ #include "line-group-group-engraver.hh" /** - Just as Line_group_engraver, but won't disgrace Lily by typesetting - an empty line (for orchestral scores). + Just as Line_group_engraver, Find interesting items for + Hara_kiri_line_group_engraver. + + + + @see + Hara_kiri_vertical_group_spanner + + */ class Hara_kiri_line_group_engraver : public Line_group_engraver_group { diff --git a/lily/include/hara-kiri-vertical-group-spanner.hh b/lily/include/hara-kiri-vertical-group-spanner.hh index 15ad5d0405..33bf0a4f6f 100644 --- a/lily/include/hara-kiri-vertical-group-spanner.hh +++ b/lily/include/hara-kiri-vertical-group-spanner.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998 Jan Nieuwenhuizen + (c) 1998, 1999 Jan Nieuwenhuizen */ @@ -13,24 +13,23 @@ #include "vertical-group-spanner.hh" /** - As Vertical_group_spanner, but keeps dependencies to notes. - */ + As Vertical_group_spanner, but keep track of interesting items. If + we don't contain any interesting items after linebreaking, then + gracefully commit suicide. Objective: don't disgrace Lily by + typesetting empty lines in orchestral scores. */ class Hara_kiri_vertical_group_spanner : public Vertical_group_spanner { public: - - Hara_kiri_vertical_group_spanner (); virtual void do_post_processing (); - void add_note (Note_head* n); - + void add_interesting_item (Item* n); protected: VIRTUAL_COPY_CONS(Score_element); virtual void do_substitute_dependency (Score_element*, Score_element*); virtual void do_print ()const; - Link_array head_l_arr_; + Link_array interesting_items_; }; diff --git a/lily/include/lyric-engraver.hh b/lily/include/lyric-engraver.hh index 5cae730ed9..1736d593dd 100644 --- a/lily/include/lyric-engraver.hh +++ b/lily/include/lyric-engraver.hh @@ -14,20 +14,24 @@ #include "engraver.hh" #include "array.hh" +/** + Generate texts for lyric syllables. We only do one lyric at a time. + Multiple copies of this engraver should be used to do multiple voices. + */ class Lyric_engraver : public Engraver { protected: virtual void do_pre_move_processing(); virtual bool do_try_music (Music*); virtual void do_process_requests(); - + virtual void do_post_move_processing (); public: Lyric_engraver (); VIRTUAL_COPY_CONS (Translator); private: - Link_array lyric_req_l_arr_; - Link_array text_p_arr_; + Lyric_req * req_l_; + G_text_item* text_p_; }; diff --git a/lily/include/molecule.hh b/lily/include/molecule.hh index 461993e482..0a4bae3c29 100644 --- a/lily/include/molecule.hh +++ b/lily/include/molecule.hh @@ -19,8 +19,12 @@ /** a group of individually translated symbols. You can add molecules to the top, to the right, etc. */ class Molecule { +#ifdef ATOM_SMOB + SCM atom_list_; +#else // Protected_scm atom_list_; // change to List? Cons *atom_list_; +#endif friend class Paper_outputter; public: Box dim_; diff --git a/lily/include/musical-request.hh b/lily/include/musical-request.hh index 9905362080..28d949b497 100644 --- a/lily/include/musical-request.hh +++ b/lily/include/musical-request.hh @@ -156,7 +156,7 @@ public: }; /// an extender line -class Extender_req : public Musical_span_req { +class Extender_req : public Request { public: REQUESTMETHODS(Extender_req); Extender_req (); diff --git a/lily/include/my-lily-parser.hh b/lily/include/my-lily-parser.hh index ddac529ffb..5207978087 100644 --- a/lily/include/my-lily-parser.hh +++ b/lily/include/my-lily-parser.hh @@ -19,6 +19,11 @@ #include "array.hh" #include "input.hh" +/** + State for the parser. Do not ever add any variables to parse + musical content here. We still have to remove default_duration_. + + */ class My_lily_parser { public: @@ -31,18 +36,17 @@ public: public: Duration default_duration_; - Extender_req* extender_req; Scope *default_header_p_; - bool first_b_; - - Link_array pre_reqs, post_reqs; int fatal_error_i_; Sources * source_l_; int error_level_i_; bool init_parse_b_; My_lily_lexer * lexer_p_; - + bool ignore_version_b_; + + + Input here_input() const; void remember_spot(); Input pop_spot(); @@ -52,24 +56,17 @@ public: void do_yyparse(); void parser_error (String); - Link_array* get_parens_request (int t); - void set_debug(); void set_yydebug (bool); - bool ignore_version_b_; - private: char const* here_ch_C() const; Array define_spot_array_; String init_str_; - void add_requests (Simultaneous_music*v); - Simultaneous_music * get_note_element (Note_req * ,Duration *); Simultaneous_music * get_chord (Musical_pitch, Array*, Array*, Musical_pitch*, Duration); Simultaneous_music* get_rest_element (String, Duration *); Simultaneous_music* get_word_element (String, Duration*); - Melodic_req* get_melodic_req (Melodic_req* melodic, int quotes); String notename_str (Melodic_req* melodic); void set_last_duration (Duration const *); friend int yyparse (void*); diff --git a/lily/item.cc b/lily/item.cc index d5a9b7959d..fe15e3673a 100644 --- a/lily/item.cc +++ b/lily/item.cc @@ -143,9 +143,9 @@ Item* Item::find_prebroken_piece (Direction breakstatus) const { if (!breakstatus) - return (Item *)(this); // ugh + return (Item *) (this); // ugh else - return dynamic_cast( broken_to_drul_[breakstatus]); + return dynamic_cast (broken_to_drul_[breakstatus]); } void diff --git a/lily/lookup.cc b/lily/lookup.cc index dcbafb3975..f873b92097 100644 --- a/lily/lookup.cc +++ b/lily/lookup.cc @@ -394,6 +394,9 @@ static Dict_initialiser cmr_init[] = { {0,0} }; +// Magic numbers from Knuths plain.tex: +static Real mag_steps[] = {1, 1, 1.200, 1.440, 1.7280, 2.074, 2.488}; + static Dictionary cmr_dict (cmr_init); Molecule @@ -401,13 +404,18 @@ Lookup::text (String style, String text) const { Molecule m; - + int font_mag = 1; Real font_h = paper_l_->get_var ("font_normal"); if (paper_l_->scope_p_->elem_b ("font_" + style)) { font_h = paper_l_->get_var ("font_" + style); } + if (paper_l_->scope_p_->elem_b ("magnification_" + style)) + { + font_mag = (int)paper_l_->get_var ("magnification_" + style); + } + if (cmr_dict.elem_b (style)) { style = String (cmr_dict [style]) + to_str ((int)font_h); // ugh @@ -432,6 +440,13 @@ Lookup::text (String style, String text) const } } + if (font_mag > 1 && font_mag < 7 ) + { + style = style + String(" scaled \\magstep ") + to_str (font_mag); + w *= mag_steps[font_mag]; + ydims *= mag_steps[font_mag]; + } + DOUT << "\n" << to_str (w) << "\n"; m.dim_.x () = Interval (0, w); m.dim_.y () = ydims; diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc index c0cc8a25fb..fa5c1035d1 100644 --- a/lily/lyric-engraver.cc +++ b/lily/lyric-engraver.cc @@ -18,6 +18,8 @@ ADD_THIS_TRANSLATOR (Lyric_engraver); Lyric_engraver::Lyric_engraver() { + text_p_ =0; + req_l_ =0; } bool @@ -25,7 +27,9 @@ Lyric_engraver::do_try_music (Music*r) { if (Lyric_req* l = dynamic_cast (r)) { - lyric_req_l_arr_.push (l); + if (req_l_) + return false; + req_l_ =l; return true; } return false; @@ -34,39 +38,32 @@ Lyric_engraver::do_try_music (Music*r) void Lyric_engraver::do_process_requests() { - if (text_p_arr_.size ()) - return; - - for (int i=0; i < lyric_req_l_arr_.size (); i++) + if (req_l_) { - Lyric_req* request_l = lyric_req_l_arr_[i]; - G_text_item* item_p = new G_text_item; - item_p->text_str_ = request_l->text_str_; + text_p_= new G_text_item; + text_p_->text_str_ = req_l_->text_str_; Scalar style = get_property ("textstyle", 0); if (style.length_i ()) - item_p->style_str_ = style; - if (i) - { - Real dy = paper ()->lookup_l (0)-> text - (item_p->style_str_, String ("Cg")).dim_. y ().length (); - dy *= 1.1; - item_p->translate_axis (-i * dy, Y_AXIS); - } + text_p_->style_str_ = style; - text_p_arr_.push (item_p); - announce_element (Score_element_info (item_p, request_l)); + announce_element (Score_element_info (text_p_, req_l_)); } } void Lyric_engraver::do_pre_move_processing() { - for (int i=0; i < text_p_arr_.size (); i++) + if (text_p_) { - typeset_element (text_p_arr_[i]); + typeset_element (text_p_); + text_p_ =0; } - text_p_arr_.clear (); - lyric_req_l_arr_.clear (); +} + +void +Lyric_engraver::do_post_move_processing () +{ + req_l_ =0; } diff --git a/lily/multi-measure-rest-engraver.cc b/lily/multi-measure-rest-engraver.cc index f3a39170c9..132f7f2b9b 100644 --- a/lily/multi-measure-rest-engraver.cc +++ b/lily/multi-measure-rest-engraver.cc @@ -11,11 +11,6 @@ #include "multi-measure-rest-engraver.hh" #include "score-column.hh" #include "time-description.hh" -//#include "paper-score.hh" -//#include "p-score.hh" -//#include "paper-def.hh" -//#include "main.hh" -//#include "global-translator.hh" #include "bar.hh" diff --git a/lily/my-lily-parser.cc b/lily/my-lily-parser.cc index 6b43a89e37..207b755b47 100644 --- a/lily/my-lily-parser.cc +++ b/lily/my-lily-parser.cc @@ -29,7 +29,7 @@ My_lily_parser::My_lily_parser (Sources * source_l) lexer_p_ = 0; default_duration_.durlog_i_ = 2; error_level_i_ = 0; - extender_req = 0; + fatal_error_i_ = 0; default_header_p_ =0; } @@ -101,7 +101,7 @@ My_lily_parser::set_last_duration (Duration const *d) default_duration_ = *d; } - +// junk me Simultaneous_music* My_lily_parser::get_word_element (String s, Duration * duration_p) { @@ -118,7 +118,7 @@ My_lily_parser::get_word_element (String s, Duration * duration_p) return velt_p; } - +// junk me Simultaneous_music * My_lily_parser::get_rest_element (String s, Duration * duration_p) { @@ -146,6 +146,7 @@ My_lily_parser::get_rest_element (String s, Duration * duration_p) return velt_p; } +// junk me Simultaneous_music * My_lily_parser::get_chord (Musical_pitch tonic, Array* add_arr_p, Array* sub_arr_p, Musical_pitch* inversion_p, Duration d) { @@ -170,6 +171,7 @@ My_lily_parser::get_chord (Musical_pitch tonic, Array* add_arr_p, return v; } +// junk me Simultaneous_music * My_lily_parser::get_note_element (Note_req *rq, Duration * duration_p) { @@ -185,90 +187,6 @@ My_lily_parser::get_note_element (Note_req *rq, Duration * duration_p) } -/* - UGH. - */ -Link_array* -My_lily_parser::get_parens_request (int t) -{ - Link_array& reqs = *new Link_array; - switch (t) - { - case '~': - reqs.push (new Tie_req); - break; - - case '[': - case ']': - { - reqs.push (new Beam_req); - } - break; - - case '>': - case '!': - case '<': - reqs.push (new Span_dynamic_req); - break; - - case ')': - case '(': - { - reqs.push (new Slur_req); - } - break; - default: - assert (false); - break; - } - - switch (t) - { - case '<': - case '>': - case '(': - case '[': - dynamic_cast (reqs[0])->spantype_ = START; - break; - - case '!': - case ')': - case ']': - dynamic_cast (reqs[0])->spantype_ = STOP; - break; - - default: - break; - } - - for (int i = 0; i < reqs.size (); i++) - if (dynamic_cast (reqs[i])) - { - Span_dynamic_req* s_l= dynamic_cast (reqs[i]); - s_l->dynamic_dir_ = (t == '<') ? UP:DOWN; - } - - // ugh? don't we do this in the parser too? - reqs[0]->set_spot (here_input()); - return &reqs; -} - -void -My_lily_parser::add_requests (Simultaneous_music*v) -{ - for (int i = 0; i < pre_reqs.size(); i++) - { - v->add_music (pre_reqs[i]); - } - pre_reqs.clear(); - for (int i = 0; i add_music (post_reqs[i]); - } - - post_reqs.clear(); -} - Input My_lily_parser::pop_spot() { diff --git a/lily/separating-group-spanner.cc b/lily/separating-group-spanner.cc index 41c2c515e6..723c24621c 100644 --- a/lily/separating-group-spanner.cc +++ b/lily/separating-group-spanner.cc @@ -56,8 +56,6 @@ Separating_group_spanner::add_spacing_unit (Single_malt_grouping_item*i) add_dependency (i); } - - void Separating_group_spanner::do_substitute_dependency (Score_element*o, Score_element*n) { diff --git a/lily/tie-engraver.cc b/lily/tie-engraver.cc index 26275ce12b..1b544269a2 100644 --- a/lily/tie-engraver.cc +++ b/lily/tie-engraver.cc @@ -36,6 +36,8 @@ Tie_engraver::acknowledge_element (Score_element_info i) if (Note_head *nh = dynamic_cast (i.elem_l_)) { Note_req * m = dynamic_cast (i.req_l_); + if (!m) + return; now_heads_.push (CHead_melodic_tuple (nh, m, now_mom()+ m->length_mom ())); } } @@ -52,7 +54,6 @@ Tie_engraver::do_process_requests () while (past_notes_pq_.size () && past_notes_pq_.front ().end_ == now) stopped_heads_.push (past_notes_pq_.get ()); - } } diff --git a/lily/translator-group.cc b/lily/translator-group.cc index a42db078f8..2e6c6ee316 100644 --- a/lily/translator-group.cc +++ b/lily/translator-group.cc @@ -401,7 +401,8 @@ Translator_group::do_add_processing () } Scalar -Translator_group::get_property (String id, Translator_group **where_l) const +Translator_group::get_property (String id, + Translator_group **where_l) const { if (properties_dict_.elem_b (id)) { diff --git a/ly/paper20.ly b/ly/paper20.ly index 61f5951ed9..f26068d0e6 100644 --- a/ly/paper20.ly +++ b/ly/paper20.ly @@ -19,7 +19,9 @@ paper_twenty = \paper { "font_number-1" = 8.; %"font_number" = 10.; "font_number+1" = 12.; - + + % Ugh + magnification_dynamic = 2.; % ugh see table20 for sizes quartwidth = 6.61\pt; diff --git a/stepmake/NEWS b/stepmake/NEWS index c2935e25ab..6fc5bf84a7 100644 --- a/stepmake/NEWS +++ b/stepmake/NEWS @@ -1,3 +1,9 @@ +pl 69 + - package_depth detection fix + +pl 68 + - support for install-libraries + pl 66 - check for tbl and gmake diff --git a/stepmake/VERSION b/stepmake/VERSION index 397e3cf00f..e92135e2ec 100644 --- a/stepmake/VERSION +++ b/stepmake/VERSION @@ -1,7 +1,7 @@ PACKAGE_NAME=StepMake MAJOR_VERSION=0 MINOR_VERSION=1 -PATCH_LEVEL=67 +PATCH_LEVEL=69 MY_PATCH_LEVEL= # use the above to send patches, always empty for released version: diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4 index 0e035cad95..6dceec035c 100644 --- a/stepmake/aclocal.m4 +++ b/stepmake/aclocal.m4 @@ -1,7 +1,3 @@ -dnl WARNING WARNING WARNING WARNING -dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4 -dnl WARNING WARNING WARNING WARNING -dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4 dnl aclocal.m4 -*-shell-script-*- dnl StepMake subroutines for configure.in @@ -167,18 +163,13 @@ AC_DEFUN(AC_STEPMAKE_GUILE, [ # to force new check iso reading from cache # gh_scm2doubles,gh_doubles2scm are new in 1.3 - AC_CHECK_LIB(guile, gh_scm2doubles, \ - LIBS="-lguile $LIBS"; AC_DEFINE(HAVE_LIBGUILE), \ - AC_CHECK_LIB(readline, readline) \ - AC_CHECK_LIB(dl, dlopen) \ - AC_CHECK_LIB(socket, socket)\ - AC_CHECK_LIB(termcap,tgetent)\ - AC_CHECK_LIB(m, fabs)\ - AC_CHECK_LIB(guile, gh_doubles2scm)\ + GUILE_FLAGS + AC_CHECK_LIB(guile, gh_scm2doubles, + LIBS="`echo $GUILE_LDFLAGS | sed -e 's/-L[[[/-_a-zA-Z0-9]]]\+ //g'` $LIBS"; + AC_DEFINE(HAVE_LIBGUILE), , $GUILE_LDFLAGS dnl ) - if test "$ac_cv_lib_guile_gh_scm2doubles" != yes -a \ - "$ac_cv_lib_guile_gh_doubles2scm" != yes ; then - AC_STEPMAKE_WARN(You should install guile 1.3 or newer) + if test "$ac_cv_lib_guile_gh_scm2doubles" != yes ; then + AC_STEPMAKE_WARN(You should install guile 1.3 or newer) fi ]) @@ -240,7 +231,12 @@ AC_DEFUN(AC_STEPMAKE_INIT, [ AC_DEFINE_UNQUOTED(PACKAGE, "${PACKAGE_NAME}") AC_DEFINE_UNQUOTED(TOPLEVEL_VERSION, "${FULL_VERSION}") - package_depth=`dirname $cache_file` + if test "$package_depth" = "" ; then + package_depth="." + else + package_depth="../$package_depth" + fi + export package_depth AC_SUBST(package_depth) AUTOGENERATE="This file was automatically generated by configure" @@ -985,3 +981,36 @@ main () AC_SUBST(GTK___LIBS) ]) +dnl GUILE_FLAGS --- set flags for compiling and linking with Guile +dnl +dnl This macro runs the `guile-config' script, installed with Guile, +dnl to find out where Guile's header files and libraries are +dnl installed. It sets two variables, marked for substitution, as +dnl by AC_SUBST. +dnl +dnl GUILE_CFLAGS --- flags to pass to a C or C++ compiler to build +dnl code that uses Guile header files. This is almost +dnl always just a -I flag. +dnl +dnl GUILE_LDFLAGS --- flags to pass to the linker to link a +dnl program against Guile. This includes `-lguile' for +dnl the Guile library itself, any libraries that Guile +dnl itself requires (like -lqthreads), and so on. It may +dnl also include a -L flag to tell the compiler where to +dnl find the libraries. + +AC_DEFUN([GUILE_FLAGS],[ +## The GUILE_FLAGS macro. + ## First, let's just see if we can find Guile at all. + AC_MSG_CHECKING(for Guile) + guile-config link > /dev/null || { + echo "configure: cannot find guile-config; is Guile installed?" 1>&2 + exit 1 + } + GUILE_CFLAGS="`guile-config compile`" + GUILE_LDFLAGS="`guile-config link`" + AC_SUBST(GUILE_CFLAGS) + AC_SUBST(GUILE_LDFLAGS) + AC_MSG_RESULT(yes) +]) + diff --git a/stepmake/stepmake/install-library-rules.make b/stepmake/stepmake/install-library-rules.make new file mode 100644 index 0000000000..1bb8bf6d7f --- /dev/null +++ b/stepmake/stepmake/install-library-rules.make @@ -0,0 +1 @@ +# empty diff --git a/stepmake/stepmake/install-library-targets.make b/stepmake/stepmake/install-library-targets.make new file mode 100644 index 0000000000..cb3915ea42 --- /dev/null +++ b/stepmake/stepmake/install-library-targets.make @@ -0,0 +1,22 @@ + +localinstall: $(LIBRARY) +ifneq ($(strip $(INSTALL_HEADERS)),) + $(INSTALL) -d $(includedir) + $(INSTALL) $(INSTALL_HEADERS) $(includedir) +endif +ifeq ($(LIB_SUFFIX),.so) + $(INSTALL) -d $(libdir) + $(INSTALL) $(LIBRARY) $(libdir)/$(INSTALL_LIBRARY).$(VERSION) + ln -s $(LIB_PREFIX)intl$(LIB_SUFFIX).$(VERSION) $(libdir)/$(LIB_PREFIX)intl$(LIB_SUFFIX).$(MAJOR_VERSION) + ln -s $(LIB_PREFIX)intl$(LIB_SUFFIX).$(VERSION) $(libdir)/$(LIB_PREFIX)intl$(LIB_SUFFIX) +else + $(INSTALL) -d $(libdir) + $(INSTALL) $(LIBRARY) $(libdir)/$(INSTALL_LIBRARY) +endif + +localuninstall: +ifneq ($(strip $(INSTALL_HEADERS)),) + rm -f $(addprefix $(includedir)/, $(INSTALL_HEADERS)) +endif + rm -f $(libdir)/$(INSTALL_LIBRARY) + diff --git a/stepmake/stepmake/install-library-vars.make b/stepmake/stepmake/install-library-vars.make new file mode 100644 index 0000000000..1bb8bf6d7f --- /dev/null +++ b/stepmake/stepmake/install-library-vars.make @@ -0,0 +1 @@ +# empty -- 2.39.5