X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstanza-number-engraver.cc;h=892bae633c35b4845abe4a439a0dad83fc9dbdfe;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=7c860ce11a70f9ae0bbba8e4ef69cbf3ee67a0cb;hpb=3130370f1e21481c80abc3e67fb33b3b505cb241;p=lilypond.git

diff --git a/lily/stanza-number-engraver.cc b/lily/stanza-number-engraver.cc
index 7c860ce11a..892bae633c 100644
--- a/lily/stanza-number-engraver.cc
+++ b/lily/stanza-number-engraver.cc
@@ -1,99 +1,99 @@
-/*   
-  lyric-number-engraver.cc --  implement Stanza_number_engraver
-  
-  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.
- */
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 2000--2015 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 "bar-line.hh"
 
 class Stanza_number_engraver : public Engraver
 {
   Item *text_;
-  bool bar_b_;
 
-  void create_text (SCM s);
+  SCM last_stanza_;
 public:
-  TRANSLATOR_DECLARATIONS(Stanza_number_engraver);
-
-  virtual void process_music ();
-  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);
 };
 
+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::process_music ()
 {
-  if (gh_string_p (get_property ("whichBar")))
-    {
-      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_l_->has_interface (symbol ("lyric-syllable-interface")))
+  SCM stanza = get_property ("stanza");
 
-	  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.
-
-	*/
+  if (Text_interface::is_markup (stanza)
+      && stanza != last_stanza_)
+    {
+      last_stanza_ = stanza;
 
-	create_text (s);
+      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_, SCM_EOL);
-    }
+  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 ",
 
-ENTER_DESCRIPTION(Stanza_number_engraver,
-/* descr */       "",
-/* creats*/       "StanzaNumber",
-/* acks  */       "",
-/* reads */       "stz stanza",
-/* write */       "");
+                /* write */
+                ""
+               );