X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fphrasing-slur-engraver.cc;h=0906d168317e8d269694077040cbc923c9fa1251;hb=7979d8adaa8393daefd6585534221a93dd526758;hp=b1e621a910d7c3d1b93036899e605669eaa05d28;hpb=675533acf58b9b863adc830f175696735ca6dc95;p=lilypond.git diff --git a/lily/phrasing-slur-engraver.cc b/lily/phrasing-slur-engraver.cc index b1e621a910..0906d16831 100644 --- a/lily/phrasing-slur-engraver.cc +++ b/lily/phrasing-slur-engraver.cc @@ -1,10 +1,10 @@ /* phrasing-slur-engraver.cc -- implement Phrasing_slur_engraver - (c) 1997--2002 Han-Wen Nienhuys + (c) 1997--2003 Han-Wen Nienhuys */ -#include "musical-request.hh" +#include "event.hh" #include "slur.hh" #include "warn.hh" #include "note-column.hh" @@ -12,12 +12,19 @@ #include "engraver.hh" #include "spanner.hh" +/* + TODO: + + ALGRGRRGRG + + Derive this from Slur_engraver. This code is completely duplicate. +*/ class Phrasing_slur_engraver : public Engraver { - Link_array requests_arr_; - Link_array new_phrasing_slur_req_l_arr_; + Link_array eventses_; + Link_array new_phrasing_slur_evs_; Link_array phrasing_slur_l_stack_; - Link_array end_phrasing_slur_l_arr_; + Link_array end_phrasing_slurs_; Moment last_start_; protected: @@ -39,46 +46,45 @@ Phrasing_slur_engraver::Phrasing_slur_engraver () } bool -Phrasing_slur_engraver::try_music (Music *req_l) +Phrasing_slur_engraver::try_music (Music *ev) { - if (Span_req *sl = dynamic_cast (req_l)) + if (ev->is_mus_type ("abort-event")) { - String t = ly_scm2string (sl->get_mus_property ("span-type")); - if (t == "abort") + for (int i = 0; i < phrasing_slur_l_stack_.size (); i++) { - 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 (); + phrasing_slur_l_stack_[i]->suicide (); } - else if (t == "phrasing-slur") + phrasing_slur_l_stack_.clear (); + for (int i = 0; i < end_phrasing_slurs_.size (); i++) { - /* - 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 + end_phrasing_slurs_[i]->suicide (); + } + end_phrasing_slurs_.clear (); + eventses_.clear (); + new_phrasing_slur_evs_.clear (); + } + else if (ev->is_mus_type ("phrasing-slur-event")) + { + /* + Let's not start more than one phrasing slur per moment. + */ + + Direction d = to_dir (ev->get_mus_property ("span-direction")); + + if (d == START) + { + if (now_mom () > last_start_) { - new_phrasing_slur_req_l_arr_.push (sl); + new_phrasing_slur_evs_.push (ev); + last_start_ = now_mom (); return true; } } + else + { + new_phrasing_slur_evs_.push (ev); + return true; + } } return false; } @@ -86,13 +92,13 @@ Phrasing_slur_engraver::try_music (Music *req_l) void Phrasing_slur_engraver::acknowledge_grob (Grob_info info) { - if (Note_column::has_interface (info.grob_l_)) + if (Note_column::has_interface (info.grob_)) { - Grob *e =info.grob_l_; + 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_slur_l_arr_.size (); i++) - Slur::add_column (end_phrasing_slur_l_arr_[i], e); + for (int i = 0; i < end_phrasing_slurs_.size (); i++) + Slur::add_column (end_phrasing_slurs_[i], e); } } @@ -106,74 +112,85 @@ Phrasing_slur_engraver::finalize () #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")); - } + for (int i=0; i < eventses_.size (); i++) + { + eventses_[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++) + Link_array start_phrasing_slurs; + for (int i=0; i< new_phrasing_slur_evs_.size (); i++) { - Span_req* phrasing_slur_req_l = new_phrasing_slur_req_l_arr_[i]; + Music* phrasing_slur_ev = new_phrasing_slur_evs_[i]; // end phrasing slur: move the phrasing slur to other array - if (phrasing_slur_req_l->get_span_dir () == STOP) + + Direction d = to_dir (phrasing_slur_ev->get_mus_property ("span-direction")); + + if (d == STOP) { if (phrasing_slur_l_stack_.empty ()) - phrasing_slur_req_l->origin ()->warning (_f ("can't find start of phrasing slur")); + phrasing_slur_ev->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 (); + end_phrasing_slurs_.push (phrasing_slur); + eventses_.pop (); } } - else if (phrasing_slur_req_l->get_span_dir () == START) + 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_slur_l_arr.push (phrasing_slur); - requests_arr_.push (phrasing_slur_req_l); - announce_grob(phrasing_slur, phrasing_slur_req_l->self_scm()); + + + if (Direction updown = to_dir (phrasing_slur_ev->get_mus_property ("direction"))) + { + phrasing_slur->set_grob_property ("direction", gh_int2scm (updown)); + } + + start_phrasing_slurs.push (phrasing_slur); + eventses_.push (phrasing_slur_ev); + announce_grob(phrasing_slur, phrasing_slur_ev->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 (); + for (int i=0; i < start_phrasing_slurs.size (); i++) + phrasing_slur_l_stack_.push (start_phrasing_slurs[i]); + new_phrasing_slur_evs_.clear (); } void Phrasing_slur_engraver::stop_translation_timestep () { - for (int i = 0; i < end_phrasing_slur_l_arr_.size (); i++) + for (int i = 0; i < end_phrasing_slurs_.size (); i++) { - typeset_grob (end_phrasing_slur_l_arr_[i]); + typeset_grob (end_phrasing_slurs_[i]); } - end_phrasing_slur_l_arr_.clear (); + end_phrasing_slurs_.clear (); } void Phrasing_slur_engraver::start_translation_timestep () { - new_phrasing_slur_req_l_arr_.clear (); + new_phrasing_slur_evs_.clear (); } ENTER_DESCRIPTION(Phrasing_slur_engraver, -/* descr */ "Print phrasing slurs. Similar to Slur_engraver", +/* descr */ "Print phrasing slurs. Similar to @ref{Slur_engraver}", /* creats*/ "PhrasingSlur", +/* accepts */ "phrasing-slur-event", /* acks */ "note-column-interface", -/* reads */ "slurMelismaBusy", +/* reads */ "", /* write */ "");