X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftuplet-engraver.cc;h=9acf07106b601525e6a388cfc0fa85bbbb9390b2;hb=87d48c0b8a5c75a1476bbb88ca853de838f3c7ac;hp=2745f3461eb4d16457742c62539aba09270ebbb6;hpb=7e72a1e50e94a7f9738d62599de79fe7745f600c;p=lilypond.git diff --git a/lily/tuplet-engraver.cc b/lily/tuplet-engraver.cc index 2745f3461e..9acf07106b 100644 --- a/lily/tuplet-engraver.cc +++ b/lily/tuplet-engraver.cc @@ -1,61 +1,62 @@ -/* - plet-engraver.cc -- implement Tuplet_engraver - - source file of the GNU LilyPond music typesetter - - (c) 1998--2004 Han-Wen Nienhuys - - */ +/* + tuplet-engraver.cc -- implement Tuplet_engraver + source file of the GNU LilyPond music typesetter + (c) 1998--2005 Han-Wen Nienhuys +*/ #include "tuplet-bracket.hh" #include "note-column.hh" -#include "time-scaled-music.hh" #include "beam.hh" -#include "music-list.hh" #include "engraver.hh" #include "spanner.hh" +struct Tuplet_description +{ + Music *music_; + Rational stop_; + Rational span_stop_; + Spanner *spanner_; + Tuplet_description () + { + music_ = 0; + spanner_ = 0; + } +}; + class Tuplet_engraver : public Engraver { public: - TRANSLATOR_DECLARATIONS(Tuplet_engraver); + TRANSLATOR_DECLARATIONS (Tuplet_engraver); protected: - Link_array time_scaled_musics_; - /// when does the scaled music stop? Array order is synced with time_scaled_musics_ - Array stop_moments_; - /// when does the current spanner stop? Array order is synced with time_scaled_musics_ - Array span_stop_moments_; - - /// The spanners. Array order is synced with time_scaled_musics_ - Link_array started_spanners_; - - virtual void finalize (); + Array tuplets_; + virtual void acknowledge_grob (Grob_info); - virtual bool try_music (Music*r); + virtual bool try_music (Music *r); virtual void start_translation_timestep (); - virtual void process_acknowledged_grobs (); + virtual void process_music (); }; bool -Tuplet_engraver::try_music (Music *c) +Tuplet_engraver::try_music (Music *music) { - if (c->is_mus_type ("time-scaled-music")) + if (music->is_mus_type ("time-scaled-music")) { - Music *el = unsmob_music (c->get_mus_property ("element")); + Music *el = unsmob_music (music->get_property ("element")); if (el && !el->is_mus_type ("event-chord")) { - time_scaled_musics_.push (c); - Rational m = now_mom ().main_part_ + c->get_length ().main_part_; - stop_moments_.push (m); + Tuplet_description d; + d.music_ = music; + d.stop_ = now_mom ().main_part_ + music->get_length ().main_part_; + d.span_stop_ = d.stop_; SCM s = get_property ("tupletSpannerDuration"); if (unsmob_moment (s)) - m = m = started_spanners_.size ()) - started_spanners_.push (glep); - else - started_spanners_[i] = glep; - + Spanner *spanner = make_spanner ("TupletBracket", + tuplets_[i].music_->self_scm ()); + tuplets_[i].spanner_ = spanner; SCM proc = get_property ("tupletNumberFormatFunction"); - if (gh_procedure_p (proc)) + if (ly_c_procedure_p (proc)) { - SCM t = gh_apply (proc, scm_list_n (time_scaled_musics_[i]->self_scm (), SCM_UNDEFINED)); - glep->set_grob_property ("text", t); + SCM t = scm_apply_0 (proc, scm_list_1 (tuplets_[i].music_->self_scm ())); + spanner->set_property ("text", t); } - - announce_grob(glep, time_scaled_musics_ [i]->self_scm()); } } @@ -98,9 +89,10 @@ Tuplet_engraver::acknowledge_grob (Grob_info i) { if (Note_column::has_interface (i.grob_)) { - for (int j =0; j (i.grob_)); + for (int j = 0; j < tuplets_.size (); j++) + if (tuplets_[j].spanner_) + Tuplet_bracket::add_column (tuplets_[j].spanner_, + dynamic_cast (i.grob_)); } } @@ -114,52 +106,37 @@ Tuplet_engraver::start_translation_timestep () if (unsmob_moment (s)) tsd = unsmob_moment (s)->main_part_; - for (int i= started_spanners_.size (); i--;) + for (int i = tuplets_.size (); i--;) { - if (now.main_part_ >= span_stop_moments_[i]) + if (now.main_part_ >= tuplets_[i].span_stop_) { - if (Spanner *sp = started_spanners_[i]) + if (Spanner *sp = tuplets_[i].spanner_) { if (!sp->get_bound (RIGHT)) sp->set_bound (RIGHT, sp->get_bound (LEFT)); - - typeset_grob (sp); - started_spanners_[i] =0; + tuplets_[i].spanner_ = 0; } - + if (tsd.to_bool ()) - span_stop_moments_[i] += tsd.main_part_; + tuplets_[i].span_stop_ += tsd.main_part_; } - if (now.main_part_ >= stop_moments_[i]) + if (now.main_part_ >= tuplets_[i].stop_) { - started_spanners_.del (i); - stop_moments_.del (i); - span_stop_moments_.del (i); - time_scaled_musics_.del (i); + tuplets_.del (i); } } } -void -Tuplet_engraver::finalize () +Tuplet_engraver::Tuplet_engraver () { - for (int i=0; i < started_spanners_.size (); i++) - { - if (started_spanners_[i]) - typeset_grob (started_spanners_[i]); - } } - - -Tuplet_engraver::Tuplet_engraver(){} - -ENTER_DESCRIPTION(Tuplet_engraver, -/* descr */ "Catch Time_scaled_music and generate appropriate bracket ", -/* creats*/ "TupletBracket", -/* accepts */ "time-scaled-music", -/* acks */ "note-column-interface", -/* reads */ "tupletNumberFormatFunction tupletSpannerDuration tupletInvisible", -/* write */ ""); +ADD_TRANSLATOR (Tuplet_engraver, + /* descr */ "Catch Time_scaled_music and generate appropriate bracket ", + /* creats*/ "TupletBracket", + /* accepts */ "time-scaled-music", + /* acks */ "note-column-interface", + /* reads */ "tupletNumberFormatFunction tupletSpannerDuration", + /* write */ "");