for (int i=0; i < rhead_l_arr_.size (); i++)
{
- if (!rhead_l_arr_[i]->dim_cache_[X_AXIS]->parent_l_)
+ if (!rhead_l_arr_[i]->parent_l(X_AXIS))
ncol_p_->add_head (rhead_l_arr_[i]);
}
rhead_l_arr_.set_size (0);
if (ncol_p_)
{
if (dotcol_l_
- && !dotcol_l_->dim_cache_[X_AXIS]->parent_l_)
+ && !dotcol_l_->parent_l(X_AXIS))
{
ncol_p_->set_dotcol (dotcol_l_);
}
if (stem_l_
- && !stem_l_->dim_cache_[X_AXIS]->parent_l_)
+ && !stem_l_->parent_l(X_AXIS))
{
ncol_p_->set_stem (stem_l_);
stem_l_ = 0;
}
-
- bool wegrace = get_property ("weAreGraceContext",0).to_bool ();
+ SCM wg = get_property ("weAreGraceContext",0);
+ bool wegrace = gh_boolean_p (wg) && gh_scm2bool (wg);
if (!wegrace)
for (int i=0; i < grace_slur_endings_.size(); i++)
void
Rhythmic_column_engraver::acknowledge_element (Score_element_info i)
{
- if ((get_property ("weAreGraceContext",0).to_bool () !=
+ SCM wg = get_property ("weAreGraceContext",0);
+ bool wegrace = gh_boolean_p (wg) && gh_scm2bool (wg);
+ if ((wegrace !=
(i.elem_l_->get_elt_property (grace_scm_sym) != SCM_BOOL_F))
&& !dynamic_cast<Slur*> (i.elem_l_))
return ;
{
if (ncol_p_)
{
- Scalar sh = get_property ("horizontalNoteShift", 0);
- if (sh.isnum_b ())
+ SCM sh = get_property ("horizontalNoteShift", 0);
+ if (SCM_NUMBERP(sh))
{
- ncol_p_->set_elt_property (horizontal_shift_scm_sym,
- gh_int2scm (int (sh)));
+ ncol_p_->set_elt_property (horizontal_shift_scm_sym, sh);
}
sh = get_property ("forceHorizontalShift" ,0);
- if (sh.isnum_b ())
+ if (SCM_NUMBERP(sh))
{
- ncol_p_->set_elt_property (force_hshift_scm_sym,
- gh_double2scm (double (sh)));
+ ncol_p_->set_elt_property (force_hshift_scm_sym, sh);
}
typeset_element (ncol_p_);