X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstanza-number-engraver.cc;h=ddcd526d583b77041068e6e946881b66f60830e1;hb=0b544cfb7332615ef809b71b57ab656741311ae1;hp=e08808f02ea49f43eb6f2ef0651458853a0e3714;hpb=df4a7c4a55148e065d878dcc2f7e09ac27ea9c32;p=lilypond.git

diff --git a/lily/stanza-number-engraver.cc b/lily/stanza-number-engraver.cc
index e08808f02e..ddcd526d58 100644
--- a/lily/stanza-number-engraver.cc
+++ b/lily/stanza-number-engraver.cc
@@ -1,88 +1,99 @@
+/*
+  This file is part of LilyPond, the GNU music typesetter.
 
-/*   
-  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.
- */
+  Copyright (C) 2000--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>, Glen Prideaux <glenprideaux@iname.com>
+
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
 #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 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_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 */
+                "Engrave stanza numbers.",
 
+                /* create */
+                "StanzaNumber ",
 
+                /* read */
+                "stanza ",
 
+                /* write */
+                ""
+               );