Merge branch 'master' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond

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

diff --git a/lily/stanza-number-engraver.cc b/lily/stanza-number-engraver.cc
index 063c3518352c6be6d54dbd8091e2197c87656d5c..41759ff12a90ac358a76effbbd6f2065326e3ff3 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--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
 {
@@ -45,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;
 
@@ -73,6 +76,5 @@ ADD_ACKNOWLEDGER (Stanza_number_engraver, lyric_syllable);
 ADD_TRANSLATOR (Stanza_number_engraver,
                /* doc */ "",
                /* create */ "StanzaNumber",
-               /* accept */ "",
                /* read */ "stanza",
                /* write */ "");