use springs instead of fixed/distance pairs

[lilypond.git] / lily / note-spacing.cc

diff --git a/lily/note-spacing.cc b/lily/note-spacing.cc
index a886c31a417f0d15f3a60c8d3a0d0dc09be118a8..1274fe98c4b8c8a8150cd6b86602173f348c9846 100644 (file)
--- a/lily/note-spacing.cc
+++ b/lily/note-spacing.cc
@@ -27,9 +27,9 @@
   spacing?
 */
 
-void
+Spring
 Note_spacing::get_spacing (Grob *me, Item *right_col,
-                          Real base_space, Real increment, Real *space, Real *fixed)
+                          Real base_space, Real increment)
 {
   vector<Item*> note_columns = Spacing_interface::left_note_columns (me);
   Real left_head_end = 0;
@@ -65,19 +65,15 @@ Note_spacing::get_spacing (Grob *me, Item *right_col,
     the full amount of space.
   */
   Real min_dist = Spacing_interface::minimum_distance (me);
+  Real min_desired_space = max (left_head_end + (min_dist - left_head_end) / 2,
+                               min_dist - (base_space - increment) / 2);
+  Real ideal = base_space - increment + min_desired_space;
 
-  *fixed = max (left_head_end + (min_dist - left_head_end) / 2,
-               min_dist - (base_space - increment) / 2);
-
-  /*
-    We don't do complicated stuff: (base_space - increment) is the
-    normal amount of white, which also determines the amount of
-    stretch. Upon (extreme) stretching, notes with accidentals should
-    stretch as much as notes without accidentals.
-  */
-  *space = (base_space - increment) + *fixed;
+  stem_dir_correction (me, right_col, increment, &ideal, &min_desired_space);
 
-  stem_dir_correction (me, right_col, increment, space, fixed);
+  Spring ret (ideal, min_dist);
+  ret.set_inverse_compress_strength (ideal - max (min_dist, min_desired_space));
+  return ret;
 }