X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftie-engraver.cc;h=ee2fdab41dfbef0ea00c3e687de47274ac10922b;hb=8cab78caa0db1ba14f2e52e4c1ddbb541ea0e5cb;hp=26275ce12ba26fac5017de4b83b0570b54e80014;hpb=8aad615ea7bb31f49a0c2afc21eea5ff5de20437;p=lilypond.git diff --git a/lily/tie-engraver.cc b/lily/tie-engraver.cc index 26275ce12b..1a397b3b74 100644 --- a/lily/tie-engraver.cc +++ b/lily/tie-engraver.cc @@ -1,153 +1,294 @@ -/* - 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--2009 Han-Wen Nienhuys +*/ + +#include "engraver.hh" + +#include "context.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 "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. -Tie_engraver::Tie_engraver() + 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 { - req_l_ = 0; -} + 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_; + + 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 +{ + Engraver::derived_mark (); + for (vsize i = 0; i < heads_to_tie_.size (); i++) + scm_gc_mark (heads_to_tie_[i].tie_definition_); +} -bool -Tie_engraver::do_try_music (Music *m) +Tie_engraver::Tie_engraver () { - if (Tie_req * c = dynamic_cast (m)) - { - req_l_ = c; - return true; - } - return false; + event_ = 0; + tie_column_ = 0; } +IMPLEMENT_TRANSLATOR_LISTENER (Tie_engraver, tie); void -Tie_engraver::acknowledge_element (Score_element_info i) +Tie_engraver::listen_tie (Stream_event *ev) { - if (Note_head *nh = dynamic_cast (i.elem_l_)) - { - Note_req * m = dynamic_cast (i.req_l_); - now_heads_.push (CHead_melodic_tuple (nh, m, now_mom()+ m->length_mom ())); - } + ASSIGN_EVENT_ONCE (event_, ev); } void -Tie_engraver::do_process_requests () +Tie_engraver::process_music () { - if (req_l_) - { - 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 ()); + 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::process_acknowledged () +Tie_engraver::acknowledge_note_head (Grob_info i) { - if (req_l_) + Grob *h = i.grob (); + + now_heads_.push_back (h); + for (vsize i = heads_to_tie_.size (); i--;) { - if (now_heads_.size () != stopped_heads_.size ()) - { - req_l_->warning ("Unequal number of note heads for tie"); - } - int sz = now_heads_.size () get_property ("cause")); + Stream_event *left_ev = unsmob_stream_event (th->get_property ("cause")); - // hmm. Should do something more sensible. - // because, we assume no more noteheads come along after the 1st pass. - if (sz > tie_p_arr_.size ()) + /* + 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"))) { - now_heads_.sort (CHead_melodic_tuple::pitch_compare); - stopped_heads_.sort(CHead_melodic_tuple::pitch_compare); + Grob *p = new Spanner (heads_to_tie_[i].tie_definition_); - for (int i=0; i < sz; i++) + 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"))) { - Tie * p = new Tie; - p->set_head (LEFT, stopped_heads_[i].head_l_); - p->set_head (RIGHT, now_heads_[i].head_l_); - tie_p_arr_.push (p); - announce_element (Score_element_info (p, req_l_)); + 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_pre_move_processing () +Tie_engraver::start_translation_timestep () { - for (int i=0; i < now_heads_.size (); i++) + context ()->set_property ("tieMelismaBusy", + ly_bool2scm (heads_to_tie_.size ())); + + if (heads_to_tie_.size () && !to_boolean (get_property ("tieWaitForNote"))) { - past_notes_pq_.insert (now_heads_[i]); + Moment now = now_mom (); + 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); + } } - now_heads_.clear (); +} - Scalar dir (get_property ("tieydirection", 0)); - Scalar dir2 (get_property ("ydirection", 0)); +void +Tie_engraver::stop_translation_timestep () +{ + bool wait = to_boolean (get_property ("tieWaitForNote")); + if (ties_.size ()) + { + if (!wait) + heads_to_tie_.clear (); + + for (vsize i = 0; i < ties_.size (); i++) + typeset_tie (ties_[i]); + + ties_.clear (); + tie_column_ = 0; + } - Direction tie_dir = CENTER; - if (dir.length_i () && dir.isnum_b ()) - tie_dir = (Direction) sign (int(dir)); - else if (dir2.length_i () && dir2.isnum_b ()) - tie_dir = (Direction) sign (int (dir2)); + vector new_heads_to_tie; - for (int i=0; i< tie_p_arr_.size (); i++) - { - tie_p_arr_[i]->dir_ = tie_dir; - typeset_element (tie_p_arr_[i]); + 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")); + + if (!left_ev) + { + // may happen for ambituses + continue; + } + + + 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)) + { + Stream_event *ev = unsmob_stream_event (scm_car (s)); + if (!ev) + continue; + + if (ev->in_event_class ("tie-event")) + tie_event = ev; + } + + if (left_ev && (tie_event || tie_stream_event)) + { + 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); + } } - tie_p_arr_.clear (); + + if (!wait && new_heads_to_tie.size ()) + heads_to_tie_.clear (); + + // 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 (); } void -Tie_engraver::do_post_move_processing () +Tie_engraver::typeset_tie (Grob *her) { - 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); + 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); -CHead_melodic_tuple::CHead_melodic_tuple () -{ - head_l_ =0; - mel_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; - mel_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.mel_l_, *h2.mel_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 " + );