2003 -> 2004

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

diff --git a/lily/note-name-engraver.cc b/lily/note-name-engraver.cc
index 462045446cdbf5233f3c7f2f576dfd68e952683d..47562e6e2c5b156a441c34626b28ceaf23487d11 100644 (file)
--- a/lily/note-name-engraver.cc
+++ b/lily/note-name-engraver.cc
@@ -3,53 +3,54 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 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
 {
 public:
-  VIRTUAL_COPY_CONS(Translator);
-  Link_array<Note_req> req_l_arr_;
+  TRANSLATOR_DECLARATIONS(Note_name_engraver);
+
+  Link_array<Music> reqs_;
   Link_array<Item> texts_;
   virtual bool  try_music (Music*m);
-  virtual void create_grobs ();
+  virtual void process_acknowledged_grobs ();
   virtual void stop_translation_timestep ();
 };
 
 bool
 Note_name_engraver::try_music (Music *m)
 {
-  if (Note_req *r = dynamic_cast<Note_req* > (m))
+  if (m->is_mus_type ("note-event"))
     {
-      req_l_arr_.push (r);
+      reqs_.push (m);
       return true;
     }
   return false;
 }
 
 void
-Note_name_engraver::create_grobs ()
+Note_name_engraver::process_acknowledged_grobs ()
 {
   if (texts_.size ())
     return;
   String s ;
-  for (int i=0; i < req_l_arr_.size (); i++)
+  for (int i=0; i < reqs_.size (); i++)
     {
       if (i)
        s += " ";
-      s += unsmob_pitch (req_l_arr_[i]->get_mus_property ("pitch"))->str ();
+      s += unsmob_pitch (reqs_[i]->get_mus_property ("pitch"))->to_string ();
     }
-  if (s.length_i())
+  if (s.length ())
     {
-      Item * t = new Item (get_property ("NoteName"));
-      t->set_grob_property ("text", ly_str02scm ( s.ch_C()));
-      announce_grob (t, req_l_arr_[0]);
+      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);
     }
 }
@@ -61,8 +62,19 @@ Note_name_engraver::stop_translation_timestep ()
     {
       typeset_grob (texts_[i]);
     }
-  texts_.clear() ;
-  req_l_arr_.clear ();
+  texts_.clear () ;
+  reqs_.clear ();
+}
+
+
+Note_name_engraver::Note_name_engraver()
+{
 }
 
-ADD_THIS_TRANSLATOR(Note_name_engraver);
+ENTER_DESCRIPTION(Note_name_engraver,
+/* descr */       "",
+/* creats*/       "NoteName",
+/* accepts */     "note-event",
+/* acks  */      "",
+/* reads */       "",
+/* write */       "");