X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fextender-engraver.cc;h=d3b2e90972facbdee6b1579468aedafb9900d345;hb=fa938d4b51ccb3c18e489b395838f2587b531ec2;hp=a6bcd2593ee6c6dda7ef28afd6590be4023fa5e5;hpb=bfb10684605084baf1a898be8f42c0e463c5764a;p=lilypond.git diff --git a/lily/extender-engraver.cc b/lily/extender-engraver.cc index a6bcd2593e..d3b2e90972 100644 --- a/lily/extender-engraver.cc +++ b/lily/extender-engraver.cc @@ -1,149 +1,153 @@ /* extender-engraver.cc -- implement Extender_engraver - (c) 1999 Glen Prideaux , - Han-Wen Nienhuys, Jan Nieuwenhuizen. - + source file of the GNU LilyPond music typesetter + + (c) 1999--2006 Glen Prideaux , + Han-Wen Nienhuys , + Jan Nieuwenhuizen */ -#include "flower-proto.hh" -#include "musical-request.hh" -#include "lyric-extender.hh" -#include "paper-column.hh" -#include "item.hh" +#include "context.hh" #include "engraver.hh" -#include "drul-array.hh" +#include "international.hh" +#include "item.hh" #include "lyric-extender.hh" -#include "pqueue.hh" - +#include "note-head.hh" +#include "pointer-group-interface.hh" +#include "warn.hh" -/** - Generate an centred extender. Should make a Extender_spanner that - typesets a nice centred extender of varying length depending on the - gap between syllables. +void completize_extender (Spanner *sp); - We remember the last Item that come across. When we get a - request, we create the spanner, and attach the left point to the - last lyrics, and the right point to any lyrics we receive by - then. */ class Extender_engraver : public Engraver { - Grob *last_lyric_l_; - Grob *current_lyric_l_; - Extender_req* req_l_; - Spanner* extender_p_; + Music *ev_; + Spanner *extender_; + Spanner *pending_extender_; + public: - TRANSLATOR_DECLARATIONS(Extender_engraver); + TRANSLATOR_DECLARATIONS (Extender_engraver); protected: - virtual void acknowledge_grob (Grob_info); + DECLARE_ACKNOWLEDGER (lyric_syllable); virtual void finalize (); - virtual bool try_music (Music*); - virtual void stop_translation_timestep (); - virtual void start_translation_timestep (); - virtual void process_music (); -private: - + virtual bool try_music (Music *); + void stop_translation_timestep (); + void process_music (); }; - - - Extender_engraver::Extender_engraver () { - current_lyric_l_ = 0; - last_lyric_l_ = 0; - extender_p_ = 0; - req_l_ = 0; + extender_ = 0; + pending_extender_ = 0; + ev_ = 0; } -void -Extender_engraver::acknowledge_grob (Grob_info i) -{ - // -> text_item - if (i.grob_l_->internal_has_interface (ly_symbol2scm ("lyric-syllable-interface"))) - { - current_lyric_l_ = i.grob_l_; - if (extender_p_ - && !extender_p_->get_bound (RIGHT) - ) - { - Lyric_extender::set_textitem (extender_p_, RIGHT, dynamic_cast (i.grob_l_)); - } - } -} - - bool -Extender_engraver::try_music (Music* r) +Extender_engraver::try_music (Music *r) { - if (Extender_req* p = dynamic_cast (r)) + if (!ev_) { - if (req_l_) - return false; - - req_l_ = p; + ev_ = r; return true; } return false; } void -Extender_engraver::finalize () +Extender_engraver::process_music () { - if (extender_p_) + if (ev_) + extender_ = make_spanner ("LyricExtender", ev_->self_scm ()); +} + +void +Extender_engraver::acknowledge_lyric_syllable (Grob_info i) +{ + Item *item = i.item (); + if (extender_) + extender_->set_bound (LEFT, item); + + if (pending_extender_) { - req_l_->origin ()->warning (_ ("unterminated extender")); - extender_p_->set_bound (RIGHT, unsmob_grob (get_property ("currentCommandColumn"))); + pending_extender_->set_object ("next", item->self_scm ()); + completize_extender (pending_extender_); + pending_extender_ = 0; } } void -Extender_engraver::process_music () +Extender_engraver::stop_translation_timestep () { - if (req_l_ && ! extender_p_) + if (extender_ || pending_extender_) { - if (!last_lyric_l_) + Context *voice = get_voice_to_lyrics (context ()); + Grob *h = voice ? get_current_note_head (voice) : 0; + + if (h) { - req_l_->origin ()->warning (_ ("Nothing to connect extender to on the left. Ignoring extender request.")); - return; + if (extender_) + { + Pointer_group_interface::add_grob (extender_, + ly_symbol2scm ("heads"), h); + } + + if (pending_extender_) + { + Pointer_group_interface::add_grob (pending_extender_, + ly_symbol2scm ("heads"), h); + } } - - extender_p_ = new Spanner (get_property ("LyricExtender")); - - Lyric_extender::set_textitem (extender_p_, LEFT, last_lyric_l_); - announce_grob(extender_p_, req_l_->self_scm()); + if (extender_) + { + pending_extender_ = extender_; + extender_ = 0; + } } -} + ev_ = 0; +} void -Extender_engraver::stop_translation_timestep () +completize_extender (Spanner *sp) { - if (extender_p_) + if (!sp->get_bound (RIGHT)) { - typeset_grob (extender_p_); - extender_p_ = 0; - } - - if (current_lyric_l_) - { - last_lyric_l_ = current_lyric_l_; - current_lyric_l_ =0; + extract_item_set (sp, "heads", heads); + if (heads.size ()) + sp->set_bound (RIGHT, heads.back ()); } } void -Extender_engraver::start_translation_timestep () +Extender_engraver::finalize () { - req_l_ = 0; + if (extender_) + { + completize_extender (extender_); + + if (!extender_->get_bound (RIGHT)) + extender_->warning (_ ("unterminated extender")); + extender_ = 0; + } + + if (pending_extender_) + { + completize_extender (pending_extender_); + + if (!pending_extender_->get_bound (RIGHT)) + pending_extender_->warning (_ ("unterminated extender")); + pending_extender_ = 0; + } } +#include "translator.icc" -ENTER_DESCRIPTION(Extender_engraver, -/* descr */ "Create lyric extenders", -/* creats*/ "LyricExtender", -/* acks */ "lyric-syllable-interface", -/* reads */ "", -/* write */ ""); +ADD_ACKNOWLEDGER (Extender_engraver, lyric_syllable); +ADD_TRANSLATOR (Extender_engraver, + /* doc */ "Create lyric extenders", + /* create */ "LyricExtender", + /* accept */ "extender-event", + /* read */ "", + /* write */ "");