* 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.

diff --git a/ChangeLog b/ChangeLog
index d93060360f2368ba090cddc2decc3e170a458250..198f2f9f1efe25c34427f86889e8076b89cfd880 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-02-24  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
+
+       * 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  <mats.bengtsson@s3.kth.se>
 
        * mf/*, buildscipts/* : Backport 1.7 changes. Fixes problems with 

diff --git a/lily/percent-repeat-engraver.cc b/lily/percent-repeat-engraver.cc
index 70f12528794343487c4538574fc815e861e7576a..93b34e9b42a52b0beb9727b6ceff649e2364b16e 100644 (file)
--- 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<Global_translator*> (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_;
     }