X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstanza-number-align-engraver.cc;h=494e64842f62475cbfca8d7def42f5686b143bfd;hb=3dd7c6f29c9ca494976f69736b470b6300135099;hp=cc3baa7a172fe7b88d248976c9bdcb7ac85e3eb7;hpb=2c22efe5a46a37065b10c3f51c5d7db00d07d318;p=lilypond.git diff --git a/lily/stanza-number-align-engraver.cc b/lily/stanza-number-align-engraver.cc index cc3baa7a17..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 + (c) 2004--2009 Han-Wen Nienhuys */ #include "context.hh" @@ -21,8 +21,8 @@ public: TRANSLATOR_DECLARATIONS (Stanza_number_align_engraver); protected: - Link_array lyrics_; - Link_array stanza_numbers_; + vector lyrics_; + vector stanza_numbers_; DECLARE_ACKNOWLEDGER (lyric_syllable); DECLARE_ACKNOWLEDGER (stanza_number); @@ -37,21 +37,21 @@ 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 (); @@ -60,10 +60,18 @@ Stanza_number_align_engraver::stop_translation_timestep () 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 */ "");