X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fchord-tremolo-engraver.cc;h=ab2dc0d39a979525dc49c1382fed3a451ca73e35;hb=3351938e1a606aba14c1722fa5cb1924eaa4f526;hp=983676ccc3e2b55003f2836acf67d3c628b3eb9e;hpb=2bf5899dc541498d9573576b2a057985e20d4596;p=lilypond.git diff --git a/lily/chord-tremolo-engraver.cc b/lily/chord-tremolo-engraver.cc index 983676ccc3..ab2dc0d39a 100644 --- a/lily/chord-tremolo-engraver.cc +++ b/lily/chord-tremolo-engraver.cc @@ -1,11 +1,11 @@ /* - 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--2003 Han-Wen Nienhuys + (c) 2000--2004 Han-Wen Nienhuys - */ +*/ #include "engraver.hh" #include "beam.hh" @@ -26,23 +26,23 @@ /** - This acknowledges repeated music with "tremolo" style. It typesets - a beam. +This acknowledges repeated music with "tremolo" style. It typesets +a beam. - TODO: +TODO: - - perhaps use engraver this to steer other engravers? That would - create dependencies between engravers, which is bad. +- perhaps use engraver this to steer other engravers? That would +create dependencies between engravers, which is bad. - - create dots if appropriate. +- 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_; @@ -50,6 +50,8 @@ protected: Moment start_mom_; Moment stop_mom_; int flags_ ; + int total_duration_flags_; + /// location within measure where beam started. Moment beam_start_location_; @@ -80,7 +82,7 @@ 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 (); @@ -93,7 +95,7 @@ Chord_tremolo_engraver::try_music (Music * m) int elt_count = seq ? scm_ilength (seq-> music_list ()) : 1; - if (elt_count != 2) + if (seq && elt_count != 2) { rp->origin ()->warning (_f ("Chord tremolo with %d elements. Must have two elements.", elt_count)); } @@ -104,13 +106,7 @@ Chord_tremolo_engraver::try_music (Music * m) Rational total_dur = l.main_part_; Rational note_dur = total_dur / Rational (elt_count * repeat_->repeat_count ()); - if (total_dur < Rational (1,4)) - { - /* - This would require beams between flagged (8th) notes. - */ - rp->origin ()->warning ("Chord tremolo is too short to denote properly."); - } + total_duration_flags_ = 0 >? (intlog2 (total_dur.den ()) - 2); flags_ = intlog2 (note_dur.den ()) -2 ; @@ -123,31 +119,18 @@ 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); + + SCM smp = get_property ("measurePosition"); + Moment mp + = (unsmob_moment (smp)) ? *unsmob_moment (smp) : Moment (0); + beam_start_location_ = mp; } } + void Chord_tremolo_engraver::finalize () { @@ -162,11 +145,7 @@ Chord_tremolo_engraver::finalize () void Chord_tremolo_engraver::typeset_beam () { - if (finished_beam_) - { - typeset_grob (finished_beam_); - finished_beam_ = 0; - } + finished_beam_ = 0; } void @@ -176,17 +155,15 @@ Chord_tremolo_engraver::acknowledge_grob (Grob_info info) { Grob * s = info.grob_; - if (start_mom_ == now_mom()) + 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")) { @@ -201,10 +178,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); } } @@ -224,18 +206,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",