Merge branch 'jneeman' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

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

diff --git a/lily/spacing-spanner.cc b/lily/spacing-spanner.cc
index 5aca1009612d5ffd9a3ac2fc80147a9faaad8000..31f7df6c8e72fba6e118f9dd2e0f4bf945cbe109 100644 (file)
--- a/lily/spacing-spanner.cc
+++ b/lily/spacing-spanner.cc
@@ -10,8 +10,10 @@
 
 #include <math.h>
 #include <cstdio>
+
 using namespace std;
 
+#include "spacing-options.hh"
 #include "international.hh"
 #include "main.hh"
 #include "moment.hh"
@@ -26,32 +28,20 @@ using namespace std;
 #include "system.hh"
 #include "warn.hh"
 
-
-/*
-  TODO:
-
-  use callback instead?
-
-*/
-Rational
-Spacing_spanner::effective_shortest_duration (Grob *me,
-                                             vector<Grob*> const &all)
+vector<Grob*>
+Spacing_spanner::get_columns (Spanner *me)
 {
-  SCM preset_shortest = me->get_property ("common-shortest-duration");
-  Rational global_shortest;
-  if (unsmob_moment (preset_shortest))
-    global_shortest = unsmob_moment (preset_shortest)->main_part_;
-  else
-    {
-      global_shortest = Spacing_spanner::find_shortest (me, all);
-      if (be_verbose_global)
-       message (_f ("Global shortest duration is %s", global_shortest.to_string ()) + "\n");
-    }
+  vector<Grob*> all (get_root_system (me)->columns ());
+  vsize start = binary_search (all, (Grob*)me->get_bound (LEFT),
+                              &Paper_column::less_than);
+  vsize end = binary_search (all, (Grob*) me->get_bound (RIGHT),
+                            &Paper_column::less_than);
 
-  return global_shortest;
+  all = vector<Grob*>::vector<Grob*> (all.begin () + start,
+                                     all.begin () + end + 1);
+  return all;
 }
 
-
 MAKE_SCHEME_CALLBACK (Spacing_spanner, set_springs, 1);
 SCM
 Spacing_spanner::set_springs (SCM smob)
@@ -61,20 +51,11 @@ Spacing_spanner::set_springs (SCM smob)
   /*
     can't use get_system() ? --hwn.
   */
-  vector<Grob*> all (get_root_system (me)->columns ());
-  vsize start = binary_search (all, (Grob*)me->get_bound (LEFT),
-                              &Paper_column::compare);
-  vsize end = binary_search (all, (Grob*) me->get_bound (RIGHT),
-                            &Paper_column::compare);
-
-  all = vector<Grob*>::vector<Grob*> (all.begin () + start,
-                                     all.begin () + end + 1);
-  
+  vector<Grob*> all (get_columns (me));
   set_explicit_neighbor_columns (all);
 
   Spacing_options options;
   options.init_from_grob (me);
-  options.global_shortest_ = effective_shortest_duration (me, all);
 
   prune_loose_columns (me, &all, &options);
   set_implicit_neighbor_columns (all);
@@ -92,9 +73,15 @@ Spacing_spanner::set_springs (SCM smob)
   note has a different duration, but hey, don't write that kind of
   stuff, then.
 */
-Rational
-Spacing_spanner::find_shortest (Grob *me, vector<Grob*> const &cols)
+
+MAKE_SCHEME_CALLBACK (Spacing_spanner, calc_common_shortest_duration, 1);
+SCM 
+Spacing_spanner::calc_common_shortest_duration (SCM grob)
 {
+  Spanner *me = unsmob_spanner (grob);
+
+  vector<Grob*> cols (get_columns (me));
+  
   /*
     ascending in duration
   */
@@ -172,7 +159,7 @@ Spacing_spanner::find_shortest (Grob *me, vector<Grob*> const &cols)
   if (max_idx >= 0)
     d = min (d, durations[max_idx]);
 
-  return d;
+  return Moment (d).smobbed_copy ();
 }
 
 void
@@ -279,12 +266,11 @@ Spacing_spanner::musical_column_spacing (Grob *me,
          if (!lext.is_empty ())
            compound_note_space += -lext[LEFT];
        }
-      
     }
   else
     {
       int wish_count = 0;
-
+      
       extract_grob_set (left_col, "right-neighbors", neighbors);
 
       /*
@@ -332,8 +318,33 @@ Spacing_spanner::musical_column_spacing (Grob *me,
 
       if (compound_note_space < 0 || wish_count == 0)
        {
-         compound_note_space = base_note_space;
-         compound_fixed_note_space = options->increment_;
+
+         if (!Paper_column::is_musical (right_col))
+           {
+             Real left_col_stick_out = robust_relative_extent (left_col, left_col,  X_AXIS)[RIGHT];
+             compound_fixed_note_space = max (left_col_stick_out, options->increment_);
+
+             compound_note_space = max (base_note_space,
+                                        base_note_space - options->increment_ + left_col_stick_out);
+           }
+         else
+           {
+             /*
+               Fixed should be 0.0. If there are no spacing wishes, we're
+               likely dealing with polyphonic spacing of hemiolas.
+           
+               We used to have compound_fixed_note_space = options->increment_
+
+               but this can lead to numeric instability problems when we
+               do
+           
+               inverse_strength = (compound_note_space - compound_fixed_note_space)
+      
+             */
+
+             compound_note_space = base_note_space;
+             compound_fixed_note_space = 0.0;
+           }
        }
       else if (to_boolean (me->get_property ("average-spacing-wishes")))
        {
@@ -484,7 +495,7 @@ Spacing_spanner::breakable_column_spacing (Grob *me, Item *l, Item *r,
   Spaceable_grob::add_spring (l, r, distance, inverse_strength);
 }
 
-ADD_INTERFACE (Spacing_spanner, "spacing-spanner-interface",
+ADD_INTERFACE (Spacing_spanner,
               "The space taken by a note is dependent on its duration. Doubling a\n"
               "duration adds spacing-increment to the space. The most common shortest\n"
               "note gets @code{shortest-duration-space}. Notes that are even shorter are\n"
@@ -500,17 +511,18 @@ ADD_INTERFACE (Spacing_spanner, "spacing-spanner-interface",
               "average-spacing-wishes "
               "base-shortest-duration "
               "common-shortest-duration "
-              "grace-space-factor "
               "packed-spacing "
               "shortest-duration-space "
               "spacing-increment "
+              "strict-grace-spacing "
               "strict-note-spacing "
               "uniform-stretching "
               
               );
 
-ADD_INTERFACE (Spacing_interface, "spacing-interface",
+ADD_INTERFACE (Spacing_interface,
               "Something to do with line breaking and spacing. "
               "Kill this one after determining line breaks.",
+              
               "");