X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fseparating-group-spanner.cc;h=fb8cce00226d91ec9171f54cca78be2e907cb2da;hb=2649586f759f68254919874fc4568a50eff2919c;hp=94aac0973486e391dbab515a2653142a49b31b4e;hpb=4248f11e51e95dcf14ff67cda43be64c0ea53871;p=lilypond.git

diff --git a/lily/separating-group-spanner.cc b/lily/separating-group-spanner.cc
index 94aac09734..fb8cce0022 100644
--- a/lily/separating-group-spanner.cc
+++ b/lily/separating-group-spanner.cc
@@ -16,7 +16,7 @@
 
 void
 Separating_group_spanner::find_rods (Item *r,
-				     Link_array<Grob> const &separators,
+				     vector<Grob*> const &separators,
 				     vsize idx,
 				     Real padding)
 {
@@ -34,35 +34,11 @@ Separating_group_spanner::find_rods (Item *r,
 
       if (lb)
 	{
-	  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 ();
-	    }
+	  Separation_item::set_distance (Drul_array<Item*> (lb, r), padding);
 	}
 
-      Interval li (Separation_item::width (l));
-      Interval ri (Separation_item::conditional_width (r, l));
-      if (!li.is_empty () && !ri.is_empty ())
-	{
-	  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;
-	}
+      if (Separation_item::set_distance (Drul_array<Item *> (l, r), padding))
+	break;
 
       /*
 	this grob doesn't cause a constraint. We look further until we
@@ -106,13 +82,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);
+  Pointer_group_interface::add_unordered_grob (me, ly_symbol2scm ("elements"), i);
 }
 
-ADD_INTERFACE (Separating_group_spanner, "separation-spanner-interface",
+ADD_INTERFACE (Separating_group_spanner,
 	       "A spanner that calculates spacing constraints (\"rods\") "
 	       "using the @code{separation-item-interface} grobs in @code{elements}.",
 
 	       /* properties */
 	       "elements "
-	       "padding");
+	       "padding ");