X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstanza-number-engraver.cc;h=efbcc6d26cf4c0dfcfe121e5a75580c7dd7bfb75;hb=6224c5c3bfe0a4c7aef15a060a323c77c99bd3f0;hp=bacc51b6d96be687a7b1b20d56cd549b8c8e0a57;hpb=c7a23c5c727ce283c5a2e9fc44382d22c7728905;p=lilypond.git

diff --git a/lily/stanza-number-engraver.cc b/lily/stanza-number-engraver.cc
index bacc51b6d9..efbcc6d26c 100644
--- a/lily/stanza-number-engraver.cc
+++ b/lily/stanza-number-engraver.cc
@@ -3,29 +3,32 @@
 
   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--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>, Glen Prideaux <glenprideaux@iname.com>
 */
 
 #include "engraver.hh"
 #include "side-position-interface.hh"
+#include "text-interface.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 ();
-  DECLARE_ACKNOWLEDGER(lyric_syllable);
+  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 +38,7 @@ public:
 Stanza_number_engraver::Stanza_number_engraver ()
 {
   text_ = 0;
+  last_stanza_ = SCM_EOL;
 }
 
 void
@@ -42,7 +46,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;
 
@@ -55,9 +60,7 @@ void
 Stanza_number_engraver::acknowledge_lyric_syllable (Grob_info inf)
 {
   if (text_)
-    {
-      Side_position_interface::add_support (text_, inf.grob ());
-    }
+    Side_position_interface::add_support (text_, inf.grob ());
 }
 
 void
@@ -68,11 +71,10 @@ Stanza_number_engraver::stop_translation_timestep ()
 
 #include "translator.icc"
 
-ADD_ACKNOWLEDGER(Stanza_number_engraver,lyric_syllable);
+ADD_ACKNOWLEDGER (Stanza_number_engraver, lyric_syllable);
 ADD_TRANSLATOR (Stanza_number_engraver,
-		/* descr */ "",
-		/* creats*/ "StanzaNumber",
-		/* accepts */ "",
-		/* acks  */ "",
-		/* reads */ "stanza",
+		/* doc */ "",
+		/* create */ "StanzaNumber",
+		/* accept */ "",
+		/* read */ "stanza",
 		/* write */ "");