X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fpart-combiner.scm;h=2a95e2083bbe5331734a30382ba4abbbbffd945e;hb=b60f26d395a56e7fbfa272c35cd2e77dccb98ee9;hp=40047d3ce136ee65be7478d821eb019a083d9311;hpb=aa8523e4fa16352a1708065e447aac65426d82a4;p=lilypond.git

diff --git a/scm/part-combiner.scm b/scm/part-combiner.scm
index 40047d3ce1..2a95e2083b 100644
--- a/scm/part-combiner.scm
+++ b/scm/part-combiner.scm
@@ -1,8 +1,19 @@
-;;;; part-combiner.scm -- Part combining, staff changes.
+;;;; This file is part of LilyPond, the GNU music typesetter.
 ;;;;
-;;;;  source file of the GNU LilyPond music typesetter
+;;;; Copyright (C) 2004--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;;
-;;;; (c) 2004--2009	Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; LilyPond is free software: you can redistribute it and/or modify
+;;;; it under the terms of the GNU General Public License as published by
+;;;; the Free Software Foundation, either version 3 of the License, or
+;;;; (at your option) any later version.
+;;;;
+;;;; LilyPond is distributed in the hope that it will be useful,
+;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;;; GNU General Public License for more details.
+;;;;
+;;;; You should have received a copy of the GNU General Public License
+;;;; along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 
 ;; todo: figure out how to make module,
 ;; without breaking nested ly scopes
@@ -43,7 +54,10 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (define-class <Split-state> ()
+  ;; The automatically determined split configuration
   (configuration #:init-value '() #:accessor configuration)
+  ;; Allow overriding split configuration, takes precedence over configuration
+  (forced-configuration #:init-value #f #:accessor forced-configuration)
   (when-moment #:accessor when #:init-keyword #:when)
   ;; voice-states are states starting with the Split-state or later
   ;;
@@ -252,6 +266,56 @@ list, similar to the Recording_group_engraver in 2.8 and earlier"
 	 (voice-state-vec2 (make-voice-states evl2))
 	 (result (make-split-state voice-state-vec1 voice-state-vec2)))
 
+    ;; Go through all moments recursively and check if the events of that
+    ;; moment contain a part-combine-force-event override. If so, store its
+    ;; value in the forced-configuration field, which will override. The
+    ;; previous configuration is used to determine non-terminated settings.
+    (define (analyse-forced-combine result-idx prev-res)
+
+      (define (get-forced-event x)
+	(if (ly:in-event-class? x 'part-combine-force-event)
+	    (cons (ly:event-property x 'forced-type) (ly:event-property x 'once))
+	    #f))
+      (define (part-combine-events vs)
+	(if (not vs)
+	    '()
+	    (filter-map get-forced-event (events vs))))
+      ;; end part-combine-events
+
+      ;; forced-result: Take the previous config and analyse whether
+      ;; any change happened.... Return new once and permanent config
+      (define (forced-result evt state)
+	;; sanity check, evt should always be (new-state . once)
+	(if (not (and (pair? evt) (pair? state)))
+	    state
+	    (if (cdr evt)
+		;; Once-event, leave permanent state unchanged
+		(cons (car evt) (cdr state))
+		;; permanent change, leave once state unchanged
+		(cons (car state) (car evt)))))
+      ;; end forced-combine-result
+
+      ;; body of analyse-forced-combine:
+      (if (< result-idx (vector-length result))
+	  (let* ((now-state (vector-ref result result-idx)) ; current result
+		 ;; Extract all part-combine force events
+		 (ev1 (part-combine-events (car (voice-states now-state))))
+		 (ev2 (part-combine-events (cdr (voice-states now-state))))
+		 (evts (append ev1 ev2))
+		 ;; result is (once-state permament-state):
+		 (state (fold forced-result (cons 'automatic prev-res) evts))
+		 ;; Now let once override permanent changes:
+		 (force-state (if (equal? (car state) 'automatic)
+				  (cdr state)
+				  (car state))))
+	    (set! (forced-configuration (vector-ref result result-idx))
+		  force-state)
+	    ;; For the next moment, ignore the once override (car stat)
+	    ;; and pass on the permanent override, stored as (cdr state)
+	    (analyse-forced-combine (1+ result-idx) (cdr state)))))
+    ;; end analyse-forced-combine
+
+
     (define (analyse-time-step result-idx)
       (define (put x . index)
 	"Put the result to X, starting from INDEX backwards.
@@ -477,14 +541,25 @@ the mark when there are no spanners active.
 	  (display "***\n")
 	  (display result)
 	  (display "***\n")))
+
+    ;; Extract all forced combine strategies, i.e. events inserted by
+    ;; \partcombine(Apart|Automatic|SoloI|SoloII|Chords)[Once]
+    ;; They will in the end override the automaically determined ones.
+    ;; Initial state for both voices is no override
+    (analyse-forced-combine 0 #f)
+    ;; Now go through all time steps in a loop and find a combination strategy
+    ;; based only on the events of that one moment (i.e. neglecting longer
+    ;; periods of solo/apart, etc.)
     (analyse-time-step 0)
     ;; (display result)
+    ;; Check for unisono or unisilence moments
     (analyse-a2 0)
     ;;(display result)
     (analyse-solo12 0)
     ;; (display result)
     (set! result (map
-		  (lambda (x) (cons (when x) (configuration x)))
+		  ;; forced-configuration overrides, if it is set
+		  (lambda (x) (cons (when x) (or (forced-configuration x) (configuration x))))
 		  (vector->list result)))
     (if #f ;; pc-debug
 	 (display result))