X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fhairpin.cc;h=40e165dd6d0ffe35c9cfff0051e19133129037ed;hb=cfe204f50a73e31a4fa15091a1f812843ef6c245;hp=7ef0f847a1e8fdf30e3231434cbb84209d119f57;hpb=ebe492ca408fb0d9abf80b94c56197eef8dc2f09;p=lilypond.git

diff --git a/lily/hairpin.cc b/lily/hairpin.cc
index 7ef0f847a1..40e165dd6d 100644
--- a/lily/hairpin.cc
+++ b/lily/hairpin.cc
@@ -20,7 +20,6 @@
 #include "hairpin.hh"
 
 #include "axis-group-interface.hh"
-#include "bar-line.hh"
 #include "dimensions.hh"
 #include "directional-element-interface.hh"
 #include "international.hh"
@@ -58,7 +57,7 @@ Hairpin::broken_bound_padding (SCM smob)
   Item *r_bound = me->get_bound (RIGHT);
   if (r_bound->break_status_dir () != -1)
     {
-      me->warning ("Asking for broken bound padding at a non-broken bound.");
+      me->warning (_ ("Asking for broken bound padding at a non-broken bound."));
       return scm_from_double (0.0);
     }
 
@@ -69,23 +68,20 @@ Hairpin::broken_bound_padding (SCM smob)
 
   Grob *my_vertical_axis_group = Grob::get_vertical_axis_group (me);
   Drul_array<Grob *> vertical_axis_groups;
-  Direction d = DOWN;
-  do
+  for (DOWN_and_UP (d))
     vertical_axis_groups[d] = d == dir
                               ? sys->get_neighboring_staff (d, my_vertical_axis_group, Interval_t<int> (me->spanned_rank_interval ()))
                               : my_vertical_axis_group;
-  while (flip (&d) != DOWN);
 
   if (!vertical_axis_groups[dir])
     return scm_from_double (0.0);
 
   Drul_array<Grob *> span_bars (0, 0);
-  d = DOWN;
-  do
+  for (DOWN_and_UP (d))
     {
       extract_grob_set (vertical_axis_groups[d], "elements", elts);
       for (vsize i = elts.size (); i--;)
-        if (Bar_line::has_interface (elts[i])
+        if (elts[i]->internal_has_interface (ly_symbol2scm ("bar-line-interface"))
             && dynamic_cast<Item *> (elts[i])->break_status_dir () == -1)
           {
             SCM hsb = elts[i]->get_property ("has-span-bar");
@@ -95,10 +91,10 @@ Hairpin::broken_bound_padding (SCM smob)
             span_bars[d] = unsmob_grob ((d == UP ? scm_car : scm_cdr) (hsb));
             break;
           }
+
       if (!span_bars[d])
         return scm_from_double (0.0);
     }
-  while (flip (&d) != DOWN);
 
   if (span_bars[DOWN] != span_bars[UP])
     return scm_from_double (0.0);
@@ -125,22 +121,22 @@ Hairpin::print (SCM smob)
 
   Drul_array<bool> broken;
   Drul_array<Item *> bounds;
-  Direction d = LEFT;
-  do
+  for (LEFT_and_RIGHT (d))
     {
       bounds[d] = me->get_bound (d);
       broken[d] = bounds[d]->break_status_dir () != CENTER;
     }
-  while (flip (&d) != LEFT);
-
-  broken[RIGHT] = broken[RIGHT] && me->broken_neighbor (RIGHT);
-  broken[RIGHT] = broken[RIGHT] && me->broken_neighbor (RIGHT)->is_live ();
 
   if (broken[RIGHT])
     {
       Spanner *next = me->broken_neighbor (RIGHT);
-      Stencil *s = next->get_stencil ();
-      if (!s || s->is_empty ())
+      // Hairpin-parts suicide in after-line-breaking if they need not be drawn
+      if (next)
+        {
+          (void) next->get_property ("after-line-breaking");
+          broken[RIGHT] = next->is_live ();
+        }
+      else
         broken[RIGHT] = false;
     }
 
@@ -162,12 +158,10 @@ Hairpin::print (SCM smob)
     thick = robust_scm2double (me->get_property ("thickness"), 1.0)
             * Staff_symbol_referencer::line_thickness (me);
 
-  do
+  for (LEFT_and_RIGHT (d))
     {
       Item *b = bounds[d];
-      Interval e = (Paper_column::has_interface (b) && b->break_status_dir ())
-                   ? Axis_group_interface::generic_bound_extent (b, common, X_AXIS)
-                   : robust_relative_extent (b, common, X_AXIS);
+      Interval e = Axis_group_interface::generic_bound_extent (b, common, X_AXIS);
 
       x_points[d] = b->relative_coordinate (common, X_AXIS);
       if (broken [d])
@@ -254,7 +248,6 @@ Hairpin::print (SCM smob)
             }
         }
     }
-  while (flip (&d) != LEFT);
 
   Real width = x_points[RIGHT] - x_points[LEFT];