(struct Simple_spacer): remove

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

diff --git a/lily/stanza-number-engraver.cc b/lily/stanza-number-engraver.cc
index e08808f02ea49f43eb6f2ef0651458853a0e3714..8904bdd712cc5b4536a7c1cd51f81509848ea8f9 100644 (file)
--- a/lily/stanza-number-engraver.cc
+++ b/lily/stanza-number-engraver.cc
@@ -1,88 +1,82 @@
-
 /*   
   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>
-  
-  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 "system-start-delimiter.hh"
-//#include "side-position-interface.hh"
-//#include "staff-symbol-referencer.hh"
-#include "bar.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:
-  VIRTUAL_COPY_CONS(Translator);
-  Stanza_number_engraver ();
-
-  virtual void acknowledge_grob (Grob_info);
+  TRANSLATOR_DECLARATIONS (Stanza_number_engraver);
+  virtual void process_music ();
   virtual void stop_translation_timestep ();
+  virtual void acknowledge_grob (Grob_info);
 };
 
-ADD_THIS_TRANSLATOR(Stanza_number_engraver);
+
+/*
+  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::acknowledge_grob(Grob_info i)
+Stanza_number_engraver::process_music ()
 {
-  SCM s = get_property ("stanza");
-      
-  if (now_mom () > Moment (0))
-    s = get_property ("stz");
+  SCM stanza = get_property ("stanza");
   
-  if (gh_string_p (s))
+  if (ly_c_string_p (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 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.
-       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_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_)
-    {
-      text_ = new Item (get_property ("StanzaNumber"));
-      text_->set_grob_property ("text", txt);
-      announce_grob (text_,0);
-    }
+  text_ = 0;
 }
 
 
-
-
+ENTER_DESCRIPTION (Stanza_number_engraver,
+/* descr */       "",
+/* creats*/       "StanzaNumber",
+/* accepts */     "",
+/* acks  */      "lyric-syllable-interface",
+/* reads */       "stanza",
+/* write */       "");