release: 1.3.94

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

diff --git a/lily/note-name-engraver.cc b/lily/note-name-engraver.cc
index 8ddcc9a98464e4536220848583d8f52d4f67ae5c..df2c4872143ba67e697c69f43865798de11e026b 100644 (file)
--- a/lily/note-name-engraver.cc
+++ b/lily/note-name-engraver.cc
@@ -3,27 +3,25 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
 #include "engraver.hh"
 #include "musical-request.hh"
-#include "text-item.hh"
+#include "item.hh"
 
 class Note_name_engraver : public Engraver
 {
 public:
   VIRTUAL_COPY_CONS(Translator);
   Link_array<Note_req> req_l_arr_;
-  Link_array<Text_item> texts_;
+  Link_array<Item> texts_;
   virtual bool  do_try_music (Music*m);
-  virtual void do_process_requests ();
+  virtual void do_process_music ();
   virtual void do_pre_move_processing ();
 };
 
-ADD_THIS_TRANSLATOR (Note_name_engraver);
-
 bool
 Note_name_engraver::do_try_music (Music *m)
 {
@@ -37,7 +35,7 @@ Note_name_engraver::do_try_music (Music *m)
 
 
 void
-Note_name_engraver::do_process_requests ()
+Note_name_engraver::do_process_music ()
 {
   String s ;
   for (int i=0; i < req_l_arr_.size (); i++)
@@ -48,9 +46,9 @@ Note_name_engraver::do_process_requests ()
     }
   if (s.length_i())
     {
-      Text_item * t = new Text_item;
+      Item * t = new Item (get_property ("NoteName"));
       t->set_elt_property ("text", ly_str02scm ( s.ch_C()));
-      announce_element (Score_element_info (t, req_l_arr_[0]));
+      announce_element (t, req_l_arr_[0]);
       texts_.push (t);
     }
 }
@@ -65,3 +63,5 @@ Note_name_engraver::do_pre_move_processing ()
   texts_.clear() ;
   req_l_arr_.clear ();
 }
+
+ADD_THIS_TRANSLATOR(Note_name_engraver);