X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fstanza-number-engraver.cc;h=d9887cfefd2686f17a5bbbd4066f78bab9c0c513;hb=ea1cd9ac0821fabc809e48f2b9390f26e6e90829;hp=5d4b0a5e0109cc1aecdf241d69d867a3f5f43342;hpb=d8691dd2c4cf8e365c544e535a6c6d08aa231c8d;p=lilypond.git

diff --git a/lily/stanza-number-engraver.cc b/lily/stanza-number-engraver.cc
index 5d4b0a5e01..d9887cfefd 100644
--- a/lily/stanza-number-engraver.cc
+++ b/lily/stanza-number-engraver.cc
@@ -3,33 +3,29 @@
   
   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--2003 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 "system-start-delimiter.hh"
-//#include "side-position-interface.hh"
-//#include "staff-symbol-referencer.hh"
-#include "bar.hh"
+#include "bar-line.hh"
 
 class Stanza_number_engraver : public Engraver
 {
   Item *text_;
-  bool bar_b_;;
+  bool bar_b_;
 
   void create_text (SCM s);
 public:
-  VIRTUAL_COPY_CONS (Translator);
-  Stanza_number_engraver ();
+  TRANSLATOR_DECLARATIONS(Stanza_number_engraver);
 
-  virtual void acknowledge_grob (Grob_info);
+  virtual void process_music ();
   virtual void stop_translation_timestep ();
 };
 
-ADD_THIS_TRANSLATOR (Stanza_number_engraver);
+
 
 Stanza_number_engraver::Stanza_number_engraver ()
 {
@@ -38,7 +34,7 @@ Stanza_number_engraver::Stanza_number_engraver ()
 }
 
 void
-Stanza_number_engraver::acknowledge_grob (Grob_info i)
+Stanza_number_engraver::process_music ()
 {
   if (gh_string_p (get_property ("whichBar")))
     {
@@ -49,11 +45,10 @@ Stanza_number_engraver::acknowledge_grob (Grob_info i)
 
 
       // TODO
-      if (gh_string_p (s))
-	
+      if (gh_string_p (s) || gh_pair_p (s))
 
 	/*
-	  if (i.elem_l_->has_interface (symbol ("lyric-syllable-interface")))
+	  if (i.grob_->internal_has_interface (symbol ("lyric-syllable-interface")))
 
 	  Tried catching lyric items to generate stanza numbers, but it
 	  spoils lyric spacing.
@@ -89,10 +84,17 @@ 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);
     }
 }
 
 
 
 
+ENTER_DESCRIPTION(Stanza_number_engraver,
+/* descr */       "",
+/* creats*/       "StanzaNumber",
+/* accepts */     "",
+/* acks  */      "",
+/* reads */       "stz stanza",
+/* write */       "");