From 7208189546b5932480e268e805e81e468fcd30e5 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Thu, 1 Feb 2007 14:22:36 +0100 Subject: [PATCH] don't use extent of musical column for horizontal spacing. --- lily/spacing-spanner.cc | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/lily/spacing-spanner.cc b/lily/spacing-spanner.cc index ee4ddba35d..a61bffb98a 100644 --- a/lily/spacing-spanner.cc +++ b/lily/spacing-spanner.cc @@ -319,13 +319,14 @@ Spacing_spanner::musical_column_spacing (Grob *me, if (!Paper_column::is_musical (right_col)) { /* - reconsider this: breaks with wide marks/tempos/etc. + There used to be code that examined left_col->extent + (X_AXIS), but this is resulted in unexpected wide + spacing, because the width of s^"text" output is also + taken into account here. */ - Real left_col_stick_out = robust_relative_extent (left_col, left_col, X_AXIS)[RIGHT]; - compound_fixed_note_space = max (left_col_stick_out, options->increment_); - + compound_fixed_note_space = options->increment_; compound_note_space = max (base_note_space, - base_note_space - options->increment_ + left_col_stick_out); + options->increment_); } else { -- 2.39.5