note-spacing: stretch somewhat uniformly

[lilypond.git] / lily / spacing-loose-columns.cc

diff --git a/lily/spacing-loose-columns.cc b/lily/spacing-loose-columns.cc
index bf8e13593aa4ed71074dc1c2e52fc6a2b186baf0..5bdb8b8c5173f3b2c84e423b016d596b6b833ddb 100644 (file)
--- a/lily/spacing-loose-columns.cc
+++ b/lily/spacing-loose-columns.cc
@@ -153,19 +153,14 @@ set_loose_columns (System *which, Column_x_positions const *posns)
           if (Paper_column::is_musical (next_col)
               && Paper_column::is_musical (loose_col))
             {
-              Real base = Spacing_spanner::note_spacing (spacing, loose_col, next_col,
-                                                         &options);
+              Spring spring = Spacing_spanner::note_spacing (spacing, loose_col,
+                                                             next_col, &options);
               if (Note_spacing::has_interface (spacing))
-                {
-                  Spring spring = Note_spacing::get_spacing (spacing, next_col, base, options.increment_);;
-                  base_note_space = spring.distance ();
-                  tight_note_space = spring.min_distance ();
-                }
-              else
-                {
-                  base_note_space = base;
-                  tight_note_space = base;
-                }
+                spring = Note_spacing::get_spacing (spacing, next_col,
+                                                    spring, options.increment_);
+
+              base_note_space = spring.distance ();
+              tight_note_space = spring.min_distance ();
             }
           else
             {