Run `make grand-replace'.

[lilypond.git] / lily / spacing-determine-loose-columns.cc

diff --git a/lily/spacing-determine-loose-columns.cc b/lily/spacing-determine-loose-columns.cc
index ef5e8c71de866b0179192ef8706b2723ee8a6a88..ed706a6575460447c16d6eb2d2866d28dda3d3c2 100644 (file)
--- a/lily/spacing-determine-loose-columns.cc
+++ b/lily/spacing-determine-loose-columns.cc
@@ -4,7 +4,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "staff-spacing.hh"
@@ -157,11 +157,11 @@ Spacing_spanner::set_distances_for_loose_col (Grob *me, Grob *c,
              Real base = note_spacing (me, lc, rc, options);
              Spring spring = Note_spacing::get_spacing (sp, rc, base, options->increment_);
 
-             dists[d] = max (dists[d], spring.distance () - options->increment_);
+             dists[d] = max (dists[d], spring.min_distance ());
            }
          else if (Staff_spacing::has_interface (sp))
            {
-             Spring spring = Staff_spacing::get_spacing (sp);
+             Spring spring = Staff_spacing::get_spacing (sp, rc);
 
              dists[d] = max (dists[d], spring.min_distance ());
            }