Fix #362.

[lilypond.git] / lily / spacing-spanner.cc

diff --git a/lily/spacing-spanner.cc b/lily/spacing-spanner.cc
index ee4ddba35ddd25baeddedb90ee13aa65dacbaf94..a61bffb98a3aa41d7a417ee493a17e7412e127b0 100644 (file)
--- 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
            {