Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond

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

diff --git a/lily/dot-column.cc b/lily/dot-column.cc
index 133f88ad3c68bb3f143f8a12997754c9182289b2..b2645ba6dd20f26b295ee57f0e95de83f6c5952b 100644 (file)
--- a/lily/dot-column.cc
+++ b/lily/dot-column.cc
@@ -36,6 +36,13 @@ Dot_column::calc_positioning_done (SCM smob)
 {
   Grob *me = unsmob_grob (smob);  
 
+  /*
+    Trigger note collision resolution first, since that may kill off
+    dots when merging.
+  */
+  if (Grob *collision = unsmob_grob (me->get_object ("note-collision")))
+    (void) collision->get_property ("positioning-done");
+
   me->set_property ("positioning-done", SCM_BOOL_T);
 
   vector<Grob*> dots
@@ -45,24 +52,19 @@ Dot_column::calc_positioning_done (SCM smob)
   Real ss = 0;
 
   Grob *commonx = me;
-  { /*
-      Trigger note collision resolution first, since that may kill off
-      dots when merging.
-    */
-    for (vsize i = 0; i < dots.size (); i++)
-      {
-       Grob *n = dots[i]->get_parent (Y_AXIS);
-       commonx = n->common_refpoint (commonx, X_AXIS);
-
-       if (Grob *stem = unsmob_grob (n->get_object("stem")))
-         {
-           commonx = stem->common_refpoint (commonx, X_AXIS);
-
-           if (Stem::first_head (stem) == n)
-             main_heads.push_back (n);
-         }
-      }
-  }
+  for (vsize i = 0; i < dots.size (); i++)
+    {
+      Grob *n = dots[i]->get_parent (Y_AXIS);
+      commonx = n->common_refpoint (commonx, X_AXIS);
+      
+      if (Grob *stem = unsmob_grob (n->get_object("stem")))
+       {
+         commonx = stem->common_refpoint (commonx, X_AXIS);
+         
+         if (Stem::first_head (stem) == n)
+           main_heads.push_back (n);
+       }
+    }
 
   vector<Box> boxes;
   set<Grob*> stems;
@@ -83,21 +85,31 @@ Dot_column::calc_positioning_done (SCM smob)
         
         Rest collisions should wait after line breaking.
       */
+      Interval y;
       if (Rest::has_interface (s))
        {
          base_x.unite (s->extent (commonx, X_AXIS));
          continue;
        }
+      else if (Stem::has_interface (s))
+       {
+         Real y1 = Stem::head_positions (s)[-get_grob_direction (s)];
+         Real y2 = y1 + get_grob_direction (s) * 7;
+
+         y.add_point (y1);
+         y.add_point (y2);
+       }
+      else
+       y = s->extent (s, Y_AXIS);
 
-      Interval y = s->extent (s, Y_AXIS);
       y *= 2 / ss;
       y += Staff_symbol_referencer::get_position (s);
          
       Box b (s->extent (commonx, X_AXIS), y);
       boxes.push_back (b);
 
-      if (Grob *s = unsmob_grob (s->get_object ("stem")))
-       stems.insert (s);
+      if (Grob *stem = unsmob_grob (s->get_object ("stem")))
+       stems.insert (stem);
     }
 
   for (set<Grob*>::const_iterator i(stems.begin());
@@ -189,9 +201,8 @@ Dot_column::add_head (Grob *me, Grob *rh)
 }
 
 ADD_INTERFACE (Dot_column,
-              
-              "Groups dot objects so they form a column, and position dots so they do not "
-              "clash with staff lines. ",
+              "Group dot objects so they form a column, and position"
+              " dots so they do not clash with staff lines.",
 
               /* properties */
               "dots "