X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fline-spanner.cc;h=08dfbe700137233a033f3bab69074f15863930b7;hb=b50ab1c348bba9622c85ab9f53a1519d94a3f1b7;hp=aa7985b9c554ebae33b9596a614b6ba921c40ed9;hpb=abce4dafb98d26ae58663bf9aa3b07a0dd43ced0;p=lilypond.git

diff --git a/lily/line-spanner.cc b/lily/line-spanner.cc
index aa7985b9c5..08dfbe7001 100644
--- a/lily/line-spanner.cc
+++ b/lily/line-spanner.cc
@@ -233,8 +233,7 @@ Line_spanner::print (SCM smob)
   do
     {
       Offset z (robust_scm2double (ly_assoc_get (ly_symbol2scm ("X"),
-						 bounds[d], SCM_BOOL_F), 0.0)
-		+ commonx->relative_coordinate (commonx, X_AXIS),
+						 bounds[d], SCM_BOOL_F), 0.0),
 		robust_scm2double (ly_assoc_get (ly_symbol2scm ("Y"),
 						 bounds[d], SCM_BOOL_F), 0.0));
       
@@ -276,13 +275,15 @@ Line_spanner::print (SCM smob)
   Stencil line;
   do
     {
+      span_points[d] += -d * gaps[d] *  dz.direction ();
+
       if (stencils[d])
 	{
 	 Stencil s = stencils[d]->translated (span_points[d]);
 	 SCM align = ly_assoc_get (ly_symbol2scm ("stencil-align-dir-y"),
 				   bounds[d], SCM_BOOL_F);
 	 SCM off = ly_assoc_get (ly_symbol2scm ("stencil-offset"),
-				   bounds[d], SCM_BOOL_F);
+				 bounds[d], SCM_BOOL_F);
 
 	 if (scm_is_number (align)) 
 	   s.align_to (Y_AXIS, scm_to_double (align));
@@ -303,21 +304,23 @@ Line_spanner::print (SCM smob)
       if (stencils[d])
 	span_points[d] += dz_dir *
 	  (stencils[d]->extent (X_AXIS)[-d] / dz_dir[X_AXIS]);
-      
-      span_points[d] += -d * gaps[d] *  dz.direction ();
     }
   while (flip (&d) != LEFT);
 
   Offset adjust = dz.direction() * Staff_symbol_referencer::staff_space (me);
-  line.add_stencil (Line_interface::line (me, 
-					  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],
-					    span_points[RIGHT],
-					    arrows[LEFT],
-					    arrows[RIGHT]));
+
+  Offset line_left = span_points[LEFT] + (arrows[LEFT] ? adjust*1.4 : Offset (0, 0));
+  Offset line_right = span_points[RIGHT] - (arrows[RIGHT] ? adjust*0.55 : Offset (0, 0));
+  if (line_right[X_AXIS] > line_left[X_AXIS])
+    {
+      line.add_stencil (Line_interface::line (me, line_left, line_right));
+ 
+      line.add_stencil (Line_interface::arrows (me,
+						span_points[LEFT],
+						span_points[RIGHT],
+						arrows[LEFT],
+						arrows[RIGHT]));
+    }
 
   line.translate (Offset (-me->relative_coordinate (commonx, X_AXIS),
 			  -me->relative_coordinate (my_common_y, Y_AXIS)));