remove spacing-interface.

diff --git a/lily/spacing-spanner.cc b/lily/spacing-spanner.cc
index ab623f29e8edcc1d947fb58e069d2152b7725ad3..515e6e081af6bcac3f10e352863d07514ac451af 100644 (file)
--- a/lily/spacing-spanner.cc
+++ b/lily/spacing-spanner.cc
@@ -394,21 +394,25 @@ Spacing_spanner::musical_column_spacing (Grob *me,
   Spaceable_grob::add_spring (left_col, right_col, distance, inverse_strength);
 }
 
+/*
+  Check if COL fills the whole measure.
+ */
 bool
-Spacing_spanner::fills_measure (Grob *me, Item *l, Item *r)
+Spacing_spanner::fills_measure (Grob *me, Item *left, Item *col)
 {
   System *sys = get_root_system (me);
-  Grob *next = sys->column (r->get_column()->get_rank () + 1);
+  Grob *next = sys->column (col->get_column()->get_rank () + 1);
   if (!next)
     return false;
 
-  if (Paper_column::is_musical (next))
+  if (Paper_column::is_musical (next)
+      || !Paper_column::is_used (next))
     return false;
   
   Moment dt =
-    Paper_column::when_mom (next) - Paper_column::when_mom (r);
+    Paper_column::when_mom (next) - Paper_column::when_mom (col);
   
-  Moment *len = unsmob_moment (l->get_property ("measure-length"));
+  Moment *len = unsmob_moment (left->get_property ("measure-length"));
   if (!len)
     return false;
   
@@ -497,6 +501,7 @@ Spacing_spanner::breakable_column_spacing (Grob *me, Item *l, Item *r,
     }
 
   if (Paper_column::is_musical (r)
+      && l->break_status_dir () == CENTER
       && fills_measure (me, l, r))
     {
       compound_space += 1.0; 
@@ -545,9 +550,3 @@ ADD_INTERFACE (Spacing_spanner,
               
               );
 
-ADD_INTERFACE (Spacing_interface,
-              "Something to do with line breaking and spacing. "
-              "Kill this one after determining line breaks.",
-              
-              "");
-

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 0c76b85e5c590bf527fc26d51897083e87c5fc04..8dd4bb63485ad1bdd766e5d8e87a0ffa44961f35 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -708,7 +708,7 @@
        (shortest-duration-space . 1.6)
        (meta . ((class . Spanner)
                 (interfaces . (grace-spacing-interface
-                               spacing-interface
+                               
                                spacing-options-interface
                                spanner-interface))))))
     (GridPoint
@@ -949,7 +949,7 @@
        (X-extent . #f)
        (meta . ((class . Spanner)
                 (interfaces . (spanner-interface
-                               lyric-hyphen-interface spacing-interface))
+                               lyric-hyphen-interface ))
                 ))
        ))
     
@@ -988,7 +988,7 @@
      . (
        (neutral-direction . ,DOWN)
        (meta . ((class . Item)
-                (interfaces . (melody-spanner-interface spacing-interface))))))
+                (interfaces . (melody-spanner-interface ))))))
     (MensuralLigature
      . (
        (thickness . 1.4)
@@ -1136,7 +1136,7 @@
        ;; If you ever change this back, please document! --hwn
        (knee-spacing-correction . 1.0)
        (meta . ((class . Item)
-                (interfaces . (spacing-interface
+                (interfaces . (
                                note-spacing-interface))))))
 
     (NoteName
@@ -1404,7 +1404,7 @@
        (Y-extent . ,ly:axis-group-interface::height)
        (skylines . ,ly:separation-item::calc-skylines)
        (meta . ((class . Item)
-                (interfaces . (spacing-interface
+                (interfaces . (
                                separation-item-interface))))))
 
     (SeparatingGroupSpanner
@@ -1412,7 +1412,7 @@
        (springs-and-rods . ,ly:separating-group-spanner::set-spacing-rods)
        (meta . ((class . Spanner)
                 (interfaces . (only-prebreak-interface
-                               spacing-interface
+                               
                                separating-group-spanner-interface))))))
 
     (Slur
@@ -1470,7 +1470,7 @@
        
        (base-shortest-duration . ,(ly:make-moment 3 16))
        (meta . ((class . Spanner)
-                (interfaces . (spacing-interface
+                (interfaces . (
                                spacing-options-interface                               
                                spacing-spanner-interface))))))
 
@@ -1520,8 +1520,7 @@
        (non-musical . #t)
        (stem-spacing-correction . 0.4)
        (meta . ((class . Item)
-                (interfaces . (spacing-interface
-                               staff-spacing-interface))))))
+                (interfaces . (staff-spacing-interface))))))
 
    
     (StaffSymbol