X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftuplet-engraver.cc;h=7d97443e1d3db2ffac3ce03ae60ce2fb602c606f;hb=7802d89e1fbb1310b2801502293ece228b5dda66;hp=0db8d88ef25af4fff6f1c2e1269e2a84bf193cea;hpb=7b22eeeee2505be517e58c3f922ddc53f1b7b0bd;p=lilypond.git diff --git a/lily/tuplet-engraver.cc b/lily/tuplet-engraver.cc index 0db8d88ef2..7d97443e1d 100644 --- a/lily/tuplet-engraver.cc +++ b/lily/tuplet-engraver.cc @@ -1,161 +1,232 @@ -/* - 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--2007 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 "international.hh" +#include "note-column.hh" #include "spanner.hh" +#include "stream-event.hh" +#include "tuplet-bracket.hh" +#include "warn.hh" +#include "item.hh" +#include "moment.hh" + +#include "translator.icc" + +struct Tuplet_description +{ + Stream_event *event_; + Spanner *bracket_; + Spanner *number_; + + bool full_length_; + bool full_length_note_; + Moment stop_moment_; + Moment start_moment_; + Moment length_; + + Tuplet_description () + { + event_ = 0; + full_length_note_ = false; + full_length_ = false; + bracket_ = 0; + number_ = 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_; + vector tuplets_; + vector new_tuplets_; + vector stopped_tuplets_; + vector last_tuplets_; - /// The spanners. Array order is synced with time_scaled_musics_ - Link_array started_spanners_; - + DECLARE_ACKNOWLEDGER (note_column); + DECLARE_TRANSLATOR_LISTENER (tuplet_span); virtual void finalize (); - virtual void acknowledge_grob (Grob_info); - virtual bool try_music (Music*r); - virtual void start_translation_timestep (); - virtual void process_acknowledged_grobs (); + void start_translation_timestep (); + void process_music (); }; -bool -Tuplet_engraver::try_music (Music *c) -{ - if (c->is_mus_type ("time-scaled-music")) - { - Music *el = unsmob_music (c->get_mus_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); - - SCM s = get_property ("tupletSpannerDuration"); - if (unsmob_moment (s)) - m = m get_property ("span-direction")); + if (dir == START) { - if (i < started_spanners_.size () && started_spanners_[i]) - continue; + Tuplet_description d; + d.event_ = ev; - Spanner* glep = make_spanner ("TupletBracket"); + d.length_ = robust_scm2moment (d.event_->get_property ("length"), + Moment (0)); + d.start_moment_ = now_mom (); + d.stop_moment_ = now_mom () + d.length_; - if (i >= started_spanners_.size ()) - started_spanners_.push (glep); - else - started_spanners_[i] = glep; - - - SCM proc = get_property ("tupletNumberFormatFunction"); - if (gh_procedure_p (proc)) + for (vsize i=0; i < new_tuplets_.size (); i++) { - SCM t = gh_apply (proc, scm_list_n (time_scaled_musics_[i]->self_scm (), SCM_UNDEFINED)); - glep->set_grob_property ("text", t); + /* + discard duplicates. + */ + if (new_tuplets_[i].stop_moment_ == d.stop_moment_) + return; } - announce_grob(glep, time_scaled_musics_ [i]->self_scm()); + new_tuplets_.push_back (d); } -} - -void -Tuplet_engraver::acknowledge_grob (Grob_info i) -{ - if (Note_column::has_interface (i.grob_)) + else if (dir == STOP) { - for (int j =0; j (i.grob_)); + if (tuplets_.size ()) + { + stopped_tuplets_.push_back (tuplets_.back ()); + tuplets_.pop_back (); + } + else if (!to_boolean (get_property ("skipTypesetting"))) + ev->origin ()->warning (_f ("No tuplet to end")); } + else + ev->origin ()->programming_error ("direction tuplet-span-event_ invalid."); } void -Tuplet_engraver::start_translation_timestep () +Tuplet_engraver::process_music () { + /* + This may happen if the end of a tuplet is part of a quoted voice. + */ Moment now = now_mom (); - - Moment tsd; - SCM s = get_property ("tupletSpannerDuration"); - if (unsmob_moment (s)) - tsd = unsmob_moment (s)->main_part_; - - for (int i= started_spanners_.size (); i--;) + for (vsize i = tuplets_.size (); i --; ) { - if (now.main_part_ >= span_stop_moments_[i]) + if (tuplets_[i].stop_moment_ == now) { - if (Spanner *sp = started_spanners_[i]) + stopped_tuplets_.push_back (tuplets_[i]); + tuplets_.erase (tuplets_.begin () + i); + } + } + + for (vsize i = 0; i < stopped_tuplets_.size (); i++) + { + Spanner *bracket = stopped_tuplets_[i].bracket_; + Spanner *number = stopped_tuplets_[i].number_; + if (bracket) + { + if (stopped_tuplets_[i].full_length_) { - if (!sp->get_bound (RIGHT)) - sp->set_bound (RIGHT, sp->get_bound (LEFT)); + Item *col = + unsmob_item (stopped_tuplets_[i].full_length_note_ + ? get_property ("currentMusicalColumn") + : get_property ("currentCommandColumn")); - typeset_grob (sp); - - started_spanners_[i] =0; + bracket->set_bound (RIGHT, col); + number->set_bound (RIGHT, col); + } + else if (!bracket->get_bound (RIGHT)) + { + bracket->set_bound (RIGHT, + bracket->get_bound (LEFT)); + number->set_bound (RIGHT, + stopped_tuplets_[i].bracket_->get_bound (LEFT)); } - if (tsd.to_bool ()) - span_stop_moments_[i] += tsd.main_part_; + // todo: scrap last_tuplets_, use stopped_tuplets_ only. + // clear stopped_tuplets_ at start_translation_timestep + last_tuplets_.push_back (bracket); + last_tuplets_.push_back (number); } + } + stopped_tuplets_.clear (); + + concat (tuplets_, new_tuplets_); + new_tuplets_.clear (); + for (vsize j = tuplets_.size (); j > 0; j--) + { + /* i goes from size-1 downto 0, inclusively */ + vsize i = j - 1; + + + if (tuplets_[i].bracket_) + continue; + + tuplets_[i].full_length_ = to_boolean (get_property ("tupletFullLength")); + tuplets_[i].full_length_note_ + = to_boolean (get_property ("tupletFullLengthNote")); + + tuplets_[i].bracket_ = make_spanner ("TupletBracket", + tuplets_[i].event_->self_scm ()); + tuplets_[i].number_ = make_spanner ("TupletNumber", + tuplets_[i].event_->self_scm ()); + tuplets_[i].number_->set_object ("bracket", tuplets_[i].bracket_->self_scm ()); + tuplets_[i].bracket_->set_object ("tuplet-number", tuplets_[i].number_->self_scm ()); + tuplets_[i].stop_moment_.grace_part_ = 0; + + + if (i + 1 < tuplets_.size () && tuplets_[i + 1].bracket_) + Tuplet_bracket::add_tuplet_bracket (tuplets_[i].bracket_, tuplets_[i + 1].bracket_); + + if (i > 0 && tuplets_[i - 1].bracket_) + Tuplet_bracket::add_tuplet_bracket (tuplets_[i - 1].bracket_, tuplets_[i].bracket_); - if (now.main_part_ >= stop_moments_[i]) - { - started_spanners_.del (i); - stop_moments_.del (i); - span_stop_moments_.del (i); - time_scaled_musics_.del (i); - } } } void -Tuplet_engraver::finalize () +Tuplet_engraver::acknowledge_note_column (Grob_info inf) { - for (int i=0; i < started_spanners_.size (); i++) - { - if (started_spanners_[i]) - typeset_grob (started_spanners_[i]); - } + for (vsize j = 0; j < tuplets_.size (); j++) + if (tuplets_[j].bracket_) + { + Item *i = dynamic_cast (inf.grob ()); + Tuplet_bracket::add_column (tuplets_[j].bracket_, i); + add_bound_item (tuplets_[j].number_, i); + } } +void +Tuplet_engraver::start_translation_timestep () +{ + last_tuplets_.clear (); + /* + May seem superfluous, but necessary for skipTypesetting. + */ + new_tuplets_.clear (); +} +void +Tuplet_engraver::finalize () +{ + if (to_boolean (get_property ("tupletFullLength"))) + for (vsize i = 0; i < last_tuplets_.size (); i++) + { + Item *col = unsmob_item (get_property ("currentCommandColumn")); + last_tuplets_[i]->set_bound (RIGHT, col); + } +} -Tuplet_engraver::Tuplet_engraver(){} +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", -/* write */ ""); +ADD_ACKNOWLEDGER (Tuplet_engraver, note_column); +ADD_TRANSLATOR (Tuplet_engraver, + + /* doc */ + "Catch tuplet events and generate appropriate bracket.", + + /* create */ + "TupletBracket " + "TupletNumber ", + /* read */ + "tupletFullLength " + "tupletFullLengthNote ", + /* write */ "");