Take: separatING-group-spanner-interface.

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

diff --git a/lily/separation-item.cc b/lily/separation-item.cc
index c9d673979985188596e783a617f44d8771e7848c..4a7f0f06720bb67d5779f434021ddfc90ac2c3c6 100644 (file)
--- a/lily/separation-item.cc
+++ b/lily/separation-item.cc
@@ -8,6 +8,7 @@
 
 #include "separation-item.hh"
 
+#include "skyline.hh"
 #include "paper-column.hh"
 #include "warn.hh"
 #include "pointer-group-interface.hh"
@@ -26,6 +27,60 @@ Separation_item::add_conditional_item (Grob *me, Grob *e)
   Pointer_group_interface::add_grob (me, ly_symbol2scm ("conditional-elements"), e);
 }
 
+void
+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)
+{
+  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_ = items;
+
+      rod.distance_ = li[RIGHT] - ri[LEFT] + padding;
+
+      if (rod.distance_  > 0)
+       rod.add_to_cols ();
+      return true;
+    }
+  return false;
+}
+
 /*
   Return the width of ME given that we are considering the object on
   the LEFT.
@@ -44,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")))
@@ -62,6 +116,60 @@ Separation_item::conditional_width (Grob *me, Grob *left)
   return w;
 }
 
+
+MAKE_SCHEME_CALLBACK(Separation_item,calc_skylines,1);
+SCM
+Separation_item::calc_skylines (SCM smob)
+{
+  Item *me = unsmob_item (smob);
+  SCM lines = scm_cons (SCM_BOOL_F,SCM_BOOL_F);
+
+  Direction d = LEFT;
+  vector<Box> bs = boxes (me);
+  do
+    {
+      Skyline l (bs, Y_AXIS, d);
+      index_set_cell (lines, d, l.smobbed_copy ());
+    }
+  while (flip (&d) != LEFT);
+
+  return lines;
+}
+
+
+vector<Box>
+Separation_item::boxes (Grob *me)
+{
+  Item *item = dynamic_cast<Item *> (me);
+
+  int very_large = INT_MAX;
+  Paper_column *pc = item->get_column ();
+  vector<Box> out;
+  extract_grob_set (me, "elements", elts);
+
+  Grob *ycommon = common_refpoint_of_array (elts, me, Y_AXIS);
+  
+  for (vsize i = 0; i < elts.size (); i++)
+    {
+      Item *il = dynamic_cast<Item *> (elts[i]);
+      if (pc != il->get_column ())
+       {
+         continue;
+       }
+
+      if (to_boolean (il->get_property ("no-spacing-rods")))
+       continue;
+
+      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);
+    }
+
+  return out;      
+}
+
 Interval
 Separation_item::width (Grob *me)
 {
@@ -150,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 "
               );