X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftie-engraver.cc;h=277a4206e29e920956436e3927c9820619819384;hb=983f5ae64247cd3c1017b31e810701b55691f3f3;hp=0948237b0e152886cb2bc16c6ed77e7d9d7215c5;hpb=f6e3a77381e8eb67aa01195ec3945bd978f86aa8;p=lilypond.git diff --git a/lily/tie-engraver.cc b/lily/tie-engraver.cc index 0948237b0e..277a4206e2 100644 --- a/lily/tie-engraver.cc +++ b/lily/tie-engraver.cc @@ -1,22 +1,81 @@ /* - ctie-engraver.cc -- implement Tie_engraver + tie-engraver.cc -- implement Tie_engraver source file of the GNU LilyPond music typesetter - (c) 1998--1999 Han-Wen Nienhuys + (c) 1998--2000 Han-Wen Nienhuys */ #include "tie-engraver.hh" #include "command-request.hh" -#include "note-head.hh" +#include "rhythmic-head.hh" #include "musical-request.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); +} + + +/** + Manufacture ties. Acknowledge noteheads, and put them into a + priority queue. If we have a Tie_req, connect the notes that finish + just at this time, and note that start at this time. + + TODO: junk the pq. + */ +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_; + + 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*); +public: + VIRTUAL_COPY_CONS(Translator); + Tie_engraver(); +}; + + Tie_engraver::Tie_engraver() { req_l_ = 0; + tie_column_p_ = 0; } @@ -25,8 +84,11 @@ Tie_engraver::do_try_music (Music *m) { if (Tie_req * c = dynamic_cast (m)) { + /* if (end_mom_ > now_mom ()) + return false; + */ req_l_ = c; - SCM m = get_property ("automaticMelismata",0); + SCM m = get_property ("automaticMelismata"); bool am = gh_boolean_p (m) &&gh_scm2bool (m); if (am) { @@ -40,34 +102,27 @@ Tie_engraver::do_try_music (Music *m) void Tie_engraver::set_melisma (bool m) { - Translator_group *where = daddy_trans_l_; - get_property ("tieMelismaBusy", &where); - if (!where) - where = daddy_trans_l_; - daddy_trans_l_->set_property ("tieMelismaBusy", m ? SCM_BOOL_T : SCM_BOOL_F); } void Tie_engraver::acknowledge_element (Score_element_info i) { - if (Note_head *nh = dynamic_cast (i.elem_l_)) + if (Rhythmic_head::has_interface (i.elem_l_)) { Note_req * m = dynamic_cast (i.req_l_); if (!m) return; - now_heads_.push (CHead_melodic_tuple (nh, m, now_mom()+ m->length_mom ())); + now_heads_.push (CHead_melodic_tuple (i.elem_l_, m, now_mom()+ m->length_mom ())); } } void -Tie_engraver::do_process_requests () +Tie_engraver::do_process_music () { if (req_l_) { Moment now = now_mom (); - Link_array nharr; - stopped_heads_.clear (); while (past_notes_pq_.size () && past_notes_pq_.front ().end_ == now) @@ -91,8 +146,8 @@ Tie_engraver::process_acknowledged () while (i >= 0 && j >=0) { int comp - = Musical_pitch::compare (now_heads_[i].req_l_->pitch_ , - stopped_heads_[j].req_l_->pitch_); + = Musical_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) { @@ -101,8 +156,8 @@ Tie_engraver::process_acknowledged () } else { - head_list = gh_cons (gh_cons (stopped_heads_[j].head_l_->self_scm_, - now_heads_[i].head_l_->self_scm_), + 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]); @@ -113,8 +168,8 @@ Tie_engraver::process_acknowledged () } } - - SCM sparse = get_property ("sparseTies", 0); + SCM basic = get_property ("Tie"); + SCM sparse = get_property ("sparseTies"); if (to_boolean (sparse)) { int i = scm_ilength (head_list); @@ -124,28 +179,37 @@ Tie_engraver::process_acknowledged () SCM pair = gh_list_ref (head_list, gh_int2scm (i/2)); - Tie * p = new Tie; - p->set_head (LEFT, dynamic_cast (unsmob_element (gh_car (pair)))); - p->set_head (RIGHT, dynamic_cast (unsmob_element (gh_cdr (pair)))); + Spanner * p = new Spanner (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_)); + announce_element (p, req_l_); } else for (SCM s = head_list; gh_pair_p (s); s = gh_cdr (s)) { - Tie * p = new Tie; - p->set_head (LEFT, dynamic_cast (unsmob_element (gh_caar (s)))); - p->set_head (RIGHT, dynamic_cast (unsmob_element (gh_cdar (s)))); + Score_element * p = new Spanner (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_)); + announce_element (p, req_l_); } if (!tie_p_arr_.size ()) { - req_l_->warning (_ ("No ties were created!")); + req_l_->origin ()->warning (_ ("No ties were created!")); + } + else 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_element (tie_column_p_, 0); } - } } @@ -161,15 +225,41 @@ Tie_engraver::do_pre_move_processing () for (int i=0; i< tie_p_arr_.size (); i++) { - typeset_element (tie_p_arr_[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) +{ + 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_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 () ); + + typeset_element (her); } void Tie_engraver::do_post_move_processing () { - SCM m = get_property ("automaticMelismata",0); + SCM m = get_property ("automaticMelismata"); if (to_boolean (m)) { set_melisma (false); @@ -190,7 +280,7 @@ CHead_melodic_tuple::CHead_melodic_tuple () end_ = 0; } -CHead_melodic_tuple::CHead_melodic_tuple (Note_head *h, Melodic_req*m, Moment mom) +CHead_melodic_tuple::CHead_melodic_tuple (Score_element *h, Melodic_req*m, Moment mom) { head_l_ = h; req_l_ = m; @@ -201,7 +291,10 @@ 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_); + SCM p1 = h1.req_l_->get_mus_property ("pitch"); + SCM p2 = h2.req_l_->get_mus_property ("pitch"); + + return Musical_pitch::equal_p (p1,p2) == SCM_BOOL_T; } int