X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fextender-engraver.cc;h=c6fb7167e3f0f785e2f236b0bd9556349d348afe;hb=ed9862d117b627c0438d6c11d1bb3ef103abbc47;hp=f0478bebe2a7678b079543dddd1e07a83e85af63;hpb=74e65211d6cda3818a6d4891f1f1c31f457e94cd;p=lilypond.git diff --git a/lily/extender-engraver.cc b/lily/extender-engraver.cc index f0478bebe2..c6fb7167e3 100644 --- a/lily/extender-engraver.cc +++ b/lily/extender-engraver.cc @@ -1,142 +1,161 @@ /* extender-engraver.cc -- implement Extender_engraver - (c) 1998--1999 Jan Nieuwenhuizen + source file of the GNU LilyPond music typesetter + + (c) 1999--2004 Glen Prideaux , + Han-Wen Nienhuys , + Jan Nieuwenhuizen */ -#include "proto.hh" -#include "musical-request.hh" -#include "extender-engraver.hh" -#include "extender-spanner.hh" -#include "text-def.hh" -#include "score-column.hh" -#include "g-text-item.hh" +#include "context.hh" +#include "engraver.hh" +#include "group-interface.hh" +#include "item.hh" +#include "lyric-extender.hh" +#include "note-head.hh" +#include "warn.hh" -ADD_THIS_TRANSLATOR (Extender_engraver); +void completize_extender (Spanner *sp); -Extender_engraver::Extender_engraver () +class Extender_engraver : public Engraver { - extender_spanner_p_ = 0; - req_l_ = 0; -} + Music *ev_; + Spanner *extender_; + Spanner *pending_extender_; -void -Extender_engraver::acknowledge_element (Score_element_info i) +public: + TRANSLATOR_DECLARATIONS (Extender_engraver); + +protected: + virtual void acknowledge_grob (Grob_info); + virtual void finalize (); + virtual bool try_music (Music*); + virtual void stop_translation_timestep (); + virtual void process_music (); +}; + + +Extender_engraver::Extender_engraver () { - if (G_text_item* t = dynamic_cast (i.elem_l_)) - { - Rhythmic_req * rh = dynamic_cast (i.req_l_); - if (!rh) - return; - - now_lyrics_.push (Text_lyric_tuple (t, rh, now_mom () + rh->length_mom ())); - /* - UGH. What do we do in case of multiple alternatives? - */ - if (extender_spanner_p_ - && !extender_spanner_p_->spanned_drul_[RIGHT] - ) - { - extender_spanner_p_->set_textitem (RIGHT, t); - } - } + extender_ = 0; + pending_extender_ = 0; + ev_ = 0; } - bool -Extender_engraver::do_try_music (Music* req_l) +Extender_engraver::try_music (Music *r) { - if (Extender_req* p = dynamic_cast (req_l)) + if (!ev_) { - if (req_l_) - return false; - - req_l_ = p; + ev_ = r; return true; } return false; } void -Extender_engraver::do_removal_processing () +Extender_engraver::process_music () { - if (extender_spanner_p_) - { - req_l_->warning (_ ("unterminated extender")); - extender_spanner_p_->set_bounds(RIGHT, get_staff_info ().command_pcol_l ()); - } + if (ev_) + extender_ = make_spanner ("LyricExtender", ev_->self_scm ()); } void -Extender_engraver::do_process_requests () +Extender_engraver::acknowledge_grob (Grob_info i) { - Array stopped_texts; - Moment now = now_mom (); + Item *item = dynamic_cast (i.grob_); - stopped_texts.clear (); - while (past_lyrics_pq_.size () - && past_lyrics_pq_.front ().end_ == now) - stopped_texts.push (past_lyrics_pq_.get ()); - - if (req_l_) + if (item + && item->internal_has_interface (ly_symbol2scm ("lyric-syllable-interface"))) { - if (!stopped_texts.size ()) + if (extender_) + extender_->set_bound (LEFT, item); + + if (pending_extender_) { - req_l_->warning ("Nothing to connect extender to on the left. Ignoring extender request"); - return; + pending_extender_->set_property ("next", item->self_scm ()); + completize_extender (pending_extender_); + pending_extender_ = 0; } - - extender_spanner_p_ = new Extender_spanner; - extender_spanner_p_->set_textitem (LEFT, stopped_texts[0].text_l_); - announce_element (Score_element_info (extender_spanner_p_, req_l_)); } } - void -Extender_engraver::do_pre_move_processing () +Extender_engraver::stop_translation_timestep () { - for (int i=0; i < now_lyrics_.size (); i++) + if (extender_ || pending_extender_) { - past_lyrics_pq_.insert (now_lyrics_[i]); + 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); + } + } + + if (extender_) + { + pending_extender_ = extender_; + extender_ = 0; + } } - now_lyrics_.clear (); - if (extender_spanner_p_) + ev_ = 0; +} + +void +completize_extender (Spanner *sp) +{ + if (!sp->get_bound (RIGHT)) { - typeset_element (extender_spanner_p_); - extender_spanner_p_ = 0; + SCM heads = sp->get_property ("heads"); + if (scm_is_pair (heads)) + { + Item *it = dynamic_cast (unsmob_grob (scm_car (heads))); + if (it) + sp->set_bound (RIGHT, it); + } } } + void -Extender_engraver::do_post_move_processing () +Extender_engraver::finalize () { - Moment now = now_mom (); - while (past_lyrics_pq_.size () && past_lyrics_pq_.front ().end_ < now) - past_lyrics_pq_.delmin (); + if (extender_) + { + completize_extender (extender_); - req_l_ =0; -} + if (!extender_->get_bound (RIGHT)) + extender_->warning (_ ("unterminated extender")); + extender_ = 0; + } -/**********************************************************************/ -Text_lyric_tuple::Text_lyric_tuple () -{ - text_l_ =0; - req_l_ =0; - end_ = 0; -} + if (pending_extender_) + { + completize_extender (pending_extender_); -Text_lyric_tuple::Text_lyric_tuple (G_text_item *h, Rhythmic_req*m, Moment mom) -{ - text_l_ = h; - req_l_ = m; - end_ = mom; + if (!pending_extender_->get_bound (RIGHT)) + pending_extender_->warning (_ ("unterminated extender")); + pending_extender_ =0; + } } -int -Text_lyric_tuple::time_compare (Text_lyric_tuple const&h1, - Text_lyric_tuple const &h2) -{ - return (h1.end_ - h2.end_ ).sign (); -} +ENTER_DESCRIPTION (Extender_engraver, +/* descr */ "Create lyric extenders", +/* creats*/ "LyricExtender", +/* accepts */ "extender-event", +/* acks */ "lyric-syllable-interface", +/* reads */ "", +/* write */ "");