X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fchord-tremolo-engraver.cc;h=28790b5a868019d928deada7a9d305f50d5d55eb;hb=1f8f8075de6d90783386aea28af67755ed57da16;hp=88886254218a8abad8dbe67daee14036051a4620;hpb=43c708d5857fd1a15f0ebcf41d04f5a24441dc9a;p=lilypond.git diff --git a/lily/chord-tremolo-engraver.cc b/lily/chord-tremolo-engraver.cc index 8888625421..28790b5a86 100644 --- a/lily/chord-tremolo-engraver.cc +++ b/lily/chord-tremolo-engraver.cc @@ -3,165 +3,153 @@ source file of the GNU LilyPond music typesetter - (c) 1997--1999 Han-Wen Nienhuys - Jan Nieuwenhuizen + (c) 2000--2009 Han-Wen Nienhuys + Erik Sandberg */ -#include "duration-convert.hh" -#include "time-description.hh" -#include "chord-tremolo-engraver.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" -ADD_THIS_TRANSLATOR (Chord_tremolo_engraver); +#include "translator.icc" -Chord_tremolo_engraver::Chord_tremolo_engraver () -{ - reqs_drul_[LEFT] = reqs_drul_[RIGHT] = 0; - abeam_p_ = 0; - finished_abeam_p_ = 0; - prev_start_req_ = 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; +This acknowledges repeated music with "tremolo" style. It typesets +a beam. - if ((d == STOP) && !abeam_p_) - { - m->warning (_ ("no tremolo beam to end")); - return false; - } +TODO: - reqs_drul_[d] = b; - return true; - } +- perhaps use engraver this to steer other engravers? That would +create dependencies between engravers, which is bad. - return false; -} +- create dots if appropriate. -void -Chord_tremolo_engraver::do_process_requests () +- create TremoloBeam iso Beam? +*/ +class Chord_tremolo_engraver : public Engraver { - if (reqs_drul_[STOP]) - { - if (!abeam_p_) - reqs_drul_[STOP]->warning (_ ("no tremolo beam to end")); - prev_start_req_ = 0; - finished_abeam_p_ = abeam_p_; - abeam_p_ = 0; - } + TRANSLATOR_DECLARATIONS (Chord_tremolo_engraver); +protected: + Stream_event *repeat_; - if (abeam_p_) - { - Score_engraver * e = 0; - Translator * t = daddy_grav_l (); - for (; !e && t; t = t->daddy_trans_l_) - { - e = dynamic_cast (t); - } - - if (!e) - programming_error ("No score engraver!"); - else - e->forbid_breaks (); - } - - if (reqs_drul_[START]) - { - if (abeam_p_) - { - reqs_drul_[START]->warning (_ ("Already have a tremolo beam")); - return; - } + // current direction of beam (first RIGHT, then LEFT) + Direction beam_dir_; - prev_start_req_ = reqs_drul_[START]; + Spanner *beam_; - abeam_p_ = new Beam; - abeam_p_->set_elt_property ("chord-tremolo", SCM_BOOL_T); - - announce_element (Score_element_info (abeam_p_, reqs_drul_[LEFT])); - } -} +protected: + virtual void finalize (); + void process_music (); + DECLARE_TRANSLATOR_LISTENER (tremolo_span); + DECLARE_ACKNOWLEDGER (stem); +}; -void -Chord_tremolo_engraver::do_post_move_processing () +Chord_tremolo_engraver::Chord_tremolo_engraver () { - reqs_drul_ [START] = 0; + beam_ = 0; + repeat_ = 0; + beam_dir_ = CENTER; } +IMPLEMENT_TRANSLATOR_LISTENER (Chord_tremolo_engraver, tremolo_span); void -Chord_tremolo_engraver::do_pre_move_processing () +Chord_tremolo_engraver::listen_tremolo_span (Stream_event *ev) { - typeset_beam (); + Direction span_dir = to_dir (ev->get_property ("span-direction")); + if (span_dir == START) + { + if (ASSIGN_EVENT_ONCE (repeat_, ev)) + { + beam_dir_ = RIGHT; + } + } + else if (span_dir == STOP) + { + if (!repeat_) + ev->origin ()->warning (_ ("No tremolo to end")); + repeat_ = 0; + beam_ = 0; + beam_dir_ = CENTER; + } } void -Chord_tremolo_engraver::typeset_beam () +Chord_tremolo_engraver::process_music () { - if (finished_abeam_p_) + if (repeat_ && !beam_) { - typeset_element (finished_abeam_p_); - finished_abeam_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 (abeam_p_) + if (beam_) { - prev_start_req_->warning (_ ("unfinished tremolo beam")); - finished_abeam_p_ = abeam_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 i) +Chord_tremolo_engraver::acknowledge_stem (Grob_info info) { - if (abeam_p_) + if (beam_) { - if (Stem* s = dynamic_cast (i.elem_l_)) + int tremolo_type = robust_scm2int (repeat_->get_property ("tremolo-type"), 1); + int flags = max (0, intlog2 (tremolo_type) - 2); + int repeat_count = robust_scm2int (repeat_->get_property ("repeat-count"), 1); + int gap_count = min (flags, intlog2 (repeat_count) + 1); + + 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 (gap_count)); + + if (beam_dir_ == RIGHT) { - int type_i = prev_start_req_->type_i_; - s->flag_i_ = intlog2 (type_i) - 2; - - s->beams_i_drul_[LEFT] = s->flag_i_; - s->beams_i_drul_[RIGHT] = s->flag_i_; - - abeam_p_->multiple_i_ = s->flag_i_; - /* - abbrev gaps on all but half note - */ -#if 0 - if (s->type_i () != 1) - { - int gap_i =s->flag_i_ - ((s->type_i () >? 2) - 2); - s->set_elt_property ("beam-gap", gh_int2scm(gap_i)); - } -#else - if (s->type_i () != 1) - { - int gap_i =s->flag_i_ - ((s->type_i () >? 2) - 2); - abeam_p_->set_elt_property ("beam-gap", gh_int2scm(gap_i)); - } -#endif - - abeam_p_->add_stem (s); + 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 + ::warning (s); } } } +ADD_ACKNOWLEDGER (Chord_tremolo_engraver, stem); +ADD_TRANSLATOR (Chord_tremolo_engraver, + /* doc */ + "Generate beams for tremolo repeats.", + + /* create */ + "Beam ", + + /* read */ + "", + + /* write */ + "" + );