Run `make grand-replace'.

[lilypond.git] / lily / spacing-basic.cc

diff --git a/lily/spacing-basic.cc b/lily/spacing-basic.cc
index e2f69b0bea114bfded7c67e7228788dfd4a3a79f..7545ec4e5b94723f384c94ed9753bcd2d3cbd7b4 100644 (file)
--- a/lily/spacing-basic.cc
+++ b/lily/spacing-basic.cc
@@ -3,7 +3,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 "spacing-spanner.hh"
@@ -29,7 +29,7 @@
 Spring
 Spacing_spanner::standard_breakable_column_spacing (Grob *me, Item *l, Item *r, Spacing_options const *options)
 {
-  Real min_dist = Paper_column::minimum_distance (l, r);
+  Real min_dist = max (0.0, Paper_column::minimum_distance (l, r));
   Real ideal;
 
   if (Paper_column::is_breakable (l) && Paper_column::is_breakable (r))