* lily/slur.cc (outside_slur_callback): make offset_scm optional.

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

diff --git a/lily/spacing-spanner.cc b/lily/spacing-spanner.cc
index 04ad54765e56754b9fbc0ed52a021ce634c5dcea..3e7aa266bd7c5cd214f8e3ba5f10adfeaa9c8e2e 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,7 +264,6 @@ Spacing_spanner::musical_column_spacing (Grob *me,
          if (!lext.is_empty ())
            compound_note_space += -lext[LEFT];
        }
-      
     }
   else
     {
@@ -500,10 +497,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 +509,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.",
+              
               "");