From: Joe Neeman <joeneeman@gmail.com>
Date: Fri, 17 Aug 2007 06:11:24 +0000 (+1000)
Subject: Use less space between notes and non-barlines.
X-Git-Tag: release/2.11.30-1~19
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=5b22a25acdddcefdb982e413b4b82eb4cee7b4d8;p=lilypond.git

Use less space between notes and non-barlines.
---

diff --git a/lily/note-spacing.cc b/lily/note-spacing.cc
index cd97c17970..93be9228e2 100644
--- a/lily/note-spacing.cc
+++ b/lily/note-spacing.cc
@@ -86,6 +86,8 @@ Note_spacing::get_spacing (Grob *me, Item *right_col,
 	  ideal -= shift;
 	  min_desired_space -= max (shift, 0.0);
 	}
+      else
+	ideal -= right_col->extent (right_col, X_AXIS)[RIGHT];
     }
 
   ideal = max (ideal, min_desired_space);
diff --git a/lily/spacing-determine-loose-columns.cc b/lily/spacing-determine-loose-columns.cc
index 5b13c82264..fe072bca0a 100644
--- a/lily/spacing-determine-loose-columns.cc
+++ b/lily/spacing-determine-loose-columns.cc
@@ -157,7 +157,7 @@ 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))
 	    {