Merge commit '2799dfc'

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

diff --git a/lily/spacing-loose-columns.cc b/lily/spacing-loose-columns.cc
index ee19b29ab766c14176bab2c7b7dce116ad463a23..a59fa7d0f9350734baa6717ab25017ed25ec59cf 100644 (file)
--- a/lily/spacing-loose-columns.cc
+++ b/lily/spacing-loose-columns.cc
@@ -127,14 +127,11 @@ set_loose_columns (System *which, Column_x_positions const *posns)
                                                             &options);
          else
            {
-             Real fixed, space;
-             
-             Spacing_spanner::standard_breakable_column_spacing (spacing, 
-                                                                 loose_col, next_col,
-                                                                 &fixed, &space,
-                                                                 &options);
-
-             base_note_space = space;
+             Spring spring = Spacing_spanner::standard_breakable_column_spacing (spacing,
+                                                                                 loose_col, next_col,
+                                                                                 &options);
+
+             base_note_space = spring.distance ();
            }
 
          base_note_space = max (base_note_space,