X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fkievan-ligature-engraver.cc;h=162674df2efd378bc138224661fde167330b7517;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=0439640c2f30f50ce8a521840c3bd438855c93c2;hpb=f127e14af04f474d20406ca0e0f76f05061ee103;p=lilypond.git diff --git a/lily/kievan-ligature-engraver.cc b/lily/kievan-ligature-engraver.cc index 0439640c2f..162674df2e 100644 --- a/lily/kievan-ligature-engraver.cc +++ b/lily/kievan-ligature-engraver.cc @@ -29,8 +29,6 @@ #include "translator.icc" -using std::vector; - class Kievan_ligature_engraver : public Coherent_ligature_engraver { @@ -38,23 +36,17 @@ protected: virtual Spanner *create_ligature_spanner (); virtual void build_ligature (Spanner *ligature, vector const &primitives); - DECLARE_TRANSLATOR_LISTENER (ligature); public: TRANSLATOR_DECLARATIONS (Kievan_ligature_engraver); + TRANSLATOR_INHERIT (Coherent_ligature_engraver); private: void fold_up_primitives (vector const &primitives, Real padding, Real &min_length); }; -IMPLEMENT_TRANSLATOR_LISTENER (Kievan_ligature_engraver, ligature); -void -Kievan_ligature_engraver::listen_ligature (Stream_event *ev) -{ - Ligature_engraver::listen_ligature (ev); -} - -Kievan_ligature_engraver::Kievan_ligature_engraver () +Kievan_ligature_engraver::Kievan_ligature_engraver (Context *c) + : Coherent_ligature_engraver (c) { } @@ -137,8 +129,14 @@ Kievan_ligature_engraver::build_ligature (Spanner *ligature, } -ADD_ACKNOWLEDGER (Kievan_ligature_engraver, rest); -ADD_ACKNOWLEDGER (Kievan_ligature_engraver, ligature_head); + +void +Kievan_ligature_engraver::boot () +{ + ADD_LISTENER (Kievan_ligature_engraver, ligature); + ADD_ACKNOWLEDGER (Kievan_ligature_engraver, rest); + ADD_ACKNOWLEDGER (Kievan_ligature_engraver, ligature_head); +} ADD_TRANSLATOR (Kievan_ligature_engraver, /* doc */