Fix 425.

diff --git a/lily/spacing-spanner.cc b/lily/spacing-spanner.cc
index 12ac68d792f41205d7cb2801d31e407c0a156eb3..53d6ef278b1b4b11a468e744edbbb62fea0fd957 100644 (file)
--- 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);