source file of the GNU LilyPond music typesetter
- (c) 1998--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1998--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "group-interface.hh"
void
-Separating_group_spanner::find_rods (Item * r, SCM next)
+Separating_group_spanner::find_rods (Item * r, SCM next, Real padding)
{
/*
*/
if (Separation_item::width (r).is_empty ())
return;
-
+
+
for(; gh_pair_p (next); next = ly_cdr (next))
{
Item *l = dynamic_cast<Item*> (unsmob_grob (ly_car( next)));
rod.item_l_drul_[LEFT] = lb;
rod.item_l_drul_[RIGHT] = r;
- rod.distance_ = li[RIGHT] - ri[LEFT];
+ rod.distance_ = li[RIGHT] - ri[LEFT] + padding;
rod.add_to_cols ();
}
}
rod.item_l_drul_[LEFT] =l;
rod.item_l_drul_[RIGHT]=r;
- rod.distance_ = li[RIGHT] - ri[LEFT];
+ rod.distance_ = li[RIGHT] - ri[LEFT] + padding;
rod.add_to_cols ();
break;
}
}
-MAKE_SCHEME_CALLBACK (Separating_group_spanner,set_spacing_rods_and_seqs,1);
-SCM
-Separating_group_spanner::set_spacing_rods_and_seqs (SCM smob)
-{
- set_spacing_rods (smob);
-
- return SCM_UNSPECIFIED;
-}
-
MAKE_SCHEME_CALLBACK (Separating_group_spanner,set_spacing_rods,1);
SCM
Separating_group_spanner::set_spacing_rods (SCM smob)
{
Grob*me = unsmob_grob (smob);
+
+ /*
+ Ugh: padding is added doubly, also for SeparationItem
+ */
+ Real padding = robust_scm2double (me->get_grob_property ("padding"), 0.1);
for (SCM s = me->get_grob_property ("elements"); gh_pair_p (s) && gh_pair_p (ly_cdr (s)); s = ly_cdr (s))
{
Item *rb
= dynamic_cast<Item*> (r->find_prebroken_piece (LEFT));
- find_rods (r, ly_cdr (s));
+ find_rods (r, ly_cdr (s), padding);
if (rb)
- find_rods (rb, ly_cdr (s));
+ find_rods (rb, ly_cdr (s), padding);
}
return SCM_UNSPECIFIED ;
ADD_INTERFACE (Separating_group_spanner,"separation-spanner-interface",
- "Spanner that containing @code{separation-item-interface} grobs to calculate rods",
- "");
+ "A spanner that calculates spacing constraints (\"rods\") "
+ "using the @code{separation-item-interface} grobs in @code{elements}.",
+ "elements padding");