X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fchord-tremolo-engraver.cc;h=bf3859264f73afd4ba2220e14b806f9c862f1a58;hb=051d7e7cbdbbe5f5337ab2b477b0bd1e72eedd04;hp=d41c8185a21010c153b5cd89cc6ab905c5b7cfde;hpb=d9d9a1b85f7d68dd35fb435c5ca315c6eb793af0;p=lilypond.git diff --git a/lily/chord-tremolo-engraver.cc b/lily/chord-tremolo-engraver.cc index d41c8185a2..bf3859264f 100644 --- a/lily/chord-tremolo-engraver.cc +++ b/lily/chord-tremolo-engraver.cc @@ -1,48 +1,97 @@ -/* - abbreviation-beam-engraver.cc -- implement Chord_tremolo_engraver - +/* + new-chord-tremolo-engraver.cc -- implement Chord_tremolo_engraver + source file of the GNU LilyPond music typesetter - - (c) 1997--1999 Han-Wen Nienhuys - Jan Nieuwenhuizen -*/ - -#include "duration-convert.hh" -#include "time-description.hh" -#include "chord-tremolo-engraver.hh" + + (c) 2000--2002 Han-Wen Nienhuys + + */ + +#include "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 "request.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 "music-list.hh" +#include "math.h" // ceil + +/** + 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. -ADD_THIS_TRANSLATOR (Chord_tremolo_engraver); + - create TremoloBeam iso Beam? + */ + +class Chord_tremolo_engraver : public Engraver +{ + void typeset_beam (); +TRANSLATOR_DECLARATIONS(Chord_tremolo_engraver); +protected: + Repeated_music * repeat_; + + /// moment (global time) where beam started. + Moment start_mom_; + Moment stop_mom_; + int flags_ ; + /// location within measure where beam started. + Moment beam_start_location_; + + bool sequential_body_b_; + 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; + sequential_body_b_ = 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)) + Repeated_music * rp = dynamic_cast (m); + if (rp + && rp->get_mus_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; - - if ((d == STOP) && !abeam_p_) - { - m->warning (_ ("No abbreviation beam to end")); - return false; - } - - reqs_drul_[d] = b; + Moment l = rp->get_length (); + repeat_ = rp; + start_mom_ = now_mom (); + stop_mom_ = start_mom_ + l; + sequential_body_b_ = dynamic_cast (rp->body ()); + + Rational total_dur = l.main_part_; + Rational note_dur = (total_dur / Rational (repeat_->repeat_count ())); + flags_ = intlog2 ((total_dur / note_dur).num ()); + return true; } @@ -50,115 +99,126 @@ 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 (!abeam_p_) - reqs_drul_[STOP]->warning (_("No abbreviation beam to end")); - prev_start_req_ = 0; - finished_abeam_p_ = abeam_p_; - abeam_p_ = 0; - } - - if (abeam_p_) + if (repeat_) { - Score_engraver * e = 0; - Translator * t = daddy_grav_l (); - for (; !e && t; t = t->daddy_trans_l_) + if (sequential_body_b_ && !beam_) { - e = dynamic_cast (t); + beam_ = new Spanner (get_property ("Beam")); + beam_->set_grob_property ("chord-tremolo", SCM_BOOL_T); + + SCM smp = get_property ("measurePosition"); + Moment mp + = (unsmob_moment (smp)) ? *unsmob_moment (smp) : Moment (0); + beam_start_location_ = mp; + announce_grob(beam_, repeat_->self_scm()); } - - if (!e) - programming_error ("No score engraver!"); - else - e->forbid_breaks (); - } - - if (reqs_drul_[START]) - { - if (abeam_p_) + else if (!sequential_body_b_ && !stem_tremolo_) { - reqs_drul_[START]->warning (_ ("Already have an abbreviation beam")); - return; - } - prev_start_req_ = reqs_drul_[START]; + if (flags_) + { + stem_tremolo_ = new Item (get_property ("StemTremolo")); + announce_grob(stem_tremolo_, repeat_->self_scm()); + stem_tremolo_->set_grob_property ("flag-count", + scm_int2num (flags_)); - 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 (); + if (finished_beam_) + { + typeset_grob (finished_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_; + Stem::set_beaming (s, flags_, LEFT); + Stem::set_beaming (s, flags_, RIGHT); + + SCM d = s->get_grob_property ("direction"); + if (Stem::duration_log (s) != 1) + { + beam_->set_grob_property ("gap", gh_double2scm (0.8)); + } + s->set_grob_property ("direction", d); - 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 (stem_tremolo_ && Stem::has_interface (info.grob_)) + { + Stem_tremolo::set_stem (stem_tremolo_, info.grob_); + 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 abbreviation 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* s = dynamic_cast (i.elem_l_)) - { - int type_i = prev_start_req_->type_i_; - s->flag_i_ = intlog2 (type_i) - 2; + typeset_beam (); - 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_scm_sym, 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_scm_sym, gh_int2scm(gap_i)); - } -#endif - - abeam_p_->add_stem (s); - } + if (stem_tremolo_) + { + typeset_grob (stem_tremolo_); + stem_tremolo_ = 0; } + } + + + +ENTER_DESCRIPTION(Chord_tremolo_engraver, +/* descr */ "Generates beams for tremolo repeats.", +/* creats*/ "Beam", +/* accepts */ "repeated-music", +/* acks */ "stem-interface note-head-interface", +/* reads */ "", +/* write */ "");