Merge branch 'jneeman' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

[lilypond.git] / lily / separating-group-spanner.cc

diff --git a/lily/separating-group-spanner.cc b/lily/separating-group-spanner.cc
index c905b430e78a3326be8148ac78adcf5d1fa3e039..fb8cce00226d91ec9171f54cca78be2e907cb2da 100644 (file)
--- a/lily/separating-group-spanner.cc
+++ b/lily/separating-group-spanner.cc
@@ -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
@@ -109,7 +85,7 @@ 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, "separating-group-spanner-interface",
+ADD_INTERFACE (Separating_group_spanner,
               "A spanner that calculates spacing constraints (\"rods\") "
               "using the @code{separation-item-interface} grobs in @code{elements}.",