Restrict spread of symbols in church rests

[lilypond.git] / lily / drum-note-engraver.cc

diff --git a/lily/drum-note-engraver.cc b/lily/drum-note-engraver.cc
index 37cf47a2174e4ad25145110ce4e843e12f912b2e..16b089cb703cca7877766b9e16ed202929357fbb 100644 (file)
--- a/lily/drum-note-engraver.cc
+++ b/lily/drum-note-engraver.cc
@@ -18,6 +18,7 @@
 */
 
 #include <cctype>
+using namespace std;
 
 #include "item.hh"
 #include "duration.hh"
@@ -32,8 +33,6 @@
 
 #include "translator.icc"
 
-using std::vector;
-
 class Drum_notes_engraver : public Engraver
 {
   vector<Item *> scripts_;
@@ -44,9 +43,9 @@ public:
 
 protected:
   void process_music ();
-  DECLARE_ACKNOWLEDGER (stem);
-  DECLARE_ACKNOWLEDGER (note_column);
-  DECLARE_TRANSLATOR_LISTENER (note);
+  void acknowledge_stem (Grob_info);
+  void acknowledge_note_column (Grob_info);
+  void listen_note (Stream_event *);
   void stop_translation_timestep ();
 };
 
@@ -54,7 +53,6 @@ Drum_notes_engraver::Drum_notes_engraver ()
 {
 }
 
-IMPLEMENT_TRANSLATOR_LISTENER (Drum_notes_engraver, note);
 void
 Drum_notes_engraver::listen_note (Stream_event *ev)
 {
@@ -141,8 +139,14 @@ Drum_notes_engraver::stop_translation_timestep ()
   events_.clear ();
 }
 
-ADD_ACKNOWLEDGER (Drum_notes_engraver, stem);
-ADD_ACKNOWLEDGER (Drum_notes_engraver, note_column);
+
+void
+Drum_notes_engraver::boot ()
+{
+  ADD_LISTENER (Drum_notes_engraver, note);
+  ADD_ACKNOWLEDGER (Drum_notes_engraver, stem);
+  ADD_ACKNOWLEDGER (Drum_notes_engraver, note_column);
+}
 
 ADD_TRANSLATOR (Drum_notes_engraver,
                 /* doc */