X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-name-engraver.cc;h=13d3746faf05f7a2044c995bd5f32f40c86a583e;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=132bd17e29d552c95a153581a9201f4e1e04631d;hpb=c98e0ae0356a787f60de758f5cc82372c6967ad8;p=lilypond.git

diff --git a/lily/note-name-engraver.cc b/lily/note-name-engraver.cc
index 132bd17e29..13d3746faf 100644
--- 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--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"
@@ -18,8 +29,7 @@ class Note_name_engraver : public Engraver
 public:
   TRANSLATOR_DECLARATIONS (Note_name_engraver);
 
-  vector<Stream_event*> events_;
-  vector<Item*> texts_;
+  vector<Stream_event *> events_;
   DECLARE_TRANSLATOR_LISTENER (note);
   void process_music ();
   void stop_translation_timestep ();
@@ -39,26 +49,24 @@ 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 = *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 ();
 }
 
@@ -67,8 +75,15 @@ Note_name_engraver::Note_name_engraver ()
 }
 
 ADD_TRANSLATOR (Note_name_engraver,
-		/* doc */ "Print pitches as words.",
-		/* create */ "NoteName",
-		/* accept */ "note-event",
-		/* read */ "printOctaveNames",
-		/* write */ "");
+                /* doc */
+                "Print pitches as words.",
+
+                /* create */
+                "NoteName ",
+
+                /* read */
+                "printOctaveNames ",
+
+                /* write */
+                ""
+               );