include local.make so compilers can set CHECK_SOURCE

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

diff --git a/lily/note-name-engraver.cc b/lily/note-name-engraver.cc
index b464eeefcf7bba9fb5aa853d3da96e58a9b72f29..f3c081f0395a5af2f0c5a95bc2f0af302d539c32 100644 (file)
--- a/lily/note-name-engraver.cc
+++ b/lily/note-name-engraver.cc
@@ -8,35 +8,35 @@
 
 #include "engraver.hh"
 #include "item.hh"
+#include "pitch.hh"
+#include "stream-event.hh"
+
+#include "translator.icc"
 
 class Note_name_engraver : public Engraver
 {
 public:
   TRANSLATOR_DECLARATIONS (Note_name_engraver);
 
-  Link_array<Music> events_;
-  Link_array<Item> texts_;
-  virtual bool try_music (Music *m);
+  vector<Stream_event*> events_;
+  vector<Item*> texts_;
+  DECLARE_TRANSLATOR_LISTENER (note);
   void process_music ();
   void stop_translation_timestep ();
 };
 
-bool
-Note_name_engraver::try_music (Music *m)
+IMPLEMENT_TRANSLATOR_LISTENER (Note_name_engraver, note);
+void
+Note_name_engraver::listen_note (Stream_event *ev)
 {
-  if (m->is_mus_type ("note-event"))
-    {
-      events_.push (m);
-      return true;
-    }
-  return false;
+  events_.push_back (ev);
 }
 
 void
 Note_name_engraver::process_music ()
 {
-  std::string s;
-  for (int i = 0; i < events_.size (); i++)
+  string s;
+  for (vsize i = 0; i < events_.size (); i++)
     {
       if (i)
        s += " ";
@@ -51,7 +51,7 @@ Note_name_engraver::process_music ()
     {
       Item *t = make_item ("NoteName", events_[0]->self_scm ());
       t->set_property ("text", scm_makfrom0str (s.c_str ()));
-      texts_.push (t);
+      texts_.push_back (t);
     }
 }
 
@@ -66,11 +66,8 @@ Note_name_engraver::Note_name_engraver ()
 {
 }
 
-#include "translator.icc"
-
 ADD_TRANSLATOR (Note_name_engraver,
-               /* doc */ "",
+               /* doc */ "Print pitches as words.",
                /* create */ "NoteName",
-               /* accept */ "note-event",
                /* read */ "printOctaveNames",
                /* write */ "");