X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftuplet-engraver.cc;h=772b8db124e855b6d6a951d9a69a4ed02c5295c6;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=84299d2662f655690432d962b4b2df3dc2d6b64d;hpb=08799b9501bc361026e59eed5789e4b0b4a7b61e;p=lilypond.git diff --git a/lily/tuplet-engraver.cc b/lily/tuplet-engraver.cc index 84299d2662..772b8db124 100644 --- a/lily/tuplet-engraver.cc +++ b/lily/tuplet-engraver.cc @@ -3,156 +3,237 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2005 Han-Wen Nienhuys + (c) 1998--2008 Han-Wen Nienhuys */ -#include "tuplet-bracket.hh" -#include "note-column.hh" #include "beam.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 { - Music *music_; - Rational stop_; - Rational span_stop_; - Rational length_; - Spanner *spanner_; + Stream_event *event_; + Spanner *bracket_; + Spanner *number_; + + bool full_length_; + bool full_length_note_; + Moment stop_moment_; + Moment start_moment_; + Moment length_; + Tuplet_description () { - music_ = 0; - spanner_ = 0; - } - static int compare (Tuplet_description const &a, Tuplet_description const &b) - { - return ::compare (a.length_, b.length_); + event_ = 0; + full_length_note_ = false; + full_length_ = false; + bracket_ = 0; + number_ = 0; } }; - - class Tuplet_engraver : public Engraver { public: TRANSLATOR_DECLARATIONS (Tuplet_engraver); protected: - Array tuplets_; - + vector tuplets_; + vector new_tuplets_; + vector stopped_tuplets_; + vector last_tuplets_; + DECLARE_ACKNOWLEDGER (note_column); - virtual bool try_music (Music *r); + DECLARE_TRANSLATOR_LISTENER (tuplet_span); + virtual void finalize (); void start_translation_timestep (); void process_music (); }; -bool -Tuplet_engraver::try_music (Music *music) +IMPLEMENT_TRANSLATOR_LISTENER (Tuplet_engraver, tuplet_span); +void +Tuplet_engraver::listen_tuplet_span (Stream_event *ev) { - if (music->is_mus_type ("time-scaled-music")) + Direction dir = to_dir (ev->get_property ("span-direction")); + if (dir == START) { - Music *el = unsmob_music (music->get_property ("element")); - if (el && !el->is_mus_type ("event-chord")) - { - Tuplet_description d; - d.music_ = music; - d.length_ = music->get_length ().main_part_; - d.stop_ = now_mom ().main_part_ + d.length_; - d.span_stop_ = d.stop_; + Tuplet_description d; + d.event_ = ev; - SCM s = get_property ("tupletSpannerDuration"); - if (unsmob_moment (s)) - d.span_stop_ = min (d.span_stop_, (now_mom () + *unsmob_moment (s)).main_part_); + d.length_ = robust_scm2moment (d.event_->get_property ("length"), + Moment (0)); + d.start_moment_ = now_mom (); + d.stop_moment_ = now_mom () + d.length_; - tuplets_.push (d); + for (vsize i=0; i < new_tuplets_.size (); i++) + { + /* + discard duplicates. + */ + if (new_tuplets_[i].stop_moment_ == d.stop_moment_) + return; } - return true; + + new_tuplets_.push_back (d); } - return false; + else if (dir == STOP) + { + if (tuplets_.size ()) + { + stopped_tuplets_.push_back (tuplets_.back ()); + tuplets_.pop_back (); + } + else if (!to_boolean (get_property ("skipTypesetting"))) + ev->origin ()->warning (_ ("No tuplet to end")); + } + else + ev->origin ()->programming_error ("direction tuplet-span-event_ invalid."); } void Tuplet_engraver::process_music () { - if (!tuplets_.size ()) - return; + /* + This may happen if the end of a tuplet is part of a quoted voice. + */ + Moment now = now_mom (); + for (vsize i = tuplets_.size (); i --; ) + { + if (tuplets_[i].stop_moment_ == now) + { + 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_) + { + Item *col = + unsmob_item (stopped_tuplets_[i].full_length_note_ + ? get_property ("currentMusicalColumn") + : get_property ("currentCommandColumn")); + + bracket->set_bound (RIGHT, col); + number->set_bound (RIGHT, col); + } + else if (!bracket->get_bound (RIGHT)) + { + if (bracket->get_bound (LEFT)) + { + bracket->set_bound (RIGHT, + bracket->get_bound (LEFT)); + number->set_bound (RIGHT, + stopped_tuplets_[i].bracket_->get_bound (LEFT)); + } + else + programming_error ("stopped tuplet bracket has left nor right bound."); + } + // 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 (); - tuplets_.sort (&Tuplet_description::compare); - for (int i = 0; i < tuplets_.size (); i++) + concat (tuplets_, new_tuplets_); + new_tuplets_.clear (); + for (vsize j = tuplets_.size (); j > 0; j--) { - if (tuplets_[i].spanner_) - continue; + /* i goes from size-1 downto 0, inclusively */ + vsize i = j - 1; - Spanner *spanner = make_spanner ("TupletBracket", - tuplets_[i].music_->self_scm ()); - tuplets_[i].spanner_ = spanner; + + if (tuplets_[i].bracket_) + continue; - if (i > 0 && tuplets_[i-1].spanner_) - Tuplet_bracket::add_tuplet_bracket (tuplets_[i].spanner_, tuplets_[i-1].spanner_); - if (i < tuplets_.size()-1 && tuplets_[i+1].spanner_) - Tuplet_bracket::add_tuplet_bracket (tuplets_[i+1].spanner_, tuplets_[i].spanner_); + 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_); - SCM proc = get_property ("tupletNumberFormatFunction"); - if (ly_is_procedure (proc)) - { - SCM t = scm_apply_0 (proc, scm_list_1 (tuplets_[i].music_->self_scm ())); - spanner->set_property ("text", t); - } } } void -Tuplet_engraver::acknowledge_note_column (Grob_info i) +Tuplet_engraver::acknowledge_note_column (Grob_info inf) { - for (int j = 0; j < tuplets_.size (); j++) - if (tuplets_[j].spanner_) - Tuplet_bracket::add_column (tuplets_[j].spanner_, - dynamic_cast (i.grob ())); + 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 () { - Moment now = now_mom (); - - for (int i = tuplets_.size (); i--;) - { - Moment tsdmom = robust_scm2moment (get_property ("tupletSpannerDuration"), Moment (0)); - - Rational tsd = tsdmom.main_part_; - - if (now.main_part_ >= tuplets_[i].span_stop_) - { - if (Spanner *sp = tuplets_[i].spanner_) - { - if (!sp->get_bound (RIGHT)) - sp->set_bound (RIGHT, sp->get_bound (LEFT)); - - tuplets_[i].spanner_ = 0; - } - - if (tsd) - tuplets_[i].span_stop_ += tsd; - } + last_tuplets_.clear (); + /* + May seem superfluous, but necessary for skipTypesetting. + */ + new_tuplets_.clear (); +} - if (now.main_part_ >= tuplets_[i].stop_) - { - tuplets_.del (i); - } - } +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 () { } -ADD_ACKNOWLEDGER (Tuplet_engraver,note_column); +ADD_ACKNOWLEDGER (Tuplet_engraver, note_column); ADD_TRANSLATOR (Tuplet_engraver, - /* descr */ "Catch Time_scaled_music and generate appropriate bracket ", - /* creats*/ "TupletBracket", - /* accepts */ "time-scaled-music", - /* reads */ "tupletNumberFormatFunction tupletSpannerDuration", - /* write */ ""); + /* doc */ + "Catch tuplet events and generate appropriate bracket.", + + /* create */ + "TupletBracket " + "TupletNumber ", + + /* read */ + "tupletFullLength " + "tupletFullLengthNote ", + + /* write */ + "" + );