X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fchord-tremolo-engraver.cc;h=bb84edc4bcb3007dd9df591e83ee870efb4954b6;hb=9bea477a992947adbbba48bc479c3f551cde8225;hp=df8573434b914892a194076d0854ec94db1a36b5;hpb=2873636a53f0011f837aaf6e2072de602730d957;p=lilypond.git diff --git a/lily/chord-tremolo-engraver.cc b/lily/chord-tremolo-engraver.cc index df8573434b..bb84edc4bc 100644 --- a/lily/chord-tremolo-engraver.cc +++ b/lily/chord-tremolo-engraver.cc @@ -1,48 +1,109 @@ /* - abbreviation-beam-engraver.cc -- implement Chord_tremolo_engraver + chord-tremolo-engraver.cc -- implement Chord_tremolo_engraver source file of the GNU LilyPond music typesetter - (c) 1997--1999 Han-Wen Nienhuys - Jan Nieuwenhuizen + (c) 2000--2005 Han-Wen Nienhuys */ -#include "duration-convert.hh" -#include "time-description.hh" -#include "chord-tremolo-engraver.hh" +#include "beam.hh" +#include "repeated-music.hh" #include "stem.hh" -#include "chord-tremolo.hh" -#include "musical-request.hh" -#include "misc.hh" +#include "rhythmic-head.hh" +#include "engraver-group-engraver.hh" #include "warn.hh" -#include "score-engraver.hh" +#include "misc.hh" +#include "note-head.hh" +#include "spanner.hh" +#include "item.hh" +#include "chord-tremolo-iterator.hh" +#include "stem-tremolo.hh" +#include "math.h" // ceil + +/** + +This acknowledges repeated music with "tremolo" style. It typesets +a beam. -ADD_THIS_TRANSLATOR (Chord_tremolo_engraver); +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 +{ + void typeset_beam (); + TRANSLATOR_DECLARATIONS (Chord_tremolo_engraver); +protected: + Music *repeat_; + + /// moment (global time) where beam started. + Moment start_mom_; + Moment stop_mom_; + int flags_; + int total_duration_flags_; + + /// location within measure where beam started. + Moment beam_start_location_; + + bool body_is_sequential_; + Spanner *beam_; + Spanner *finished_beam_; + Item *stem_tremolo_; +protected: + virtual void finalize (); + virtual bool try_music (Music *); + virtual void acknowledge_grob (Grob_info); + virtual void stop_translation_timestep (); + virtual void start_translation_timestep (); + virtual void process_music (); +}; Chord_tremolo_engraver::Chord_tremolo_engraver () { - reqs_drul_[LEFT] = reqs_drul_[RIGHT] = 0; - abeam_p_ = 0; - finished_abeam_p_ = 0; - prev_start_req_ = 0; + beam_ = finished_beam_ = 0; + repeat_ = 0; + flags_ = 0; + stem_tremolo_ = 0; + body_is_sequential_ = false; } bool -Chord_tremolo_engraver::do_try_music (Music* m) +Chord_tremolo_engraver::try_music (Music *m) { - if (Chord_tremolo_req* b = dynamic_cast (m)) + if (m->is_mus_type ("repeated-music") + && m->get_property ("iterator-ctor") == Chord_tremolo_iterator::constructor_proc + && !repeat_) { - Direction d = b->span_dir_; - if (reqs_drul_[d] && !reqs_drul_[d]->equal_b (b)) - return false; + Moment l = m->get_length (); + repeat_ = m; + start_mom_ = now_mom (); + stop_mom_ = start_mom_ + l; + + Music *body = Repeated_music::body (m); + body_is_sequential_ = body->is_mus_type ("sequential-music"); - if ((d == STOP) && !abeam_p_) + int elt_count = body_is_sequential_ ? scm_ilength (body->get_property ("elements")) : 1; + + if (body_is_sequential_ && elt_count != 2) { - m->warning (_ ("no tremolo beam to end")); - return false; + m->origin ()->warning (_f ("Chord tremolo with %d elements. Must have two elements.", elt_count)); } - reqs_drul_[d] = b; + if (elt_count <= 0) + elt_count = 1; + + Rational total_dur = l.main_part_; + Rational note_dur = total_dur / Rational (elt_count * Repeated_music::repeat_count (repeat_)); + + total_duration_flags_ = 0 >? (intlog2 (total_dur.den ()) - 2); + + flags_ = intlog2 (note_dur.den ()) -2; + return true; } @@ -50,116 +111,105 @@ Chord_tremolo_engraver::do_try_music (Music* m) } void -Chord_tremolo_engraver::do_process_requests () +Chord_tremolo_engraver::process_music () { - if (reqs_drul_[STOP]) + if (repeat_ && body_is_sequential_ && !beam_) { - if (!abeam_p_) - reqs_drul_[STOP]->warning (_ ("no tremolo beam to end")); - prev_start_req_ = 0; - finished_abeam_p_ = abeam_p_; - abeam_p_ = 0; - } + beam_ = make_spanner ("Beam", repeat_->self_scm ()); + beam_->set_property ("chord-tremolo", SCM_BOOL_T); - 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 (); + beam_start_location_ = robust_scm2moment (get_property ("measurePosition"), Moment (0)); } - - if (reqs_drul_[START]) - { - if (abeam_p_) - { - reqs_drul_[START]->warning (_ ("Already have a tremolo beam")); - return; - } - - prev_start_req_ = reqs_drul_[START]; - - abeam_p_ = new Chord_tremolo; - announce_element (Score_element_info (abeam_p_, reqs_drul_[LEFT])); - } } void -Chord_tremolo_engraver::do_post_move_processing () +Chord_tremolo_engraver::finalize () { - reqs_drul_ [START] = 0; + typeset_beam (); + if (beam_) + { + repeat_->origin ()->warning (_ ("unterminated chord tremolo")); + beam_->suicide (); + } } void -Chord_tremolo_engraver::do_pre_move_processing () +Chord_tremolo_engraver::typeset_beam () { - typeset_beam (); + finished_beam_ = 0; } void -Chord_tremolo_engraver::typeset_beam () +Chord_tremolo_engraver::acknowledge_grob (Grob_info info) { - if (finished_abeam_p_) + if (beam_ && Stem::has_interface (info.grob_)) { - typeset_element (finished_abeam_p_); - finished_abeam_p_ = 0; + Grob *s = info.grob_; + + if (start_mom_ == now_mom ()) + Stem::set_beaming (s, flags_, RIGHT); + else + Stem::set_beaming (s, flags_, LEFT); + + if (Stem::duration_log (s) != 1) + { + beam_->set_property ("gap-count", scm_int2num (flags_ - total_duration_flags_)); + } - reqs_drul_[STOP] = 0; + if (info.music_cause ()->is_mus_type ("rhythmic-event")) + { + Beam::add_stem (beam_, s); + } + else + { + String s = _ ("stem must have Rhythmic structure"); + if (info.music_cause ()) + info.music_cause ()->origin ()->warning (s); + else + ::warning (s); + } + } + else if (repeat_ + && flags_ && !body_is_sequential_ && Stem::has_interface (info.grob_)) + { + stem_tremolo_ = make_item ("StemTremolo", repeat_->self_scm ()); + stem_tremolo_->set_property ("flag-count", + scm_int2num (flags_)); + stem_tremolo_->set_property ("stem", + info.grob_->self_scm ()); + stem_tremolo_->set_parent (info.grob_, X_AXIS); } } void -Chord_tremolo_engraver::do_removal_processing () +Chord_tremolo_engraver::start_translation_timestep () { - typeset_beam (); - if (abeam_p_) + if (beam_ && stop_mom_ == now_mom ()) { - prev_start_req_->warning (_ ("unfinished tremolo beam")); - finished_abeam_p_ = abeam_p_; - typeset_beam (); + finished_beam_ = beam_; + repeat_ = 0; + beam_ = 0; } } void -Chord_tremolo_engraver::acknowledge_element (Score_element_info i) +Chord_tremolo_engraver::stop_translation_timestep () { - if (abeam_p_) + if (stem_tremolo_) { - if (Stem* s = dynamic_cast (i.elem_l_)) - { - 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); - } + repeat_ = 0; + if (beam_) + programming_error ("Huh, beam and stem tremolo?"); + stem_tremolo_ = 0; } + + typeset_beam (); } +ADD_TRANSLATOR (Chord_tremolo_engraver, + /* descr */ "Generates beams for tremolo repeats.", + /* creats*/ "Beam", + /* accepts */ "repeated-music", + /* acks */ "stem-interface note-head-interface", + /* reads */ "", + /* write */ "");