X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-name-engraver.cc;h=1333feb4a65b380976b8bd890dc2d5f2ecb8aa09;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=4b63b4f32dcb74bde037f026252178cc44c96f5b;hpb=75eebcb49e52d296b1da3e1074e0825d2c780db4;p=lilypond.git

diff --git a/lily/note-name-engraver.cc b/lily/note-name-engraver.cc
index 4b63b4f32d..1333feb4a6 100644
--- a/lily/note-name-engraver.cc
+++ b/lily/note-name-engraver.cc
@@ -1,76 +1,95 @@
 /*
-  note-name-engraver.cc -- implement Note_name_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1999--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1999--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "engraver.hh"
 #include "item.hh"
+#include "pitch.hh"
+#include "stream-event.hh"
+
+#include "translator.icc"
 
 class Note_name_engraver : public Engraver
 {
 public:
   TRANSLATOR_DECLARATIONS (Note_name_engraver);
 
-  Link_array<Music> events_;
-  Link_array<Item> texts_;
-  virtual bool try_music (Music *m);
+  vector<Stream_event *> events_;
+  void listen_note (Stream_event *);
   void process_music ();
   void stop_translation_timestep ();
 };
 
-bool
-Note_name_engraver::try_music (Music *m)
+void
+Note_name_engraver::listen_note (Stream_event *ev)
 {
-  if (m->is_mus_type ("note-event"))
-    {
-      events_.push (m);
-      return true;
-    }
-  return false;
+  events_.push_back (ev);
 }
 
 void
 Note_name_engraver::process_music ()
 {
-  String s;
-  for (int i = 0; i < events_.size (); i++)
+  string s;
+  for (vsize i = 0; i < events_.size (); i++)
     {
       if (i)
-	s += " ";
-      Pitch p = *unsmob_pitch (events_[i]->get_property ("pitch"));
+        s += " ";
+      Pitch p = *unsmob<Pitch> (events_[i]->get_property ("pitch"));
 
       if (!to_boolean (get_property ("printOctaveNames")))
-	p = Pitch (-1, p.get_notename (), p.get_alteration ());
+        p = Pitch (-1, p.get_notename (), p.get_alteration ());
 
       s += p.to_string ();
     }
   if (s.length ())
     {
       Item *t = make_item ("NoteName", events_[0]->self_scm ());
-      t->set_property ("text", scm_makfrom0str (s.to_str0 ()));
-      texts_.push (t);
+      t->set_property ("text", ly_string2scm (s));
     }
 }
 
 void
 Note_name_engraver::stop_translation_timestep ()
 {
-  texts_.clear ();
   events_.clear ();
 }
 
-Note_name_engraver::Note_name_engraver ()
+Note_name_engraver::Note_name_engraver (Context *c)
+  : Engraver (c)
 {
 }
 
-#include "translator.icc"
+void
+Note_name_engraver::boot ()
+{
+  ADD_LISTENER (Note_name_engraver, note);
+}
 
 ADD_TRANSLATOR (Note_name_engraver,
-		/* doc */ "",
-		/* create */ "NoteName",
-		/* accept */ "note-event",
-		/* read */ "printOctaveNames",
-		/* write */ "");
+                /* doc */
+                "Print pitches as words.",
+
+                /* create */
+                "NoteName ",
+
+                /* read */
+                "printOctaveNames ",
+
+                /* write */
+                ""
+               );