Take: separatING-group-spanner-interface.

[lilypond.git] / lily / separation-item.cc

diff --git a/lily/separation-item.cc b/lily/separation-item.cc
index cd73e38a9d57b63e97c47961c0c1135b889d0a0e..4a7f0f06720bb67d5779f434021ddfc90ac2c3c6 100644 (file)
--- a/lily/separation-item.cc
+++ b/lily/separation-item.cc
@@ -28,23 +28,57 @@ Separation_item::add_conditional_item (Grob *me, Grob *e)
 }
 
 void
-Separation_item::set_distance (Item *l, Item *r,
+Separation_item::set_skyline_distance (Drul_array<Item *> items,
+                                      Real padding)
+{
+  Drul_array<Skyline*> lines;
+  Direction d = LEFT;
+
+  do
+    {
+      SCM prop = items[d]->get_property ("skylines");
+      lines[d] = Skyline::unsmob (index_get_cell (prop, -d));
+    }
+  while (flip (&d) != LEFT);
+
+  Real dist = padding + lines[LEFT]->distance (*lines[RIGHT]);
+  if (dist > 0)
+    {
+      Rod rod;
+
+      rod.item_drul_ = items;
+
+      rod.distance_ = dist;
+      rod.add_to_cols ();
+    }  
+}
+
+bool
+Separation_item::set_distance (Drul_array<Item *> items,
                               Real padding)
 {
-  Interval li (Separation_item::width (l));
-  Interval ri (Separation_item::conditional_width (r, l));
+  if (!Item::is_non_musical (items[LEFT])
+      && !Item::is_non_musical (items[RIGHT]))
+    {
+      set_skyline_distance (items, padding);
+      return true;
+    }
+  
+  Interval li (Separation_item::width (items[LEFT]));
+  Interval ri (Separation_item::conditional_width (items[RIGHT], items[LEFT]));
   if (!li.is_empty () && !ri.is_empty ())
     {
       Rod rod;
 
-      rod.item_drul_[LEFT] = l;
-      rod.item_drul_[RIGHT] = r;
+      rod.item_drul_ = items;
 
       rod.distance_ = li[RIGHT] - ri[LEFT] + padding;
 
       if (rod.distance_  > 0)
        rod.add_to_cols ();
+      return true;
     }
+  return false;
 }
 
 /*
@@ -65,9 +99,8 @@ Separation_item::conditional_width (Grob *me, Grob *left)
       Item *il = dynamic_cast<Item *> (elts[i]);
       if (pc != il->get_column ())
        {
-         /* this shouldn't happen, but let's continue anyway. */
-         programming_error ("Separation_item:  I've been drinking too much");
-         continue;             /*UGH UGH*/
+         programming_error ("Separation_item element from wrong column");
+         continue;
        }
 
       if (to_boolean (il->get_property ("no-spacing-rods")))
@@ -92,10 +125,11 @@ Separation_item::calc_skylines (SCM smob)
   SCM lines = scm_cons (SCM_BOOL_F,SCM_BOOL_F);
 
   Direction d = LEFT;
+  vector<Box> bs = boxes (me);
   do
     {
-      Skyline l (boxes (me), X_AXIS, d);
-      index_set_cell (lines, d, ly_offsets2scm (l.to_points ()));
+      Skyline l (bs, Y_AXIS, d);
+      index_set_cell (lines, d, l.smobbed_copy ());
     }
   while (flip (&d) != LEFT);
 
@@ -126,8 +160,9 @@ Separation_item::boxes (Grob *me)
       if (to_boolean (il->get_property ("no-spacing-rods")))
        continue;
 
-      Box b (il->extent (pc, X_AXIS),
-            il->pure_height (ycommon, 0, very_large));
+      Interval y (il->pure_height (ycommon, 0, very_large));
+      y.widen (0.01);          // fixme
+      Box b (il->extent (pc, X_AXIS), y);
 
       out.push_back (b);
     }
@@ -223,10 +258,11 @@ Separation_item::extremal_break_aligned_grob (Grob *me,
 
 ADD_INTERFACE (Separation_item,
               "Item that computes widths to generate spacing rods. "
-              "This is done in concert with @ref{separation-spanner-interface}.",
+              "This is done in concert with @ref{separating-group-spanner-interface}.",
 
               "X-extent "
               "conditional-elements "
-              "elements"
+              "elements "
               "padding "
+              "skylines "
               );