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 d4210c42fc5edd1cb94dd856367febdc11bb5809..be9fa38515c16e52348408b42d71ed2d11de8092 100644 (file)
--- a/lily/tab-note-heads-engraver.cc
+++ b/lily/tab-note-heads-engraver.cc
@@ -3,11 +3,12 @@
 
   based on note-heads-engraver.cc, by Jean-Baptiste Lamy <jiba@tuxfamily.org>,
 
-  (c) 2002--2005
+  (c) 2002--2006
 */
 
 #include <cctype>
 #include <cstdio>
+using namespace std;
 
 #include "rhythmic-head.hh"
 #include "output-def.hh"
@@ -20,25 +21,24 @@
 #include "warn.hh"
 #include "duration.hh"
 
-
 /**
    make (guitar-like) tablature note
 */
 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);
 
 protected:
   virtual bool try_music (Music *event);
-  virtual void process_music ();
+  void process_music ();
 
-  virtual void stop_translation_timestep ();
+  void stop_translation_timestep ();
 };
 
 Tab_note_heads_engraver::Tab_note_heads_engraver ()
@@ -50,18 +50,16 @@ 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"))
-    {
-      return note_events_.size ();
-    }
+    return note_events_.size ();
 
   return false;
 }
@@ -69,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));
@@ -93,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++;
        }
 
@@ -112,7 +110,7 @@ Tab_note_heads_engraver::process_music ()
 
       Duration dur = *unsmob_duration (event->get_property ("duration"));
       note->set_property ("duration-log",
-                         scm_int2num (dur.duration_log ()));
+                         scm_from_int (dur.duration_log ()));
 
       if (dur.dot_count ())
        {
@@ -121,11 +119,11 @@ Tab_note_heads_engraver::process_music ()
 
          if (dur.dot_count ()
              != scm_to_int (d->get_property ("dot-count")))
-           d->set_property ("dot-count", scm_int2num (dur.dot_count ()));
+           d->set_property ("dot-count", scm_from_int (dur.dot_count ()));
 
          d->set_parent (note, Y_AXIS);
 
-         dots_.push (d);
+         dots_.push_back (d);
        }
 
       SCM scm_pitch = event->get_property ("pitch");
@@ -136,14 +134,14 @@ Tab_note_heads_engraver::process_music ()
       while (!string_found)
        {
          int fret = unsmob_pitch (scm_pitch)->semitone_pitch ()
-           - scm_to_int (scm_list_ref (stringTunings, scm_int2num (tab_string - 1)));
+           - scm_to_int (scm_list_ref (stringTunings, scm_from_int (tab_string - 1)));
          if (fret < min_fret)
            tab_string += high_string_one ? 1 : -1;
          else
            string_found = true;
        }
 
-      SCM text = scm_call_3 (proc, scm_int2num (tab_string), stringTunings, scm_pitch);
+      SCM text = scm_call_3 (proc, scm_from_int (tab_string), stringTunings, scm_pitch);
 
       int pos = 2 * tab_string - number_of_strings - 1; // No tab-note between the string !!!
       if (to_boolean (get_property ("stringOneTopmost")))
@@ -151,8 +149,8 @@ Tab_note_heads_engraver::process_music ()
 
       note->set_property ("text", text);
 
-      note->set_property ("staff-position", scm_int2num (pos));
-      notes_.push (note);
+      note->set_property ("staff-position", scm_from_int (pos));
+      notes_.push_back (note);
     }
 }
 
@@ -165,11 +163,12 @@ Tab_note_heads_engraver::stop_translation_timestep ()
   tabstring_events_.clear ();
 }
 
+#include "translator.icc"
+
 ADD_TRANSLATOR (Tab_note_heads_engraver,
-               /* descr */ "Generate one or more tablature noteheads from Music of type NoteEvent.",
-               /* creats*/ "TabNoteHead Dots",
-               /* accepts */ "note-event string-number-event busy-playing-event",
-               /* acks  */ "",
-               /* reads */ "middleCPosition stringTunings minimumFret tablatureFormat highStringOne stringOneTopmost",
+               /* doc */ "Generate one or more tablature noteheads from Music of type NoteEvent.",
+               /* create */ "TabNoteHead Dots",
+               /* accept */ "note-event string-number-event busy-playing-event",
+               /* read */ "middleCPosition stringTunings minimumFret tablatureFormat highStringOne stringOneTopmost",
                /* write */ "");