(musical_column_spacing): crude fix for

breakable items after uniformly stretched notes.

diff --git a/ChangeLog b/ChangeLog
index 446f4ba915bcc684f63b9e7732236994ba31d2a8..4edc9a24d25918fd2e6d8cec330320dcd4d1dd17 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-03-15  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * 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 4fe3b25a0ea1f099abeec90f516261631491da88..c5cf8f50650c9844a94c58d1b79a83403601805e 100644 (file)
--- 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;