tweaks to spacing and include spring.cc

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

diff --git a/lily/spacing-basic.cc b/lily/spacing-basic.cc
index e2f69b0bea114bfded7c67e7228788dfd4a3a79f..bed086a72cefab0672589b0042cfb0e5f3bb1f14 100644 (file)
--- a/lily/spacing-basic.cc
+++ b/lily/spacing-basic.cc
@@ -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))