X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstanza-number-engraver.cc;h=4b7eaa5a8a3e760e199f3270246e55a622a12bc8;hb=dbc2dd143e50e000a39883fc8217b4ec60e08657;hp=866336e224d2e9060dbc521d46379a73e00f8c7e;hpb=237e77fa9135ba5219636ba4602c09e1026a7aba;p=lilypond.git

diff --git a/lily/stanza-number-engraver.cc b/lily/stanza-number-engraver.cc
index 866336e224..4b7eaa5a8a 100644
--- a/lily/stanza-number-engraver.cc
+++ b/lily/stanza-number-engraver.cc
@@ -1,13 +1,26 @@
 /*
-  lyric-number-engraver.cc -- implement Stanza_number_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2000--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>, Glen Prideaux <glenprideaux@iname.com>
 
-  (c) 2000--2005 Han-Wen Nienhuys <hanwen@cs.uu.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"
 
 class Stanza_number_engraver : public Engraver
 {
@@ -19,7 +32,7 @@ public:
   void process_music ();
   virtual void derived_mark () const;
   void stop_translation_timestep ();
-  DECLARE_ACKNOWLEDGER (lyric_syllable);
+  void acknowledge_lyric_syllable (Grob_info);
 };
 
 void
@@ -34,9 +47,11 @@ Stanza_number_engraver::derived_mark () const
   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
@@ -44,7 +59,8 @@ Stanza_number_engraver::process_music ()
 {
   SCM stanza = get_property ("stanza");
 
-  if (scm_is_string (stanza) && stanza != last_stanza_)
+  if (Text_interface::is_markup (stanza)
+      && !scm_is_eq (stanza, last_stanza_))
     {
       last_stanza_ = stanza;
 
@@ -57,9 +73,7 @@ void
 Stanza_number_engraver::acknowledge_lyric_syllable (Grob_info inf)
 {
   if (text_)
-    {
-      Side_position_interface::add_support (text_, inf.grob ());
-    }
+    Side_position_interface::add_support (text_, inf.grob ());
 }
 
 void
@@ -70,10 +84,22 @@ Stanza_number_engraver::stop_translation_timestep ()
 
 #include "translator.icc"
 
-ADD_ACKNOWLEDGER (Stanza_number_engraver,lyric_syllable);
+void
+Stanza_number_engraver::boot ()
+{
+  ADD_ACKNOWLEDGER (Stanza_number_engraver, lyric_syllable);
+}
+
 ADD_TRANSLATOR (Stanza_number_engraver,
-		/* descr */ "",
-		/* creats*/ "StanzaNumber",
-		/* accepts */ "",
-		/* reads */ "stanza",
-		/* write */ "");
+                /* doc */
+                "Engrave stanza numbers.",
+
+                /* create */
+                "StanzaNumber ",
+
+                /* read */
+                "stanza ",
+
+                /* write */
+                ""
+               );