#include "grace-align-item.hh"
#include "align-interface.hh"
#include "note-column.hh"
-#include "local-key-item.hh"
#include "warn.hh"
#include "directional-element-interface.hh"
#include "side-position-interface.hh"
+#include "local-key-item.hh"
+#include "paper-def.hh"
/**
Catch notes, and put them in a row. Used for aligning grace notes.
*/
class Align_note_column_engraver: public Engraver
{
- Grace_align_item * align_item_p_;
- Note_column * now_column_l_;
- Local_key_item * accidental_l_;
+ Item * align_item_p_;
+ Score_element * now_column_l_;
+ Score_element * accidental_l_;
virtual void process_acknowledged ();
virtual void do_post_move_processing ();
void
Align_note_column_engraver::do_creation_processing ()
{
- align_item_p_ = new Grace_align_item (get_property ("basicGraceAlignItemProperties"));
- Side_position_interface (align_item_p_).set_axis (X_AXIS);
- Side_position_interface (align_item_p_).set_direction (LEFT);
+ align_item_p_ = new Item (get_property ("GraceAlignment"));
+ Grace_align_item::set_interface (align_item_p_);
+ Side_position::set_axis (align_item_p_, X_AXIS);
+ Side_position::set_direction (align_item_p_, LEFT);
// needed for setting font size.
- announce_element (Score_element_info (align_item_p_, 0));
+ announce_element (align_item_p_, 0);
}
void
if (isdir_b (al))
{
Direction d = to_dir (al);
- directional_element (align_item_p_).set (d);
+ Directional_element_interface::set (align_item_p_,d);
}
typeset_element (align_item_p_);
void
Align_note_column_engraver::acknowledge_element (Score_element_info inf)
{
- if (Note_column * n = dynamic_cast<Note_column*> (inf.elem_l_))
+ if (Note_column::has_interface(inf.elem_l_))
{
- now_column_l_ =n;
+ now_column_l_ =inf.elem_l_;
}
- else if (Local_key_item * it = dynamic_cast<Local_key_item*> (inf.elem_l_))
+ else if (Local_key_item::has_interface (inf.elem_l_))
{
- accidental_l_ = it;
+ accidental_l_ = inf.elem_l_;
}
}
void
B. it has no pscore_l_ field.
+
+ UGH UGH: separate note-spacing into separate class, and
+ use that to space grace notes.
*/
- SCM grsp = get_property ("graceAccidentalSpace");
+ SCM grsp = get_property ("graceAccidentalSpace") ;
if (gh_number_p(grsp))
{
/*
ugh.
*/
Real extra_space = gh_scm2double(grsp);
- SCM e = gh_cons (gh_double2scm (-extra_space), gh_double2scm (0.0));
+ SCM e = gh_cons (gh_double2scm (-extra_space),
+ gh_double2scm (0.0));
now_column_l_->set_elt_property ("extra-space", e);
}
}
if (now_column_l_)
{
- Align_interface (align_item_p_).add_element (now_column_l_);
+ Align_interface::add_element (align_item_p_,now_column_l_);
now_column_l_ =0;
}
}