X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fextender-engraver.cc;h=097b47912ba0daa1d7375cc416ee89bec8382317;hb=d770aef543262c29157842e46ac775bced34aa90;hp=bf1fa72fe09bb9688d73d25cb9fcfec80dea552e;hpb=a4d7106c75b325441063fd9ba9c4131979784aa5;p=lilypond.git diff --git a/lily/extender-engraver.cc b/lily/extender-engraver.cc index bf1fa72fe0..097b47912b 100644 --- a/lily/extender-engraver.cc +++ b/lily/extender-engraver.cc @@ -1,152 +1,204 @@ /* - 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--2010 Glen Prideaux , + Han-Wen Nienhuys , + Jan Nieuwenhuizen -#include "flower-proto.hh" -#include "musical-request.hh" -#include "lyric-extender.hh" -#include "paper-column.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 "drul-array.hh" +#include "international.hh" +#include "item.hh" #include "lyric-extender.hh" -#include "pqueue.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" -/** - Generate an centred extender. Should make a Extender_spanner that - typesets a nice centred extender of varying length depending on the - gap between syllables. +void completize_extender (Spanner *sp); - We remember the last Item that come across. When we get a - request, we create the spanner, and attach the left point to the - last lyrics, and the right point to any lyrics we receive by - then. */ class Extender_engraver : public Engraver { - Score_element *last_lyric_l_; - Score_element *current_lyric_l_; - Extender_req* req_l_; - Spanner* extender_p_; + Stream_event *ev_; + Spanner *extender_; + Spanner *pending_extender_; + bool current_lyric_is_skip_; + public: - Extender_engraver (); - VIRTUAL_COPY_CONS (Translator); + TRANSLATOR_DECLARATIONS (Extender_engraver); protected: - virtual void acknowledge_element (Score_element_info); - virtual void do_removal_processing(); - void deprecated_process_music(); - virtual bool do_try_music (Music*); - virtual void do_pre_move_processing(); - virtual void do_post_move_processing (); - virtual void process_acknowledged (); -private: - -}; + DECLARE_TRANSLATOR_LISTENER (extender); + DECLARE_ACKNOWLEDGER (lyric_syllable); + 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_p_ = 0; - req_l_ = 0; + current_lyric_is_skip_ = false; + extender_ = 0; + pending_extender_ = 0; + ev_ = 0; } +IMPLEMENT_TRANSLATOR_LISTENER (Extender_engraver, extender); void -Extender_engraver::acknowledge_element (Score_element_info i) +Extender_engraver::listen_extender (Stream_event *ev) { - // -> text_item - if (i.elem_l_->has_interface (ly_symbol2scm("text-item-interface"))) - - { - current_lyric_l_ = i.elem_l_; - if (extender_p_ - && !extender_p_->get_bound (RIGHT) - ) - { - Lyric_extender(extender_p_).set_textitem (RIGHT, dynamic_cast (i.elem_l_)); - } - } + ASSIGN_EVENT_ONCE (ev_, ev); } - -bool -Extender_engraver::do_try_music (Music* r) +void +Extender_engraver::process_music () { - if (Extender_req* p = dynamic_cast (r)) - { - if (req_l_) - return false; - - req_l_ = p; - return true; - } - return false; + if (ev_) + extender_ = make_spanner ("LyricExtender", ev_->self_scm ()); } void -Extender_engraver::do_removal_processing () +Extender_engraver::acknowledge_lyric_syllable (Grob_info i) { - if (extender_p_) + 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_) { - req_l_->origin ()->warning (_ ("unterminated extender")); - extender_p_->set_bound(RIGHT, unsmob_element (get_property ("currentCommandColumn"))); + pending_extender_->set_object ("next", item->self_scm ()); + completize_extender (pending_extender_); + pending_extender_ = 0; } } void -Extender_engraver::process_acknowledged () -{ - deprecated_process_music (); -} - -void -Extender_engraver::deprecated_process_music () +Extender_engraver::stop_translation_timestep () { - if (req_l_ && ! extender_p_) + if (extender_ || pending_extender_) { - if (!last_lyric_l_) + Context *voice = get_voice_to_lyrics (context ()); + Grob *h = voice ? get_current_note_head (voice) : 0; + + if (h) { - req_l_->origin ()->warning (_ ("Nothing to connect extender to on the left. Ignoring extender request.")); - return; + 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; } - - extender_p_ = new Spanner (get_property ("LyricExtender")); + } + ev_ = 0; +} - Lyric_extender (extender_p_).set_textitem (LEFT, last_lyric_l_); - announce_element (extender_p_, req_l_); +void +completize_extender (Spanner *sp) +{ + if (!sp->get_bound (RIGHT)) + { + 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_p_) + if (extender_) { - typeset_element (extender_p_); - extender_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 () -{ - req_l_ = 0; -} +ADD_ACKNOWLEDGER (Extender_engraver, lyric_syllable); +ADD_TRANSLATOR (Extender_engraver, + /* doc */ + "Create lyric extenders.", + + /* create */ + "LyricExtender ", + /* read */ + "extendersOverRests ", + /* write */ + "" + );