X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fhairpin.cc;h=281d50cf921f8688a18d4c65950e2422da87ebff;hb=5bbfc22fce036b9b69df5e420de93e11da23c05e;hp=7639ddd78e774210ebcea9de2da6b772a493564a;hpb=46e296f5381495ce30108aa981e549d61e55a009;p=lilypond.git

diff --git a/lily/hairpin.cc b/lily/hairpin.cc
index 7639ddd78e..281d50cf92 100644
--- a/lily/hairpin.cc
+++ b/lily/hairpin.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -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"
@@ -39,7 +38,7 @@ MAKE_SCHEME_CALLBACK (Hairpin, pure_height, 3);
 SCM
 Hairpin::pure_height (SCM smob, SCM, SCM)
 {
-  Grob *me = unsmob_grob (smob);
+  Grob *me = Grob::unsmob (smob);
   Real height = robust_scm2double (me->get_property ("height"), 0.0)
                 * Staff_symbol_referencer::staff_space (me);
 
@@ -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);
     }
 
@@ -82,16 +81,17 @@ Hairpin::broken_bound_padding (SCM smob)
     {
       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");
             if (!scm_is_pair (hsb))
               break;
 
-            span_bars[d] = unsmob_grob ((d == UP ? scm_car : scm_cdr) (hsb));
+            span_bars[d] = Grob::unsmob ((d == UP ? scm_car : scm_cdr) (hsb));
             break;
           }
+
       if (!span_bars[d])
         return scm_from_double (0.0);
     }
@@ -127,14 +127,16 @@ Hairpin::print (SCM smob)
       broken[d] = bounds[d]->break_status_dir () != CENTER;
     }
 
-  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;
     }
 
@@ -159,9 +161,7 @@ Hairpin::print (SCM smob)
   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])
@@ -236,7 +236,8 @@ Hairpin::print (SCM smob)
                 }
               else
                 {
-                  if (Note_column::has_interface (b)
+                  if (d == RIGHT // end at the left edge of a rest
+                      && Note_column::has_interface (b)
                       && Note_column::has_rests (b))
                     x_points[d] = e[-d];
                   else