X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frhythmic-column-engraver.cc;h=f726dc88ab5c4533b026824412419386eb707740;hb=bdf4ab13203502e7ec7cf9cf5896527643a07c1f;hp=6d7fc6927b3135ba0b926006dc361300ef78d923;hpb=1cf3d59c1559fb9774c4c1c8cae155cfe54a927c;p=lilypond.git diff --git a/lily/rhythmic-column-engraver.cc b/lily/rhythmic-column-engraver.cc index 6d7fc6927b..f726dc88ab 100644 --- a/lily/rhythmic-column-engraver.cc +++ b/lily/rhythmic-column-engraver.cc @@ -1,120 +1,154 @@ /* - rhythmic-column-grav.cc -- implement Rhythmic_column_engraver + rhythmic-column-engraver.cc -- implement Rhythmic_column_engraver source file of the GNU LilyPond music typesetter - (c) 1997--1998 Han-Wen Nienhuys + (c) 1997--2005 Han-Wen Nienhuys */ -#include "rhythmic-column-engraver.hh" -#include "note-head.hh" +#include "engraver.hh" +#include "rhythmic-head.hh" #include "stem.hh" #include "note-column.hh" -#include "script.hh" #include "dot-column.hh" +#include "group-interface.hh" -Rhythmic_column_engraver::Rhythmic_column_engraver() +/* + 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 { - stem_l_ =0; - ncol_p_=0; - dotcol_l_ =0; -} + Link_array rheads_; + Grob *stem_; + Grob *note_column_; + Grob *dotcol_; + + Grob *last_spacing_; + Grob *spacing_; + + TRANSLATOR_DECLARATIONS (Rhythmic_column_engraver); +protected: + virtual void acknowledge_grob (Grob_info); + virtual void process_acknowledged_grobs (); + virtual void stop_translation_timestep (); +}; + +Rhythmic_column_engraver::Rhythmic_column_engraver () +{ + spacing_ = 0; + last_spacing_ = 0; + + stem_ = 0; + note_column_ = 0; + dotcol_ = 0; +} void -Rhythmic_column_engraver::process_acknowledged () +Rhythmic_column_engraver::process_acknowledged_grobs () { - if (rhead_l_arr_.size ()) + if (rheads_.size ()) { - if (!ncol_p_) + if (!note_column_) { - ncol_p_ = new Note_column; - announce_element (Score_element_info (ncol_p_, 0)); + note_column_ = make_item ("NoteColumn", rheads_[0]->self_scm ()); + + spacing_ = make_item ("NoteSpacing", SCM_EOL); + spacing_->set_property ("left-items", scm_cons (note_column_->self_scm (), SCM_EOL)); + + 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++) + for (int i = 0; i < rheads_.size (); i++) { - ncol_p_->add_head (rhead_l_arr_[i]); + if (!rheads_[i]->get_parent (X_AXIS)) + Note_column::add_head (note_column_, rheads_[i]); } - rhead_l_arr_.set_size (0); + rheads_.set_size (0); } - - if (ncol_p_) + if (note_column_) { - if (dotcol_l_) + if (dotcol_ + && !dotcol_->get_parent (X_AXIS)) { - ncol_p_->set_dotcol (dotcol_l_); + Note_column::set_dotcol (note_column_, dotcol_); } - if (stem_l_) + if (stem_ + && !stem_->get_parent (X_AXIS)) { - ncol_p_->set_stem (stem_l_); - stem_l_ = 0; + Note_column::set_stem (note_column_, stem_); + stem_ = 0; } - - for (int i=0; i < script_l_arr_.size(); i++) - { - if (ncol_p_) - ncol_p_->add_script (script_l_arr_[i]); - } - - script_l_arr_.clear(); } } void -Rhythmic_column_engraver::acknowledge_element (Score_element_info i) +Rhythmic_column_engraver::acknowledge_grob (Grob_info i) { - Item * item = i.elem_l_->access_Item (); - if (!item) + Item *item = dynamic_cast (i.grob_); + if (!item || item->get_parent (X_AXIS)) return; - if (item->is_type_b (Script::static_name ()) - && i.req_l_ - && i.req_l_->access_Musical_req ()) - { - script_l_arr_.push ((Script*)item); - } - else if (item->is_type_b (Stem::static_name())) + if (Stem::has_interface (item)) { - stem_l_ = (Stem*) item; + stem_ = item; } - else if (item->is_type_b (Rhythmic_head::static_name ())) + else if (Rhythmic_head::has_interface (item)) { - rhead_l_arr_.push ((Rhythmic_head*)item); + rheads_.push (item); } - else if (item->is_type_b (Dot_column::static_name ())) + else if (Dot_column::has_interface (item)) { - dotcol_l_ = (Dot_column*) item; + dotcol_ = item; } } void -Rhythmic_column_engraver::do_pre_move_processing() +Rhythmic_column_engraver::stop_translation_timestep () { - if (ncol_p_) + note_column_ = 0; + + if (spacing_) { - if (! ncol_p_->h_shift_b_) - // egcs - ncol_p_->h_shift_b_ = get_property ("hshift").operator bool (); - if (! ncol_p_->dir_) - ncol_p_->dir_ =(Direction) int(get_property ("ydirection")); - - typeset_element (ncol_p_); - ncol_p_ =0; + last_spacing_ = spacing_; + spacing_ = 0; } -} -void -Rhythmic_column_engraver::do_post_move_processing() -{ - script_l_arr_.clear(); - dotcol_l_ =0; - stem_l_ =0; + dotcol_ = 0; + stem_ = 0; } - - - -IMPLEMENT_IS_TYPE_B1(Rhythmic_column_engraver,Engraver); -ADD_THIS_TRANSLATOR(Rhythmic_column_engraver); +ADD_TRANSLATOR (Rhythmic_column_engraver, + /* descr */ "Generates NoteColumn, an objects that groups stems, noteheads and rests.", + /* creats*/ "NoteColumn NoteSpacing", + /* accepts */ "", + /* acks */ "stem-interface rhythmic-head-interface dot-column-interface", + /* reads */ "", + /* write */ "");