X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspacing-basic.cc;h=40e0a16b4a152122ee3d88dabb7b7983ea9978a5;hb=4e6d37762f033a5d89afc0b0848ef42914f7318f;hp=e2f69b0bea114bfded7c67e7228788dfd4a3a79f;hpb=e93ef6da649651c20932fa4acbe807e8cb37e0ac;p=lilypond.git

diff --git a/lily/spacing-basic.cc b/lily/spacing-basic.cc
index e2f69b0bea..40e0a16b4a 100644
--- 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))
@@ -83,11 +83,11 @@ get_measure_length (Grob *column)
 }
 
 Real
-Spacing_spanner::note_spacing (Grob *me, Grob *lc, Grob *rc,
+Spacing_spanner::note_spacing (Grob * /* me */,
+			       Grob *lc,
+			       Grob *rc,
 			       Spacing_options const *options)
 {
-  (void) me;
-  
   Moment shortest_playing_len = 0;
   SCM s = lc->get_property ("shortest-playing-duration");