* scm/define-grobs.scm:

[lilypond.git] / lily / separating-group-spanner.cc

diff --git a/lily/separating-group-spanner.cc b/lily/separating-group-spanner.cc
index 059afad994521fe15d33079eaf802d79ec5c9be0..14e457b6ef047a3caf2bb245d44210e44aa79b18 100644 (file)
--- a/lily/separating-group-spanner.cc
+++ b/lily/separating-group-spanner.cc
@@ -1,72 +1,118 @@
-/*   
-  separating-group-spanner.cc --  implement Separating_group_spanner
-  
+/*
+  separating-group-spanner.cc -- implement Separating_group_spanner
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #include "separating-group-spanner.hh"
-#include "single-malt-grouping-item.hh"
-#include "p-col.hh"
-#include "paper-def.hh"
 
-Array<Rod>
-Separating_group_spanner::get_rods () const
+#include "separation-item.hh"
+#include "paper-column.hh"
+#include "output-def.hh"
+#include "dimensions.hh"
+#include "pointer-group-interface.hh"
+
+void
+Separating_group_spanner::find_rods (Item *r,
+                                    vector<Grob*> const &separators,
+                                    vsize idx,
+                                    Real padding)
 {
-  Array<Rod> a;
-  
-  for (int i=0; i < spacing_unit_l_arr_.size () -1; i++)
+
+  /*
+    This is an inner loop: look for the first normal (unbroken) Left
+    grob.  This looks like an inner loop (ie. quadratic total), but in
+    most cases, the interesting L will just be the first entry of
+    NEXT, making it linear in most of the cases.
+  */
+  for (; idx != VPOS; idx--)
     {
-      a.push (Rod (spacing_unit_l_arr_[i], spacing_unit_l_arr_[i+1]));
-      bool lb =spacing_unit_l_arr_[i]->column_l ()->breakable_b_;
+      Item *l = dynamic_cast<Item *> (separators[idx]);
+      Item *lb = l->find_prebroken_piece (RIGHT);
+
       if (lb)
        {
-         Rod r((Single_malt_grouping_item*)
-                      spacing_unit_l_arr_[i]->find_prebroken_piece (RIGHT),
-                      spacing_unit_l_arr_[i+1]);
-         r.distance_f_ += paper ()->interline_f () *1.5;
-         a.push (r);
-       }
-      bool rb=spacing_unit_l_arr_[i+1]->column_l ()->breakable_b_;
-      if (rb)
-       {
-         a.push (Rod (spacing_unit_l_arr_[i],
-                      (Single_malt_grouping_item*)
-                      spacing_unit_l_arr_[i+1]->find_prebroken_piece (LEFT)));
+         Interval li (Separation_item::width (lb));
+         Interval ri (Separation_item::conditional_width (r, lb));
+         if (!li.is_empty () && !ri.is_empty ())
+           {
+             Rod rod;
+
+             rod.item_drul_[LEFT] = lb;
+             rod.item_drul_[RIGHT] = r;
+
+             rod.distance_ = li[RIGHT] - ri[LEFT] + padding;
+             rod.add_to_cols ();
+           }
        }
-      if (lb && rb)
+
+      Interval li (Separation_item::width (l));
+      Interval ri (Separation_item::conditional_width (r, l));
+      if (!li.is_empty () && !ri.is_empty ())
        {
-         Rod r((Single_malt_grouping_item*)
-                      spacing_unit_l_arr_[i]->find_prebroken_piece (RIGHT),
-                      (Single_malt_grouping_item*)
-                      spacing_unit_l_arr_[i+1]->find_prebroken_piece (LEFT));
-         r.distance_f_ += paper ()->interline_f () *1.5;
-         a.push (r);
+         Rod rod;
+
+         rod.item_drul_[LEFT] = l;
+         rod.item_drul_[RIGHT] = r;
+
+         rod.distance_ = li[RIGHT] - ri[LEFT] + padding;
+
+         if (rod.distance_ > 0.0)
+           rod.add_to_cols ();
+         break;
        }
+
+      /*
+       this grob doesn't cause a constraint. We look further until we
+       find one that does.
+      */
     }
-      
-  return a;
 }
 
-void
-Separating_group_spanner::add_spacing_unit (Single_malt_grouping_item*i)
+MAKE_SCHEME_CALLBACK (Separating_group_spanner, set_spacing_rods, 1);
+SCM
+Separating_group_spanner::set_spacing_rods (SCM smob)
 {
-  spacing_unit_l_arr_.push (i);
-  add_dependency (i);
-}
+  Grob *me = unsmob_grob (smob);
 
-IMPLEMENT_IS_TYPE_B1(Separating_group_spanner, Spanner);
+  /*
+    Ugh: padding is added doubly, also for SeparationItem
+  */
+  Real padding = robust_scm2double (me->get_property ("padding"), 0.1);
 
-void
-Separating_group_spanner::do_substitute_dependency (Score_element*o, Score_element*n)
-{
-  if (o->is_type_b (Single_malt_grouping_item::static_name ()))
+  extract_grob_set (me, "elements", elts);
+  for (vsize i = elts.size (); i-- > 1;)
     {
-      Single_malt_grouping_item*ns = n ?
-       (Single_malt_grouping_item*)dynamic_cast <Item *> (n) : 0;
-      spacing_unit_l_arr_.substitute ((Single_malt_grouping_item*)dynamic_cast <Item *> (o), ns);
+      Item *r = dynamic_cast<Item *> (elts[i]);
+      if (!r)
+       continue;
+
+      if (Separation_item::width (r).is_empty ())
+       continue;
+
+      Item *rb
+       = dynamic_cast<Item *> (r->find_prebroken_piece (LEFT));
+
+      find_rods (r, elts, i - 1, padding);
+      if (rb)
+       find_rods (rb, elts, i - 1, padding);
     }
+
+  return SCM_UNSPECIFIED;
 }
 
+void
+Separating_group_spanner::add_spacing_unit (Grob *me, Item *i)
+{
+  Pointer_group_interface::add_unordered_grob (me, ly_symbol2scm ("elements"), i);
+}
+
+ADD_INTERFACE (Separating_group_spanner, "separation-spanner-interface",
+              "A spanner that calculates spacing constraints (\"rods\") "
+              "using the @code{separation-item-interface} grobs in @code{elements}.",
+
+              /* properties */
+              "elements "
+              "padding ");