From f74c28fe4a8a1a8b7bf4cf97f5df763ad35c590c Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sat, 22 Sep 2001 14:13:06 +0200 Subject: [PATCH] release: 1.5.12 =========== * Add -p flag to package-diff.py's diff invocation, to show changed function. * Add configure checks for python headers. * Make midi module. 1.5.11.h --- CHANGES | 23 +++++++++--------- VERSION | 4 ++-- config.hh.in | 3 +++ configure | 42 +++++++++++++++++++++++++++++++++ configure.in | 2 +- lily/tie-engraver.cc | 2 +- make/out/lilypond.lsm | 8 +++---- make/out/lilypond.mandrake.spec | 2 +- make/out/lilypond.redhat.spec | 4 ++-- make/out/lilypond.suse.spec | 4 ++-- modules/midi.c | 5 ++++ 11 files changed, 74 insertions(+), 25 deletions(-) diff --git a/CHANGES b/CHANGES index cec66bd7e5..03b0f11b8b 100644 --- a/CHANGES +++ b/CHANGES @@ -1,25 +1,24 @@ -1.5.11.hwn1 +1.5.11.jcn1 =========== -* Allow breaks at measures starting with grace notes. - -* Bugfix: don't give up when there is one entirely unspaceable -measure/line. +* Add -p flag to package-diff.py's diff invocation, to show changed function. -* Some GH deprecation. +* Add configure checks for python headers. -* Midi module: add timestamps. +* Make midi module. -1.5.11.jcn2 +1.5.11.hwn1 =========== -* guile > 1.4 fixes. +* Allow breaks at measures starting with grace notes. -* Add -p flag to package-diff.py's diff invocation, to show changed function. +* Bugfix: don't give up when there is one entirely unspaceable +measure/line. -* Add configure checks for python headers. +* Midi module: many bugfixes. + +* midi2ly python blurble. -* Make midi module. 1.5.11 ====== diff --git a/VERSION b/VERSION index 047ca1547f..cdb7a38a66 100644 --- a/VERSION +++ b/VERSION @@ -1,8 +1,8 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=5 -PATCH_LEVEL=11 -MY_PATCH_LEVEL=jcn3 +PATCH_LEVEL=12 +MY_PATCH_LEVEL= # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/config.hh.in b/config.hh.in index 388eea7e3d..038a46c661 100644 --- a/config.hh.in +++ b/config.hh.in @@ -44,6 +44,9 @@ /* define if you have python2/Python.h header */ #define HAVE_PYTHON2_PYTHON_H 0 +/* define if you have python1.5/Python.h */ +#define HAVE_PYTHON1_5_PYTHON_H 0 + /* define if you have python/Python.h header */ #define HAVE_PYTHON_PYTHON_H 0 diff --git a/configure b/configure index abca10383a..93015c4e63 100755 --- a/configure +++ b/configure @@ -3481,6 +3481,48 @@ else fi +for ac_hdr in python2/Python.h python/Python.h python1.5/Python.h Python.h +do +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:3489: checking for $ac_hdr" >&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:3499: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" +fi +rm -f conftest* +fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >> confdefs.h <&6 +fi +done + + + trap '' 1 2 15 cat > confcache <<\EOF diff --git a/configure.in b/configure.in index 1cca0ffe08..636d386f35 100644 --- a/configure.in +++ b/configure.in @@ -49,7 +49,7 @@ AC_STEPMAKE_MAKEINFO AC_PATH_PROG(PERL, perl, error) -AC_HAVE_HEADERS(python2/Python.h python/Python.h Python.h) +AC_HAVE_HEADERS(python2/Python.h python/Python.h python1.5/Python.h Python.h) AC_STEPMAKE_END diff --git a/lily/tie-engraver.cc b/lily/tie-engraver.cc index e5ee0362c8..d96acb32e9 100644 --- a/lily/tie-engraver.cc +++ b/lily/tie-engraver.cc @@ -164,7 +164,7 @@ Tie_engraver::create_grobs () if (!i) return; - SCM pair = scm_list_n_ref (head_list, gh_int2scm (i/2)); + SCM pair = scm_list_ref (head_list, gh_int2scm (i/2)); Spanner * p = new Spanner (basic); diff --git a/make/out/lilypond.lsm b/make/out/lilypond.lsm index b33dd83218..575def8426 100644 --- a/make/out/lilypond.lsm +++ b/make/out/lilypond.lsm @@ -1,15 +1,15 @@ Begin3 Title: LilyPond -Version: 1.5.11 -Entered-date: 21SEP01 +Version: 1.5.12 +Entered-date: 23SEP01 Description: @BLURB@ Keywords: music notation typesetting midi fonts engraving Author: hanwen@cs.uu.nl (Han-Wen Nienhuys) janneke@gnu.org (Jan Nieuwenhuizen) Maintained-by: hanwen@stack.nl (Han-Wen Nienhuys) Primary-site: sunsite.unc.edu /pub/Linux/apps/sound/convert - 1000k lilypond-1.5.11.tar.gz + 1000k lilypond-1.5.12.tar.gz Original-site: ftp.cs.uu.nl /pub/GNU/LilyPond/development/ - 1000k lilypond-1.5.11.tar.gz + 1000k lilypond-1.5.12.tar.gz Copying-policy: GPL End diff --git a/make/out/lilypond.mandrake.spec b/make/out/lilypond.mandrake.spec index 31be80813d..bebfda0000 100644 --- a/make/out/lilypond.mandrake.spec +++ b/make/out/lilypond.mandrake.spec @@ -1,5 +1,5 @@ %define name lilypond -%define version 1.5.11 +%define version 1.5.12 %define release 1mdk Name: %{name} diff --git a/make/out/lilypond.redhat.spec b/make/out/lilypond.redhat.spec index 48b12bd8cf..3a55369af8 100644 --- a/make/out/lilypond.redhat.spec +++ b/make/out/lilypond.redhat.spec @@ -1,11 +1,11 @@ %define info yes Name: lilypond -Version: 1.5.11 +Version: 1.5.12 Release: 1 License: GPL Group: Applications/Publishing -Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.5.11.tar.gz +Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.5.12.tar.gz Summary: Create and print music notation URL: http://www.lilypond.org/ BuildRoot: /tmp/lilypond-install diff --git a/make/out/lilypond.suse.spec b/make/out/lilypond.suse.spec index 631e774b87..6dda6f6443 100644 --- a/make/out/lilypond.suse.spec +++ b/make/out/lilypond.suse.spec @@ -14,11 +14,11 @@ Distribution: SuSE Linux 7.0 (i386) Name: lilypond -Version: 1.5.11 +Version: 1.5.12 Release: 2 Copyright: GPL Group: Applications/Publishing -Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.5.11.tar.gz +Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.5.12.tar.gz # music notation software for.. ? Summary: A program for printing sheet music. URL: http://www.lilypond.org/ diff --git a/modules/midi.c b/modules/midi.c index 545d1d0a42..747ed1b5ab 100644 --- a/modules/midi.c +++ b/modules/midi.c @@ -23,6 +23,8 @@ midi.parse (s) /* urg */ #if HAVE_PYTHON2_PYTHON_H #include +#elif HAVE_PYTHON1_5_PYTHON_H +#include #elif HAVE_PYTHON_PYTHON_H #define assert(x) #include @@ -274,9 +276,12 @@ midi_parse_track (unsigned char **track, unsigned char *track_end) debug_print ("%s", "\n"); track_size = track_end - *track; +#if 0 /* need this for direct midi.parse_track (s) on midi file */ if (strcmp (*track, "MTrk")) *track = memmem (*track, track_size - 1, "MTrk", 4); +#endif + debug_print ("%s", "\n"); assert (!strcmp (*track, "MTrk")); *track += 4; -- 2.39.2