X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fextender-engraver.cc;h=d3b2e90972facbdee6b1579468aedafb9900d345;hb=e10092cbaddbbe8bf2a3668eb70ee4dafb54af8a;hp=faf311ed83b254e24f5831f70211c4d20ee6111d;hpb=c52973e438ce3490d688860bb71849a7b3c26fef;p=lilypond.git diff --git a/lily/extender-engraver.cc b/lily/extender-engraver.cc index faf311ed83..d3b2e90972 100644 --- a/lily/extender-engraver.cc +++ b/lily/extender-engraver.cc @@ -1,144 +1,153 @@ /* extender-engraver.cc -- implement Extender_engraver - (c) 1999 Glen Prideaux , - Han-Wen Nienhuys, Jan Nieuwenhuizen. - + source file of the GNU LilyPond music typesetter + + (c) 1999--2006 Glen Prideaux , + Han-Wen Nienhuys , + Jan Nieuwenhuizen */ -#include "proto.hh" -#include "musical-request.hh" -#include "extender-spanner.hh" -#include "paper-column.hh" -#include "item.hh" +#include "context.hh" #include "engraver.hh" -#include "drul-array.hh" -#include "extender-spanner.hh" -#include "pqueue.hh" - +#include "international.hh" +#include "item.hh" +#include "lyric-extender.hh" +#include "note-head.hh" +#include "pointer-group-interface.hh" +#include "warn.hh" -/** - 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 { - Item * last_lyric_l_; - Item * current_lyric_l_; - Extender_req* req_l_; - Spanner* extender_p_; + Music *ev_; + Spanner *extender_; + Spanner *pending_extender_; + public: - Extender_engraver (); - VIRTUAL_COPY_CONS (Translator); + TRANSLATOR_DECLARATIONS (Extender_engraver); protected: - virtual void acknowledge_element (Score_element_info); - virtual void do_removal_processing(); - virtual void do_process_music(); - virtual bool do_try_music (Music*); - virtual void do_pre_move_processing(); - virtual void do_post_move_processing (); -private: - + DECLARE_ACKNOWLEDGER (lyric_syllable); + virtual void finalize (); + virtual bool try_music (Music *); + void stop_translation_timestep (); + void process_music (); }; - -ADD_THIS_TRANSLATOR (Extender_engraver); - Extender_engraver::Extender_engraver () { - current_lyric_l_ = 0; - last_lyric_l_ = 0; - extender_p_ = 0; - req_l_ = 0; -} - -void -Extender_engraver::acknowledge_element (Score_element_info i) -{ - // -> text_item - if (Item* t = dynamic_cast (i.elem_l_)) - { - current_lyric_l_ = t; - if (extender_p_ - && !extender_p_->get_bound (RIGHT) - ) - { - Lyric_extender(extender_p_).set_textitem (RIGHT, t); - } - } + extender_ = 0; + pending_extender_ = 0; + ev_ = 0; } - bool -Extender_engraver::do_try_music (Music* r) +Extender_engraver::try_music (Music *r) { - if (Extender_req* p = dynamic_cast (r)) + if (!ev_) { - if (req_l_) - return false; - - req_l_ = p; + ev_ = r; return true; } return false; } void -Extender_engraver::do_removal_processing () +Extender_engraver::process_music () +{ + if (ev_) + extender_ = make_spanner ("LyricExtender", ev_->self_scm ()); +} + +void +Extender_engraver::acknowledge_lyric_syllable (Grob_info i) { - if (extender_p_) + Item *item = i.item (); + if (extender_) + extender_->set_bound (LEFT, item); + + if (pending_extender_) { - req_l_->warning (_ ("unterminated extender")); - extender_p_->set_bound(RIGHT, get_staff_info ().command_pcol_l ()); + pending_extender_->set_object ("next", item->self_scm ()); + completize_extender (pending_extender_); + pending_extender_ = 0; } } void -Extender_engraver::do_process_music () +Extender_engraver::stop_translation_timestep () { - if (req_l_) + 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_->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); + } } - - extender_p_ = new Spanner (get_property ("basicLyricExtenderProperties")); - extender_p_->set_extent_callback (Score_element::point_dimension_callback, Y_AXIS); - Lyric_extender (extender_p_).set_textitem (LEFT, last_lyric_l_); - announce_element (Score_element_info (extender_p_, req_l_)); + if (extender_) + { + pending_extender_ = extender_; + extender_ = 0; + } } -} + ev_ = 0; +} void -Extender_engraver::do_pre_move_processing () +completize_extender (Spanner *sp) { - if (extender_p_) - { - typeset_element (extender_p_); - extender_p_ = 0; - } - - if (current_lyric_l_) + if (!sp->get_bound (RIGHT)) { - last_lyric_l_ = current_lyric_l_; - current_lyric_l_ =0; + extract_item_set (sp, "heads", heads); + if (heads.size ()) + sp->set_bound (RIGHT, heads.back ()); } } void -Extender_engraver::do_post_move_processing () +Extender_engraver::finalize () { - req_l_ = 0; + if (extender_) + { + completize_extender (extender_); + + if (!extender_->get_bound (RIGHT)) + extender_->warning (_ ("unterminated extender")); + extender_ = 0; + } + + if (pending_extender_) + { + completize_extender (pending_extender_); + + if (!pending_extender_->get_bound (RIGHT)) + pending_extender_->warning (_ ("unterminated extender")); + pending_extender_ = 0; + } } +#include "translator.icc" +ADD_ACKNOWLEDGER (Extender_engraver, lyric_syllable); +ADD_TRANSLATOR (Extender_engraver, + /* doc */ "Create lyric extenders", + /* create */ "LyricExtender", + /* accept */ "extender-event", + /* read */ "", + /* write */ "");