add breakableSeparationItem to extra encompass for slurs. This fixes

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

diff --git a/lily/separating-group-spanner.cc b/lily/separating-group-spanner.cc
index baf2ea14ae0bd053cc74408e39f14f3e5614c138..14e457b6ef047a3caf2bb245d44210e44aa79b18 100644 (file)
--- 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"
@@ -16,8 +16,8 @@
 
 void
 Separating_group_spanner::find_rods (Item *r,
-                                    Link_array<Grob> const &separators,
-                                    int idx,
+                                    vector<Grob*> const &separators,
+                                    vsize idx,
                                     Real padding)
 {
 
@@ -27,7 +27,7 @@ Separating_group_spanner::find_rods (Item *r,
     most cases, the interesting L will just be the first entry of
     NEXT, making it linear in most of the cases.
   */
-  for (; idx >= 0; idx--)
+  for (; idx != VPOS; idx--)
     {
       Item *l = dynamic_cast<Item *> (separators[idx]);
       Item *lb = l->find_prebroken_piece (RIGHT);
@@ -83,8 +83,7 @@ Separating_group_spanner::set_spacing_rods (SCM smob)
   Real padding = robust_scm2double (me->get_property ("padding"), 0.1);
 
   extract_grob_set (me, "elements", elts);
-  for (int i = elts.size ();
-       i-- > 1;)
+  for (vsize i = elts.size (); i-- > 1;)
     {
       Item *r = dynamic_cast<Item *> (elts[i]);
       if (!r)
@@ -107,11 +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 ");