From af51aed77121351f6f91900378578a842772f6e6 Mon Sep 17 00:00:00 2001 From: fred Date: Tue, 26 Mar 2002 23:10:10 +0000 Subject: [PATCH] lilypond-1.3.39 --- CHANGES | 71 +++++++++++++++++++++++++++++++++++++++++- VERSION | 2 +- configure | 72 +++++++++++++++++++++++++++---------------- ly/chord-modifiers.ly | 30 ++++++++++-------- 4 files changed, 133 insertions(+), 42 deletions(-) diff --git a/CHANGES b/CHANGES index 945a94499d..ef5ace9782 100644 --- a/CHANGES +++ b/CHANGES @@ -1,10 +1,77 @@ +1.3.38.hwn2 +=========== + +* General cleanups of My_lily_parser. + +* Start of a Chord_tremolo_iterator for the `\repeat 4 "tremolo"' +syntax. + +* Moved Score_element::do_space_processing out of the dependency +mechanism. + +* Use Scheme for notename tables. Removed uppercase letters for low +octave notes. Removed Notename_table. + +* Fixed core dump with declared "\key ; " + +* Extra robustness warning for Side_position_interface::aligned_on_self () + +* Extra robustness: make sure that first and last columns are breakable. + +1.3.38.jcn4 +=========== + +* stepmake/aclocal.m4: Added support for cross-compiling with guile. + +* buildscripts/make-cygwin-cross.sh: A try at dropping cygwin1.dll + dependency by using mingw. Compiling guile is too much to ask + for mingw, though. Also: + - rename python scripts .py (request from Alain) + - install native packages under their own, separate root. (Alain) + +* lily.scm: Don't use regex module when running on +Windows. (Shamus) + +* lily/staff-margin-engraver.cc (acknowledge_element): If +possible, hang y-axis of margin script to span-bar. This fixes +vertical placement of margin scripts attached to staff groups. + +* help2man-rules.make: Fixes for generating manpages by copying +and for building using --scrdir. + +* stepmake/stepmake/generic-targets.make: Preserve date stamp of +config.h, version.hh files file when copying. + +* buildscripts/make-cygwin-cross.sh: made number of fixes: + - add `Cygnus/' prefix to directories in .zip-file too. + - package guile too. + - don't link to cygwin1.dll + +* stepmake/stepmake/install-targets.make: bugfix, don't fail if directory + is not emty when uninstalling. + +* stepmake/stepmake/generic-targets.make: added man target. + +* buildscripts/make-cygwin-cross.sh: new script for cross-building cygwin + development tools and lilypond executable. + +* Documentation/ntweb/lilypond-manpages.patch: provide pre-built + manpages, so that make doesn't fail on help2man trying to execute + a GNU/windows executable. + +* Documentation/ntweb/guile-1.3.4-gnu-windows.patch: new patch for + guile-1.3.4. + +* flower/libc-extension.cc (memmem): cygwin compile fix. + 1.3.38 ====== 1.3.37.hwn1 =========== -* (generic-property.scm) added tieDash +* (generic-property.scm) added \property tieDash to set dashing on +ties. * Removed ly_eval_str(), we should use scm_eval (Scm_object). @@ -210,6 +277,8 @@ don't run into the text anymore. This breaks the fine looks of all dynamics, again :-) + + 1.3.33 ====== diff --git a/VERSION b/VERSION index 1f0bace1bd..0a4d16c579 100644 --- a/VERSION +++ b/VERSION @@ -1,7 +1,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=3 -PATCH_LEVEL=38 +PATCH_LEVEL=39 MY_PATCH_LEVEL= # use the above to send patches: MY_PATCH_LEVEL is always empty for a diff --git a/configure b/configure index d1f5a831c0..5721504ad7 100755 --- a/configure +++ b/configure @@ -2660,31 +2660,49 @@ echo "configure:2645: checking for TeX TFM directory" >&5 + ## First, let's just see if we can find Guile at all. + echo $ac_n "checking "for guile-config"""... $ac_c" 1>&6 +echo "configure:2666: checking "for guile-config"" >&5 + for guile_config in guile-config $build-guile-config; do + echo "$ac_t"""$guile_config"" 1>&6 + if ! $guile_config --version > /dev/null 2>&1 ; then + echo "configure: warning: "cannot execute $guile_config"" 1>&2 + echo $ac_n "checking "if we are cross compiling"""... $ac_c" 1>&6 +echo "configure:2672: checking "if we are cross compiling"" >&5 + guile_config=error + else + break + fi + done + if test "$guile_config" = "error"; then + { echo "configure: error: "cannot find guile-config; is Guile installed?"" 1>&2; exit 1; } + exit 1 + fi + if $guile_config --version 2>&1 | grep -q 'version 1\.012'; then + + echo "configure: warning: Guile version 1.3 or better needed" 1>&2 + warn_b=yes + + fi ## The GUILE_FLAGS macro. - ## First, let's just see if we can find Guile at all. echo $ac_n "checking for Guile""... $ac_c" 1>&6 -echo "configure:2668: checking for Guile" >&5 - guile-config link > /dev/null || { - echo "configure: cannot find guile-config; is Guile installed?" 1>&2 - exit 1 - } +echo "configure:2691: checking for Guile" >&5 + if ! $guile_config link > /dev/null ; then + echo "$ac_t"""cannot execute $guile_config"" 1>&6 + { echo "configure: error: "cannot find guile-config; is Guile installed?"" 1>&2; exit 1; } + exit 1 + fi GUILE_CFLAGS="`guile-config compile`" GUILE_LDFLAGS="`guile-config link`" echo "$ac_t""yes" 1>&6 - if guile-config --version 2>&1 | grep -q 'version 1\.012'; then - - echo "configure: warning: Guile version 1.3 or better needed" 1>&2 - warn_b=yes - - fi # Extract the first word of "guile", so it can be a program name with args. set dummy guile; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2688: checking for $ac_word" >&5 +echo "configure:2706: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GUILE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2722,7 +2740,7 @@ fi echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 -echo "configure:2726: checking for 8-bit clean memcmp" >&5 +echo "configure:2744: 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 @@ -2730,7 +2748,7 @@ else ac_cv_func_memcmp_clean=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_memcmp_clean=yes else @@ -2761,12 +2779,12 @@ echo "$ac_t""$ac_cv_func_memcmp_clean" 1>&6 test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}" echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:2765: checking for vprintf" >&5 +echo "configure:2783: checking for vprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -2816,12 +2834,12 @@ fi if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:2820: checking for _doprnt" >&5 +echo "configure:2838: checking for _doprnt" >&5 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else @@ -2874,12 +2892,12 @@ fi for ac_func in memmem snprintf vsnprintf gettext do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2878: checking for $ac_func" >&5 +echo "configure:2896: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2927: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2944,7 +2962,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:2948: checking for $ac_word" >&5 +echo "configure:2966: 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 @@ -2977,7 +2995,7 @@ test -n "$MAKEINFO" || MAKEINFO="error" # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2981: checking for $ac_word" >&5 +echo "configure:2999: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else diff --git a/ly/chord-modifiers.ly b/ly/chord-modifiers.ly index 6f16728730..bab60b66f4 100644 --- a/ly/chord-modifiers.ly +++ b/ly/chord-modifiers.ly @@ -2,18 +2,22 @@ chord modifiers %} +% UGR #(eval-string (ly-gulp-file "chord-names.scm")) -\chordmodifiers { - m = \musicalpitch { 0 2 -1 } - min = \musicalpitch { 0 2 -1 } - aug = \musicalpitch { 0 4 1 } - % urg! - % dim = \musicalpitch { -100 4 -1 } - dim = \musicalpitch { -100 2 -1 } - % urg, not actually a chord-modifier, but it works - % c7 -> , c 7+ -> c b - maj = \musicalpitch { 0 6 1 } - % sus4 should delete 2 too... - sus = \musicalpitch { 0 3 0 } -} + +% urg! +% +\chordmodifiers #'( + (m . ( 0 2 -1 )) + (min . ( 0 2 -1 )) + (aug . ( 0 4 1 )) +; (dim . ( -100 4 -1 )) + (dim . ( -100 2 -1 )) +; urg, not actually a chord-modifier, but it works +; c7 -> , c 7+ -> c b + (maj . ( 0 6 1 )) +; sus4 should delete 2 too... + (sus . ( 0 3 0 )) +) + -- 2.39.5