X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-name-engraver.cc;h=c7ea5ea6042f5868be45c28909ea3147e995444e;hb=62dddf43ef5990c6efc5944aadcab3ead9423f29;hp=c0ee4986f6651741a0a059e79b55be09f8b28cb4;hpb=9d4a5bbc9687aef811a60aabd9cb839412984e96;p=lilypond.git

diff --git a/lily/note-name-engraver.cc b/lily/note-name-engraver.cc
index c0ee4986f6..c7ea5ea604 100644
--- a/lily/note-name-engraver.cc
+++ b/lily/note-name-engraver.cc
@@ -1,64 +1,72 @@
 /*
-  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--2014 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_;
+  DECLARE_TRANSLATOR_LISTENER (note);
   void process_music ();
   void stop_translation_timestep ();
 };
 
-bool
-Note_name_engraver::try_music (Music *m)
+IMPLEMENT_TRANSLATOR_LISTENER (Note_name_engraver, note);
+void
+Note_name_engraver::listen_note (Stream_event *ev)
 {
-  if (m->is_mus_type ("note-event"))
-    {
-      events_.push_back (m);
-      return true;
-    }
-  return false;
+  events_.push_back (ev);
 }
 
 void
 Note_name_engraver::process_music ()
 {
-  std::string s;
+  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 = *Pitch::unsmob (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.c_str ()));
-      texts_.push_back (t);
+      t->set_property ("text", ly_string2scm (s));
     }
 }
 
 void
 Note_name_engraver::stop_translation_timestep ()
 {
-  texts_.clear ();
   events_.clear ();
 }
 
@@ -66,11 +74,16 @@ Note_name_engraver::Note_name_engraver ()
 {
 }
 
-#include "translator.icc"
-
 ADD_TRANSLATOR (Note_name_engraver,
-		/* doc */ "",
-		/* create */ "NoteName",
-		/* accept */ "note-event",
-		/* read */ "printOctaveNames",
-		/* write */ "");
+                /* doc */
+                "Print pitches as words.",
+
+                /* create */
+                "NoteName ",
+
+                /* read */
+                "printOctaveNames ",
+
+                /* write */
+                ""
+               );