X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftrill-spanner-engraver.cc;h=6f5f28beb7006c31601f4808886760fc71e7c352;hb=362b15ebbdfdc5da1563ad2d4d75ceef449e998c;hp=d2ef7e1eb8045c836316aa3c838ed8ebe3667374;hpb=3f8485925e8c879fe4c9ae86acef9804126c3b91;p=lilypond.git diff --git a/lily/trill-spanner-engraver.cc b/lily/trill-spanner-engraver.cc index d2ef7e1eb8..6f5f28beb7 100644 --- a/lily/trill-spanner-engraver.cc +++ b/lily/trill-spanner-engraver.cc @@ -17,6 +17,7 @@ #include "international.hh" #include "note-column.hh" +#include "pointer-group-interface.hh" #include "side-position-interface.hh" #include "stream-event.hh" #include "spanner.hh" @@ -30,6 +31,8 @@ public: protected: virtual void finalize (); DECLARE_TRANSLATOR_LISTENER (trill_span); + DECLARE_ACKNOWLEDGER (note_column); + void stop_translation_timestep (); void process_music (); @@ -58,6 +61,21 @@ Trill_spanner_engraver::listen_trill_span (Stream_event *ev) ASSIGN_EVENT_ONCE (event_drul_[d], ev); } +void +Trill_spanner_engraver::acknowledge_note_column (Grob_info info) +{ + if (span_) { + Pointer_group_interface::add_grob (span_, + ly_symbol2scm ("note-columns"), + info.grob()); + add_bound_item (span_, info.grob ()); + } else if (finished_) { + Pointer_group_interface::add_grob (finished_, ly_symbol2scm ("note-columns"), + info.grob()); + add_bound_item (finished_, info.grob ()); + } +} + void Trill_spanner_engraver::process_music () { @@ -68,6 +86,7 @@ Trill_spanner_engraver::process_music () else { finished_ = span_; + announce_end_grob (finished_, SCM_EOL); span_ = 0; current_event_ = 0; } @@ -126,9 +145,18 @@ Trill_spanner_engraver::finalize () } } +ADD_ACKNOWLEDGER (Trill_spanner_engraver, note_column); + ADD_TRANSLATOR (Trill_spanner_engraver, - /* doc */ "Create trill spanner from an event.", + /* doc */ + "Create trill spanner from an event.", + /* create */ "TrillSpanner ", - /* read */ "", - /* write */ ""); + + /* read */ + "", + + /* write */ + "" + );