X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-name-engraver.cc;h=0a3814f477791903f22dcd93a1454f04e57a2b5a;hb=f07f18bef861d6afa48b941b7579079d5d40df80;hp=47562e6e2c5b156a441c34626b28ceaf23487d11;hpb=7e72a1e50e94a7f9738d62599de79fe7745f600c;p=lilypond.git

diff --git a/lily/note-name-engraver.cc b/lily/note-name-engraver.cc
index 47562e6e2c..0a3814f477 100644
--- a/lily/note-name-engraver.cc
+++ b/lily/note-name-engraver.cc
@@ -1,25 +1,23 @@
-/*   
-  note-name-engraver.cc --  implement Note_name_engraver
-  
+/*
+  note-name-engraver.cc -- implement Note_name_engraver
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+*/
 
 #include "engraver.hh"
-#include "event.hh"
 #include "item.hh"
 
 class Note_name_engraver : public Engraver
 {
 public:
-  TRANSLATOR_DECLARATIONS(Note_name_engraver);
+  TRANSLATOR_DECLARATIONS (Note_name_engraver);
 
-  Link_array<Music> reqs_;
+  Link_array<Music> events_;
   Link_array<Item> texts_;
-  virtual bool  try_music (Music*m);
-  virtual void process_acknowledged_grobs ();
+  virtual bool try_music (Music *m);
+  virtual void process_music ();
   virtual void stop_translation_timestep ();
 };
 
@@ -28,29 +26,31 @@ Note_name_engraver::try_music (Music *m)
 {
   if (m->is_mus_type ("note-event"))
     {
-      reqs_.push (m);
+      events_.push (m);
       return true;
     }
   return false;
 }
 
 void
-Note_name_engraver::process_acknowledged_grobs ()
+Note_name_engraver::process_music ()
 {
-  if (texts_.size ())
-    return;
-  String s ;
-  for (int i=0; i < reqs_.size (); i++)
+  String s;
+  for (int i = 0; i < events_.size (); i++)
     {
       if (i)
 	s += " ";
-      s += unsmob_pitch (reqs_[i]->get_mus_property ("pitch"))->to_string ();
+      Pitch p = *unsmob_pitch (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 ())
     {
-      Item * t = make_item ("NoteName");
-      t->set_grob_property ("text", scm_makfrom0str (s.to_str0 ()));
-      announce_grob(t, reqs_[0]->self_scm());
+      Item *t = make_item ("NoteName", events_[0]->self_scm ());
+      t->set_property ("text", scm_makfrom0str (s.to_str0 ()));
       texts_.push (t);
     }
 }
@@ -58,23 +58,18 @@ Note_name_engraver::process_acknowledged_grobs ()
 void
 Note_name_engraver::stop_translation_timestep ()
 {
-  for (int i=0; i < texts_.size (); i++)
-    {
-      typeset_grob (texts_[i]);
-    }
-  texts_.clear () ;
-  reqs_.clear ();
+  texts_.clear ();
+  events_.clear ();
 }
 
-
-Note_name_engraver::Note_name_engraver()
+Note_name_engraver::Note_name_engraver ()
 {
 }
 
-ENTER_DESCRIPTION(Note_name_engraver,
-/* descr */       "",
-/* creats*/       "NoteName",
-/* accepts */     "note-event",
-/* acks  */      "",
-/* reads */       "",
-/* write */       "");
+ADD_TRANSLATOR (Note_name_engraver,
+		/* descr */ "",
+		/* creats*/ "NoteName",
+		/* accepts */ "note-event",
+		/* acks  */ "",
+		/* reads */ "printOctaveNames",
+		/* write */ "");