X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fline-spanner.cc;h=6c5e627442ce460650c66f5c20456248f98c4e57;hb=3b617fc949192eacf627413dac0420ebc54aebf6;hp=2be8d1e5032561c8d83a9ab2d3041f7b09bcb094;hpb=28f3294954eff1f263d3b2e3de1c520f4d2fbdfc;p=lilypond.git

diff --git a/lily/line-spanner.cc b/lily/line-spanner.cc
index 2be8d1e503..6c5e627442 100644
--- a/lily/line-spanner.cc
+++ b/lily/line-spanner.cc
@@ -21,7 +21,6 @@
 #include "axis-group-interface.hh"
 #include "font-interface.hh"
 #include "grob-interface.hh"
-#include "international.hh"
 #include "item.hh"
 #include "lily-proto.hh"
 #include "line-interface.hh"
@@ -115,7 +114,7 @@ Line_spanner::calc_bound_info (SCM smob, Direction dir)
                       ? Axis_group_interface::generic_bound_extent (bound_grob, commonx, X_AXIS)
                       : robust_relative_extent (bound_grob, commonx, X_AXIS)).linear_combination (attach);
 
-      Grob *acc = Note_column::accidentals (bound_grob->get_parent (X_AXIS));
+      Grob *acc = unsmob_grob (bound_grob->get_object ("accidental-grob"));
       if (acc && to_boolean (ly_assoc_get (ly_symbol2scm ("end-on-accidental"), details, SCM_BOOL_F)))
         x_coord = robust_relative_extent (acc, commonx, X_AXIS).linear_combination (attach);
 
@@ -190,7 +189,9 @@ Line_spanner::calc_bound_info (SCM smob, Direction dir)
         }
       else
         {
-          y = me->get_bound (dir)->extent (common_y, Y_AXIS).center ();
+          Interval ii = me->get_bound (dir)->extent (common_y, Y_AXIS);
+          if (!ii.is_empty())
+            y = ii.center ();
           details = scm_acons (ly_symbol2scm ("common-Y"), common_y->self_scm (), details);
         }
 
@@ -369,8 +370,6 @@ Line_spanner::print (SCM smob)
                                                 arrows[LEFT],
                                                 arrows[RIGHT]));
     }
-  else
-    me->warning (_ ("Line spanner's left point is to the right of its right point."));
 
   line.translate (Offset (-me->relative_coordinate (commonx, X_AXIS),
                           simple_y ? 0.0 : -me->relative_coordinate (my_common_y, Y_AXIS)));