Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/note-name-engraver.cc b/lily/note-name-engraver.cc
index aeff5aa9b8697e9b735ea1486fdc3a6227b68e20..585eb1fae208abd700f643aeda59ad6125d929a2 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--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
@@ -14,8 +14,8 @@ class Note_name_engraver : public Engraver
 public:
   TRANSLATOR_DECLARATIONS (Note_name_engraver);
 
-  Link_array<Music> events_;
-  Link_array<Item> texts_;
+  vector<Music*> events_;
+  vector<Item*> texts_;
   virtual bool try_music (Music *m);
   void process_music ();
   void stop_translation_timestep ();
@@ -26,7 +26,7 @@ Note_name_engraver::try_music (Music *m)
 {
   if (m->is_mus_type ("note-event"))
     {
-      events_.push (m);
+      events_.push_back (m);
       return true;
     }
   return false;
@@ -35,8 +35,8 @@ Note_name_engraver::try_music (Music *m)
 void
 Note_name_engraver::process_music ()
 {
-  String s;
-  for (int i = 0; i < events_.size (); i++)
+  string s;
+  for (vsize i = 0; i < events_.size (); i++)
     {
       if (i)
        s += " ";
@@ -50,8 +50,8 @@ Note_name_engraver::process_music ()
   if (s.length ())
     {
       Item *t = make_item ("NoteName", events_[0]->self_scm ());
-      t->set_property ("text", scm_makfrom0str (s.to_str0 ()));
-      texts_.push (t);
+      t->set_property ("text", scm_makfrom0str (s.c_str ()));
+      texts_.push_back (t);
     }
 }
 
@@ -69,8 +69,8 @@ Note_name_engraver::Note_name_engraver ()
 #include "translator.icc"
 
 ADD_TRANSLATOR (Note_name_engraver,
-               /* descr */ "",
-               /* creats*/ "NoteName",
-               /* accepts */ "note-event",
-               /* reads */ "printOctaveNames",
+               /* doc */ "",
+               /* create */ "NoteName",
+               /* accept */ "note-event",
+               /* read */ "printOctaveNames",
                /* write */ "");