From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Fri, 26 Jan 2007 01:16:20 +0000 (+0100)
Subject: don't look for common_y too high up if Y has an override
X-Git-Tag: release/2.11.14-1~20
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=3ed8eea6809f5bf570bf9df1885ed3f5fa378742;p=lilypond.git

don't look for common_y too high up if Y has an override
---

diff --git a/lily/new-line-spanner.cc b/lily/new-line-spanner.cc
index b891750361..956f657343 100644
--- a/lily/new-line-spanner.cc
+++ b/lily/new-line-spanner.cc
@@ -162,6 +162,9 @@ New_line_spanner::calc_bound_info (SCM smob, Direction dir)
       y += dir * extra_dy / 2; 
       details = scm_acons (ly_symbol2scm ("Y"), scm_from_double (y), details);
     }
+  else
+    details = scm_acons (ly_symbol2scm ("preset-Y"),
+			 SCM_BOOL_T, details);
 
   return details;
 }
@@ -316,7 +319,17 @@ New_line_spanner::print (SCM smob)
 					    span_points[RIGHT],
 					    arrows[LEFT],
 					    arrows[RIGHT]));
-  Grob *commony = common_y (me);
+  Grob *commony = me;
+ 
+  do
+    {
+      if (ly_assoc_get (ly_symbol2scm ("preset-Y"), bounds[LEFT],
+			SCM_BOOL_F)
+	  != SCM_BOOL_T)
+
+	commony = commony->common_refpoint (me->get_bound (d), Y_AXIS);
+    }
+  while (flip (&d) != LEFT);
 
   line.translate (Offset (-me->relative_coordinate (commonx, X_AXIS),
 			  -me->relative_coordinate (commony, Y_AXIS)));