X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftie-engraver.cc;h=1a397b3b7479d675dca9e4fe301f92a7503e5a2e;hb=b3f0c2f6c352a850f03dc44a947776199eb3fa0b;hp=aa3180f7f620a603649f1d91ab01e0eb0e2a9376;hpb=9661ba1fb275f3e14f8a69f2cee2f02a2f893e48;p=lilypond.git diff --git a/lily/tie-engraver.cc b/lily/tie-engraver.cc index aa3180f7f6..1a397b3b74 100644 --- a/lily/tie-engraver.cc +++ b/lily/tie-engraver.cc @@ -1,302 +1,294 @@ -/* - tie-engraver.cc -- implement Tie_engraver - +/* + tie-engraver.cc -- implement Tie_engraver + source file of the GNU LilyPond music typesetter - - (c) 1998--2000 Han-Wen Nienhuys - - */ -#include "tie-engraver.hh" -#include "command-request.hh" -#include "rhythmic-head.hh" -#include "musical-request.hh" -#include "tie.hh" -#include "translator-group.hh" -#include "spanner.hh" -#include "tie-column.hh" -#include "pqueue.hh" -#include "engraver.hh" -#include "item.hh" + (c) 1998--2009 Han-Wen Nienhuys +*/ -struct CHead_melodic_tuple { - Melodic_req *req_l_ ; - Score_element *head_l_; - Moment end_; - CHead_melodic_tuple (); - CHead_melodic_tuple (Score_element*, Melodic_req*, Moment); - static int pitch_compare (CHead_melodic_tuple const &, CHead_melodic_tuple const &); - static int time_compare (CHead_melodic_tuple const &, CHead_melodic_tuple const &); -}; +#include "engraver.hh" -inline int compare (CHead_melodic_tuple const &a, CHead_melodic_tuple const &b) -{ - return CHead_melodic_tuple::time_compare (a,b); -} +#include "context.hh" +#include "international.hh" +#include "item.hh" +#include "note-head.hh" +#include "protected-scm.hh" +#include "spanner.hh" +#include "staff-symbol-referencer.hh" +#include "stream-event.hh" +#include "tie-column.hh" +#include "tie.hh" +#include "warn.hh" +#include "translator.icc" /** Manufacture ties. Acknowledge noteheads, and put them into a - priority queue. If we have a Tie_req, connect the notes that finish + priority queue. If we have a TieEvent, connect the notes that finish just at this time, and note that start at this time. - TODO: junk the pq. - */ + TODO: Remove the dependency on musical info. We should tie on the + basis of position and duration-log of the heads (not of the events). +*/ + +struct Head_event_tuple +{ + Grob *head_; + Moment end_moment_; + SCM tie_definition_; + Stream_event *tie_stream_event_; + Stream_event *tie_event_; + + Head_event_tuple () + { + head_ = 0; + tie_definition_ = SCM_EOL; + tie_event_ = 0; + tie_stream_event_ = 0; + } +}; + class Tie_engraver : public Engraver { - PQueue past_notes_pq_; - Moment end_mom_; - Moment next_end_mom_; + Stream_event *event_; + vector now_heads_; + vector heads_to_tie_; + vector ties_; - Tie_req *req_l_; - Array now_heads_; - Array stopped_heads_; - Link_array tie_p_arr_; + Spanner *tie_column_; - Spanner * tie_column_p_; - - void set_melisma (bool); - protected: - virtual void do_post_move_processing (); - virtual void do_pre_move_processing (); - virtual void acknowledge_element (Score_element_info); - virtual bool do_try_music (Music*); - virtual void do_process_music (); - virtual void process_acknowledged (); - void typeset_tie (Score_element*); + void stop_translation_timestep (); + virtual void derived_mark () const; + void start_translation_timestep (); + DECLARE_ACKNOWLEDGER (note_head); + DECLARE_TRANSLATOR_LISTENER (tie); + void process_music (); + void typeset_tie (Grob *); public: - VIRTUAL_COPY_CONS(Translator); - Tie_engraver(); + TRANSLATOR_DECLARATIONS (Tie_engraver); }; - - -Tie_engraver::Tie_engraver() +void +Tie_engraver::derived_mark () const { - req_l_ = 0; - tie_column_p_ = 0; + Engraver::derived_mark (); + for (vsize i = 0; i < heads_to_tie_.size (); i++) + scm_gc_mark (heads_to_tie_[i].tie_definition_); } +Tie_engraver::Tie_engraver () +{ + event_ = 0; + tie_column_ = 0; +} -bool -Tie_engraver::do_try_music (Music *m) +IMPLEMENT_TRANSLATOR_LISTENER (Tie_engraver, tie); +void +Tie_engraver::listen_tie (Stream_event *ev) { - if (Tie_req * c = dynamic_cast (m)) - { - /* if (end_mom_ > now_mom ()) - return false; - */ - req_l_ = c; - SCM m = get_property ("automaticMelismata"); - bool am = gh_boolean_p (m) &&gh_scm2bool (m); - if (am) - { - set_melisma (true); - } - return true; - } - return false; + ASSIGN_EVENT_ONCE (event_, ev); } void -Tie_engraver::set_melisma (bool m) +Tie_engraver::process_music () { - daddy_trans_l_->set_property ("tieMelismaBusy", m ? SCM_BOOL_T : SCM_BOOL_F); + bool busy = event_; + for (vsize i = 0; !busy && i < heads_to_tie_.size (); i++) + busy |= (heads_to_tie_[i].tie_event_ + || heads_to_tie_[i].tie_stream_event_); + + if (busy) + context ()->set_property ("tieMelismaBusy", SCM_BOOL_T); } void -Tie_engraver::acknowledge_element (Score_element_info i) +Tie_engraver::acknowledge_note_head (Grob_info i) { - if (Rhythmic_head::has_interface (i.elem_l_)) + Grob *h = i.grob (); + + now_heads_.push_back (h); + for (vsize i = heads_to_tie_.size (); i--;) { - Note_req * m = dynamic_cast (i.req_l_); - if (!m) - return; - now_heads_.push (CHead_melodic_tuple (i.elem_l_, m, now_mom()+ m->length_mom ())); + Grob *th = heads_to_tie_[i].head_; + Stream_event *right_ev = unsmob_stream_event (h->get_property ("cause")); + Stream_event *left_ev = unsmob_stream_event (th->get_property ("cause")); + + /* + maybe should check positions too. + */ + if (!right_ev || !left_ev) + continue; + + if (ly_is_equal (right_ev->get_property ("pitch"), + left_ev->get_property ("pitch"))) + { + Grob *p = new Spanner (heads_to_tie_[i].tie_definition_); + + SCM cause = heads_to_tie_[i].tie_event_ + ? heads_to_tie_[i].tie_event_->self_scm () + : heads_to_tie_[i].tie_stream_event_->self_scm (); + + announce_grob (p, cause); + Tie::set_head (p, LEFT, th); + Tie::set_head (p, RIGHT, h); + + + if (is_direction (unsmob_stream_event (cause)->get_property ("direction"))) + { + Direction d = to_dir (unsmob_stream_event (cause)->get_property ("direction")); + p->set_property ("direction", scm_from_int (d)); + } + + ties_.push_back (p); + heads_to_tie_.erase (heads_to_tie_.begin () + i); + } } + + if (ties_.size () && ! tie_column_) + tie_column_ = make_spanner ("TieColumn", ties_[0]->self_scm ()); + + if (tie_column_) + for (vsize i = ties_.size (); i--;) + Tie_column::add_tie (tie_column_, ties_[i]); } void -Tie_engraver::do_process_music () +Tie_engraver::start_translation_timestep () { - if (req_l_) + context ()->set_property ("tieMelismaBusy", + ly_bool2scm (heads_to_tie_.size ())); + + if (heads_to_tie_.size () && !to_boolean (get_property ("tieWaitForNote"))) { Moment now = now_mom (); - stopped_heads_.clear (); - while (past_notes_pq_.size () - && past_notes_pq_.front ().end_ == now) - stopped_heads_.push (past_notes_pq_.get ()); + for (vsize i = heads_to_tie_.size (); i--; ) + { + if (now > heads_to_tie_[i].end_moment_) + heads_to_tie_.erase (heads_to_tie_.begin () + i); + } } } void -Tie_engraver::process_acknowledged () +Tie_engraver::stop_translation_timestep () { - if (req_l_) + bool wait = to_boolean (get_property ("tieWaitForNote")); + if (ties_.size ()) { - now_heads_.sort (CHead_melodic_tuple::pitch_compare); - stopped_heads_.sort(CHead_melodic_tuple::pitch_compare); + if (!wait) + heads_to_tie_.clear (); - SCM head_list = SCM_EOL; - - int j = stopped_heads_.size ()-1; - int i = now_heads_.size ()-1; + for (vsize i = 0; i < ties_.size (); i++) + typeset_tie (ties_[i]); - while (i >= 0 && j >=0) - { - int comp - = Musical_pitch::compare (now_heads_[i].req_l_->pitch_ , - stopped_heads_[j].req_l_->pitch_); + ties_.clear (); + tie_column_ = 0; + } - if (comp) - { - (comp < 0) ? j -- : i--; - continue; - } - else - { - head_list = gh_cons (gh_cons (stopped_heads_[j].head_l_->self_scm_, - now_heads_[i].head_l_->self_scm_), - head_list); - - past_notes_pq_. insert (now_heads_[i]); - now_heads_.del (i); - stopped_heads_.del (j); - i--; - j--; - } - } + vector new_heads_to_tie; + + for (vsize i = 0; i < now_heads_.size (); i++) + { + Grob *head = now_heads_[i]; + Stream_event *left_ev + = unsmob_stream_event (head->get_property ("cause")); - SCM basic = get_property ("basicTieProperties"); - SCM sparse = get_property ("sparseTies"); - if (to_boolean (sparse)) + if (!left_ev) { - int i = scm_ilength (head_list); - - if (!i) - return; - - SCM pair = gh_list_ref (head_list, gh_int2scm (i/2)); - - Spanner * p = new Spanner (basic); - Tie::set_head (p,LEFT, dynamic_cast (unsmob_element (gh_car (pair)))); - Tie::set_head (p,RIGHT, dynamic_cast (unsmob_element (gh_cdr (pair)))); - - tie_p_arr_.push (p); - announce_element (p, req_l_); - } - else for (SCM s = head_list; gh_pair_p (s); s = gh_cdr (s)) - { - Score_element * p = new Spanner (basic); - Tie::set_interface (p); - - Tie::set_head (p, LEFT, dynamic_cast (unsmob_element (gh_caar (s)))); - Tie::set_head (p, RIGHT, dynamic_cast (unsmob_element (gh_cdar (s)))); - - tie_p_arr_.push (p); - announce_element (p, req_l_); + // may happen for ambituses + continue; } + + + SCM left_articulations = left_ev->get_property ("articulations"); - if (!tie_p_arr_.size ()) + Stream_event *tie_event = 0; + Stream_event *tie_stream_event = event_; + for (SCM s = left_articulations; + !tie_event && !tie_stream_event && scm_is_pair (s); + s = scm_cdr (s)) { - req_l_->origin ()->warning (_ ("No ties were created!")); + Stream_event *ev = unsmob_stream_event (scm_car (s)); + if (!ev) + continue; + + if (ev->in_event_class ("tie-event")) + tie_event = ev; } - else if (tie_p_arr_.size () > 1 && !tie_column_p_) + + if (left_ev && (tie_event || tie_stream_event)) { - tie_column_p_ = new Spanner (get_property ("basicTieColumnProperties")); - Tie_column::set_interface (tie_column_p_); - for (int i = tie_p_arr_.size (); i--; ) - Tie_column::add_tie (tie_column_p_,tie_p_arr_ [i]); - announce_element (tie_column_p_, 0); + Head_event_tuple event_tup; + + SCM start_definition + = updated_grob_properties (context (), ly_symbol2scm ("Tie")); + + event_tup.head_ = head; + event_tup.tie_definition_ = start_definition; + event_tup.tie_event_ = tie_event; + event_tup.tie_stream_event_ = tie_stream_event; + + Moment end = now_mom (); + if (end.grace_part_) + { + end.grace_part_ += get_event_length (left_ev).main_part_; + } + else + { + end += get_event_length (left_ev); + } + event_tup.end_moment_ = end; + + new_heads_to_tie.push_back (event_tup); } } -} + if (!wait && new_heads_to_tie.size ()) + heads_to_tie_.clear (); -void -Tie_engraver::do_pre_move_processing () -{ - for (int i=0; i < now_heads_.size (); i++) - { - past_notes_pq_.insert (now_heads_[i]); - } + // hmmm, how to do with copy () ? + for (vsize i = 0; i < new_heads_to_tie.size (); i++) + heads_to_tie_.push_back (new_heads_to_tie[i]); + + event_ = 0; now_heads_.clear (); - - for (int i=0; i< tie_p_arr_.size (); i++) - { - typeset_tie (tie_p_arr_[i]); - } - tie_p_arr_.clear (); - if (tie_column_p_) - { - typeset_element (tie_column_p_); - tie_column_p_ =0; - } } void -Tie_engraver::typeset_tie (Score_element *her) +Tie_engraver::typeset_tie (Grob *her) { - if (!(Tie::head (her,LEFT) && Tie::head (her,RIGHT))) + if (! (Tie::head (her, LEFT) && Tie::head (her, RIGHT))) warning (_ ("lonely tie")); Direction d = LEFT; - Drul_array new_head_drul; - new_head_drul[LEFT] = Tie::head(her,LEFT); - new_head_drul[RIGHT] = Tie::head (her,RIGHT); - do { - if (!Tie::head (her,d)) - new_head_drul[d] = Tie::head(her,(Direction)-d); - } while (flip(&d) != LEFT); - - index_set_cell (her->get_elt_property ("heads"), LEFT, new_head_drul[LEFT]->self_scm_ ); - index_set_cell (her->get_elt_property ("heads"), RIGHT, new_head_drul[RIGHT]->self_scm_ ); - - typeset_element (her); -} - -void -Tie_engraver::do_post_move_processing () -{ - SCM m = get_property ("automaticMelismata"); - if (to_boolean (m)) + Drul_array new_head_drul; + new_head_drul[LEFT] = Tie::head (her, LEFT); + new_head_drul[RIGHT] = Tie::head (her, RIGHT); + do { - set_melisma (false); + if (!Tie::head (her, d)) + new_head_drul[d] = Tie::head (her, (Direction) - d); } - req_l_ = 0; - Moment now = now_mom (); - while (past_notes_pq_.size () && past_notes_pq_.front ().end_ < now) - past_notes_pq_.delmin (); -} - -ADD_THIS_TRANSLATOR(Tie_engraver); + while (flip (&d) != LEFT); - -CHead_melodic_tuple::CHead_melodic_tuple () -{ - head_l_ =0; - req_l_ =0; - end_ = 0; + Spanner *sp = dynamic_cast (her); + sp->set_bound (LEFT, new_head_drul[LEFT]); + sp->set_bound (RIGHT, new_head_drul[RIGHT]); } -CHead_melodic_tuple::CHead_melodic_tuple (Score_element *h, Melodic_req*m, Moment mom) -{ - head_l_ = h; - req_l_ = m; - end_ = mom; -} +ADD_ACKNOWLEDGER (Tie_engraver, note_head); +ADD_TRANSLATOR (Tie_engraver, + /* doc */ + "Generate ties between note heads of equal pitch.", -int -CHead_melodic_tuple::pitch_compare (CHead_melodic_tuple const&h1, - CHead_melodic_tuple const &h2) -{ - return Melodic_req::compare (*h1.req_l_, *h2.req_l_); -} + /* create */ + "Tie " + "TieColumn ", -int -CHead_melodic_tuple::time_compare (CHead_melodic_tuple const&h1, - CHead_melodic_tuple const &h2) -{ - return (h1.end_ - h2.end_ ).sign (); -} + /* read */ + "tieWaitForNote ", + + /* write */ + "tieMelismaBusy " + );