From 29dbdf41ad56b84cae0f447bb712db9ee1e5d900 Mon Sep 17 00:00:00 2001 From: fred Date: Tue, 26 Mar 2002 23:24:46 +0000 Subject: [PATCH] lilypond-1.3.73 --- lily/spacing-spanner.cc | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/lily/spacing-spanner.cc b/lily/spacing-spanner.cc index d032027005..d83d58e725 100644 --- a/lily/spacing-spanner.cc +++ b/lily/spacing-spanner.cc @@ -41,6 +41,11 @@ Spacing_spanner::do_measure (Score_element*me, Link_array cols) { Moment shortest; Moment mean_shortest; + + /* + space as if this duration is present. + */ + Moment base_shortest_duration = *unsmob_moment (me->get_elt_property ("maximum-duration-for-spacing")); shortest.set_infinite (1); int n = 0; @@ -94,11 +99,11 @@ Spacing_spanner::do_measure (Score_element*me, Link_array cols) // 2nd condition should be (i+1 < col_count()), ie. not the last column in score. FIXME else if (!lc->musical_b() && i+1 < cols.size ()) { - left_distance= default_bar_spacing (me,lc,rc,shortest); + left_distance= default_bar_spacing (me,lc,rc,shortest musical_b()) { - left_distance = note_spacing (me,lc, rc, shortest); + left_distance = note_spacing (me,lc, rc, shortest paper_l ()->get_var ("arithmetic_basicspace") - log; @@ -218,7 +223,8 @@ Spacing_spanner::get_duration_space (Score_element*me, Moment d, Moment shortest Real -Spacing_spanner::note_spacing (Score_element*me, Score_element *lc, Score_element *rc, Moment shortest) +Spacing_spanner::note_spacing (Score_element*me, Score_element *lc, Score_element *rc, + Moment shortest) { Moment shortest_playing_len = 0; SCM s = lc->get_elt_property ("shortest-playing-duration"); -- 2.39.5