X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fslur-engraver.cc;h=13ca895e2e1e52a586efbbaac3bf96ebda84ec19;hb=fc102f36047265ac31ec16f90576c0b961f984aa;hp=5ccf0386f6ea9b5a70fc84307930f69a4dcb8145;hpb=1cf3d59c1559fb9774c4c1c8cae155cfe54a927c;p=lilypond.git diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc index 5ccf0386f6..13ca895e2e 100644 --- a/lily/slur-engraver.cc +++ b/lily/slur-engraver.cc @@ -1,124 +1,239 @@ /* - slur-grav.cc -- implement Slur_engraver + slur-engraver.cc -- implement Slur_engraver - (c) 1997--1998 Han-Wen Nienhuys + source file of the GNU LilyPond music typesetter + + (c) 1997--2009 Han-Wen Nienhuys */ -#include "proto.hh" -#include "plist.hh" -#include "musical-request.hh" -#include "slur-engraver.hh" -#include "slur.hh" -#include "debug.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) + + */ -bool -Slur_engraver::do_try_request (Request *req_l) +/* + 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 { - Musical_req *mus_l = req_l->access_Musical_req (); - if (!mus_l || !mus_l->access_Slur_req ()) - return false; + Drul_array events_; + Stream_event *running_slur_start_; + vector slurs_; + vector end_slurs_; + + void set_melisma (bool); + +protected: + DECLARE_TRANSLATOR_LISTENER (slur); + DECLARE_ACKNOWLEDGER (accidental); + 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 (); - new_slur_req_l_arr_.push (mus_l->access_Slur_req ()); - return true; + virtual void finalize (); + + +public: + TRANSLATOR_DECLARATIONS (Slur_engraver); +}; + +Slur_engraver::Slur_engraver () +{ + events_[START] = events_[STOP] = 0; } +IMPLEMENT_TRANSLATOR_LISTENER (Slur_engraver, slur); void -Slur_engraver::acknowledge_element (Score_element_info info) +Slur_engraver::listen_slur (Stream_event *ev) { - if (info.elem_l_->is_type_b (Note_column::static_name ())) - { - Note_column *col_l =(Note_column*) info.elem_l_->access_Item() ;// 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 (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::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 (); - 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); } -/* - abracadabra - */ -Slur_engraver::Slur_engraver() +void +Slur_engraver::acknowledge_note_column (Grob_info info) +{ + 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::acknowledge_extra_object (Grob_info info) +{ + Slur::auxiliary_acknowledge_extra_object (info, slurs_, end_slurs_); +} + +void +Slur_engraver::acknowledge_accidental (Grob_info info) { - dir_ =CENTER; + acknowledge_extra_object (info); } + +void +Slur_engraver::acknowledge_fingering (Grob_info info) +{ + acknowledge_extra_object (info); +} + void -Slur_engraver::do_process_requests() +Slur_engraver::acknowledge_tuplet_number (Grob_info info) { - Array start_slur_l_arr_; - for (int i=0; i< new_slur_req_l_arr_.size(); i++) + 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); +} + +void +Slur_engraver::acknowledge_tie (Grob_info info) +{ + acknowledge_extra_object (info); +} + +void +Slur_engraver::finalize () +{ + if (slurs_.size ()) { - 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) - { - if (slur_l_stack_.empty()) - - slur_req_l->warning (_f ("can't find both ends of %s", _("slur"))); - else - { - end_slur_l_arr_.push (slur_l_stack_.pop()); - requests_arr_.pop(); - } - } - 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)); - } + slurs_[0]->warning (_ ("unterminated slur")); + for (vsize i = 0; i < slurs_.size (); i++) + slurs_[i]->suicide (); } - 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::process_music () { - Scalar dir (get_property ("slurydirection")); - Scalar dir2 (get_property ("ydirection")); - if (!dir.length_i () && dir2.length_i ()) + if (events_[STOP]) { - dir_ = (Direction) int(dir2); + if (slurs_.size () == 0) + events_[STOP]->origin ()->warning (_ ("cannot end slur")); + + + end_slurs_ = slurs_; + slurs_.clear (); } - else if (dir.length_i ()) - dir_ = (Direction) int (dir); - - for (int i = 0; i < end_slur_l_arr_.size(); i++) + + if (events_[START] && slurs_.empty ()) { - if (dir_) - end_slur_l_arr_[i]->dir_ = dir_; - typeset_element (end_slur_l_arr_[i]); + 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) + { + set_grob_direction (slur, DOWN); + slur = make_spanner ("Slur", events_[START]->self_scm ()); + set_grob_direction (slur, UP); + slurs_.push_back (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(); + if (Grob *g = unsmob_grob (get_property ("currentCommandColumn"))) + { + for (vsize i = 0; i < end_slurs_.size (); i++) + Slur::add_extra_encompass (end_slurs_[i], g); + + 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++) + { + 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; } -IMPLEMENT_IS_TYPE_B1(Slur_engraver,Engraver); -ADD_THIS_TRANSLATOR(Slur_engraver); +ADD_ACKNOWLEDGER (Slur_engraver, accidental); +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 */ + "" + );