From 362ed46d08ffa2ec6d5783bd469ce78f4c1b1f6c Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Wed, 31 May 2006 23:42:06 +0000 Subject: [PATCH] *** empty log message *** --- ChangeLog | 4 ++++ lily/ledger-line-spanner.cc | 5 ++++- stepmake/aclocal.m4 | 9 +++++++-- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8cbfafbeb5..dfe07ee897 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2006-06-01 Han-Wen Nienhuys + + * stepmake/aclocal.m4: revert version detection change. + 2006-06-01 Jan Nieuwenhuizen * stepmake/aclocal.m4: Robustification for (gcc) version detection. diff --git a/lily/ledger-line-spanner.cc b/lily/ledger-line-spanner.cc index 907c95985f..bf7444dea0 100644 --- a/lily/ledger-line-spanner.cc +++ b/lily/ledger-line-spanner.cc @@ -119,7 +119,10 @@ Ledger_line_spanner::set_spacing_rods (SCM smob) // find size of note heads. Grob *staff = Staff_symbol_referencer::get_staff_symbol (me); if (!staff) - return SCM_EOL; + { + me->suicide (); + return SCM_EOL; + } Real min_length_fraction = robust_scm2double (me->get_property ("minimum-length-fraction"), 0.15); diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4 index 482c73a3cb..9f418fbad4 100644 --- a/stepmake/aclocal.m4 +++ b/stepmake/aclocal.m4 @@ -32,8 +32,13 @@ AC_DEFUN(STEPMAKE_GET_VERSION, [ ## FIXME: what systems still do not have $() in /bin/sh? eval _ver=\"\`("$1" --version || "$1" -V) 2>&1 | grep '[0-9]\.[0-9]' \ | head -n 1 \ - | sed -e 's/\([0-9][0-9]*\.[0-9][.0-9]*\).*/\1/' \ - -e 's/\([^0-9]*\|^\) //' -e 's/[^0-9]*$//'\`\" + | sed -e 's/.*[^-.0-9]\([0-9][0-9]*\.[0-9][.0-9]*\).*/\1/' \ + -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" + +## apparently breaks on darwin, +# | sed -e 's/\([0-9][0-9]*\.[0-9][.0-9]*\).*/\1/' \ +# -e 's/\([^0-9]*\|^\) //' -e 's/[^0-9]*$//'\`\" + if test -z "$_ver"; then ## If empty, try date [fontforge] eval _ver=\"\`("$1" --version || "$1" -V) 2>&1 | grep '[0-9]\{6,8\}' \ -- 2.39.5