X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fslur-engraver.cc;h=b88afa21b03dde92b030f19788a2323c54f91e78;hb=14d74ac262744d16fc753ee41042d32860d58633;hp=55970b93ffd82bc7b087a245e0afc3a048967cb5;hpb=2fd5f86de0500ecd9a3f47a2540c3b304f835ef4;p=lilypond.git diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc index 55970b93ff..b88afa21b0 100644 --- a/lily/slur-engraver.cc +++ b/lily/slur-engraver.cc @@ -1,126 +1,167 @@ /* - 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 "note-column.hh" -#include "translator-group.hh" +#include "context.hh" +#include "directional-element-interface.hh" +#include "engraver.hh" +#include "spanner.hh" +#include "tie.hh" -ADD_THIS_TRANSLATOR (Slur_engraver); +/* + 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. +*/ -bool -Slur_engraver::do_try_music (Music *req_l) +class Slur_engraver : public Engraver { - if (Span_req *sl = dynamic_cast (req_l)) - { - if (sl->span_type_str_ != "slur") - return false; - new_slur_req_l_arr_.push (sl); + Drul_array events_; + Music * running_slur_start_; + Link_array slurs_; + Link_array end_slurs_; - return true; - } - return false; -} + void set_melisma (bool); -void -Slur_engraver::set_melisma (bool m) +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 () { - 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); + events_[START] = events_[STOP] = 0; } -void -Slur_engraver::acknowledge_element (Score_element_info info) +bool +Slur_engraver::try_music (Music *m) { - if (dynamic_cast (info.elem_l_)) + if (m->is_mus_type ("slur-event")) { - 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); + 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::do_removal_processing () +Slur_engraver::set_melisma (bool m) { - for (int i = 0; i < slur_l_stack_.size(); i++) - { - typeset_element (slur_l_stack_[i]); - } - slur_l_stack_.clear (); - SCM wg = get_property ("weAreGraceContext",0); - bool wgb = to_boolean (wg); - if (!wgb) - for (int i=0; i < requests_arr_.size(); i++) - { - requests_arr_[i]->warning (_ ("unterminated slur")); - } + context ()->set_property ("slurMelismaBusy", m ? SCM_BOOL_T :SCM_BOOL_F); } void -Slur_engraver::do_process_requests() +Slur_engraver::acknowledge_grob (Grob_info info) { - Array start_slur_l_arr_; - for (int i=0; i< new_slur_req_l_arr_.size(); i++) + Grob *e = info.grob_; + if (Note_column::has_interface (info.grob_)) { - Span_req* slur_req_l = new_slur_req_l_arr_[i]; - // end slur: move the slur to other array - if (slur_req_l->span_dir_ == STOP) + 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); + } + else + { + SCM inside = e->get_property ("inside-slur"); + if (Tie::has_interface (e) + || to_boolean (inside)) + { + 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) { - if (slur_l_stack_.empty()) + 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->span_dir_ == START) - { - // push a new slur onto stack. - //(use temp. array to wait for all slur STOPs) - Slur * s_p =new Slur; - - 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 () { - 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",0); - if (to_boolean (m)) + if (events_[STOP]) { - set_melisma (slur_l_stack_.size ()); + if (slurs_.size() == 0) + { + events_[STOP]->origin()->warning (_ ("No slur to end")); + } + + end_slurs_ = slurs_; + slurs_.clear (); } + + if (events_[START] && slurs_.is_empty ()) + { + 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_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 */ "");