X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Ffootnote-engraver.cc;h=39e18cd57c897db66fb029fdd4bf7d4f5e375664;hb=aefc5a4057a0a61f1d7e4411cc1c5061d9aea6b7;hp=71cd9dd6ffeba996c535865dff3b337decc7369f;hpb=c7f7e636a7adc0dc113a7349cfc0698b8dd2e2bc;p=lilypond.git diff --git a/lily/footnote-engraver.cc b/lily/footnote-engraver.cc index 71cd9dd6ff..39e18cd57c 100644 --- a/lily/footnote-engraver.cc +++ b/lily/footnote-engraver.cc @@ -33,45 +33,22 @@ class Footnote_engraver : public Engraver { TRANSLATOR_DECLARATIONS (Footnote_engraver); - DECLARE_TRANSLATOR_LISTENER (footnote); DECLARE_ACKNOWLEDGER (grob); DECLARE_END_ACKNOWLEDGER (grob); - vector events_; + vector > annotated_spanners_; - void stop_translation_timestep (); void finalize (); - virtual void derived_mark () const; void footnotify (Grob *, SCM); }; -IMPLEMENT_TRANSLATOR_LISTENER (Footnote_engraver, footnote); -void -Footnote_engraver::listen_footnote (Stream_event *ev) -{ - events_.push_back (ev); -} - -void -Footnote_engraver::stop_translation_timestep () -{ - events_.clear (); -} - void Footnote_engraver::finalize () { annotated_spanners_.clear (); } -void -Footnote_engraver::derived_mark () const -{ - for (vsize i = 0; i < events_.size (); ++i) - scm_gc_mark (events_[i]->self_scm ()); -} - Footnote_engraver::Footnote_engraver () { } @@ -115,24 +92,8 @@ Footnote_engraver::acknowledge_grob (Grob_info info) // This grob has exhausted its footnote info.grob ()->set_property ("footnote-music", SCM_EOL); - return; - } - if (!events_.empty ()) - { - string grobname = info.grob ()->name (); - - for (vsize i = 0; i < events_.size (); i++) - { - SCM name = events_[i]->get_property ("symbol"); - if (scm_is_symbol (name) - && grobname == ly_symbol2string (name)) - { - footnotify (info.grob (), events_[i]->self_scm ()); - // Event has exhausted its footnote - events_[i]->set_property ("symbol", SCM_EOL); - } - } + return; } }