X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftie-engraver.cc;h=f44e8b3b0d80a03d55bd7e37fbd29792c921e6db;hb=26633bbfbf821a7cfdfe7a0367d1ea94a440be2e;hp=1b544269a252d24f258d4f4961e26cf416a10ec7;hpb=25c92bfff1189d93b80cdef0da0d570d14834c8d;p=lilypond.git diff --git a/lily/tie-engraver.cc b/lily/tie-engraver.cc index 1b544269a2..f44e8b3b0d 100644 --- a/lily/tie-engraver.cc +++ b/lily/tie-engraver.cc @@ -1,154 +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--1999 Han-Wen Nienhuys + (c) 1998--2003 Han-Wen Nienhuys */ -#include "tie-engraver.hh" -#include "command-request.hh" -#include "note-head.hh" -#include "musical-request.hh" +#include "event.hh" #include "tie.hh" +#include "translator-group.hh" +#include "spanner.hh" +#include "tie-column.hh" +#include "engraver.hh" +#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 TieEvent, connect the notes that finish + just at this time, and note that start at this time. + + 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 } > -Tie_engraver::Tie_engraver() + melisma is after the 2nd 8th note, but will now be signaled as + lasting till the 3rd 16th. +*/ +class Tie_engraver : public Engraver { - req_l_ = 0; + Music *event_; + Music *last_event_; + Link_array now_heads_; + Link_array heads_to_tie_; + Link_array ties_; + + Spanner * tie_column_; + + +protected: + 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: + TRANSLATOR_DECLARATIONS(Tie_engraver); +}; + + + +Tie_engraver::Tie_engraver () +{ + 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; - return true; + event_ = mus; } - return false; + + return true; } void -Tie_engraver::acknowledge_element (Score_element_info i) +Tie_engraver::acknowledge_grob (Grob_info i) { - if (Note_head *nh = dynamic_cast (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 (nh, m, now_mom()+ m->length_mom ())); + 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::do_process_requests () +Tie_engraver::process_acknowledged_grobs () { - if (req_l_) + if (ties_.size () > 1 && !tie_column_) { - Moment now = now_mom (); - Link_array nharr; + tie_column_ = new Spanner (get_property ("TieColumn")); - stopped_heads_.clear (); - while (past_notes_pq_.size () - && past_notes_pq_.front ().end_ == now) - stopped_heads_.push (past_notes_pq_.get ()); + for (int i = ties_.size (); i--;) + Tie_column::add_tie (tie_column_,ties_ [i]); + + announce_grob(tie_column_, SCM_EOL); } } void -Tie_engraver::process_acknowledged () +Tie_engraver::start_translation_timestep () +{ + if (to_boolean (get_property ("automaticMelismata"))) + daddy_trans_->set_property ("tieMelismaBusy", + gh_bool2scm (heads_to_tie_.size ())); + +} + +void +Tie_engraver::stop_translation_timestep () { - if (req_l_) + if (ties_.size ()) { - if (now_heads_.size () != stopped_heads_.size ()) + heads_to_tie_.clear (); + for (int i=0; i< ties_.size (); i++) { - req_l_->warning ("Unequal number of note heads for tie"); + typeset_tie (ties_[i]); } - int sz = now_heads_.size () tie_p_arr_.size ()) + ties_.clear(); + last_event_ = 0; + if (tie_column_) { - now_heads_.sort (CHead_melodic_tuple::pitch_compare); - stopped_heads_.sort(CHead_melodic_tuple::pitch_compare); - - for (int i=0; i < sz; i++) - { - 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_)); - } + 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 (); - - 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)); - - for (int i=0; i< tie_p_arr_.size (); i++) - { - tie_p_arr_[i]->dir_ = tie_dir; - typeset_element (tie_p_arr_[i]); - } - tie_p_arr_.clear (); } void -Tie_engraver::do_post_move_processing () +Tie_engraver::typeset_tie (Grob *her) { - req_l_ =0; - Moment now = now_mom (); - while (past_notes_pq_.size () && past_notes_pq_.front ().end_ < now) - past_notes_pq_.delmin (); + 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); } -ADD_THIS_TRANSLATOR(Tie_engraver); - -CHead_melodic_tuple::CHead_melodic_tuple () -{ - head_l_ =0; - mel_l_ =0; - end_ = 0; -} - -CHead_melodic_tuple::CHead_melodic_tuple (Note_head *h, Melodic_req*m, Moment mom) -{ - head_l_ = h; - mel_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.mel_l_, *h2.mel_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 */ "");