X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fphrasing-slur-engraver.cc;h=ef0b4287df1faae20a2b43f6a72ec649f87f5992;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=609a707a076f4b402879dfc67efa99baaa412bea;hpb=1b9fc29140bd1d9345f784595afd22158876dfb7;p=lilypond.git diff --git a/lily/phrasing-slur-engraver.cc b/lily/phrasing-slur-engraver.cc index 609a707a07..ef0b4287df 100644 --- a/lily/phrasing-slur-engraver.cc +++ b/lily/phrasing-slur-engraver.cc @@ -1,182 +1,199 @@ /* phrasing-slur-engraver.cc -- implement Phrasing_slur_engraver - (c) 1997--2002 Han-Wen Nienhuys + source file of the GNU LilyPond music typesetter + + (c) 1997--2008 Han-Wen Nienhuys */ -#include "request.hh" -#include "slur.hh" -#include "warn.hh" -#include "note-column.hh" -#include "translator-group.hh" #include "engraver.hh" + +#include "context.hh" +#include "directional-element-interface.hh" +#include "international.hh" +#include "note-column.hh" +#include "slur.hh" #include "spanner.hh" +#include "stream-event.hh" +#include "warn.hh" + +#include "translator.icc" +/* + It is possible that a slur starts and ends on the same note. At + least, it is for phrasing slurs: a note can be both beginning and + ending of a phrase. + +*/ + +/* + NOTE NOTE NOTE + + This is largely similar to Slur_engraver. Check if fixes apply there too. + + (on principle, engravers don't use inheritance for code sharing) + + */ class Phrasing_slur_engraver : public Engraver { - Link_array requestses_; - Link_array new_phrasing_slur_reqs_; - Link_array phrasing_slur_l_stack_; - Link_array end_phrasing_slurs_; - Moment last_start_; + Drul_array events_; + Stream_event *running_slur_start_; + vector slurs_; + vector end_slurs_; protected: - virtual bool try_music (Music*); - virtual void acknowledge_grob (Grob_info); - virtual void stop_translation_timestep (); - virtual void start_translation_timestep (); + void acknowledge_extra_object (Grob_info); + DECLARE_ACKNOWLEDGER (accidental); + DECLARE_ACKNOWLEDGER (fingering); + DECLARE_ACKNOWLEDGER (note_column); + DECLARE_ACKNOWLEDGER (slur); + DECLARE_ACKNOWLEDGER (script); + DECLARE_ACKNOWLEDGER (text_script); + DECLARE_ACKNOWLEDGER (tie); + DECLARE_ACKNOWLEDGER (tuplet_number); + DECLARE_TRANSLATOR_LISTENER (phrasing_slur); + + void stop_translation_timestep (); virtual void finalize (); - virtual void process_acknowledged_grobs (); + void process_music (); public: - TRANSLATOR_DECLARATIONS(Phrasing_slur_engraver); - + TRANSLATOR_DECLARATIONS (Phrasing_slur_engraver); }; Phrasing_slur_engraver::Phrasing_slur_engraver () { - last_start_ = Moment (-1); + events_[START] = events_[STOP] = 0; } -bool -Phrasing_slur_engraver::try_music (Music *req) +IMPLEMENT_TRANSLATOR_LISTENER (Phrasing_slur_engraver, phrasing_slur); +void +Phrasing_slur_engraver::listen_phrasing_slur (Stream_event *ev) { - if (req->is_mus_type ("abort-event")) - { - for (int i = 0; i < phrasing_slur_l_stack_.size (); i++) - { - phrasing_slur_l_stack_[i]->suicide (); - } - phrasing_slur_l_stack_.clear (); - for (int i = 0; i < end_phrasing_slurs_.size (); i++) - { - end_phrasing_slurs_[i]->suicide (); - } - end_phrasing_slurs_.clear (); - requestses_.clear (); - new_phrasing_slur_reqs_.clear (); - } - else if (req->is_mus_type ("phrasing-slur-event")) - { - /* - Let's not start more than one phrasing slur per moment. - */ - - Direction d = to_dir (req->get_mus_property ("span-direction")); - - if (d == START) - { - if (now_mom () > last_start_) - { - new_phrasing_slur_reqs_.push (req); - last_start_ = now_mom (); - return true; - } - } - else - { - new_phrasing_slur_reqs_.push (req); - return true; - } - } - return false; + /* + Let's not start more than one slur per moment. + */ + Direction d = to_dir (ev->get_property ("span-direction")); + if (d == START) + ASSIGN_EVENT_ONCE (events_[START], ev); + else if (d == STOP && !slurs_.empty ()) + ASSIGN_EVENT_ONCE (events_[STOP], ev); } void -Phrasing_slur_engraver::acknowledge_grob (Grob_info info) +Phrasing_slur_engraver::acknowledge_note_column (Grob_info info) { - if (Note_column::has_interface (info.grob_)) - { - Grob *e =info.grob_; - for (int i = 0; i < phrasing_slur_l_stack_.size (); i++) - Slur::add_column (phrasing_slur_l_stack_[i], e); - for (int i = 0; i < end_phrasing_slurs_.size (); i++) - Slur::add_column (end_phrasing_slurs_[i], e); - } + Grob *e = info.grob (); + for (vsize i = slurs_.size (); i--;) + Slur::add_column (slurs_[i], e); + for (vsize i = end_slurs_.size (); i--;) + Slur::add_column (end_slurs_[i], e); } void -Phrasing_slur_engraver::finalize () +Phrasing_slur_engraver::acknowledge_extra_object (Grob_info info) { - for (int i = 0; i < phrasing_slur_l_stack_.size (); i++) - { -#if 0 - typeset_grob (phrasing_slur_l_stack_[i]); -#else - /* - Let's not typeset unterminated stuff - */ - phrasing_slur_l_stack_[i]->suicide (); -#endif - } - phrasing_slur_l_stack_.clear (); + Slur::auxiliary_acknowledge_extra_object (info, slurs_, end_slurs_); +} - for (int i=0; i < requestses_.size (); i++) - { - requestses_[i]->origin ()->warning (_ ("unterminated phrasing slur")); - } +void +Phrasing_slur_engraver::acknowledge_accidental (Grob_info info) +{ + acknowledge_extra_object (info); } void -Phrasing_slur_engraver::process_acknowledged_grobs () +Phrasing_slur_engraver::acknowledge_fingering (Grob_info info) { - Link_array start_phrasing_slurs; - for (int i=0; i< new_phrasing_slur_reqs_.size (); i++) - { - Music* phrasing_slur_req = new_phrasing_slur_reqs_[i]; - // end phrasing slur: move the phrasing slur to other array - - Direction d = to_dir (phrasing_slur_req->get_mus_property ("span-direction")); - - if (d == STOP) - { - if (phrasing_slur_l_stack_.empty ()) - phrasing_slur_req->origin ()->warning (_f ("can't find start of phrasing slur")); - else - { - Grob* phrasing_slur = phrasing_slur_l_stack_.pop (); - end_phrasing_slurs_.push (phrasing_slur); - requestses_.pop (); - } - } - else if (d == START) - { - // push a new phrasing_slur onto stack. - // (use temp. array to wait for all phrasing_slur STOPs) - Grob* phrasing_slur = new Spanner (get_property ("PhrasingSlur")); - Slur::set_interface (phrasing_slur); // can't remove. - start_phrasing_slurs.push (phrasing_slur); - requestses_.push (phrasing_slur_req); - announce_grob(phrasing_slur, phrasing_slur_req->self_scm()); - } - } - for (int i=0; i < start_phrasing_slurs.size (); i++) - phrasing_slur_l_stack_.push (start_phrasing_slurs[i]); - new_phrasing_slur_reqs_.clear (); + acknowledge_extra_object (info); } void -Phrasing_slur_engraver::stop_translation_timestep () +Phrasing_slur_engraver::acknowledge_text_script (Grob_info info) { - for (int i = 0; i < end_phrasing_slurs_.size (); i++) + acknowledge_extra_object (info); +} + +void +Phrasing_slur_engraver::acknowledge_script (Grob_info info) +{ + if (!info.grob ()->internal_has_interface (ly_symbol2scm ("dynamic-interface"))) + acknowledge_extra_object (info); +} + +void +Phrasing_slur_engraver::acknowledge_tie (Grob_info info) +{ + acknowledge_extra_object (info); +} + +void +Phrasing_slur_engraver::acknowledge_tuplet_number (Grob_info info) +{ + acknowledge_extra_object (info); +} + +void +Phrasing_slur_engraver::acknowledge_slur (Grob_info info) +{ + acknowledge_extra_object (info); +} + +void +Phrasing_slur_engraver::finalize () +{ + if (slurs_.size ()) + slurs_[0]->warning (_ ("unterminated phrasing slur")); +} + +void +Phrasing_slur_engraver::process_music () +{ + if (events_[STOP]) { - typeset_grob (end_phrasing_slurs_[i]); + end_slurs_ = slurs_; + slurs_.clear (); + } + + if (events_[START] && slurs_.empty ()) + { + Stream_event *ev = events_[START]; + + Grob *slur = make_spanner ("PhrasingSlur", events_[START]->self_scm ()); + Direction updown = to_dir (ev->get_property ("direction")); + if (updown) + set_grob_direction (slur, updown); + + slurs_.push_back (slur); } - end_phrasing_slurs_.clear (); } void -Phrasing_slur_engraver::start_translation_timestep () +Phrasing_slur_engraver::stop_translation_timestep () { - new_phrasing_slur_reqs_.clear (); + end_slurs_.clear (); + events_[START] = events_[STOP] = 0; } +ADD_ACKNOWLEDGER (Phrasing_slur_engraver, accidental); +ADD_ACKNOWLEDGER (Phrasing_slur_engraver, fingering) +ADD_ACKNOWLEDGER (Phrasing_slur_engraver, note_column); +ADD_ACKNOWLEDGER (Phrasing_slur_engraver, slur); +ADD_ACKNOWLEDGER (Phrasing_slur_engraver, script); +ADD_ACKNOWLEDGER (Phrasing_slur_engraver, text_script); +ADD_ACKNOWLEDGER (Phrasing_slur_engraver, tie); +ADD_ACKNOWLEDGER (Phrasing_slur_engraver, tuplet_number); + +ADD_TRANSLATOR (Phrasing_slur_engraver, + /* doc */ + "Print phrasing slurs. Similar to @ref{Slur_engraver}.", + + /* create */ + "PhrasingSlur ", + /* read */ + "", -ENTER_DESCRIPTION(Phrasing_slur_engraver, -/* descr */ "Print phrasing slurs. Similar to Slur_engraver", -/* creats*/ "PhrasingSlur", -/* accepts */ "phrasing-slur-event", -/* acks */ "note-column-interface", -/* reads */ "slurMelismaBusy", -/* write */ ""); + /* write */ + "" + );