X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fextender-engraver.cc;h=f3f711de0f84d9efb31664bb04b43f3ce7f8086e;hb=1a788358cd2d55e1d8f7556861e984f94c1ce2e9;hp=914eefbe63b857544c750c0f412600fadb30671d;hpb=a6ee9dcd388111e842064a8d46ab06c4897a00d2;p=lilypond.git diff --git a/lily/extender-engraver.cc b/lily/extender-engraver.cc index 914eefbe63..f3f711de0f 100644 --- a/lily/extender-engraver.cc +++ b/lily/extender-engraver.cc @@ -1,149 +1,169 @@ /* 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--2009 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 "stream-event.hh" +#include "warn.hh" +#include "spanner.hh" +#include "translator.icc" -/** - 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_; - Grob *current_lyric_; - Extender_req* req_; - Spanner* extender_; + Stream_event *ev_; + Spanner *extender_; + Spanner *pending_extender_; + public: - TRANSLATOR_DECLARATIONS(Extender_engraver); + TRANSLATOR_DECLARATIONS (Extender_engraver); protected: - virtual void acknowledge_grob (Grob_info); + DECLARE_TRANSLATOR_LISTENER (extender); + 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: + void stop_translation_timestep (); + void process_music (); }; - - - Extender_engraver::Extender_engraver () { - current_lyric_ = 0; - last_lyric_ = 0; extender_ = 0; - req_ = 0; + pending_extender_ = 0; + ev_ = 0; } +IMPLEMENT_TRANSLATOR_LISTENER (Extender_engraver, extender); void -Extender_engraver::acknowledge_grob (Grob_info i) +Extender_engraver::listen_extender (Stream_event *ev) { - // -> text_item - if (i.grob_->internal_has_interface (ly_symbol2scm ("lyric-syllable-interface"))) - { - current_lyric_ = i.grob_; - if (extender_ - && !extender_->get_bound (RIGHT) - ) - { - Lyric_extender::set_textitem (extender_, RIGHT, dynamic_cast (i.grob_)); - } - } + ASSIGN_EVENT_ONCE (ev_, ev); } - -bool -Extender_engraver::try_music (Music* r) +void +Extender_engraver::process_music () { - if (Extender_req* p = dynamic_cast (r)) - { - if (req_) - return false; - - req_ = p; - return true; - } - return false; + if (ev_) + extender_ = make_spanner ("LyricExtender", ev_->self_scm ()); } void -Extender_engraver::finalize () +Extender_engraver::acknowledge_lyric_syllable (Grob_info i) { + Item *item = i.item (); if (extender_) + extender_->set_bound (LEFT, item); + + if (pending_extender_) { - req_->origin ()->warning (_ ("unterminated extender")); - extender_->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_ && ! extender_) + if (extender_ || pending_extender_) { - if (!last_lyric_) + Context *voice = get_voice_to_lyrics (context ()); + Grob *h = voice ? get_current_note_head (voice) : 0; + + if (h) + { + 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); + } + } + else + { + if (pending_extender_ + && !get_property ("extendersOverRests")) + { + completize_extender (pending_extender_); + pending_extender_ = 0; + } + + } + if (extender_) { - req_->origin ()->warning (_ ("Nothing to connect extender to on the left. Ignoring extender request.")); - return; + pending_extender_ = extender_; + extender_ = 0; } - - extender_ = new Spanner (get_property ("LyricExtender")); + } + ev_ = 0; +} - Lyric_extender::set_textitem (extender_, LEFT, last_lyric_); - announce_grob(extender_, req_->self_scm()); +void +completize_extender (Spanner *sp) +{ + if (!sp->get_bound (RIGHT)) + { + extract_item_set (sp, "heads", heads); + if (heads.size ()) + sp->set_bound (RIGHT, heads.back ()); } } - void -Extender_engraver::stop_translation_timestep () +Extender_engraver::finalize () { if (extender_) { - typeset_grob (extender_); + completize_extender (extender_); + + if (!extender_->get_bound (RIGHT)) + extender_->warning (_ ("unterminated extender")); extender_ = 0; } - if (current_lyric_) + if (pending_extender_) { - last_lyric_ = current_lyric_; - current_lyric_ =0; + completize_extender (pending_extender_); + + if (!pending_extender_->get_bound (RIGHT)) + pending_extender_->warning (_ ("unterminated extender")); + pending_extender_ = 0; } } -void -Extender_engraver::start_translation_timestep () -{ - req_ = 0; -} +ADD_ACKNOWLEDGER (Extender_engraver, lyric_syllable); +ADD_TRANSLATOR (Extender_engraver, + /* doc */ + "Create lyric extenders.", + + /* create */ + "LyricExtender ", + /* read */ + "extendersOverRests ", -ENTER_DESCRIPTION(Extender_engraver, -/* descr */ "Create lyric extenders", -/* creats*/ "LyricExtender", -/* acks */ "lyric-syllable-interface", -/* reads */ "", -/* write */ ""); + /* write */ + "" + );