X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftie-engraver.cc;h=b30d40c35eb1788d8bde2d49620ea3a1a4babc2f;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=efae25603fb00e7eef382ca9990f78f592f0946d;hpb=2804f8f79e01dc606ce067bffda2d966524e6e36;p=lilypond.git diff --git a/lily/tie-engraver.cc b/lily/tie-engraver.cc index efae25603f..3d30e77738 100644 --- a/lily/tie-engraver.cc +++ b/lily/tie-engraver.cc @@ -1,268 +1,294 @@ -/* - tie-engraver.cc -- implement Tie_engraver - +/* + tie-engraver.cc -- implement Tie_engraver + source file of the GNU LilyPond music typesetter - - (c) 1998--2002 Han-Wen Nienhuys - - */ -#include "command-request.hh" -#include "musical-request.hh" -#include "tie.hh" -#include "translator-group.hh" -#include "spanner.hh" -#include "tie-column.hh" + (c) 1998--2008 Han-Wen Nienhuys +*/ + #include "engraver.hh" + +#include "context.hh" +#include "international.hh" #include "item.hh" -#include "grob-pitch-tuple.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: Remove the dependency on musical info. We should tie on the - basis of position and duration-log of the heads (not of the reqs). - + 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 { - Moment end_mom_; - Moment next_end_mom_; + Stream_event *event_; + vector now_heads_; + vector heads_to_tie_; + vector ties_; - Tie_req *req_l_; - Link_array now_heads_; - Link_array stopped_heads_; - Link_array tie_p_arr_; + Spanner *tie_column_; - Spanner * tie_column_p_; - - void set_melisma (bool); - protected: - virtual void start_translation_timestep (); - virtual void stop_translation_timestep (); - virtual void acknowledge_grob (Grob_info); - virtual bool try_music (Music*); - virtual void create_grobs (); - void typeset_tie (Grob*); + 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); + 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_); } - -bool -Tie_engraver::try_music (Music *m) +Tie_engraver::Tie_engraver () { - 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; + event_ = 0; + tie_column_ = 0; } +IMPLEMENT_TRANSLATOR_LISTENER (Tie_engraver, tie); void -Tie_engraver::set_melisma (bool m) +Tie_engraver::listen_tie (Stream_event *ev) { - daddy_trans_l_->set_property ("tieMelismaBusy", m ? SCM_BOOL_T : SCM_BOOL_F); + ASSIGN_EVENT_ONCE (event_, ev); } void -Tie_engraver::acknowledge_grob (Grob_info i) -{ - if (Note_head::has_interface (i.grob_l_)) - { - now_heads_.push (i.grob_l_); - } -} - -int -head_pitch_compare (Grob *const&a,Grob *const&b) +Tie_engraver::process_music () { - Music *m1 =unsmob_music (a->get_grob_property ("cause")); - Music *m2 =unsmob_music (b->get_grob_property ("cause")); + 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_); - return Pitch::compare (* unsmob_pitch (m1->get_mus_property ("pitch")), - * unsmob_pitch (m2->get_mus_property ("pitch"))); + if (busy) + context ()->set_property ("tieMelismaBusy", SCM_BOOL_T); } void -Tie_engraver::create_grobs () +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--;) { - now_heads_.sort (&head_pitch_compare); - stopped_heads_.sort (&head_pitch_compare); + 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")); - SCM head_list = SCM_EOL; + /* + maybe should check positions too. + */ + if (!right_ev || !left_ev) + continue; - int j = stopped_heads_.size ()-1; - int i = now_heads_.size ()-1; - - while (i >= 0 && j >=0) + if (ly_is_equal (right_ev->get_property ("pitch"), + left_ev->get_property ("pitch"))) { - int comp - = head_pitch_compare (now_heads_[i], stopped_heads_[j]); + Grob *p = new Spanner (heads_to_tie_[i].tie_definition_); - if (comp) - { - (comp < 0) ? j -- : i--; - continue; - } - else + 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"))) { - head_list = gh_cons (gh_cons (stopped_heads_[j]->self_scm (), - now_heads_[i]->self_scm ()), - head_list); - - now_heads_.del (i); - stopped_heads_.del (j); - i--; - j--; + 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); } + } - SCM basic = get_property ("Tie"); - SCM sparse = get_property ("sparseTies"); - if (to_boolean (sparse)) - { - int i = scm_ilength (head_list); + if (ties_.size () && ! tie_column_) + tie_column_ = make_spanner ("TieColumn", ties_[0]->self_scm ()); - if (!i) - return; - - SCM pair = scm_list_ref (head_list, gh_int2scm (i/2)); - - Spanner * p = new Spanner (basic); + if (tie_column_) + for (vsize i = ties_.size (); i--;) + Tie_column::add_tie (tie_column_, ties_[i]); +} - Tie::set_interface (p); - Tie::set_head (p,LEFT, dynamic_cast (unsmob_grob (ly_car (pair)))); - Tie::set_head (p,RIGHT, dynamic_cast (unsmob_grob (ly_cdr (pair)))); - - tie_p_arr_.push (p); - announce_grob(p, req_l_->self_scm()); - } - else for (SCM s = head_list; gh_pair_p (s); s = ly_cdr (s)) - { - Grob * p = new Spanner (basic); - Tie::set_interface (p); - - Tie::set_head (p, LEFT, dynamic_cast (unsmob_grob (ly_caar (s)))); - Tie::set_head (p, RIGHT, dynamic_cast (unsmob_grob (ly_cdar (s)))); - - tie_p_arr_.push (p); - announce_grob(p, req_l_->self_scm()); - } +void +Tie_engraver::start_translation_timestep () +{ + context ()->set_property ("tieMelismaBusy", + ly_bool2scm (heads_to_tie_.size ())); - if (tie_p_arr_.size () > 1 && !tie_column_p_) + if (heads_to_tie_.size () && !to_boolean (get_property ("tieWaitForNote"))) + { + Moment now = now_mom (); + for (vsize i = heads_to_tie_.size (); i--; ) { - tie_column_p_ = new Spanner (get_property ("TieColumn")); - 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_grob(tie_column_p_, SCM_EOL); + if (now > heads_to_tie_[i].end_moment_) + heads_to_tie_.erase (heads_to_tie_.begin () + i); } } } - void Tie_engraver::stop_translation_timestep () { - req_l_ = 0; + bool wait = to_boolean (get_property ("tieWaitForNote")); + if (ties_.size ()) + { + if (!wait) + heads_to_tie_.clear (); - now_heads_.clear (); + for (vsize i = 0; i < ties_.size (); i++) + typeset_tie (ties_[i]); - /* - we don't warn for no ties, since this happens naturally when you - use skipTypesetting. */ - - for (int i=0; i< tie_p_arr_.size (); i++) - { - typeset_tie (tie_p_arr_[i]); + ties_.clear (); + tie_column_ = 0; } - tie_p_arr_.clear (); - if (tie_column_p_) + + vector new_heads_to_tie; + + for (vsize i = 0; i < now_heads_.size (); i++) { - typeset_grob (tie_column_p_); - tie_column_p_ =0; + 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); + } } + + 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::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_grob_property ("heads"), LEFT, new_head_drul[LEFT]->self_scm ()); - index_set_cell (her->get_grob_property ("heads"), RIGHT, new_head_drul[RIGHT]->self_scm ()); - - typeset_grob (her); -} - -void -Tie_engraver::start_translation_timestep () -{ - SCM m = get_property ("automaticMelismata"); - if (to_boolean (m)) + 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); } + while (flip (&d) != LEFT); - SCM grobs = get_property ("busyGrobs"); - Moment now = now_mom(); - stopped_heads_.clear (); - - for (; gh_pair_p (grobs); grobs = gh_cdr (grobs)) - { - Grob * grob = unsmob_grob (gh_cdar (grobs)); - Moment end =*unsmob_moment (gh_caar (grobs)); - - /* - This is slightly ugh: we are now confunding the frontend - (iterators) and the backend (note heads) */ - if (end > now) - break; - else if (end == now - && Note_head::has_interface (grob)) - stopped_heads_.push (grob); - } + Spanner *sp = dynamic_cast (her); + sp->set_bound (LEFT, new_head_drul[LEFT]); + sp->set_bound (RIGHT, new_head_drul[RIGHT]); } +ADD_ACKNOWLEDGER (Tie_engraver, note_head); +ADD_TRANSLATOR (Tie_engraver, + /* doc */ + "Generate ties between note heads of equal pitch.", + + /* create */ + "Tie " + "TieColumn ", + + /* read */ + "tieWaitForNote ", -ENTER_DESCRIPTION(Tie_engraver, -/* descr */ "Generate ties between noteheads of equal pitch.", -/* creats*/ "Tie TieColumn", -/* acks */ "rhythmic-head-interface", -/* reads */ "sparseTies tieMelismaBusy", -/* write */ ""); + /* write */ + "tieMelismaBusy " + );