X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftie-engraver.cc;h=d96acb32e973073f031dcc68ed025732e178a6cd;hb=f74c28fe4a8a1a8b7bf4cf97f5df763ad35c590c;hp=26275ce12ba26fac5017de4b83b0570b54e80014;hpb=8aad615ea7bb31f49a0c2afc21eea5ff5de20437;p=lilypond.git diff --git a/lily/tie-engraver.cc b/lily/tie-engraver.cc index 26275ce12b..d96acb32e9 100644 --- a/lily/tie-engraver.cc +++ b/lily/tie-engraver.cc @@ -1,93 +1,206 @@ /* - 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--2001 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" -Tie_engraver::Tie_engraver() +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); +} + + +/** + 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; the PQ is overkill if we assume that no + different durations occur in parallel. +*/ +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 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*); +public: + VIRTUAL_COPY_CONS (Translator); + Tie_engraver (); +}; + + + +Tie_engraver::Tie_engraver () { req_l_ = 0; + tie_column_p_ = 0; } bool -Tie_engraver::do_try_music (Music *m) +Tie_engraver::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"); + bool am = gh_boolean_p (m) &&gh_scm2bool (m); + if (am) + { + set_melisma (true); + } return true; } return false; } void -Tie_engraver::acknowledge_element (Score_element_info i) +Tie_engraver::set_melisma (bool m) { - if (Note_head *nh = dynamic_cast (i.elem_l_)) - { - Note_req * m = dynamic_cast (i.req_l_); - now_heads_.push (CHead_melodic_tuple (nh, m, now_mom()+ m->length_mom ())); - } + daddy_trans_l_->set_property ("tieMelismaBusy", m ? SCM_BOOL_T : SCM_BOOL_F); } void -Tie_engraver::do_process_requests () +Tie_engraver::acknowledge_grob (Grob_info i) { - if (req_l_) + if (Rhythmic_head::has_interface (i.elem_l_)) { - 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 ()); - + 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::process_acknowledged () +Tie_engraver::create_grobs () { if (req_l_) { - if (now_heads_.size () != stopped_heads_.size ()) - { - req_l_->warning ("Unequal number of note heads for tie"); - } - int sz = now_heads_.size () tie_p_arr_.size ()) + while (i >= 0 && j >=0) { - now_heads_.sort (CHead_melodic_tuple::pitch_compare); - stopped_heads_.sort(CHead_melodic_tuple::pitch_compare); + 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"))); - for (int i=0; i < sz; i++) + if (comp) + { + (comp < 0) ? j -- : i--; + continue; + } + else { - Tie * p = new Tie; - p->set_head (LEFT, stopped_heads_[i].head_l_); - p->set_head (RIGHT, now_heads_[i].head_l_); - tie_p_arr_.push (p); - announce_element (Score_element_info (p, req_l_)); + 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; + + SCM pair = scm_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 (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_); + } + 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 (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); + } } } + void -Tie_engraver::do_pre_move_processing () +Tie_engraver::stop_translation_timestep () { for (int i=0; i < now_heads_.size (); i++) { @@ -95,59 +208,107 @@ Tie_engraver::do_pre_move_processing () } now_heads_.clear (); - Scalar dir (get_property ("tieydirection", 0)); - Scalar dir2 (get_property ("ydirection", 0)); - - Direction tie_dir = CENTER; - if (dir.length_i () && dir.isnum_b ()) - tie_dir = (Direction) sign (int(dir)); - else if (dir2.length_i () && dir2.isnum_b ()) - tie_dir = (Direction) sign (int (dir2)); + /* + 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!")); + } +#endif for (int i=0; i< tie_p_arr_.size (); i++) { - tie_p_arr_[i]->dir_ = tie_dir; - typeset_element (tie_p_arr_[i]); + typeset_tie (tie_p_arr_[i]); } tie_p_arr_.clear (); + if (tie_column_p_) + { + typeset_grob (tie_column_p_); + tie_column_p_ =0; + } } void -Tie_engraver::do_post_move_processing () +Tie_engraver::typeset_tie (Grob *her) { - req_l_ =0; + 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)) + { + 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 ()); + } -ADD_THIS_TRANSLATOR(Tie_engraver); +ADD_THIS_TRANSLATOR (Tie_engraver); CHead_melodic_tuple::CHead_melodic_tuple () { head_l_ =0; - mel_l_ =0; + req_l_ =0; end_ = 0; } -CHead_melodic_tuple::CHead_melodic_tuple (Note_head *h, Melodic_req*m, Moment mom) +CHead_melodic_tuple::CHead_melodic_tuple (Grob *h, Melodic_req*m, Moment mom) { head_l_ = h; - mel_l_ = m; + 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) + CHead_melodic_tuple const &h2) { - return (h1.end_ - h2.end_ ).sign (); + return Moment::compare(h1.end_, h2.end_); }