From: Joe Neeman <joeneeman@gmail.com>
Date: Tue, 25 Sep 2007 10:45:04 +0000 (+1000)
Subject: Fix 425.
X-Git-Tag: release/2.11.34-1~6
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=8b6cdcfae9f6c897ad0205678901aef6a8dba47f;p=lilypond.git

Fix 425.
---

diff --git a/lily/spacing-spanner.cc b/lily/spacing-spanner.cc
index 12ac68d792..53d6ef278b 100644
--- a/lily/spacing-spanner.cc
+++ b/lily/spacing-spanner.cc
@@ -230,6 +230,11 @@ set_column_rods (vector<Grob*> const &cols, Real padding)
       Skyline_pair *skys = Skyline_pair::unsmob (r->get_property ("horizontal-skylines"));
       Real right_stickout = skys ? (*skys)[LEFT].max_height () : 0.0;
 
+      /* min rather than max because right-stickout will be negative if the right-hand column
+	 sticks out a lot to the left */
+      right_stickout = min (right_stickout,
+			    Separation_item::conditional_skyline (r, cols[i-1]).max_height ());
+
       Drul_array<Item*> r_cols (r, rb);
       Drul_array<Real> cur_dist (0.0, 0.0);