X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fslur-engraver.cc;h=7d7abf2440934e6206ea40f403e576c7cf09f0fd;hb=3c9561d788078f7ee4a6e1d973cf549d8f258935;hp=045373378dc863647b16dddc7ddeae6595040ac3;hpb=685452c8675e89a84692420fb9891756d318e771;p=lilypond.git diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc index 045373378d..7d7abf2440 100644 --- a/lily/slur-engraver.cc +++ b/lily/slur-engraver.cc @@ -1,27 +1,86 @@ /* - slur-grav.cc -- implement Slur_engraver + slur-engraver.cc -- implement Slur_engraver - (c) 1997--1999 Han-Wen Nienhuys + (c) 1997--2004 Han-Wen Nienhuys */ -#include "proto.hh" -#include "musical-request.hh" -#include "slur-engraver.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: 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 try_music (Music*); + virtual void acknowledge_grob (Grob_info); + virtual void stop_translation_timestep (); + virtual void finalize (); + virtual void process_music (); + +public: + 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_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_property ("span-direction")); + + if (nd == STOP) + return true; + } + + new_slur_evs_.push (ev); + return true; + } } return false; } @@ -29,108 +88,106 @@ Slur_engraver::do_try_music (Music *req_l) void Slur_engraver::set_melisma (bool m) { - Translator_group *where = daddy_trans_l_; - get_property ("slurMelismaBusy", &where); - if (!where) - where = daddy_trans_l_; - - 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_element (Score_element_info info) +Slur_engraver::acknowledge_grob (Grob_info info) { - if (dynamic_cast (info.elem_l_)) + Grob *e =info.grob_; + if (Note_column::has_interface (info.grob_)) { - Note_column *col_l =dynamic_cast (info.elem_l_) ;// ugh - for (int i = 0; i < slur_l_stack_.size(); i++) - slur_l_stack_[i]->add_column (col_l); - for (int i = 0; i < end_slur_l_arr_.size(); i++) - end_slur_l_arr_[i]->add_column (col_l); + for (int i = 0; i < slur_stack_.size (); i++) + New_slur::add_column (slur_stack_[i], e); + for (int i = 0; i < end_slurs_.size (); i++) + New_slur::add_column (end_slurs_[i], e); + } + else + { + for (int i = 0; i < slur_stack_.size (); i++) + New_slur::add_extra_encompass (slur_stack_[i], e); + for (int i = 0; i < end_slurs_.size (); i++) + New_slur::add_extra_encompass (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++) { - typeset_element (slur_l_stack_[i]); + /* + Let's not typeset unterminated stuff + */ + slur_stack_[i]->suicide (); } - slur_l_stack_.clear (); - SCM wg = get_property ("weAreGraceContext",0); - bool wgb = gh_boolean_p (wg) && gh_scm2bool (wgb); - 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]->warning (_ ("unterminated slur")); + events_[i]->origin ()->warning (_ ("unterminated slur")); } } void -Slur_engraver::do_process_requests() +Slur_engraver::process_music () { - 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_property ("span-direction")); + if (d== STOP) { - if (slur_l_stack_.empty()) - - slur_req_l->warning (_f ("Can't find both ends of %s", _("slur"))); + if (slur_stack_.is_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 { - end_slur_l_arr_.push (slur_l_stack_.pop()); - 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) - Slur * s_p =new Slur; + // (use temp. array to wait for all slur STOPs) + Grob* slur = make_spanner ("Slur", slur_ev->self_scm ()); + + if (Direction updown = to_dir (slur_ev->get_property ("direction"))) + { + slur->set_property ("direction", scm_int2num (updown)); + } - requests_arr_.push (slur_req_l); - start_slur_l_arr_.push (s_p); - announce_element (Score_element_info (s_p, 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]); -} -void -Slur_engraver::do_pre_move_processing() -{ - SCM dir (get_property ("slurVerticalDirection", 0)); - SCM dir2 (get_property ("verticalDirection", 0)); - - Direction slurdir = CENTER; - if (gh_number_p(dir)) - slurdir = to_dir (dir); - else if (gh_number_p (dir2)) - slurdir = to_dir (dir2); - - for (int i = 0; i < end_slur_l_arr_.size(); i++) - { - end_slur_l_arr_[i]->dir_ = slurdir; - 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",0); - if (gh_boolean_p (m) && gh_scm2bool (m)) - { - set_melisma (slur_l_stack_.size ()); - } + end_slurs_.clear (); + new_slur_evs_.clear (); } -ADD_THIS_TRANSLATOR(Slur_engraver); + +ENTER_DESCRIPTION (Slur_engraver, +/* descr */ "Build slurs grobs from slur events", +/* creats*/ "Slur", +/* accepts */ "slur-event", +/* acks */ "note-column-interface accidental-interface fingering-interface script-interface", +/* reads */ "slurMelismaBusy", +/* write */ "");