X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspacing-loose-columns.cc;h=a59fa7d0f9350734baa6717ab25017ed25ec59cf;hb=88d9664a4deb407f55e3b0807c0047b44a4afb2d;hp=4102ecdecc2009dfade508156a291c8b53b3cd94;hpb=1cdd20054babbf7ce6eb6a135854abc2d8f00f8f;p=lilypond.git

diff --git a/lily/spacing-loose-columns.cc b/lily/spacing-loose-columns.cc
index 4102ecdecc..a59fa7d0f9 100644
--- a/lily/spacing-loose-columns.cc
+++ b/lily/spacing-loose-columns.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "system.hh"
@@ -100,7 +100,7 @@ set_loose_columns (System *which, Column_x_positions const *posns)
 
       vector<Real> clique_spacing;
       clique_spacing.push_back (0.0);
-      for (vsize j = 1; j < clique.size () - 1; j ++)
+      for (vsize j = 1; j + 1 < clique.size (); j ++)
 	{
 	  Grob *clique_col = clique[j];
 
@@ -119,23 +119,19 @@ set_loose_columns (System *which, Column_x_positions const *posns)
 	  else
 	    programming_error ("Column without spacing object");
 
-	  bool expand_only = false;
 	  Real base_note_space = 0.0;
 
 	  if (Paper_column::is_musical (next_col)
 	      && Paper_column::is_musical (loose_col))
-	    base_note_space = Spacing_spanner::note_spacing (spacing, loose_col, next_col, 
-							     &options, &expand_only);
+	    base_note_space = Spacing_spanner::note_spacing (spacing, loose_col, next_col,
+							     &options);
 	  else
 	    {
-	      Real fixed, space;
-	      
-	      Spacing_spanner::standard_breakable_column_spacing (spacing, 
-								  loose_col, next_col,
-								  &fixed, &space,
-								  &options);
-
-	      base_note_space = space;
+	      Spring spring = Spacing_spanner::standard_breakable_column_spacing (spacing,
+										  loose_col, next_col,
+										  &options);
+
+	      base_note_space = spring.distance ();
 	    }
 
 	  base_note_space = max (base_note_space,