Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / lily / tab-note-heads-engraver.cc

diff --git a/lily/tab-note-heads-engraver.cc b/lily/tab-note-heads-engraver.cc
index 3ea9ea5c4efb465b050db6154e5d81647474ee21..be9fa38515c16e52348408b42d71ed2d11de8092 100644 (file)
--- a/lily/tab-note-heads-engraver.cc
+++ b/lily/tab-note-heads-engraver.cc
@@ -26,11 +26,11 @@ using namespace std;
 */
 class Tab_note_heads_engraver : public Engraver
 {
-  Link_array<Item> notes_;
+  vector<Item*> notes_;
 
-  Link_array<Item> dots_;
-  Link_array<Music> note_events_;
-  Link_array<Music> tabstring_events_;
+  vector<Item*> dots_;
+  vector<Music*> note_events_;
+  vector<Music*> tabstring_events_;
 public:
   TRANSLATOR_DECLARATIONS (Tab_note_heads_engraver);
 
@@ -50,12 +50,12 @@ Tab_note_heads_engraver::try_music (Music *m)
 {
   if (m->is_mus_type ("note-event"))
     {
-      note_events_.push (m);
+      note_events_.push_back (m);
       return true;
     }
   else if (m->is_mus_type ("string-number-event"))
     {
-      tabstring_events_.push (m);
+      tabstring_events_.push_back (m);
       return true;
     }
   else if (m->is_mus_type ("busy-playing-event"))
@@ -67,8 +67,8 @@ Tab_note_heads_engraver::try_music (Music *m)
 void
 Tab_note_heads_engraver::process_music ()
 {
-  int j = 0;
-  for (int i = 0; i < note_events_.size (); i++)
+  vsize j = 0;
+  for (vsize i = 0; i < note_events_.size (); i++)
     {
       SCM stringTunings = get_property ("stringTunings");
       int number_of_strings = ((int) ly_length (stringTunings));
@@ -91,7 +91,7 @@ Tab_note_heads_engraver::process_music ()
       if (!tabstring_event && j < tabstring_events_.size ())
        {
          tabstring_event = tabstring_events_[j];
-         if (j +1 < tabstring_events_.size ())
+         if (j + 1 < tabstring_events_.size ())
            j++;
        }
 
@@ -123,7 +123,7 @@ Tab_note_heads_engraver::process_music ()
 
          d->set_parent (note, Y_AXIS);
 
-         dots_.push (d);
+         dots_.push_back (d);
        }
 
       SCM scm_pitch = event->get_property ("pitch");
@@ -150,7 +150,7 @@ Tab_note_heads_engraver::process_music ()
       note->set_property ("text", text);
 
       note->set_property ("staff-position", scm_from_int (pos));
-      notes_.push (note);
+      notes_.push_back (note);
     }
 }