X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftab-note-heads-engraver.cc;h=18a1e122f6eee8318005c52ba642e292254dd01e;hb=90e4d7057f3857da049dfda3d130017d4719bd6b;hp=c4789566cc1af80893aadc7b55422667058f12ad;hpb=e24fb7cc5671aea95211d4a0c56f28fb6fe8720e;p=lilypond.git

diff --git a/lily/tab-note-heads-engraver.cc b/lily/tab-note-heads-engraver.cc
index c4789566cc..18a1e122f6 100644
--- a/lily/tab-note-heads-engraver.cc
+++ b/lily/tab-note-heads-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2002--2014 Han-Wen Nienhuys, Jean-Baptiste Lamy <jiba@tuxfamily.org>,
+  Copyright (C) 2002--2015 Han-Wen Nienhuys, Jean-Baptiste Lamy <jiba@tuxfamily.org>,
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -49,33 +49,31 @@ public:
   TRANSLATOR_DECLARATIONS (Tab_note_heads_engraver);
 
 protected:
-  DECLARE_TRANSLATOR_LISTENER (note);
-  DECLARE_TRANSLATOR_LISTENER (string_number);
-  DECLARE_TRANSLATOR_LISTENER (fingering);
+  void listen_note (Stream_event *);
+  void listen_string_number (Stream_event *);
+  void listen_fingering (Stream_event *);
   void process_music ();
 
   void stop_translation_timestep ();
 };
 
-Tab_note_heads_engraver::Tab_note_heads_engraver ()
+Tab_note_heads_engraver::Tab_note_heads_engraver (Context *c)
+  : Engraver (c)
 {
 }
 
-IMPLEMENT_TRANSLATOR_LISTENER (Tab_note_heads_engraver, note);
 void
 Tab_note_heads_engraver::listen_note (Stream_event *ev)
 {
   note_events_.push_back (ev);
 }
 
-IMPLEMENT_TRANSLATOR_LISTENER (Tab_note_heads_engraver, string_number);
 void
 Tab_note_heads_engraver::listen_string_number (Stream_event *ev)
 {
   tabstring_events_.push_back (ev);
 }
 
-IMPLEMENT_TRANSLATOR_LISTENER (Tab_note_heads_engraver, fingering);
 void
 Tab_note_heads_engraver::listen_fingering (Stream_event *ev)
 {
@@ -111,12 +109,12 @@ Tab_note_heads_engraver::process_music ()
   bool length_changed = (note_events_.size () != fret_count);
   vsize index;
 
-  if (string_fret_finger != SCM_EOL)
+  if (!scm_is_null (string_fret_finger))
     for (vsize i = 0; i < fret_count; i++)
       {
         note_entry = scm_list_ref (string_fret_finger, scm_from_int (i));
         string_number = scm_car (note_entry);
-        if (string_number != SCM_BOOL_F)
+        if (scm_is_true (string_number))
           {
             fret = scm_cadr (note_entry);
             fret_label = scm_call_3 (fret_procedure,
@@ -142,6 +140,14 @@ Tab_note_heads_engraver::stop_translation_timestep ()
   fingering_events_.clear ();
 }
 
+void
+Tab_note_heads_engraver::boot ()
+{
+  ADD_LISTENER (Tab_note_heads_engraver, note);
+  ADD_LISTENER (Tab_note_heads_engraver, string_number);
+  ADD_LISTENER (Tab_note_heads_engraver, fingering);
+}
+
 ADD_TRANSLATOR (Tab_note_heads_engraver,
                 /* doc */
                 "Generate one or more tablature note heads from event of type"