From: Joe Neeman <joeneeman@gmail.com>
Date: Fri, 20 Aug 2010 07:57:44 +0000 (-0700)
Subject: Prevent add_spacing_rods from being quadratic.
X-Git-Tag: release/2.13.31-1~22
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=c4bc3b1e1356819db7645a28fea689c699980922;p=lilypond.git

Prevent add_spacing_rods from being quadratic.
---

diff --git a/lily/spacing-spanner.cc b/lily/spacing-spanner.cc
index 783946eb10..e1d454816b 100644
--- a/lily/spacing-spanner.cc
+++ b/lily/spacing-spanner.cc
@@ -271,7 +271,7 @@ set_column_rods (vector<Grob*> const &cols, Real padding)
 	      bool touches = right_stickout - left_stickout + cur_dist[d] < 0.0;
 	      Real dist = 0.0;
 
-	      /* we set a distance for the line-starter column even if it's non-broken counterpart
+	      /* we set a distance for the line-starter column even if its non-broken counterpart
 		 doesn't touch the right column. */
 	      if (lb)
 		Separation_item::set_distance (lb, r_col, padding);
@@ -285,6 +285,7 @@ set_column_rods (vector<Grob*> const &cols, Real padding)
 	      if (j == i-1)
 		cur_dist[d] = distances[j];
 
+	      cur_dist[d] = max (cur_dist[d], dist);
 	      done = done && !touches;
 	    }
 	  while (flip (&d) != LEFT && rb);