X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstanza-number-align-engraver.cc;h=494e64842f62475cbfca8d7def42f5686b143bfd;hb=43600104d4f9a82f744e9bc4da8d4a0cb69047f9;hp=2c78cbb722b208e03bcc89a8c1352178d514f82d;hpb=c7a23c5c727ce283c5a2e9fc44382d22c7728905;p=lilypond.git

diff --git a/lily/stanza-number-align-engraver.cc b/lily/stanza-number-align-engraver.cc
index 2c78cbb722..494e64842f 100644
--- a/lily/stanza-number-align-engraver.cc
+++ b/lily/stanza-number-align-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "context.hh"
@@ -21,12 +21,12 @@ public:
   TRANSLATOR_DECLARATIONS (Stanza_number_align_engraver);
 
 protected:
-  Link_array<Grob> lyrics_;
-  Link_array<Grob> stanza_numbers_;
+  vector<Grob*> lyrics_;
+  vector<Grob*> stanza_numbers_;
 
-  DECLARE_ACKNOWLEDGER(lyric_syllable);
-  DECLARE_ACKNOWLEDGER(stanza_number);
-  PRECOMPUTED_VIRTUAL void stop_translation_timestep ();
+  DECLARE_ACKNOWLEDGER (lyric_syllable);
+  DECLARE_ACKNOWLEDGER (stanza_number);
+  void stop_translation_timestep ();
 };
 
 Stanza_number_align_engraver::Stanza_number_align_engraver ()
@@ -37,34 +37,41 @@ void
 Stanza_number_align_engraver::acknowledge_lyric_syllable (Grob_info gi)
 {
   Grob *h = gi.grob ();
-  lyrics_.push (h);
+  lyrics_.push_back (h);
 }
 
 void
 Stanza_number_align_engraver::acknowledge_stanza_number (Grob_info gi)
 {
   Grob *h = gi.grob ();
-  stanza_numbers_.push (h);
+  stanza_numbers_.push_back (h);
 }
 
 void
 Stanza_number_align_engraver::stop_translation_timestep ()
 {
-  for (int i = lyrics_.size (); i--;)
-    for (int j = stanza_numbers_.size (); j--;)
+  for (vsize i = lyrics_.size (); i--;)
+    for (vsize j = stanza_numbers_.size (); j--;)
       Side_position_interface::add_support (stanza_numbers_[j], lyrics_[i]);
 
   stanza_numbers_.clear ();
   lyrics_.clear ();
 }
 
-ADD_ACKNOWLEDGER(Stanza_number_align_engraver,lyric_syllable);
-ADD_ACKNOWLEDGER(Stanza_number_align_engraver,stanza_number);
+ADD_ACKNOWLEDGER (Stanza_number_align_engraver, lyric_syllable);
+ADD_ACKNOWLEDGER (Stanza_number_align_engraver, stanza_number);
+
 ADD_TRANSLATOR (Stanza_number_align_engraver,
-		"This engraver ensures that stanza numbers are neatly aligned. ",
-		"",
+		/* doc */
+		"This engraver ensures that stanza numbers are neatly"
+		" aligned.",
+
+		/* create */
 		"",
-		" ",
+
+		/* read */
 		"",
+
+		/* write */
 		"");