X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-name-engraver.cc;h=1e1e01acb15db4eac0a86cfd6dee02333192f2e5;hb=refs%2Fheads%2Fbugs%2F572290;hp=1f03a0ea1a3eeb9788f057d6d6f2716647a6dbf4;hpb=76f13ab50fc726c89fa7c96f3deed519d2d773dc;p=lilypond.git

diff --git a/lily/note-name-engraver.cc b/lily/note-name-engraver.cc
index 1f03a0ea1a..1e1e01acb1 100644
--- a/lily/note-name-engraver.cc
+++ b/lily/note-name-engraver.cc
@@ -1,67 +1,81 @@
-/*   
-  note-name-engraver.cc --  implement Note_name_engraver
-  
+/*
+  note-name-engraver.cc -- implement Note_name_engraver
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 1999--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #include "engraver.hh"
-#include "musical-request.hh"
-#include "text-item.hh"
+#include "item.hh"
+#include "pitch.hh"
+#include "stream-event.hh"
+
+#include "translator.icc"
 
 class Note_name_engraver : public Engraver
 {
 public:
-  VIRTUAL_COPY_CONS(Translator);
-  Link_array<Note_req> req_l_arr_;
-  Link_array<Text_item> texts_;
-  virtual bool  do_try_music (Music*m);
-  virtual void do_process_music ();
-  virtual void do_pre_move_processing ();
+  TRANSLATOR_DECLARATIONS (Note_name_engraver);
+
+  vector<Stream_event*> events_;
+  vector<Item*> texts_;
+  DECLARE_TRANSLATOR_LISTENER (note);
+  void process_music ();
+  void stop_translation_timestep ();
 };
 
-bool
-Note_name_engraver::do_try_music (Music *m)
+IMPLEMENT_TRANSLATOR_LISTENER (Note_name_engraver, note);
+void
+Note_name_engraver::listen_note (Stream_event *ev)
 {
-  if (Note_req *r = dynamic_cast<Note_req* > (m))
-    {
-      req_l_arr_.push (r);
-      return true;
-    }
-  return false;
+  events_.push_back (ev);
 }
 
-
 void
-Note_name_engraver::do_process_music ()
+Note_name_engraver::process_music ()
 {
-  String s ;
-  for (int i=0; i < req_l_arr_.size (); i++)
+  string s;
+  for (vsize 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 ())
     {
-      Text_item * t = new Text_item (SCM_EOL);
-      t->set_elt_property ("text", ly_str02scm ( s.ch_C()));
-      announce_element (Score_element_info (t, req_l_arr_[0]));
-      texts_.push (t);
+      Item *t = make_item ("NoteName", events_[0]->self_scm ());
+      t->set_property ("text", ly_string2scm (s));
+      texts_.push_back (t);
     }
 }
 
 void
-Note_name_engraver::do_pre_move_processing ()
+Note_name_engraver::stop_translation_timestep ()
 {
-  for (int i=0; i < texts_.size (); i++)
-    {
-      typeset_element (texts_[i]);
-    }
-  texts_.clear() ;
-  req_l_arr_.clear ();
+  texts_.clear ();
+  events_.clear ();
 }
 
-ADD_THIS_TRANSLATOR(Note_name_engraver);
+Note_name_engraver::Note_name_engraver ()
+{
+}
+
+ADD_TRANSLATOR (Note_name_engraver,
+		/* doc */
+		"Print pitches as words.",
+
+		/* create */
+		"NoteName ",
+
+		/* read */
+		"printOctaveNames ",
+
+		/* write */
+		""
+		);