X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fchord-tremolo-engraver.cc;h=49d62e12de9edcd0d9f0c35577296423be4906c8;hb=7e72a1e50e94a7f9738d62599de79fe7745f600c;hp=63626bd0227cead1ca1466383f7e07b8f4d6b532;hpb=9661ba1fb275f3e14f8a69f2cee2f02a2f893e48;p=lilypond.git diff --git a/lily/chord-tremolo-engraver.cc b/lily/chord-tremolo-engraver.cc index 63626bd022..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 Han-Wen Nienhuys + (c) 2000--2004 Han-Wen Nienhuys */ @@ -13,14 +13,19 @@ #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" #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. @@ -31,177 +36,203 @@ - 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_mus_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_) { - beam_p_ = new Spanner (get_property ("basicBeamProperties")); - Beam::set_interface (beam_p_); - beam_p_->set_elt_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_); + if (sequential_body_b_ && !beam_) + { + 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_, repeat_->self_scm()); + } + else if (!sequential_body_b_ && !stem_tremolo_) + { + if (flags_) + { + stem_tremolo_ = make_item ("StemTremolo"); + announce_grob(stem_tremolo_, repeat_->self_scm()); + stem_tremolo_->set_grob_property ("flag-count", + scm_int2num (flags_)); + } + } } } - - void -Chord_tremolo_engraver::do_removal_processing () +Chord_tremolo_engraver::finalize () { typeset_beam (); - if (beam_p_) + if (beam_) { repeat_->origin ()->warning (_ ("unterminated chord tremolo")); - finished_beam_p_ = beam_p_; - typeset_beam (); + beam_->suicide (); } } void Chord_tremolo_engraver::typeset_beam () { - if (finished_beam_p_) + if (finished_beam_) { - typeset_element (finished_beam_p_); - finished_beam_p_ = 0; + typeset_grob (finished_beam_); + 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 (me).set (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 (Stem::duration_log (s) != 1) + { + beam_->set_grob_property ("gap-count", gh_int2scm (flags_ - total_duration_flags_)); + } - if (Rhythmic_req* r = dynamic_cast (info.req_l_)) - { - Beam::add_stem (beam_p_, s); - Moment stem_location = now_mom () - - start_mom_ + beam_start_location_; - } - else - { - String s = _ ("stem must have Rhythmic structure"); - if (info.req_l_) - info.req_l_->origin ()->warning (s); - else - ::warning (s); - } + if (info.music_cause ()->is_mus_type ("rhythmic-event")) + { + Beam::add_stem (beam_, s); } - if (Note_head::has_interface (info.elem_l_)) + 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 (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_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 () { typeset_beam (); + + if (stem_tremolo_) + { + 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 */ "");