X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstanza-number-engraver.cc;h=618add3881caf06e97f47d7313be3727a09edd4e;hb=a7f82e4dc22fc6219a9fe0f6874f8c91e3f31f24;hp=f5d2c4f995c211f7b1019bbff831648df532a351;hpb=e24df7c27635dc996c466295eacf2981bddccaf7;p=lilypond.git diff --git a/lily/stanza-number-engraver.cc b/lily/stanza-number-engraver.cc index f5d2c4f995..618add3881 100644 --- a/lily/stanza-number-engraver.cc +++ b/lily/stanza-number-engraver.cc @@ -1,10 +1,9 @@ -/* - lyric-number-engraver.cc -- implement Stanza_number_engraver - +/* + lyric-number-engraver.cc -- implement Stanza_number_engraver + source file of the GNU LilyPond music typesetter - - (c) 2000--2005 Han-Wen Nienhuys , Glen Prideaux + (c) 2000--2005 Han-Wen Nienhuys , Glen Prideaux */ #include "engraver.hh" @@ -18,21 +17,20 @@ class Stanza_number_engraver : public Engraver 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 (); + PRECOMPUTED_VIRTUAL void process_music (); + PRECOMPUTED_VIRTUAL void stop_translation_timestep (); virtual void acknowledge_grob (Grob_info); }; - /* 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 () { @@ -43,25 +41,23 @@ void Stanza_number_engraver::process_music () { SCM stanza = get_property ("stanza"); - + if (scm_is_string (stanza) && stanza != last_stanza_) { last_stanza_ = stanza; - + text_ = make_item ("StanzaNumber", SCM_EOL); text_->set_property ("text", stanza); - } } - void Stanza_number_engraver::acknowledge_grob (Grob_info inf) { if (text_ - && inf.grob_->internal_has_interface (ly_symbol2scm ("lyric-syllable-interface"))) + && inf.grob ()->internal_has_interface (ly_symbol2scm ("lyric-syllable-interface"))) { - Side_position_interface::add_support (text_, inf.grob_); + Side_position_interface::add_support (text_, inf.grob ()); } } @@ -71,11 +67,12 @@ Stanza_number_engraver::stop_translation_timestep () text_ = 0; } +#include "translator.icc" ADD_TRANSLATOR (Stanza_number_engraver, -/* descr */ "", -/* creats*/ "StanzaNumber", -/* accepts */ "", -/* acks */ "lyric-syllable-interface", -/* reads */ "stanza", -/* write */ ""); + /* descr */ "", + /* creats*/ "StanzaNumber", + /* accepts */ "", + /* acks */ "lyric-syllable-interface", + /* reads */ "stanza", + /* write */ "");