X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fchord-tremolo-engraver.cc;h=efc8e74a05aed28ffb57c77fb5ba02c3c06246b4;hb=10fce7970987502ec8340819411897a829f6be23;hp=4272ec2bef599fdb0bc5affa4a567a06c2a593bc;hpb=94a1966c72301b8bd1d8bb3b8628c3f089d007cf;p=lilypond.git diff --git a/lily/chord-tremolo-engraver.cc b/lily/chord-tremolo-engraver.cc index 4272ec2bef..efc8e74a05 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--2004 Han-Wen Nienhuys + (c) 2000--2005 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 "event.hh" #include "warn.hh" #include "misc.hh" #include "note-head.hh" @@ -21,22 +19,21 @@ #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. +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 @@ -44,7 +41,7 @@ class Chord_tremolo_engraver : public Engraver void typeset_beam (); TRANSLATOR_DECLARATIONS (Chord_tremolo_engraver); protected: - Repeated_music * repeat_; + Music * repeat_; /// moment (global time) where beam started. Moment start_mom_; @@ -55,7 +52,7 @@ protected: /// location within measure where beam started. Moment beam_start_location_; - bool sequential_body_b_; + bool body_is_sequential_; Spanner * beam_; Spanner * finished_beam_; Item * stem_tremolo_; @@ -71,40 +68,40 @@ protected: Chord_tremolo_engraver::Chord_tremolo_engraver () { beam_ = finished_beam_ = 0; - repeat_ =0; + repeat_ = 0; flags_ = 0; stem_tremolo_ = 0; - sequential_body_b_ = false; + body_is_sequential_ = false; } bool Chord_tremolo_engraver::try_music (Music * m) { - Repeated_music * rp = dynamic_cast (m); - if (rp - && rp->get_property ("iterator-ctor") == Chord_tremolo_iterator::constructor_proc + if (m->is_mus_type ("repeated-music") + && m->get_property ("iterator-ctor") == Chord_tremolo_iterator::constructor_proc && !repeat_) { - Moment l = rp->get_length (); - repeat_ = rp; + Moment l = m->get_length (); + repeat_ = m; start_mom_ = now_mom (); stop_mom_ = start_mom_ + l; - Sequential_music * seq = dynamic_cast (rp->body ()); - sequential_body_b_ = seq; - int elt_count = seq ? scm_ilength (seq-> music_list ()) : 1; + Music *body = Repeated_music::body (m); + body_is_sequential_ = body->is_mus_type ("sequential-music"); + + int elt_count = body_is_sequential_ ? scm_ilength (body->get_property ("elements")) : 1; - if (seq && elt_count != 2) + if (body_is_sequential_ && elt_count != 2) { - rp->origin ()->warning (_f ("Chord tremolo with %d elements. Must have two elements.", elt_count)); + m->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 ()); + Rational note_dur = total_dur / Rational (elt_count * Repeated_music::repeat_count (repeat_)); total_duration_flags_ = 0 >? (intlog2 (total_dur.den ()) - 2); @@ -119,17 +116,13 @@ Chord_tremolo_engraver::try_music (Music * m) void Chord_tremolo_engraver::process_music () { - if (repeat_ && sequential_body_b_ && !beam_) - { - 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_, repeat_->self_scm ()); - } + if (repeat_ && body_is_sequential_ && !beam_) + { + 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 @@ -146,11 +139,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 @@ -184,10 +173,9 @@ Chord_tremolo_engraver::acknowledge_grob (Grob_info info) } } else if (repeat_ && - flags_ && !sequential_body_b_ && Stem::has_interface (info.grob_)) + flags_ && !body_is_sequential_ && Stem::has_interface (info.grob_)) { - stem_tremolo_ = make_item ("StemTremolo"); - announce_grob (stem_tremolo_, repeat_->self_scm ()); + stem_tremolo_ = make_item ("StemTremolo", repeat_->self_scm ()); stem_tremolo_->set_property ("flag-count", scm_int2num (flags_)); stem_tremolo_->set_property ("stem", @@ -212,18 +200,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, +ADD_TRANSLATOR (Chord_tremolo_engraver, /* descr */ "Generates beams for tremolo repeats.", /* creats*/ "Beam", /* accepts */ "repeated-music",