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 059c72190da397682ffc98bc0a9fd3b3564cefa0..1d1b8d2331c226a0845850cfd9b9e0d2fa18d74b 100644 (file)
--- a/lily/drum-note-engraver.cc
+++ b/lily/drum-note-engraver.cc
@@ -1,7 +1,7 @@
 /*
   drum-note-engraver.cc
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include <cctype>
@@ -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");
@@ -103,28 +103,23 @@ Drum_notes_engraver::process_music ()
          if (scm_is_string (script))
            {
              Item *p = make_item ("Script", ev->self_scm ());
-             bool follow;
-             make_script_from_event (p, &follow,
-                                     context (), script,
+             make_script_from_event (p, context (), script,
                                      0);
 
-             if (p->get_property ("follow-into-staff"))
-               p->set_property ("staff-padding", SCM_EOL);
-
              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];
 
@@ -134,10 +129,11 @@ Drum_notes_engraver::acknowledge_stem (Grob_info inf)
       Side_position_interface::add_support (e, inf.grob ());
     }
 }
+
 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];