* lily/ambitus-engraver.cc (create_ambitus): change name to

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

diff --git a/lily/note-name-engraver.cc b/lily/note-name-engraver.cc
index 9644f9373424fa6aaaf0c77b9c103fdd6713102a..94841f74812079a5366e8839bbf6d0ec3996ea8a 100644 (file)
--- a/lily/note-name-engraver.cc
+++ b/lily/note-name-engraver.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -14,12 +14,12 @@
 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 void process_music ();
   virtual void stop_translation_timestep ();
 };
 
@@ -28,29 +28,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++)
+  for (int i=0; i < events_.size (); i++)
     {
       if (i)
        s += " ";
-      s += unsmob_pitch (reqs_[i]->get_mus_property ("pitch"))->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 = new Item (get_property ("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 +60,19 @@ 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 ();
+  events_.clear ();
 }
 
 
-Note_name_engraver::Note_name_engraver()
+Note_name_engraver::Note_name_engraver ()
 {
 }
 
-ENTER_DESCRIPTION(Note_name_engraver,
+ENTER_DESCRIPTION (Note_name_engraver,
 /* descr */       "",
 /* creats*/       "NoteName",
 /* accepts */     "note-event",
 /* acks  */      "",
-/* reads */       "",
+/* reads */       "printOctaveNames",
 /* write */       "");