X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstanza-number-align-engraver.cc;h=7cb014c942b54563816b8a9b609a833a2d6c8228;hb=5837be11cf336e61e7134097f507ad47e9bd9e68;hp=2d1d7c5e120f715fbb6e987d7c4036e2aaafbbef;hpb=634ad74db688a5305f001917453c5cd15305c539;p=lilypond.git

diff --git a/lily/stanza-number-align-engraver.cc b/lily/stanza-number-align-engraver.cc
index 2d1d7c5e12..7cb014c942 100644
--- a/lily/stanza-number-align-engraver.cc
+++ b/lily/stanza-number-align-engraver.cc
@@ -1,65 +1,68 @@
+/*
+  stanza-number-align-engraver.cc -- implement Stanza_number_align_engraver
 
-/*   
-stanza-number-align-engraver.cc -- implement 
+  source file of the GNU LilyPond music typesetter
 
-source file of the GNU LilyPond music typesetter
-
-(c) 2004--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
-
- */
+  (c) 2004--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #include "context.hh"
 #include "engraver.hh"
 #include "note-head.hh"
 #include "lyric-extender.hh"
-#include "group-interface.hh"
+#include "pointer-group-interface.hh"
 #include "side-position-interface.hh"
 
+#include "translator.icc"
+
 class Stanza_number_align_engraver : public Engraver
 {
-public:  
+public:
   TRANSLATOR_DECLARATIONS (Stanza_number_align_engraver);
 
-protected:  
-  Link_array<Grob> lyrics_;
-  Link_array<Grob> stanza_numbers_;
-  virtual void acknowledge_grob (Grob_info);
-  virtual void stop_translation_timestep ();
+protected:
+  vector<Grob*> lyrics_;
+  vector<Grob*> stanza_numbers_;
+
+  DECLARE_ACKNOWLEDGER (lyric_syllable);
+  DECLARE_ACKNOWLEDGER (stanza_number);
+  void stop_translation_timestep ();
 };
 
 Stanza_number_align_engraver::Stanza_number_align_engraver ()
 {
-  
 }
 
 void
-Stanza_number_align_engraver::acknowledge_grob (Grob_info gi)
+Stanza_number_align_engraver::acknowledge_lyric_syllable (Grob_info gi)
+{
+  Grob *h = gi.grob ();
+  lyrics_.push_back (h);
+}
+
+void
+Stanza_number_align_engraver::acknowledge_stanza_number (Grob_info gi)
 {
-  Grob *h = gi.grob_;
-  
-  if (h->internal_has_interface (ly_symbol2scm ("lyric-syllable-interface")))
-    lyrics_.push (h);
-  else if (h->internal_has_interface (ly_symbol2scm ("stanza-number-interface")))
-    stanza_numbers_.push (h);
+  Grob *h = gi.grob ();
+  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_TRANSLATOR (Stanza_number_align_engraver,
-		  "This engraver ensures that stanza numbers are neatly aligned. ",
-		  "",
-		  "",
-		  "stanza-number-interface lyric-syllable-interface ",
-		  "",
-		  "");
+		"This engraver ensures that stanza numbers are neatly aligned. ",
+		"",
+		" ",
+		"");