From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Wed, 31 Mar 2004 23:36:11 +0000 (+0000)
Subject: (analyse-spanner-states): use split-index,
X-Git-Tag: release/2.2.0~6
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=61622a4e7f4b265bafca21fb6d614f058e75a0e8;p=lilypond.git

(analyse-spanner-states): use split-index,
not voice-state index for tie state. This fixes a partcombine
problem with ties.
---

diff --git a/ChangeLog b/ChangeLog
index 3afea1e1ce..deca7c3c90 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2004-04-01  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+	* scm/part-combiner.scm (analyse-spanner-states): use split-index,
+	not voice-state index for tie state. This fixes a partcombine
+	problem with ties.
+
 	* Documentation/user/tutorial.itely (Commenting input files): add
 	note about convert-ly.
 
diff --git a/scm/part-combiner.scm b/scm/part-combiner.scm
index c7cca04df9..0997a29b8a 100644
--- a/scm/part-combiner.scm
+++ b/scm/part-combiner.scm
@@ -118,7 +118,8 @@ Voice-state objects
     
     (define (analyse-tie-start active ev)
       (if (equal? (ly:music-property ev 'name) 'TieEvent)
-	  (acons 'tie index active)
+	  (acons 'tie (split-index (vector-ref voice-state-vec index))
+		 active)
 	  active))
     
     (define (analyse-tie-end active ev)
@@ -289,6 +290,8 @@ Only set if not set previously.
 	  (let* ((now-state (vector-ref result ri))
 		 (vs1 (car (voice-states now-state)))
 		 (vs2 (cdr (voice-states now-state))))
+
+	    
 	    (cond ((not vs1) (put 'apart))
 		  ((not vs2) (put 'apart))
 		  (else