X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftie-engraver.cc;h=7d2b83d82c4ef5aab50359e6a1c2269981c29951;hb=14d0e70efc16bfb71c1a235e22b43262942f1674;hp=16abacdeeca0b92d8cccb7dca54d5841c60612b7;hpb=718c54f4d35bfae090b6d6c938742cac518927b2;p=lilypond.git diff --git a/lily/tie-engraver.cc b/lily/tie-engraver.cc index 16abacdeec..7d2b83d82c 100644 --- a/lily/tie-engraver.cc +++ b/lily/tie-engraver.cc @@ -1,16 +1,17 @@ /* - tie-engraver.cc -- implement Tie_engraver + new-tie-engraver.cc -- implement Tie_engraver source file of the GNU LilyPond music typesetter - (c) 1998--2002 Han-Wen Nienhuys + (c) 1998--2004 Han-Wen Nienhuys */ -#include "command-request.hh" -#include "musical-request.hh" +#include "event.hh" #include "tie.hh" -#include "translator-group.hh" +#include "context.hh" + +#include "protected-scm.hh" #include "spanner.hh" #include "tie-column.hh" #include "engraver.hh" @@ -18,195 +19,143 @@ #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). */ 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_; + Protected_scm tie_start_definition_; - void set_melisma (bool); + Spanner * tie_column_; 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_music (); void typeset_tie (Grob*); public: - TRANSLATOR_DECLARATIONS(Tie_engraver); + TRANSLATOR_DECLARATIONS (Tie_engraver); }; 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; -} - -void -Tie_engraver::set_melisma (bool m) -{ - daddy_trans_l_->set_property ("tieMelismaBusy", m ? SCM_BOOL_T : SCM_BOOL_F); + + return true; } void -Tie_engraver::acknowledge_grob (Grob_info i) +Tie_engraver::process_music () { - if (Note_head::has_interface (i.grob_l_)) + if (event_) { - now_heads_.push (i.grob_l_); + context ()->set_property ("tieMelismaBusy", SCM_BOOL_T); } } -int -head_pitch_compare (Grob *const&a,Grob *const&b) -{ - Music *m1 =unsmob_music (a->get_grob_property ("cause")); - Music *m2 =unsmob_music (b->get_grob_property ("cause")); - - return Pitch::compare (* unsmob_pitch (m1->get_mus_property ("pitch")), - * unsmob_pitch (m2->get_mus_property ("pitch"))); -} - void -Tie_engraver::create_grobs () +Tie_engraver::acknowledge_grob (Grob_info i) { - if (req_l_) + if (Note_head::has_interface (i.grob_)) { - now_heads_.sort (&head_pitch_compare); - /* - We could sort stopped_heads_ as well (and use a linear alg. in - stead of nested loop), but we'd have to use a stable sorting - algorithm, since the ordering of the stopped heads (of the - same pitch) is relevant. - */ - - SCM head_list = SCM_EOL; - - for (int i = now_heads_.size(); i--;) + Grob * h = i.grob_; + now_heads_.push (h); + for (int i = heads_to_tie_.size (); i--;) { - for (int j = stopped_heads_.size(); j--;) + Grob *th = heads_to_tie_[i]; + 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_c_equal_p (right_mus->get_property ("pitch"), + left_mus->get_property ("pitch"))) { - int comp - = head_pitch_compare (now_heads_[i], stopped_heads_[j]); - - if (!comp) - { - 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); - break ; - } - } - } - - SCM basic = get_property ("Tie"); - SCM sparse = get_property ("sparseTies"); - if (to_boolean (sparse)) - { - int i = scm_ilength (head_list); - - if (!i) - return; + Grob * p = new Spanner (tie_start_definition_); + announce_grob (p, last_event_->self_scm ()); + Tie::set_interface (p); // cannot remove yet! - SCM pair = scm_list_ref (head_list, gh_int2scm (i/2)); - - Spanner * p = new Spanner (basic); - - Tie::set_interface (p); // cannot remove. - 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::set_head (p, LEFT, th); + Tie::set_head (p, RIGHT, h); - tie_p_arr_.push (p); - announce_grob(p, req_l_->self_scm()); + ties_.push (p); + } } - else for (SCM s = head_list; gh_pair_p (s); s = ly_cdr (s)) + + if (ties_.size () && ! tie_column_) { - Grob * p = new Spanner (basic); - Tie::set_interface (p); // cannot remove yet! + tie_column_ = make_spanner ("TieColumn", SCM_EOL); - 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_->self_scm()); } - if (tie_p_arr_.size () > 1 && !tie_column_p_) - { - tie_column_p_ = new Spanner (get_property ("TieColumn")); - - for (int i = tie_p_arr_.size (); i--;) - Tie_column::add_tie (tie_column_p_,tie_p_arr_ [i]); - announce_grob(tie_column_p_, SCM_EOL); - } + 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::stop_translation_timestep () { - req_l_ = 0; - - now_heads_.clear (); + if (ties_.size ()) + { + heads_to_tie_.clear (); + for (int i=0; i< ties_.size (); i++) + { + typeset_tie (ties_[i]); + } - /* - 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]); + ties_.clear (); + last_event_ = 0; + tie_column_ =0; } - tie_p_arr_.clear (); - if (tie_column_p_) + + if (event_) { - typeset_grob (tie_column_p_); - tie_column_p_ =0; + tie_start_definition_ = updated_grob_properties (context (), ly_symbol2scm ("Tie")); + heads_to_tie_ = now_heads_; + last_event_ = event_; } + event_ = 0; + now_heads_.clear (); } void @@ -224,63 +173,16 @@ Tie_engraver::typeset_tie (Grob *her) 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); - } - - 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); - } - - - /* - - The list starts with entries that start earlier. By going through - it, we reverse the order, where as we'd like to use the `last' - heads first. - - This makes a difference for grace notes. If we have - - c4 \grace c8 ~ c4 - - Then busyGrobs will have ((1/4 . gc8) (1/4 . c4)). + 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 ()); - We want stopped_heads_ to contain (c4 gc8), because we start with - it at the top. - */ - stopped_heads_.reverse(); } -ENTER_DESCRIPTION(Tie_engraver, +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 */ "");