X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftie-engraver.cc;h=5710202b95469fba2e0e7d031f203e6327cc1eea;hb=811be522d0b79493159f47789e5621dc85493495;hp=eb9caa579174b27642af4f7b43777b5b9c029a3b;hpb=f1f05196a6b5048718405a0810868c145bceef29;p=lilypond.git diff --git a/lily/tie-engraver.cc b/lily/tie-engraver.cc index eb9caa5791..5710202b95 100644 --- a/lily/tie-engraver.cc +++ b/lily/tie-engraver.cc @@ -1,16 +1,14 @@ -/* - tie-engraver.cc -- implement Tie_engraver - +/* + tie-engraver.cc -- implement Tie_engraver + source file of the GNU LilyPond music typesetter - - (c) 1998--2002 Han-Wen Nienhuys - - */ + (c) 1998--2005 Han-Wen Nienhuys +*/ -#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,6 +16,7 @@ #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 @@ -26,36 +25,52 @@ 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). - - New tie event happens at the time of the first note, the */ -class Tie_engraver : public Engraver + +struct Head_event_tuple { - Moment end_mom_; - Moment next_end_mom_; + Grob *head_; + SCM tie_definition_; + Music *event_; + Head_event_tuple () + { + } + Head_event_tuple (Grob *h, Music *m, SCM def) + { + head_ = h; + event_ = m; + tie_definition_ = def; + } +}; +class Tie_engraver : public Engraver +{ Music *event_; - Link_array now_heads_; - Link_array stopped_heads_; + Array heads_to_tie_; Link_array ties_; - Spanner * tie_column_; - - void set_melisma (bool); - + Spanner *tie_column_; + protected: - virtual void start_translation_timestep (); - virtual void stop_translation_timestep (); - virtual void acknowledge_grob (Grob_info); - virtual bool try_music (Music*); - virtual void process_acknowledged_grobs (); - void typeset_tie (Grob*); + void stop_translation_timestep (); + virtual void derived_mark () const; + void start_translation_timestep (); + DECLARE_ACKNOWLEDGER (note_head); + virtual bool try_music (Music *); + void process_music (); + void typeset_tie (Grob *); public: - TRANSLATOR_DECLARATIONS(Tie_engraver); + TRANSLATOR_DECLARATIONS (Tie_engraver); }; - +void +Tie_engraver::derived_mark () const +{ + Engraver::derived_mark (); + for (int i = 0; i < heads_to_tie_.size (); i++) + scm_gc_mark (heads_to_tie_[i].tie_definition_); +} Tie_engraver::Tie_engraver () { @@ -63,228 +78,138 @@ Tie_engraver::Tie_engraver () tie_column_ = 0; } - bool Tie_engraver::try_music (Music *mus) { - if(mus->is_mus_type( "tie-event")) + if (mus->is_mus_type ("tie-event")) { event_ = mus; } - if (event_) - { - SCM m = get_property ("automaticMelismata"); - bool am = gh_boolean_p (m) &&gh_scm2bool (m); - if (am) - { - set_melisma (true); - } - } return true; } void -Tie_engraver::set_melisma (bool m) +Tie_engraver::process_music () { - daddy_trans_->set_property ("tieMelismaBusy", m ? SCM_BOOL_T : SCM_BOOL_F); + if (event_) + { + context ()->set_property ("tieMelismaBusy", SCM_BOOL_T); + } } void -Tie_engraver::acknowledge_grob (Grob_info i) +Tie_engraver::acknowledge_note_head (Grob_info i) { - if (Note_head::has_interface (i.grob_)) + Grob *h = i.grob (); + now_heads_.push (h); + for (int i = heads_to_tie_.size (); i--;) { - now_heads_.push (i.grob_); + Grob *th = heads_to_tie_[i].head_; + 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_is_equal (right_mus->get_property ("pitch"), + left_mus->get_property ("pitch"))) + { + Grob *p = new Spanner (heads_to_tie_[i].tie_definition_, + context ()->get_grob_key ("Tie")); + announce_grob (p, heads_to_tie_[i].event_->self_scm ()); + Tie::set_interface (p); // cannot remove yet! + + Tie::set_head (p, LEFT, th); + Tie::set_head (p, RIGHT, h); + + ties_.push (p); + heads_to_tie_.del (i); + } } + + if (ties_.size () && ! tie_column_) + { + tie_column_ = make_spanner ("TieColumn", ties_[0]->self_scm ()); + } + + if (tie_column_) + for (int i = ties_.size (); i--;) + Tie_column::add_tie (tie_column_, ties_[i]); } -int -head_pitch_compare (Grob *const&a,Grob *const&b) +void +Tie_engraver::start_translation_timestep () { - 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"))); + context ()->set_property ("tieMelismaBusy", + ly_bool2scm (heads_to_tie_.size ())); } void -Tie_engraver::process_acknowledged_grobs () +Tie_engraver::stop_translation_timestep () { - if (event_) + if (ties_.size ()) { - 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--;) + if (!to_boolean (get_property ("tieWaitForNote"))) { - for (int j = stopped_heads_.size(); j--;) - { - 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 ; - } - } + heads_to_tie_.clear (); } - - 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); // 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)))); - - ties_.push (p); - announce_grob(p, event_->self_scm()); - } - else for (SCM s = head_list; gh_pair_p (s); s = ly_cdr (s)) + + for (int i = 0; i < ties_.size (); i++) { - Grob * p = new Spanner (basic); - Tie::set_interface (p); // cannot remove yet! - - Tie::set_head (p, LEFT, dynamic_cast (unsmob_grob (ly_caar (s)))); - Tie::set_head (p, RIGHT, dynamic_cast (unsmob_grob (ly_cdar (s)))); - - ties_.push (p); - announce_grob(p, event_->self_scm()); + typeset_tie (ties_[i]); } - if (ties_.size () > 1 && !tie_column_) - { - tie_column_ = new Spanner (get_property ("TieColumn")); + ties_.clear (); + tie_column_ = 0; + } + + if (event_) + { + SCM start_definition + = updated_grob_properties (context (), ly_symbol2scm ("Tie")); - for (int i = ties_.size (); i--;) - Tie_column::add_tie (tie_column_,ties_ [i]); - announce_grob(tie_column_, SCM_EOL); + if (!to_boolean (get_property ("tieWaitForNote"))) + heads_to_tie_.clear (); + + for (int i = 0; i < now_heads_.size (); i++) + { + heads_to_tie_.push (Head_event_tuple (now_heads_[i], event_, + start_definition)); } } -} - -void -Tie_engraver::stop_translation_timestep () -{ event_ = 0; now_heads_.clear (); - - /* - we don't warn for no ties, since this happens naturally when you - use skipTypesetting. */ - - for (int i=0; i< ties_.size (); i++) - { - typeset_tie (ties_[i]); - } - ties_.clear (); - if (tie_column_) - { - typeset_grob (tie_column_); - tie_column_ =0; - } } void Tie_engraver::typeset_tie (Grob *her) { - if (! (Tie::head (her,LEFT) && Tie::head (her,RIGHT))) + 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)) + new_head_drul[LEFT] = Tie::head (her, LEFT); + new_head_drul[RIGHT] = Tie::head (her, RIGHT); + do { - set_melisma (false); + if (!Tie::head (her, d)) + new_head_drul[d] = Tie::head (her, (Direction) - d); } + while (flip (&d) != LEFT); - 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)). - - We want stopped_heads_ to contain (c4 gc8), because we start with - it at the top. - */ - stopped_heads_.reverse(); - - event_ = 0; + 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 ()); } - -ENTER_DESCRIPTION(Tie_engraver, -/* descr */ "Generate ties between noteheads of equal pitch.", -/* creats*/ "Tie TieColumn", -/* accepts */ "tie-event", -/* acks */ "rhythmic-head-interface", -/* reads */ "sparseTies tieMelismaBusy", -/* write */ ""); +#include "translator.icc" +ADD_ACKNOWLEDGER (Tie_engraver, note_head); +ADD_TRANSLATOR (Tie_engraver, + /* descr */ "Generate ties between noteheads of equal pitch.", + /* creats*/ "Tie TieColumn", + /* accepts */ "tie-event", + /* reads */ "tieMelismaBusy", + /* write */ "");