X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fchord-tremolo-engraver.cc;h=0e7d79525f4c47027be0e5780e37d129769065d6;hb=0b544cfb7332615ef809b71b57ab656741311ae1;hp=8c16d4804160623723026f00cf6dbab7d00f4ad0;hpb=b1323f33e9aa4b9eea05eefb8755c907d4d762d4;p=lilypond.git diff --git a/lily/chord-tremolo-engraver.cc b/lily/chord-tremolo-engraver.cc index 8c16d48041..0e7d79525f 100644 --- a/lily/chord-tremolo-engraver.cc +++ b/lily/chord-tremolo-engraver.cc @@ -1,238 +1,174 @@ -/* - new-chord-tremolo-engraver.cc -- implement Chord_tremolo_engraver - - source file of the GNU LilyPond music typesetter - - (c) 2000--2004 Han-Wen Nienhuys - - */ - -#include "engraver.hh" +/* + This file is part of LilyPond, the GNU music typesetter. + + Copyright (C) 2000--2014 Han-Wen Nienhuys + Erik Sandberg + + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . +*/ + #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 "event.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 "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 (); - TRANSLATOR_DECLARATIONS(Chord_tremolo_engraver); + TRANSLATOR_DECLARATIONS (Chord_tremolo_engraver); protected: - Repeated_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_; - - bool sequential_body_b_; - Spanner * beam_; - Spanner * finished_beam_; - Item * stem_tremolo_; + Stream_event *repeat_; + + Spanner *beam_; + // Store the pointer to the previous stem, so we can create a beam if + // necessary and end the spanner + Grob *previous_stem_; + 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 (); + void process_music (); + DECLARE_TRANSLATOR_LISTENER (tremolo_span); + DECLARE_ACKNOWLEDGER (stem); }; Chord_tremolo_engraver::Chord_tremolo_engraver () { - beam_ = finished_beam_ = 0; - repeat_ =0; - flags_ = 0; - stem_tremolo_ = 0; - sequential_body_b_ = false; + beam_ = 0; + repeat_ = 0; + previous_stem_ = 0; } -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_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 = rp->get_length (); - repeat_ = rp; - start_mom_ = now_mom (); - stop_mom_ = start_mom_ + l; - - Sequential_music * seq = dynamic_cast (rp->body ()); - sequential_body_b_ = seq; - - int elt_count = seq ? scm_ilength (seq-> music_list ()) : 1; - - if (seq && elt_count != 2) - { - rp->origin ()->warning (_f ("Chord tremolo with %d elements. Must have two elements.", elt_count)); - } - - if (elt_count <= 0) - elt_count = 1; - - Rational total_dur = l.main_part_; - Rational note_dur = total_dur / Rational (elt_count * repeat_->repeat_count ()); - - total_duration_flags_ = 0 >? (intlog2 (total_dur.den ()) - 2); - - flags_ = intlog2 (note_dur.den ()) -2 ; - - return true; + ASSIGN_EVENT_ONCE (repeat_, ev); + } + else if (span_dir == STOP) + { + if (!repeat_) + ev->origin ()->warning (_ ("No tremolo to end")); + repeat_ = 0; + beam_ = 0; + previous_stem_ = 0; } - - return false; } void Chord_tremolo_engraver::process_music () { - if (repeat_) + if (repeat_ && !beam_) { - if (sequential_body_b_ && !beam_) - { - beam_ = make_spanner ("Beam"); - 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_, repeat_->self_scm()); - } - else if (!sequential_body_b_ && !stem_tremolo_) - { - if (flags_) - { - stem_tremolo_ = make_item ("StemTremolo"); - announce_grob(stem_tremolo_, repeat_->self_scm()); - stem_tremolo_->set_property ("flag-count", - scm_int2num (flags_)); - } - } + beam_ = make_spanner ("Beam", repeat_->self_scm ()); } } + 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 () -{ - if (finished_beam_) - { - typeset_grob (finished_beam_); - finished_beam_ = 0; - } -} - -void -Chord_tremolo_engraver::acknowledge_grob (Grob_info info) +Chord_tremolo_engraver::acknowledge_stem (Grob_info info) { - if (beam_ && Stem::has_interface (info.grob_)) + if (beam_) { - Grob * s = info.grob_; + int tremolo_type = robust_scm2int (repeat_->get_property ("tremolo-type"), 1); + int flags = max (0, intlog2 (tremolo_type) - 2); + int repeat_count = robust_scm2int (repeat_->get_property ("repeat-count"), 1); + int gap_count = min (flags, intlog2 (repeat_count) + 1); + + Grob *s = info.grob (); + if (previous_stem_) + { + // FIXME: We know that the beam has ended only in listen_tremolo_span + // but then it is too late for Spanner_break_forbid_engraver + // to allow a line break... So, as a nasty hack, announce the + // spanner's end after each note except the first. The only + // "drawback" is that for multi-note tremolos a break would + // theoretically be allowed after the second note (but since + // that note is typically not at a barline, I don't think + // anyone will ever notice!) + announce_end_grob (beam_, previous_stem_->self_scm ()); + // Create the whole beam between previous and current note + Stem::set_beaming (previous_stem_, flags, RIGHT); + Stem::set_beaming (s, flags, LEFT); + } - 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", gh_int2scm (flags_ - total_duration_flags_)); - } - - if (info.music_cause ()->is_mus_type ("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); - else - ::warning (s); - } - } - else if (stem_tremolo_ && Stem::has_interface (info.grob_)) - { - Stem_tremolo::set_stem (stem_tremolo_, info.grob_); - stem_tremolo_->set_parent (info.grob_,X_AXIS); - } -} - + beam_->set_property ("gap-count", scm_from_int (gap_count)); -void -Chord_tremolo_engraver::start_translation_timestep () -{ - if (beam_ && stop_mom_ == now_mom ()) - { - finished_beam_ = beam_; - repeat_ = 0; - beam_ = 0; + 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); + } + // Store current grob, so we can possibly end the spanner here (and + // reset the beam direction to RIGHT) + previous_stem_ = s; } } +ADD_ACKNOWLEDGER (Chord_tremolo_engraver, stem); +ADD_TRANSLATOR (Chord_tremolo_engraver, + /* doc */ + "Generate beams for tremolo repeats.", -void -Chord_tremolo_engraver::stop_translation_timestep () -{ - typeset_beam (); - - if (stem_tremolo_) - { - typeset_grob (stem_tremolo_); - stem_tremolo_ = 0; - } -} - + /* create */ + "Beam ", + /* read */ + "", -ENTER_DESCRIPTION(Chord_tremolo_engraver, -/* descr */ "Generates beams for tremolo repeats.", -/* creats*/ "Beam", -/* accepts */ "repeated-music", -/* acks */ "stem-interface note-head-interface", -/* reads */ "", -/* write */ ""); + /* write */ + "" + );