X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftie-engraver.cc;h=8c418564753480dbbd6ed64c5e7ed9c08ebce8e9;hb=8fcb449bffdbfc7803da139e3aecd6289dba1db5;hp=ca954b5e080ded5f1a27f8c05fcd254f1bc4231f;hpb=f02e7db17cd0babaeb7978251ca5809e353ad29a;p=lilypond.git diff --git a/lily/tie-engraver.cc b/lily/tie-engraver.cc index ca954b5e08..8c41856475 100644 --- a/lily/tie-engraver.cc +++ b/lily/tie-engraver.cc @@ -1,236 +1,155 @@ /* - tie-engraver.cc -- implement Tie_engraver + new-tie-engraver.cc -- implement Tie_engraver source file of the GNU LilyPond music typesetter - (c) 1998--2001 Han-Wen Nienhuys + (c) 1998--2004 Han-Wen Nienhuys */ -#include "command-request.hh" -#include "rhythmic-head.hh" -#include "musical-request.hh" +#include "event.hh" #include "tie.hh" -#include "translator-group.hh" +#include "context.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_ ; - Grob *head_l_; - Moment end_; - CHead_melodic_tuple (); - CHead_melodic_tuple (Grob*, 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; the PQ is overkill if we assume that no - different durations occur in parallel. + 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). */ class Tie_engraver : public Engraver { - PQueue past_notes_pq_; - Moment end_mom_; - Moment next_end_mom_; - - Tie_req *req_l_; - Array now_heads_; - Array stopped_heads_; - Link_array tie_p_arr_; - - Spanner * tie_column_p_; + Music *event_; + Music *last_event_; + Link_array now_heads_; + Link_array heads_to_tie_; + Link_array ties_; - void set_melisma (bool); + Spanner * tie_column_; protected: - virtual void start_translation_timestep (); virtual void stop_translation_timestep (); + virtual void start_translation_timestep (); virtual void acknowledge_grob (Grob_info); virtual bool try_music (Music*); - virtual void create_grobs (); + virtual void process_music (); void typeset_tie (Grob*); public: - VIRTUAL_COPY_CONS (Translator); - Tie_engraver (); + TRANSLATOR_DECLARATIONS (Tie_engraver); }; Tie_engraver::Tie_engraver () { - req_l_ = 0; - tie_column_p_ = 0; + event_ = 0; + last_event_ = 0; + tie_column_ = 0; } bool -Tie_engraver::try_music (Music *m) +Tie_engraver::try_music (Music *mus) { - if (Tie_req * c = dynamic_cast (m)) + if (mus->is_mus_type ("tie-event")) { - /* 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; + event_ = mus; } - return false; + + return true; } void -Tie_engraver::set_melisma (bool m) +Tie_engraver::process_music () { - daddy_trans_l_->set_property ("tieMelismaBusy", m ? SCM_BOOL_T : SCM_BOOL_F); + if (event_) + context ()->set_property ("tieMelismaBusy", SCM_BOOL_T); } void Tie_engraver::acknowledge_grob (Grob_info i) { - if (Rhythmic_head::has_interface (i.elem_l_)) + if (Note_head::has_interface (i.grob_)) { - 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 ())); - } -} - - -void -Tie_engraver::create_grobs () -{ - if (req_l_) - { - 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) + Grob * h = i.grob_; + now_heads_.push (h); + for (int i = heads_to_tie_.size (); i--;) { - int comp - = Pitch::compare (*unsmob_pitch (now_heads_[i].req_l_->get_mus_property ("pitch")), - *unsmob_pitch (stopped_heads_[j].req_l_->get_mus_property ("pitch"))); - - if (comp) + Grob *th = heads_to_tie_[i]; + 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_mus && left_mus + && ly_c_equal_p (right_mus->get_property ("pitch"), + left_mus->get_property ("pitch"))) { - (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 ("Tie"); - SCM sparse = get_property ("sparseTies"); - if (to_boolean (sparse)) - { - int i = scm_ilength (head_list); - - if (!i) - return; + Grob * p = make_spanner ("Tie", last_event_->self_scm ()); + Tie::set_interface (p); // cannot remove yet! - SCM pair = gh_list_ref (head_list, gh_int2scm (i/2)); - - Spanner * p = new Spanner (basic); - - Tie::set_interface (p); - Tie::set_head (p,LEFT, dynamic_cast (unsmob_grob (gh_car (pair)))); - Tie::set_head (p,RIGHT, dynamic_cast (unsmob_grob (gh_cdr (pair)))); + Tie::set_head (p, LEFT, th); + Tie::set_head (p, RIGHT, h); - tie_p_arr_.push (p); - announce_grob (p, req_l_); + ties_.push (p); + } } - else for (SCM s = head_list; gh_pair_p (s); s = gh_cdr (s)) + + if (ties_.size () && ! tie_column_) { - Grob * p = new Spanner (basic); - Tie::set_interface (p); + tie_column_ = make_spanner ("TieColumn", SCM_EOL); - Tie::set_head (p, LEFT, dynamic_cast (unsmob_grob (gh_caar (s)))); - Tie::set_head (p, RIGHT, dynamic_cast (unsmob_grob (gh_cdar (s)))); - - tie_p_arr_.push (p); - announce_grob (p, req_l_); } - if (tie_p_arr_.size () > 1 && !tie_column_p_) - { - 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_, 0); - } + if (tie_column_) + for (int i = ties_.size (); i--;) + Tie_column::add_tie (tie_column_,ties_ [i]); } } +void +Tie_engraver::start_translation_timestep () +{ + context ()->set_property ("tieMelismaBusy", + ly_bool2scm (heads_to_tie_.size ())); + +} void Tie_engraver::stop_translation_timestep () { - for (int i=0; i < now_heads_.size (); i++) + if (ties_.size ()) { - past_notes_pq_.insert (now_heads_[i]); - } - now_heads_.clear (); + heads_to_tie_.clear (); + for (int 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. */ - -#if 0 - if (req_l_ && !tie_p_arr_.size ()) - { - /* How to shut up this warning, when no notes appeared because - they were suicided by Thread_devnull_engraver? */ - req_l_->origin ()->warning (_ ("No ties were created!")); + ties_.clear (); + last_event_ = 0; + tie_column_ =0; } -#endif - for (int i=0; i< tie_p_arr_.size (); i++) - { - typeset_tie (tie_p_arr_[i]); - } - tie_p_arr_.clear (); - if (tie_column_p_) + if (event_) { - typeset_grob (tie_column_p_); - tie_column_p_ =0; + heads_to_tie_ = now_heads_; + last_event_ = event_; } + event_ = 0; + now_heads_.clear (); } void @@ -248,67 +167,16 @@ Tie_engraver::typeset_tie (Grob *her) 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)) - { - 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 (); - - - stopped_heads_.clear (); - while (past_notes_pq_.size () - && past_notes_pq_.front ().end_ == now) - stopped_heads_.push (past_notes_pq_.get ()); + index_set_cell (her->get_property ("head-pair"), LEFT, new_head_drul[LEFT]->self_scm ()); + index_set_cell (her->get_property ("head-pair"), RIGHT, new_head_drul[RIGHT]->self_scm ()); } -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 (Grob *h, Melodic_req*m, Moment mom) -{ - head_l_ = h; - req_l_ = m; - end_ = mom; -} - -/* - signed compare, should use pitchget_mus_property ("pitch"); - SCM p2 = h2.req_l_->get_mus_property ("pitch"); - - return Pitch::compare (*unsmob_pitch (p1), - *unsmob_pitch (p2)); -} - -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 */ "");