label&page-ref: apply label to the next score or markup, iso. to the previous one.

[lilypond.git] / lily / note-collision.cc

diff --git a/lily/note-collision.cc b/lily/note-collision.cc
index 23e3f98e018dff05e6c8d662f7765114a7c34348..6feb71c8633f0e00f26e4f59c5bc32dbf44f4a20 100644 (file)
--- a/lily/note-collision.cc
+++ b/lily/note-collision.cc
@@ -306,7 +306,12 @@ check_meshing_chords (Grob *me,
        far to the right.
       */
       if (Dot_column::has_interface (parent))
-       Side_position_interface::add_support (parent, nu);
+       {
+         Grob *stem = unsmob_grob (nu->get_object ("stem"));
+         extract_grob_set (stem, "note-heads", heads);
+         for (vsize i = 0; i < heads.size (); i++)
+           Side_position_interface::add_support (parent, heads[i]);
+       }
     }
 
   Direction d = UP;
@@ -502,6 +507,23 @@ Note_collision_interface::automatic_shift (Grob *me,
     }
   while ((flip (&d)) != UP);
 
+
+  /*
+    see input/regression/dot-up-voice-collision.ly
+   */
+  for (vsize i = 0; i < clash_groups[UP].size (); i++)
+    {
+      Grob *g = clash_groups[UP][i];
+      Grob *dc = Note_column::dot_column (g);
+      
+      if (dc)
+       for (vsize j = i + 1;  j < clash_groups[UP].size (); j++)
+         {
+           Grob *stem = Note_column::get_stem (clash_groups[UP][j]);
+           Side_position_interface::add_support (dc, stem);
+         }
+    }
+  
   /*
     Check if chords are meshing
   */