X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fslur-engraver.cc;h=64853b8284bbaa33389b8a9e0eed2c99bee9205b;hb=c2ccda3e91d408453744bd03882c6b0584a9561a;hp=9bf8e6a29ec4674f24559c46c68695626589f190;hpb=2804f8f79e01dc606ce067bffda2d966524e6e36;p=lilypond.git diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc index 9bf8e6a29e..64853b8284 100644 --- a/lily/slur-engraver.cc +++ b/lily/slur-engraver.cc @@ -1,203 +1,237 @@ /* slur-engraver.cc -- implement Slur_engraver - (c) 1997--2002 Han-Wen Nienhuys + source file of the GNU LilyPond music typesetter + + (c) 1997--2006 Han-Wen Nienhuys */ -#include "musical-request.hh" -#include "slur.hh" -#include "debug.hh" -#include "note-column.hh" -#include "translator-group.hh" #include "engraver.hh" + +#include "context.hh" +#include "directional-element-interface.hh" +#include "international.hh" +#include "note-column.hh" +#include "slur.hh" #include "spanner.hh" +#include "stream-event.hh" +#include "warn.hh" + +#include "translator.icc" + + +/* + NOTE NOTE NOTE + This is largely similar to Phrasing_slur_engraver. Check if fixes + apply there too. + + (on principle, engravers don't use inheritance for code sharing) + + */ + +/* + 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_; + Stream_event *running_slur_start_; + vector slurs_; + vector 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 start_translation_timestep (); + DECLARE_TRANSLATOR_LISTENER (slur); + DECLARE_ACKNOWLEDGER (accidental); + DECLARE_ACKNOWLEDGER (dynamic_line_spanner); + DECLARE_ACKNOWLEDGER (fingering); + DECLARE_ACKNOWLEDGER (note_column); + DECLARE_ACKNOWLEDGER (script); + DECLARE_ACKNOWLEDGER (text_script); + DECLARE_ACKNOWLEDGER (tie); + DECLARE_ACKNOWLEDGER (tuplet_number); + + void acknowledge_extra_object (Grob_info); + void stop_translation_timestep (); + void process_music (); + virtual void finalize (); - virtual void create_grobs (); + public: - TRANSLATOR_DECLARATIONS(Slur_engraver); + TRANSLATOR_DECLARATIONS (Slur_engraver); }; Slur_engraver::Slur_engraver () { - last_start_ = Moment (-1); + events_[START] = events_[STOP] = 0; } -bool -Slur_engraver::try_music (Music *req_l) +IMPLEMENT_TRANSLATOR_LISTENER (Slur_engraver, slur); +void +Slur_engraver::listen_slur (Stream_event *ev) { - if (Span_req *sl = dynamic_cast (req_l)) - { - String t = ly_scm2string (sl->get_mus_property ("span-type")); - if (t == "abort") - { - 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 (); - } - else if (t == "slur") - { - /* - 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; - } - } - } - return false; + Direction d = to_dir (ev->get_property ("span-direction")); + if (d == START) + ASSIGN_EVENT_ONCE (events_[START], ev); + else if (d == STOP) + ASSIGN_EVENT_ONCE (events_[STOP], ev); + else ev->origin ()->warning (_f ("direction of %s invalid: %d", + "slur-event", int (d))); } 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_grob (Grob_info info) +Slur_engraver::acknowledge_note_column (Grob_info info) { - if (Note_column::has_interface (info.grob_l_)) - { - Grob *e =info.grob_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 (vsize i = slurs_.size (); i--;) + Slur::add_column (slurs_[i], e); + for (vsize i = end_slurs_.size (); i--;) + Slur::add_column (end_slurs_[i], e); } void -Slur_engraver::finalize () +Slur_engraver::acknowledge_extra_object (Grob_info info) { - for (int i = 0; i < slur_l_stack_.size (); i++) - { -#if 0 - typeset_grob (slur_l_stack_[i]); -#else - /* - Let's not typeset unterminated stuff - */ - slur_l_stack_[i]->suicide (); -#endif - } - slur_l_stack_.clear (); + Slur::auxiliary_acknowledge_extra_object (info, slurs_, end_slurs_); +} + +void +Slur_engraver::acknowledge_accidental (Grob_info info) +{ + acknowledge_extra_object (info); +} + +void +Slur_engraver::acknowledge_dynamic_line_spanner (Grob_info info) +{ + acknowledge_extra_object (info); +} + +void +Slur_engraver::acknowledge_fingering (Grob_info info) +{ + acknowledge_extra_object (info); +} + +void +Slur_engraver::acknowledge_tuplet_number (Grob_info info) +{ + acknowledge_extra_object (info); +} + + +void +Slur_engraver::acknowledge_script (Grob_info info) +{ + if (!info.grob ()->internal_has_interface (ly_symbol2scm ("dynamic-interface"))) + acknowledge_extra_object (info); +} + +void +Slur_engraver::acknowledge_text_script (Grob_info info) +{ + acknowledge_extra_object (info); +} - for (int i=0; i < requests_arr_.size (); i++) - { - requests_arr_[i]->origin ()->warning (_ ("unterminated slur")); - } +void +Slur_engraver::acknowledge_tie (Grob_info info) +{ + acknowledge_extra_object (info); } void -Slur_engraver::create_grobs () +Slur_engraver::finalize () { - Link_array start_slur_l_arr; - for (int i=0; i< new_slur_req_l_arr_.size (); i++) + if (slurs_.size ()) + slurs_[0]->warning (_ ("unterminated slur")); +} + +void +Slur_engraver::process_music () +{ + if (events_[STOP]) { - 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) - { - if (slur_l_stack_.empty ()) - /* How to shut up this warning, when Voice_devnull_engraver has - eaten start request? */ - slur_req_l->origin ()->warning (_f ("can't find start of slur")); - else - { - Grob* slur = slur_l_stack_.pop (); - SCM s = get_property ("slurEndAttachment"); - if (gh_symbol_p (s)) - { - index_set_cell (slur->get_grob_property ("attachment"), STOP, s); - } - end_slur_l_arr_.push (slur); - requests_arr_.pop (); - } - } - else if (slur_req_l->get_span_dir () == START) + if (slurs_.size () == 0) + events_[STOP]->origin ()->warning (_ ("cannot end slur")); + + + end_slurs_ = slurs_; + slurs_.clear (); + } + + if (events_[START] && slurs_.empty ()) + { + Stream_event *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_back (slur); + + if (double_slurs) { - // push a new slur onto stack. - // (use temp. array to wait for all slur STOPs) - Grob* slur = new Spanner (get_property ("Slur")); - Slur::set_interface (slur); - SCM s = get_property ("slurBeginAttachment"); - if (gh_symbol_p (s)) - { - index_set_cell (slur->get_grob_property ("attachment"), START, s); - } - start_slur_l_arr.push (slur); - requests_arr_.push (slur_req_l); - announce_grob(slur, slur_req_l->self_scm()); + set_grob_direction (slur, DOWN); + slur = make_spanner ("Slur", events_[START]->self_scm ()); + set_grob_direction (slur, UP); + slurs_.push_back (slur); } } - 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 (); + set_melisma (slurs_.size ()); } void Slur_engraver::stop_translation_timestep () { - for (int i = 0; i < end_slur_l_arr_.size (); i++) + if (Grob *g = unsmob_grob (get_property ("breakableSeparationItem"))) { - typeset_grob (end_slur_l_arr_[i]); - } - end_slur_l_arr_.clear (); -} + for (vsize i = 0; i < end_slurs_.size (); i++) + Slur::add_extra_encompass (end_slurs_[i], g); -void -Slur_engraver::start_translation_timestep () -{ - new_slur_req_l_arr_.clear (); - SCM m = get_property ("automaticMelismata"); - if (to_boolean (m)) + if (!events_[START]) + for (vsize i = 0; i < slurs_.size (); i++) + Slur::add_extra_encompass (slurs_[i], g); + } + + + for (vsize i = 0; i < end_slurs_.size (); i++) { - set_melisma (slur_l_stack_.size ()); + Spanner * s = dynamic_cast (end_slurs_[i]); + if (!s->get_bound (RIGHT)) + s->set_bound (RIGHT, unsmob_grob (get_property ("currentMusicalColumn"))); + announce_end_grob (s, SCM_EOL); } + end_slurs_.clear (); + events_[START] = events_[STOP] = 0; } - - -ENTER_DESCRIPTION(Slur_engraver, -/* descr */ "Build slurs from Slur_reqs", -/* creats*/ "Slur", -/* acks */ "note-column-interface", -/* reads */ "slurBeginAttachment slurEndAttachment slurMelismaBusy", -/* write */ ""); +ADD_ACKNOWLEDGER (Slur_engraver, accidental); +ADD_ACKNOWLEDGER (Slur_engraver, dynamic_line_spanner); +ADD_ACKNOWLEDGER (Slur_engraver, fingering); +ADD_ACKNOWLEDGER (Slur_engraver, note_column); +ADD_ACKNOWLEDGER (Slur_engraver, script); +ADD_ACKNOWLEDGER (Slur_engraver, text_script); +ADD_ACKNOWLEDGER (Slur_engraver, tie); +ADD_ACKNOWLEDGER (Slur_engraver, tuplet_number); +ADD_TRANSLATOR (Slur_engraver, + /* doc */ "Build slur grobs from slur events", + /* create */ "Slur", + /* read */ + "slurMelismaBusy " + "doubleSlurs ", + + /* write */ "");