X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstanza-number-engraver.cc;h=3434f06167c81a40707a30152d9c7d2c51ef7236;hb=38d7d319eabc906e82fb42002678c6d42a23b6f7;hp=f5d7257154dd05e16b21a14f0a15bc5d65fabd3e;hpb=7e72a1e50e94a7f9738d62599de79fe7745f600c;p=lilypond.git

diff --git a/lily/stanza-number-engraver.cc b/lily/stanza-number-engraver.cc
index f5d7257154..3434f06167 100644
--- a/lily/stanza-number-engraver.cc
+++ b/lily/stanza-number-engraver.cc
@@ -1,86 +1,88 @@
-/*   
-  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--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>, Glen Prideaux <glenprideaux@iname.com>
 
+  (c) 2000--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>, Glen Prideaux <glenprideaux@iname.com>
 */
 
 #include "engraver.hh"
-#include "item.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);
-  virtual void process_music ();
-  virtual void stop_translation_timestep ();
-  virtual void acknowledge_grob (Grob_info);
+  TRANSLATOR_DECLARATIONS (Stanza_number_engraver);
+  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
   all aligned.
- */
+*/
 
 Stanza_number_engraver::Stanza_number_engraver ()
 {
   text_ = 0;
+  last_stanza_ = SCM_EOL;
 }
 
 void
 Stanza_number_engraver::process_music ()
 {
   SCM stanza = get_property ("stanza");
-  
-  if (gh_string_p (stanza) && stanza != last_stanza_)
+
+  if (Text_interface::is_markup (stanza)
+      && stanza != last_stanza_)
     {
       last_stanza_ = stanza;
-      
-      text_ = make_item ("StanzaNumber");
-      text_->set_grob_property ("text", stanza);
-      announce_grob (text_, SCM_EOL);
+
+      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")))
-    {
-      Side_position_interface::add_support (text_, inf.grob_);
-    }
+  if (text_)
+    Side_position_interface::add_support (text_, inf.grob ());
 }
 
 void
 Stanza_number_engraver::stop_translation_timestep ()
 {
-  if (text_)
-    {
-      typeset_grob (text_);
-      text_ = 0;
-    }
+  text_ = 0;
 }
 
+#include "translator.icc"
+
+ADD_ACKNOWLEDGER (Stanza_number_engraver, lyric_syllable);
+ADD_TRANSLATOR (Stanza_number_engraver,
+		/* doc */
+		"Engrave stanza numbers.",
+
+		/* create */
+		"StanzaNumber ",
+
+		/* read */
+		"stanza ",
 
-ENTER_DESCRIPTION(Stanza_number_engraver,
-/* descr */       "",
-/* creats*/       "StanzaNumber",
-/* accepts */     "",
-/* acks  */      "lyric-syllable-interface",
-/* reads */       "stanza",
-/* write */       "");
+		/* write */
+		""
+		);