X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstanza-number-engraver.cc;h=41759ff12a90ac358a76effbbd6f2065326e3ff3;hb=474c8729dc274a30558102a015a01fa5882673db;hp=a91e6bac79adf6acaa31adf8c5e1d4952d0c0997;hpb=fc3e875d6bf06f0680e897faffdcab36ad975a03;p=lilypond.git

diff --git a/lily/stanza-number-engraver.cc b/lily/stanza-number-engraver.cc
index a91e6bac79..41759ff12a 100644
--- a/lily/stanza-number-engraver.cc
+++ b/lily/stanza-number-engraver.cc
@@ -1,88 +1,80 @@
+/*
+  lyric-number-engraver.cc -- implement Stanza_number_engraver
 
-/*   
-  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>
-  
-  Similar to (and derived from) Instrument_name_engraver.
- */
+
+  (c) 2000--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>, Glen Prideaux <glenprideaux@iname.com>
+*/
 
 #include "engraver.hh"
+#include "side-position-interface.hh"
+#include "text-interface.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_;;
 
-  void create_text (SCM s);
+  SCM last_stanza_;
 public:
-  VIRTUAL_COPY_CONS (Translator);
-  Stanza_number_engraver ();
-
-  virtual void acknowledge_grob (Grob_info);
-  virtual void stop_translation_timestep ();
+  TRANSLATOR_DECLARATIONS (Stanza_number_engraver);
+  void process_music ();
+  virtual void derived_mark () const;
+  void stop_translation_timestep ();
+  DECLARE_ACKNOWLEDGER (lyric_syllable);
 };
 
-ADD_THIS_TRANSLATOR (Stanza_number_engraver);
+void
+Stanza_number_engraver::derived_mark () const
+{
+  scm_gc_mark (last_stanza_);
+}
+
+/*
+  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;
+  last_stanza_ = SCM_EOL;
 }
 
 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))
+  SCM stanza = get_property ("stanza");
+
+  if (Text_interface::is_markup (stanza)
+      && stanza != last_stanza_)
     {
-//       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.
-	create_text (s);
+      last_stanza_ = stanza;
+
+      text_ = make_item ("StanzaNumber", SCM_EOL);
+      text_->set_property ("text", stanza);
     }
 }
 
-
 void
-Stanza_number_engraver::stop_translation_timestep ()
+Stanza_number_engraver::acknowledge_lyric_syllable (Grob_info inf)
 {
   if (text_)
-    {
-      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_)
-    {
-      text_ = new Item (get_property ("StanzaNumber"));
-      text_->set_grob_property ("text", txt);
-      announce_grob (text_,0);
-    }
+  text_ = 0;
 }
 
+#include "translator.icc"
 
-
-
+ADD_ACKNOWLEDGER (Stanza_number_engraver, lyric_syllable);
+ADD_TRANSLATOR (Stanza_number_engraver,
+		/* doc */ "",
+		/* create */ "StanzaNumber",
+		/* read */ "stanza",
+		/* write */ "");