* ly/gregorian-init.ly (neumeDemoLayout): update

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

diff --git a/lily/spacing-spanner.cc b/lily/spacing-spanner.cc
index 04ad54765e56754b9fbc0ed52a021ce634c5dcea..2f6e90326ccd06712ed8d48256d13a18706a1c4f 100644 (file)
--- a/lily/spacing-spanner.cc
+++ b/lily/spacing-spanner.cc
@@ -31,9 +31,9 @@ Spacing_spanner::get_columns (Spanner *me)
 {
   vector<Grob*> all (get_root_system (me)->columns ());
   vsize start = binary_search (all, (Grob*)me->get_bound (LEFT),
-                              &Paper_column::compare);
+                              &Paper_column::less_than);
   vsize end = binary_search (all, (Grob*) me->get_bound (RIGHT),
-                            &Paper_column::compare);
+                            &Paper_column::less_than);
 
   all = vector<Grob*>::vector<Grob*> (all.begin () + start,
                                      all.begin () + end + 1);
@@ -54,8 +54,6 @@ Spacing_spanner::set_springs (SCM smob)
 
   Spacing_options options;
   options.init_from_grob (me);
-  options.global_shortest_ = robust_scm2moment (me->get_property ("common-shortest-duration"),
-                                               Moment (Rational (1,8))).main_part_;
 
   prune_loose_columns (me, &all, &options);
   set_implicit_neighbor_columns (all);
@@ -266,12 +264,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);
 
       /*
@@ -319,21 +316,33 @@ 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.
+
+         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_
+               We used to have compound_fixed_note_space = options->increment_
 
-           but this can lead to numeric instability problems when we
-           do
+               but this can lead to numeric instability problems when we
+               do
            
-              inverse_strength = (compound_note_space - compound_fixed_note_space)
+               inverse_strength = (compound_note_space - compound_fixed_note_space)
       
-         */
-         
-         compound_note_space = base_note_space;
-         compound_fixed_note_space = 0.0;
+             */
+
+             compound_note_space = base_note_space;
+             compound_fixed_note_space = 0.0;
+           }
        }
       else if (to_boolean (me->get_property ("average-spacing-wishes")))
        {
@@ -500,10 +509,10 @@ 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 "
               
@@ -512,5 +521,6 @@ ADD_INTERFACE (Spacing_spanner, "spacing-spanner-interface",
 ADD_INTERFACE (Spacing_interface, "spacing-interface",
               "Something to do with line breaking and spacing. "
               "Kill this one after determining line breaks.",
+              
               "");