From: Joe Neeman <joeneeman@gmail.com>
Date: Sat, 14 Jul 2007 00:35:30 +0000 (+1000)
Subject: fix skyline thinko
X-Git-Tag: release/2.11.28-1~14^2~2
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=ba8a253a14cfcbd757fef0ad36232d371b88d23b;p=lilypond.git

fix skyline thinko
---

diff --git a/lily/axis-group-interface.cc b/lily/axis-group-interface.cc
index bd00b28307..3e9450c846 100644
--- a/lily/axis-group-interface.cc
+++ b/lily/axis-group-interface.cc
@@ -279,8 +279,10 @@ Axis_group_interface::combine_skylines (SCM smob)
   Grob *me = unsmob_grob (smob);
   extract_grob_set (me, "elements", elements);
   Grob *y_common = common_refpoint_of_array (elements, me, Y_AXIS);
+  Grob *x_common = common_refpoint_of_array (elements, me, X_AXIS);
 
-  assert (y_common == me);
+  if (y_common != me)
+    programming_error ("combining skylines that don't belong to me");
 
   Skyline_pair ret;
   for (vsize i = 0; i < elements.size (); i++)
@@ -291,6 +293,7 @@ Axis_group_interface::combine_skylines (SCM smob)
 	  Real offset = elements[i]->relative_coordinate (y_common, Y_AXIS);
 	  Skyline_pair other = *Skyline_pair::unsmob (skyline_scm);
 	  other.raise (offset);
+	  other.shift (elements[i]->relative_coordinate (x_common, X_AXIS));
 	  ret.merge (other);
 	}
     }