From: Joe Neeman <joeneeman@gmail.com>
Date: Tue, 14 Aug 2007 23:16:17 +0000 (+1000)
Subject: Use less whitespace at the end of a measure.
X-Git-Tag: release/2.11.30-1~22
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=bda09275e2e42fbdd241b08e757a2f3a3803b355;p=lilypond.git

Use less whitespace at the end of a measure.
---

diff --git a/lily/note-spacing.cc b/lily/note-spacing.cc
index d476f70fa0..d19f63e632 100644
--- a/lily/note-spacing.cc
+++ b/lily/note-spacing.cc
@@ -81,13 +81,17 @@ Note_spacing::get_spacing (Grob *me, Item *right_col,
 						      Bar_line::has_interface);
 
       if (bar)
-	ideal -= bar->extent (right_col, X_AXIS)[LEFT];
+	{
+	  Real shift = bar->extent (right_col, X_AXIS)[LEFT];
+	  ideal -= shift;
+	  min_desired_space -= shift;
+	}
     }
 
   ideal = max (ideal, min_desired_space);
   stem_dir_correction (me, right_col, increment, &ideal, &min_desired_space);
 
-  Spring ret (ideal, min_dist);
+  Spring ret (max (0.0, ideal), min_dist);
   ret.set_inverse_compress_strength (max (0.0, ideal - min_desired_space));
   ret.set_inverse_stretch_strength (max (0.1, base_space - increment));
   return ret;