* lily/spacing-spanner.cc (musical_column_spacing): set

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

diff --git a/lily/spacing-spanner.cc b/lily/spacing-spanner.cc
index 39638ff007cfd28199893f3580c568068a566946..9c48aaec0a0a384413db2d6e35ada1cd3af3e549 100644 (file)
--- a/lily/spacing-spanner.cc
+++ b/lily/spacing-spanner.cc
@@ -35,7 +35,7 @@ using namespace std;
 */
 Rational
 Spacing_spanner::effective_shortest_duration (Grob *me,
-                                             Link_array__Grob_ const &all)
+                                             vector<Grob*> const &all)
 {
   SCM preset_shortest = me->get_property ("common-shortest-duration");
   Rational global_shortest;
@@ -56,13 +56,20 @@ MAKE_SCHEME_CALLBACK (Spacing_spanner, set_springs, 1);
 SCM
 Spacing_spanner::set_springs (SCM smob)
 {
-  Grob *me = unsmob_grob (smob);
+  Spanner *me = unsmob_spanner (smob);
 
   /*
     can't use get_system() ? --hwn.
   */
-  Link_array__Grob_ all (get_root_system (me)->columns ());
-
+  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);
+  
   set_explicit_neighbor_columns (all);
 
   Spacing_options options;
@@ -86,13 +93,13 @@ Spacing_spanner::set_springs (SCM smob)
   stuff, then.
 */
 Rational
-Spacing_spanner::find_shortest (Grob *me, Link_array__Grob_ const &cols)
+Spacing_spanner::find_shortest (Grob *me, vector<Grob*> const &cols)
 {
   /*
     ascending in duration
   */
-  std::vector<Rational> durations;
-  std::vector<int> counts;
+  vector<Rational> durations;
+  vector<int> counts;
 
   Rational shortest_in_measure;
   shortest_in_measure.set_infinite (1);
@@ -115,7 +122,7 @@ Spacing_spanner::find_shortest (Grob *me, Link_array__Grob_ const &cols)
          shortest_in_measure = min (shortest_in_measure, this_shortest.main_part_);
        }
       else if (!shortest_in_measure.is_infinity ()
-              && Item::is_breakable (cols[i]))
+              && Paper_column::is_breakable (cols[i]))
        {
          vsize j = 0;
          for (; j < durations.size (); j++)
@@ -225,19 +232,19 @@ Spacing_spanner::generate_pair_spacing (Grob *me,
 
 void
 Spacing_spanner::generate_springs (Grob *me,
-                                  Link_array__Grob_ const &cols,
+                                  vector<Grob*> const &cols,
                                   Spacing_options const *options)
 {
-  Paper_column *next = 0;
-  Paper_column *next_next = 0;
-  for (vsize i = cols.size (); i--;)
+  Paper_column *prev = 0;
+  for (vsize i = 0; i < cols.size (); i++)
     {
       Paper_column *col = dynamic_cast<Paper_column *> (cols[i]);
-      if (next)
-       generate_pair_spacing (me, col, next, next_next, options);
+      Paper_column *next = (i < cols.size()-1) ? dynamic_cast<Paper_column *> (cols[i+1]) : 0;
+      
+      if (i > 0)
+       generate_pair_spacing (me, prev, col, next, options);
 
-      next_next = next;
-      next = col;
+      prev = col;
     }
 }
 
@@ -260,7 +267,20 @@ Spacing_spanner::musical_column_spacing (Grob *me,
   Real compound_fixed_note_space = 0.0;
 
   if (options->stretch_uniformly_)
-    compound_note_space = base_note_space;
+    {
+      compound_note_space = base_note_space;
+            
+      if (!Paper_column::is_musical (right_col))
+       {
+         /*
+           Crude fix for notes that lead up to barlines and time sigs.
+         */
+         Interval lext = right_col->extent (right_col, X_AXIS);
+         if (!lext.is_empty ())
+           compound_note_space += -lext[LEFT];
+       }
+      
+    }
   else
     {
       int wish_count = 0;
@@ -312,8 +332,21 @@ Spacing_spanner::musical_column_spacing (Grob *me,
 
       if (compound_note_space < 0 || wish_count == 0)
        {
+         /*
+           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 = options->increment_;
+         compound_fixed_note_space = 0.0;
        }
       else if (to_boolean (me->get_property ("average-spacing-wishes")))
        {
@@ -476,15 +509,17 @@ ADD_INTERFACE (Spacing_spanner, "spacing-spanner-interface",
               "head width) A 16th note is followed by 0.5 note head width. The\n"
               "quarter note is followed by  3 NHW, the half by 4 NHW, etc.\n",
 
+              
               "average-spacing-wishes "
+              "base-shortest-duration "
+              "common-shortest-duration "
               "grace-space-factor "
+              "packed-spacing "
+              "shortest-duration-space "
               "spacing-increment "
-              "base-shortest-duration "
               "strict-note-spacing "
-              "shortest-duration-space "
-              "common-shortest-duration "
               "uniform-stretching "
-              "packed-spacing "
+              
               );
 
 ADD_INTERFACE (Spacing_interface, "spacing-interface",