Imported Upstream version 2.14.2

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

diff --git a/lily/note-name-engraver.cc b/lily/note-name-engraver.cc
index 1222654dab57ff445f795d7b072017acc2f59176..d2a6b91535c58397d86b44223ffda6973418837a 100644 (file)
--- a/lily/note-name-engraver.cc
+++ b/lily/note-name-engraver.cc
@@ -1,13 +1,25 @@
 /*
-  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--2011 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"
@@ -17,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 ();
@@ -49,15 +60,13 @@ Note_name_engraver::process_music ()
   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,8 +75,15 @@ Note_name_engraver::Note_name_engraver ()
 }
 
 ADD_TRANSLATOR (Note_name_engraver,
-               /* doc */ "",
-               /* create */ "NoteName",
-               /* accept */ "note-event",
-               /* read */ "printOctaveNames",
-               /* write */ "");
+               /* doc */
+               "Print pitches as words.",
+
+               /* create */
+               "NoteName ",
+
+               /* read */
+               "printOctaveNames ",
+
+               /* write */
+               ""
+               );