Build: Target version.itexi and weblinks.itexi (issue 3576).

[lilypond.git] / lily / line-spanner.cc

diff --git a/lily/line-spanner.cc b/lily/line-spanner.cc
index f80d58132d5fc1a71067c6c44fcbce3d8b06b2d4..6c5e627442ce460650c66f5c20456248f98c4e57 100644 (file)
--- a/lily/line-spanner.cc
+++ b/lily/line-spanner.cc
@@ -114,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);
 
@@ -189,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);
         }