* lily/context.cc (where_defined): also assign value in

[lilypond.git] / lily / stanza-number-engraver.cc

diff --git a/lily/stanza-number-engraver.cc b/lily/stanza-number-engraver.cc
index f5d2c4f995c211f7b1019bbff831648df532a351..2618274a055dd0ddf41d70bb3d6649070a36b0ff 100644 (file)
--- a/lily/stanza-number-engraver.cc
+++ b/lily/stanza-number-engraver.cc
@@ -1,10 +1,9 @@
-/*   
-  lyric-number-engraver.cc --  implement Stanza_number_engraver
-  
+/*
+  lyric-number-engraver.cc -- implement Stanza_number_engraver
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 2000--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>, Glen Prideaux <glenprideaux@iname.com>
 
+  (c) 2000--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>, Glen Prideaux <glenprideaux@iname.com>
 */
 
 #include "engraver.hh"
@@ -18,21 +17,20 @@ class Stanza_number_engraver : public Engraver
     This is naughty, since last_stanza_ may be GCd from under us.  But
     since we don't look at the contents, we are/should be (knock on
     wood) OK.
-   */
+  */
   SCM last_stanza_;
 public:
   TRANSLATOR_DECLARATIONS (Stanza_number_engraver);
-  virtual void process_music ();
-  virtual void stop_translation_timestep ();
-  virtual void acknowledge_grob (Grob_info);
+  PRECOMPUTED_VIRTUAL void process_music ();
+  PRECOMPUTED_VIRTUAL void stop_translation_timestep ();
+  DECLARE_ACKNOWLEDGER(lyric_syllable);
 };
 
-
 /*
   TODO: should make engraver that collects all the stanzas on a higher
   level, and then groups them to the side. Stanza numbers should be
   all aligned.
- */
+*/
 
 Stanza_number_engraver::Stanza_number_engraver ()
 {
@@ -43,25 +41,22 @@ void
 Stanza_number_engraver::process_music ()
 {
   SCM stanza = get_property ("stanza");
-  
+
   if (scm_is_string (stanza) && stanza != last_stanza_)
     {
       last_stanza_ = stanza;
-      
+
       text_ = make_item ("StanzaNumber", SCM_EOL);
       text_->set_property ("text", stanza);
-      
     }
 }
 
-
 void
-Stanza_number_engraver::acknowledge_grob (Grob_info inf)
+Stanza_number_engraver::acknowledge_lyric_syllable (Grob_info inf)
 {
-  if (text_
-      && inf.grob_->internal_has_interface (ly_symbol2scm ("lyric-syllable-interface")))
+  if (text_)
     {
-      Side_position_interface::add_support (text_, inf.grob_);
+      Side_position_interface::add_support (text_, inf.grob ());
     }
 }
 
@@ -71,11 +66,12 @@ Stanza_number_engraver::stop_translation_timestep ()
   text_ = 0;
 }
 
+#include "translator.icc"
 
+ADD_ACKNOWLEDGER(Stanza_number_engraver,lyric_syllable);
 ADD_TRANSLATOR (Stanza_number_engraver,
-/* descr */       "",
-/* creats*/       "StanzaNumber",
-/* accepts */     "",
-/* acks  */      "lyric-syllable-interface",
-/* reads */       "stanza",
-/* write */       "");
+               /* descr */ "",
+               /* creats*/ "StanzaNumber",
+               /* accepts */ "",
+               /* reads */ "stanza",
+               /* write */ "");