From 19a201c3b99e9244f4cb48956d8e253e5cc906d3 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Tue, 15 Aug 2000 23:28:35 +0200
Subject: [PATCH] patch::: 1.3.78.jcn4

1.3.78.jcn4
===========

* Made simple fix to get part-combiner to recognise different rhythms
---
 CHANGES                             |  5 +++++
 VERSION                             |  2 +-
 lily/part-combine-music-iterator.cc | 14 +++++++-------
 mutopia/Coriolan/flauti.ly          | 18 ++++++++++--------
 4 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/CHANGES b/CHANGES
index d5e17b1fea..a3bd728da0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+1.3.78.jcn4
+===========
+
+* Made simple fix to get part-combiner to recognise different rhythms
+
 1.3.78.jcn3
 ===========
 
diff --git a/VERSION b/VERSION
index 410f982f50..bc65a00325 100644
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
 PATCH_LEVEL=78
-MY_PATCH_LEVEL=jcn3
+MY_PATCH_LEVEL=jcn4
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.
diff --git a/lily/part-combine-music-iterator.cc b/lily/part-combine-music-iterator.cc
index e0e0d0a528..8776877b1e 100644
--- a/lily/part-combine-music-iterator.cc
+++ b/lily/part-combine-music-iterator.cc
@@ -130,12 +130,8 @@ Part_combine_music_iterator::do_process_and_next (Moment m)
   /*
     TODO:
 
-    * fix rhythm check
-
-    * check setting/resetting of properties
-
-    Later (because currently, we only handle thread switching, really):
-
+    (check): can this all be handled now?
+    
     Maybe different modes exist?
 
     * Wind instruments (Flute I/II)
@@ -179,8 +175,12 @@ Part_combine_music_iterator::do_process_and_next (Moment m)
   bool solo_b = (first_arr_l->empty () != second_arr_l->empty ());
 
   /*
-    Urg, this doesn't work at all.  Do we need to send out another inquisition?
+    Urg, this won't work at end of music.  Should interrogate rhythm.
    */
+  if (first_iter_p_->ok ())
+    first_next = first_iter_p_->next_moment ();
+  if (second_iter_p_->ok ())
+    second_next = second_iter_p_->next_moment ();
   bool unirhythm_b = (first_next == second_next) && !solo_b;
 
   Translator_group * fd = fir->find_create_translator_l (p->what_str_, "one");
diff --git a/mutopia/Coriolan/flauti.ly b/mutopia/Coriolan/flauti.ly
index 4de0fdd353..83c1ea59c1 100644
--- a/mutopia/Coriolan/flauti.ly
+++ b/mutopia/Coriolan/flauti.ly
@@ -14,17 +14,19 @@ copyright =	 "public domain";
 \include "flauto-1.ly"
 \include "flauto-2.ly"
 
-$flauti_staff = \context Staff = flauti <
+$flauti_staff = \notes \context Staff = flauti <
 	\property Staff.midiInstrument = #"flute"
 	\property Staff.instrument = #"2 Flauti"
 	\property Staff.instr = #"Fl."
-	%\notes \context Voice=flauti < 
-	\notes \context Staff=flauti < 
-		\global
-		\context VoiceOne=flautoi 
-			\$flauto1
-		\context VoiceTwo=flautoii 
-			\$flauto2
+
+	\global
+
+	\context Voice=one { \skip 1; }
+	\context Voice=two { \skip 1; }
+
+	\context Voice=one \partcombine Voice <
+		\context Thread=one \$flauto1
+		\context Thread=two \$flauto2
 	>
 >
 
-- 
2.39.5