Run `make grand-replace'.

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

diff --git a/lily/stanza-number-engraver.cc b/lily/stanza-number-engraver.cc
index 866336e224d2e9060dbc521d46379a73e00f8c7e..5baf68a2fc0968b0426f322b92d63f5dd505c0d5 100644 (file)
--- a/lily/stanza-number-engraver.cc
+++ b/lily/stanza-number-engraver.cc
@@ -3,11 +3,13 @@
 
   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--2008 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
 {
@@ -37,6 +39,7 @@ Stanza_number_engraver::derived_mark () const
 Stanza_number_engraver::Stanza_number_engraver ()
 {
   text_ = 0;
+  last_stanza_ = SCM_EOL;
 }
 
 void
@@ -44,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;
 
@@ -57,9 +61,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
@@ -70,10 +72,17 @@ 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 */ "",
-               /* reads */ "stanza",
-               /* write */ "");
+               /* doc */
+               "Engrave stanza numbers.",
+
+               /* create */
+               "StanzaNumber ",
+
+               /* read */
+               "stanza ",
+
+               /* write */
+               ""
+               );