From: Joe Neeman <joeneeman@gmail.com>
Date: Tue, 28 Jul 2009 06:37:00 +0000 (-0700)
Subject: Fix cross-staff thinko.
X-Git-Tag: release/2.12.3-1~11
X-Git-Url: https://git.donarmstrong.com/lilypond.git?a=commitdiff_plain;h=bbaf60edda2d5dd759050c1046cbd9865f3affbd;p=lilypond.git

Fix cross-staff thinko.
(cherry picked from commit fb4c6edf438fe84d9f01d41e71dc361d86a90f3f)
---

diff --git a/lily/axis-group-interface.cc b/lily/axis-group-interface.cc
index 639c8b6267..31f7beb8d0 100644
--- a/lily/axis-group-interface.cc
+++ b/lily/axis-group-interface.cc
@@ -616,7 +616,11 @@ Axis_group_interface::skyline_spacing (Grob *me, vector<Grob*> elements)
       current_elts.push_back (elements[i]);
       while (i + 1 < elements.size () 
 	     && scm_eq_p (elements[i+1]->get_property ("outside-staff-priority"), priority))
-	current_elts.push_back (elements[++i]);
+	{
+	  if (!to_boolean (elements[i+1]->get_property ("cross-staff")))
+	    current_elts.push_back (elements[i+1]);
+	  ++i;
+	}
 
       add_grobs_of_one_priority (&skylines, current_elts, x_common, y_common);
     }