Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/drum-note-engraver.cc b/lily/drum-note-engraver.cc
index 1b95c519ad29b2e8d5c7d99e6799d251e617b468..1d1b8d2331c226a0845850cfd9b9e0d2fa18d74b 100644 (file)
--- a/lily/drum-note-engraver.cc
+++ b/lily/drum-note-engraver.cc
@@ -18,10 +18,10 @@ using namespace std;
 
 class Drum_notes_engraver : public Engraver
 {
-  Link_array<Item> notes_;
-  Link_array<Item> dots_;
-  Link_array<Item> scripts_;
-  Link_array<Music> events_;
+  vector<Item*> notes_;
+  vector<Item*> dots_;
+  vector<Item*> scripts_;
+  vector<Music*> events_;
 
 public:
   TRANSLATOR_DECLARATIONS (Drum_notes_engraver);
@@ -43,7 +43,7 @@ Drum_notes_engraver::try_music (Music *m)
 {
   if (m->is_mus_type ("note-event"))
     {
-      events_.push (m);
+      events_.push_back (m);
       return true;
     }
   else if (m->is_mus_type ("busy-playing-event"))
@@ -56,7 +56,7 @@ void
 Drum_notes_engraver::process_music ()
 {
   SCM tab = 0;
-  for (int i = 0; i < events_.size (); i++)
+  for (vsize i = 0; i < events_.size (); i++)
     {
       if (!tab)
        tab = get_property ("drumStyleTable");
@@ -79,7 +79,7 @@ Drum_notes_engraver::process_music ()
 
          d->set_parent (note, Y_AXIS);
 
-         dots_.push (d);
+         dots_.push_back (d);
        }
 
       SCM drum_type = ev->get_property ("drum-type");
@@ -108,18 +108,18 @@ Drum_notes_engraver::process_music ()
 
              p->set_parent (note, Y_AXIS);
              Side_position_interface::add_support (p, note);
-             scripts_.push (p);
+             scripts_.push_back (p);
            }
        }
 
-      notes_.push (note);
+      notes_.push_back (note);
     }
 }
 
 void
 Drum_notes_engraver::acknowledge_stem (Grob_info inf)
 {
-  for (int i = 0; i < scripts_.size (); i++)
+  for (vsize i = 0; i < scripts_.size (); i++)
     {
       Grob *e = scripts_[i];
 
@@ -133,7 +133,7 @@ Drum_notes_engraver::acknowledge_stem (Grob_info inf)
 void
 Drum_notes_engraver::acknowledge_note_column (Grob_info inf)
 {
-  for (int i = 0; i < scripts_.size (); i++)
+  for (vsize i = 0; i < scripts_.size (); i++)
     {
       Grob *e = scripts_[i];