X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdrum-note-engraver.cc;h=73bec0ed9f83f171ea060e9b74a7295ad4cf1c21;hb=90e4d7057f3857da049dfda3d130017d4719bd6b;hp=c8dbabca1cffbdf927c01b4c0c440b59edffddac;hpb=4bb29573149a0ffa1f881c5e38a0fe68e9e76b67;p=lilypond.git

diff --git a/lily/drum-note-engraver.cc b/lily/drum-note-engraver.cc
index c8dbabca1c..73bec0ed9f 100644
--- a/lily/drum-note-engraver.cc
+++ b/lily/drum-note-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -43,17 +43,17 @@ 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 ();
 };
 
-Drum_notes_engraver::Drum_notes_engraver ()
+Drum_notes_engraver::Drum_notes_engraver (Context *c)
+  : Engraver (c)
 {
 }
 
-IMPLEMENT_TRANSLATOR_LISTENER (Drum_notes_engraver, note);
 void
 Drum_notes_engraver::listen_note (Stream_event *ev)
 {
@@ -63,12 +63,12 @@ Drum_notes_engraver::listen_note (Stream_event *ev)
 void
 Drum_notes_engraver::process_music ()
 {
-  SCM tab = 0;
+  if (events_.empty ())
+    return;
+
+  SCM tab = get_property ("drumStyleTable");
   for (vsize i = 0; i < events_.size (); i++)
     {
-      if (!tab)
-        tab = get_property ("drumStyleTable");
-
       Stream_event *ev = events_[i];
       Item *note = make_item ("NoteHead", ev->self_scm ());
 
@@ -76,7 +76,7 @@ Drum_notes_engraver::process_music ()
 
       SCM defn = SCM_EOL;
 
-      if (scm_hash_table_p (tab) == SCM_BOOL_T)
+      if (to_boolean (scm_hash_table_p (tab)))
         defn = scm_hashq_ref (tab, drum_type, SCM_EOL);
 
       if (scm_is_pair (defn))
@@ -85,7 +85,7 @@ Drum_notes_engraver::process_music ()
           SCM style = scm_car (defn);
           SCM script = scm_cadr (defn);
 
-          if (scm_integer_p (pos) == SCM_BOOL_T)
+          if (scm_is_integer (pos))
             note->set_property ("staff-position", pos);
           if (scm_is_symbol (style))
             note->set_property ("style", style);
@@ -128,6 +128,8 @@ Drum_notes_engraver::acknowledge_note_column (Grob_info inf)
       if (!e->get_parent (X_AXIS)
           && Side_position_interface::get_axis (e) == Y_AXIS)
         e->set_parent (inf.grob (), X_AXIS);
+
+      Side_position_interface::add_support (e, inf.grob ());
     }
 }
 
@@ -138,8 +140,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 */