X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fligature-bracket-engraver.cc;h=9e50962ddcb2473a0158068bb26f13e67ff81568;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=cb37ead208e671b477346551b89519eb04b332c1;hpb=058370efc7e9710f149d0f444328bb1fcd7bdec1;p=lilypond.git diff --git a/lily/ligature-bracket-engraver.cc b/lily/ligature-bracket-engraver.cc index cb37ead208..9e50962ddc 100644 --- a/lily/ligature-bracket-engraver.cc +++ b/lily/ligature-bracket-engraver.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2002--2014 Juergen Reuter + Copyright (C) 2002--2015 Juergen Reuter LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -33,9 +33,9 @@ class Ligature_bracket_engraver : public Engraver protected: virtual void process_music (); virtual void stop_translation_timestep (); - DECLARE_ACKNOWLEDGER (rest); - DECLARE_ACKNOWLEDGER (note_column); - DECLARE_TRANSLATOR_LISTENER (ligature); + void acknowledge_rest (Grob_info); + void acknowledge_note_column (Grob_info); + void listen_ligature (Stream_event *); public: TRANSLATOR_DECLARATIONS (Ligature_bracket_engraver); @@ -46,7 +46,6 @@ private: Stream_event *previous_start_event_; }; -IMPLEMENT_TRANSLATOR_LISTENER (Ligature_bracket_engraver, ligature); void Ligature_bracket_engraver::listen_ligature (Stream_event *ev) { @@ -54,7 +53,8 @@ Ligature_bracket_engraver::listen_ligature (Stream_event *ev) ASSIGN_EVENT_ONCE (events_drul_[d], ev); } -Ligature_bracket_engraver::Ligature_bracket_engraver () +Ligature_bracket_engraver::Ligature_bracket_engraver (Context *c) + : Engraver (c) { ligature_ = 0; finished_ligature_ = 0; @@ -116,8 +116,14 @@ Ligature_bracket_engraver::stop_translation_timestep () finished_ligature_ = 0; } -ADD_ACKNOWLEDGER (Ligature_bracket_engraver, rest); -ADD_ACKNOWLEDGER (Ligature_bracket_engraver, note_column); + +void +Ligature_bracket_engraver::boot () +{ + ADD_LISTENER (Ligature_bracket_engraver, ligature); + ADD_ACKNOWLEDGER (Ligature_bracket_engraver, rest); + ADD_ACKNOWLEDGER (Ligature_bracket_engraver, note_column); +} ADD_TRANSLATOR (Ligature_bracket_engraver, /* doc */