X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fhyphen-engraver.cc;h=19ff388963d2273934eb9a5356b1da005557aefe;hb=f072a75dd79d39a772a46c9e7961f46cd955d874;hp=e78882d3d14639523cda5ec6d509074a6abf3fa8;hpb=7a558267cfbc5a90bf87a80ce9bcfed087692064;p=lilypond.git diff --git a/lily/hyphen-engraver.cc b/lily/hyphen-engraver.cc index e78882d3d1..19ff388963 100644 --- a/lily/hyphen-engraver.cc +++ b/lily/hyphen-engraver.cc @@ -1,136 +1,178 @@ /* - hyphen-engraver.cc -- implement Hyphen_engraver + This file is part of LilyPond, the GNU music typesetter. - (c) 1999 Glen Prideaux + 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 "flower-proto.hh" -#include "musical-request.hh" -#include "hyphen-spanner.hh" -#include "paper-column.hh" -#include "item.hh" #include "engraver.hh" +#include "international.hh" +#include "item.hh" +#include "pointer-group-interface.hh" +#include "spanner.hh" +#include "stream-event.hh" +#include "warn.hh" -/** - Generate an centred hyphen. Should make a Hyphen_spanner that - typesets a nice centred hyphen of varying length depending on the - gap between syllables. +#include "translator.icc" - 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 Hyphen_engraver : public Engraver { - Score_element *last_lyric_l_; - Score_element *current_lyric_l_; - Hyphen_req* req_l_; - Spanner* hyphen_p_; + Stream_event *ev_; + Stream_event *finished_ev_; + + Spanner *hyphen_; + Spanner *finished_hyphen_; + public: - Hyphen_engraver (); - VIRTUAL_COPY_CONS (Translator); + TRANSLATOR_DECLARATIONS (Hyphen_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: -}; + void acknowledge_lyric_syllable (Grob_info); + void listen_hyphen (Stream_event *); + + virtual void finalize (); -ADD_THIS_TRANSLATOR (Hyphen_engraver); + void stop_translation_timestep (); + void process_music (); +}; Hyphen_engraver::Hyphen_engraver () { - current_lyric_l_ = 0; - last_lyric_l_ = 0; - hyphen_p_ = 0; - req_l_ = 0; + hyphen_ = 0; + finished_hyphen_ = 0; + finished_ev_ = 0; + ev_ = 0; } void -Hyphen_engraver::acknowledge_element (Score_element_info i) +Hyphen_engraver::acknowledge_lyric_syllable (Grob_info i) { - // -> text-item - if (i.elem_l_->has_interface (ly_symbol2scm ("lyric-syllable-interface"))) - { - current_lyric_l_ = i.elem_l_; - if (hyphen_p_ - && !hyphen_p_->get_bound (RIGHT) - ) - { - Hyphen_spanner (hyphen_p_).set_textitem (RIGHT, i.elem_l_); - } - } -} + Item *item = i.item (); + if (!hyphen_) + hyphen_ = make_spanner ("LyricSpace", item->self_scm ()); -bool -Hyphen_engraver::do_try_music (Music* r) -{ - if (Hyphen_req* p = dynamic_cast (r)) - { - if (req_l_) - return false; + if (hyphen_) + hyphen_->set_bound (LEFT, item); - req_l_ = p; - return true; - } - return false; + if (finished_hyphen_) + finished_hyphen_->set_bound (RIGHT, item); } void -Hyphen_engraver::do_removal_processing () +Hyphen_engraver::listen_hyphen (Stream_event *ev) { - if (hyphen_p_) + ASSIGN_EVENT_ONCE (ev_, ev); +} + +void +completize_hyphen (Spanner *sp) +{ + if (!sp->get_bound (RIGHT)) { - req_l_->origin ()->warning (_ ("unterminated hyphen")); - hyphen_p_->set_bound(RIGHT, unsmob_element (get_property ("currentCommandColumn"))); + extract_item_set (sp, "heads", heads); + if (heads.size ()) + sp->set_bound (RIGHT, heads.back ()); } } void -Hyphen_engraver::do_process_music () +Hyphen_engraver::finalize () { - if (req_l_) + if (hyphen_) { - if (!last_lyric_l_) - { - req_l_->origin ()->warning (_ ("Nothing to connect hyphen to on the left. Ignoring hyphen request.")); - return; - } - - hyphen_p_ = new Spanner (get_property ("LyricHyphen")); - - Hyphen_spanner (hyphen_p_).set_textitem (LEFT, last_lyric_l_); - announce_element (hyphen_p_, req_l_); + completize_hyphen (hyphen_); + + if (!hyphen_->get_bound (RIGHT)) + { + hyphen_->warning (_ ("removing unterminated hyphen")); + hyphen_->suicide (); + } + + hyphen_ = 0; + } + + if (finished_hyphen_) + { + completize_hyphen (finished_hyphen_); + + if (!finished_hyphen_->get_bound (RIGHT)) + { + if (finished_ev_) + finished_hyphen_->warning (_ ("unterminated hyphen; removing")); + finished_hyphen_->suicide (); + } + finished_hyphen_ = 0; } } +void +Hyphen_engraver::process_music () +{ + if (ev_) + hyphen_ = make_spanner ("LyricHyphen", ev_->self_scm ()); +} void -Hyphen_engraver::do_pre_move_processing () +Hyphen_engraver::stop_translation_timestep () { - if (hyphen_p_) + if (finished_hyphen_ && finished_hyphen_->get_bound (RIGHT)) + { + finished_hyphen_ = 0; + finished_ev_ = 0; + } + + if (finished_hyphen_ && hyphen_) { - typeset_element (hyphen_p_); - hyphen_p_ = 0; + programming_error ("hyphen not finished yet"); + finished_hyphen_ = 0; + finished_ev_ = 0; } - if (current_lyric_l_) + if (hyphen_) { - last_lyric_l_ = current_lyric_l_; - current_lyric_l_ =0; + finished_hyphen_ = hyphen_; + finished_ev_ = ev_; } + + hyphen_ = 0; + ev_ = 0; } + void -Hyphen_engraver::do_post_move_processing () +Hyphen_engraver::boot () { - req_l_ = 0; + ADD_LISTENER (Hyphen_engraver, hyphen); + ADD_ACKNOWLEDGER (Hyphen_engraver, lyric_syllable); } +ADD_TRANSLATOR (Hyphen_engraver, + /* doc */ + "Create lyric hyphens and distance constraints between words.", + + /* create */ + "LyricHyphen " + "LyricSpace ", + + /* read */ + "", + /* write */ + "" + );