X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fepisema-engraver.cc;h=d2fc2f398f9ac8856a0ef4b69cf2e5d3392edb20;hb=57ca7c6601ed88f6f5a02cb0724d1e87ff148b83;hp=233de4efbd5e1d40376fdf327faa2a95bf6aa1f8;hpb=f5a18c364cf7688d9ac6e09996a489a93a821b3c;p=lilypond.git

diff --git a/lily/episema-engraver.cc b/lily/episema-engraver.cc
index 233de4efbd..d2fc2f398f 100644
--- a/lily/episema-engraver.cc
+++ b/lily/episema-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2010--2012 Neil Puttock <n.puttock@gmail.com>
+  Copyright (C) 2010--2015 Neil Puttock <n.puttock@gmail.com>
 
   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 @@ public:
   TRANSLATOR_DECLARATIONS (Episema_engraver);
 protected:
   virtual void finalize ();
-  DECLARE_TRANSLATOR_LISTENER (episema);
-  DECLARE_ACKNOWLEDGER (note_column);
-  DECLARE_ACKNOWLEDGER (note_head);
+  void listen_episema (Stream_event *);
+  void acknowledge_note_column (Grob_info);
+  void acknowledge_note_head (Grob_info);
   void stop_translation_timestep ();
   void process_music ();
 
@@ -56,7 +56,6 @@ Episema_engraver::Episema_engraver ()
   event_drul_.set (0, 0);
 }
 
-IMPLEMENT_TRANSLATOR_LISTENER (Episema_engraver, episema);
 void
 Episema_engraver::listen_episema (Stream_event *ev)
 {
@@ -106,7 +105,7 @@ Episema_engraver::typeset_all ()
         {
           Grob *col = (note_columns_.size ()
                        ? note_columns_.back ()
-                       : unsmob_grob (get_property ("currentMusicalColumn")));
+                       : unsmob<Grob> (get_property ("currentMusicalColumn")));
           finished_->set_bound (RIGHT, col);
         }
       finished_ = 0;
@@ -120,7 +119,7 @@ Episema_engraver::stop_translation_timestep ()
     {
       Grob *col = (note_columns_.size ()
                    ? note_columns_.front ()
-                   : unsmob_grob (get_property ("currentMusicalColumn")));
+                   : unsmob<Grob> (get_property ("currentMusicalColumn")));
       span_->set_bound (LEFT, col);
     }
 
@@ -161,8 +160,14 @@ Episema_engraver::acknowledge_note_head (Grob_info info)
     }
 }
 
-ADD_ACKNOWLEDGER (Episema_engraver, note_column);
-ADD_ACKNOWLEDGER (Episema_engraver, note_head);
+
+void
+Episema_engraver::boot ()
+{
+  ADD_LISTENER (Episema_engraver, episema);
+  ADD_ACKNOWLEDGER (Episema_engraver, note_column);
+  ADD_ACKNOWLEDGER (Episema_engraver, note_head);
+}
 
 ADD_TRANSLATOR (Episema_engraver,
                 /* doc */