X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fextender-engraver.cc;h=624a6bc062e809b734849058c1d410f323bd72b8;hb=90e4d7057f3857da049dfda3d130017d4719bd6b;hp=097b47912ba0daa1d7375cc416ee89bec8382317;hpb=e18531db1f79fb685fbd16d6a2a67bf4b6c09915;p=lilypond.git diff --git a/lily/extender-engraver.cc b/lily/extender-engraver.cc index 097b47912b..624a6bc062 100644 --- a/lily/extender-engraver.cc +++ b/lily/extender-engraver.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1999--2010 Glen Prideaux , + Copyright (C) 1999--2015 Glen Prideaux , Han-Wen Nienhuys , Jan Nieuwenhuizen @@ -18,6 +18,7 @@ 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 "international.hh" @@ -28,8 +29,6 @@ #include "stream-event.hh" #include "warn.hh" #include "spanner.hh" -#include "paper-column.hh" - #include "translator.icc" void completize_extender (Spanner *sp); @@ -39,14 +38,14 @@ class Extender_engraver : public Engraver Stream_event *ev_; Spanner *extender_; Spanner *pending_extender_; - bool current_lyric_is_skip_; public: TRANSLATOR_DECLARATIONS (Extender_engraver); protected: - DECLARE_TRANSLATOR_LISTENER (extender); - DECLARE_ACKNOWLEDGER (lyric_syllable); + void listen_extender (Stream_event *); + void listen_completize_extender (Stream_event *); + void acknowledge_lyric_syllable (Grob_info); virtual void finalize (); @@ -54,21 +53,36 @@ protected: void process_music (); }; -Extender_engraver::Extender_engraver () +Extender_engraver::Extender_engraver (Context *c) + : Engraver (c) { - current_lyric_is_skip_ = false; extender_ = 0; pending_extender_ = 0; ev_ = 0; } -IMPLEMENT_TRANSLATOR_LISTENER (Extender_engraver, extender); 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 (pending_extender_) + { + completize_extender (pending_extender_); + pending_extender_ = 0; + } +} + void Extender_engraver::process_music () { @@ -83,10 +97,7 @@ Extender_engraver::acknowledge_lyric_syllable (Grob_info i) if (extender_) extender_->set_bound (LEFT, item); - SCM text = item->get_property ("text"); - current_lyric_is_skip_ = ly_is_equal (text, scm_from_locale_string (" ")); - - if (pending_extender_ && !current_lyric_is_skip_) + if (pending_extender_) { pending_extender_->set_object ("next", item->self_scm ()); completize_extender (pending_extender_); @@ -103,53 +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); - /* - The following check addresses the case where the lyrics end before - the associated voice. The current_lyric_is_skip_ check is - necessary to handle manual melismata, which should not result in - extenders being completized. We also need to make sure that we're not - in the middle of a note (happens when this function is called because - of an event in a voice other than our associated one). - */ - if (!melisma_busy (voice) && !current_lyric_is_skip_) - { - Moment now = voice->now_mom (); - Paper_column *column = (dynamic_cast (h))->get_column (); - Moment *start_mom = column ? unsmob_moment (column->get_property ("when")) : 0; - if (!column || (start_mom->main_part_ == now.main_part_)) - { - completize_extender (pending_extender_); - pending_extender_ = 0; - } - } + { + 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 (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; @@ -162,7 +153,7 @@ completize_extender (Spanner *sp) { extract_item_set (sp, "heads", heads); if (heads.size ()) - sp->set_bound (RIGHT, heads.back ()); + sp->set_bound (RIGHT, heads.back ()); } } @@ -174,7 +165,7 @@ Extender_engraver::finalize () completize_extender (extender_); if (!extender_->get_bound (RIGHT)) - extender_->warning (_ ("unterminated extender")); + extender_->warning (_ ("unterminated extender")); extender_ = 0; } @@ -183,22 +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; } } -ADD_ACKNOWLEDGER (Extender_engraver, lyric_syllable); +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, - /* doc */ - "Create lyric extenders.", + /* doc */ + "Create lyric extenders.", - /* create */ - "LyricExtender ", + /* create */ + "LyricExtender ", - /* read */ - "extendersOverRests ", + /* read */ + "extendersOverRests ", - /* write */ - "" - ); + /* write */ + "" + );