X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fchord-tremolo-engraver.cc;h=9a9017e663647cefa17ca64aa97ef188cdbfc7ed;hb=refs%2Ftags%2Frelease%2F1.5.9;hp=f21bcb3150aefb677dc17e29de7efdc815d81900;hpb=7a558267cfbc5a90bf87a80ce9bcfed087692064;p=lilypond.git diff --git a/lily/chord-tremolo-engraver.cc b/lily/chord-tremolo-engraver.cc index f21bcb3150..9a9017e663 100644 --- a/lily/chord-tremolo-engraver.cc +++ b/lily/chord-tremolo-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Han-Wen Nienhuys + (c) 2000--2001 Han-Wen Nienhuys */ @@ -19,6 +19,9 @@ #include "note-head.hh" #include "spanner.hh" #include "item.hh" +#include "chord-tremolo-iterator.hh" +#include "stem-tremolo.hh" +#include "music-list.hh" /** This acknowledges repeated music with "tremolo" style. It typesets @@ -38,8 +41,8 @@ class Chord_tremolo_engraver : public Engraver { void typeset_beam (); public: - VIRTUAL_COPY_CONS(Translator); - Chord_tremolo_engraver(); + VIRTUAL_COPY_CONS (Translator); + Chord_tremolo_engraver (); protected: Repeated_music * repeat_; @@ -51,75 +54,92 @@ protected: Moment beam_start_location_; int note_head_i_; - + + bool sequential_body_b_; Spanner * beam_p_; Spanner * finished_beam_p_; - + Item * stem_tremolo_; 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 (); + 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 (); }; -Chord_tremolo_engraver::Chord_tremolo_engraver() +Chord_tremolo_engraver::Chord_tremolo_engraver () { beam_p_ = finished_beam_p_ = 0; repeat_ =0; note_head_i_ = 0; + stem_tremolo_ = 0; + sequential_body_b_ = false; } bool -Chord_tremolo_engraver::do_try_music (Music * m) +Chord_tremolo_engraver::try_music (Music * m) { Repeated_music * rp = dynamic_cast (m); - if (rp && rp->type_ == "tremolo" && !repeat_) + if (rp + && rp->get_mus_property ("iterator-ctor") == Chord_tremolo_iterator::constructor_cxx_function + && !repeat_) { - Moment l = rp->body_length_mom (); + Moment l = rp->length_mom (); repeat_ = rp; 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 () set_elt_property ("chord-tremolo", SCM_BOOL_T); + if (sequential_body_b_ && !beam_p_) + { + beam_p_ = new Spanner (get_property ("Beam")); + 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_element (beam_p_, repeat_); - } -} + 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)); + } + } + } +} void -Chord_tremolo_engraver::do_removal_processing () +Chord_tremolo_engraver::finalize () { typeset_beam (); if (beam_p_) { repeat_->origin ()->warning (_ ("unterminated chord tremolo")); -#if 0 - finished_beam_p_ = beam_p_; - typeset_beam (); -#else beam_p_->suicide (); -#endif } } @@ -128,20 +148,20 @@ Chord_tremolo_engraver::typeset_beam () { if (finished_beam_p_) { - typeset_element (finished_beam_p_); + typeset_grob (finished_beam_p_); finished_beam_p_ = 0; } } void -Chord_tremolo_engraver::acknowledge_element (Score_element_info info) +Chord_tremolo_engraver::acknowledge_grob (Grob_info info) { if (beam_p_) { if (Stem::has_interface (info.elem_l_)) { - Score_element * s = info.elem_l_; + Grob * s = info.elem_l_; int f = Stem::flag_i (s); f = (f > 2) ? f - 2 : 1; Stem::set_beaming (s, f, LEFT); @@ -158,13 +178,13 @@ Chord_tremolo_engraver::acknowledge_element (Score_element_info info) don't understand this comment. --hwn. */ - SCM d = s->get_elt_property ("direction"); - if (Stem::type_i (s ) != 1) + 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_elt_property ("beam-gap", gh_int2scm(gap_i)); + int gap_i =Stem::flag_i (s) - ((Stem::type_i (s) >? 2) - 2); + beam_p_->set_grob_property ("gap", gh_int2scm (gap_i)); } - s->set_elt_property ("direction", d); + s->set_grob_property ("direction", d); if (dynamic_cast (info.req_l_)) { @@ -179,16 +199,24 @@ Chord_tremolo_engraver::acknowledge_element (Score_element_info info) ::warning (s); } } - if (Note_head::has_interface (info.elem_l_)) - { - info.elem_l_->set_elt_property ("duration-log", gh_int2scm (intlog2 (note_head_i_))); - } + } + 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_)) + { + info.elem_l_->set_grob_property ("duration-log", gh_int2scm (intlog2 (note_head_i_))); } } void -Chord_tremolo_engraver::do_post_move_processing () +Chord_tremolo_engraver::start_translation_timestep () { if (beam_p_ && stop_mom_ == now_mom ()) { @@ -201,10 +229,17 @@ Chord_tremolo_engraver::do_post_move_processing () void -Chord_tremolo_engraver::do_pre_move_processing () +Chord_tremolo_engraver::stop_translation_timestep () { typeset_beam (); + + if (stem_tremolo_) + { + typeset_grob (stem_tremolo_); + stem_tremolo_ = 0; + } + } -ADD_THIS_TRANSLATOR(Chord_tremolo_engraver); +ADD_THIS_TRANSLATOR (Chord_tremolo_engraver);