X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fslur-engraver.cc;h=7c6bc4fb6a160aa325f2448657a94fafa1a55cc0;hb=feef5e0d897345a88595671e0f54e1127a20d09f;hp=f96a4cb56d65279979c2f974b4a05ccfc7f53938;hpb=94375d04f45b415ad705fd444fdb344416f116d9;p=lilypond.git diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc index f96a4cb56d..7c6bc4fb6a 100644 --- a/lily/slur-engraver.cc +++ b/lily/slur-engraver.cc @@ -1,23 +1,27 @@ /* slur-engraver.cc -- implement Slur_engraver - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2004 Han-Wen Nienhuys */ -#include "musical-request.hh" +#include "event.hh" #include "slur.hh" -#include "debug.hh" +#include "warn.hh" #include "note-column.hh" -#include "translator-group.hh" +#include "context.hh" + #include "engraver.hh" #include "spanner.hh" +/* + TODO: junk nested slur functionality. + */ class Slur_engraver : public Engraver { - Link_array requests_arr_; - Link_array new_slur_req_l_arr_; - Link_array slur_l_stack_; - Link_array end_slur_l_arr_; + Link_array events_; + Link_array new_slur_evs_; + Link_array slur_stack_; + Link_array end_slurs_; Moment last_start_; void set_melisma (bool); @@ -26,12 +30,11 @@ 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 create_grobs (); + virtual void process_music (); public: - TRANSLATOR_DECLARATIONS(Slur_engraver); + TRANSLATOR_DECLARATIONS (Slur_engraver); }; Slur_engraver::Slur_engraver () @@ -40,45 +43,43 @@ Slur_engraver::Slur_engraver () } bool -Slur_engraver::try_music (Music *req_l) +Slur_engraver::try_music (Music *ev) { - if (Span_req *sl = dynamic_cast (req_l)) + if (ev->is_mus_type ("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 (ev->get_property ("span-direction")); + if (d == START) { - for (int i = 0; i < slur_l_stack_.size (); i++) + if (now_mom () > last_start_) { - slur_l_stack_[i]->suicide (); + new_slur_evs_.push (ev); + last_start_ = now_mom (); } - slur_l_stack_.clear (); - for (int i = 0; i < end_slur_l_arr_.size (); i++) - { - end_slur_l_arr_[i]->suicide (); - } - end_slur_l_arr_.clear (); - requests_arr_.clear (); - new_slur_req_l_arr_.clear (); + + /* + But we swallow other slur events. + */ + + return true; } - else if (t == "slur") + else if (d == STOP) { /* - Let's not start more than one slur per moment. - */ - if (sl->get_span_dir () == START) - { - if (now_mom () > last_start_) - { - new_slur_req_l_arr_.push (sl); - last_start_ = now_mom (); - return true; - } - } - else + Swallow other events. + */ + for (int j = new_slur_evs_.size (); j--;) { - new_slur_req_l_arr_.push (sl); - return true; + Direction nd = to_dir (new_slur_evs_[j]->get_property ("span-direction")); + + if (nd == STOP) + return true; } + + new_slur_evs_.push (ev); + return true; } } return false; @@ -87,117 +88,101 @@ Slur_engraver::try_music (Music *req_l) void Slur_engraver::set_melisma (bool m) { - daddy_trans_l_->set_property ("slurMelismaBusy", m ? SCM_BOOL_T :SCM_BOOL_F); + context ()->set_property ("slurMelismaBusy", m ? SCM_BOOL_T :SCM_BOOL_F); } void 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 < slur_l_stack_.size (); i++) - Slur::add_column (slur_l_stack_[i], e); - for (int i = 0; i < end_slur_l_arr_.size (); i++) - Slur::add_column (end_slur_l_arr_[i], e); + Grob *e =info.grob_; + for (int i = 0; i < slur_stack_.size (); i++) + Slur::add_column (slur_stack_[i], e); + for (int i = 0; i < end_slurs_.size (); i++) + Slur::add_column (end_slurs_[i], e); } } void Slur_engraver::finalize () { - for (int i = 0; i < slur_l_stack_.size (); i++) + for (int i = 0; i < slur_stack_.size (); i++) { -#if 0 - typeset_grob (slur_l_stack_[i]); -#else /* Let's not typeset unterminated stuff */ - slur_l_stack_[i]->suicide (); -#endif + slur_stack_[i]->suicide (); } - slur_l_stack_.clear (); + slur_stack_.clear (); - for (int i=0; i < requests_arr_.size (); i++) + for (int i=0; i < events_.size (); i++) { - requests_arr_[i]->origin ()->warning (_ ("unterminated slur")); + events_[i]->origin ()->warning (_ ("unterminated slur")); } } void -Slur_engraver::create_grobs () +Slur_engraver::process_music () { - Link_array start_slur_l_arr; - for (int i=0; i< new_slur_req_l_arr_.size (); i++) + Link_array start_slurs; + for (int i=0; i< new_slur_evs_.size (); i++) { - Span_req* slur_req_l = new_slur_req_l_arr_[i]; + Music* slur_ev = new_slur_evs_[i]; // end slur: move the slur to other array - if (slur_req_l->get_span_dir () == STOP) + Direction d = to_dir (slur_ev->get_property ("span-direction")); + if (d== STOP) { - if (slur_l_stack_.empty ()) + if (slur_stack_.is_empty ()) /* How to shut up this warning, when Voice_devnull_engraver has - eaten start request? */ - slur_req_l->origin ()->warning (_f ("can't find start of slur")); + eaten start event? */ + slur_ev->origin ()->warning (_f ("can't find start of slur")); else { - Grob* slur = slur_l_stack_.pop (); - SCM s = get_property ("slurEndAttachment"); - if (gh_symbol_p (s)) - { - index_set_cell (slur->get_grob_property ("attachment"), STOP, s); - } - end_slur_l_arr_.push (slur); - requests_arr_.pop (); + Grob* slur = slur_stack_.pop (); + + end_slurs_.push (slur); + events_.pop (); } } - else if (slur_req_l->get_span_dir () == START) + else if (d == START) { // push a new slur onto stack. // (use temp. array to wait for all slur STOPs) - Grob* slur = new Spanner (get_property ("Slur")); - Slur::set_interface (slur); - SCM s = get_property ("slurBeginAttachment"); - if (gh_symbol_p (s)) + Grob* slur = make_spanner ("Slur", slur_ev->self_scm ()); + Slur::set_interface (slur); // cannot remove yet! + + + if (Direction updown = to_dir (slur_ev->get_property ("direction"))) { - index_set_cell (slur->get_grob_property ("attachment"), START, s); + slur->set_property ("direction", scm_int2num (updown)); } - start_slur_l_arr.push (slur); - requests_arr_.push (slur_req_l); - announce_grob (slur, slur_req_l); + + start_slurs.push (slur); + events_.push (slur_ev); } } - for (int i=0; i < start_slur_l_arr.size (); i++) - slur_l_stack_.push (start_slur_l_arr[i]); - new_slur_req_l_arr_.clear (); -} -void -Slur_engraver::stop_translation_timestep () -{ - for (int i = 0; i < end_slur_l_arr_.size (); i++) - { - typeset_grob (end_slur_l_arr_[i]); - } - end_slur_l_arr_.clear (); + slur_stack_.concat (start_slurs); + + set_melisma (slur_stack_.size ()); + + new_slur_evs_.clear (); } void -Slur_engraver::start_translation_timestep () +Slur_engraver::stop_translation_timestep () { - new_slur_req_l_arr_.clear (); - SCM m = get_property ("automaticMelismata"); - if (to_boolean (m)) - { - set_melisma (slur_l_stack_.size ()); - } + end_slurs_.clear (); + new_slur_evs_.clear (); } -ENTER_DESCRIPTION(Slur_engraver, -/* descr */ "Build slurs from Slur_reqs", +ENTER_DESCRIPTION (Slur_engraver, +/* descr */ "Build slurs from Slur_evs", /* creats*/ "Slur", -/* acks */ "note-column-interface", -/* reads */ "slurBeginAttachment slurEndAttachment slurMelismaBusy", +/* accepts */ "slur-event", +/* acks */ "note-column-interface", +/* reads */ "slurMelismaBusy", /* write */ "");