Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / lily / dot-column.cc

diff --git a/lily/dot-column.cc b/lily/dot-column.cc
index 78dbcabb4ca40fd8bc86289aa885847110b6944e..3ebddc69a015267561adb67a24a35a3f5a9a474e 100644 (file)
--- a/lily/dot-column.cc
+++ b/lily/dot-column.cc
@@ -31,20 +31,26 @@ SCM
 Dot_column::side_position (SCM smob)
 {
   Grob *me = unsmob_grob (smob);
-  Grob *stem = unsmob_grob (me->get_object ("stem"));
-  if (stem
-      && !Stem::get_beam (stem)
-      && Stem::duration_log (stem) > 2
-      && !Stem::is_invisible (stem))
+  extract_grob_set (me, "dots", dots);
+  
+  for (vsize i = 0; i  < dots.size (); i++)
     {
-      /*
-       trigger stem end & direction calculation.
-
-       This will add the stem to the support if a flag collision happens.
-      */
-      stem->get_property ("stem-end-position");
+      Grob *head = dots[i]->get_parent (Y_AXIS);
+      Grob *stem = head ? unsmob_grob (head->get_object ("stem")) : 0;
+      if (stem
+         && !Stem::get_beam (stem)
+         && Stem::duration_log (stem) > 2
+         && !Stem::is_invisible (stem))
+       {
+         /*
+           trigger stem end & direction calculation.
+           
+           This will add the stem to the support if a flag collision happens.
+         */
+         stem->get_property ("stem-end-position");
+       }
     }
-  
+
   return Side_position_interface::x_aligned_side (smob);
 }
 
@@ -204,7 +210,7 @@ SCM
 Dot_column::calc_positioning_done (SCM smob)
 {
   Grob *me = unsmob_grob (smob);  
-  Link_array<Grob> dots
+  vector<Grob*> dots
     = extract_grob_array (me, "dots");
 
   { /*
@@ -227,10 +233,10 @@ Dot_column::calc_positioning_done (SCM smob)
       }
   }
 
-  dots.sort (compare_position);
+  vector_sort (dots, &compare_position);
   for (vsize i = dots.size (); i--;)
     if (!dots[i]->is_live ())
-      dots.del (i);
+      dots.erase (dots.begin () + i);
 
   Dot_configuration cfg;
   for (vsize i = 0;i < dots.size (); i++)
@@ -290,7 +296,8 @@ ADD_INTERFACE (Dot_column,
               "clash with staff lines ",
 
               /* properties */
+              "dots "
               "positioning-done "
               "direction "
-              "stem");
+              );