Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / lily / grob-pq-engraver.cc

diff --git a/lily/grob-pq-engraver.cc b/lily/grob-pq-engraver.cc
index 00ca948cd64aee5aaf20aa1bb8e6f4ebf6bad9b9..e4e8b944f968aefd5647185bc9f2ef21c87a560f 100644 (file)
--- a/lily/grob-pq-engraver.cc
+++ b/lily/grob-pq-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2001--2005  Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2001--2006  Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "context.hh"
@@ -28,11 +28,11 @@ public:
   TRANSLATOR_DECLARATIONS (Grob_pq_engraver);
 protected:
   virtual void initialize ();
-  DECLARE_ACKNOWLEDGER(grob);
-  PRECOMPUTED_VIRTUAL void start_translation_timestep ();
-  PRECOMPUTED_VIRTUAL void stop_translation_timestep ();
+  DECLARE_ACKNOWLEDGER (grob);
+  void start_translation_timestep ();
+  void stop_translation_timestep ();
 
-  Array<Grob_pq_entry> started_now_;
+  vector<Grob_pq_entry> started_now_;
 };
 
 Grob_pq_engraver::Grob_pq_engraver ()
@@ -81,8 +81,8 @@ Grob_pq_engraver::acknowledge_grob (Grob_info gi)
       Grob_pq_entry e;
       e.grob_ = gi.grob ();
       e.end_ = end;
-      
-      started_now_.push (e);
+
+      started_now_.push_back (e);
     }
 }
 
@@ -93,21 +93,19 @@ Grob_pq_engraver::stop_translation_timestep ()
   SCM start_busy = get_property ("busyGrobs");
   SCM busy = start_busy;
   while (scm_is_pair (busy) && *unsmob_moment (scm_caar (busy)) == now)
-    {
-      busy = scm_cdr (busy);
-    }
+    busy = scm_cdr (busy);
 
-  started_now_.sort (Grob_pq_entry::compare);
+  vector_sort (started_now_, Grob_pq_entry::compare);
   SCM lst = SCM_EOL;
   SCM *tail = &lst;
-  for (int i = 0; i < started_now_.size (); i++)
+  for (vsize i = 0; i < started_now_.size (); i++)
     {
       *tail = scm_acons (started_now_[i].end_.smobbed_copy (),
                         started_now_[i].grob_->self_scm (),
                         SCM_EOL);
-      tail = SCM_CDRLOC(*tail);
+      tail = SCM_CDRLOC (*tail);
     }
-  
+
   busy = scm_merge_x (lst, busy, ly_grob_pq_less_p_proc);
   context ()->set_property ("busyGrobs", busy);
 
@@ -135,12 +133,11 @@ Grob_pq_engraver::start_translation_timestep ()
 }
 
 #include "translator.icc"
-ADD_ACKNOWLEDGER(Grob_pq_engraver, grob);
+ADD_ACKNOWLEDGER (Grob_pq_engraver, grob);
 ADD_TRANSLATOR (Grob_pq_engraver,
 
-               /* descr */ "Administrate when certain grobs (eg. note heads) stop playing",
-               /* creats*/ "",
-               /* accepts */ "",
-               /* acks  */ "",
-               /* reads */ "busyGrobs",
+               /* doc */ "Administrate when certain grobs (eg. note heads) stop playing",
+               /* create */ "",
+               /* accept */ "",
+               /* read */ "busyGrobs",
                /* write */ "busyGrobs");