]> git.donarmstrong.com Git - lilypond.git/blobdiff - scm/autochange.scm
Table Of Contents crash with negative first-page-number
[lilypond.git] / scm / autochange.scm
index b358c22b53dd0a610abcb28266601d42a645ee3e..3e1d4b9775d146a8e2b09e4dda748814a4a2e484 100644 (file)
@@ -3,8 +3,8 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; autochange.scm - fairly related to part combining.
 
-(define-public (make-autochange-music parser music)
-  (define (generate-split-list change-moment event-list acc)
+(define-public (make-autochange-music music)
+  (define (generate-split-list change-moment prev-dir event-list acc)
     (if (null? event-list)
         acc
         (let* ((now-tun (caar event-list))
                               evs))
                (pitch (if (pair? notes)
                           (ly:event-property (car notes) 'pitch)
-                          #f)))
+                          #f))
+               (dir (if pitch (sign (ly:pitch-steps pitch)) 0)))
           ;; tail recursive.
-          (if (and pitch (not (= (ly:pitch-steps pitch) 0)))
+          (if (and (not (= dir 0))
+                   (not (= dir prev-dir)))
               (generate-split-list #f
+                                   dir
                                    (cdr event-list)
                                    (cons (cons
 
                                           (if change-moment
                                               change-moment
                                               now)
-                                          (sign (ly:pitch-steps pitch))) acc))
+                                          (if (< dir 0) 'down 'up)) acc))
               (generate-split-list
-               (if pitch #f now)
+               (if pitch #f (if change-moment change-moment now))
+               dir
                (cdr event-list) acc)))))
 
   (let* ((m (make-music 'AutoChangeMusic))
-         (m1 (make-non-relative-music (context-spec-music music 'Voice "one")))
-         (context-list (recording-group-emulate music
-                                                (ly:parser-lookup parser 'partCombineListener)))
-         (evs (car context-list))
+         (m1 (context-spec-music (make-non-relative-music music) 'Voice ""))
+         (context-list (recording-group-emulate m1
+                                                (ly:parser-lookup 'partCombineListener)))
          (rev (reverse! (cdar context-list)))
          (split (reverse! (generate-split-list
                            #f
+                           0
                            rev
                            '())
                           '())))
-    (set! (ly:music-property m 'element) music)
-    (set! (ly:music-property m 'split-list) split)
+    (set! (ly:music-property m 'element) m1)
+    (set! (ly:music-property m 'context-change-list) split)
     m))