X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fchord-tremolo-engraver.cc;h=8570ff263d5bfdd0f8091ac478f04b7425e3a174;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=769ec5a3fcba7d7bb50500326e0fe75541d14782;hpb=fbb6d20e9f58d691ffe845284cbb4d8bacf9ca60;p=lilypond.git diff --git a/lily/chord-tremolo-engraver.cc b/lily/chord-tremolo-engraver.cc index 769ec5a3fc..82eba5cec1 100644 --- a/lily/chord-tremolo-engraver.cc +++ b/lily/chord-tremolo-engraver.cc @@ -3,236 +3,158 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys - Jan Nieuwenhuizen + (c) 2000--2008 Han-Wen Nienhuys + Erik Sandberg */ -#include "timing-translator.hh" -#include "stem.hh" #include "beam.hh" -#include "musical-request.hh" +#include "engraver-group.hh" +#include "international.hh" +#include "item.hh" +#include "math.h" // ceil #include "misc.hh" +#include "repeated-music.hh" +#include "rhythmic-head.hh" +#include "spanner.hh" +#include "stem-tremolo.hh" +#include "stem.hh" +#include "stream-event.hh" #include "warn.hh" -#include "score-engraver.hh" -#include "engraver.hh" -#include "drul-array.hh" -#include "timing-engraver.hh" -#include "beaming.hh" + +#include "translator.icc" /** - Generate a beam tremolo. Eat stems. - UGH. Derive me from Beam_engraver. - - */ +This acknowledges repeated music with "tremolo" style. It typesets +a beam. + +TODO: + +- perhaps use engraver this to steer other engravers? That would +create dependencies between engravers, which is bad. + +- create dots if appropriate. + +- create TremoloBeam iso Beam? +*/ class Chord_tremolo_engraver : public Engraver { -public: - VIRTUAL_COPY_CONS(Translator); - + TRANSLATOR_DECLARATIONS (Chord_tremolo_engraver); +protected: + Stream_event *repeat_; - Chord_tremolo_engraver(); + int flags_; + // number of beams for short tremolos + int expected_beam_count_; + // current direction of beam (first RIGHT, then LEFT) + Direction beam_dir_; + Spanner *beam_; protected: - virtual void do_removal_processing(); - virtual void do_process_music(); - virtual bool do_try_music (Music*); - virtual void acknowledge_element (Score_element_info); - virtual void do_pre_move_processing(); - virtual void do_post_move_processing(); - -private: - void typeset_beam (); - Drul_array reqs_drul_; - Chord_tremolo_req* prev_start_req_; - Beam* beam_p_; - Beam* finished_beam_p_; - - /// location within measure where beam started. - Moment beam_start_location_; - - /// moment (global time) where beam started. - Moment beam_start_mom_; - Beaming_info_list * beam_info_p_; - Beaming_info_list * finished_beam_info_p_; + virtual void finalize (); + void process_music (); + DECLARE_TRANSLATOR_LISTENER (tremolo_span); + DECLARE_ACKNOWLEDGER (stem); }; -ADD_THIS_TRANSLATOR (Chord_tremolo_engraver); - Chord_tremolo_engraver::Chord_tremolo_engraver () { - reqs_drul_[LEFT] = reqs_drul_[RIGHT] = 0; - beam_p_ = 0; - finished_beam_p_ = 0; - prev_start_req_ = 0; - finished_beam_info_p_=0; - beam_info_p_ =0; -} - -bool -Chord_tremolo_engraver::do_try_music (Music* m) -{ - if (Chord_tremolo_req* b = dynamic_cast (m)) - { - Direction d = b->span_dir_; - if (reqs_drul_[d] && !reqs_drul_[d]->equal_b (b)) - return false; - - if ((d == STOP) && !beam_p_) - { - m->warning (_ ("can't find start of chord tremolo")); - return false; - } - - reqs_drul_[d] = b; - return true; - } - - return false; + beam_ = 0; + repeat_ = 0; + flags_ = 0; + expected_beam_count_ = 0; + beam_dir_ = CENTER; } +IMPLEMENT_TRANSLATOR_LISTENER (Chord_tremolo_engraver, tremolo_span); void -Chord_tremolo_engraver::do_process_music () +Chord_tremolo_engraver::listen_tremolo_span (Stream_event *ev) { - if (reqs_drul_[STOP]) + Direction span_dir = to_dir (ev->get_property ("span-direction")); + if (span_dir == START) { - if (!beam_p_) - reqs_drul_[STOP]->warning (_ ("can't find start of chord tremolo")); - - prev_start_req_ = 0; - - finished_beam_p_ = beam_p_; - beam_p_ = 0; - - finished_beam_info_p_ = beam_info_p_; - beam_info_p_ = 0; - } - - if (beam_p_) - { - Score_engraver * e = 0; - Translator * t = daddy_grav_l (); - for (; !e && t; t = t->daddy_trans_l_) + if (ASSIGN_EVENT_ONCE (repeat_, ev)) { - e = dynamic_cast (t); + int type = scm_to_int (ev->get_property ("tremolo-type")); + /* e.g. 1 for type 8, 2 for type 16 */ + flags_ = intlog2 (type) - 2; + expected_beam_count_ = scm_to_int (ev->get_property ("expected-beam-count")); + beam_dir_ = RIGHT; } - - if (!e) - programming_error ("No score engraver!"); - else - e->forbid_breaks (); } - - if (reqs_drul_[START]) + else if (span_dir == STOP) { - if (beam_p_) - { - reqs_drul_[START]->warning (_ ("already have a chord tremolo")); - return; - } - - prev_start_req_ = reqs_drul_[START]; - - beam_p_ = new Beam; - beam_p_->set_elt_property ("chord-tremolo", SCM_BOOL_T); - Translator * t = daddy_grav_l ()->get_simple_translator ("Timing_engraver"); - Timing_engraver *timer = dynamic_cast (t); - beam_start_location_ = (t) ? timer->measure_position () : Moment (0); - beam_start_mom_ = now_mom(); - beam_info_p_ = new Beaming_info_list; - - announce_element (Score_element_info (beam_p_, reqs_drul_[LEFT])); - } -} - -void -Chord_tremolo_engraver::do_post_move_processing () -{ - reqs_drul_ [START] = 0; -} - - -void -Chord_tremolo_engraver::do_pre_move_processing () -{ - typeset_beam (); + if (!repeat_) + ev->origin ()->warning (_ ("No tremolo to end")); + repeat_ = 0; + beam_ = 0; + expected_beam_count_ = 0; + beam_dir_ = CENTER; + } } void -Chord_tremolo_engraver::typeset_beam () +Chord_tremolo_engraver::process_music () { - if (finished_beam_p_) + if (repeat_ && !beam_) { - finished_beam_info_p_->beamify (); - finished_beam_p_->set_beaming (finished_beam_info_p_); - typeset_element (finished_beam_p_); - finished_beam_p_ = 0; - delete finished_beam_info_p_; - finished_beam_info_p_ =0; - - reqs_drul_[STOP] = 0; + beam_ = make_spanner ("Beam", repeat_->self_scm ()); } } void -Chord_tremolo_engraver::do_removal_processing () +Chord_tremolo_engraver::finalize () { - typeset_beam (); - if (beam_p_) + if (beam_) { - prev_start_req_->warning (_ ("unterminated chord tremolo")); - finished_beam_p_ = beam_p_; - finished_beam_info_p_ = beam_info_p_; - typeset_beam (); + repeat_->origin ()->warning (_ ("unterminated chord tremolo")); + announce_end_grob (beam_, SCM_EOL); + beam_->suicide (); } } void -Chord_tremolo_engraver::acknowledge_element (Score_element_info info) +Chord_tremolo_engraver::acknowledge_stem (Grob_info info) { - if (beam_p_) + if (beam_) { - if (Stem* s = dynamic_cast (info.elem_l_)) + Grob *s = info.grob (); + + Stem::set_beaming (s, flags_, beam_dir_); + + if (Stem::duration_log (s) != 1) + beam_->set_property ("gap-count", scm_from_int (flags_ - expected_beam_count_)); + + if (beam_dir_ == RIGHT) { - int type_i = prev_start_req_->type_i_; - s->set_elt_property ("duration-log", gh_int2scm (intlog2 (type_i) - 2)); - - s->set_beaming (s->flag_i (), LEFT); - s->set_beaming ( s->flag_i (), RIGHT); - - /* - URG: this sets the direction of the Stem s. - It's amazing Mike: - - Stem:: type_i () ->first_head ()->get_direction () -> - directional_element (me).set (d); - - */ - SCM d = s->get_elt_property ("direction"); - if (s->type_i () != 1) - { - int gap_i =s->flag_i () - ((s->type_i () >? 2) - 2); - beam_p_->set_elt_property ("beam-gap", gh_int2scm(gap_i)); - } - s->set_elt_property ("direction", d); - - if (Rhythmic_req* r = dynamic_cast (info.req_l_)) - { - beam_p_->add_stem (s); - Moment stem_location = now_mom () - - beam_start_mom_ + beam_start_location_; - beam_info_p_->add_stem (stem_location, - (r->duration_.durlog_i_ - 2) >? 1); - } + beam_dir_ = LEFT; + announce_end_grob (beam_, s->self_scm ()); + } + + if (info.ultimate_event_cause ()->in_event_class ("rhythmic-event")) + Beam::add_stem (beam_, s); + else + { + string s = _ ("stem must have Rhythmic structure"); + if (info.event_cause ()) + info.event_cause ()->origin ()->warning (s); else - { - String s = _ ("stem must have Rhythmic structure"); - if (info.req_l_) - info.req_l_->warning (s); - else - ::warning (s); - } + ::warning (s); } } } +ADD_ACKNOWLEDGER (Chord_tremolo_engraver, stem); +ADD_TRANSLATOR (Chord_tremolo_engraver, + /* doc */ + "Generate beams for tremolo repeats.", + + /* create */ + "Beam ", + + /* read */ + "", + + /* write */ + "" + );