X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fchord-tremolo-engraver.cc;h=82eba5cec150bf6d743f63cd44d1bbbb80dc72e2;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=a71c7f104156b153d4edfc850c2b52cdf4f6caab;hpb=df4a7c4a55148e065d878dcc2f7e09ac27ea9c32;p=lilypond.git diff --git a/lily/chord-tremolo-engraver.cc b/lily/chord-tremolo-engraver.cc index a71c7f1041..82eba5cec1 100644 --- a/lily/chord-tremolo-engraver.cc +++ b/lily/chord-tremolo-engraver.cc @@ -1,220 +1,160 @@ -/* - 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--2008 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 "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 "stem.hh" +#include "stream-event.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_; - - /// moment (global time) where beam started. - Moment start_mom_; - Moment stop_mom_; + Stream_event *repeat_; - /// location within measure where beam started. - Moment beam_start_location_; + int flags_; + // number of beams for short tremolos + int expected_beam_count_; + // current direction of beam (first RIGHT, then LEFT) + Direction beam_dir_; - int note_head_i_; - - Spanner * beam_p_; - Spanner * finished_beam_p_; - + Spanner *beam_; protected: - virtual void do_removal_processing(); - void deprecated_process_music(); - virtual bool try_music (Music*); - virtual void acknowledge_grob (Grob_info); - virtual void stop_translation_timestep(); - virtual void start_translation_timestep(); - virtual void create_grobs (); + 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; + beam_ = 0; + repeat_ = 0; + flags_ = 0; + expected_beam_count_ = 0; + beam_dir_ = CENTER; } -bool -Chord_tremolo_engraver::try_music (Music * m) +IMPLEMENT_TRANSLATOR_LISTENER (Chord_tremolo_engraver, tremolo_span); +void +Chord_tremolo_engraver::listen_tremolo_span (Stream_event *ev) { - Repeated_music * rp = dynamic_cast (m); - if (rp - && rp->get_mus_property ("type") == Chord_tremolo_iterator::constructor_cxx_function - && !repeat_) + Direction span_dir = to_dir (ev->get_property ("span-direction")); + if (span_dir == START) { - 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 ("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; + } + } + else if (span_dir == STOP) + { + if (!repeat_) + ev->origin ()->warning (_ ("No tremolo to end")); + repeat_ = 0; + beam_ = 0; + expected_beam_count_ = 0; + beam_dir_ = CENTER; } - return false; -} - -void -Chord_tremolo_engraver::create_grobs () -{ - deprecated_process_music (); } void -Chord_tremolo_engraver::deprecated_process_music () +Chord_tremolo_engraver::process_music () { - if (repeat_ && !beam_p_) + if (repeat_ && !beam_) { - beam_p_ = new Spanner (get_property ("Beam")); - Beam::set_interface (beam_p_); - beam_p_->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_p_, repeat_); + beam_ = make_spanner ("Beam", repeat_->self_scm ()); } } - void -Chord_tremolo_engraver::do_removal_processing () +Chord_tremolo_engraver::finalize () { - typeset_beam (); - if (beam_p_) + if (beam_) { repeat_->origin ()->warning (_ ("unterminated chord tremolo")); -#if 0 - finished_beam_p_ = beam_p_; - typeset_beam (); -#else - beam_p_->suicide (); -#endif + announce_end_grob (beam_, SCM_EOL); + beam_->suicide (); } } void -Chord_tremolo_engraver::typeset_beam () +Chord_tremolo_engraver::acknowledge_stem (Grob_info info) { - if (finished_beam_p_) + if (beam_) { - typeset_grob (finished_beam_p_); - finished_beam_p_ = 0; - } -} + Grob *s = info.grob (); + Stem::set_beaming (s, flags_, beam_dir_); -void -Chord_tremolo_engraver::acknowledge_grob (Grob_info info) -{ - if (beam_p_) - { - if (Stem::has_interface (info.elem_l_)) + if (Stem::duration_log (s) != 1) + beam_->set_property ("gap-count", scm_from_int (flags_ - expected_beam_count_)); + + if (beam_dir_ == RIGHT) { - 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); - } - else - { - String s = _ ("stem must have Rhythmic structure"); - if (info.req_l_) - info.req_l_->origin ()->warning (s); - else - ::warning (s); - } + beam_dir_ = LEFT; + announce_end_grob (beam_, s->self_scm ()); } - if (Note_head::has_interface (info.elem_l_)) + + if (info.ultimate_event_cause ()->in_event_class ("rhythmic-event")) + Beam::add_stem (beam_, s); + else { - info.elem_l_->set_grob_property ("duration-log", gh_int2scm (intlog2 (note_head_i_))); + 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 */ + "Generate beams for tremolo repeats.", -void -Chord_tremolo_engraver::start_translation_timestep () -{ - if (beam_p_ && stop_mom_ == now_mom ()) - { - finished_beam_p_ = beam_p_; - - repeat_ = 0; - beam_p_ = 0; - } -} - - -void -Chord_tremolo_engraver::stop_translation_timestep () -{ - typeset_beam (); -} + /* create */ + "Beam ", -ADD_THIS_TRANSLATOR(Chord_tremolo_engraver); + /* read */ + "", + /* write */ + "" + );