X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fextender-engraver.cc;h=19e04062793b19d531f6a73b5b3f646772eaf602;hb=734f5255777e8c85676ad3f24fcd214a62a35862;hp=f7eebd9e42491d1992c8dead4f98a091f666ce47;hpb=aad5ddf9162f3ee43f74a8e108324f3959f2f9c0;p=lilypond.git diff --git a/lily/extender-engraver.cc b/lily/extender-engraver.cc index f7eebd9e42..19e0406279 100644 --- a/lily/extender-engraver.cc +++ b/lily/extender-engraver.cc @@ -1,95 +1,197 @@ /* - extender-engraver.cc -- implement Extender_engraver + This file is part of LilyPond, the GNU music typesetter. - (c) 1998 Jan Nieuwenhuizen + Copyright (C) 1999--2012 Glen Prideaux , + Han-Wen Nienhuys , + Jan Nieuwenhuizen + + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ -#include "proto.hh" -#include "musical-request.hh" -#include "extender-engraver.hh" -#include "extender-spanner.hh" -#include "text-def.hh" -#include "score-column.hh" -#include "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_TRANSLATOR_LISTENER (completize_extender); + DECLARE_ACKNOWLEDGER (lyric_syllable); + + virtual void finalize (); + + void stop_translation_timestep (); + void process_music (); +}; Extender_engraver::Extender_engraver () { - extender_spanner_p_ = 0; - span_reqs_drul_[RIGHT] = span_reqs_drul_[LEFT] = 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) { - Text_item* t = (dynamic_cast (i.elem_l_)); - if (!t) - return; - if (!extender_spanner_p_) - return; - if (!span_reqs_drul_[LEFT]) - return; - - if (!extender_spanner_p_->textitem_l_drul_[LEFT]) - extender_spanner_p_->set_textitem (LEFT, t); - else - if (span_reqs_drul_[RIGHT] && !extender_spanner_p_->textitem_l_drul_[RIGHT]) - extender_spanner_p_->set_textitem (RIGHT, t); + ASSIGN_EVENT_ONCE (ev_, ev); } -bool -Extender_engraver::do_try_music (Music* req_l) +/* + A CompletizeExtenderEvent is sent at the end of each lyrics block + to ensure any pending extender can be correctly terminated if the lyrics + end before the associated voice (this prevents the right bound being extended + to the next note-column if no lyric follows the extender) +*/ +IMPLEMENT_TRANSLATOR_LISTENER (Extender_engraver, completize_extender); +void +Extender_engraver::listen_completize_extender (Stream_event * /* ev */) { - if (Extender_req* p = dynamic_cast (req_l)) + if (pending_extender_) { - if (bool (extender_spanner_p_) == bool (p->spantype_ == START)) - return false; - - Direction d = (!extender_spanner_p_) ? LEFT : RIGHT; - if (span_reqs_drul_[d] && !span_reqs_drul_[d]->equal_b (p)) - return false; - - span_reqs_drul_[d] = p; - span_mom_drul_[d] = get_staff_info ().musical_l ()->when (); - return true; + completize_extender (pending_extender_); + pending_extender_ = 0; } - return false; } void -Extender_engraver::do_removal_processing () +Extender_engraver::process_music () +{ + if (ev_) + extender_ = make_spanner ("LyricExtender", ev_->self_scm ()); +} + +void +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_) { - span_reqs_drul_[LEFT]->warning (_ ("unterminated extender")); - extender_spanner_p_->unlink (); - delete extender_spanner_p_; - extender_spanner_p_ = 0; - span_reqs_drul_[RIGHT] = span_reqs_drul_[LEFT] = 0; + 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 () { - if (extender_spanner_p_ || !span_reqs_drul_[LEFT]) - return; + if (extender_ || pending_extender_) + { + Context *voice = get_voice_to_lyrics (context ()); + Grob *h = voice ? get_current_note_head (voice, to_boolean (get_property ("includeGraceNotes"))) : 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_) + { + pending_extender_ = extender_; + extender_ = 0; + } + } - extender_spanner_p_ = new Extender_spanner; + ev_ = 0; +} - announce_element (Score_element_info (extender_spanner_p_, span_reqs_drul_[LEFT])); +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::do_pre_move_processing () +Extender_engraver::finalize () { - if (!extender_spanner_p_ || !span_reqs_drul_[RIGHT]) - return; + if (extender_) + { + completize_extender (extender_); - typeset_element (extender_spanner_p_); - - extender_spanner_p_ = 0; - span_reqs_drul_[RIGHT] = span_reqs_drul_[LEFT] = 0; + 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; + } } +ADD_ACKNOWLEDGER (Extender_engraver, lyric_syllable); +ADD_TRANSLATOR (Extender_engraver, + /* doc */ + "Create lyric extenders.", + + /* create */ + "LyricExtender ", + + /* read */ + "extendersOverRests " + "includeGraceNotes ", + + /* write */ + "" + );