X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftie-engraver.cc;h=f44e8b3b0d80a03d55bd7e37fbd29792c921e6db;hb=26633bbfbf821a7cfdfe7a0367d1ea94a440be2e;hp=4f619e27ae2d5738fd68a631f9b9b2e20be3db9e;hpb=0af2486a28f1c60b9de929a9101964d880927e54;p=lilypond.git diff --git a/lily/tie-engraver.cc b/lily/tie-engraver.cc index 4f619e27ae..f44e8b3b0d 100644 --- a/lily/tie-engraver.cc +++ b/lily/tie-engraver.cc @@ -1,297 +1,196 @@ /* - ctie-engraver.cc -- implement Tie_engraver + new-tie-engraver.cc -- implement Tie_engraver source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2003 Han-Wen Nienhuys */ -#include "tie-engraver.hh" -#include "command-request.hh" -#include "rhythmic-head.hh" -#include "musical-request.hh" +#include "event.hh" #include "tie.hh" #include "translator-group.hh" +#include "spanner.hh" #include "tie-column.hh" -#include "pqueue.hh" #include "engraver.hh" #include "item.hh" - -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 &); -}; - -inline int compare (CHead_melodic_tuple const &a, CHead_melodic_tuple const &b) -{ - return CHead_melodic_tuple::time_compare (a,b); -} - +#include "grob-pitch-tuple.hh" +#include "warn.hh" +#include "note-head.hh" +#include "staff-symbol-referencer.hh" /** 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). + + TODO: support sparseTies. + + TODO: melismata will fuck up now: + + < { c8 ~ c8 } + { c16 c c c } > + + melisma is after the 2nd 8th note, but will now be signaled as + lasting till the 3rd 16th. +*/ class Tie_engraver : public Engraver { - PQueue past_notes_pq_; - Tie_req *req_l_; - Array now_heads_; - Array stopped_heads_; - Link_array tie_p_arr_; - - Tie_column * tie_column_p_; + Music *event_; + Music *last_event_; + Link_array now_heads_; + Link_array heads_to_tie_; + Link_array ties_; + + Spanner * tie_column_; - 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*); + virtual void stop_translation_timestep (); + virtual void start_translation_timestep (); + virtual void acknowledge_grob (Grob_info); + virtual bool try_music (Music*); + virtual void process_acknowledged_grobs (); + void typeset_tie (Grob*); public: - VIRTUAL_COPY_CONS(Translator); - Tie_engraver(); + TRANSLATOR_DECLARATIONS(Tie_engraver); }; -Tie_engraver::Tie_engraver() +Tie_engraver::Tie_engraver () { - req_l_ = 0; - tie_column_p_ = 0; + event_ = 0; + last_event_ = 0; + tie_column_ = 0; } bool -Tie_engraver::do_try_music (Music *m) +Tie_engraver::try_music (Music *mus) { - if (Tie_req * c = dynamic_cast (m)) + if (mus->is_mus_type ("tie-event")) { - req_l_ = c; - SCM m = get_property ("automaticMelismata"); - bool am = gh_boolean_p (m) &&gh_scm2bool (m); - if (am) - { - set_melisma (true); - } - return true; + event_ = mus; } - return false; + + return true; } void -Tie_engraver::set_melisma (bool m) +Tie_engraver::acknowledge_grob (Grob_info i) { - daddy_trans_l_->set_property ("tieMelismaBusy", m ? SCM_BOOL_T : SCM_BOOL_F); + if (Note_head::has_interface (i.grob_)) + { + Grob * h = i.grob_; + now_heads_.push (h); + for (int i = heads_to_tie_.size (); i--;) + { + Grob *th = heads_to_tie_[i]; + Music * right_mus = unsmob_music (h->get_grob_property ("cause")); + Music * left_mus = unsmob_music (th->get_grob_property ("cause")); + + /* + maybe should check positions too. + */ + if (right_mus && left_mus + && gh_equal_p (right_mus->get_mus_property ("pitch"), + left_mus->get_mus_property ("pitch"))) + { + Grob * p = new Spanner (get_property ("Tie")); + Tie::set_interface (p); // cannot remove yet! + + Tie::set_head (p, LEFT, th); + Tie::set_head (p, RIGHT, h); + + ties_.push (p); + announce_grob(p, last_event_->self_scm()); + } + } + } } void -Tie_engraver::acknowledge_element (Score_element_info i) +Tie_engraver::process_acknowledged_grobs () { - if (Rhythmic_head::has_interface (i.elem_l_)) + if (ties_.size () > 1 && !tie_column_) { - 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 ())); + tie_column_ = new Spanner (get_property ("TieColumn")); + + for (int i = ties_.size (); i--;) + Tie_column::add_tie (tie_column_,ties_ [i]); + + announce_grob(tie_column_, SCM_EOL); } } void -Tie_engraver::do_process_music () +Tie_engraver::start_translation_timestep () { - if (req_l_) - { - Moment now = now_mom (); - Link_array nharr; + if (to_boolean (get_property ("automaticMelismata"))) + daddy_trans_->set_property ("tieMelismaBusy", + gh_bool2scm (heads_to_tie_.size ())); - stopped_heads_.clear (); - while (past_notes_pq_.size () - && past_notes_pq_.front ().end_ == now) - stopped_heads_.push (past_notes_pq_.get ()); - } } void -Tie_engraver::process_acknowledged () +Tie_engraver::stop_translation_timestep () { - if (req_l_) + if (ties_.size ()) { - now_heads_.sort (CHead_melodic_tuple::pitch_compare); - stopped_heads_.sort(CHead_melodic_tuple::pitch_compare); - - 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_); - - 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--; - } - } - - SCM basic = get_property ("basicTieProperties"); - SCM sparse = get_property ("sparseTies"); - if (to_boolean (sparse)) - { - int i = scm_ilength (head_list); - - if (!i) - return; - - SCM pair = gh_list_ref (head_list, gh_int2scm (i/2)); - - Tie * p = new Tie (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 (Score_element_info (p, req_l_)); - } - else for (SCM s = head_list; gh_pair_p (s); s = gh_cdr (s)) + heads_to_tie_.clear (); + for (int i=0; i< ties_.size (); i++) { - Tie * p = new Tie (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 (Score_element_info (p, req_l_)); + typeset_tie (ties_[i]); } - if (!tie_p_arr_.size ()) - { - req_l_->warning (_ ("No ties were created!")); - } - else if (tie_p_arr_.size () > 1 && !tie_column_p_) + ties_.clear(); + last_event_ = 0; + if (tie_column_) { - tie_column_p_ = new Tie_column (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 (Score_element_info (tie_column_p_, 0)); + typeset_grob (tie_column_); + tie_column_ =0; } } -} - - -void -Tie_engraver::do_pre_move_processing () -{ - for (int i=0; i < now_heads_.size (); i++) + + if (event_) { - past_notes_pq_.insert (now_heads_[i]); + heads_to_tie_ = now_heads_; + last_event_ = event_; } + 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); + 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_ ); + new_head_drul[d] = Tie::head (her, (Direction)-d); + } while (flip (&d) != LEFT); - typeset_element (her); -} + 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 ()); -void -Tie_engraver::do_post_move_processing () -{ - SCM m = get_property ("automaticMelismata"); - if (to_boolean (m)) - { - set_melisma (false); - } - req_l_ = 0; - Moment now = now_mom (); - while (past_notes_pq_.size () && past_notes_pq_.front ().end_ < now) - past_notes_pq_.delmin (); + typeset_grob (her); } -ADD_THIS_TRANSLATOR(Tie_engraver); - -CHead_melodic_tuple::CHead_melodic_tuple () -{ - head_l_ =0; - req_l_ =0; - end_ = 0; -} - -CHead_melodic_tuple::CHead_melodic_tuple (Score_element *h, Melodic_req*m, Moment mom) -{ - head_l_ = h; - req_l_ = m; - end_ = mom; -} - -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 (); -} +ENTER_DESCRIPTION(Tie_engraver, +/* descr */ "Generate ties between noteheads of equal pitch.", +/* creats*/ "Tie TieColumn", +/* accepts */ "tie-event", +/* acks */ "rhythmic-head-interface", +/* reads */ "tieMelismaBusy", +/* write */ "");