X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-name-engraver.cc;h=1e1e01acb15db4eac0a86cfd6dee02333192f2e5;hb=731d3cb1ef66145c13864a4cfc762e8245d60fab;hp=4d3b44d54d1e78e911b325f729b658aafffa192f;hpb=91821bd59959b1289f2d711509017a4dacebecd2;p=lilypond.git

diff --git a/lily/note-name-engraver.cc b/lily/note-name-engraver.cc
index 4d3b44d54d..1e1e01acb1 100644
--- a/lily/note-name-engraver.cc
+++ b/lily/note-name-engraver.cc
@@ -3,40 +3,40 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #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 ()
 {
-  String s;
-  for (int i = 0; i < events_.size (); i++)
+  string s;
+  for (vsize i = 0; i < events_.size (); i++)
     {
       if (i)
 	s += " ";
@@ -50,8 +50,8 @@ Note_name_engraver::process_music ()
   if (s.length ())
     {
       Item *t = make_item ("NoteName", events_[0]->self_scm ());
-      t->set_property ("text", scm_makfrom0str (s.to_str0 ()));
-      texts_.push (t);
+      t->set_property ("text", ly_string2scm (s));
+      texts_.push_back (t);
     }
 }
 
@@ -66,11 +66,16 @@ Note_name_engraver::Note_name_engraver ()
 {
 }
 
-#include "translator.icc"
-
 ADD_TRANSLATOR (Note_name_engraver,
-		/* doc */ "",
-		/* create */ "NoteName",
-		/* accept */ "note-event",
-		/* read */ "printOctaveNames",
-		/* write */ "");
+		/* doc */
+		"Print pitches as words.",
+
+		/* create */
+		"NoteName ",
+
+		/* read */
+		"printOctaveNames ",
+
+		/* write */
+		""
+		);