X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fchord-tremolo-engraver.cc;h=b7ecae6d21186e3e7941937cbed768e3e43e1409;hb=3548eacf9da6dddfdd5a9ca2dc15d055a0a9a5e2;hp=bf3859264f73afd4ba2220e14b806f9c862f1a58;hpb=051d7e7cbdbbe5f5337ab2b477b0bd1e72eedd04;p=lilypond.git diff --git a/lily/chord-tremolo-engraver.cc b/lily/chord-tremolo-engraver.cc index bf3859264f..b7ecae6d21 100644 --- a/lily/chord-tremolo-engraver.cc +++ b/lily/chord-tremolo-engraver.cc @@ -1,19 +1,17 @@ /* - 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--2002 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 "request.hh" #include "warn.hh" #include "misc.hh" #include "note-head.hh" @@ -25,23 +23,24 @@ #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 TremoloBeam iso Beam? - */ +- create dots if appropriate. +- 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_; @@ -49,6 +48,8 @@ protected: Moment start_mom_; Moment stop_mom_; int flags_ ; + int total_duration_flags_; + /// location within measure where beam started. Moment beam_start_location_; @@ -79,18 +80,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_proc + && rp->get_property ("iterator-ctor") == Chord_tremolo_iterator::constructor_proc && !repeat_) { 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_ = 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; } @@ -101,33 +117,15 @@ Chord_tremolo_engraver::try_music (Music * m) void Chord_tremolo_engraver::process_music () { - if (repeat_) + if (repeat_ && sequential_body_b_ && !beam_) { - if (sequential_body_b_ && !beam_) - { - 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()); - } - else if (!sequential_body_b_ && !stem_tremolo_) - { - - 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_)); + beam_ = make_spanner ("Beam", repeat_->self_scm ()); + beam_->set_property ("chord-tremolo", SCM_BOOL_T); - } - } + beam_start_location_ = robust_scm2moment (get_property ("measurePosition"), Moment (0)); } } + void Chord_tremolo_engraver::finalize () { @@ -142,29 +140,25 @@ Chord_tremolo_engraver::finalize () void Chord_tremolo_engraver::typeset_beam () { - if (finished_beam_) - { - typeset_grob (finished_beam_); - finished_beam_ = 0; - } + finished_beam_ = 0; } - void Chord_tremolo_engraver::acknowledge_grob (Grob_info info) { if (beam_ && Stem::has_interface (info.grob_)) { Grob * s = info.grob_; - Stem::set_beaming (s, flags_, LEFT); - Stem::set_beaming (s, flags_, RIGHT); + + 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_->set_grob_property ("gap", gh_double2scm (0.8)); + beam_->set_property ("gap-count", scm_int2num (flags_ - total_duration_flags_)); } - s->set_grob_property ("direction", d); if (info.music_cause ()->is_mus_type ("rhythmic-event")) { @@ -179,10 +173,15 @@ Chord_tremolo_engraver::acknowledge_grob (Grob_info info) ::warning (s); } } - else if (stem_tremolo_ && Stem::has_interface (info.grob_)) + else if (repeat_ && + flags_ && !sequential_body_b_ && Stem::has_interface (info.grob_)) { - Stem_tremolo::set_stem (stem_tremolo_, info.grob_); - stem_tremolo_->set_parent (info.grob_,X_AXIS); + 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); } } @@ -193,7 +192,6 @@ Chord_tremolo_engraver::start_translation_timestep () if (beam_ && stop_mom_ == now_mom ()) { finished_beam_ = beam_; - repeat_ = 0; beam_ = 0; } @@ -203,19 +201,20 @@ Chord_tremolo_engraver::start_translation_timestep () void Chord_tremolo_engraver::stop_translation_timestep () { - typeset_beam (); - if (stem_tremolo_) { - typeset_grob (stem_tremolo_); + repeat_ = 0; + if (beam_) + programming_error ("Huh, beam and stem tremolo?"); stem_tremolo_ = 0; } - + + typeset_beam (); } -ENTER_DESCRIPTION(Chord_tremolo_engraver, +ENTER_DESCRIPTION (Chord_tremolo_engraver, /* descr */ "Generates beams for tremolo repeats.", /* creats*/ "Beam", /* accepts */ "repeated-music",