X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fslur-engraver.cc;h=cf43fc626b296c6e0146fe32bd2331fb44c8b0ae;hb=7e72a1e50e94a7f9738d62599de79fe7745f600c;hp=763d77a3e585cb075cb7287d996f129b86961d22;hpb=287611887cd612ac84dbf10c5fe4e1a44cc56596;p=lilypond.git diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc index 763d77a3e5..cf43fc626b 100644 --- a/lily/slur-engraver.cc +++ b/lily/slur-engraver.cc @@ -1,48 +1,85 @@ /* - slur-grav.cc -- implement Slur_engraver + slur-engraver.cc -- implement Slur_engraver - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2004 Han-Wen Nienhuys */ -#include "musical-request.hh" -#include "slur-engraver.hh" +#include "event.hh" #include "slur.hh" -#include "debug.hh" +#include "warn.hh" #include "note-column.hh" #include "translator-group.hh" #include "engraver.hh" #include "spanner.hh" -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_; +/* + TODO: junk nested slur functionality. + */ +class Slur_engraver : public Engraver +{ + Link_array events_; + Link_array new_slur_evs_; + Link_array slur_stack_; + Link_array end_slurs_; + Moment last_start_; void set_melisma (bool); + protected: - virtual bool do_try_music (Music*); - virtual void do_process_music (); - virtual void acknowledge_element (Score_element_info); - virtual void do_pre_move_processing (); - virtual void do_post_move_processing (); - virtual void do_removal_processing (); + virtual bool try_music (Music*); + virtual void acknowledge_grob (Grob_info); + virtual void stop_translation_timestep (); + virtual void finalize (); + virtual void process_music (); public: - VIRTUAL_COPY_CONS (Translator); - + TRANSLATOR_DECLARATIONS (Slur_engraver); }; +Slur_engraver::Slur_engraver () +{ + last_start_ = Moment (-1); +} + bool -Slur_engraver::do_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")) { - if (sl->span_type_str_ != "slur") - return false; - new_slur_req_l_arr_.push (sl); + /* + Let's not start more than one slur per moment. + */ + Direction d = to_dir (ev->get_mus_property ("span-direction")); + if (d == START) + { + if (now_mom () > last_start_) + { + new_slur_evs_.push (ev); + last_start_ = now_mom (); + } - return true; + /* + But we swallow other slur events. + */ + + return true; + } + else if (d == STOP) + { + /* + Swallow other events. + */ + for (int j = new_slur_evs_.size(); j--;) + { + Direction nd = to_dir (new_slur_evs_[j]->get_mus_property ("span-direction")); + + if (nd == STOP) + return true; + } + + new_slur_evs_.push (ev); + return true; + } } return false; } @@ -50,110 +87,106 @@ Slur_engraver::do_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); + daddy_trans_->set_property ("slurMelismaBusy", m ? SCM_BOOL_T :SCM_BOOL_F); } void -Slur_engraver::acknowledge_element (Score_element_info info) +Slur_engraver::acknowledge_grob (Grob_info info) { - if (Note_column::has_interface (info.elem_l_)) + if (Note_column::has_interface (info.grob_)) { - Score_element *e =info.elem_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::do_removal_processing () +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_element (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 (); - SCM wg = get_property ("weAreGraceContext"); - bool wgb = to_boolean (wg); - if (!wgb) - for (int i=0; i < requests_arr_.size (); i++) + slur_stack_.clear (); + + for (int i=0; i < events_.size (); i++) { - requests_arr_[i]->origin ()->warning (_ ("unterminated slur")); + events_[i]->origin ()->warning (_ ("unterminated slur")); } } void -Slur_engraver::do_process_music () +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->span_dir_ == STOP) + Direction d = to_dir (slur_ev->get_mus_property ("span-direction")); + if (d== STOP) { - if (slur_l_stack_.empty ()) - slur_req_l->origin ()->warning (_f ("can't find start of slur")); + if (slur_stack_.empty ()) + /* How to shut up this warning, when Voice_devnull_engraver has + eaten start event? */ + slur_ev->origin ()->warning (_f ("can't find start of slur")); else { - Score_element* slur = slur_l_stack_.pop (); - SCM s = get_property ("slurEndAttachment"); - if (gh_symbol_p (s)) - { - index_set_cell (slur->get_elt_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->span_dir_ == START) + else if (d == START) { // push a new slur onto stack. // (use temp. array to wait for all slur STOPs) - Score_element* slur = new Spanner (get_property ("basicSlurProperties")); - Slur::set_interface (slur); - SCM s = get_property ("slurBeginAttachment"); - if (gh_symbol_p (s)) + Grob* slur = make_spanner ("Slur"); + Slur::set_interface (slur); // cannot remove yet! + + + if (Direction updown = to_dir (slur_ev->get_mus_property ("direction"))) { - index_set_cell (slur->get_elt_property ("attachment"), START, s); + slur->set_grob_property ("direction", gh_int2scm (updown)); } - start_slur_l_arr_.push (slur); - requests_arr_.push (slur_req_l); - announce_element (slur, slur_req_l); + + start_slurs.push (slur); + events_.push (slur_ev); + announce_grob (slur, slur_ev->self_scm ()); } } - for (int i=0; i < start_slur_l_arr_.size (); i++) - slur_l_stack_.push (start_slur_l_arr_[i]); -} -void -Slur_engraver::do_pre_move_processing () -{ - for (int i = 0; i < end_slur_l_arr_.size (); i++) - { - typeset_element (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::do_post_move_processing () +Slur_engraver::stop_translation_timestep () { - new_slur_req_l_arr_.clear (); - SCM m = get_property ("automaticMelismata"); - if (to_boolean (m)) + for (int i = 0; i < end_slurs_.size (); i++) { - set_melisma (slur_l_stack_.size ()); + typeset_grob (end_slurs_[i]); } + end_slurs_.clear (); + new_slur_evs_.clear (); } -ADD_THIS_TRANSLATOR (Slur_engraver); + +ENTER_DESCRIPTION (Slur_engraver, +/* descr */ "Build slurs from Slur_evs", +/* creats*/ "Slur", +/* accepts */ "slur-event", +/* acks */ "note-column-interface", +/* reads */ "slurMelismaBusy", +/* write */ "");