X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fslur-engraver.cc;h=80bd9bbf81eed2507083b3eefc9481bfd13c70aa;hb=f4ff2e488239d66830ac8b3ae5771358a917b58f;hp=33e2b24c2391138feda8e1ca3e8d2061542e83a9;hpb=31653bf1d61a33ef8bc8c871d60c6b3452d04d28;p=lilypond.git diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc index 33e2b24c23..80bd9bbf81 100644 --- a/lily/slur-engraver.cc +++ b/lily/slur-engraver.cc @@ -1,117 +1,168 @@ /* - slur-grav.cc -- implement Slur_engraver + slur-engraver.cc -- implement Slur_engraver - (c) 1997--1998 Han-Wen Nienhuys + (c) 1997--2004 Han-Wen Nienhuys */ -#include "proto.hh" -#include "plist.hh" -#include "musical-request.hh" -#include "slur-engraver.hh" +#include "event.hh" #include "slur.hh" -#include "debug.hh" #include "note-column.hh" +#include "context.hh" +#include "directional-element-interface.hh" +#include "engraver.hh" +#include "spanner.hh" +#include "tie.hh" +#include "input.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 +{ + Drul_array events_; + Music * running_slur_start_; + Link_array slurs_; + Link_array end_slurs_; + + 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 () +{ + events_[START] =events_[STOP] = 0; +} bool -Slur_engraver::do_try_request (Request *req_l) +Slur_engraver::try_music (Music *m) { - Musical_req *mus_l = dynamic_cast (req_l); - if (Slur_req *sl = dynamic_cast (mus_l)) + if (m->is_mus_type ("slur-event")) { - new_slur_req_l_arr_.push (dynamic_cast (mus_l)); - return true; + Direction d = to_dir (m->get_property ("span-direction")); + if (d == START) + { + events_[START] = m; + return true; + } + else if (d == STOP) + { + events_[STOP] = m; + return true; + } } return false; } void -Slur_engraver::acknowledge_element (Score_element_info info) +Slur_engraver::set_melisma (bool m) { - if (dynamic_cast (info.elem_l_)) - { - 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); - } + context ()->set_property ("slurMelismaBusy", m ? SCM_BOOL_T :SCM_BOOL_F); } void -Slur_engraver::do_removal_processing () +Slur_engraver::acknowledge_grob (Grob_info info) { - for (int i = 0; i < slur_l_stack_.size(); i++) - { - typeset_element (slur_l_stack_[i]); - } - slur_l_stack_.clear (); - for (int i=0; i < requests_arr_.size(); i++) + Grob *e =info.grob_; + if (Note_column::has_interface (info.grob_)) { - requests_arr_[i]->warning (_ ("unterminated slur")); + 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_process_requests() -{ - Array start_slur_l_arr_; - for (int i=0; i< new_slur_req_l_arr_.size(); i++) + else { - Slur_req* slur_req_l = new_slur_req_l_arr_[i]; - // end slur: move the slur to other array - if (slur_req_l->spantype == Span_req::STOP) + SCM inside = e->get_property ("inside-slur"); + if (Tie::has_interface (e) + || to_boolean (inside)) { - if (slur_l_stack_.empty()) + 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 (inside == SCM_BOOL_F) + { + Grob *slur = slurs_.size()?slurs_[0] : 0; + slur = (end_slurs_.size () && !slur) + ? end_slurs_[0] : slur; - slur_req_l->warning (_f ("can't find both ends of %s", _("slur"))); - else + if (slur) { - end_slur_l_arr_.push (slur_l_stack_.pop()); - requests_arr_.pop(); + e->add_offset_callback (Slur::outside_slur_callback_proc, Y_AXIS); + e->set_property ("slur", slur->self_scm()); } } - else if (slur_req_l->spantype == Span_req::START) - { - // push a new slur onto stack. - //(use temp. array to wait for all slur STOPs) - Slur * s_p =new Slur; - Scalar prop = get_property ("slurdash"); - if (prop.isnum_b ()) - s_p->dash_i_ = prop; - requests_arr_.push (slur_req_l); - start_slur_l_arr_.push (s_p); - announce_element (Score_element_info (s_p, slur_req_l)); - } } - 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() +Slur_engraver::finalize () +{ + if (slurs_.size ()) + slurs_[0]->warning (_("unterminated slur")); +} + +void +Slur_engraver::process_music () { - Scalar dir (get_property ("slurydirection")); - Scalar dir2 (get_property ("ydirection")); - - Direction slurdir = CENTER; - if (dir.length_i () && dir.isnum_b ()) - slurdir = (Direction) sign (int(dir)); - else if (dir2.length_i () && dir2.isnum_b ()) - slurdir = (Direction) sign (int (dir2)); + if (events_[STOP]) + { + if (slurs_.size() == 0) + { + events_[STOP]->origin()->warning (_ ("No slur to end")); + } + + end_slurs_ = slurs_; + slurs_.clear (); + } - for (int i = 0; i < end_slur_l_arr_.size(); i++) + if (events_[START] && slurs_.is_empty ()) { - end_slur_l_arr_[i]->dir_ = slurdir; - typeset_element (end_slur_l_arr_[i]); + 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); + } } - end_slur_l_arr_.clear(); + set_melisma (slurs_.size ()); } void -Slur_engraver::do_post_move_processing() +Slur_engraver::stop_translation_timestep () { - new_slur_req_l_arr_.clear(); + end_slurs_.clear (); + events_[START] = events_[STOP] = 0; } -IMPLEMENT_IS_TYPE_B1(Slur_engraver,Engraver); -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 tie-interface text-script-interface", + /* reads */ "slurMelismaBusy doubleSlurs", + /* write */ "");