X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frhythmic-column-engraver.cc;h=55462e76a970b4cba3b742d8523524b727d18a69;hb=d9b43b93f2c885409bafdb157138158f65cc49aa;hp=914a2c2ecfdefa1577e9f4757a5c861e07d5671a;hpb=3a0e9efb7f067e5b334ba0596b95e15d96d7cc49;p=lilypond.git diff --git a/lily/rhythmic-column-engraver.cc b/lily/rhythmic-column-engraver.cc index 914a2c2ecf..55462e76a9 100644 --- a/lily/rhythmic-column-engraver.cc +++ b/lily/rhythmic-column-engraver.cc @@ -3,133 +3,179 @@ source file of the GNU LilyPond music typesetter - (c) 1997--1999 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ -#include "dimension-cache.hh" + #include "slur.hh" -#include "rhythmic-column-engraver.hh" -#include "note-head.hh" +#include "engraver.hh" +#include "rhythmic-head.hh" #include "stem.hh" #include "note-column.hh" #include "dot-column.hh" #include "musical-request.hh" +#include "item.hh" +#include "group-interface.hh" + + + +/* + this engraver glues together stems, rests and note heads into a NoteColumn + grob. + + It also generates spacing objects. Originally, we have tried to + have the spacing functionality at different levels. + + - by simply using the sequence of Separation-item as + spacing-sequences (at staff level). Unfortunately, this fucks up if + there are different kinds of tuplets in different voices (8th and + 8ths triplets combined made the program believe there were 1/12 th + notes.). + + Doing it in a separate engraver using timing info is generally + complicated (start/end time management), and fucks up if a voice + changes staff. + + Now we do it from here again. This has the problem that voices can + appear and disappear at will, leaving lots of loose ends (the note + spacing engraver don't know where to connect the last note of the + voice on the right with), but we don't complain about those, and let + the default spacing do its work. + + */ + + +class Rhythmic_column_engraver :public Engraver +{ + Link_array rhead_l_arr_; + Grob * stem_l_; + Grob * note_column_; + Grob * dotcol_l_; + + Grob * last_spacing_; + Grob * spacing_; + + TRANSLATOR_DECLARATIONS(Rhythmic_column_engraver); +protected: + + virtual void acknowledge_grob (Grob_info); + virtual void create_grobs (); + virtual void stop_translation_timestep (); + virtual void start_translation_timestep (); +}; + + -Rhythmic_column_engraver::Rhythmic_column_engraver() +Rhythmic_column_engraver::Rhythmic_column_engraver () { + spacing_ =0 ; + last_spacing_ = 0; + stem_l_ =0; - ncol_p_=0; + note_column_=0; dotcol_l_ =0; } void -Rhythmic_column_engraver::process_acknowledged () +Rhythmic_column_engraver::create_grobs () { if (rhead_l_arr_.size ()) { - if (!ncol_p_) + if (!note_column_) { - ncol_p_ = new Note_column; - announce_element (Score_element_info (ncol_p_, 0)); + note_column_ = new Item (get_property ("NoteColumn")); + Note_column::set_interface (note_column_); + announce_grob (note_column_, 0); + + + spacing_ = new Item (get_property ("NoteSpacing")); + spacing_->set_grob_property ("left-items", gh_cons (note_column_->self_scm (), SCM_EOL)); + announce_grob (spacing_, 0); + + if (last_spacing_) + { + Pointer_group_interface::add_grob (last_spacing_, + ly_symbol2scm ("right-items" ), + note_column_); + } + } for (int i=0; i < rhead_l_arr_.size (); i++) { - if (!rhead_l_arr_[i]->parent_l(X_AXIS)) - ncol_p_->add_head (rhead_l_arr_[i]); + if (!rhead_l_arr_[i]->get_parent (X_AXIS)) + Note_column::add_head (note_column_, rhead_l_arr_[i]); } rhead_l_arr_.set_size (0); } - if (ncol_p_) + if (note_column_) { if (dotcol_l_ - && !dotcol_l_->parent_l(X_AXIS)) + && !dotcol_l_->get_parent (X_AXIS)) { - ncol_p_->set_dotcol (dotcol_l_); + Note_column::set_dotcol (note_column_, dotcol_l_); } if (stem_l_ - && !stem_l_->parent_l(X_AXIS)) + && !stem_l_->get_parent (X_AXIS)) { - ncol_p_->set_stem (stem_l_); + Note_column::set_stem (note_column_, stem_l_); stem_l_ = 0; } - 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++) - grace_slur_endings_[i]->add_column (ncol_p_); - grace_slur_endings_.clear (); } } void -Rhythmic_column_engraver::acknowledge_element (Score_element_info i) +Rhythmic_column_engraver::acknowledge_grob (Grob_info i) { - 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 (i.elem_l_)) - return ; - - Item * item = dynamic_cast (i.elem_l_); - if (Stem*s=dynamic_cast (item)) + Item * item = dynamic_cast (i.grob_l_); + if (item && Stem::has_interface (item)) { - stem_l_ = s; + stem_l_ = item; } - else if (Rhythmic_head*r=dynamic_cast (item)) + else if (item && Rhythmic_head::has_interface (item)) { - rhead_l_arr_.push (r); + rhead_l_arr_.push (item); } - else if (Dot_column*d =dynamic_cast (item)) + else if (item && Dot_column::has_interface (item)) { - dotcol_l_ = d; + dotcol_l_ = item; } - else if (Slur *s = dynamic_cast (i.elem_l_)) - { - /* - end slurs starting on grace notes - */ - - if (s->get_elt_property (grace_scm_sym) != SCM_BOOL_F) - grace_slur_endings_.push (s); - } } void -Rhythmic_column_engraver::do_pre_move_processing() +Rhythmic_column_engraver::stop_translation_timestep () { - if (ncol_p_) + if (note_column_) { - SCM sh = get_property ("horizontalNoteShift", 0); - if (SCM_NUMBERP(sh)) - { - ncol_p_->set_elt_property (horizontal_shift_scm_sym, sh); - } - - sh = get_property ("forceHorizontalShift" ,0); - if (SCM_NUMBERP(sh)) - { - ncol_p_->set_elt_property (force_hshift_scm_sym, sh); - } + typeset_grob (note_column_); + note_column_ =0; + } - typeset_element (ncol_p_); - ncol_p_ =0; + if (spacing_) + { + typeset_grob (spacing_); + last_spacing_ = spacing_; + spacing_ =0; } } void -Rhythmic_column_engraver::do_post_move_processing() +Rhythmic_column_engraver::start_translation_timestep () { - grace_slur_endings_.clear (); dotcol_l_ =0; stem_l_ =0; } -ADD_THIS_TRANSLATOR(Rhythmic_column_engraver); + + +ENTER_DESCRIPTION(Rhythmic_column_engraver, +/* descr */ "Generates NoteColumn, an objects that groups stems, noteheads and rests.", +/* creats*/ "NoteColumn NoteSpacing", +/* acks */ "stem-interface rhythmic-head-interface dot-column-interface", +/* reads */ "", +/* write */ "");