From a06e3c9db4b3288b61c989a19c64b1330e55ae09 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Mon, 24 Feb 2003 12:25:18 +0000 Subject: [PATCH] * input/regression/percent-repeat-skipbars.ly: new file. * lily/percent-repeat-engraver.cc (try_music): also insert correct process moments for % repeats. Fixes problem when skipBars is set. --- ChangeLog | 7 +++++++ lily/percent-repeat-engraver.cc | 17 +++++------------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index d93060360f..198f2f9f1e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2003-02-24 Han-Wen Nienhuys + + * input/regression/percent-repeat-skipbars.ly: new file. + + * lily/percent-repeat-engraver.cc (try_music): also insert correct + process moments for % repeats. Fixes problem when skipBars is set. + 2003-02-10 Mats Bengtsson * mf/*, buildscipts/* : Backport 1.7 changes. Fixes problems with diff --git a/lily/percent-repeat-engraver.cc b/lily/percent-repeat-engraver.cc index 70f1252879..93b34e9b42 100644 --- a/lily/percent-repeat-engraver.cc +++ b/lily/percent-repeat-engraver.cc @@ -120,18 +120,11 @@ Percent_repeat_engraver::try_music (Music * m) repeat_ = rp; - Global_translator *global =0; - Translator *t = this; - do - { - t = t->daddy_trans_ ; - global = dynamic_cast (t); - } - while (!global); - + Global_translator *global =top_engraver(); for (int i = 0; i < count; i++) - global->add_moment_to_process (now + Moment (1+i) * body_length_); - + global->add_moment_to_process (next_moment_ + + Moment (i) * body_length_); + return true; } @@ -167,7 +160,7 @@ Percent_repeat_engraver::process_music () forbid breaks on a % line. Should forbid all breaks, really. */ - top_engraver()->forbid_breaks (); // guh. Use properties! + top_engraver()->forbid_breaks (); // guh. Use properties! } next_moment_ = next_moment_ + body_length_; } -- 2.39.5