#include "rest-column.hh"
bool
-Note_column_engraver::acceptable_elem_b (Score_elem const*elem_C)const
+Note_column_engraver::acceptable_elem_b (Score_elem const*elem_C) const
{
char const*nC = elem_C->name();
return (nC == Script::static_name() || nC == Note_head::static_name ()
- || nC == Stem::static_name());
+ || nC == Stem::static_name());
}
Note_column*
Note_column_engraver::note_col_l()
{
if (!ncol_p_)
{
- ncol_p_ = new Note_column;
- announce_element (Score_elem_info (ncol_p_, 0));
+ ncol_p_ = new Note_column;
+ announce_element (Score_elem_info (ncol_p_, 0));
}
return ncol_p_;
}
{
if (!restcol_p_)
{
- restcol_p_ = new Rest_column;
- announce_element (Score_elem_info (restcol_p_,0));
+ restcol_p_ = new Rest_column;
+ announce_element (Score_elem_info (restcol_p_,0));
}
return restcol_p_;
}
Note_column_engraver::acknowledge_element (Score_elem_info i)
{
if (!acceptable_elem_b (i.elem_l_))
- return;
+ return;
char const*nC = i.elem_l_->name();
if (nC == Script::static_name() && i.req_l_ && i.req_l_->musical ())
{
- script_l_arr_.push ((Script*)i.elem_l_->item());
+ script_l_arr_.push ((Script*)i.elem_l_->item());
}
else if (nC == Note_head::static_name())
{
- Note_head * h_l = (Note_head*)i.elem_l_->item();
- if (h_l->rest_b_)
- rest_col_l()->add (h_l);
- else
- note_col_l()->add (h_l);
+ Note_head * h_l = (Note_head*)i.elem_l_->item();
+ if (h_l->rest_b_)
+ rest_col_l()->add (h_l);
+ else
+ note_col_l()->add (h_l);
}
else if (nC == Stem::static_name())
{
- stem_l_ = (Stem*)i.elem_l_->item();
+ stem_l_ = (Stem*)i.elem_l_->item();
}
- if ( ncol_p_ || restcol_p_)
+ if (ncol_p_ || restcol_p_)
{
- if ( stem_l_)
- {
- if (restcol_p_&& !restcol_p_->stem_l_)
- restcol_p_->set (stem_l_);
- if (ncol_p_ && !ncol_p_->stem_l_)
- ncol_p_->set (stem_l_);
- }
+ if (stem_l_)
+ {
+ if (restcol_p_&& !restcol_p_->stem_l_)
+ restcol_p_->set (stem_l_);
+ if (ncol_p_ && !ncol_p_->stem_l_)
+ ncol_p_->set (stem_l_);
+ }
- for (int i=0; i < script_l_arr_.size(); i++)
- {
- if (restcol_p_)
- restcol_p_->add (script_l_arr_[i]);
- if ( ncol_p_)
- ncol_p_->add (script_l_arr_[i]);
- }
+ for (int i=0; i < script_l_arr_.size(); i++)
+ {
+ if (restcol_p_)
+ restcol_p_->add (script_l_arr_[i]);
+ if (ncol_p_)
+ ncol_p_->add (script_l_arr_[i]);
+ }
- script_l_arr_.clear();
+ script_l_arr_.clear();
}
}
{
if (ncol_p_)
{
- if (! ncol_p_->h_shift_b_)
- ncol_p_->h_shift_b_ = h_shift_b_;
- if (! ncol_p_->dir_i_)
- ncol_p_->dir_i_ = dir_i_;
+ if (! ncol_p_->h_shift_b_)
+ ncol_p_->h_shift_b_ = h_shift_b_;
+ if (! ncol_p_->dir_)
+ ncol_p_->dir_ = dir_;
- typeset_element (ncol_p_);
- ncol_p_ =0;
+ typeset_element (ncol_p_);
+ ncol_p_ =0;
}
if (restcol_p_)
{
- if (! restcol_p_->dir_i_)
- restcol_p_->dir_i_ = dir_i_;
+ if (! restcol_p_->dir_)
+ restcol_p_->dir_ = dir_;
- typeset_element (restcol_p_);
- restcol_p_ =0;
+ typeset_element (restcol_p_);
+ restcol_p_ =0;
}
}
void
Note_column_engraver::set_feature (Feature i)
{
- if (i.type_ == "vdir")
- dir_i_ = i.value_;
- if (i.type_ == "hshift")
- h_shift_b_ = (bool)(int)i.value_;
+ if (i.type_ == "vdir")
+ dir_ = (Direction) int(i.value_);
+ if (i.type_ == "hshift")
+ h_shift_b_ = (bool)(int)i.value_;
}
Note_column_engraver::Note_column_engraver()
{
- dir_i_ =0;
+ dir_ =CENTER;
h_shift_b_ = false;
ncol_p_=0;