X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftie-engraver.cc;h=f44e8b3b0d80a03d55bd7e37fbd29792c921e6db;hb=26633bbfbf821a7cfdfe7a0367d1ea94a440be2e;hp=b725b64a4b010b9aa2a2f2d5cf3003027ea475a3;hpb=8dbb0048c1ac59125562d5adc1c68512eab8541b;p=lilypond.git diff --git a/lily/tie-engraver.cc b/lily/tie-engraver.cc index b725b64a4b..f44e8b3b0d 100644 --- a/lily/tie-engraver.cc +++ b/lily/tie-engraver.cc @@ -1,14 +1,13 @@ /* - 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--2003 Han-Wen Nienhuys */ -#include "command-request.hh" -#include "musical-request.hh" +#include "event.hh" #include "tie.hh" #include "translator-group.hh" #include "spanner.hh" @@ -16,44 +15,45 @@ #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 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: Remove the dependency on musical info. We should tie on the - basis of position and duration-log of the heads (not of the reqs). + basis of position and duration-log of the heads (not of the events). + TODO: support sparseTies. - TODO: figure this out: currently, this engravers ties note heads - that have the same Y-position (and does not look at pitch). This - means that we will fuck up with a clef-change. How should - clef-changes during ties be handled, or should they not? + TODO: melismata will fuck up now: - + < { c8 ~ c8 } + { c16 c c c } > + + melisma is after the 2nd 8th note, but will now be signaled as + lasting till the 3rd 16th. */ class Tie_engraver : public Engraver { - Moment end_mom_; - Moment next_end_mom_; - - Tie_req *req_l_; + Music *event_; + Music *last_event_; Link_array now_heads_; - Link_array stopped_heads_; - Link_array tie_p_arr_; - - Spanner * tie_column_p_; + Link_array heads_to_tie_; + Link_array ties_; + + Spanner * tie_column_; - void set_melisma (bool); 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_acknowledged_grobs (); void typeset_tie (Grob*); public: TRANSLATOR_DECLARATIONS(Tie_engraver); @@ -63,154 +63,106 @@ public: 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::acknowledge_grob (Grob_info i) { - daddy_trans_l_->set_property ("tieMelismaBusy", m ? SCM_BOOL_T : SCM_BOOL_F); + if (Note_head::has_interface (i.grob_)) + { + 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::acknowledge_grob (Grob_info i) +Tie_engraver::process_acknowledged_grobs () { - if (Note_head::has_interface (i.grob_l_)) + if (ties_.size () > 1 && !tie_column_) { - now_heads_.push (i.grob_l_); + tie_column_ = new Spanner (get_property ("TieColumn")); + + for (int i = ties_.size (); i--;) + Tie_column::add_tie (tie_column_,ties_ [i]); + + announce_grob(tie_column_, SCM_EOL); } } -int -head_position_compare (Grob *const&a,Grob *const&b) +void +Tie_engraver::start_translation_timestep () { - return sign (gh_scm2double (a->get_grob_property ("staff-position")) - - gh_scm2double (b->get_grob_property ("staff-position"))); + if (to_boolean (get_property ("automaticMelismata"))) + daddy_trans_->set_property ("tieMelismaBusy", + gh_bool2scm (heads_to_tie_.size ())); + } void -Tie_engraver::create_grobs () +Tie_engraver::stop_translation_timestep () { - if (req_l_) + if (ties_.size ()) { - now_heads_.sort (&head_position_compare); - stopped_heads_.sort (&head_position_compare); - - SCM head_list = SCM_EOL; - - int j = stopped_heads_.size ()-1; - int i = now_heads_.size ()-1; - - while (i >= 0 && j >=0) + heads_to_tie_.clear (); + for (int i=0; i< ties_.size (); i++) { - int comp - = head_position_compare (now_heads_[i], stopped_heads_[j]); - - if (comp) - { - (comp < 0) ? j -- : i--; - continue; - } - else - { - head_list = gh_cons (gh_cons (stopped_heads_[j]->self_scm (), - now_heads_[i]->self_scm ()), - head_list); - - now_heads_.del (i); - stopped_heads_.del (j); - i--; - j--; - } + typeset_tie (ties_[i]); } - SCM basic = get_property ("Tie"); - SCM sparse = get_property ("sparseTies"); - if (to_boolean (sparse)) + ties_.clear(); + last_event_ = 0; + if (tie_column_) { - 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 (ly_caar (s)))); - Tie::set_head (p, RIGHT, dynamic_cast (unsmob_grob (ly_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); + typeset_grob (tie_column_); + tie_column_ =0; } } -} - - -void -Tie_engraver::stop_translation_timestep () -{ - req_l_ = 0; - - now_heads_.clear (); - - /* - we don't warn for no ties, since this happens naturally when you - use skipTypesetting. */ - 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 @@ -234,39 +186,11 @@ Tie_engraver::typeset_tie (Grob *her) typeset_grob (her); } -void -Tie_engraver::start_translation_timestep () -{ - SCM m = get_property ("automaticMelismata"); - if (to_boolean (m)) - { - set_melisma (false); - } - - SCM grobs = get_property ("busyGrobs"); - Moment now = now_mom(); - stopped_heads_.clear (); - - for (; gh_pair_p (grobs); grobs = gh_cdr (grobs)) - { - Grob * grob = unsmob_grob (gh_cdar (grobs)); - Moment end =*unsmob_moment (gh_caar (grobs)); - - /* - This is slightly ugh: we are now confunding the frontend - (iterators) and the backend (note heads) */ - if (end > now) - break; - else if (end == now - && Note_head::has_interface (grob)) - stopped_heads_.push (grob); - } -} - ENTER_DESCRIPTION(Tie_engraver, /* descr */ "Generate ties between noteheads of equal pitch.", /* creats*/ "Tie TieColumn", -/* acks */ "rhythmic-head-interface", -/* reads */ "sparseTies tieMelismaBusy", +/* accepts */ "tie-event", +/* acks */ "rhythmic-head-interface", +/* reads */ "tieMelismaBusy", /* write */ "");