From: Jan Nieuwenhuizen Date: Mon, 1 Jul 2002 12:59:24 +0000 (+0000) Subject: hanging mods X-Git-Tag: release/1.5.65~14 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=8728a5e07051be0375e9309313881c29a5a204dd;p=lilypond.git hanging mods --- diff --git a/configure.in b/configure.in index f70b6c8c44..3f9bdbef16 100644 --- a/configure.in +++ b/configure.in @@ -65,21 +65,6 @@ fi AC_DEFINE_UNQUOTED(TOPLEVEL_VERSION, "${FULL_VERSION}") AC_DEFINE_UNQUOTED(FLOWER_VERSION, "${FULL_FLOWER_VERSION}") -# Check for guile ./configure'd --with-threads -# which shows nasty memory corruption errors. -# Until we found the real cause, advise no to use threads -exe=`STEPMAKE_GET_EXECUTABLE($guile_config)` -if test -n "$exe" -a -x "$exe"; then - AC_MSG_CHECKING(["for guile, ./configure\'d --without-threads"]) - link=`$guile_config link` - if expr "$link" : '.*\(thread\)' >/dev/null 2>&1; then - STEPMAKE_ADD_ENTRY(OPTIONAL, ["guile, ./configure'd --without-threads (using guile with threads may give nasty memory corruption errors on large scores)."]) - AC_MSG_RESULT(["no, watch out."]) - else - AC_MSG_RESULT(["yes, good."]) - fi -fi - # Gather requirements and generate output. STEPMAKE_END diff --git a/lily/spacing-spanner.cc b/lily/spacing-spanner.cc index 3869a449e3..e69fac88a5 100644 --- a/lily/spacing-spanner.cc +++ b/lily/spacing-spanner.cc @@ -608,8 +608,18 @@ Spacing_spanner::standard_breakable_column_spacing (Grob * me, Item*l, Item*r, Real * fixed, Real * space, Moment shortest) { - *fixed = l->extent (l, X_AXIS)[RIGHT] - r->extent (r, X_AXIS)[LEFT]; - + *fixed = 0.0; + Direction d = LEFT; + Drul_array cols(l,r); + + do + { + Interval lext = cols[d]->extent (cols [d], X_AXIS); + + *fixed += -d * lext[-d]; + } + while (flip (&d) != LEFT); + if (l->breakable_b (l) && r->breakable_b(r)) { Moment *dt = unsmob_moment (l->get_grob_property ("measure-length"));