X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Ftuplet-engraver.cc;h=772b8db124e855b6d6a951d9a69a4ed02c5295c6;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=b8f85eb870dfef0668728e58597190d19fbea66b;hpb=f6e3a77381e8eb67aa01195ec3945bd978f86aa8;p=lilypond.git diff --git a/lily/tuplet-engraver.cc b/lily/tuplet-engraver.cc index b8f85eb870..772b8db124 100644 --- a/lily/tuplet-engraver.cc +++ b/lily/tuplet-engraver.cc @@ -1,108 +1,239 @@ -/* - auto-plet-engraver.cc -- implement Auto_plet_engraver - +/* + tuplet-engraver.cc -- implement Tuplet_engraver + source file of the GNU LilyPond music typesetter - - (c) 1998--1999 Han-Wen Nienhuys - - */ -#include "tuplet-engraver.hh" -#include "command-request.hh" -#include "tuplet-spanner.hh" -#include "note-column.hh" -#include "time-scaled-music.hh" + (c) 1998--2008 Han-Wen Nienhuys +*/ + #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" -bool -Tuplet_engraver::do_try_music (Music *r) +#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 { - if (Time_scaled_music * c = dynamic_cast (r)) +public: + TRANSLATOR_DECLARATIONS (Tuplet_engraver); + +protected: + vector tuplets_; + vector new_tuplets_; + vector stopped_tuplets_; + vector last_tuplets_; + + DECLARE_ACKNOWLEDGER (note_column); + DECLARE_TRANSLATOR_LISTENER (tuplet_span); + virtual void finalize (); + void start_translation_timestep (); + void process_music (); +}; + +IMPLEMENT_TRANSLATOR_LISTENER (Tuplet_engraver, tuplet_span); +void +Tuplet_engraver::listen_tuplet_span (Stream_event *ev) +{ + Direction dir = to_dir (ev->get_property ("span-direction")); + if (dir == START) { - Music *el = c->element_l (); - if (!dynamic_cast (el)) + Tuplet_description d; + d.event_ = ev; + + d.length_ = robust_scm2moment (d.event_->get_property ("length"), + Moment (0)); + d.start_moment_ = now_mom (); + d.stop_moment_ = now_mom () + d.length_; + + for (vsize i=0; i < new_tuplets_.size (); i++) { - time_scaled_music_arr_.push (c); - stop_moments_.push (now_mom () + c->length_mom ()); + /* + discard duplicates. + */ + if (new_tuplets_[i].stop_moment_ == d.stop_moment_) + return; } - return true; + + new_tuplets_.push_back (d); } - return false; -} - -void -Tuplet_engraver::do_process_requests () -{ - int dir = 0; - SCM prop = get_property ("tupletDirection", 0); - if (isdir_b (prop)) - dir = to_dir (prop); - int visibility = 3; - prop = get_property ("tupletVisibility", 0); - if (gh_number_p(prop)) - visibility = gh_scm2int (prop); // bool ? - - for (int i= started_span_p_arr_.size (); - i < time_scaled_music_arr_.size (); i++) + else if (dir == STOP) { - Tuplet_spanner* glep = new Tuplet_spanner; - started_span_p_arr_.push (glep); - glep->number_str_ = to_str (time_scaled_music_arr_[i]->den_i_); - glep->set_elt_property("tuplet-visibility", - gh_int2scm (visibility)); - if (dir != 0) - glep->set_elt_property("dir-forced", gh_int2scm (dir)); - announce_element (Score_element_info (glep, time_scaled_music_arr_ [i])); + 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::acknowledge_element (Score_element_info i) +Tuplet_engraver::process_music () { - bool grace= (i.elem_l_->get_elt_property ("grace") != SCM_UNDEFINED); - SCM wg = get_property ("weAreGraceContext",0); - bool wgb = to_boolean (wg); - if (grace != wgb) - 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); + } + } - if (Note_column *nc = dynamic_cast (i.elem_l_)) + for (vsize i = 0; i < stopped_tuplets_.size (); i++) { - for (int j =0; j add_column (nc); + 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); + } } - else if (Beam *b = dynamic_cast (i.elem_l_)) + stopped_tuplets_.clear (); + + concat (tuplets_, new_tuplets_); + new_tuplets_.clear (); + for (vsize j = tuplets_.size (); j > 0; j--) { - for (int j = 0; j < started_span_p_arr_.size (); j++) - started_span_p_arr_[j]->add_beam (b); + /* 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_); + } } void -Tuplet_engraver::do_post_move_processing () +Tuplet_engraver::acknowledge_note_column (Grob_info inf) { - Moment now = now_mom (); - for (int i= started_span_p_arr_.size (); i--; ) - { - if (now >= stop_moments_[i]) - { - typeset_element (started_span_p_arr_[i]); - started_span_p_arr_.del (i); - stop_moments_.del(i); - time_scaled_music_arr_.del(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::do_removal_processing () +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 () { - for (int i=0; i < started_span_p_arr_.size (); i++) - { - typeset_element (started_span_p_arr_[i]); - } } -ADD_THIS_TRANSLATOR(Tuplet_engraver); +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 */ + "" + );