X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpercent-repeat-engraver.cc;h=db9225a0554a0e7c7782f926a78033e0242b4b1a;hb=32cdc3e2bc738e82c0965bdc5d8d99830e929092;hp=63ff323b14dd4a8f745edd7e619e155dfc700779;hpb=faaa3855a18cb8c797c36c419cc3fd104397f8e9;p=lilypond.git diff --git a/lily/percent-repeat-engraver.cc b/lily/percent-repeat-engraver.cc index 63ff323b14..db9225a055 100644 --- a/lily/percent-repeat-engraver.cc +++ b/lily/percent-repeat-engraver.cc @@ -1,44 +1,38 @@ -/* - new-chord-tremolo-engraver.cc -- implement Chord_tremolo_engraver - +/* + new-chord-tremolo-engraver.cc -- implement Chord_tremolo_engraver + source file of the GNU LilyPond music typesetter - - (c) 2000--2003 Han-Wen Nienhuys - - */ -#include "engraver.hh" + (c) 2000--2005 Han-Wen Nienhuys +*/ + #include "repeated-music.hh" -#include "engraver-group-engraver.hh" -#include "global-translator.hh" +#include "global-context.hh" #include "warn.hh" #include "misc.hh" #include "spanner.hh" #include "item.hh" #include "percent-repeat-iterator.hh" #include "bar-line.hh" - #include "score-engraver.hh" -#include "translator-group.hh" /** - This acknowledges repeated music with "percent" style. It typesets - a % sign. + This acknowledges repeated music with "percent" style. It typesets + a % sign. - TODO: + TODO: - - BEAT case: Create items for single beat repeats, i.e. c4 / / / + - BEAT case: Create items for single beat repeats, i.e. c4 / / / - - DOUBLE_MEASURE case: attach a % to an appropriate barline. - + - DOUBLE_MEASURE case: attach a % to an appropriate barline. */ class Percent_repeat_engraver : public Engraver { void typeset_perc (); public: - TRANSLATOR_DECLARATIONS(Percent_repeat_engraver); + TRANSLATOR_DECLARATIONS (Percent_repeat_engraver); protected: - Repeated_music * repeat_; + Music *repeat_; /// moment (global time) where beam started. Moment start_mom_; @@ -49,21 +43,20 @@ protected: Moment next_moment_; Moment body_length_; - enum { - UNKNOWN, - BEAT, - MEASURE, - DOUBLE_MEASURE, - } repeat_sign_type_ ; - - Item * beat_slash_; - Item * double_percent_; - Spanner * perc_; - Spanner * finished_perc_; - Item * stem_tremolo_; + enum + { + UNKNOWN, + MEASURE, + DOUBLE_MEASURE, + } + repeat_sign_type_; + + Item *double_percent_; + Spanner *perc_; + Spanner *finished_perc_; protected: virtual void finalize (); - virtual bool try_music (Music*); + virtual bool try_music (Music *); virtual void stop_translation_timestep (); virtual void start_translation_timestep (); virtual void process_music (); @@ -71,59 +64,59 @@ protected: Percent_repeat_engraver::Percent_repeat_engraver () { - perc_ = finished_perc_ = 0; - repeat_ =0; - stem_tremolo_ = 0; + perc_ = 0; + finished_perc_ = 0; + repeat_ = 0; - beat_slash_ = 0; double_percent_ = 0; } bool -Percent_repeat_engraver::try_music (Music * m) +Percent_repeat_engraver::try_music (Music *m) { - Repeated_music * rp = dynamic_cast (m); - if (rp - && rp->get_mus_property ("iterator-ctor") - == Percent_repeat_iterator::constructor_proc + if (m->is_mus_type ("repeated-music") + && m->get_property ("iterator-ctor") + == Percent_repeat_iterator::constructor_proc && !repeat_) { - body_length_ = rp->body_get_length (); - int count = rp->repeat_count (); - + body_length_ = Repeated_music::body_get_length (m); + int count = Repeated_music::repeat_count (m); + Moment now = now_mom (); start_mom_ = now; stop_mom_ = start_mom_ + Moment (count) * body_length_; next_moment_ = start_mom_ + body_length_; - SCM m = get_property ("measureLength"); - Moment meas_len; - if (unsmob_moment (m)) - meas_len = *unsmob_moment (m); - - if (body_length_ < meas_len && - meas_len.main_part_.mod_rat (body_length_.main_part_) == Moment (Rational (0,0))) - repeat_sign_type_ = BEAT; - else if (meas_len == body_length_) + Moment meas_len (robust_scm2moment (get_property ("measureLength"), Moment (1))); + if (meas_len == body_length_) repeat_sign_type_ = MEASURE; - else if (Moment (2)* meas_len == body_length_) + else if (Moment (2) * meas_len == body_length_) { repeat_sign_type_ = DOUBLE_MEASURE; - next_moment_ += meas_len ; } else { - warning (_ ("Don't know how to handle a percent repeat of this length.")); + warning (_f ("can't handle a percent repeat of length: %s", + body_length_.to_string ())); return false; } - repeat_ = rp; + repeat_ = m; + + Global_context *global = get_global_context (); + for (int i = 1; i < count; i++) + { + Moment m = next_moment_ + Moment (i) * body_length_; + global->add_moment_to_process (m); + + /* bars between % too. */ + if (repeat_sign_type_ == DOUBLE_MEASURE) + global->add_moment_to_process (m - meas_len); + } + if (repeat_sign_type_ == DOUBLE_MEASURE) + next_moment_ += meas_len; - Global_translator *global =top_engraver(); - for (int i = 0; i < count; i++) - global->add_moment_to_process (next_moment_ + Moment (i) * body_length_); - return true; } @@ -135,34 +128,27 @@ Percent_repeat_engraver::process_music () { if (repeat_ && now_mom () == next_moment_) { - if (repeat_sign_type_ == BEAT) - { - beat_slash_ = new Item (get_property ("RepeatSlash")); - announce_grob(beat_slash_, repeat_->self_scm()); - } - else if (repeat_sign_type_ == MEASURE) + if (repeat_sign_type_ == MEASURE) { finished_perc_ = perc_; typeset_perc (); - perc_ = new Spanner (get_property ("PercentRepeat")); - SCM col =get_property ("currentCommandColumn"); + perc_ = make_spanner ("PercentRepeat", repeat_->self_scm ()); + SCM col = get_property ("currentCommandColumn"); perc_->set_bound (LEFT, unsmob_grob (col)); - announce_grob(perc_, repeat_->self_scm()); } else if (repeat_sign_type_ == DOUBLE_MEASURE) { - double_percent_ = new Item (get_property ("DoublePercentRepeat")); - announce_grob(double_percent_, repeat_->self_scm()); - - /* - forbid breaks on a % line. Should forbid all breaks, really. - */ - - top_engraver()->forbid_breaks (); // guh. Use properties! + double_percent_ = make_item ("DoublePercentRepeat", repeat_->self_scm ()); + + /* + forbid breaks on a % line. Should forbid all breaks, really. + + Ugh. Why can't this be regular communication between + contexts? + */ + get_score_engraver ()->forbid_breaks (); } next_moment_ = next_moment_ + body_length_; - - top_engraver()->add_moment_to_process (next_moment_); } } @@ -172,7 +158,7 @@ Percent_repeat_engraver::finalize () typeset_perc (); if (perc_) { - repeat_->origin ()->warning (_ ("unterminated chord tremolo")); + repeat_->origin ()->warning (_ ("unterminated percent repeat")); perc_->suicide (); } } @@ -182,28 +168,14 @@ Percent_repeat_engraver::typeset_perc () { if (finished_perc_) { - SCM col =get_property ("currentCommandColumn"); + SCM col = get_property ("currentCommandColumn"); finished_perc_->set_bound (RIGHT, unsmob_grob (col)); - typeset_grob (finished_perc_); finished_perc_ = 0; } - if (beat_slash_) - { - typeset_grob (beat_slash_); - beat_slash_ = 0; - } - - if (double_percent_) - { - typeset_grob (double_percent_); - double_percent_ = 0; - } + double_percent_ = 0; } - - - void Percent_repeat_engraver::start_translation_timestep () { @@ -220,20 +192,16 @@ Percent_repeat_engraver::start_translation_timestep () } } - void Percent_repeat_engraver::stop_translation_timestep () { typeset_perc (); } - - - -ENTER_DESCRIPTION(Percent_repeat_engraver, -/* descr */ "Make beat, whole bar and double bar repeats.", -/* creats*/ "PercentRepeat RepeatSlash DoublePercentRepeat", -/* accepts */ "repeated-music", -/* acks */ "", -/* reads */ "measureLength currentCommandColumn", -/* write */ ""); +ADD_TRANSLATOR (Percent_repeat_engraver, + /* descr */ "Make whole bar and double bar repeats.", + /* creats*/ "PercentRepeat DoublePercentRepeat", + /* accepts */ "repeated-music", + /* acks */ "", + /* reads */ "measureLength currentCommandColumn", + /* write */ "");