X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fseparating-group-spanner.cc;h=14e457b6ef047a3caf2bb245d44210e44aa79b18;hb=730c54a571ab3b6c30e02be5f93c876abee0f9a7;hp=9ce1156d171bccdf9b29d9287e68eed29592a568;hpb=76f13ab50fc726c89fa7c96f3deed519d2d773dc;p=lilypond.git

diff --git a/lily/separating-group-spanner.cc b/lily/separating-group-spanner.cc
index 9ce1156d17..14e457b6ef 100644
--- a/lily/separating-group-spanner.cc
+++ b/lily/separating-group-spanner.cc
@@ -1,113 +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--2000 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 "separation-item.hh"
 #include "paper-column.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
 #include "dimensions.hh"
-#include "group-interface.hh"
+#include "pointer-group-interface.hh"
 
-static Rod
-make_rod (Single_malt_grouping_item *l, Single_malt_grouping_item *r)
+void
+Separating_group_spanner::find_rods (Item *r,
+				     vector<Grob*> const &separators,
+				     vsize idx,
+				     Real padding)
 {
-  Rod rod;
-
-  Interval li (l->my_width ());
-  Interval ri (r->my_width ());
 
-  rod.item_l_drul_[LEFT] =l;
-  rod.item_l_drul_[RIGHT]=r;
-
-  if (li.empty_b () || ri.empty_b ())
-    rod.distance_f_ = 0;
-  else
-    rod.distance_f_ = li[RIGHT] - ri[LEFT];
-
-  rod.columnize ();
-  return rod;
-}
-  
-
-Array<Rod>
-Separating_group_spanner::get_rods () const
-{
-  Array<Rod> a;
-  
-  for (SCM s = get_elt_pointer ("elements"); gh_pair_p (s) && gh_pair_p (gh_cdr (s)); s = gh_cdr (s))
+  /*
+    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--)
     {
-      /*
-	Order of elements is reversed!
-       */
-      SCM elt = gh_cadr (s);
-      SCM next_elt = gh_car (s);
-
-      Single_malt_grouping_item *l = dynamic_cast<Single_malt_grouping_item*> (unsmob_element (elt));
-      Single_malt_grouping_item *r = dynamic_cast<Single_malt_grouping_item*> (unsmob_element ( next_elt));
+      Item *l = dynamic_cast<Item *> (separators[idx]);
+      Item *lb = l->find_prebroken_piece (RIGHT);
 
-      if (!r || !l)
-	continue;
-      
-      Single_malt_grouping_item *lb
-	= dynamic_cast<Single_malt_grouping_item*>(l->find_prebroken_piece (RIGHT));
-
-      Single_malt_grouping_item *rb
-	= dynamic_cast<Single_malt_grouping_item*>(r->find_prebroken_piece (LEFT));
-      
-      a.push (make_rod(l,  r));
       if (lb)
 	{
-	  Rod rod(make_rod (lb, r));
-	  a.push (rod);
-	}
-      
-      if (rb)
-	{
-	  a.push (make_rod (l, rb));
+	  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 rod(make_rod (lb, rb));
-	  a.push (rod);
+	  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.
+      */
     }
+}
+
+MAKE_SCHEME_CALLBACK (Separating_group_spanner, set_spacing_rods, 1);
+SCM
+Separating_group_spanner::set_spacing_rods (SCM smob)
+{
+  Grob *me = unsmob_grob (smob);
 
   /*
-    We've done our job, so we get lost. 
-   */
-  for (SCM s = get_elt_pointer ("elements"); gh_pair_p (s); s = gh_cdr (s))
+    Ugh: padding is added doubly, also for SeparationItem
+  */
+  Real padding = robust_scm2double (me->get_property ("padding"), 0.1);
+
+  extract_grob_set (me, "elements", elts);
+  for (vsize i = elts.size (); i-- > 1;)
     {
-      Item * it =dynamic_cast<Item*>(unsmob_element (gh_car (s)));
-      if (it && it->broken_b ())
-	{
-	  it->find_prebroken_piece (LEFT) ->suicide ();
-	  it->find_prebroken_piece (RIGHT)->suicide ();
-	}
-      it->suicide ();
+      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);
     }
-  
-  ((Separating_group_spanner *)this)->suicide ();
-  
-  return a;
+
+  return SCM_UNSPECIFIED;
 }
 
 void
-Separating_group_spanner::add_spacing_unit (Single_malt_grouping_item*i)
+Separating_group_spanner::add_spacing_unit (Grob *me, Item *i)
 {
-  Pointer_group_interface (this, "elements").add_element (i);
-  add_dependency (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}.",
 
-Separating_group_spanner::Separating_group_spanner (SCM s)
-  : Spanner (s)  
-{
-  set_elt_pointer ("elements", SCM_EOL);
-}
+	       /* properties */
+	       "elements "
+	       "padding ");