X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fextender-engraver.cc;h=77a9f7c9520f50f1c2f46c80586d03a866fde169;hb=76324bbc6789847e80b4bbdd4e8246d6e4eae8d1;hp=1f616ec7951d674babd835f43069020e40c55085;hpb=1d7d22c0171288be6009b68e611beaed18be993c;p=lilypond.git diff --git a/lily/extender-engraver.cc b/lily/extender-engraver.cc index 1f616ec795..77a9f7c952 100644 --- a/lily/extender-engraver.cc +++ b/lily/extender-engraver.cc @@ -1,141 +1,169 @@ /* extender-engraver.cc -- implement Extender_engraver - (c) 1998--1999 Jan Nieuwenhuizen + source file of the GNU LilyPond music typesetter + + (c) 1999--2007 Glen Prideaux , + Han-Wen Nienhuys , + Jan Nieuwenhuizen */ -#include "proto.hh" -#include "musical-request.hh" -#include "extender-engraver.hh" -#include "extender-spanner.hh" -#include "score-column.hh" -#include "g-text-item.hh" +#include "context.hh" +#include "engraver.hh" +#include "international.hh" +#include "item.hh" +#include "lyric-extender.hh" +#include "note-head.hh" +#include "pointer-group-interface.hh" +#include "stream-event.hh" +#include "warn.hh" +#include "spanner.hh" + +#include "translator.icc" + +void completize_extender (Spanner *sp); + +class Extender_engraver : public Engraver +{ + Stream_event *ev_; + Spanner *extender_; + Spanner *pending_extender_; + +public: + TRANSLATOR_DECLARATIONS (Extender_engraver); -ADD_THIS_TRANSLATOR (Extender_engraver); +protected: + DECLARE_TRANSLATOR_LISTENER (extender); + DECLARE_ACKNOWLEDGER (lyric_syllable); + + virtual void finalize (); + + void stop_translation_timestep (); + void process_music (); +}; Extender_engraver::Extender_engraver () { - extender_spanner_p_ = 0; - req_l_ = 0; + extender_ = 0; + pending_extender_ = 0; + ev_ = 0; } +IMPLEMENT_TRANSLATOR_LISTENER (Extender_engraver, extender); void -Extender_engraver::acknowledge_element (Score_element_info i) +Extender_engraver::listen_extender (Stream_event *ev) { - 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); - } - } + ASSIGN_EVENT_ONCE (ev_, ev); } - -bool -Extender_engraver::do_try_music (Music* req_l) +void +Extender_engraver::process_music () { - if (Extender_req* p = dynamic_cast (req_l)) - { - if (req_l_) - return false; - - req_l_ = p; - return true; - } - return false; + if (ev_) + extender_ = make_spanner ("LyricExtender", ev_->self_scm ()); } void -Extender_engraver::do_removal_processing () +Extender_engraver::acknowledge_lyric_syllable (Grob_info i) { - if (extender_spanner_p_) + Item *item = i.item (); + if (extender_) + extender_->set_bound (LEFT, item); + + if (pending_extender_) { - req_l_->warning (_ ("unterminated extender")); - extender_spanner_p_->set_bounds(RIGHT, get_staff_info ().command_pcol_l ()); + pending_extender_->set_object ("next", item->self_scm ()); + completize_extender (pending_extender_); + pending_extender_ = 0; } } void -Extender_engraver::do_process_requests () +Extender_engraver::stop_translation_timestep () { - Array stopped_texts; - Moment now = now_mom (); - - 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 (extender_ || pending_extender_) { - if (!stopped_texts.size ()) + 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 { - req_l_->warning ("Nothing to connect extender to on the left. Ignoring extender request"); - return; + if (pending_extender_ + && !get_property ("extendersOverRests")) + { + completize_extender (pending_extender_); + pending_extender_ = 0; + } + + } + if (extender_) + { + pending_extender_ = extender_; + 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_)); } -} + ev_ = 0; +} void -Extender_engraver::do_pre_move_processing () +completize_extender (Spanner *sp) { - for (int i=0; i < now_lyrics_.size (); i++) - { - past_lyrics_pq_.insert (now_lyrics_[i]); - } - now_lyrics_.clear (); - - if (extender_spanner_p_) + if (!sp->get_bound (RIGHT)) { - typeset_element (extender_spanner_p_); - extender_spanner_p_ = 0; + extract_item_set (sp, "heads", heads); + if (heads.size ()) + sp->set_bound (RIGHT, heads.back ()); } } + 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; + } } +ADD_ACKNOWLEDGER (Extender_engraver, lyric_syllable); +ADD_TRANSLATOR (Extender_engraver, + /* doc */ + "Create lyric extenders.", -int -Text_lyric_tuple::time_compare (Text_lyric_tuple const&h1, - Text_lyric_tuple const &h2) -{ - return (h1.end_ - h2.end_ ).sign (); -} + /* create */ + "LyricExtender ", + + /* read */ + "extendersOverRests ", + + /* write */ + "" + );