X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frhythmic-column-engraver.cc;h=827a6fb94ff2a621c6685d050a070085126f613b;hb=e0ab7a37fa31290d42c9e5534ac5480c7d9f4a8f;hp=d57c1c49a5528f4c5280dac2d574afc0b6c37e62;hpb=3fa45148a1ccad976ab747eddc1762135c063bec;p=lilypond.git diff --git a/lily/rhythmic-column-engraver.cc b/lily/rhythmic-column-engraver.cc index d57c1c49a5..827a6fb94f 100644 --- a/lily/rhythmic-column-engraver.cc +++ b/lily/rhythmic-column-engraver.cc @@ -51,7 +51,6 @@ class Rhythmic_column_engraver : public Engraver TRANSLATOR_DECLARATIONS (Rhythmic_column_engraver); protected: - DECLARE_ACKNOWLEDGER (dot_column); DECLARE_ACKNOWLEDGER (stem); DECLARE_ACKNOWLEDGER (rhythmic_head); DECLARE_ACKNOWLEDGER (arpeggio); @@ -64,7 +63,6 @@ Rhythmic_column_engraver::Rhythmic_column_engraver () stem_ = 0; note_column_ = 0; - dotcol_ = 0; arpeggio_ = 0; } @@ -75,24 +73,17 @@ Rhythmic_column_engraver::process_acknowledged () if (rheads_.size ()) { if (!note_column_) - { - note_column_ = make_item ("NoteColumn", rheads_[0]->self_scm ()); - } + note_column_ = make_item ("NoteColumn", rheads_[0]->self_scm ()); for (vsize i = 0; i < rheads_.size (); i++) - { - if (!rheads_[i]->get_parent (X_AXIS)) - Note_column::add_head (note_column_, rheads_[i]); - } + if (!rheads_[i]->get_parent (X_AXIS)) + Note_column::add_head (note_column_, rheads_[i]); + rheads_.resize (0); } if (note_column_) { - if (dotcol_ - && !dotcol_->get_parent (X_AXIS)) - Note_column::set_dotcol (note_column_, dotcol_); - if (stem_ && !stem_->get_parent (X_AXIS)) { @@ -120,12 +111,6 @@ Rhythmic_column_engraver::acknowledge_rhythmic_head (Grob_info i) rheads_.push_back (i.grob ()); } -void -Rhythmic_column_engraver::acknowledge_dot_column (Grob_info i) -{ - dotcol_ = i.grob (); -} - void Rhythmic_column_engraver::acknowledge_arpeggio (Grob_info i) { @@ -136,12 +121,10 @@ void Rhythmic_column_engraver::stop_translation_timestep () { note_column_ = 0; - dotcol_ = 0; stem_ = 0; arpeggio_ = 0; } -ADD_ACKNOWLEDGER (Rhythmic_column_engraver, dot_column); ADD_ACKNOWLEDGER (Rhythmic_column_engraver, stem); ADD_ACKNOWLEDGER (Rhythmic_column_engraver, rhythmic_head); ADD_ACKNOWLEDGER (Rhythmic_column_engraver, arpeggio);