fix overlap of trill-like line spanners and arrowheads

diff --git a/lily/line-spanner.cc b/lily/line-spanner.cc
index d764a3b717041b909c7f3564660d16913e64e018..a1fe664c16275205e973c1eeb82f1987456dccbe 100644 (file)
--- a/lily/line-spanner.cc
+++ b/lily/line-spanner.cc
@@ -275,9 +275,10 @@ Line_spanner::print (SCM smob)
     }
   while (flip (&d) != LEFT);
 
+  Offset adjust = dz.direction() * Staff_symbol_referencer::staff_space (me);
   line.add_stencil (Line_interface::line (me, 
-                                         span_points[LEFT],
-                                         span_points[RIGHT]));
+                                         span_points[LEFT]  + (arrows[LEFT]  ? adjust*1.4  : Offset(0,0)),
+                                         span_points[RIGHT] - (arrows[RIGHT] ? adjust*0.55 : Offset(0,0))));
 
   line.add_stencil (Line_interface::arrows (me,
                                            span_points[LEFT],