Use less space between notes and non-barlines.

diff --git a/lily/note-spacing.cc b/lily/note-spacing.cc
index cd97c179704a9feca75780ed2545215c87b1193d..93be9228e2f90ff06a5ec84eee17e2aa4509c471 100644 (file)
--- 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 5b13c82264362ded0f7f8717ee82bae0b77e824f..fe072bca0aba3a93097095595e49101faaded388 100644 (file)
--- 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))
            {