X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fphrasing-slur-engraver.cc;h=9509bae468b2575de1f5c2db300a4da3feb36580;hb=4a355154045dd79f3d5c7409867c08a580733f4c;hp=329228cddc8d9ef472c108e16b8f10925626fd49;hpb=25e0ad87d00c21597de319ed4554f18a7c4e6b1d;p=lilypond.git diff --git a/lily/phrasing-slur-engraver.cc b/lily/phrasing-slur-engraver.cc index 329228cddc..9509bae468 100644 --- a/lily/phrasing-slur-engraver.cc +++ b/lily/phrasing-slur-engraver.cc @@ -1,179 +1,155 @@ /* phrasing-slur-engraver.cc -- implement Phrasing_slur_engraver - (c) 1997--2002 Han-Wen Nienhuys + (c) 1997--2005 Han-Wen Nienhuys */ -#include "musical-request.hh" +#include "context.hh" +#include "directional-element-interface.hh" +#include "engraver.hh" #include "slur.hh" -#include "debug.hh" #include "note-column.hh" -#include "translator-group.hh" -#include "engraver.hh" #include "spanner.hh" +#include "tie.hh" + +/* + 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. +*/ class Phrasing_slur_engraver : public Engraver { - Link_array requests_arr_; - Link_array new_phrasing_slur_req_l_arr_; - Link_array phrasing_slur_l_stack_; - Link_array end_phrasing_slur_l_arr_; - Moment last_start_; + Drul_array events_; + Music * running_slur_start_; + Link_array slurs_; + Link_array end_slurs_; protected: virtual bool try_music (Music*); virtual void acknowledge_grob (Grob_info); virtual void stop_translation_timestep (); - virtual void start_translation_timestep (); virtual void finalize (); - virtual void process_acknowledged_grobs (); + virtual 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_l) +Phrasing_slur_engraver::try_music (Music *m) { - if (Span_req *sl = dynamic_cast (req_l)) + if (m->is_mus_type ("phrasing-slur-event")) { - String t = ly_scm2string (sl->get_mus_property ("span-type")); - if (t == "abort") + /* + Let's not start more than one slur per moment. + */ + Direction d = to_dir (m->get_property ("span-direction")); + if (d == START) { - 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_slur_l_arr_.size (); i++) - { - end_phrasing_slur_l_arr_[i]->suicide (); - } - end_phrasing_slur_l_arr_.clear (); - requests_arr_.clear (); - new_phrasing_slur_req_l_arr_.clear (); + events_[START] = m; + return true; } - else if (t == "phrasing-slur") + else if (d == STOP) { - /* - Let's not start more than one phrasing slur per moment. - */ - if (sl->get_span_dir () == START) - { - if (now_mom () > last_start_) - { - new_phrasing_slur_req_l_arr_.push (sl); - last_start_ = now_mom (); - return true; - } - } - else - { - new_phrasing_slur_req_l_arr_.push (sl); - return true; - } + if (slurs_.is_empty ()) + return false; + + events_[STOP] = m; + return true; } } return false; } + void Phrasing_slur_engraver::acknowledge_grob (Grob_info info) { - if (Note_column::has_interface (info.grob_l_)) + Grob *e = info.grob_; + if (Note_column::has_interface (info.grob_)) { - Grob *e =info.grob_l_; - 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_slur_l_arr_.size (); i++) - Slur::add_column (end_phrasing_slur_l_arr_[i], e); + for (int i = slurs_.size (); i--; ) + Slur::add_column (slurs_[i], e); + for (int i = end_slurs_.size (); i-- ; ) + Slur::add_column (end_slurs_[i], e); } -} - -void -Phrasing_slur_engraver::finalize () -{ - for (int i = 0; i < phrasing_slur_l_stack_.size (); i++) + else { -#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 (); - - for (int i=0; i < requests_arr_.size (); i++) - { - requests_arr_[i]->origin ()->warning (_ ("unterminated phrasing slur")); - } -} - -void -Phrasing_slur_engraver::process_acknowledged_grobs () -{ - Link_array start_phrasing_slur_l_arr; - for (int i=0; i< new_phrasing_slur_req_l_arr_.size (); i++) - { - Span_req* phrasing_slur_req_l = new_phrasing_slur_req_l_arr_[i]; - // end phrasing slur: move the phrasing slur to other array - if (phrasing_slur_req_l->get_span_dir () == STOP) + ugh. cut & paste from slur-engraver.cc + */ + SCM inside = e->get_property ("inside-slur"); + if (Tie::has_interface (e) + || Slur::has_interface (e) + || to_boolean (inside)) { - if (phrasing_slur_l_stack_.empty ()) - phrasing_slur_req_l->origin ()->warning (_f ("can't find start of phrasing slur")); - else - { - Grob* phrasing_slur = phrasing_slur_l_stack_.pop (); - end_phrasing_slur_l_arr_.push (phrasing_slur); - requests_arr_.pop (); - } + for (int i = slurs_.size (); i--; ) + Slur::add_extra_encompass (slurs_[i], e); + for (int i = end_slurs_.size (); i--; ) + Slur::add_extra_encompass (end_slurs_[i], e); } - else if (phrasing_slur_req_l->get_span_dir () == START) + else if (inside == SCM_BOOL_F) { - // 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_slur_l_arr.push (phrasing_slur); - requests_arr_.push (phrasing_slur_req_l); - announce_grob(phrasing_slur, phrasing_slur_req_l->self_scm()); + Grob *slur = slurs_.size()?slurs_[0] : 0; + slur = (end_slurs_.size () && !slur) + ? end_slurs_[0] : slur; + + if (slur) + { + e->add_offset_callback (Slur::outside_slur_callback_proc, Y_AXIS); + e->set_property ("slur", slur->self_scm()); + } } } - for (int i=0; i < start_phrasing_slur_l_arr.size (); i++) - phrasing_slur_l_stack_.push (start_phrasing_slur_l_arr[i]); - new_phrasing_slur_req_l_arr_.clear (); } void -Phrasing_slur_engraver::stop_translation_timestep () +Phrasing_slur_engraver::finalize () { - for (int i = 0; i < end_phrasing_slur_l_arr_.size (); i++) + if (slurs_.size ()) + slurs_[0]->warning (_ ("unterminated phrasing slur")); +} + +void +Phrasing_slur_engraver::process_music () +{ + if (events_[STOP]) { - typeset_grob (end_phrasing_slur_l_arr_[i]); + end_slurs_ = slurs_; + slurs_.clear (); + } + + if (events_[START] && slurs_.is_empty ()) + { + Music *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 (slur); } - end_phrasing_slur_l_arr_.clear (); } void -Phrasing_slur_engraver::start_translation_timestep () +Phrasing_slur_engraver::stop_translation_timestep () { - new_phrasing_slur_req_l_arr_.clear (); + end_slurs_.clear (); + events_[START] = events_[STOP] = 0; } - -ENTER_DESCRIPTION(Phrasing_slur_engraver, -/* descr */ "Print phrasing slurs. Similar to Slur_engraver", +ADD_TRANSLATOR (Phrasing_slur_engraver, +/* descr */ "Print phrasing slurs. Similar to @ref{Slur_engraver}", /* creats*/ "PhrasingSlur", -/* acks */ "note-column-interface", -/* reads */ "slurMelismaBusy", +/* accepts */ "phrasing-slur-event", +/* acks */ "note-column-interface tie-interface fingering-interface script-interface slur-interface", +/* reads */ "", /* write */ "");