X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fchord-tremolo-engraver.cc;h=49d62e12de9edcd0d9f0c35577296423be4906c8;hb=7e72a1e50e94a7f9738d62599de79fe7745f600c;hp=2bf00410fb52db4b50a08657a4ad07047135658a;hpb=8e7c61da2807da363e25c2d80bd0d69616dadea8;p=lilypond.git diff --git a/lily/chord-tremolo-engraver.cc b/lily/chord-tremolo-engraver.cc index 2bf00410fb..49d62e12de 100644 --- a/lily/chord-tremolo-engraver.cc +++ b/lily/chord-tremolo-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2002 Han-Wen Nienhuys + (c) 2000--2004 Han-Wen Nienhuys */ @@ -13,7 +13,7 @@ #include "stem.hh" #include "rhythmic-head.hh" #include "engraver-group-engraver.hh" -#include "musical-request.hh" +#include "event.hh" #include "warn.hh" #include "misc.hh" #include "note-head.hh" @@ -25,6 +25,7 @@ #include "math.h" // ceil /** + This acknowledges repeated music with "tremolo" style. It typesets a beam. @@ -35,26 +36,28 @@ - create dots if appropriate. - - create TremoloBeam iso Beam? - */ + - create TremoloBeam iso Beam? +*/ class Chord_tremolo_engraver : public Engraver { void typeset_beam (); -TRANSLATOR_DECLARATIONS(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_i_ ; + int flags_ ; + int total_duration_flags_; + /// location within measure where beam started. Moment beam_start_location_; bool sequential_body_b_; - Spanner * beam_p_; - Spanner * finished_beam_p_; + Spanner * beam_; + Spanner * finished_beam_; Item * stem_tremolo_; protected: virtual void finalize (); @@ -67,9 +70,9 @@ protected: Chord_tremolo_engraver::Chord_tremolo_engraver () { - beam_p_ = finished_beam_p_ = 0; + beam_ = finished_beam_ = 0; repeat_ =0; - flags_i_ = 0; + flags_ = 0; stem_tremolo_ = 0; sequential_body_b_ = false; } @@ -79,18 +82,33 @@ Chord_tremolo_engraver::try_music (Music * m) { Repeated_music * rp = dynamic_cast (m); if (rp - && rp->get_mus_property ("iterator-ctor") == Chord_tremolo_iterator::constructor_cxx_function + && rp->get_mus_property ("iterator-ctor") == Chord_tremolo_iterator::constructor_proc && !repeat_) { - Moment l = rp->length_mom (); + Moment l = rp->get_length (); repeat_ = rp; start_mom_ = now_mom (); stop_mom_ = start_mom_ + l; - sequential_body_b_ = dynamic_cast (rp->body ()); + Sequential_music * seq = dynamic_cast (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 (repeat_->repeat_count ())); - flags_i_ = intlog2 ((total_dur / note_dur).num ()); + 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; } @@ -103,27 +121,25 @@ Chord_tremolo_engraver::process_music () { if (repeat_) { - if (sequential_body_b_ && !beam_p_) + if (sequential_body_b_ && !beam_) { - beam_p_ = new Spanner (get_property ("Beam")); - beam_p_->set_grob_property ("chord-tremolo", SCM_BOOL_T); + beam_ = make_spanner ("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_p_, repeat_->self_scm()); + announce_grob(beam_, repeat_->self_scm()); } else if (!sequential_body_b_ && !stem_tremolo_) { - - if (flags_i_) + if (flags_) { - stem_tremolo_ = new Item (get_property ("StemTremolo")); + stem_tremolo_ = make_item ("StemTremolo"); announce_grob(stem_tremolo_, repeat_->self_scm()); stem_tremolo_->set_grob_property ("flag-count", - gh_int2scm (flags_i_)); - + scm_int2num (flags_)); } } } @@ -132,43 +148,43 @@ void Chord_tremolo_engraver::finalize () { typeset_beam (); - if (beam_p_) + if (beam_) { repeat_->origin ()->warning (_ ("unterminated chord tremolo")); - beam_p_->suicide (); + beam_->suicide (); } } void Chord_tremolo_engraver::typeset_beam () { - if (finished_beam_p_) + if (finished_beam_) { - typeset_grob (finished_beam_p_); - finished_beam_p_ = 0; + typeset_grob (finished_beam_); + finished_beam_ = 0; } } - void Chord_tremolo_engraver::acknowledge_grob (Grob_info info) { - if (beam_p_ && Stem::has_interface (info.grob_l_)) + if (beam_ && Stem::has_interface (info.grob_)) { - Grob * s = info.grob_l_; - Stem::set_beaming (s, flags_i_, LEFT); - Stem::set_beaming (s, flags_i_, RIGHT); + Grob * s = info.grob_; + + if (start_mom_ == now_mom()) + Stem::set_beaming (s, flags_, RIGHT); + else + Stem::set_beaming (s, flags_, LEFT); - SCM d = s->get_grob_property ("direction"); if (Stem::duration_log (s) != 1) { - beam_p_->set_grob_property ("gap", gh_double2scm (0.8)); + beam_->set_grob_property ("gap-count", gh_int2scm (flags_ - total_duration_flags_)); } - s->set_grob_property ("direction", d); - if (dynamic_cast (info.music_cause ())) + if (info.music_cause ()->is_mus_type ("rhythmic-event")) { - Beam::add_stem (beam_p_, s); + Beam::add_stem (beam_, s); } else { @@ -179,10 +195,10 @@ Chord_tremolo_engraver::acknowledge_grob (Grob_info info) ::warning (s); } } - else if (stem_tremolo_ && Stem::has_interface (info.grob_l_)) + else if (stem_tremolo_ && Stem::has_interface (info.grob_)) { - Stem_tremolo::set_stem (stem_tremolo_, info.grob_l_); - stem_tremolo_->set_parent (info.grob_l_,X_AXIS); + Stem_tremolo::set_stem (stem_tremolo_, info.grob_); + stem_tremolo_->set_parent (info.grob_,X_AXIS); } } @@ -190,12 +206,11 @@ Chord_tremolo_engraver::acknowledge_grob (Grob_info info) void 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; } } @@ -210,7 +225,6 @@ Chord_tremolo_engraver::stop_translation_timestep () typeset_grob (stem_tremolo_); stem_tremolo_ = 0; } - } @@ -218,6 +232,7 @@ Chord_tremolo_engraver::stop_translation_timestep () ENTER_DESCRIPTION(Chord_tremolo_engraver, /* descr */ "Generates beams for tremolo repeats.", /* creats*/ "Beam", -/* acks */ "stem-interface note-head-interface", +/* accepts */ "repeated-music", +/* acks */ "stem-interface note-head-interface", /* reads */ "", /* write */ "");