X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fseparating-group-spanner.cc;h=5ef9038dfbc3859c1377da7368c658b4db08b855;hb=e012a172277f78d4954d269fd4973ad3fd6e5d60;hp=42ec3ee92c562448b409bcc17fa252d4282d00d8;hpb=77add406027ae5afda409a2e77b35852c5fae4f9;p=lilypond.git

diff --git a/lily/separating-group-spanner.cc b/lily/separating-group-spanner.cc
index 42ec3ee92c..5ef9038dfb 100644
--- a/lily/separating-group-spanner.cc
+++ b/lily/separating-group-spanner.cc
@@ -1,63 +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.ruu.nl>
-  
- */
+
+  (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #include "separating-group-spanner.hh"
-#include "single-malt-grouping-item.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]->breakable_b_;
+      Item *l = dynamic_cast<Item *> (separators[idx]);
+      Item *lb = l->find_prebroken_piece (RIGHT);
+
       if (lb)
 	{
-	  a.push (Rod ((Single_malt_grouping_item*) spacing_unit_l_arr_[i]->find_prebroken_piece (RIGHT),
-		       spacing_unit_l_arr_[i+1]));
-	}
-      bool rb=spacing_unit_l_arr_[i+1]->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 ())
 	{
-	  a.push (Rod ((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)));
+	  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_elem*o, Score_elem*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*)n->item () : 0;
-      spacing_unit_l_arr_.substitute ((Single_malt_grouping_item*)o->item (), 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");