X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftie-engraver.cc;h=cf5364015cb9daadad230e4086fd462d29683db0;hb=1402d6d957bee7d47e0bddf4c57dd89912182b26;hp=020779e4827586206e986ea58c96dcfecd6e7271;hpb=40c8e12b8afa8e9c7e44cf6ea3b724295884091b;p=lilypond.git diff --git a/lily/tie-engraver.cc b/lily/tie-engraver.cc index 020779e482..cf5364015c 100644 --- a/lily/tie-engraver.cc +++ b/lily/tie-engraver.cc @@ -1,272 +1,219 @@ -/* - ctie-engraver.cc -- implement Tie_engraver - +/* + tie-engraver.cc -- implement Tie_engraver + source file of the GNU LilyPond music typesetter - - (c) 1998--2000 Han-Wen Nienhuys - - */ - -#include "tie-engraver.hh" -#include "command-request.hh" -#include "rhythmic-head.hh" -#include "musical-request.hh" + + (c) 1998--2005 Han-Wen Nienhuys +*/ + #include "tie.hh" -#include "translator-group.hh" +#include "context.hh" +#include "protected-scm.hh" +#include "spanner.hh" #include "tie-column.hh" -#include "pqueue.hh" #include "engraver.hh" - -struct CHead_melodic_tuple { - Melodic_req *req_l_ ; - Rhythmic_head *head_l_; - Moment end_; - CHead_melodic_tuple (); - CHead_melodic_tuple (Rhythmic_head*, 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 "item.hh" +#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: should share code with Beam_engraver, Extender_engraver? - */ -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_; - - 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 (); + 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). +*/ -public: - VIRTUAL_COPY_CONS(Translator); - Tie_engraver(); +struct Head_event_tuple +{ + Grob *head_; + SCM tie_definition_; + Music *event_; + Head_event_tuple () + { + } + Head_event_tuple (Grob *h, Music *m, SCM def) + { + head_ = h; + event_ = m; + tie_definition_ = def; + } }; - - -Tie_engraver::Tie_engraver() +class Tie_engraver : public Engraver { - req_l_ = 0; - tie_column_p_ = 0; -} + Music *event_; + Link_array now_heads_; + Array heads_to_tie_; + Link_array ties_; + Spanner *tie_column_; -bool -Tie_engraver::do_try_music (Music *m) +protected: + PRECOMPUTED_VIRTUAL void stop_translation_timestep (); + virtual void derived_mark () const; + PRECOMPUTED_VIRTUAL void start_translation_timestep (); + virtual void acknowledge_grob (Grob_info); + virtual bool try_music (Music *); + PRECOMPUTED_VIRTUAL void process_music (); + void typeset_tie (Grob *); +public: + TRANSLATOR_DECLARATIONS (Tie_engraver); +}; + +void +Tie_engraver::derived_mark () const { - if (Tie_req * c = dynamic_cast (m)) - { - 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; + Engraver::derived_mark (); + for (int i = 0; i < heads_to_tie_.size (); i++) + scm_gc_mark (heads_to_tie_[i].tie_definition_); } -void -Tie_engraver::set_melisma (bool m) +Tie_engraver::Tie_engraver () { - daddy_trans_l_->set_property ("tieMelismaBusy", m ? SCM_BOOL_T : SCM_BOOL_F); + event_ = 0; + tie_column_ = 0; } -void -Tie_engraver::acknowledge_element (Score_element_info i) +bool +Tie_engraver::try_music (Music *mus) { - if (Rhythmic_head *nh = dynamic_cast (i.elem_l_)) + if (mus->is_mus_type ("tie-event")) { - Note_req * m = dynamic_cast (i.req_l_); - if (!m) - return; - now_heads_.push (CHead_melodic_tuple (nh, m, now_mom()+ m->length_mom ())); + event_ = mus; } + + return true; } void -Tie_engraver::do_process_music () +Tie_engraver::process_music () { - if (req_l_) + if (event_) { - 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 ()); + context ()->set_property ("tieMelismaBusy", SCM_BOOL_T); } } void -Tie_engraver::process_acknowledged () +Tie_engraver::acknowledge_grob (Grob_info i) { - if (req_l_) + if (Note_head::has_interface (i.grob ())) { - 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 - = Musical_pitch::compare (now_heads_[i].req_l_->pitch_ , - stopped_heads_[j].req_l_->pitch_); - - if (comp) - { - (comp < 0) ? j -- : i--; - continue; - } - else + Grob *th = heads_to_tie_[i].head_; + 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_is_equal (right_mus->get_property ("pitch"), + left_mus->get_property ("pitch"))) { - 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--; + Grob *p = new Spanner (heads_to_tie_[i].tie_definition_, + context ()->get_grob_key ("Tie")); + announce_grob (p, heads_to_tie_[i].event_->self_scm ()); + Tie::set_interface (p); // cannot remove yet! + + Tie::set_head (p, LEFT, th); + Tie::set_head (p, RIGHT, h); + + ties_.push (p); + heads_to_tie_.del (i); } } - SCM basic = get_property ("basicTieProperties"); - SCM sparse = get_property ("sparseTies"); - if (to_boolean (sparse)) + if (ties_.size () && ! tie_column_) { - 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); - p->set_head (LEFT, dynamic_cast (unsmob_element (gh_car (pair)))); - p->set_head (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)) - { - Tie * p = new Tie (basic); - p->set_head (LEFT, dynamic_cast (unsmob_element (gh_caar (s)))); - p->set_head (RIGHT, dynamic_cast (unsmob_element (gh_cdar (s)))); - - tie_p_arr_.push (p); - announce_element (Score_element_info (p, req_l_)); + tie_column_ = make_spanner ("TieColumn", ties_[0]->self_scm ()); } - if (!tie_p_arr_.size ()) - { - req_l_->warning (_ ("No ties were created!")); - } - else if (tie_p_arr_.size () > 1 && !tie_column_p_) - { - tie_column_p_ = new Tie_column (get_property ("basicTieColumnProperties")); - for (int i = tie_p_arr_.size (); i--; ) - tie_column_p_->add_tie (tie_p_arr_ [i]); - announce_element (Score_element_info (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::do_pre_move_processing () +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 (); + if (!to_boolean (get_property ("tieWaitForNote"))) + { + heads_to_tie_.clear (); + } + + for (int i = 0; i < ties_.size (); i++) + { + typeset_tie (ties_[i]); + } - for (int i=0; i< tie_p_arr_.size (); i++) - { - typeset_element (tie_p_arr_[i]); + ties_.clear (); + tie_column_ = 0; } - tie_p_arr_.clear (); - if (tie_column_p_) + + if (event_) { - typeset_element (tie_column_p_); - tie_column_p_ =0; + SCM start_definition + = updated_grob_properties (context (), ly_symbol2scm ("Tie")); + + if (!to_boolean (get_property ("tieWaitForNote"))) + heads_to_tie_.clear (); + + for (int i = 0; i < now_heads_.size (); i++) + { + heads_to_tie_.push (Head_event_tuple (now_heads_[i], event_, + start_definition)); + } } + + event_ = 0; + now_heads_.clear (); } void -Tie_engraver::do_post_move_processing () +Tie_engraver::typeset_tie (Grob *her) { - SCM m = get_property ("automaticMelismata"); - if (to_boolean (m)) + 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 { - set_melisma (false); + if (!Tie::head (her, d)) + new_head_drul[d] = Tie::head (her, (Direction) - d); } - 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); + while (flip (&d) != LEFT); - -CHead_melodic_tuple::CHead_melodic_tuple () -{ - head_l_ =0; - req_l_ =0; - end_ = 0; + 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 ()); } -CHead_melodic_tuple::CHead_melodic_tuple (Rhythmic_head *h, Melodic_req*m, Moment mom) -{ - head_l_ = h; - req_l_ = m; - end_ = mom; -} +#include "translator.icc" -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 (); -} +ADD_TRANSLATOR (Tie_engraver, + /* descr */ "Generate ties between noteheads of equal pitch.", + /* creats*/ "Tie TieColumn", + /* accepts */ "tie-event", + /* acks */ "rhythmic-head-interface", + /* reads */ "tieMelismaBusy", + /* write */ "");