X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fhyphen-engraver.cc;h=78470bf2fb1184cf28ac7361b093fa6da2cf201e;hb=9e781b7dc83b60a543ce218aa1a5f139f74c760f;hp=8f7193fad165216a7652d21f9d99534ef0a693dc;hpb=ac93c7dd01e0b6661c360acf89721ce9d32e4e4c;p=lilypond.git diff --git a/lily/hyphen-engraver.cc b/lily/hyphen-engraver.cc index 8f7193fad1..78470bf2fb 100644 --- a/lily/hyphen-engraver.cc +++ b/lily/hyphen-engraver.cc @@ -1,89 +1,97 @@ /* - hyphen-engraver.cc -- implement Hyphen_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--2014 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 "warn.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" + +#include "translator.icc" class Hyphen_engraver : public Engraver { - Music *ev_; + Stream_event *ev_; + Stream_event *finished_ev_; + Spanner *hyphen_; - Spanner *finished_hyphen_; + Spanner *finished_hyphen_; + public: TRANSLATOR_DECLARATIONS (Hyphen_engraver); protected: - virtual void acknowledge_grob (Grob_info); - virtual void finalize (); - virtual bool try_music (Music*); - virtual void stop_translation_timestep (); - virtual void process_music (); -private: - -}; + DECLARE_ACKNOWLEDGER (lyric_syllable); + DECLARE_TRANSLATOR_LISTENER (hyphen); + virtual void finalize (); + void stop_translation_timestep (); + void process_music (); +}; Hyphen_engraver::Hyphen_engraver () { hyphen_ = 0; finished_hyphen_ = 0; + finished_ev_ = 0; ev_ = 0; } void -Hyphen_engraver::acknowledge_grob (Grob_info i) +Hyphen_engraver::acknowledge_lyric_syllable (Grob_info i) { - Item * item = dynamic_cast (i.grob_); - // -> Text_item - if (item && item->internal_has_interface (ly_symbol2scm ("lyric-syllable-interface"))) - { - if (hyphen_) - hyphen_->set_bound (LEFT, item); + Item *item = i.item (); - if (finished_hyphen_) - finished_hyphen_->set_bound (RIGHT, item); - } -} + if (!hyphen_) + hyphen_ = make_spanner ("LyricSpace", item->self_scm ()); + if (hyphen_) + hyphen_->set_bound (LEFT, item); -bool -Hyphen_engraver::try_music (Music* r) -{ - if (ev_) - return false; + if (finished_hyphen_) + finished_hyphen_->set_bound (RIGHT, item); +} - ev_ = r; - return true; +IMPLEMENT_TRANSLATOR_LISTENER (Hyphen_engraver, hyphen); +void +Hyphen_engraver::listen_hyphen (Stream_event *ev) +{ + ASSIGN_EVENT_ONCE (ev_, ev); } void -completize_hyphen (Spanner* sp) +completize_hyphen (Spanner *sp) { if (!sp->get_bound (RIGHT)) { - SCM heads = sp->get_property ("heads"); - if (scm_is_pair (heads)) - { - Item* it = dynamic_cast (unsmob_grob (scm_car (heads))); - if (it) - sp->set_bound (RIGHT, it); - } + extract_item_set (sp, "heads", heads); + if (heads.size ()) + sp->set_bound (RIGHT, heads.back ()); } } - - void Hyphen_engraver::finalize () { @@ -92,10 +100,10 @@ Hyphen_engraver::finalize () completize_hyphen (hyphen_); if (!hyphen_->get_bound (RIGHT)) - { - hyphen_->warning (_ ("removing unterminated hyphen")); - hyphen_->suicide (); - } + { + hyphen_->warning (_ ("removing unterminated hyphen")); + hyphen_->suicide (); + } hyphen_ = 0; } @@ -105,11 +113,12 @@ Hyphen_engraver::finalize () completize_hyphen (finished_hyphen_); if (!finished_hyphen_->get_bound (RIGHT)) - { - finished_hyphen_->warning (_("unterminated hyphen; removing")); - finished_hyphen_->suicide (); - } - finished_hyphen_ =0; + { + if (finished_ev_) + finished_hyphen_->warning (_ ("unterminated hyphen; removing")); + finished_hyphen_->suicide (); + } + finished_hyphen_ = 0; } } @@ -117,41 +126,48 @@ void Hyphen_engraver::process_music () { if (ev_) - { - hyphen_ = make_spanner ("LyricHyphen", ev_->self_scm () -); - } + hyphen_ = make_spanner ("LyricHyphen", ev_->self_scm ()); } - void Hyphen_engraver::stop_translation_timestep () { if (finished_hyphen_ && finished_hyphen_->get_bound (RIGHT)) { finished_hyphen_ = 0; + finished_ev_ = 0; } if (finished_hyphen_ && hyphen_) { - programming_error ("Haven't finished hyphen yet."); - finished_hyphen_ =0; + programming_error ("hyphen not finished yet"); + finished_hyphen_ = 0; + finished_ev_ = 0; } - + if (hyphen_) - finished_hyphen_ = hyphen_; - hyphen_ = 0; + { + finished_hyphen_ = hyphen_; + finished_ev_ = ev_; + } + hyphen_ = 0; ev_ = 0; } +ADD_ACKNOWLEDGER (Hyphen_engraver, lyric_syllable); + +ADD_TRANSLATOR (Hyphen_engraver, + /* doc */ + "Create lyric hyphens and distance constraints between words.", + /* create */ + "LyricHyphen " + "LyricSpace ", + /* read */ + "", -ENTER_DESCRIPTION (Hyphen_engraver, -/* descr */ "Create lyric hyphens", -/* creats*/ "LyricHyphen", -/* accepts */ "hyphen-event", -/* acks */ "lyric-syllable-interface", -/* reads */ "", -/* write */ ""); + /* write */ + "" + );