X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fslur-engraver.cc;h=f41c69c3380a21140b7f3e26bd5c85ba84eb7e30;hb=bdf4ab13203502e7ec7cf9cf5896527643a07c1f;hp=4d363d3d431cde3374d200df4055208b6531542a;hpb=a4d7106c75b325441063fd9ba9c4131979784aa5;p=lilypond.git diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc index 4d363d3d43..f41c69c338 100644 --- a/lily/slur-engraver.cc +++ b/lily/slur-engraver.cc @@ -1,206 +1,167 @@ /* - slur-grav.cc -- implement Slur_engraver + slur-engraver.cc -- implement Slur_engraver - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2005 Han-Wen Nienhuys */ -#include "musical-request.hh" -#include "slur-engraver.hh" #include "slur.hh" -#include "debug.hh" #include "note-column.hh" -#include "translator-group.hh" +#include "context.hh" +#include "directional-element-interface.hh" #include "engraver.hh" #include "spanner.hh" +#include "tie.hh" + +/* + It is possible that a slur starts and ends on the same note. At + least, it is for phrasing slurs: a note can be both beginning and + ending of a phrase. +*/ 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_; - Moment last_start_; + Drul_array events_; + Music *running_slur_start_; + Link_array slurs_; + Link_array end_slurs_; void set_melisma (bool); protected: - virtual bool do_try_music (Music*); - void deprecated_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 void process_acknowledged (); + 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); - Slur_engraver (); + TRANSLATOR_DECLARATIONS (Slur_engraver); }; Slur_engraver::Slur_engraver () { - last_start_ = Moment (-1); + events_[START] = events_[STOP] = 0; } bool -Slur_engraver::do_try_music (Music *req_l) +Slur_engraver::try_music (Music *m) { - if (Span_req *sl = dynamic_cast (req_l)) + if (m->is_mus_type ("slur-event")) { - String t = ly_scm2string (sl->get_mus_property ("span-type")); - if (t == "abort") + Direction d = to_dir (m->get_property ("span-direction")); + if (d == START) { - for (int i = 0; i < slur_l_stack_.size (); i++) - { - slur_l_stack_[i]->suicide (); - } - 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 (); + events_[START] = m; + 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 - { - new_slur_req_l_arr_.push (sl); - return true; - } + events_[STOP] = m; + return true; } } return false; } -void -Slur_engraver::process_acknowledged () -{ - deprecated_process_music (); -} - 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_element (Score_element_info info) +Slur_engraver::acknowledge_grob (Grob_info info) { - if (Note_column::has_interface (info.elem_l_)) + Grob *e = info.grob_; + 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); + for (int i = slurs_.size (); i--;) + Slur::add_column (slurs_[i], e); + for (int i = end_slurs_.size (); i--;) + Slur::add_column (end_slurs_[i], e); } -} - -void -Slur_engraver::do_removal_processing () -{ - for (int i = 0; i < slur_l_stack_.size (); i++) + else { -#if 0 - typeset_element (slur_l_stack_[i]); -#else - /* - Let's not typeset unterminated stuff - */ - slur_l_stack_[i]->suicide (); -#endif - } - 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++) - { - requests_arr_[i]->origin ()->warning (_ ("unterminated slur")); - } -} - -void -Slur_engraver::deprecated_process_music () -{ - Link_array start_slur_l_arr; - for (int i=0; i< new_slur_req_l_arr_.size (); i++) - { - Span_req* slur_req_l = new_slur_req_l_arr_[i]; - // end slur: move the slur to other array - if (slur_req_l->get_span_dir() == STOP) + SCM inside = e->get_property ("inside-slur"); + if (Tie::has_interface (e) + || to_boolean (inside)) { - if (slur_l_stack_.empty ()) - slur_req_l->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 (); - } + for (int i = slurs_.size (); i--;) + Slur::add_extra_encompass (slurs_[i], e); + for (int i = end_slurs_.size (); i--;) + Slur::add_extra_encompass (end_slurs_[i], e); } - else if (slur_req_l->get_span_dir() == START) + else if (inside == SCM_BOOL_F) { - // push a new slur onto stack. - // (use temp. array to wait for all slur STOPs) - Score_element* slur = new Spanner (get_property ("Slur")); - Slur::set_interface (slur); - SCM s = get_property ("slurBeginAttachment"); - if (gh_symbol_p (s)) + Grob *slur = slurs_.size () ? slurs_[0] : 0; + slur = (end_slurs_.size () && !slur) + ? end_slurs_[0] : slur; + + if (slur) { - index_set_cell (slur->get_elt_property ("attachment"), START, s); + e->add_offset_callback (Slur::outside_slur_callback_proc, Y_AXIS); + e->set_property ("slur", slur->self_scm ()); } - start_slur_l_arr.push (slur); - requests_arr_.push (slur_req_l); - announce_element (slur, slur_req_l); } } - 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::do_pre_move_processing () +Slur_engraver::finalize () { - for (int i = 0; i < end_slur_l_arr_.size (); i++) - { - typeset_element (end_slur_l_arr_[i]); - } - end_slur_l_arr_.clear (); + if (slurs_.size ()) + slurs_[0]->warning (_ ("unterminated slur")); } void -Slur_engraver::do_post_move_processing () +Slur_engraver::process_music () { - new_slur_req_l_arr_.clear (); - SCM m = get_property ("automaticMelismata"); - if (to_boolean (m)) + if (events_[STOP]) + { + if (slurs_.size () == 0) + { + events_[STOP]->origin ()->warning (_ ("No slur to end")); + } + + end_slurs_ = slurs_; + slurs_.clear (); + } + + if (events_[START] && slurs_.is_empty ()) { - set_melisma (slur_l_stack_.size ()); + Music *ev = events_[START]; + + bool double_slurs = to_boolean (get_property ("doubleSlurs")); + + Grob *slur = make_spanner ("Slur", events_[START]->self_scm ()); + Direction updown = to_dir (ev->get_property ("direction")); + if (updown && !double_slurs) + set_grob_direction (slur, updown); + + slurs_.push (slur); + + if (double_slurs) + { + set_grob_direction (slur, DOWN); + slur = make_spanner ("Slur", events_[START]->self_scm ()); + set_grob_direction (slur, UP); + slurs_.push (slur); + } } + set_melisma (slurs_.size ()); } +void +Slur_engraver::stop_translation_timestep () +{ + end_slurs_.clear (); + events_[START] = events_[STOP] = 0; +} -ADD_THIS_TRANSLATOR (Slur_engraver); +ADD_TRANSLATOR (Slur_engraver, + /* descr */ "Build slurs grobs from slur events", + /* creats*/ "Slur", + /* accepts */ "slur-event", + /* acks */ "note-column-interface accidental-interface fingering-interface script-interface tie-interface text-script-interface", + /* reads */ "slurMelismaBusy doubleSlurs", + /* write */ "");