X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fchord-tremolo-engraver.cc;h=8ab127d5eb99546be5f05f9927fcf01f9961af16;hb=04ae3a59a98ccdfa95db5664c88223a5805dc3db;hp=9a9017e663647cefa17ca64aa97ef188cdbfc7ed;hpb=5e3ae52b088d628ddc347b53cd7e42e896e12ba6;p=lilypond.git diff --git a/lily/chord-tremolo-engraver.cc b/lily/chord-tremolo-engraver.cc index 9a9017e663..8ab127d5eb 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--2001 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" @@ -22,8 +22,10 @@ #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. @@ -34,30 +36,28 @@ - create dots if appropriate. - - create TremoloBeam iso Beam? - */ + - 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_; - bool sequential_body_b_; - Spanner * beam_p_; - Spanner * finished_beam_p_; + Spanner * beam_; + Spanner * finished_beam_; Item * stem_tremolo_; protected: virtual void finalize (); @@ -70,9 +70,9 @@ protected: 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; } @@ -82,17 +82,34 @@ 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_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 ()); - // 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; } @@ -104,30 +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_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_); + announce_grob (beam_, repeat_->self_scm ()); } else if (!sequential_body_b_ && !stem_tremolo_) { - int flags = intlog2 (note_head_i_ * repeat_->repeat_count ()) -2; - if (flags) + if (flags_) { - stem_tremolo_ = new Item (get_property ("StemTremolo")); - Stem_tremolo::set_interface (stem_tremolo_); - - announce_grob (stem_tremolo_, repeat_); - stem_tremolo_->set_grob_property ("tremolo-flags", - gh_int2scm (flags)); - + stem_tremolo_ = make_item ("StemTremolo"); + announce_grob (stem_tremolo_, repeat_->self_scm ()); + stem_tremolo_->set_property ("flag-count", + scm_int2num (flags_)); } } } @@ -136,81 +148,57 @@ 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_) + if (beam_ && Stem::has_interface (info.grob_)) { - if (Stem::has_interface (info.elem_l_)) - { - Grob * 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_grob_property ("direction"); - if (Stem::type_i (s) != 1) - { - int gap_i =Stem::flag_i (s) - ((Stem::type_i (s) >? 2) - 2); - beam_p_->set_grob_property ("gap", gh_int2scm (gap_i)); - } - s->set_grob_property ("direction", d); + if (Stem::duration_log (s) != 1) + { + beam_->set_property ("gap-count", gh_int2scm (flags_ - total_duration_flags_)); + } - if (dynamic_cast (info.req_l_)) - { - Beam::add_stem (beam_p_, s); - } + 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 - { - String s = _ ("stem must have Rhythmic structure"); - if (info.req_l_) - info.req_l_->origin ()->warning (s); - else - ::warning (s); - } + ::warning (s); } } - else if (stem_tremolo_ && Stem::has_interface (info.elem_l_)) + else if (stem_tremolo_ && Stem::has_interface (info.grob_)) { - Stem_tremolo::set_stem (stem_tremolo_, info.elem_l_); - - info.elem_l_->set_grob_property ("duration-log", gh_int2scm (intlog2 (note_head_i_))); - } - - - if (repeat_ && Note_head::has_interface (info.elem_l_)) - { - info.elem_l_->set_grob_property ("duration-log", gh_int2scm (intlog2 (note_head_i_))); + Stem_tremolo::set_stem (stem_tremolo_, info.grob_); + stem_tremolo_->set_parent (info.grob_,X_AXIS); } } @@ -218,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; } } @@ -238,8 +225,14 @@ Chord_tremolo_engraver::stop_translation_timestep () typeset_grob (stem_tremolo_); stem_tremolo_ = 0; } - } -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 */ "");