2003 -> 2004

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

diff --git a/lily/note-name-engraver.cc b/lily/note-name-engraver.cc
index 1e7806e676b9bd05c48d773df02fd97192bf5b00..47562e6e2c5b156a441c34626b28ceaf23487d11 100644 (file)
--- a/lily/note-name-engraver.cc
+++ b/lily/note-name-engraver.cc
@@ -3,12 +3,12 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
 #include "engraver.hh"
-#include "musical-request.hh"
+#include "event.hh"
 #include "item.hh"
 
 class Note_name_engraver : public Engraver
@@ -16,7 +16,7 @@ class Note_name_engraver : public Engraver
 public:
   TRANSLATOR_DECLARATIONS(Note_name_engraver);
 
-  Link_array<Note_req> reqs_;
+  Link_array<Music> reqs_;
   Link_array<Item> texts_;
   virtual bool  try_music (Music*m);
   virtual void process_acknowledged_grobs ();
@@ -26,9 +26,9 @@ public:
 bool
 Note_name_engraver::try_music (Music *m)
 {
-  if (Note_req *r = dynamic_cast<Note_req* > (m))
+  if (m->is_mus_type ("note-event"))
     {
-      reqs_.push (r);
+      reqs_.push (m);
       return true;
     }
   return false;
@@ -44,11 +44,11 @@ Note_name_engraver::process_acknowledged_grobs ()
     {
       if (i)
        s += " ";
-      s += unsmob_pitch (reqs_[i]->get_mus_property ("pitch"))->string ();
+      s += unsmob_pitch (reqs_[i]->get_mus_property ("pitch"))->to_string ();
     }
   if (s.length ())
     {
-      Item * t = new Item (get_property ("NoteName"));
+      Item * t = make_item ("NoteName");
       t->set_grob_property ("text", scm_makfrom0str (s.to_str0 ()));
       announce_grob(t, reqs_[0]->self_scm());
       texts_.push (t);
@@ -74,6 +74,7 @@ Note_name_engraver::Note_name_engraver()
 ENTER_DESCRIPTION(Note_name_engraver,
 /* descr */       "",
 /* creats*/       "NoteName",
-/* acks  */       "",
+/* accepts */     "note-event",
+/* acks  */      "",
 /* reads */       "",
 /* write */       "");