X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fstanza-number-engraver.cc;h=41759ff12a90ac358a76effbbd6f2065326e3ff3;hb=4790df2a2c3cdcd14479e8ece60a99ab803f6197;hp=618add3881caf06e97f47d7313be3727a09edd4e;hpb=a7f82e4dc22fc6219a9fe0f6874f8c91e3f31f24;p=lilypond.git

diff --git a/lily/stanza-number-engraver.cc b/lily/stanza-number-engraver.cc
index 618add3881..41759ff12a 100644
--- a/lily/stanza-number-engraver.cc
+++ b/lily/stanza-number-engraver.cc
@@ -3,29 +3,33 @@
 
   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--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>, Glen Prideaux <glenprideaux@iname.com>
 */
 
 #include "engraver.hh"
 #include "side-position-interface.hh"
+#include "text-interface.hh"
+#include "item.hh"
 
 class Stanza_number_engraver : public Engraver
 {
   Item *text_;
 
-  /*
-    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);
-  PRECOMPUTED_VIRTUAL void process_music ();
-  PRECOMPUTED_VIRTUAL void stop_translation_timestep ();
-  virtual void acknowledge_grob (Grob_info);
+  void process_music ();
+  virtual void derived_mark () const;
+  void stop_translation_timestep ();
+  DECLARE_ACKNOWLEDGER (lyric_syllable);
 };
 
+void
+Stanza_number_engraver::derived_mark () const
+{
+  scm_gc_mark (last_stanza_);
+}
+
 /*
   TODO: should make engraver that collects all the stanzas on a higher
   level, and then groups them to the side. Stanza numbers should be
@@ -35,6 +39,7 @@ public:
 Stanza_number_engraver::Stanza_number_engraver ()
 {
   text_ = 0;
+  last_stanza_ = SCM_EOL;
 }
 
 void
@@ -42,7 +47,8 @@ Stanza_number_engraver::process_music ()
 {
   SCM stanza = get_property ("stanza");
 
-  if (scm_is_string (stanza) && stanza != last_stanza_)
+  if (Text_interface::is_markup (stanza)
+      && stanza != last_stanza_)
     {
       last_stanza_ = stanza;
 
@@ -52,13 +58,10 @@ Stanza_number_engraver::process_music ()
 }
 
 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")))
-    {
-      Side_position_interface::add_support (text_, inf.grob ());
-    }
+  if (text_)
+    Side_position_interface::add_support (text_, inf.grob ());
 }
 
 void
@@ -69,10 +72,9 @@ Stanza_number_engraver::stop_translation_timestep ()
 
 #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",
+		/* doc */ "",
+		/* create */ "StanzaNumber",
+		/* read */ "stanza",
 		/* write */ "");