? Documentation/out
? Documentation/out-www
? Documentation/bibliography/out
? Documentation/bibliography/out-www
? Documentation/misc/out
? Documentation/misc/out-www
? Documentation/pictures/out
? Documentation/pictures/out-www
? Documentation/topdocs/out
? Documentation/topdocs/out-www
? Documentation/user/out
? Documentation/user/out-www
? buildscripts/out
? buildscripts/out-www
? cygwin/out
? cygwin/out-www
? elisp/out
? elisp/out-www
? flower/out
? flower/out-www
? flower/include/out
? flower/include/out-www
? input/out
? input/out-www
? input/mutopia/out
? input/mutopia/out-www
? input/mutopia/E.Satie/out
? input/mutopia/E.Satie/out-www
? input/mutopia/F.Schubert/out
? input/mutopia/F.Schubert/out-www
? input/mutopia/J.S.Bach/out
? input/mutopia/J.S.Bach/out-www
? input/mutopia/R.Schumann/out
? input/mutopia/R.Schumann/out-www
? input/mutopia/W.A.Mozart/out
? input/mutopia/W.A.Mozart/out-www
? input/no-notation/out
? input/no-notation/out-www
? input/regression/out
? input/regression/out-www
? input/test/out
? input/test/out-www
? input/tutorial/out
? input/tutorial/out-www
? lily/out
? lily/out-www
? lily/include/out
? lily/include/out-www
? ly/out
? ly/out-www
? make/out
? make/out-www
? mf/feta-alphabet11.600pk
? mf/feta-alphabet11.tfm
? mf/feta-alphabet13.600pk
? mf/feta-alphabet13.tfm
? mf/feta-alphabet14.600pk
? mf/feta-alphabet14.tfm
? mf/feta-alphabet16.600pk
? mf/feta-alphabet16.tfm
? mf/feta-alphabet18.600pk
? mf/feta-alphabet18.tfm
? mf/feta-alphabet20.600pk
? mf/feta-alphabet20.tfm
? mf/feta-alphabet23.600pk
? mf/feta-alphabet23.tfm
? mf/feta-alphabet26.600pk
? mf/feta-alphabet26.tfm
? mf/feta-braces-a.600pk
? mf/feta-braces-b.600pk
? mf/feta-braces-c.600pk
? mf/feta-braces-d.600pk
? mf/feta-braces-e.600pk
? mf/feta-braces-f.600pk
? mf/feta-braces-g.600pk
? mf/feta-braces-h.600pk
? mf/feta-braces-i.600pk
? mf/feta11.600pk
? mf/feta13.600pk
? mf/feta14.600pk
? mf/feta16.600pk
? mf/feta18.600pk
? mf/feta20.600pk
? mf/feta23.600pk
? mf/feta26.600pk
? mf/out
? mf/out-www
? mf/parmesan11.600pk
? mf/parmesan13.600pk
? mf/parmesan14.600pk
? mf/parmesan16.600pk
? mf/parmesan18.600pk
? mf/parmesan20.600pk
? mf/parmesan23.600pk
? mf/parmesan26.600pk
? po/out
? po/out-www
? ps/out
? ps/out-www
? python/out
? python/out-www
? scm/out
? scm/out-www
? scripts/os
? scripts/out
? scripts/out-www
? scripts/string
? scripts/sys
? stepmake/out
? stepmake/out-www
? stepmake/bin/out
? stepmake/bin/out-www
? stepmake/stepmake/out
? stepmake/stepmake/out-www
? tex/out
? tex/out-www
? vim/out
? vim/out-www
Index: lily/lyric-combine-music-iterator.cc
===================================================================
RCS file: /sources/lilypond/lilypond/lily/lyric-combine-music-iterator.cc,v
retrieving revision 1.55
diff -u -r1.55 lyric-combine-music-iterator.cc
--- lily/lyric-combine-music-iterator.cc	24 May 2006 11:58:00 -0000	1.55
+++ lily/lyric-combine-music-iterator.cc	3 Jun 2006 12:03:42 -0000
@@ -203,6 +203,10 @@
 
 /*
 Look for a suitable voice to align lyrics to.
+
+Returns 0 if nothing should change; i.e., if we already listen to the
+right voice, or if we don't yet listen to a voice but no appropriate
+voice could be found.
 */
 Context *
 Lyric_combine_music_iterator::find_voice ()
@@ -232,7 +236,11 @@
 void
 Lyric_combine_music_iterator::process (Moment)
 {
-  find_voice ();
+  /* see if associatedVoice has been changed */
+  Context *new_voice = find_voice ();
+  if (new_voice)
+    set_music_context (new_voice);
+
   if (!music_context_)
     return;
 
Index: lily/percent-repeat-iterator.cc
===================================================================
RCS file: /sources/lilypond/lilypond/lily/percent-repeat-iterator.cc,v
retrieving revision 1.28
diff -u -r1.28 percent-repeat-iterator.cc
--- lily/percent-repeat-iterator.cc	24 May 2006 07:00:41 -0000	1.28
+++ lily/percent-repeat-iterator.cc	3 Jun 2006 12:03:42 -0000
@@ -34,7 +34,7 @@
     percent->set_spot (*mus->origin ());
     percent->set_property ("length", length);
     if (repeats > 1)
-      percent->set_property ("repeat-count", scm_int2num (i - 1));
+      percent->set_property ("repeat-count", scm_int2num (i));
     child_list = scm_cons (percent->unprotect (), child_list);
   }
   child_list = scm_cons (child->self_scm (), child_list);