X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fchord-tremolo-engraver.cc;h=7bb5d93a2b17bf7b729d346566b53b80b639690d;hb=1402d6d957bee7d47e0bddf4c57dd89912182b26;hp=05981c4c33287c3f06a6f22a0d63e0d076bac0fe;hpb=6b9bfd374643d1eed1ea158777d796c57a2bcd3a;p=lilypond.git diff --git a/lily/chord-tremolo-engraver.cc b/lily/chord-tremolo-engraver.cc index 05981c4c33..7bb5d93a2b 100644 --- a/lily/chord-tremolo-engraver.cc +++ b/lily/chord-tremolo-engraver.cc @@ -1,97 +1,108 @@ -/* - new-chord-tremolo-engraver.cc -- implement Chord_tremolo_engraver - +/* + chord-tremolo-engraver.cc -- implement Chord_tremolo_engraver + source file of the GNU LilyPond music typesetter - - (c) 2000--2002 Han-Wen Nienhuys - - */ -#include "engraver.hh" + (c) 2000--2005 Han-Wen Nienhuys +*/ + #include "beam.hh" #include "repeated-music.hh" #include "stem.hh" #include "rhythmic-head.hh" #include "engraver-group-engraver.hh" -#include "musical-request.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 +#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_; + Music *repeat_; /// moment (global time) where beam started. Moment start_mom_; Moment stop_mom_; - int flags_ ; + int flags_; + int total_duration_flags_; + /// location within measure where beam started. Moment beam_start_location_; - bool sequential_body_b_; - Spanner * beam_; - Spanner * finished_beam_; - Item * stem_tremolo_; + bool body_is_sequential_; + Spanner *beam_; + Spanner *finished_beam_; + Item *stem_tremolo_; protected: virtual void finalize (); - virtual bool try_music (Music*); + 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 (); + PRECOMPUTED_VIRTUAL void stop_translation_timestep (); + PRECOMPUTED_VIRTUAL void start_translation_timestep (); + PRECOMPUTED_VIRTUAL void process_music (); }; Chord_tremolo_engraver::Chord_tremolo_engraver () { - beam_ = finished_beam_ = 0; - repeat_ =0; + beam_ = finished_beam_ = 0; + repeat_ = 0; flags_ = 0; stem_tremolo_ = 0; - sequential_body_b_ = false; + body_is_sequential_ = false; } bool -Chord_tremolo_engraver::try_music (Music * m) +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 - && !repeat_) + if (m->is_mus_type ("repeated-music") + && m->get_property ("iterator-ctor") == Chord_tremolo_iterator::constructor_proc + && !repeat_) { - Moment l = rp->length_mom (); - repeat_ = rp; + Moment l = m->get_length (); + repeat_ = m; start_mom_ = now_mom (); stop_mom_ = start_mom_ + l; - sequential_body_b_ = dynamic_cast (rp->body ()); + + 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 (body_is_sequential_ && elt_count != 2) + { + m->origin ()->warning (_f ("expect 2 elements for chord tremolo, found %d", 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 * Repeated_music::repeat_count (repeat_)); + + total_duration_flags_ = max (0, (intlog2 (total_dur.den ()) - 2)); + + flags_ = intlog2 (note_dur.den ()) -2; + return true; } @@ -101,33 +112,15 @@ Chord_tremolo_engraver::try_music (Music * m) void Chord_tremolo_engraver::process_music () { - if (repeat_) + if (repeat_ && body_is_sequential_ && !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_) - { + beam_ = make_spanner ("Beam", repeat_->self_scm ()); + beam_->set_property ("chord-tremolo", SCM_BOOL_T); - 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_start_location_ = robust_scm2moment (get_property ("measurePosition"), Moment (0)); } } + void Chord_tremolo_engraver::finalize () { @@ -142,31 +135,27 @@ 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_)) + if (beam_ && Stem::has_interface (info.grob ())) { - Grob * s = info.grob_; - Stem::set_beaming (s, flags_, LEFT); - Stem::set_beaming (s, flags_, RIGHT); - - SCM d = s->get_grob_property ("direction"); + Grob *s = info.grob (); + + if (start_mom_ == now_mom ()) + Stem::set_beaming (s, flags_, RIGHT); + else + Stem::set_beaming (s, flags_, LEFT); + 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 (dynamic_cast (info.music_cause ())) + if (info.music_cause ()->is_mus_type ("rhythmic-event")) { Beam::add_stem (beam_, s); } @@ -179,46 +168,51 @@ Chord_tremolo_engraver::acknowledge_grob (Grob_info info) ::warning (s); } } - else if (stem_tremolo_ && Stem::has_interface (info.grob_)) + else if (repeat_ + && flags_ + && !body_is_sequential_ + && 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_object ("stem", + info.grob ()->self_scm ()); + stem_tremolo_->set_parent (info.grob (), X_AXIS); } } - void Chord_tremolo_engraver::start_translation_timestep () { if (beam_ && stop_mom_ == now_mom ()) { finished_beam_ = beam_; - repeat_ = 0; beam_ = 0; } } - void Chord_tremolo_engraver::stop_translation_timestep () { - typeset_beam (); - if (stem_tremolo_) { - typeset_grob (stem_tremolo_); + repeat_ = 0; + if (beam_) + programming_error ("beam and stem tremolo?"); stem_tremolo_ = 0; } - -} + typeset_beam (); +} +#include "translator.icc" -ENTER_DESCRIPTION(Chord_tremolo_engraver, -/* descr */ "Generates beams for tremolo repeats.", -/* creats*/ "Beam", -/* accepts */ "general-music", -/* acks */ "stem-interface note-head-interface", -/* reads */ "", -/* write */ ""); +ADD_TRANSLATOR (Chord_tremolo_engraver, + /* descr */ "Generates beams for tremolo repeats.", + /* creats*/ "Beam", + /* accepts */ "repeated-music", + /* acks */ "stem-interface", + /* reads */ "", + /* write */ "");