X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frhythmic-column-engraver.cc;h=3c63236546d9a36980a3fe308bcf91395c087caa;hb=1855cf7137149c0bd27b5851fd9db498385591b3;hp=574bee667561cd3e8102d14d3cdba371cb4603c6;hpb=2fd5f86de0500ecd9a3f47a2540c3b304f835ef4;p=lilypond.git diff --git a/lily/rhythmic-column-engraver.cc b/lily/rhythmic-column-engraver.cc index 574bee6675..3c63236546 100644 --- a/lily/rhythmic-column-engraver.cc +++ b/lily/rhythmic-column-engraver.cc @@ -3,122 +3,171 @@ source file of the GNU LilyPond music typesetter - (c) 1997--1999 Han-Wen Nienhuys + (c) 1997--2004 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 "event.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 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 (); +}; -ADD_THIS_TRANSLATOR (Rhythmic_column_engraver); -Rhythmic_column_engraver::Rhythmic_column_engraver() + +Rhythmic_column_engraver::Rhythmic_column_engraver () { - stem_l_ =0; - ncol_p_=0; - dotcol_l_ =0; + 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++) { - if (!rhead_l_arr_[i]->parent_l(X_AXIS)) - 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_ - && !dotcol_l_->parent_l(X_AXIS)) + if (dotcol_ + && !dotcol_->get_parent (X_AXIS)) { - ncol_p_->set_dotcol (dotcol_l_); + Note_column::set_dotcol (note_column_, dotcol_); } - if (stem_l_ - && !stem_l_->parent_l(X_AXIS)) + 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; } - SCM wg = get_property ("weAreGraceContext",0); - bool wegrace = to_boolean (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 = to_boolean (wg); - if ((wegrace != - (i.elem_l_->get_elt_property ("grace") != SCM_UNDEFINED)) - && !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_); + if (!item || item->get_parent (X_AXIS)) + return ; + if (Stem::has_interface (item)) { - stem_l_ = s; + stem_ = item; } - else if (Rhythmic_head*r=dynamic_cast (item)) + else if (Rhythmic_head::has_interface (item)) { - rhead_l_arr_.push (r); + rheads_.push (item); } - else if (Dot_column*d =dynamic_cast (item)) + else if (Dot_column::has_interface (item)) { - dotcol_l_ = d; + dotcol_ = item; } - else if (Slur *s = dynamic_cast (i.elem_l_)) - { - /* - end slurs starting on grace notes - */ - - if (to_boolean (s->get_elt_property ("grace"))) - grace_slur_endings_.push (s); - } } void -Rhythmic_column_engraver::do_pre_move_processing() +Rhythmic_column_engraver::stop_translation_timestep () { - if (ncol_p_) + note_column_ =0; + + if (spacing_) { - typeset_element (ncol_p_); - ncol_p_ =0; + last_spacing_ = spacing_; + spacing_ =0; } + + dotcol_ =0; + stem_ =0; } -void -Rhythmic_column_engraver::do_post_move_processing() -{ - grace_slur_endings_.clear (); - dotcol_l_ =0; - stem_l_ =0; -} + +ENTER_DESCRIPTION (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 */ "");