X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstanza-number-engraver.cc;h=833241cb530df3cb45cb68f0412b32d87fd77452;hb=46340a068e743b3b35175c80b811c0b3860512ea;hp=86d62e4fbd525bd89f98b62a4f32b2b8a69b961c;hpb=71056f5964c862b038992b54edb49de5a1d1ffa6;p=lilypond.git

diff --git a/lily/stanza-number-engraver.cc b/lily/stanza-number-engraver.cc
index 86d62e4fbd..833241cb53 100644
--- a/lily/stanza-number-engraver.cc
+++ b/lily/stanza-number-engraver.cc
@@ -1,36 +1,31 @@
-
 /*   
   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.
  */
 
 #include "engraver.hh"
 #include "item.hh"
-//#include "system-start-delimiter.hh"
-//#include "side-position-interface.hh"
-//#include "staff-symbol-referencer.hh"
 #include "bar.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_element (Score_element_info);
-  virtual void do_pre_move_processing ();
+  virtual void process_music ();
+  virtual void stop_translation_timestep ();
 };
 
-ADD_THIS_TRANSLATOR(Stanza_number_engraver);
+
 
 Stanza_number_engraver::Stanza_number_engraver ()
 {
@@ -39,35 +34,45 @@ Stanza_number_engraver::Stanza_number_engraver ()
 }
 
 void
-Stanza_number_engraver::acknowledge_element(Score_element_info i)
+Stanza_number_engraver::process_music ()
 {
-  SCM s = get_property ("stanza");
-      
-  if (now_mom () > Moment (0))
-    s = get_property ("stz");
-  
-  if (gh_string_p (s))
+  if (gh_string_p (get_property ("whichBar")))
     {
-//       if (i.elem_l_->has_interface (ly_symbol2scm ("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 (ly_symbol2scm ("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.
+      SCM s = get_property ("stanza");
+      
+      if (now_mom () > Moment (0))
+	s = get_property ("stz");
+
+
+      // TODO
+      if (gh_string_p (s) || gh_pair_p (s))
+
+	/*
+	  if (i.grob_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,14 +80,20 @@ 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);
     }
 }
 
 
 
 
+ENTER_DESCRIPTION(Stanza_number_engraver,
+/* descr */       "",
+/* creats*/       "StanzaNumber",
+/* acks  */       "",
+/* reads */       "stz stanza",
+/* write */       "");