source file of the GNU LilyPond music typesetter
-(c) 2002--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+(c) 2002--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
Grob * me =unsmob_grob (s);
Grob * par = me->get_parent (X_AXIS);
- if (!to_boolean (par->get_grob_property ("alignment-done")))
+ if (!to_boolean (par->get_grob_property ("positioning-done")))
{
- par->set_grob_property ("alignment-done", SCM_BOOL_T);
+ par->set_grob_property ("positioning-done", SCM_BOOL_T);
position_accidentals (par);
}
if (!extent.is_empty ())
{
- Real p = gh_scm2double (me->get_grob_property ("left-padding"));
+ Real p = robust_scm2double (me->get_grob_property ("left-padding"), 0.2);
extent[LEFT] -= p;
}
head_ape-> left_skyline_ = head_skyline;
head_ape->offset_ = 0.0;
- SCM rs = me->get_grob_property ("right-padding");
- if (gh_number_p (rs))
- head_ape->offset_ -= gh_scm2double (rs);
+ head_ape->offset_ -= robust_scm2double ( me->get_grob_property ("right-padding"), 0);
- Real padding = 0.2;
- SCM spad = me->get_grob_property ("padding");
- if (gh_number_p (spad))
- padding = gh_scm2double (spad);
+ Real padding = robust_scm2double (me->get_grob_property ("padding"),0.2);
Array<Skyline_entry> left_skyline = head_ape->left_skyline_;
/*
for (int i = ape->extents_.size(); i--;)
right_extent.unite (ape->offset_ + ape->extents_[i][X_AXIS]);
- SCM ls = me->get_grob_property ("left-padding");
- if (gh_number_p (rs))
- left_extent[LEFT] -= gh_scm2double (ls);
+
+ left_extent[LEFT] -= robust_scm2double (me->get_grob_property ("left-padding"), 0);
Interval width(left_extent[LEFT], right_extent[RIGHT]);
ADD_INTERFACE(Accidental_placement,
"accidental-placement-interface",
"Take care of complex accidental collisions.",
- "left-padding padding right-padding accidental-grobs alignment-done")
+ "left-padding padding right-padding accidental-grobs positioning-done")