Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / lily / horizontal-bracket-engraver.cc

diff --git a/lily/horizontal-bracket-engraver.cc b/lily/horizontal-bracket-engraver.cc
index 0148204f9c7953f884ae3beb41db888e5c5fd9a0..5c553374a31a7fc378c2327259ba3643e060417f 100644 (file)
--- a/lily/horizontal-bracket-engraver.cc
+++ b/lily/horizontal-bracket-engraver.cc
@@ -4,37 +4,38 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2002--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
-#include "side-position-interface.hh"
+#include "international.hh"
 #include "note-column.hh"
 #include "pointer-group-interface.hh"
+#include "side-position-interface.hh"
+
+#include "translator.icc"
 
 class Horizontal_bracket_engraver : public Engraver
 {
 public:
   TRANSLATOR_DECLARATIONS (Horizontal_bracket_engraver);
-  Link_array<Spanner> bracket_stack_;
-  Link_array<Music> events_;
-  int pop_count_;
-  int push_count_;
+  vector<Spanner*> bracket_stack_;
+  vector<Music*> events_;
+  vsize pop_count_;
+  vsize push_count_;
 
   virtual bool try_music (Music *);
-  PRECOMPUTED_VIRTUAL void stop_translation_timestep ();
-  PRECOMPUTED_VIRTUAL void process_music ();
-  DECLARE_ACKNOWLEDGER(note_column);
+  void stop_translation_timestep ();
+  void process_music ();
+  DECLARE_ACKNOWLEDGER (note_column);
 };
 
-#include "translator.icc"
-ADD_ACKNOWLEDGER(Horizontal_bracket_engraver,note_column);
+ADD_ACKNOWLEDGER (Horizontal_bracket_engraver, note_column);
 ADD_TRANSLATOR (Horizontal_bracket_engraver,
                "Create horizontal brackets over notes for musical analysis purposes.",
                "HorizontalBracket",
                "note-grouping-event",
                "",
-               "",
                "");
 
 Horizontal_bracket_engraver::Horizontal_bracket_engraver ()
@@ -59,7 +60,7 @@ Horizontal_bracket_engraver::try_music (Music *m)
       else
        {
          push_count_++;
-         events_.push (m);
+         events_.push_back (m);
        }
 
       if (pop_count_ && push_count_)
@@ -73,7 +74,7 @@ Horizontal_bracket_engraver::try_music (Music *m)
 void
 Horizontal_bracket_engraver::acknowledge_note_column (Grob_info gi)
 {
-  for (int i = 0; i < bracket_stack_.size (); i++)
+  for (vsize i = 0; i < bracket_stack_.size (); i++)
     {
       Side_position_interface::add_support (bracket_stack_[i], gi.grob ());
       Pointer_group_interface::add_grob (bracket_stack_[i],
@@ -86,18 +87,14 @@ Horizontal_bracket_engraver::acknowledge_note_column (Grob_info gi)
 void
 Horizontal_bracket_engraver::process_music ()
 {
-  for (int k = 0; k < push_count_; k++)
+  for (vsize k = 0; k < push_count_; k++)
     {
       Spanner *sp = make_spanner ("HorizontalBracket", events_[k]->self_scm ());
 
-      for (int i = 0; i < bracket_stack_.size (); i++)
-       {
-         /*
-           sp is the smallest, it should be added to the bigger brackets.
-         */
-         Side_position_interface::add_support (bracket_stack_[i], sp);
-       }
-      bracket_stack_.push (sp);
+      for (vsize i = 0; i < bracket_stack_.size (); i++)
+       /* sp is the smallest, it should be added to the bigger brackets.  */
+       Side_position_interface::add_support (bracket_stack_[i], sp);
+      bracket_stack_.push_back (sp);
     }
 }
 
@@ -105,10 +102,8 @@ void
 Horizontal_bracket_engraver::stop_translation_timestep ()
 {
   for (int i = pop_count_; i--;)
-    {
-      if (bracket_stack_.size ())
-       bracket_stack_.pop ();
-    }
+    if (bracket_stack_.size ())
+      bracket_stack_.pop_back ();
   pop_count_ = 0;
   push_count_ = 0;
 }