X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstanza-number-engraver.cc;h=4b7eaa5a8a3e760e199f3270246e55a622a12bc8;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=07fa421aae7e968c6a99521c88a88c8b0d6d0619;hpb=243db47a88df9240a66bde37356b43aaeb41260d;p=lilypond.git

diff --git a/lily/stanza-number-engraver.cc b/lily/stanza-number-engraver.cc
index 07fa421aae..4b7eaa5a8a 100644
--- a/lily/stanza-number-engraver.cc
+++ b/lily/stanza-number-engraver.cc
@@ -1,86 +1,105 @@
-/*   
-  lyric-number-engraver.cc --  implement Stanza_number_engraver
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 2000--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>, Glen Prideaux <glenprideaux@iname.com>
+/*
+  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 "item.hh"
 #include "side-position-interface.hh"
+#include "text-interface.hh"
+#include "item.hh"
 
 class Stanza_number_engraver : public Engraver
 {
   Item *text_;
 
-  /*
-    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);
+  TRANSLATOR_DECLARATIONS (Stanza_number_engraver);
+  void process_music ();
+  virtual void derived_mark () const;
+  void stop_translation_timestep ();
+  void acknowledge_lyric_syllable (Grob_info);
 };
 
+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 ()
+Stanza_number_engraver::Stanza_number_engraver (Context *c)
+  : Engraver (c)
 {
   text_ = 0;
+  last_stanza_ = SCM_EOL;
 }
 
 void
 Stanza_number_engraver::process_music ()
 {
   SCM stanza = get_property ("stanza");
-  
-  if (gh_string_p (stanza) && stanza != last_stanza_)
+
+  if (Text_interface::is_markup (stanza)
+      && !scm_is_eq (stanza, last_stanza_))
     {
       last_stanza_ = stanza;
-      
-      text_ = make_item ("StanzaNumber");
-      text_->set_grob_property ("text", stanza);
-      announce_grob (text_, SCM_EOL);
+
+      text_ = make_item ("StanzaNumber", SCM_EOL);
+      text_->set_property ("text", stanza);
     }
 }
 
-
 void
-Stanza_number_engraver::acknowledge_grob (Grob_info inf)
+Stanza_number_engraver::acknowledge_lyric_syllable (Grob_info inf)
 {
-  if (text_
-      && inf.grob_->internal_has_interface (ly_symbol2scm ("lyric-syllable-interface")))
-    {
-      Side_position_interface::add_support (text_, inf.grob_);
-    }
+  if (text_)
+    Side_position_interface::add_support (text_, inf.grob ());
 }
 
 void
 Stanza_number_engraver::stop_translation_timestep ()
 {
-  if (text_)
-    {
-      typeset_grob (text_);
-      text_ = 0;
-    }
+  text_ = 0;
 }
 
+#include "translator.icc"
+
+void
+Stanza_number_engraver::boot ()
+{
+  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",
-/* accepts */     "",
-/* acks  */      "lyric-syllable-interface",
-/* reads */       "stanza",
-/* write */       "");
+                /* write */
+                ""
+               );