]> git.donarmstrong.com Git - lilypond.git/commitdiff
Fix cross-staff thinko.
authorJoe Neeman <joeneeman@gmail.com>
Tue, 28 Jul 2009 06:37:00 +0000 (23:37 -0700)
committerNeil Puttock <n.puttock@gmail.com>
Sun, 6 Sep 2009 20:43:16 +0000 (21:43 +0100)
(cherry picked from commit fb4c6edf438fe84d9f01d41e71dc361d86a90f3f)

lily/axis-group-interface.cc

index 639c8b6267a12a6450cfe7739009e7e6b311cdbb..31f7beb8d0f72b51d97d368729bf93b7685a6090 100644 (file)
@@ -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);
     }