*** empty log message ***

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

diff --git a/lily/stanza-number-engraver.cc b/lily/stanza-number-engraver.cc
index a91e6bac79adf6acaa31adf8c5e1d4952d0c0997..d9887cfefd2686f17a5bbbd4066f78bab9c0c513 100644 (file)
--- 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--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 ()
 {
@@ -39,29 +34,39 @@ Stanza_number_engraver::Stanza_number_engraver ()
 }
 
 void
-Stanza_number_engraver::acknowledge_grob (Grob_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 (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 LyricsVoice 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.
+      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_->internal_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::stop_translation_timestep ()
 {
@@ -79,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 */       "");