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 2babc2b03311b8638bdc9191e6094a73950eade2..5c553374a31a7fc378c2327259ba3643e060417f 100644 (file)
--- a/lily/horizontal-bracket-engraver.cc
+++ b/lily/horizontal-bracket-engraver.cc
@@ -19,10 +19,10 @@ 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 *);
   void stop_translation_timestep ();
@@ -87,17 +87,13 @@ 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 (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);
-       }
+       /* 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);
     }
 }
@@ -106,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;
 }