X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fchord-tremolo-engraver.cc;h=d28af332f6e892053a42a17c223da2380e9255c9;hb=6c68e65859bae109509e1c464fdfca6de4b5ddd1;hp=e990addf9b939462b3a5689cfe7f537a4f4caf6e;hpb=16552264e655926b1c54825a2b0f8778be4235fe;p=lilypond.git diff --git a/lily/chord-tremolo-engraver.cc b/lily/chord-tremolo-engraver.cc index e990addf9b..d28af332f6 100644 --- a/lily/chord-tremolo-engraver.cc +++ b/lily/chord-tremolo-engraver.cc @@ -1,98 +1,110 @@ -/* - 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 Han-Wen Nienhuys - - */ -#include "engraver.hh" + (c) 2000--2006 Han-Wen Nienhuys +*/ + +#include "math.h" // ceil + #include "beam.hh" +#include "chord-tremolo-iterator.hh" +#include "engraver-group.hh" +#include "international.hh" +#include "item.hh" +#include "misc.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 "stem.hh" +#include "warn.hh" + +#include "translator.icc" /** - 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 (); -public: - VIRTUAL_COPY_CONS(Translator); - 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 total_duration_flags_; /// location within measure where beam started. Moment beam_start_location_; - int note_head_i_; - - bool sequential_body_b_; - Spanner * beam_p_; - Spanner * finished_beam_p_; - 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 void acknowledge_grob (Grob_info); - virtual void stop_translation_timestep(); - virtual void start_translation_timestep(); - virtual void process_music (); + virtual void finalize (); + virtual bool try_music (Music *); + void stop_translation_timestep (); + void start_translation_timestep (); + void process_music (); + DECLARE_ACKNOWLEDGER (stem); }; -Chord_tremolo_engraver::Chord_tremolo_engraver() +Chord_tremolo_engraver::Chord_tremolo_engraver () { - beam_p_ = finished_beam_p_ = 0; - repeat_ =0; - note_head_i_ = 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_cxx_function - && !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 ()); - // ugh. should generate dots, triplet beams. - note_head_i_ = l.den () 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 (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; } @@ -102,145 +114,100 @@ 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_p_) - { - beam_p_ = new Spanner (get_property ("Beam")); - Beam::set_interface (beam_p_); - beam_p_->set_grob_property ("chord-tremolo", SCM_BOOL_T); - + 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; - announce_grob (beam_p_, repeat_); - } - else if (!sequential_body_b_ && !stem_tremolo_) - { - int flags = intlog2(note_head_i_ * repeat_->repeat_count ()) -2; - if (flags) - { - stem_tremolo_ = new Item (get_property ("StemTremolo")); - Stem_tremolo::set_interface (stem_tremolo_); - - announce_grob (stem_tremolo_, repeat_); - stem_tremolo_->set_grob_property ("tremolo-flags", - gh_int2scm (flags)); - - } - } + beam_start_location_ = robust_scm2moment (get_property ("measurePosition"), Moment (0)); } } + void Chord_tremolo_engraver::finalize () { typeset_beam (); - if (beam_p_) + if (beam_) { repeat_->origin ()->warning (_ ("unterminated chord tremolo")); - beam_p_->suicide (); + beam_->suicide (); } } void Chord_tremolo_engraver::typeset_beam () { - if (finished_beam_p_) - { - typeset_grob (finished_beam_p_); - finished_beam_p_ = 0; - } + finished_beam_ = 0; } - void -Chord_tremolo_engraver::acknowledge_grob (Grob_info info) +Chord_tremolo_engraver::acknowledge_stem (Grob_info info) { - if (beam_p_) + if (beam_) { - if (Stem::has_interface (info.elem_l_)) + 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_property ("gap-count", scm_from_int (flags_ - total_duration_flags_)); + + if (info.ultimate_music_cause ()->is_mus_type ("rhythmic-event")) + Beam::add_stem (beam_, s); + else { - Grob * 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); - - /* - URG: this sets the direction of the Stem s. - It's amazing Mike: - - Stem:: type_i () ->first_head ()->get_direction () -> - Directional_element_interface::set (me, d); - - - don't understand this comment. - --hwn. - */ - SCM d = s->get_grob_property ("direction"); - if (Stem::type_i (s ) != 1) - { - int gap_i =Stem::flag_i (s ) - ((Stem::type_i (s ) >? 2) - 2); - beam_p_->set_grob_property ("beam-gap", gh_int2scm(gap_i)); - } - s->set_grob_property ("direction", d); - - if (dynamic_cast (info.req_l_)) - { - Beam::add_stem (beam_p_, s); - } + std::string s = _ ("stem must have Rhythmic structure"); + if (info.music_cause ()) + info.music_cause ()->origin ()->warning (s); else - { - String s = _ ("stem must have Rhythmic structure"); - if (info.req_l_) - info.req_l_->origin ()->warning (s); - else - ::warning (s); - } + ::warning (s); } } - else if (stem_tremolo_ && Stem::has_interface (info.elem_l_)) - { - Stem_tremolo::set_stem (stem_tremolo_, info.elem_l_); - - info.elem_l_->set_grob_property ("duration-log", gh_int2scm (intlog2 (note_head_i_))); - } - - - if (repeat_ && Note_head::has_interface (info.elem_l_)) + else if (repeat_ + && flags_ + && !body_is_sequential_) { - info.elem_l_->set_grob_property ("duration-log", gh_int2scm (intlog2 (note_head_i_))); + stem_tremolo_ = make_item ("StemTremolo", repeat_->self_scm ()); + stem_tremolo_->set_property ("flag-count", + scm_from_int (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_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::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; } - -} -ADD_THIS_TRANSLATOR(Chord_tremolo_engraver); + typeset_beam (); +} +ADD_ACKNOWLEDGER (Chord_tremolo_engraver, stem); +ADD_TRANSLATOR (Chord_tremolo_engraver, + /* doc */ "Generates beams for tremolo repeats.", + /* create */ "Beam", + /* accept */ "repeated-music", + /* read */ "", + /* write */ "");