X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fextender-engraver.cc;h=3f3ef3b3ff3941527362496a43e9f2a3f964274a;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=cc2939a030fd151c96b6da39fd58acb3cacc9e36;hpb=94a1966c72301b8bd1d8bb3b8628c3f089d007cf;p=lilypond.git diff --git a/lily/extender-engraver.cc b/lily/extender-engraver.cc index cc2939a030..3f3ef3b3ff 100644 --- a/lily/extender-engraver.cc +++ b/lily/extender-engraver.cc @@ -1,41 +1,58 @@ /* - extender-engraver.cc -- implement Extender_engraver + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter - - (c) 1999--2004 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 "warn.hh" -#include "lyric-extender.hh" -#include "item.hh" -#include "engraver.hh" #include "context.hh" -#include "group-interface.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 { - Music* ev_; - Spanner* extender_; - Spanner * pending_extender_; + Stream_event *ev_; + Spanner *extender_; + Spanner *pending_extender_; + public: TRANSLATOR_DECLARATIONS (Extender_engraver); protected: - virtual void acknowledge_grob (Grob_info); + DECLARE_TRANSLATOR_LISTENER (extender); + DECLARE_TRANSLATOR_LISTENER (completize_extender); + DECLARE_ACKNOWLEDGER (lyric_syllable); + virtual void finalize (); - virtual bool try_music (Music*); - virtual void stop_translation_timestep (); - virtual void process_music (); -private: + void stop_translation_timestep (); + void process_music (); }; - - - Extender_engraver::Extender_engraver () { extender_ = 0; @@ -43,95 +60,104 @@ Extender_engraver::Extender_engraver () ev_ = 0; } -bool -Extender_engraver::try_music (Music* r) +IMPLEMENT_TRANSLATOR_LISTENER (Extender_engraver, extender); +void +Extender_engraver::listen_extender (Stream_event *ev) { - if (ev_) - return false; - - ev_ = r; - return true; + 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) +*/ +IMPLEMENT_TRANSLATOR_LISTENER (Extender_engraver, completize_extender); void -Extender_engraver::process_music () +Extender_engraver::listen_completize_extender (Stream_event * /* ev */) { - if (ev_) + if (pending_extender_) { - extender_ = make_spanner ("LyricExtender"); - announce_grob (extender_, ev_->self_scm ()); + completize_extender (pending_extender_); + pending_extender_ = 0; } } +void +Extender_engraver::process_music () +{ + if (ev_) + extender_ = make_spanner ("LyricExtender", ev_->self_scm ()); +} void -Extender_engraver::acknowledge_grob (Grob_info i) +Extender_engraver::acknowledge_lyric_syllable (Grob_info i) { - Item * item = dynamic_cast (i.grob_); + Item *item = i.item (); + if (extender_) + extender_->set_bound (LEFT, item); - if (item - && item->internal_has_interface (ly_symbol2scm ("lyric-syllable-interface"))) + if (pending_extender_) { - if (extender_) - extender_->set_bound (LEFT, item); - - if (pending_extender_) - pending_extender_->set_bound (RIGHT, item); + pending_extender_->set_object ("next", item->self_scm ()); + completize_extender (pending_extender_); + pending_extender_ = 0; } } void Extender_engraver::stop_translation_timestep () { - if (pending_extender_ && pending_extender_->get_bound (RIGHT)) - { - typeset_grob (pending_extender_); - pending_extender_ = 0; - } - if (extender_ || pending_extender_) { - Context *voice = get_voice_to_lyrics (daddy_context_); - Grob* h = (voice) ? get_current_note_head (voice) : 0; + 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_) + { + 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; - } + { + pending_extender_ = extender_; + extender_ = 0; + } } ev_ = 0; } void -completize_extender (Spanner* sp) +completize_extender (Spanner *sp) { if (!sp->get_bound (RIGHT)) { - SCM heads = sp->get_property ("heads"); - if (ly_pair_p (heads)) - { - Item* it = dynamic_cast (unsmob_grob (ly_car (heads))); - if (it) - sp->set_bound (RIGHT, it); - } + extract_item_set (sp, "heads", heads); + if (heads.size ()) + sp->set_bound (RIGHT, heads.back ()); } } - - void Extender_engraver::finalize () { @@ -140,8 +166,7 @@ Extender_engraver::finalize () completize_extender (extender_); if (!extender_->get_bound (RIGHT)) - extender_->warning (_ ("unterminated extender")); - typeset_grob (extender_); + extender_->warning (_ ("unterminated extender")); extender_ = 0; } @@ -150,20 +175,22 @@ Extender_engraver::finalize () completize_extender (pending_extender_); if (!pending_extender_->get_bound (RIGHT)) - pending_extender_->warning (_("unterminated extender")); - typeset_grob (pending_extender_); - pending_extender_ =0; + 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 ", - -ENTER_DESCRIPTION (Extender_engraver, -/* descr */ "Create lyric extenders", -/* creats*/ "LyricExtender", -/* accepts */ "extender-event", -/* acks */ "lyric-syllable-interface", -/* reads */ "", -/* write */ ""); + /* write */ + "" + );