X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fextender-engraver.cc;h=08d48a2027154ac9e9dfb38f7c5f0c5b8b750a68;hb=c6b8818201add8f2e2114b5583bca805ac63574a;hp=2bf4c708702a437c1ca57497fd936b748e78ce1c;hpb=b1323f33e9aa4b9eea05eefb8755c907d4d762d4;p=lilypond.git diff --git a/lily/extender-engraver.cc b/lily/extender-engraver.cc index 2bf4c70870..08d48a2027 100644 --- a/lily/extender-engraver.cc +++ b/lily/extender-engraver.cc @@ -1,153 +1,204 @@ /* - 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--2009 Glen Prideaux , + Han-Wen Nienhuys , + Jan Nieuwenhuizen -#include "warn.hh" -#include "lyric-extender.hh" -#include "item.hh" + 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 "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 "paper-column.hh" + +#include "translator.icc" + +void completize_extender (Spanner *sp); class Extender_engraver : public Engraver { - Music* ev_; - Spanner* extender_; - Spanner * finished_extender_; + Stream_event *ev_; + Spanner *extender_; + Spanner *pending_extender_; + bool current_lyric_is_skip_; + public: - TRANSLATOR_DECLARATIONS(Extender_engraver); + TRANSLATOR_DECLARATIONS (Extender_engraver); protected: - virtual void acknowledge_grob (Grob_info); + DECLARE_TRANSLATOR_LISTENER (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 () { + current_lyric_is_skip_ = false; extender_ = 0; - finished_extender_ = 0; + pending_extender_ = 0; ev_ = 0; } +IMPLEMENT_TRANSLATOR_LISTENER (Extender_engraver, extender); void -Extender_engraver::acknowledge_grob (Grob_info i) +Extender_engraver::listen_extender (Stream_event *ev) { - Item * item = dynamic_cast (i.grob_); - // -> text_item - if (item && item->internal_has_interface (ly_symbol2scm ("lyric-syllable-interface"))) - { - if (extender_) - extender_->set_bound (LEFT, item); - - if (finished_extender_) - finished_extender_->set_bound (RIGHT, item); - } + ASSIGN_EVENT_ONCE (ev_, ev); } - -bool -Extender_engraver::try_music (Music* r) +void +Extender_engraver::process_music () { if (ev_) - return false; - - ev_ = r; - return true; + extender_ = make_spanner ("LyricExtender", ev_->self_scm ()); } void -completize_extender (Spanner* sp) +Extender_engraver::acknowledge_lyric_syllable (Grob_info i) { - if (!sp->get_bound (RIGHT)) + Item *item = i.item (); + 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_) { - SCM heads = sp->get_property ("heads"); - if (gh_pair_p (heads)) - { - Item* it = dynamic_cast (unsmob_grob (gh_car (heads))); - if (it) - sp->set_bound (RIGHT, it); - } + pending_extender_->set_object ("next", item->self_scm ()); + completize_extender (pending_extender_); + pending_extender_ = 0; } } - - void -Extender_engraver::finalize () +Extender_engraver::stop_translation_timestep () { - if (extender_) + if (extender_ || pending_extender_) { - completize_extender (extender_); + Context *voice = get_voice_to_lyrics (context ()); + Grob *h = voice ? get_current_note_head (voice) : 0; - if (!extender_->get_bound (RIGHT)) - extender_->warning (_ ("unterminated extender")); - typeset_grob (extender_); - extender_ = 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; + } + } + } + } + else + { + if (pending_extender_ + && !get_property ("extendersOverRests")) + { + completize_extender (pending_extender_); + pending_extender_ = 0; + } + + } + if (extender_) + { + pending_extender_ = extender_; + extender_ = 0; + } } - if (finished_extender_) - { - completize_extender (finished_extender_); - - if (!finished_extender_->get_bound (RIGHT)) - finished_extender_->warning (_("unterminated extender")); - typeset_grob (finished_extender_); - finished_extender_ =0; - } + ev_ = 0; } void -Extender_engraver::process_music () +completize_extender (Spanner *sp) { - if (ev_) + if (!sp->get_bound (RIGHT)) { - extender_ = make_spanner ("LyricExtender"); - announce_grob (extender_, ev_->self_scm()); + extract_item_set (sp, "heads", heads); + if (heads.size ()) + sp->set_bound (RIGHT, heads.back ()); } } - void -Extender_engraver::stop_translation_timestep () +Extender_engraver::finalize () { - if (finished_extender_ && finished_extender_->get_bound (RIGHT)) + if (extender_) { - typeset_grob (finished_extender_); - finished_extender_ = 0; + completize_extender (extender_); + + if (!extender_->get_bound (RIGHT)) + extender_->warning (_ ("unterminated extender")); + extender_ = 0; } - if (finished_extender_ && extender_) + if (pending_extender_) { - programming_error ("Haven't finished extender yet."); - typeset_grob (finished_extender_); - finished_extender_ =0; - } - - if (extender_) - finished_extender_ = extender_; - extender_ = 0; + completize_extender (pending_extender_); - ev_ = 0; + 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 ", -ENTER_DESCRIPTION(Extender_engraver, -/* descr */ "Create lyric extenders", -/* creats*/ "LyricExtender", -/* accepts */ "extender-event", -/* acks */ "lyric-syllable-interface", -/* reads */ "", -/* write */ ""); + /* write */ + "" + );