X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fseparating-group-spanner.cc;h=5ef9038dfbc3859c1377da7368c658b4db08b855;hb=5d1d077e3d4f49fd822d3c04e785eee4be06a7fc;hp=8192ea7bccd1a6e372140ce660423fa5b3bda9c4;hpb=58bcc84c9480dae1b21bc24d8396b91fe19e0131;p=lilypond.git

diff --git a/lily/separating-group-spanner.cc b/lily/separating-group-spanner.cc
index 8192ea7bcc..5ef9038dfb 100644
--- a/lily/separating-group-spanner.cc
+++ b/lily/separating-group-spanner.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "separating-group-spanner.hh"
@@ -12,10 +12,13 @@
 #include "paper-column.hh"
 #include "output-def.hh"
 #include "dimensions.hh"
-#include "group-interface.hh"
+#include "pointer-group-interface.hh"
 
 void
-Separating_group_spanner::find_rods (Item *r, SCM next, Real padding)
+Separating_group_spanner::find_rods (Item *r,
+				     vector<Grob*> const &separators,
+				     vsize idx,
+				     Real padding)
 {
 
   /*
@@ -24,12 +27,9 @@ Separating_group_spanner::find_rods (Item *r, SCM next, Real padding)
     most cases, the interesting L will just be the first entry of
     NEXT, making it linear in most of the cases.
   */
-  if (Separation_item::width (r).is_empty ())
-    return;
-
-  for (; scm_is_pair (next); next = scm_cdr (next))
+  for (; idx != VPOS; idx--)
     {
-      Item *l = dynamic_cast<Item *> (unsmob_grob (scm_car (next)));
+      Item *l = dynamic_cast<Item *> (separators[idx]);
       Item *lb = l->find_prebroken_piece (RIGHT);
 
       if (lb)
@@ -55,11 +55,12 @@ Separating_group_spanner::find_rods (Item *r, SCM next, Real padding)
 	  Rod rod;
 
 	  rod.item_drul_[LEFT] = l;
-	  rod.item_drul_[RIGHT]= r;
+	  rod.item_drul_[RIGHT] = r;
 
 	  rod.distance_ = li[RIGHT] - ri[LEFT] + padding;
 
-	  rod.add_to_cols ();
+	  if (rod.distance_ > 0.0)
+	    rod.add_to_cols ();
 	  break;
 	}
 
@@ -67,7 +68,6 @@ Separating_group_spanner::find_rods (Item *r, SCM next, Real padding)
 	this grob doesn't cause a constraint. We look further until we
 	find one that does.
       */
-
     }
 }
 
@@ -82,23 +82,22 @@ Separating_group_spanner::set_spacing_rods (SCM smob)
   */
   Real padding = robust_scm2double (me->get_property ("padding"), 0.1);
 
-  for (SCM s = me->get_property ("elements"); scm_is_pair (s) && scm_is_pair (scm_cdr (s)); s = scm_cdr (s))
+  extract_grob_set (me, "elements", elts);
+  for (vsize i = elts.size (); i-- > 1;)
     {
-      /*
-	Order of elements is reversed!
-      */
-      SCM elt = scm_car (s);
-      Item *r = unsmob_item (elt);
-
+      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, scm_cdr (s), padding);
+      find_rods (r, elts, i - 1, padding);
       if (rb)
-	find_rods (rb, scm_cdr (s), padding);
+	find_rods (rb, elts, i - 1, padding);
     }
 
   return SCM_UNSPECIFIED;
@@ -107,12 +106,13 @@ Separating_group_spanner::set_spacing_rods (SCM smob)
 void
 Separating_group_spanner::add_spacing_unit (Grob *me, Item *i)
 {
-  Pointer_group_interface::add_grob (me, ly_symbol2scm ("elements"), i);
-  me->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}.",
-	       "elements padding");
+
+	       /* properties */
+	       "elements "
+	       "padding");