''

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

diff --git a/lily/stanza-number-engraver.cc b/lily/stanza-number-engraver.cc
index ae47a7d189b24ae21fe46bb98a928805ced3d2f0..813137bc8ef63663d88a5b93ae12d206f44e2cc5 100644 (file)
--- a/lily/stanza-number-engraver.cc
+++ b/lily/stanza-number-engraver.cc
@@ -3,14 +3,14 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>, Glen Prideaux <glenprideaux@iname.com>
+  (c) 2000--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>, Glen Prideaux <glenprideaux@iname.com>
   
   Similar to (and derived from) Instrument_name_engraver.
  */
 
 #include "engraver.hh"
 #include "item.hh"
-#include "bar.hh"
+#include "bar-line.hh"
 
 class Stanza_number_engraver : public Engraver
 {
@@ -45,10 +45,10 @@ Stanza_number_engraver::process_music ()
 
 
       // TODO
-      if (gh_string_p (s))
+      if (gh_string_p (s) || gh_pair_p (s))
 
        /*
-         if (i.grob_l_->has_interface (symbol ("lyric-syllable-interface")))
+         if (i.grob_l_->internal_has_interface (symbol ("lyric-syllable-interface")))
 
          Tried catching lyric items to generate stanza numbers, but it
          spoils lyric spacing.
@@ -84,7 +84,7 @@ Stanza_number_engraver::create_text (SCM txt)
     {
       text_ = new Item (get_property ("StanzaNumber"));
       text_->set_grob_property ("text", txt);
-      announce_grob (text_,0);
+      announce_grob (text_, SCM_EOL);
     }
 }