Prevent add_spacing_rods from being quadratic.

diff --git a/lily/spacing-spanner.cc b/lily/spacing-spanner.cc
index 783946eb10de5a30e3f3b95ab98e0d445fcda98a..e1d454816b895ddbb4290ec69b66f671912b1919 100644 (file)
--- 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);