X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fextender-engraver.cc;h=624a6bc062e809b734849058c1d410f323bd72b8;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=d163ac64864bf527350067d0efac182bcb8eea6b;hpb=14d74ac262744d16fc753ee41042d32860d58633;p=lilypond.git diff --git a/lily/extender-engraver.cc b/lily/extender-engraver.cc index d163ac6486..624a6bc062 100644 --- a/lily/extender-engraver.cc +++ b/lily/extender-engraver.cc @@ -1,26 +1,41 @@ /* - 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 "context.hh" #include "engraver.hh" -#include "group-interface.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_; + Stream_event *ev_; Spanner *extender_; Spanner *pending_extender_; @@ -28,30 +43,44 @@ public: TRANSLATOR_DECLARATIONS (Extender_engraver); protected: - virtual void acknowledge_grob (Grob_info); + void listen_extender (Stream_event *); + void listen_completize_extender (Stream_event *); + void acknowledge_lyric_syllable (Grob_info); + virtual void finalize (); - virtual bool try_music (Music*); - virtual void stop_translation_timestep (); - virtual void process_music (); -}; + void stop_translation_timestep (); + void process_music (); +}; -Extender_engraver::Extender_engraver () +Extender_engraver::Extender_engraver (Context *c) + : Engraver (c) { extender_ = 0; pending_extender_ = 0; ev_ = 0; } -bool -Extender_engraver::try_music (Music *r) +void +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 (!ev_) + if (pending_extender_) { - ev_ = r; - return true; + completize_extender (pending_extender_); + pending_extender_ = 0; } - return false; } void @@ -62,22 +91,17 @@ Extender_engraver::process_music () } 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_property ("next", item->self_scm ()); - completize_extender (pending_extender_); - pending_extender_ = 0; - } + pending_extender_->set_object ("next", item->self_scm ()); + completize_extender (pending_extender_); + pending_extender_ = 0; } } @@ -90,25 +114,33 @@ Extender_engraver::stop_translation_timestep () 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_ + && !to_boolean (get_property ("extendersOverRests"))) + { + completize_extender (pending_extender_); + pending_extender_ = 0; + } + } if (extender_) - { - pending_extender_ = extender_; - extender_ = 0; - } + { + pending_extender_ = extender_; + extender_ = 0; + } } ev_ = 0; @@ -119,13 +151,9 @@ completize_extender (Spanner *sp) { if (!sp->get_bound (RIGHT)) { - 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); - } + extract_item_set (sp, "heads", heads); + if (heads.size ()) + sp->set_bound (RIGHT, heads.back ()); } } @@ -137,7 +165,7 @@ Extender_engraver::finalize () completize_extender (extender_); if (!extender_->get_bound (RIGHT)) - extender_->warning (_ ("unterminated extender")); + extender_->warning (_ ("unterminated extender")); extender_ = 0; } @@ -146,16 +174,29 @@ Extender_engraver::finalize () completize_extender (pending_extender_); if (!pending_extender_->get_bound (RIGHT)) - pending_extender_->warning (_ ("unterminated extender")); + pending_extender_->warning (_ ("unterminated extender")); pending_extender_ = 0; } } +void +Extender_engraver::boot () +{ + ADD_LISTENER (Extender_engraver, extender); + ADD_LISTENER (Extender_engraver, completize_extender); + ADD_ACKNOWLEDGER (Extender_engraver, lyric_syllable); +} ADD_TRANSLATOR (Extender_engraver, -/* descr */ "Create lyric extenders", -/* creats*/ "LyricExtender", -/* accepts */ "extender-event", -/* acks */ "lyric-syllable-interface", -/* reads */ "", -/* write */ ""); + /* doc */ + "Create lyric extenders.", + + /* create */ + "LyricExtender ", + + /* read */ + "extendersOverRests ", + + /* write */ + "" + );