X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fpart-combiner.scm;h=40047d3ce136ee65be7478d821eb019a083d9311;hb=68bcf843016f5ade4087a00f3fe09a333270d37e;hp=c4ee06a550632052dfea1add74c8b6e923b69da8;hpb=8d1022349a3cc2fbffdc40b5fc26f6913a453e7c;p=lilypond.git

diff --git a/scm/part-combiner.scm b/scm/part-combiner.scm
index c4ee06a550..40047d3ce1 100644
--- a/scm/part-combiner.scm
+++ b/scm/part-combiner.scm
@@ -1,8 +1,8 @@
 ;;;; part-combiner.scm -- Part combining, staff changes.
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
-;;;; 
-;;;; (c) 2004--2005	Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;;
+;;;; (c) 2004--2009	Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 ;; todo: figure out how to make module,
 ;; without breaking nested ly scopes
@@ -19,7 +19,7 @@
   ;; of (SYMBOL . RESULT-INDEX), which indicates where
   ;; said spanner was started.
   (spanner-state #:init-value '() #:accessor span-state))
-  
+
 (define-method (write (x <Voice-state> ) file)
   (display (when x) file)
   (display " evs = " file)
@@ -30,7 +30,7 @@
 
 (define-method (note-events (vs <Voice-state>))
   (define (f? x)
-    (equal? (ly:music-property	x 'name) 'NoteEvent))
+    (equal? (ly:event-property	x 'class) 'note-event))
   (filter f? (events vs)))
 
 (define-method (previous-voice-state (vs <Voice-state>))
@@ -49,7 +49,7 @@
   ;;
   (is #:init-keyword #:voice-states #:accessor voice-states)
   (synced  #:init-keyword #:synced #:init-value	 #f #:getter synced?))
-			     
+
 
 (define-method (write (x <Split-state> ) f)
   (display (when x) f)
@@ -82,7 +82,7 @@
   "Merge lists VS1 and VS2, containing Voice-state objects into vector
 of Split-state objects, crosslinking the Split-state vector and
 Voice-state objects
-"  
+"
   (define (helper ss-idx ss-list idx1 idx2)
     (let* ((state1 (if (< idx1 (vector-length vs1)) (vector-ref vs1 idx1) #f))
 	   (state2 (if (< idx2 (vector-length vs2)) (vector-ref vs2 idx2) #f))
@@ -114,39 +114,39 @@ Voice-state objects
 
   (define (helper index active)
     "Analyse EVS at INDEX, given state ACTIVE."
-    
+
     (define (analyse-tie-start active ev)
-      (if (equal? (ly:music-property ev 'name) 'TieEvent)
+      (if (equal? (ly:event-property ev 'class) 'tie-event)
 	  (acons 'tie (split-index (vector-ref voice-state-vec index))
 		 active)
 	  active))
-    
+
     (define (analyse-tie-end active ev)
-      (if (equal? (ly:music-property ev 'name) 'NoteEvent)
+      (if (equal? (ly:event-property ev 'class) 'note-event)
 	  (assoc-remove! active 'tie)
 	  active))
 
     (define (analyse-absdyn-end active ev)
-      (if (or (equal? (ly:music-property ev 'name) 'AbsoluteDynamicEvent)
-	      (and (equal? (ly:music-property ev 'name) 'CrescendoEvent)
-		   (equal? STOP (ly:music-property ev 'span-direction))))
+      (if (or (equal? (ly:event-property ev 'class) 'absolute-dynamic-event)
+	      (and (equal? (ly:event-property ev 'class) 'crescendo-event)
+		   (equal? STOP (ly:event-property ev 'span-direction))))
 	  (assoc-remove! (assoc-remove! active 'cresc) 'decr)
 	  active))
-    
+
     (define (active<? a b)
       (cond ((symbol<? (car a) (car b)) #t)
 	    ((symbol<? (car b) (car b)) #f)
 	    (else (< (cdr a) (cdr b)))))
-    
+
     (define (analyse-span-event active ev)
-      (let* ((name (ly:music-property ev 'name))
-	     (key (cond ((equal? name 'SlurEvent) 'slur)
-			((equal? name 'PhrasingSlurEvent) 'tie)
-			((equal? name 'BeamEvent) 'beam)
-			((equal? name 'CrescendoEvent) 'cresc)
-			((equal? name 'DecrescendoEvent) 'decr)
+      (let* ((name (ly:event-property ev 'class))
+	     (key (cond ((equal? name 'slur-event) 'slur)
+			((equal? name 'phrasing-slur-event) 'tie)
+			((equal? name 'beam-event) 'beam)
+			((equal? name 'crescendo-event) 'cresc)
+			((equal? name 'decrescendo-event) 'decr)
 			(else #f)))
-	     (sp (ly:music-property ev 'span-direction)))
+	     (sp (ly:event-property ev 'span-direction)))
 	(if (and (symbol? key) (ly:dir? sp))
 	    (if (= sp STOP)
 		(assoc-remove! active key)
@@ -181,32 +181,67 @@ Voice-state objects
 	  (set! (span-state (vector-ref voice-state-vec index))
 		(list-copy active))
 	  (helper (1+ index) active))))
-  
-  (helper 0 '()))
-
-(define noticed '())
-(define part-combine-listener '())
 
-; UGH - should pass noticed setter to part-combine-listener
-(define-safe-public (set-part-combine-listener x)
-  (set! part-combine-listener x))
+  (helper 0 '()))
 
-(define-public (notice-the-events-for-pc context lst)
-  "add CONTEXT-ID, EVENT list to NOTICED variable."
-  
-  (set! noticed (acons (ly:context-id context) lst noticed)))
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(define-public (recording-group-emulate music odef)
+  "Interprets music according to odef, but stores all events in a chronological
+list, similar to the Recording_group_engraver in 2.8 and earlier"
+  (let*
+     ((context-list '())
+      (now-mom (ly:make-moment 0 0))
+      (global (ly:make-global-context odef))
+      (mom-listener (ly:make-listener
+             (lambda (tev) (set! now-mom (ly:event-property tev 'moment)))))
+      (new-context-listener
+       (ly:make-listener
+        (lambda (sev)
+          (let*
+             ((child (ly:event-property sev 'context))
+              (this-moment-list (cons (ly:context-id child) '()))
+              (dummy (set! context-list (cons this-moment-list context-list)))
+              (acc '())
+              (accumulate-event-listener
+                  (ly:make-listener (lambda (ev)
+                                       (set! acc (cons (cons ev #t) acc)))))
+              (save-acc-listener
+                  (ly:make-listener (lambda (tev)
+                      (if (pair? acc)
+                        (let ((this-moment
+                              (cons (cons now-mom
+                                (ly:context-property child 'instrumentTransposition))
+                                ;; The accumulate-event-listener above creates
+                                ;; the list of events in reverse order, so we
+                                ;; have to revert it to the original order again
+                                (reverse acc))))
+                          (set-cdr! this-moment-list
+                                (cons this-moment (cdr this-moment-list)))
+                          (set! acc '())))))))
+            (ly:add-listener accumulate-event-listener
+                (ly:context-event-source child) 'StreamEvent)
+            (ly:add-listener save-acc-listener
+                (ly:context-event-source global) 'OneTimeStep))))))
+    (ly:add-listener new-context-listener
+        (ly:context-events-below global) 'AnnounceNewContext)
+    (ly:add-listener mom-listener (ly:context-event-source global) 'Prepare)
+    (ly:interpret-music-expression (make-non-relative-music music) global)
+    context-list))
+
+(define-public (make-part-combine-music parser music-list)
+  (let* ((m (make-music 'PartCombineMusic))
+	 (m1 (make-non-relative-music (context-spec-music (first music-list) 'Voice "one")))
+	 (m2  (make-non-relative-music  (context-spec-music (second music-list) 'Voice "two")))
+	 (listener (ly:parser-lookup parser 'partCombineListener))
+	 (evs2 (recording-group-emulate m2 listener))
+	 (evs1 (recording-group-emulate m1 listener)))
 
-(define-public (make-part-combine-music music-list)
-  (let ((m (make-music 'PartCombineMusic))
-	(m1 (make-non-relative-music (context-spec-music (car music-list) 'Voice "one")))
-	(m2  (make-non-relative-music  (context-spec-music (cadr music-list) 'Voice "two"))))
     (set! (ly:music-property m 'elements) (list m1 m2))
-    (ly:run-translator m2 part-combine-listener)
-    (ly:run-translator m1 part-combine-listener)
     (set! (ly:music-property m 'split-list)
-	  (determine-split-list (reverse! (cdr (assoc "one" noticed)) '())
-				(reverse! (cdr (assoc "two" noticed)) '())))
-    (set! noticed '())
+	  (if (and (assoc "one" evs1) (assoc "two" evs2))
+	      (determine-split-list (reverse! (assoc-get "one" evs1) '())
+				    (reverse! (assoc-get "two" evs2) '()))
+	      '()))
     m))
 
 (define-public (determine-split-list evl1 evl2)
@@ -216,7 +251,7 @@ Voice-state objects
 	 (voice-state-vec1 (make-voice-states evl1))
 	 (voice-state-vec2 (make-voice-states evl2))
 	 (result (make-split-state voice-state-vec1 voice-state-vec2)))
-    
+
     (define (analyse-time-step result-idx)
       (define (put x . index)
 	"Put the result to X, starting from INDEX backwards.
@@ -229,7 +264,7 @@ Only set if not set previously.
 	      (begin
 		(set! (configuration (vector-ref result i)) x)
 		(put x (1- i))))))
-      
+
       (define (copy-state-from state-vec vs)
 	(define (copy-one-state key-idx)
 	  (let* ((idx (cdr key-idx))
@@ -243,17 +278,17 @@ Only set if not set previously.
 	(let* ((vs1 (car (voice-states now-state)))
 	       (vs2 (cdr (voice-states now-state)))
 	       (notes1 (note-events vs1))
-	       (durs1 (sort (map (lambda (x) (ly:music-property x 'duration))
+	       (durs1 (sort (map (lambda (x) (ly:event-property x 'duration))
 				 notes1)
 			    ly:duration<?))
-	       (pitches1 (sort (map (lambda (x) (ly:music-property x 'pitch))
+	       (pitches1 (sort (map (lambda (x) (ly:event-property x 'pitch))
 				    notes1)
 			       ly:pitch<?))
 	       (notes2 (note-events vs2))
-	       (durs2 (sort (map (lambda (x) (ly:music-property x 'duration))
+	       (durs2 (sort (map (lambda (x) (ly:event-property x 'duration))
 				 notes2)
 			    ly:duration<?))
-	       (pitches2 (sort (map (lambda (x) (ly:music-property x 'pitch))
+	       (pitches2 (sort (map (lambda (x) (ly:event-property x 'pitch))
 				    notes2)
 			       ly:pitch<?)))
 	  (cond ((> (length notes1) 1) (put 'apart))
@@ -287,12 +322,12 @@ Only set if not set previously.
 						(previous-voice-state vs2)))
 			   (if (and (null? (span-state vs1)) (null? (span-state vs2)))
 			       (put 'chords)))))))))
-      
+
       (if (< result-idx (vector-length result))
 	  (let* ((now-state (vector-ref result result-idx))
 		 (vs1 (car (voice-states now-state)))
 		 (vs2 (cdr (voice-states now-state))))
-	    
+
 	    (cond ((not vs1) (put 'apart))
 		  ((not vs2) (put 'apart))
 		  (else
@@ -309,13 +344,13 @@ Only set if not set previously.
 			      (equal? active1 active2)
 			      (equal? new-active1 new-active2))
 			 (analyse-notes now-state)
-			 
+
 			 ;; active states different:
 			 (put 'apart)))
-		   
+
 		   ;; go to the next one, if it exists.
 		   (analyse-time-step (1+ result-idx)))))))
-    
+
     (define (analyse-a2 result-idx)
       (if (< result-idx (vector-length result))
 	  (let* ((now-state (vector-ref result result-idx))
@@ -323,20 +358,20 @@ Only set if not set previously.
 		 (vs2 (cdr (voice-states now-state))))
 	    (if (and (equal? (configuration now-state) 'chords)
 		     vs1 vs2)
-		(let ((notes1 (note-events vs1)) 
+		(let ((notes1 (note-events vs1))
 		      (notes2 (note-events vs2)))
 		  (cond ((and (= 1 (length notes1))
 			      (= 1 (length notes2))
-			      (equal? (ly:music-property (car notes1) 'pitch)
-				      (ly:music-property (car notes2) 'pitch)))
+			      (equal? (ly:event-property (car notes1) 'pitch)
+				      (ly:event-property (car notes2) 'pitch)))
 			 (set! (configuration now-state) 'unisono))
 			((and (= 0 (length notes1))
 			      (= 0 (length notes2)))
 			 (set! (configuration now-state) 'unisilence)))))
 	    (analyse-a2 (1+ result-idx)))))
-    
+
     (define (analyse-solo12 result-idx)
-      
+
       (define (previous-config vs)
 	(let* ((pvs (previous-voice-state vs))
 	       (spi (if pvs (split-index pvs) #f))
@@ -344,27 +379,30 @@ Only set if not set previously.
 	  (if prev-split
 	      (configuration prev-split)
 	      'apart)))
-      
+
       (define (put-range x a b)
 	;; (display (list "put range "	x a b "\n"))
 	(do ((i a (1+ i)))
 	    ((> i b) b)
 	  (set! (configuration (vector-ref result i)) x)))
-      
+
       (define (put x)
 	;; (display (list "putting "  x "\n"))
 	(set! (configuration (vector-ref result result-idx)) x))
-      
+
       (define (current-voice-state now-state voice-num)
 	(define vs ((if (= 1 voice-num) car cdr)
 		    (voice-states now-state)))
 	(if (or (not vs) (equal? (when now-state) (when vs)))
 	    vs
 	    (previous-voice-state vs)))
-      
+
       (define (try-solo type start-idx current-idx)
 	"Find a maximum stretch that can be marked as solo. Only set
-the mark when there are no spanners active."
+the mark when there are no spanners active.
+
+      return next idx to analyse.
+"
 	(if (< current-idx (vector-length result))
 	    (let* ((now-state (vector-ref result current-idx))
 		   (solo-state (current-voice-state now-state (if (equal? type 'solo1) 1 2)))
@@ -380,10 +418,11 @@ the mark when there are no spanners active."
 		     current-idx)
 		    ((and
 		      (null? (span-state solo-state)))
+
 		     ;;
 		     ;; This includes rests. This isn't a problem: long rests
 		     ;; will be shared with the silent voice, and be marked
-		     ;; as unisilence. Therefore, long rests won't 
+		     ;; as unisilence. Therefore, long rests won't
 		     ;;	 accidentally be part of a solo.
 		     ;;
 		     (put-range type start-idx current-idx)
@@ -392,7 +431,7 @@ the mark when there are no spanners active."
 		     (try-solo type start-idx (1+ current-idx)))))
 	    ;; try-solo
 	    start-idx))
-      
+
       (define (analyse-moment result-idx)
 	"Analyse 'apart starting at RESULT-IDX. Return next index. "
 	(let* ((now-state (vector-ref result result-idx))
@@ -418,11 +457,11 @@ the mark when there are no spanners active."
 		       (equal? (when vs2) (when now-state))
 		       (null? (previous-span-state vs2)))
 		  (try-solo 'solo2 result-idx result-idx))
-		 
+
 		 (else (1+ result-idx)))
 	   ;; analyse-moment
 	   (1+ result-idx))))
-      
+
       (if (< result-idx (vector-length result))
 	  (if (equal? (configuration (vector-ref result result-idx)) 'apart)
 	      (analyse-solo12 (analyse-moment result-idx))
@@ -451,65 +490,15 @@ the mark when there are no spanners active."
 	 (display result))
     result))
 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; autochange - fairly related to part combining.
-
-(define-public (make-autochange-music music)
-  (define (generate-split-list change-moment event-list acc)
-    (if (null? event-list)
-	acc
-	(let* ((now-tun (caar event-list))
-	       (evs (map car (cdar event-list)))
-	       (now (car now-tun))
-	       (notes (filter (lambda (x)
-				(equal? (ly:music-property  x 'name) 'NoteEvent))
-			      evs))
-	       (pitch (if (pair? notes)
-			  (ly:music-property (car notes) 'pitch)
-			  #f)))
-	  ;; tail recursive.
-	  (if (and pitch (not (= (ly:pitch-steps pitch) 0)))
-	      (generate-split-list #f
-				   (cdr event-list)
-				   (cons (cons
-
-					  (if change-moment
-					      change-moment
-					      now)
-					  (sign (ly:pitch-steps pitch))) acc))
-	      (generate-split-list
-	       (if pitch #f now)
-	       (cdr event-list) acc)))))
-  
-  (set! noticed '())
-  (let* ((m (make-music 'AutoChangeMusic))
-	 (context (ly:run-translator (make-non-relative-music music) part-combine-listener))
-	 (evs (last-pair noticed))
-	 (split (reverse! (generate-split-list
-			   #f
-			   (if (pair? evs)
-			       (reverse! (cdar evs) '()) '())
-			   '())
-			  '())))
-    (set! (ly:music-property m 'element) music)
-    (set! (ly:music-property m 'split-list) split)
-    (set! noticed '())
-    m))
-
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(define-public (add-quotable name mus)
-  (set! noticed '())
+(define-public (add-quotable parser name mus)
   (let* ((tab (eval 'musicQuotes (current-module)))
-	 (context (ly:run-translator (context-spec-music mus 'Voice)
-				     part-combine-listener))
-	 (first-voice-handle (last-pair noticed)))
-
-    ;; (display (last-pair noticed))
-    (if (pair? first-voice-handle)
+	 (context-list (recording-group-emulate (context-spec-music mus 'Voice)
+						(ly:parser-lookup parser 'partCombineListener))))
+    (if (pair? context-list)
 	(hash-set! tab name
 		   ;; cdr : skip name string
-		   (list->vector (reverse! (cdar first-voice-handle)
+		   (list->vector (reverse! (cdar context-list)
 					   '()))))))
-