X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftie-engraver.cc;h=1dfb42fa523236e2bd5266154c34a361d1f8ada7;hb=ce83e6caa171094d868362fb670ca2193202de8b;hp=0948237b0e152886cb2bc16c6ed77e7d9d7215c5;hpb=f6e3a77381e8eb67aa01195ec3945bd978f86aa8;p=lilypond.git diff --git a/lily/tie-engraver.cc b/lily/tie-engraver.cc index 0948237b0e..1dfb42fa52 100644 --- a/lily/tie-engraver.cc +++ b/lily/tie-engraver.cc @@ -1,212 +1,284 @@ -/* - ctie-engraver.cc -- implement Tie_engraver - +/* + tie-engraver.cc -- implement Tie_engraver + source file of the GNU LilyPond music typesetter - - (c) 1998--1999 Han-Wen Nienhuys - - */ -#include "tie-engraver.hh" -#include "command-request.hh" + (c) 1998--2006 Han-Wen Nienhuys +*/ + +#include "engraver.hh" + +#include "context.hh" +#include "grob-pitch-tuple.hh" +#include "international.hh" +#include "item.hh" #include "note-head.hh" -#include "musical-request.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 "translator-group.hh" +#include "warn.hh" + +#include "translator.icc" + +/** + Manufacture ties. Acknowledge noteheads, and put them into a + priority queue. If we have a TieEvent, connect the notes that finish + just at this time, and note that start at this time. + + 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 +{ + Stream_event *event_; + vector now_heads_; + vector heads_to_tie_; + vector ties_; -Tie_engraver::Tie_engraver() + Spanner *tie_column_; + +protected: + 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: + TRANSLATOR_DECLARATIONS (Tie_engraver); +}; + +void +Tie_engraver::derived_mark () const { - req_l_ = 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)) - { - req_l_ = c; - SCM m = get_property ("automaticMelismata",0); - 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 () { - Translator_group *where = daddy_trans_l_; - get_property ("tieMelismaBusy", &where); - if (!where) - where = daddy_trans_l_; - - 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 (Note_head *nh = dynamic_cast (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 (nh, 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_, + context ()->get_grob_key ("Tie")); + + 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); + + 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_requests () +Tie_engraver::start_translation_timestep () { - if (req_l_) + context ()->set_property ("tieMelismaBusy", + ly_bool2scm (heads_to_tie_.size ())); + + if (!to_boolean (get_property ("tieWaitForNote"))) { Moment now = now_mom (); - Link_array nharr; - - 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; - - while (i >= 0 && j >=0) - { - int comp - = Musical_pitch::compare (now_heads_[i].req_l_->pitch_ , - stopped_heads_[j].req_l_->pitch_); + for (vsize i = 0; i < ties_.size (); i++) + typeset_tie (ties_[i]); - 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--; - } - } + ties_.clear (); + tie_column_ = 0; + } + 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 sparse = get_property ("sparseTies", 0); - 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)); - - Tie * p = new Tie; - p->set_head (LEFT, dynamic_cast (unsmob_element (gh_car (pair)))); - p->set_head (RIGHT, dynamic_cast (unsmob_element (gh_cdr (pair)))); - - tie_p_arr_.push (p); - announce_element (Score_element_info (p, req_l_)); + // may happen for ambituses + continue; } - else for (SCM s = head_list; gh_pair_p (s); s = gh_cdr (s)) + + + SCM left_articulations = left_ev->get_property ("articulations"); + + 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)) { - Tie * p = new Tie; - p->set_head (LEFT, dynamic_cast (unsmob_element (gh_caar (s)))); - p->set_head (RIGHT, dynamic_cast (unsmob_element (gh_cdar (s)))); + Stream_event *ev = unsmob_stream_event (scm_car (s)); + if (!ev) + continue; - tie_p_arr_.push (p); - announce_element (Score_element_info (p, req_l_)); + if (ev->in_event_class ("tie-event")) + tie_event = ev; } - - if (!tie_p_arr_.size ()) + + if (left_ev && (tie_event || tie_stream_event)) { - req_l_->warning (_ ("No ties were created!")); + 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_element (tie_p_arr_[i]); - } - tie_p_arr_.clear (); } void -Tie_engraver::do_post_move_processing () +Tie_engraver::typeset_tie (Grob *her) { - SCM m = get_property ("automaticMelismata",0); - if (to_boolean (m)) + 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 { - 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 (Note_head *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 noteheads of equal pitch.", + /* create */ + "Tie " + "TieColumn ", -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_); -} - -int -CHead_melodic_tuple::time_compare (CHead_melodic_tuple const&h1, - CHead_melodic_tuple const &h2) -{ - return (h1.end_ - h2.end_ ).sign (); -} + /* accept */ "tie-event", + /* read */ "tieWaitForNote", + /* write */ "tieMelismaBusy");