Release: bump Welcome versions.

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

diff --git a/lily/note-name-engraver.cc b/lily/note-name-engraver.cc
index 7acf90e419226268f3aa7e5fa4c28336706057d1..1333feb4a65b380976b8bd890dc2d5f2ecb8aa09 100644 (file)
--- a/lily/note-name-engraver.cc
+++ b/lily/note-name-engraver.cc
@@ -1,9 +1,20 @@
 /*
-  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--2008 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"
@@ -18,14 +29,12 @@ class Note_name_engraver : public Engraver
 public:
   TRANSLATOR_DECLARATIONS (Note_name_engraver);
 
-  vector<Stream_event*> events_;
-  vector<Item*> texts_;
-  DECLARE_TRANSLATOR_LISTENER (note);
+  vector<Stream_event *> events_;
+  void listen_note (Stream_event *);
   void process_music ();
   void stop_translation_timestep ();
 };
 
-IMPLEMENT_TRANSLATOR_LISTENER (Note_name_engraver, note);
 void
 Note_name_engraver::listen_note (Stream_event *ev)
 {
@@ -39,11 +48,11 @@ Note_name_engraver::process_music ()
   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 ();
     }
@@ -51,31 +60,36 @@ Note_name_engraver::process_music ()
     {
       Item *t = make_item ("NoteName", events_[0]->self_scm ());
       t->set_property ("text", ly_string2scm (s));
-      texts_.push_back (t);
     }
 }
 
 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)
+{
+}
+
+void
+Note_name_engraver::boot ()
 {
+  ADD_LISTENER (Note_name_engraver, note);
 }
 
 ADD_TRANSLATOR (Note_name_engraver,
-               /* doc */
-               "Print pitches as words.",
+                /* doc */
+                "Print pitches as words.",
 
-               /* create */
-               "NoteName ",
+                /* create */
+                "NoteName ",
 
-               /* read */
-               "printOctaveNames ",
+                /* read */
+                "printOctaveNames ",
 
-               /* write */
-               ""
-               );
+                /* write */
+                ""
+               );