X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fchord-tremolo-engraver.cc;h=bd380facc7da61a06524a6c13724737e1018e383;hb=3e08e326e7c38c81d3355a3f2e7ef8eb48bd121e;hp=4148b2bb6262982e3c5ae7af5105a4320c065235;hpb=76f13ab50fc726c89fa7c96f3deed519d2d773dc;p=lilypond.git diff --git a/lily/chord-tremolo-engraver.cc b/lily/chord-tremolo-engraver.cc index 4148b2bb62..bd380facc7 100644 --- a/lily/chord-tremolo-engraver.cc +++ b/lily/chord-tremolo-engraver.cc @@ -1,202 +1,148 @@ -/* - 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 + Erik Sandberg +*/ + #include "beam.hh" +#include "engraver-group.hh" +#include "international.hh" +#include "item.hh" +#include "math.h" // ceil +#include "misc.hh" #include "repeated-music.hh" +#include "rhythmic-head.hh" +#include "spanner.hh" +#include "stem-tremolo.hh" #include "stem.hh" -#include "note-head.hh" -#include "engraver-group-engraver.hh" -#include "musical-request.hh" +#include "stream-event.hh" #include "warn.hh" -#include "misc.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 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_; + Stream_event *repeat_; - /// moment (global time) where beam started. - Moment start_mom_; - Moment stop_mom_; + int flags_; + // number of beams for short tremolos + int expected_beam_count_; + // current direction of beam (first RIGHT, then LEFT) + Direction beam_dir_; - /// location within measure where beam started. - Moment beam_start_location_; - - int note_head_i_; - - Beam * beam_p_; - Beam * finished_beam_p_; - + Spanner *beam_; protected: - virtual void do_removal_processing(); - virtual void do_process_music(); - virtual bool do_try_music (Music*); - virtual void acknowledge_element (Score_element_info); - virtual void do_pre_move_processing(); - virtual void do_post_move_processing(); + virtual void finalize (); + void process_music (); + DECLARE_TRANSLATOR_LISTENER (tremolo_span); + 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; -} - -bool -Chord_tremolo_engraver::do_try_music (Music * m) -{ - Repeated_music * rp = dynamic_cast (m); - if (rp && rp->type_ == "tremolo" && !repeat_) - { - Moment l = rp->body_length_mom (); - repeat_ = rp; - start_mom_ = now_mom (); - stop_mom_ = start_mom_ + l; - - // ugh. should generate dots, triplet beams. - note_head_i_ = l.den () get_property ("span-direction")); + if (span_dir == START) { - beam_p_ = new Beam (SCM_EOL); - beam_p_->set_elt_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_element (Score_element_info (beam_p_, repeat_)); + if (ASSIGN_EVENT_ONCE (repeat_, ev)) + { + int type = scm_to_int (ev->get_property ("tremolo-type")); + /* e.g. 1 for type 8, 2 for type 16 */ + flags_ = intlog2 (type) - 2; + expected_beam_count_ = scm_to_int (ev->get_property ("expected-beam-count")); + beam_dir_ = RIGHT; + } } -} - - -void -Chord_tremolo_engraver::do_removal_processing () -{ - typeset_beam (); - if (beam_p_) + else if (span_dir == STOP) { - repeat_->warning (_ ("unterminated chord tremolo")); - finished_beam_p_ = beam_p_; - typeset_beam (); + if (!repeat_) + ev->origin ()->warning (_ ("No tremolo to end")); + repeat_ = 0; + beam_ = 0; + expected_beam_count_ = 0; + beam_dir_ = CENTER; } } void -Chord_tremolo_engraver::typeset_beam () +Chord_tremolo_engraver::process_music () { - if (finished_beam_p_) + if (repeat_ && !beam_) { - typeset_element (finished_beam_p_); - finished_beam_p_ = 0; + beam_ = make_spanner ("Beam", repeat_->self_scm ()); } } - void -Chord_tremolo_engraver::acknowledge_element (Score_element_info info) +Chord_tremolo_engraver::finalize () { - if (beam_p_) + if (beam_) { - if (Stem* s = dynamic_cast (info.elem_l_)) - { - int f = s->flag_i (); - f = (f > 2) ? f - 2 : 1; - s->set_beaming (f, LEFT); - s->set_beaming (f, RIGHT); - - /* - URG: this sets the direction of the Stem s. - It's amazing Mike: - - Stem:: type_i () ->first_head ()->get_direction () -> - directional_element (me).set (d); - - - don't understand this comment. - --hwn. - */ - SCM d = s->get_elt_property ("direction"); - if (s->type_i () != 1) - { - int gap_i =s->flag_i () - ((s->type_i () >? 2) - 2); - beam_p_->set_elt_property ("beam-gap", gh_int2scm(gap_i)); - } - s->set_elt_property ("direction", d); - - if (Rhythmic_req* r = dynamic_cast (info.req_l_)) - { - beam_p_->add_stem (s); - Moment stem_location = now_mom () - - start_mom_ + beam_start_location_; - } - else - { - String s = _ ("stem must have Rhythmic structure"); - if (info.req_l_) - info.req_l_->warning (s); - else - ::warning (s); - } - } - if (Note_head *nh = dynamic_cast (info.elem_l_)) - { - nh->set_elt_property ("duration-log", gh_int2scm (intlog2 (note_head_i_))); - } + repeat_->origin ()->warning (_ ("unterminated chord tremolo")); + beam_->suicide (); } } - void -Chord_tremolo_engraver::do_post_move_processing () +Chord_tremolo_engraver::acknowledge_stem (Grob_info info) { - if (beam_p_ && stop_mom_ == now_mom ()) + if (beam_) { - finished_beam_p_ = beam_p_; + Grob *s = info.grob (); - repeat_ = 0; - beam_p_ = 0; - } -} + Stem::set_beaming (s, flags_, beam_dir_); + if (Stem::duration_log (s) != 1) + beam_->set_property ("gap-count", scm_from_int (flags_ - expected_beam_count_)); -void -Chord_tremolo_engraver::do_pre_move_processing () -{ - typeset_beam (); -} + if (beam_dir_ == RIGHT) + beam_dir_ = LEFT; -ADD_THIS_TRANSLATOR(Chord_tremolo_engraver); + if (info.ultimate_event_cause ()->in_event_class ("rhythmic-event")) + Beam::add_stem (beam_, s); + else + { + string s = _ ("stem must have Rhythmic structure"); + if (info.event_cause ()) + info.event_cause ()->origin ()->warning (s); + else + ::warning (s); + } + } +} +ADD_ACKNOWLEDGER (Chord_tremolo_engraver, stem); +ADD_TRANSLATOR (Chord_tremolo_engraver, + /* doc */ "Generates beams for tremolo repeats.", + /* create */ "Beam", + /* read */ "", + /* write */ "");