X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fslur-engraver.cc;h=7c6bc4fb6a160aa325f2448657a94fafa1a55cc0;hb=81d5f3ea5db5b76b81956c9504fd84dbbb51a060;hp=d5e9f673c1681ed55594a950f420672f9a30f5f0;hpb=1b9fc29140bd1d9345f784595afd22158876dfb7;p=lilypond.git diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc index d5e9f673c1..7c6bc4fb6a 100644 --- a/lily/slur-engraver.cc +++ b/lily/slur-engraver.cc @@ -1,14 +1,15 @@ /* slur-engraver.cc -- implement Slur_engraver - (c) 1997--2002 Han-Wen Nienhuys + (c) 1997--2004 Han-Wen Nienhuys */ -#include "request.hh" +#include "event.hh" #include "slur.hh" #include "warn.hh" #include "note-column.hh" -#include "translator-group.hh" +#include "context.hh" + #include "engraver.hh" #include "spanner.hh" @@ -17,8 +18,8 @@ */ class Slur_engraver : public Engraver { - Link_array requests_; - Link_array new_slur_reqs_; + Link_array events_; + Link_array new_slur_evs_; Link_array slur_stack_; Link_array end_slurs_; Moment last_start_; @@ -29,9 +30,8 @@ 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 (Slur_engraver); @@ -43,58 +43,42 @@ Slur_engraver::Slur_engraver () } bool -Slur_engraver::try_music (Music *req) +Slur_engraver::try_music (Music *ev) { - if (req->is_mus_type ("abort-event")) - { - for (int i = 0; i < slur_stack_.size (); i++) - { - slur_stack_[i]->suicide (); - } - slur_stack_.clear (); - for (int i = 0; i < end_slurs_.size (); i++) - { - end_slurs_[i]->suicide (); - } - end_slurs_.clear (); - requests_.clear (); - new_slur_reqs_.clear (); - } - else if (req->is_mus_type ("slur-event")) + if (ev->is_mus_type ("slur-event")) { /* Let's not start more than one slur per moment. */ - Direction d = to_dir (req->get_mus_property ("span-direction")); + Direction d = to_dir (ev->get_property ("span-direction")); if (d == START) { if (now_mom () > last_start_) { - new_slur_reqs_.push (req); + new_slur_evs_.push (ev); last_start_ = now_mom (); } /* - But we swallow other slur requests. + But we swallow other slur events. */ return true; - } else if (d == STOP) { /* - Swallow other requests. + Swallow other events. */ - for (int j = new_slur_reqs_.size(); j--;) + for (int j = new_slur_evs_.size (); j--;) { - Direction nd = to_dir (new_slur_reqs_[j]->get_mus_property ("span-direction")); + Direction nd = to_dir (new_slur_evs_[j]->get_property ("span-direction")); if (nd == STOP) return true; } - new_slur_reqs_.push (req); + new_slur_evs_.push (ev); return true; } } @@ -104,7 +88,7 @@ Slur_engraver::try_music (Music *req) void Slur_engraver::set_melisma (bool m) { - daddy_trans_->set_property ("slurMelismaBusy", m ? SCM_BOOL_T :SCM_BOOL_F); + context ()->set_property ("slurMelismaBusy", m ? SCM_BOOL_T :SCM_BOOL_F); } void @@ -125,87 +109,78 @@ Slur_engraver::finalize () { for (int i = 0; i < slur_stack_.size (); i++) { -#if 0 - typeset_grob (slur_stack_[i]); -#else /* Let's not typeset unterminated stuff */ slur_stack_[i]->suicide (); -#endif } slur_stack_.clear (); - for (int i=0; i < requests_.size (); i++) + for (int i=0; i < events_.size (); i++) { - requests_[i]->origin ()->warning (_ ("unterminated slur")); + events_[i]->origin ()->warning (_ ("unterminated slur")); } } void -Slur_engraver::process_acknowledged_grobs () +Slur_engraver::process_music () { Link_array start_slurs; - for (int i=0; i< new_slur_reqs_.size (); i++) + for (int i=0; i< new_slur_evs_.size (); i++) { - Music* slur_req = new_slur_reqs_[i]; + Music* slur_ev = new_slur_evs_[i]; // end slur: move the slur to other array - Direction d = to_dir (slur_req->get_mus_property ("span-direction")); - if (d== STOP) + Direction d = to_dir (slur_ev->get_property ("span-direction")); + if (d== STOP) { - if (slur_stack_.empty ()) + if (slur_stack_.is_empty ()) /* How to shut up this warning, when Voice_devnull_engraver has - eaten start request? */ - slur_req->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_stack_.pop (); end_slurs_.push (slur); - requests_.pop (); + events_.pop (); } } 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")); + 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"))) + { + slur->set_property ("direction", scm_int2num (updown)); + } + start_slurs.push (slur); - requests_.push (slur_req); - announce_grob (slur, slur_req->self_scm ()); + events_.push (slur_ev); } } - for (int i=0; i < start_slurs.size (); i++) - slur_stack_.push (start_slurs[i]); - new_slur_reqs_.clear (); + + slur_stack_.concat (start_slurs); + + set_melisma (slur_stack_.size ()); + + new_slur_evs_.clear (); } void Slur_engraver::stop_translation_timestep () { - for (int i = 0; i < end_slurs_.size (); i++) - { - typeset_grob (end_slurs_[i]); - } end_slurs_.clear (); -} - -void -Slur_engraver::start_translation_timestep () -{ - new_slur_reqs_.clear (); - SCM m = get_property ("automaticMelismata"); - if (to_boolean (m)) - { - set_melisma (slur_stack_.size ()); - } + new_slur_evs_.clear (); } ENTER_DESCRIPTION (Slur_engraver, -/* descr */ "Build slurs from Slur_reqs", +/* descr */ "Build slurs from Slur_evs", /* creats*/ "Slur", /* accepts */ "slur-event", /* acks */ "note-column-interface",