-/*
- 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--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-
- */
+
+ (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
#include "separating-group-spanner.hh"
+
#include "separation-item.hh"
#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)
{
/*
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)
{
Rod rod;
- rod.item_l_drul_[LEFT] = lb;
- rod.item_l_drul_[RIGHT] = r;
+ rod.item_drul_[LEFT] = lb;
+ rod.item_drul_[RIGHT] = r;
rod.distance_ = li[RIGHT] - ri[LEFT] + padding;
rod.add_to_cols ();
{
Rod rod;
- rod.item_l_drul_[LEFT] =l;
- rod.item_l_drul_[RIGHT]=r;
+ rod.item_drul_[LEFT] = l;
+ 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;
}
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);
+ Grob *me = unsmob_grob (smob);
/*
Ugh: padding is added doubly, also for SeparationItem
- */
+ */
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))
- {
- /*
- Order of elements is reversed!
- */
- SCM elt = scm_car (s);
- Item *r = unsmob_item (elt);
+ extract_grob_set (me, "elements", elts);
+ for (vsize i = elts.size (); i-- > 1;)
+ {
+ 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);
+ = dynamic_cast<Item *> (r->find_prebroken_piece (LEFT));
+
+ 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 ;
+ 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_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",
+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 ");