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

diff --git a/lily/note-name-engraver.cc b/lily/note-name-engraver.cc
index c6e0261b2c..13d3746faf 100644
--- a/lily/note-name-engraver.cc
+++ b/lily/note-name-engraver.cc
@@ -1,68 +1,89 @@
-/*   
-  note-name-engraver.cc --  implement Note_name_engraver
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 1999--2015 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 "musical-request.hh"
 #include "item.hh"
+#include "pitch.hh"
+#include "stream-event.hh"
+
+#include "translator.icc"
 
 class Note_name_engraver : public Engraver
 {
 public:
-  VIRTUAL_COPY_CONS (Translator);
-  Link_array<Note_req> req_l_arr_;
-  Link_array<Item> texts_;
-  virtual bool  try_music (Music*m);
-  virtual void create_grobs ();
-  virtual void stop_translation_timestep ();
+  TRANSLATOR_DECLARATIONS (Note_name_engraver);
+
+  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 (Note_req *r = dynamic_cast<Note_req* > (m))
-    {
-      req_l_arr_.push (r);
-      return true;
-    }
-  return false;
+  events_.push_back (ev);
 }
 
 void
-Note_name_engraver::create_grobs ()
+Note_name_engraver::process_music ()
 {
-  if (texts_.size ())
-    return;
-  String s ;
-  for (int i=0; i < req_l_arr_.size (); i++)
+  string s;
+  for (vsize i = 0; i < events_.size (); i++)
     {
       if (i)
-	s += " ";
-      s += unsmob_pitch (req_l_arr_[i]->get_mus_property ("pitch"))->str ();
+        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 ());
+
+      s += p.to_string ();
     }
-  if (s.length_i ())
+  if (s.length ())
     {
-      Item * t = new Item (get_property ("NoteName"));
-      t->set_grob_property ("text", ly_str02scm (s.ch_C ()));
-      announce_grob (t, req_l_arr_[0]);
-      texts_.push (t);
+      Item *t = make_item ("NoteName", events_[0]->self_scm ());
+      t->set_property ("text", ly_string2scm (s));
     }
 }
 
 void
 Note_name_engraver::stop_translation_timestep ()
 {
-  for (int i=0; i < texts_.size (); i++)
-    {
-      typeset_grob (texts_[i]);
-    }
-  texts_.clear () ;
-  req_l_arr_.clear ();
+  events_.clear ();
 }
 
-ADD_THIS_TRANSLATOR (Note_name_engraver);
+Note_name_engraver::Note_name_engraver ()
+{
+}
+
+ADD_TRANSLATOR (Note_name_engraver,
+                /* doc */
+                "Print pitches as words.",
+
+                /* create */
+                "NoteName ",
+
+                /* read */
+                "printOctaveNames ",
+
+                /* write */
+                ""
+               );