X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftie-engraver.cc;h=2e9ce6c1969920f79a726b4982ab011e3ab45182;hb=32cdc3e2bc738e82c0965bdc5d8d99830e929092;hp=c1a145184ccc7bdfa8da6c87bcfba4b8a6e72e60;hpb=e540311d3f5799216c91d203080f63b65cccde07;p=lilypond.git diff --git a/lily/tie-engraver.cc b/lily/tie-engraver.cc index c1a145184c..2e9ce6c196 100644 --- a/lily/tie-engraver.cc +++ b/lily/tie-engraver.cc @@ -1,16 +1,14 @@ -/* - new-tie-engraver.cc -- implement Tie_engraver - +/* + tie-engraver.cc -- implement Tie_engraver + source file of the GNU LilyPond music typesetter - - (c) 1998--2004 Han-Wen Nienhuys - - */ -#include "event.hh" + (c) 1998--2005 Han-Wen Nienhuys +*/ + #include "tie.hh" #include "context.hh" - +#include "protected-scm.hh" #include "spanner.hh" #include "tie-column.hh" #include "engraver.hh" @@ -28,37 +26,58 @@ 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). */ + +struct Head_event_tuple +{ + 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_; - Music *last_event_; Link_array now_heads_; - Link_array heads_to_tie_; + Array heads_to_tie_; Link_array ties_; - - Spanner * tie_column_; - + + Spanner *tie_column_; + protected: virtual void stop_translation_timestep (); + virtual void derived_mark () const; virtual void start_translation_timestep (); virtual void acknowledge_grob (Grob_info); - virtual bool try_music (Music*); + virtual bool try_music (Music *); virtual void process_music (); - void typeset_tie (Grob*); + void typeset_tie (Grob *); public: 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 () { event_ = 0; - last_event_ = 0; tie_column_ = 0; } - bool Tie_engraver::try_music (Music *mus) { @@ -66,7 +85,7 @@ Tie_engraver::try_music (Music *mus) { event_ = mus; } - + return true; } @@ -74,48 +93,52 @@ void Tie_engraver::process_music () { if (event_) - context ()->set_property ("tieMelismaBusy", SCM_BOOL_T); + { + context ()->set_property ("tieMelismaBusy", SCM_BOOL_T); + } } void Tie_engraver::acknowledge_grob (Grob_info i) { - if (Note_head::has_interface (i.grob_)) + if (Note_head::has_interface (i.grob ())) { - Grob * h = i.grob_; + Grob *h = i.grob (); now_heads_.push (h); - for (int i = heads_to_tie_.size (); i--;) + for (int i = heads_to_tie_.size (); i--;) { - Grob *th = heads_to_tie_[i]; - Music * right_mus = unsmob_music (h->get_property ("cause")); - Music * left_mus = unsmob_music (th->get_property ("cause")); + 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_c_equal_p (right_mus->get_property ("pitch"), - left_mus->get_property ("pitch"))) + left_mus->get_property ("pitch"))) { - Grob * p = make_spanner ("Tie", last_event_->self_scm ()); + 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", SCM_EOL); - + 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]); + Tie_column::add_tie (tie_column_, ties_[i]); } } @@ -123,8 +146,7 @@ void Tie_engraver::start_translation_timestep () { context ()->set_property ("tieMelismaBusy", - ly_bool2scm (heads_to_tie_.size ())); - + ly_bool2scm (heads_to_tie_.size ())); } void @@ -132,26 +154,35 @@ Tie_engraver::stop_translation_timestep () { if (ties_.size ()) { - heads_to_tie_.clear (); - for (int i=0; i< ties_.size (); i++) + if (!to_boolean (get_property ("tieWaitForNote"))) { - typeset_tie (ties_[i]); + heads_to_tie_.clear (); } - ties_.clear (); - last_event_ = 0; - if (tie_column_) + for (int i = 0; i < ties_.size (); i++) { - typeset_grob (tie_column_); - tie_column_ =0; + typeset_tie (ties_[i]); } + + ties_.clear (); + tie_column_ = 0; } - + if (event_) { - heads_to_tie_ = now_heads_; - last_event_ = event_; + SCM start_definition + = updated_grob_properties (context (), ly_symbol2scm ("Tie")); + + 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)); + } } + event_ = 0; now_heads_.clear (); } @@ -159,29 +190,28 @@ Tie_engraver::stop_translation_timestep () 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); + 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_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 ()); - - typeset_grob (her); } - -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 */ ""); +ADD_TRANSLATOR (Tie_engraver, + /* descr */ "Generate ties between noteheads of equal pitch.", + /* creats*/ "Tie TieColumn", + /* accepts */ "tie-event", + /* acks */ "rhythmic-head-interface", + /* reads */ "tieMelismaBusy", + /* write */ "");