X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fchord-tremolo-engraver.cc;h=b7ecae6d21186e3e7941937cbed768e3e43e1409;hb=3548eacf9da6dddfdd5a9ca2dc15d055a0a9a5e2;hp=e504bdeadbe213cc32337174a2ad29e6ca726533;hpb=9b40d66187029df3dca86fc5ecc65f64db315a48;p=lilypond.git diff --git a/lily/chord-tremolo-engraver.cc b/lily/chord-tremolo-engraver.cc index e504bdeadb..b7ecae6d21 100644 --- a/lily/chord-tremolo-engraver.cc +++ b/lily/chord-tremolo-engraver.cc @@ -1,209 +1,223 @@ /* - new-chord-tremolo-engraver.cc -- implement Chord_tremolo_engraver + new-chord-tremolo-engraver.cc -- implement Chord_tremolo_engraver - source file of the GNU LilyPond music typesetter + source file of the GNU LilyPond music typesetter - (c) 2000 Han-Wen Nienhuys + (c) 2000--2004 Han-Wen Nienhuys - */ +*/ -#include "engraver.hh" #include "beam.hh" #include "repeated-music.hh" #include "stem.hh" #include "rhythmic-head.hh" #include "engraver-group-engraver.hh" -#include "musical-request.hh" #include "warn.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: +This acknowledges repeated music with "tremolo" style. It typesets +a beam. - - perhaps use engraver this to steer other engravers? That would - create dependencies between engravers, which is bad. +TODO: - - create dots if appropriate. +- 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 (); -public: - VIRTUAL_COPY_CONS(Translator); - Chord_tremolo_engraver(); + TRANSLATOR_DECLARATIONS (Chord_tremolo_engraver); protected: Repeated_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_; - int note_head_i_; - - Spanner * beam_p_; - Spanner * finished_beam_p_; - + bool sequential_body_b_; + Spanner * beam_; + Spanner * finished_beam_; + Item * stem_tremolo_; 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(); + 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() +Chord_tremolo_engraver::Chord_tremolo_engraver () { - beam_p_ = finished_beam_p_ = 0; + beam_ = finished_beam_ = 0; repeat_ =0; - note_head_i_ = 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) { Repeated_music * rp = dynamic_cast (m); - if (rp && rp->type_ == "tremolo" && !repeat_) + if (rp + && rp->get_property ("iterator-ctor") == Chord_tremolo_iterator::constructor_proc + && !repeat_) { - Moment l = rp->body_length_mom (); + Moment l = rp->get_length (); repeat_ = rp; start_mom_ = now_mom (); stop_mom_ = start_mom_ + l; - // ugh. should generate dots, triplet beams. - note_head_i_ = l.den () (rp->body ()); + sequential_body_b_ = seq; + + int elt_count = seq ? scm_ilength (seq-> music_list ()) : 1; + + if (seq && elt_count != 2) + { + rp->origin ()->warning (_f ("Chord tremolo with %d elements. Must have two elements.", elt_count)); + } + + if (elt_count <= 0) + elt_count = 1; + + Rational total_dur = l.main_part_; + Rational note_dur = total_dur / Rational (elt_count * repeat_->repeat_count ()); + + total_duration_flags_ = 0 >? (intlog2 (total_dur.den ()) - 2); + + flags_ = intlog2 (note_dur.den ()) -2 ; + return true; } + return false; } void -Chord_tremolo_engraver::do_process_music () +Chord_tremolo_engraver::process_music () { - if (repeat_ && !beam_p_) + if (repeat_ && sequential_body_b_ && !beam_) { - beam_p_ = new Spanner (get_property ("Beam")); - Beam::set_interface (beam_p_); - beam_p_->set_elt_property ("chord-tremolo", SCM_BOOL_T); + beam_ = make_spanner ("Beam", repeat_->self_scm ()); + beam_->set_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_element (beam_p_, repeat_); + beam_start_location_ = robust_scm2moment (get_property ("measurePosition"), Moment (0)); } } - void -Chord_tremolo_engraver::do_removal_processing () +Chord_tremolo_engraver::finalize () { typeset_beam (); - if (beam_p_) + if (beam_) { repeat_->origin ()->warning (_ ("unterminated chord tremolo")); -#if 0 - finished_beam_p_ = beam_p_; - typeset_beam (); -#else - beam_p_->suicide (); -#endif + beam_->suicide (); } } void Chord_tremolo_engraver::typeset_beam () { - if (finished_beam_p_) - { - typeset_element (finished_beam_p_); - finished_beam_p_ = 0; - } + finished_beam_ = 0; } - void -Chord_tremolo_engraver::acknowledge_element (Score_element_info info) +Chord_tremolo_engraver::acknowledge_grob (Grob_info info) { - if (beam_p_) + if (beam_ && Stem::has_interface (info.grob_)) { - if (Stem::has_interface (info.elem_l_)) - { - Score_element * s = info.elem_l_; - int f = Stem::flag_i (s); - f = (f > 2) ? f - 2 : 1; - Stem::set_beaming (s, f, LEFT); - Stem::set_beaming (s, f, RIGHT); + Grob * s = info.grob_; + + if (start_mom_ == now_mom ()) + Stem::set_beaming (s, flags_, RIGHT); + else + Stem::set_beaming (s, flags_, LEFT); - /* - URG: this sets the direction of the Stem s. - It's amazing Mike: - - Stem:: type_i () ->first_head ()->get_direction () -> - Directional_element_interface::set (me, d); - - - don't understand this comment. - --hwn. - */ - SCM d = s->get_elt_property ("direction"); - if (Stem::type_i (s ) != 1) - { - int gap_i =Stem::flag_i (s ) - ((Stem::type_i (s ) >? 2) - 2); - beam_p_->set_elt_property ("beam-gap", gh_int2scm(gap_i)); - } - s->set_elt_property ("direction", d); - - if (dynamic_cast (info.req_l_)) - { - Beam::add_stem (beam_p_, s); - } - else - { - String s = _ ("stem must have Rhythmic structure"); - if (info.req_l_) - info.req_l_->origin ()->warning (s); - else - ::warning (s); - } + if (Stem::duration_log (s) != 1) + { + beam_->set_property ("gap-count", scm_int2num (flags_ - total_duration_flags_)); } - if (Note_head::has_interface (info.elem_l_)) + + if (info.music_cause ()->is_mus_type ("rhythmic-event")) + { + Beam::add_stem (beam_, s); + } + else { - info.elem_l_->set_elt_property ("duration-log", gh_int2scm (intlog2 (note_head_i_))); + String s = _ ("stem must have Rhythmic structure"); + if (info.music_cause ()) + info.music_cause ()->origin ()->warning (s); + else + ::warning (s); } } + else if (repeat_ && + flags_ && !sequential_body_b_ && 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_post_move_processing () +Chord_tremolo_engraver::start_translation_timestep () { - if (beam_p_ && stop_mom_ == now_mom ()) + if (beam_ && stop_mom_ == now_mom ()) { - finished_beam_p_ = beam_p_; - + finished_beam_ = beam_; repeat_ = 0; - beam_p_ = 0; + beam_ = 0; } } void -Chord_tremolo_engraver::do_pre_move_processing () +Chord_tremolo_engraver::stop_translation_timestep () { + if (stem_tremolo_) + { + repeat_ = 0; + if (beam_) + programming_error ("Huh, beam and stem tremolo?"); + stem_tremolo_ = 0; + } + typeset_beam (); } -ADD_THIS_TRANSLATOR(Chord_tremolo_engraver); + +ENTER_DESCRIPTION (Chord_tremolo_engraver, +/* descr */ "Generates beams for tremolo repeats.", +/* creats*/ "Beam", +/* accepts */ "repeated-music", +/* acks */ "stem-interface note-head-interface", +/* reads */ "", +/* write */ "");