X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fseparating-group-spanner.cc;h=f8975cd5158e5eb62be38f642899c8d3972cc220;hb=9ca7fe6e8194a1db742ca381cbcd53c5a3d4e7ad;hp=dbef68ff5a95390d58829f5ee7165ede289577c7;hpb=fc3e875d6bf06f0680e897faffdcab36ad975a03;p=lilypond.git

diff --git a/lily/separating-group-spanner.cc b/lily/separating-group-spanner.cc
index dbef68ff5a..f8975cd515 100644
--- a/lily/separating-group-spanner.cc
+++ b/lily/separating-group-spanner.cc
@@ -1,110 +1,94 @@
-/*   
-  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--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 1998--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #include "separating-group-spanner.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 void
-do_rod (Item *l, Item *r)
+void
+Separating_group_spanner::find_rods (Item *r,
+				     vector<Grob*> const &separators,
+				     vsize idx,
+				     Real padding)
 {
-  Rod rod;
 
-  Interval li (Separation_item::my_width (l));
-  Interval ri (Separation_item::my_width (r));
+  /*
+    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--)
+    {
+      Item *l = dynamic_cast<Item *> (separators[idx]);
+      Item *lb = l->find_prebroken_piece (RIGHT);
 
-  rod.item_l_drul_[LEFT] =l;
-  rod.item_l_drul_[RIGHT]=r;
+      if (lb)
+	{
+	  Separation_item::set_distance (Drul_array<Item*> (lb, r), padding);
+	}
 
-  if (li.empty_b () || ri.empty_b ())
-    rod.distance_f_ = 0;
-  else
-    rod.distance_f_ = li[RIGHT] - ri[LEFT];
+      if (Separation_item::set_distance (Drul_array<Item *> (l, r), padding))
+	break;
 
-  rod.columnize ();
-  rod.add_to_cols ();
+      /*
+	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);
+
+MAKE_SCHEME_CALLBACK (Separating_group_spanner, set_spacing_rods, 1);
 SCM
 Separating_group_spanner::set_spacing_rods (SCM smob)
 {
-  Grob*me = unsmob_grob (smob);
-  
-  for (SCM s = me->get_grob_property ("elements"); gh_pair_p (s) && gh_pair_p (gh_cdr (s)); s = gh_cdr (s))
-    {
-      /*
-	Order of elements is reversed!
-       */
-      SCM elt = gh_cadr (s);
-      SCM next_elt = gh_car (s);
+  Grob *me = unsmob_grob (smob);
 
-      Item *l = dynamic_cast<Item*> (unsmob_grob (elt));
-      Item *r = dynamic_cast<Item*> (unsmob_grob (next_elt));
+  /*
+    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 *r = dynamic_cast<Item *> (elts[i]);
+      if (!r)
+	continue;
 
-      if (!r || !l)
+      if (Separation_item::width (r).is_empty ())
 	continue;
-      
-      Item *lb
-	= dynamic_cast<Item*> (l->find_prebroken_piece (RIGHT));
 
       Item *rb
-	= dynamic_cast<Item*> (r->find_prebroken_piece (LEFT));
-      
-      do_rod (l,  r);
-      if (lb)
-	{
-	  do_rod (lb, r);
-	}
-      
-      if (rb)
-	{
-	  do_rod (l, rb);
-	}
-      
-      if (lb && rb)
-	{
-	  do_rod (lb, 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);
     }
 
-  /*
-    We've done our job, so we get lost. 
-   */
-  for (SCM s = me->get_grob_property ("elements"); gh_pair_p (s); s = gh_cdr (s))
-    {
-      Item * it =dynamic_cast<Item*> (unsmob_grob (gh_car (s)));
-      if (it && it->broken_b ())
-	{
-	  it->find_prebroken_piece (LEFT) ->suicide ();
-	  it->find_prebroken_piece (RIGHT)->suicide ();
-	}
-      it->suicide ();
-    }
-  me->suicide ();
-  return SCM_UNSPECIFIED ;
+  return SCM_UNSPECIFIED;
 }
 
 void
-Separating_group_spanner::add_spacing_unit (Grob* me ,Item*i)
+Separating_group_spanner::add_spacing_unit (Grob *me, Item *i)
 {
-  Pointer_group_interface::add_element (me, "elements",i);
-  me->add_dependency (i);
+  Pointer_group_interface::add_unordered_grob (me, ly_symbol2scm ("elements"), i);
 }
 
+ADD_INTERFACE (Separating_group_spanner,
+	       "A spanner that calculates spacing constraints (\"rods\") "
+	       "using the @code{separation-item-interface} grobs in @code{elements}.",
 
-void
-Separating_group_spanner::set_interface (Grob*)
-{
-
-}
+	       /* properties */
+	       "elements "
+	       "padding ");