X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftie-engraver.cc;h=39be6c057f034d8015cd12e96ea9edc1480a23b4;hb=9f3572d98bb948c9689cd1f75401a029451fa001;hp=1dfb42fa523236e2bd5266154c34a361d1f8ada7;hpb=04265f11d1f21416ccebd2dcaa1d903dc781b36e;p=lilypond.git diff --git a/lily/tie-engraver.cc b/lily/tie-engraver.cc index 1dfb42fa52..39be6c057f 100644 --- a/lily/tie-engraver.cc +++ b/lily/tie-engraver.cc @@ -16,13 +16,10 @@ #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 @@ -35,23 +32,22 @@ struct Head_event_tuple { Grob *head_; - Moment end_moment_; SCM tie_definition_; - Stream_event *tie_stream_event_; - Stream_event *tie_event_; - + Music *event_; Head_event_tuple () { - head_ = 0; - tie_definition_ = SCM_EOL; - tie_event_ = 0; - tie_stream_event_ = 0; + } + Head_event_tuple (Grob *h, Music *m, SCM def) + { + head_ = h; + event_ = m; + tie_definition_ = def; } }; class Tie_engraver : public Engraver { - Stream_event *event_; + Music *event_; vector now_heads_; vector heads_to_tie_; vector ties_; @@ -63,7 +59,7 @@ protected: virtual void derived_mark () const; void start_translation_timestep (); DECLARE_ACKNOWLEDGER (note_head); - DECLARE_TRANSLATOR_LISTENER (tie); + virtual bool try_music (Music *); void process_music (); void typeset_tie (Grob *); public: @@ -84,22 +80,19 @@ Tie_engraver::Tie_engraver () tie_column_ = 0; } -IMPLEMENT_TRANSLATOR_LISTENER (Tie_engraver, tie); -void -Tie_engraver::listen_tie (Stream_event *ev) +bool +Tie_engraver::try_music (Music *mus) { - ASSIGN_EVENT_ONCE (event_, ev); + if (mus->is_mus_type ("tie-event")) + event_ = mus; + + return true; } void Tie_engraver::process_music () { - 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) + if (event_) context ()->set_property ("tieMelismaBusy", SCM_BOOL_T); } @@ -107,31 +100,23 @@ void Tie_engraver::acknowledge_note_head (Grob_info i) { Grob *h = i.grob (); - now_heads_.push_back (h); for (vsize i = heads_to_tie_.size (); i--;) { 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")); + Music *right_mus = unsmob_music (h->get_property ("cause")); + Music *left_mus = unsmob_music (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"))) + if (right_mus && left_mus + && ly_is_equal (right_mus->get_property ("pitch"), + left_mus->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); + announce_grob (p, heads_to_tie_[i].event_->self_scm ()); Tie::set_head (p, LEFT, th); Tie::set_head (p, RIGHT, h); @@ -153,25 +138,14 @@ Tie_engraver::start_translation_timestep () { context ()->set_property ("tieMelismaBusy", ly_bool2scm (heads_to_tie_.size ())); - - if (!to_boolean (get_property ("tieWaitForNote"))) - { - 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); - } - } } void Tie_engraver::stop_translation_timestep () { - bool wait = to_boolean (get_property ("tieWaitForNote")); if (ties_.size ()) { - if (!wait) + if (!to_boolean (get_property ("tieWaitForNote"))) heads_to_tie_.clear (); for (vsize i = 0; i < ties_.size (); i++) @@ -181,71 +155,21 @@ Tie_engraver::stop_translation_timestep () tie_column_ = 0; } - vector new_heads_to_tie; - - for (vsize i = 0; i < now_heads_.size (); i++) + if (event_) { - Grob *head = now_heads_[i]; - Stream_event *left_ev - = unsmob_stream_event (head->get_property ("cause")); + SCM start_definition + = updated_grob_properties (context (), ly_symbol2scm ("Tie")); - 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)) + if (!to_boolean (get_property ("tieWaitForNote"))) + heads_to_tie_.clear (); + + for (vsize i = 0; i < now_heads_.size (); i++) { - 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); + heads_to_tie_.push_back (Head_event_tuple (now_heads_[i], event_, + start_definition)); } } - 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 (); } @@ -272,12 +196,14 @@ Tie_engraver::typeset_tie (Grob *her) sp->set_bound (RIGHT, new_head_drul[RIGHT]); } +#include "translator.icc" + ADD_ACKNOWLEDGER (Tie_engraver, note_head); ADD_TRANSLATOR (Tie_engraver, /* doc */ "Generate ties between noteheads of equal pitch.", /* create */ "Tie " - "TieColumn ", + "TieColumn", /* accept */ "tie-event", /* read */ "tieWaitForNote",