X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftext-engraver.cc;h=982b61a287461559c024b87911696bdf69b1870c;hb=8a493b7bc9aa4d34cd2970fc2223ec6920f0ed02;hp=f242fa4db2a9f4412d2630c6a2c593a957036d38;hpb=c054eb280fd9953596eb164f67b0f9d5555c5a32;p=lilypond.git diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc index f242fa4db2..982b61a287 100644 --- a/lily/text-engraver.cc +++ b/lily/text-engraver.cc @@ -42,11 +42,10 @@ protected: void stop_translation_timestep (); void process_music (); - DECLARE_ACKNOWLEDGER (note_column); - DECLARE_TRANSLATOR_LISTENER (text_script); + void acknowledge_note_column (Grob_info); + void listen_text_script (Stream_event *); }; -IMPLEMENT_TRANSLATOR_LISTENER (Text_engraver, text_script); void Text_engraver::listen_text_script (Stream_event *ev) { @@ -88,7 +87,7 @@ Text_engraver::acknowledge_note_column (Grob_info info) extract_grob_set (info.grob (), "note-heads", heads); Grob *x_parent = (heads.size () ? info.grob () - : Grob::unsmob (info.grob ()->get_object ("rest"))); + : unsmob (info.grob ()->get_object ("rest"))); for (vsize i = 0; i < scripts_.size (); i++) { @@ -110,7 +109,13 @@ Text_engraver::Text_engraver () { } -ADD_ACKNOWLEDGER (Text_engraver, note_column); + +void +Text_engraver::boot () +{ + ADD_LISTENER (Text_engraver, text_script); + ADD_ACKNOWLEDGER (Text_engraver, note_column); +} ADD_TRANSLATOR (Text_engraver, /* doc */