(LY_DEFINE): new file.

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

diff --git a/lily/spacing-spanner.cc b/lily/spacing-spanner.cc
index f67cf4d2fb9b734f206eee8d9113a976c79743ee..64eecf07586d1a419a2853739e4432c3a3200ab0 100644 (file)
--- a/lily/spacing-spanner.cc
+++ b/lily/spacing-spanner.cc
@@ -181,10 +181,10 @@ Spacing_spanner::prune_loose_columns (Grob *me, Link_array<Grob> *cols, Rational
            Either object can be non existent, if the score ends
            prematurely.
          */
-         
-         rns = scm_car (unsmob_grob (rns)->get_object ("right-items"));
+
+         extract_grob_set (unsmob_grob (rns), "right-items", right_items);
          c->set_object ("between-cols", scm_cons (lns,
-                                                  rns));
+                                                  right_items[0]->self_scm ()));
 
          /*
            Set distance constraints for loose columns
@@ -290,7 +290,7 @@ Spacing_spanner::set_explicit_neighbor_columns (Link_array<Grob> const &cols)
          if (right_rank <= min_rank)
            {
              if (right_rank < min_rank)
-               right_neighbors = SCM_EOL;
+               rn_arr->clear ();
 
              min_rank = right_rank;
              rn_arr->add (wish);
@@ -895,8 +895,9 @@ Spacing_spanner::note_spacing (Grob *me, Grob *lc, Grob *rc,
   shortest_playing_len = max (shortest_playing_len, delta_t);
   if (delta_t.main_part_ && !lwhen.grace_part_)
     {
-      dist = get_duration_space (me, shortest_playing_len, shortest.main_part_, expand_only);
-      dist *= (double) (delta_t.main_part_ / shortest_playing_len.main_part_);
+      dist = get_duration_space (me, shortest_playing_len,
+                                shortest.main_part_, expand_only);
+      dist *= double (delta_t.main_part_ / shortest_playing_len.main_part_);
     }
   else if (delta_t.grace_part_)
     {
@@ -925,9 +926,14 @@ ADD_INTERFACE (Spacing_spanner, "spacing-spanner-interface",
               "gets 2 note heads width (i.e. the space following a note is 1 note\n"
               "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",
-              "grace-space-factor spacing-increment base-shortest-duration shortest-duration-space common-shortest-duration");
+              
+              "grace-space-factor spacing-increment base-shortest-duration "
+              "shortest-duration-space common-shortest-duration"
+
+              );
 
 ADD_INTERFACE (Spacing_interface, "spacing-interface",
-              "Something to do with line breaking and spacing. Kill this one after determining line breaks.",
+              "Something to do with line breaking and spacing. "
+              "Kill this one after determining line breaks.",
               "");