*** empty log message ***

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

diff --git a/lily/note-name-engraver.cc b/lily/note-name-engraver.cc
index 076cff67894c4eeb65d133dd0a5383fb071b58e2..37133e5e3b293a20eed82491bb6f1ebafe85ef81 100644 (file)
--- a/lily/note-name-engraver.cc
+++ b/lily/note-name-engraver.cc
@@ -16,10 +16,10 @@ class Note_name_engraver : public Engraver
 public:
   TRANSLATOR_DECLARATIONS(Note_name_engraver);
 
-  Link_array<Note_req> req_l_arr_;
+  Link_array<Note_req> reqs_;
   Link_array<Item> texts_;
   virtual bool  try_music (Music*m);
-  virtual void create_grobs ();
+  virtual void process_acknowledged_grobs ();
   virtual void stop_translation_timestep ();
 };
 
@@ -28,29 +28,29 @@ Note_name_engraver::try_music (Music *m)
 {
   if (Note_req *r = dynamic_cast<Note_req* > (m))
     {
-      req_l_arr_.push (r);
+      reqs_.push (r);
       return true;
     }
   return false;
 }
 
 void
-Note_name_engraver::create_grobs ()
+Note_name_engraver::process_acknowledged_grobs ()
 {
   if (texts_.size ())
     return;
   String s ;
-  for (int i=0; i < req_l_arr_.size (); i++)
+  for (int i=0; i < reqs_.size (); i++)
     {
       if (i)
        s += " ";
-      s += unsmob_pitch (req_l_arr_[i]->get_mus_property ("pitch"))->str ();
+      s += unsmob_pitch (reqs_[i]->get_mus_property ("pitch"))->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]);
+      t->set_grob_property ("text", ly_str02scm (s.to_str0 ()));
+      announce_grob(t, reqs_[0]->self_scm());
       texts_.push (t);
     }
 }
@@ -63,7 +63,7 @@ Note_name_engraver::stop_translation_timestep ()
       typeset_grob (texts_[i]);
     }
   texts_.clear () ;
-  req_l_arr_.clear ();
+  reqs_.clear ();
 }