release: 1.3.146

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

diff --git a/lily/stanza-number-engraver.cc b/lily/stanza-number-engraver.cc
index e21d7c4fc96c2dd1ad9d12f05a16a689b7607db9..db88dad85db10cae87686a0d2cc3c87dde5b1daa 100644 (file)
--- a/lily/stanza-number-engraver.cc
+++ b/lily/stanza-number-engraver.cc
@@ -1,10 +1,9 @@
-
 /*   
   lyric-number-engraver.cc --  implement Stanza_number_engraver
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>, Glen Prideaux <glenprideaux@iname.com>
+  (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>, Glen Prideaux <glenprideaux@iname.com>
   
   Similar to (and derived from) Instrument_name_engraver.
  */
@@ -23,14 +22,14 @@ class Stanza_number_engraver : public Engraver
 
   void create_text (SCM s);
 public:
-  VIRTUAL_COPY_CONS(Translator);
+  VIRTUAL_COPY_CONS (Translator);
   Stanza_number_engraver ();
 
-  virtual void acknowledge_element (Score_element_info);
-  virtual void do_pre_move_processing ();
+  virtual void acknowledge_grob (Grob_info);
+  virtual void stop_translation_timestep ();
 };
 
-ADD_THIS_TRANSLATOR(Stanza_number_engraver);
+ADD_THIS_TRANSLATOR (Stanza_number_engraver);
 
 Stanza_number_engraver::Stanza_number_engraver ()
 {
@@ -39,35 +38,43 @@ Stanza_number_engraver::Stanza_number_engraver ()
 }
 
 void
-Stanza_number_engraver::acknowledge_element(Score_element_info i)
+Stanza_number_engraver::acknowledge_grob (Grob_info i)
 {
-  SCM s = get_property ("stanza");
+  if (gh_string_p (get_property ("whichBar")))
+    {
+      SCM s = get_property ("stanza");
       
-  if (now_mom () > Moment (0))
-    s = get_property ("stz");
+      if (now_mom () > Moment (0))
+       s = get_property ("stz");
   
-  if (gh_string_p (s))
-    {
-//       if (i.elem_l_->has_interface (symbol ("lyric-syllable-interface")))
-        // Tried catching lyric items to generate stanza numbers, but it spoils lyric spacing.
-       if (Bar::has_interface (i.elem_l_) || now_mom() == Moment(0))
-       // Works, but requires bar_engraver in LyricVoice context apart from at beginning.
-       // Is there any score element we can catch that will do the trick?
-//       if (! i.elem_l_->has_interface (symbol ("lyric-syllable-interface")) ||
-//       now_mom() == Moment(0))
-       // What happens if we try anything at all EXCEPT a lyric? Is there anything else?
-        // Not sure what it's catching, but it still mucks up lyrics.
+      if (gh_string_p (s))
+
+       /*
+         if (i.elem_l_->has_interface (symbol ("lyric-syllable-interface")))
+
+         Tried catching lyric items to generate stanza numbers, but it
+         spoils lyric spacing.
+
+         Works, but requires bar_engraver in LyricsVoice context apart
+         from at beginning.  Is there any score element we can catch
+         that will do the trick?
+
+         What happens if we try anything at all EXCEPT a lyric? Is
+         there anything else?  Not sure what it's catching, but it
+         still mucks up lyrics.
+
+       */
+
        create_text (s);
     }
 }
 
-
 void
-Stanza_number_engraver::do_pre_move_processing ()
+Stanza_number_engraver::stop_translation_timestep ()
 {
   if (text_)
     {
-      typeset_element (text_);
+      typeset_grob (text_);
       text_ = 0;
     }
 }
@@ -75,11 +82,11 @@ Stanza_number_engraver::do_pre_move_processing ()
 void
 Stanza_number_engraver::create_text (SCM txt)
 {
-  if(!text_)
+  if (!text_)
     {
-      text_ = new Item (get_property ("basicStanzaNumberProperties"));
-      text_->set_elt_property ("text", txt);
-      announce_element (text_,0);
+      text_ = new Item (get_property ("StanzaNumber"));
+      text_->set_grob_property ("text", txt);
+      announce_grob (text_,0);
     }
 }