X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-name-engraver.cc;h=3cc29c521fbd607ed2c201a933445bf09b9fbf92;hb=24bfffc3b5da5d82eb9b20eb0a0d1e6ff3a1a7d3;hp=df2c4872143ba67e697c69f43865798de11e026b;hpb=9b40d66187029df3dca86fc5ecc65f64db315a48;p=lilypond.git

diff --git a/lily/note-name-engraver.cc b/lily/note-name-engraver.cc
index df2c487214..3cc29c521f 100644
--- a/lily/note-name-engraver.cc
+++ b/lily/note-name-engraver.cc
@@ -3,65 +3,75 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
 #include "engraver.hh"
-#include "musical-request.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> events_;
   Link_array<Item> texts_;
-  virtual bool  do_try_music (Music*m);
-  virtual void do_process_music ();
-  virtual void do_pre_move_processing ();
+  virtual bool  try_music (Music*m);
+  virtual void process_music ();
+  virtual void stop_translation_timestep ();
 };
 
 bool
-Note_name_engraver::do_try_music (Music *m)
+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);
+      events_.push (m);
       return true;
     }
   return false;
 }
 
-
 void
-Note_name_engraver::do_process_music ()
+Note_name_engraver::process_music ()
 {
   String s ;
-  for (int i=0; i < req_l_arr_.size (); i++)
+  for (int i = 0; i < events_.size (); i++)
     {
       if (i)
 	s += " ";
-      s += req_l_arr_[i]->pitch_.str ();
+      Pitch p = *unsmob_pitch (events_[i]->get_property ("pitch"));
+
+      if (!to_boolean (get_property ("printOctaveNames")))
+	  p = Pitch (-1, p.get_notename (), p.get_alteration ());
+	  
+      s += p.to_string ();
     }
-  if (s.length_i())
+  if (s.length ())
     {
-      Item * t = new Item (get_property ("NoteName"));
-      t->set_elt_property ("text", ly_str02scm ( s.ch_C()));
-      announce_element (t, req_l_arr_[0]);
+      Item * t = make_item ("NoteName", events_[0]->self_scm () );
+      t->set_property ("text", scm_makfrom0str (s.to_str0 ()));
       texts_.push (t);
     }
 }
 
 void
-Note_name_engraver::do_pre_move_processing ()
+Note_name_engraver::stop_translation_timestep ()
+{
+  texts_.clear () ;
+  events_.clear ();
+}
+
+
+Note_name_engraver::Note_name_engraver ()
 {
-  for (int i=0; i < texts_.size (); i++)
-    {
-      typeset_element (texts_[i]);
-    }
-  texts_.clear() ;
-  req_l_arr_.clear ();
 }
 
-ADD_THIS_TRANSLATOR(Note_name_engraver);
+ADD_TRANSLATOR (Note_name_engraver,
+/* descr */       "",
+/* creats*/       "NoteName",
+/* accepts */     "note-event",
+/* acks  */      "",
+/* reads */       "printOctaveNames",
+/* write */       "");