X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fphrasing-slur-engraver.cc;h=69865eae59b8c61853dae0b56c1e0ff43fa4bac9;hb=eb81c44025904ff450116c8c64a901d891617c23;hp=f51f9473b8e2e71b1e32fff18084b9974f13da04;hpb=2804f8f79e01dc606ce067bffda2d966524e6e36;p=lilypond.git diff --git a/lily/phrasing-slur-engraver.cc b/lily/phrasing-slur-engraver.cc index f51f9473b8..69865eae59 100644 --- a/lily/phrasing-slur-engraver.cc +++ b/lily/phrasing-slur-engraver.cc @@ -1,23 +1,31 @@ /* phrasing-slur-engraver.cc -- implement Phrasing_slur_engraver - (c) 1997--2002 Han-Wen Nienhuys + (c) 1997--2004 Han-Wen Nienhuys */ -#include "musical-request.hh" -#include "slur.hh" -#include "debug.hh" +#include "event.hh" +#include "new-slur.hh" +#include "warn.hh" #include "note-column.hh" -#include "translator-group.hh" +#include "context.hh" + #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 phrasing_slur_l_stack_; - Link_array end_phrasing_slur_l_arr_; + Link_array eventses_; + Link_array new_phrasing_slur_evs_; + Link_array phrasing_slurs_; + Link_array end_phrasing_slurs_; Moment last_start_; protected: @@ -26,10 +34,10 @@ protected: virtual void stop_translation_timestep (); virtual void start_translation_timestep (); virtual void finalize (); - virtual void create_grobs (); + virtual void process_acknowledged_grobs (); public: - TRANSLATOR_DECLARATIONS(Phrasing_slur_engraver); + TRANSLATOR_DECLARATIONS (Phrasing_slur_engraver); }; @@ -39,45 +47,29 @@ 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 ("phrasing-slur-event")) { - String t = ly_scm2string (sl->get_mus_property ("span-type")); - if (t == "abort") + /* + Let's not start more than one phrasing slur per moment. + */ + + Direction d = to_dir (ev->get_property ("span-direction")); + + if (d == START) { - for (int i = 0; i < phrasing_slur_l_stack_.size (); i++) + if (now_mom () > last_start_) { - 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 (); + new_phrasing_slur_evs_.push (ev); + last_start_ = now_mom (); + return true; } - end_phrasing_slur_l_arr_.clear (); - requests_arr_.clear (); - new_phrasing_slur_req_l_arr_.clear (); } - else if (t == "phrasing-slur") + else { - /* - 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; - } + new_phrasing_slur_evs_.push (ev); + return true; } } return false; @@ -86,104 +78,94 @@ 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_; - 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); + Grob *e =info.grob_; + for (int i = 0; i < phrasing_slurs_.size (); i++) + New_slur::add_column (phrasing_slurs_[i], e); + for (int i = 0; i < end_phrasing_slurs_.size (); i++) + New_slur::add_column (end_phrasing_slurs_[i], e); } } void Phrasing_slur_engraver::finalize () { - for (int i = 0; i < phrasing_slur_l_stack_.size (); i++) + for (int i = 0; i < phrasing_slurs_.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_slurs_[i]->suicide (); } - phrasing_slur_l_stack_.clear (); + phrasing_slurs_.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::create_grobs () +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_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")); + if (phrasing_slurs_.is_empty ()) + phrasing_slur_ev->origin ()->warning (_f ("can't find start of phrasing slur")); else { - Grob* phrasing_slur = phrasing_slur_l_stack_.pop (); - SCM s = get_property ("phrasingSlurEndAttachment"); - if (gh_symbol_p (s)) - { - index_set_cell (phrasing_slur->get_grob_property ("attachment"), STOP, s); - } - end_phrasing_slur_l_arr_.push (phrasing_slur); - requests_arr_.pop (); + Grob* phrasing_slur = phrasing_slurs_.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); - SCM s = get_property ("phrasingSlurBeginAttachment"); - if (gh_symbol_p (s)) + Grob* phrasing_slur = make_spanner ("PhrasingSlur", phrasing_slur_ev->self_scm ()); + + if (Direction updown = to_dir (phrasing_slur_ev->get_property ("direction"))) { - index_set_cell (phrasing_slur->get_grob_property ("attachment"), START, s); + phrasing_slur->set_property ("direction", scm_int2num (updown)); } - 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()); + + start_phrasing_slurs.push (phrasing_slur); + eventses_.push (phrasing_slur_ev); } } - 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_slurs_.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++) - { - typeset_grob (end_phrasing_slur_l_arr_[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", +ENTER_DESCRIPTION (Phrasing_slur_engraver, +/* descr */ "Print phrasing slurs. Similar to @ref{Slur_engraver}", /* creats*/ "PhrasingSlur", +/* accepts */ "phrasing-slur-event", /* acks */ "note-column-interface", -/* reads */ "slurBeginAttachment slurEndAttachment slurMelismaBusy", +/* reads */ "", /* write */ "");