source file of the GNU LilyPond music typesetter
- (c) 2000--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>, Glen Prideaux <glenprideaux@iname.com>
+ (c) 2000--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>, Glen Prideaux <glenprideaux@iname.com>
*/
#include "engraver.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);
void process_music ();
+ virtual void derived_mark () const;
void stop_translation_timestep ();
- DECLARE_ACKNOWLEDGER(lyric_syllable);
+ 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
Stanza_number_engraver::Stanza_number_engraver ()
{
text_ = 0;
+ last_stanza_ = SCM_EOL;
}
void
{
SCM stanza = get_property ("stanza");
- if (scm_is_string (stanza) && stanza != last_stanza_)
+ if (Text_interface::is_markup (stanza)
+ && stanza != last_stanza_)
{
last_stanza_ = stanza;
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
#include "translator.icc"
-ADD_ACKNOWLEDGER(Stanza_number_engraver,lyric_syllable);
+ADD_ACKNOWLEDGER (Stanza_number_engraver, lyric_syllable);
ADD_TRANSLATOR (Stanza_number_engraver,
- /* descr */ "",
- /* creats*/ "StanzaNumber",
- /* accepts */ "",
- /* reads */ "stanza",
+ /* doc */ "",
+ /* create */ "StanzaNumber",
+ /* read */ "stanza",
/* write */ "");