X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fextender-engraver.cc;h=39fa7788dedb87fa6a4ff5344c865f9c963383c3;hb=28720b35daafc5e1b39fe041cb7fde8d19eae95a;hp=604172c29293d564d275ec5f09123ccc89a5f5cf;hpb=fc5394c7751ea902382ecc9022854583aff0d95e;p=lilypond.git diff --git a/lily/extender-engraver.cc b/lily/extender-engraver.cc index 604172c292..39fa7788de 100644 --- a/lily/extender-engraver.cc +++ b/lily/extender-engraver.cc @@ -1,107 +1,201 @@ /* - extender-engraver.cc -- implement Extender_engraver + This file is part of LilyPond, the GNU music typesetter. - (c) 1999 Glen Prideaux , - Han-Wen Nienhuys, Jan Nieuwenhuizen. - + Copyright (C) 1999--2015 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 "score-column.hh" -#include "text-item.hh" -#include "extender-engraver.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); + +protected: + void listen_extender (Stream_event *); + void listen_completize_extender (Stream_event *); + void acknowledge_lyric_syllable (Grob_info); + + virtual void finalize (); -ADD_THIS_TRANSLATOR (Extender_engraver); + void stop_translation_timestep (); + void process_music (); +}; Extender_engraver::Extender_engraver () { - current_lyric_l_ = 0; - last_lyric_l_ = 0; - extender_spanner_p_ = 0; - req_l_ = 0; + extender_ = 0; + pending_extender_ = 0; + ev_ = 0; } void -Extender_engraver::acknowledge_element (Score_element_info i) +Extender_engraver::listen_extender (Stream_event *ev) +{ + ASSIGN_EVENT_ONCE (ev_, ev); +} + +/* + 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) +*/ +void +Extender_engraver::listen_completize_extender (Stream_event * /* ev */) { - if (Text_item* t = dynamic_cast (i.elem_l_)) + if (pending_extender_) { - current_lyric_l_ = t; - if (extender_spanner_p_ - && !extender_spanner_p_->spanned_drul_[RIGHT] - ) - { - extender_spanner_p_->set_textitem (RIGHT, t); - } + completize_extender (pending_extender_); + pending_extender_ = 0; } } +void +Extender_engraver::process_music () +{ + if (ev_) + extender_ = make_spanner ("LyricExtender", ev_->self_scm ()); +} -bool -Extender_engraver::do_try_music (Music* r) +void +Extender_engraver::acknowledge_lyric_syllable (Grob_info i) { - if (Extender_req* p = dynamic_cast (r)) - { - if (req_l_) - return false; + Item *item = i.item (); + if (extender_) + extender_->set_bound (LEFT, item); - req_l_ = p; - return true; + if (pending_extender_) + { + pending_extender_->set_object ("next", item->self_scm ()); + completize_extender (pending_extender_); + pending_extender_ = 0; } - return false; } void -Extender_engraver::do_removal_processing () +Extender_engraver::stop_translation_timestep () { - if (extender_spanner_p_) + if (extender_ || pending_extender_) { - req_l_->warning (_ ("unterminated extender")); - extender_spanner_p_->set_bounds(RIGHT, get_staff_info ().command_pcol_l ()); + 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_) + { + pending_extender_ = extender_; + extender_ = 0; + } } + + ev_ = 0; } void -Extender_engraver::do_process_requests () +completize_extender (Spanner *sp) { - if (req_l_) + if (!sp->get_bound (RIGHT)) { - if (!last_lyric_l_) - { - req_l_->warning (_ ("Nothing to connect extender to on the left. Ignoring extender request.")); - return; - } - - extender_spanner_p_ = new Extender_spanner; - extender_spanner_p_->set_textitem (LEFT, last_lyric_l_); - announce_element (Score_element_info (extender_spanner_p_, req_l_)); + 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_) + if (extender_) { - typeset_element (extender_spanner_p_); - extender_spanner_p_ = 0; + completize_extender (extender_); + + if (!extender_->get_bound (RIGHT)) + extender_->warning (_ ("unterminated extender")); + extender_ = 0; } - if (current_lyric_l_) + if (pending_extender_) { - last_lyric_l_ = current_lyric_l_; - current_lyric_l_ =0; + completize_extender (pending_extender_); + + if (!pending_extender_->get_bound (RIGHT)) + pending_extender_->warning (_ ("unterminated extender")); + pending_extender_ = 0; } } void -Extender_engraver::do_post_move_processing () +Extender_engraver::boot () { - req_l_ = 0; + ADD_LISTENER (Extender_engraver, extender); + ADD_LISTENER (Extender_engraver, completize_extender); + ADD_ACKNOWLEDGER (Extender_engraver, lyric_syllable); } +ADD_TRANSLATOR (Extender_engraver, + /* doc */ + "Create lyric extenders.", + + /* create */ + "LyricExtender ", + + /* read */ + "extendersOverRests ", + /* write */ + "" + );