X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstanza-number-engraver.cc;h=f5d7257154dd05e16b21a14f0a15bc5d65fabd3e;hb=7e72a1e50e94a7f9738d62599de79fe7745f600c;hp=813137bc8ef63663d88a5b93ae12d206f44e2cc5;hpb=bfb10684605084baf1a898be8f42c0e463c5764a;p=lilypond.git

diff --git a/lily/stanza-number-engraver.cc b/lily/stanza-number-engraver.cc
index 813137bc8e..f5d7257154 100644
--- a/lily/stanza-number-engraver.cc
+++ b/lily/stanza-number-engraver.cc
@@ -3,97 +3,84 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>, Glen Prideaux <glenprideaux@iname.com>
-  
-  Similar to (and derived from) Instrument_name_engraver.
- */
+  (c) 2000--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>, Glen Prideaux <glenprideaux@iname.com>
+
+*/
 
 #include "engraver.hh"
 #include "item.hh"
-#include "bar-line.hh"
+#include "side-position-interface.hh"
 
 class Stanza_number_engraver : public Engraver
 {
   Item *text_;
-  bool bar_b_;
 
-  void create_text (SCM s);
+  /*
+    This is naughty, since last_stanza_ may be GCd from under us.  But
+    since we don't look at the contents, we are/should be (knock on
+    wood) OK.
+   */
+  SCM last_stanza_;
 public:
   TRANSLATOR_DECLARATIONS(Stanza_number_engraver);
-
   virtual void process_music ();
   virtual void stop_translation_timestep ();
+  virtual void acknowledge_grob (Grob_info);
 };
 
 
+/*
+  TODO: should make engraver that collects all the stanzas on a higher
+  level, and then groups them to the side. Stanza numbers should be
+  all aligned.
+ */
 
 Stanza_number_engraver::Stanza_number_engraver ()
 {
   text_ = 0;
-  bar_b_ = false;
 }
 
 void
 Stanza_number_engraver::process_music ()
 {
-  if (gh_string_p (get_property ("whichBar")))
+  SCM stanza = get_property ("stanza");
+  
+  if (gh_string_p (stanza) && stanza != last_stanza_)
     {
-      SCM s = get_property ("stanza");
+      last_stanza_ = stanza;
       
-      if (now_mom () > Moment (0))
-	s = get_property ("stz");
-
-
-      // TODO
-      if (gh_string_p (s) || gh_pair_p (s))
-
-	/*
-	  if (i.grob_l_->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);
+      text_ = make_item ("StanzaNumber");
+      text_->set_grob_property ("text", stanza);
+      announce_grob (text_, SCM_EOL);
     }
 }
 
+
 void
-Stanza_number_engraver::stop_translation_timestep ()
+Stanza_number_engraver::acknowledge_grob (Grob_info inf)
 {
-  if (text_)
+  if (text_
+      && inf.grob_->internal_has_interface (ly_symbol2scm ("lyric-syllable-interface")))
     {
-      typeset_grob (text_);
-      text_ = 0;
+      Side_position_interface::add_support (text_, inf.grob_);
     }
 }
 
 void
-Stanza_number_engraver::create_text (SCM txt)
+Stanza_number_engraver::stop_translation_timestep ()
 {
-  if (!text_)
+  if (text_)
     {
-      text_ = new Item (get_property ("StanzaNumber"));
-      text_->set_grob_property ("text", txt);
-      announce_grob (text_, SCM_EOL);
+      typeset_grob (text_);
+      text_ = 0;
     }
 }
 
 
-
-
 ENTER_DESCRIPTION(Stanza_number_engraver,
 /* descr */       "",
 /* creats*/       "StanzaNumber",
-/* acks  */       "",
-/* reads */       "stz stanza",
+/* accepts */     "",
+/* acks  */      "lyric-syllable-interface",
+/* reads */       "stanza",
 /* write */       "");