X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftie-engraver.cc;h=9ec95d91a14a8e49446c4ef5dde2e8627949a481;hb=9f4d4a1ce5dc0fad4ed27c9cc1e357cae090b1b1;hp=6cfc5b6457a3bdcf2662a3be0e7d728f278b6483;hpb=5d09d767066abb2f2d53cd18cf0c0a0b1188d1a7;p=lilypond.git diff --git a/lily/tie-engraver.cc b/lily/tie-engraver.cc index 6cfc5b6457..9ec95d91a1 100644 --- a/lily/tie-engraver.cc +++ b/lily/tie-engraver.cc @@ -1,25 +1,24 @@ -/* - 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" -#include "tie.hh" -#include "context.hh" + (c) 1998--2006 Han-Wen Nienhuys +*/ -#include "protected-scm.hh" -#include "spanner.hh" -#include "tie-column.hh" #include "engraver.hh" -#include "item.hh" + +#include "context.hh" #include "grob-pitch-tuple.hh" -#include "warn.hh" +#include "international.hh" +#include "item.hh" #include "note-head.hh" +#include "protected-scm.hh" +#include "spanner.hh" #include "staff-symbol-referencer.hh" +#include "tie-column.hh" +#include "tie.hh" +#include "warn.hh" /** Manufacture ties. Acknowledge noteheads, and put them into a @@ -29,54 +28,64 @@ 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_; + std::vector heads_to_tie_; Link_array ties_; - SCM tie_start_definition_; - - Spanner * tie_column_; - + + Spanner *tie_column_; + protected: - virtual void stop_translation_timestep (); + 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 void process_music (); - void typeset_tie (Grob*); + 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); }; - +void +Tie_engraver::derived_mark () const +{ + Engraver::derived_mark (); + for (vsize 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; - tie_start_definition_ = SCM_EOL; } -void -Tie_engraver::derived_mark () const -{ - scm_gc_mark (tie_start_definition_); -} - - bool Tie_engraver::try_music (Music *mus) { if (mus->is_mus_type ("tie-event")) - { - event_ = mus; - } - + event_ = mus; + return true; } @@ -84,60 +93,51 @@ 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) +Tie_engraver::acknowledge_note_head (Grob_info i) { - if (Note_head::has_interface (i.grob_)) + Grob *h = i.grob (); + now_heads_.push_back (h); + for (vsize i = heads_to_tie_.size (); i--;) { - Grob * h = i.grob_; - now_heads_.push (h); - for (int i = heads_to_tie_.size (); i--;) + 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 *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"))) - { - Grob * p = new Spanner (tie_start_definition_, context()->get_grob_key ("Tie")); - announce_grob (p, last_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); - } + 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_head (p, LEFT, th); + Tie::set_head (p, RIGHT, h); + + ties_.push_back (p); + heads_to_tie_.erase (heads_to_tie_.begin () + i); } + } - if (ties_.size () && ! tie_column_) - { - tie_column_ = make_spanner ("TieColumn", SCM_EOL); - - } + 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]); - } + if (tie_column_) + for (vsize 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 ())); - + ly_bool2scm (heads_to_tie_.size ())); } void @@ -145,23 +145,31 @@ Tie_engraver::stop_translation_timestep () { if (ties_.size ()) { - heads_to_tie_.clear (); - for (int i=0; i< ties_.size (); i++) - { - typeset_tie (ties_[i]); - } + if (!to_boolean (get_property ("tieWaitForNote"))) + heads_to_tie_.clear (); + + for (vsize i = 0; i < ties_.size (); i++) + typeset_tie (ties_[i]); ties_.clear (); - last_event_ = 0; - tie_column_ =0; + tie_column_ = 0; } - + if (event_) { - tie_start_definition_ = updated_grob_properties (context (), ly_symbol2scm ("Tie")); - 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 (vsize i = 0; i < now_heads_.size (); i++) + { + heads_to_tie_.push_back (Head_event_tuple (now_heads_[i], event_, + start_definition)); + } } + event_ = 0; now_heads_.clear (); } @@ -169,28 +177,34 @@ 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); - - 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 ()); + 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); + Spanner *sp = dynamic_cast (her); + sp->set_bound (LEFT, new_head_drul[LEFT]); + sp->set_bound (RIGHT, new_head_drul[RIGHT]); } +#include "translator.icc" + +ADD_ACKNOWLEDGER (Tie_engraver, note_head); +ADD_TRANSLATOR (Tie_engraver, + /* doc */ "Generate ties between noteheads of equal pitch.", + /* create */ + "Tie " + "TieColumn", -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 */ ""); + /* accept */ "tie-event", + /* read */ "tieWaitForNote", + /* write */ "tieMelismaBusy");