(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 3afea1e1ce9ae59d2c6ca1adcb2055430c7db37a..deca7c3c90f9eec6eb4553f54a87738b8c5017f8 100644 (file)
--- 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 c7cca04df9bba1ba36f75f902819f5ee9d3c9016..0997a29b8afa2233d825c0f54f8a63904262527f 100644 (file)
--- 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