Implements padding at right-broken hairpins that come up against span bars.

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

diff --git a/lily/dot-column.cc b/lily/dot-column.cc
index fff2359cc0376f774e46ab531798213e0dd62e40..c0c2986b0888757cd269e91635e6ea5da511a546 100644 (file)
--- a/lily/dot-column.cc
+++ b/lily/dot-column.cc
@@ -132,15 +132,12 @@ Dot_column::calc_positioning_done (SCM smob)
        i != stems.end (); i++)
     {
       Grob *stem = (*i);
-      Stencil flag = Stem::flag (stem);
-      if (!flag.is_empty ())
+      Grob *flag = Stem::flag (stem);
+      if (flag)
         {
-          Interval y = flag.extent (Y_AXIS)
-                       * (2 / ss)
-                       + Stem::stem_end_position (stem);
-
-          Interval x = stem->relative_coordinate (commonx, X_AXIS)
-                       + flag.extent (X_AXIS);
+          Grob *commony = stem->common_refpoint (flag, Y_AXIS);
+          Interval y = flag->extent (commony, Y_AXIS) * (2 / ss);
+          Interval x = flag->extent (commonx, X_AXIS);
 
           boxes.push_back (Box (x, y));
         }
@@ -167,9 +164,8 @@ Dot_column::calc_positioning_done (SCM smob)
       Grob *note = dots[i]->get_parent (Y_AXIS);
       if (note)
         {
-          Grob *stem = unsmob_grob (note->get_object ("stem"));
-          if (stem)
-            dp.extremal_head_ = Stem::first_head (stem) == note;
+          if (Note_head::has_interface (note))
+            dp.dir_ = to_dir (dp.dot_->get_property ("direction"));
 
           dp.x_extent_ = note->extent (commonx, X_AXIS);
         }
@@ -180,8 +176,6 @@ Dot_column::calc_positioning_done (SCM smob)
          offset callback but adding a dot overwrites Y-offset. */
       p += (int) robust_scm2double (dp.dot_->get_property ("staff-position"), 0.0);
       dp.pos_ = p;
-      if (dp.extremal_head_)
-        dp.dir_ = to_dir (dp.dot_->get_property ("direction"));
 
       cfg.remove_collision (p);
       cfg[p] = dp;
@@ -236,5 +230,6 @@ ADD_INTERFACE (Dot_column,
                "dots "
                "positioning-done "
                "direction "
+               "note-collision "
               );