From 5bf12ef6602df7ad743ea42cc2d349647bfe445f Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Wed, 15 Mar 2006 13:58:50 +0000 Subject: [PATCH] (musical_column_spacing): crude fix for breakable items after uniformly stretched notes. --- ChangeLog | 3 +++ lily/spacing-spanner.cc | 15 ++++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 446f4ba915..4edc9a24d2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2006-03-15 Han-Wen Nienhuys + * lily/spacing-spanner.cc (musical_column_spacing): crude fix for + breakable items after uniformly stretched notes. + * lily/tie-formatting-problem.cc (set_chord_outline): initialize outline with outer edge of note heads. This prevents infinity problems with tied whole notes. diff --git a/lily/spacing-spanner.cc b/lily/spacing-spanner.cc index 4fe3b25a0e..c5cf8f5065 100644 --- a/lily/spacing-spanner.cc +++ b/lily/spacing-spanner.cc @@ -260,7 +260,20 @@ Spacing_spanner::musical_column_spacing (Grob *me, Real compound_fixed_note_space = 0.0; if (options->stretch_uniformly_) - compound_note_space = base_note_space; + { + compound_note_space = base_note_space; + + if (!Paper_column::is_musical (right_col)) + { + /* + Crude fix for notes that lead up to barlines and time sigs. + */ + Interval lext = right_col->extent (right_col, X_AXIS); + if (!lext.is_empty ()) + compound_note_space += -lext[LEFT]; + } + + } else { int wish_count = 0; -- 2.39.2