X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspacing-spanner.cc;h=0395506bbcb79dbecc9e1423e08bcee9d821bdc0;hb=beedd09c78a7725d0d52b93c59e3d9840681c3e5;hp=6ec8108d691decc8040ba297046c395e6650aeb9;hpb=77c34ddc0877c0625a48e1b41049b6dbaae215e0;p=lilypond.git

diff --git a/lily/spacing-spanner.cc b/lily/spacing-spanner.cc
index 6ec8108d69..0395506bbc 100644
--- a/lily/spacing-spanner.cc
+++ b/lily/spacing-spanner.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1999--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1999--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -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);
@@ -539,7 +540,7 @@ Spacing_spanner::breakable_column_spacing (Grob *me, Item *l, Item *r,
     {
       Real full_measure_extra_space = robust_scm2double (l->get_property ("full-measure-extra-space"), 1.0);
       spring.set_distance (spring.distance () + full_measure_extra_space);
-      spring.set_default_strength ();
+      spring.set_default_compress_strength ();
     }
   
   if (options->stretch_uniformly_ && l->break_status_dir () != RIGHT)