* lily/modified-font-metric.cc (text_dimension): try

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

diff --git a/lily/stanza-number-engraver.cc b/lily/stanza-number-engraver.cc
index 6d76b3804196580db9f1d415c56df305a884c9bb..9babd7354ac40fb867e47fa84b37340eb1c783d0 100644 (file)
--- a/lily/stanza-number-engraver.cc
+++ b/lily/stanza-number-engraver.cc
@@ -3,12 +3,11 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>, Glen Prideaux <glenprideaux@iname.com>
+  (c) 2000--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>, Glen Prideaux <glenprideaux@iname.com>
 
 */
 
 #include "engraver.hh"
-#include "item.hh"
 #include "side-position-interface.hh"
 
 class Stanza_number_engraver : public Engraver
@@ -22,7 +21,7 @@ class Stanza_number_engraver : public Engraver
    */
   SCM last_stanza_;
 public:
-  TRANSLATOR_DECLARATIONS(Stanza_number_engraver);
+  TRANSLATOR_DECLARATIONS (Stanza_number_engraver);
   virtual void process_music ();
   virtual void stop_translation_timestep ();
   virtual void acknowledge_grob (Grob_info);
@@ -45,13 +44,13 @@ Stanza_number_engraver::process_music ()
 {
   SCM stanza = get_property ("stanza");
   
-  if (gh_string_p (stanza) && stanza != last_stanza_)
+  if (scm_is_string (stanza) && stanza != last_stanza_)
     {
       last_stanza_ = stanza;
       
-      text_ = new Item (get_property ("StanzaNumber"));
-      text_->set_grob_property ("text", stanza);
-      announce_grob (text_, SCM_EOL);
+      text_ = make_item ("StanzaNumber", SCM_EOL);
+      text_->set_property ("text", stanza);
+      
     }
 }
 
@@ -60,7 +59,7 @@ void
 Stanza_number_engraver::acknowledge_grob (Grob_info inf)
 {
   if (text_
-      && inf.grob_->internal_has_interface (ly_symbol2scm ("lyric-text-interface")))
+      && inf.grob_->internal_has_interface (ly_symbol2scm ("lyric-syllable-interface")))
     {
       Side_position_interface::add_support (text_, inf.grob_);
     }
@@ -69,15 +68,11 @@ Stanza_number_engraver::acknowledge_grob (Grob_info inf)
 void
 Stanza_number_engraver::stop_translation_timestep ()
 {
-  if (text_)
-    {
-      typeset_grob (text_);
-      text_ = 0;
-    }
+  text_ = 0;
 }
 
 
-ENTER_DESCRIPTION(Stanza_number_engraver,
+ADD_TRANSLATOR (Stanza_number_engraver,
 /* descr */       "",
 /* creats*/       "StanzaNumber",
 /* accepts */     "",