X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fchord-tremolo-engraver.cc;h=82eba5cec150bf6d743f63cd44d1bbbb80dc72e2;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=a7cd27c0871662bd61d12200583117d8fd2ce56c;hpb=91821bd59959b1289f2d711509017a4dacebecd2;p=lilypond.git diff --git a/lily/chord-tremolo-engraver.cc b/lily/chord-tremolo-engraver.cc index a7cd27c087..82eba5cec1 100644 --- a/lily/chord-tremolo-engraver.cc +++ b/lily/chord-tremolo-engraver.cc @@ -3,21 +3,23 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2005 Han-Wen Nienhuys + (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 "warn.hh" -#include "misc.hh" #include "spanner.hh" -#include "item.hh" -#include "chord-tremolo-iterator.hh" #include "stem-tremolo.hh" -#include "math.h" // ceil +#include "stem.hh" +#include "stream-event.hh" +#include "warn.hh" #include "translator.icc" @@ -37,109 +39,80 @@ create dependencies between engravers, which is bad. */ class Chord_tremolo_engraver : public Engraver { - void typeset_beam (); TRANSLATOR_DECLARATIONS (Chord_tremolo_engraver); protected: - Music *repeat_; + Stream_event *repeat_; - /// moment (global time) where beam started. - Moment start_mom_; - Moment stop_mom_; int flags_; - int total_duration_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_; - - bool body_is_sequential_; Spanner *beam_; - Spanner *finished_beam_; - Item *stem_tremolo_; protected: virtual void finalize (); - virtual bool try_music (Music *); - void stop_translation_timestep (); - void start_translation_timestep (); void process_music (); + DECLARE_TRANSLATOR_LISTENER (tremolo_span); DECLARE_ACKNOWLEDGER (stem); }; Chord_tremolo_engraver::Chord_tremolo_engraver () { - beam_ = finished_beam_ = 0; + beam_ = 0; repeat_ = 0; flags_ = 0; - stem_tremolo_ = 0; - body_is_sequential_ = false; + 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) { - if (m->is_mus_type ("repeated-music") - && m->get_property ("iterator-ctor") == Chord_tremolo_iterator::constructor_proc - && !repeat_) + Direction span_dir = to_dir (ev->get_property ("span-direction")); + if (span_dir == START) { - Moment l = m->get_length (); - repeat_ = m; - start_mom_ = now_mom (); - stop_mom_ = start_mom_ + l; - - 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) + if (ASSIGN_EVENT_ONCE (repeat_, ev)) { - m->origin ()->warning (_f ("expect 2 elements for chord tremolo, found %d", elt_count)); + 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; } - - 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; } - - return false; + 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; + } } void Chord_tremolo_engraver::process_music () { - if (repeat_ && body_is_sequential_ && !beam_) + if (repeat_ && !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 Chord_tremolo_engraver::finalize () { - typeset_beam (); if (beam_) { repeat_->origin ()->warning (_ ("unterminated chord tremolo")); + announce_end_grob (beam_, SCM_EOL); beam_->suicide (); } } -void -Chord_tremolo_engraver::typeset_beam () -{ - finished_beam_ = 0; -} - void Chord_tremolo_engraver::acknowledge_stem (Grob_info info) { @@ -147,72 +120,41 @@ Chord_tremolo_engraver::acknowledge_stem (Grob_info info) { Grob *s = info.grob (); - if (start_mom_ == now_mom ()) - Stem::set_beaming (s, flags_, RIGHT); - else - Stem::set_beaming (s, flags_, LEFT); + Stem::set_beaming (s, flags_, beam_dir_); if (Stem::duration_log (s) != 1) - { - beam_->set_property ("gap-count", scm_from_int (flags_ - total_duration_flags_)); - } + beam_->set_property ("gap-count", scm_from_int (flags_ - expected_beam_count_)); - if (info.music_cause ()->is_mus_type ("rhythmic-event")) + if (beam_dir_ == RIGHT) { - Beam::add_stem (beam_, s); + beam_dir_ = LEFT; + announce_end_grob (beam_, s->self_scm ()); } + + 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.music_cause ()) - info.music_cause ()->origin ()->warning (s); + string s = _ ("stem must have Rhythmic structure"); + if (info.event_cause ()) + info.event_cause ()->origin ()->warning (s); else ::warning (s); } } - else if (repeat_ - && flags_ - && !body_is_sequential_) - { - 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_ && stop_mom_ == now_mom ()) - { - finished_beam_ = beam_; - repeat_ = 0; - beam_ = 0; - } -} - -void -Chord_tremolo_engraver::stop_translation_timestep () -{ - if (stem_tremolo_) - { - repeat_ = 0; - if (beam_) - programming_error ("beam and stem tremolo?"); - stem_tremolo_ = 0; - } +ADD_ACKNOWLEDGER (Chord_tremolo_engraver, stem); +ADD_TRANSLATOR (Chord_tremolo_engraver, + /* doc */ + "Generate beams for tremolo repeats.", - typeset_beam (); -} + /* create */ + "Beam ", + /* read */ + "", -ADD_ACKNOWLEDGER (Chord_tremolo_engraver,stem); -ADD_TRANSLATOR (Chord_tremolo_engraver, - /* doc */ "Generates beams for tremolo repeats.", - /* create */ "Beam", - /* accept */ "repeated-music", - /* read */ "", - /* write */ ""); + /* write */ + "" + );