(c) 1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
+#include "dimension-cache.hh"
#include "slur.hh"
#include "rhythmic-column-engraver.hh"
#include "note-head.hh"
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;
}
- /*
- since ncol_p_ is announced, it already has its grace_scm_sym set, if we're
- in a Grace context.
- */
- if (ncol_p_->get_elt_property (grace_scm_sym) == SCM_BOOL_F)
+
+ bool wegrace = get_property ("weAreGraceContext",0).to_bool ();
+
+ if (!wegrace)
for (int i=0; i < grace_slur_endings_.size(); i++)
grace_slur_endings_[i]->add_column (ncol_p_);
grace_slur_endings_.clear ();
void
Rhythmic_column_engraver::acknowledge_element (Score_element_info i)
{
+ if ((get_property ("weAreGraceContext",0).to_bool () !=
+ (i.elem_l_->get_elt_property (grace_scm_sym) != SCM_BOOL_F))
+ && !dynamic_cast<Slur*> (i.elem_l_))
+ return ;
+
Item * item = dynamic_cast <Item *> (i.elem_l_);
if (Stem*s=dynamic_cast<Stem *> (item))
{
if (ncol_p_)
{
Scalar sh = get_property ("horizontalNoteShift", 0);
- // egcs
- if (sh.to_bool () && sh.isnum_b ())
+ if (sh.isnum_b ())
{
ncol_p_->set_elt_property (horizontal_shift_scm_sym,
gh_int2scm (int (sh)));
}
+ sh = get_property ("forceHorizontalShift" ,0);
+ if (sh.isnum_b ())
+ {
+ ncol_p_->set_elt_property (force_hshift_scm_sym,
+ gh_double2scm (double (sh)));
+ }
+
typeset_element (ncol_p_);
ncol_p_ =0;
}
stem_l_ =0;
}
-
-
-
-
ADD_THIS_TRANSLATOR(Rhythmic_column_engraver);