X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fhorizontal-bracket-engraver.cc;h=5c553374a31a7fc378c2327259ba3643e060417f;hb=9e752ec70a160d6c3d7632036de75630438c4142;hp=5475557ea7fc4f7170348ad8fee493543837ec8a;hpb=75eebcb49e52d296b1da3e1074e0825d2c780db4;p=lilypond.git

diff --git a/lily/horizontal-bracket-engraver.cc b/lily/horizontal-bracket-engraver.cc
index 5475557ea7..5c553374a3 100644
--- a/lily/horizontal-bracket-engraver.cc
+++ b/lily/horizontal-bracket-engraver.cc
@@ -8,9 +8,10 @@
 */
 
 #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"
 
@@ -18,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 ();
@@ -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;
 }