X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fpart-combiner.scm;h=ae51d0539be6796e5ebcc7d2088841a9f76d2ca4;hb=3ddcad37fb02925ad8247535c72b614c79b300b7;hp=dd3152cbb7125bfd025e2a85cefdd95f4fa73b5f;hpb=e67366fea6687825c81c81f23210059215abb7bb;p=lilypond.git diff --git a/scm/part-combiner.scm b/scm/part-combiner.scm index dd3152cbb7..ae51d0539b 100644 --- a/scm/part-combiner.scm +++ b/scm/part-combiner.scm @@ -1,6 +1,6 @@ ;;;; This file is part of LilyPond, the GNU music typesetter. ;;;; -;;;; Copyright (C) 2004--2014 Han-Wen Nienhuys +;;;; Copyright (C) 2004--2015 Han-Wen Nienhuys ;;;; ;;;; LilyPond is free software: you can redistribute it and/or modify ;;;; it under the terms of the GNU General Public License as published by @@ -44,6 +44,17 @@ (ly:in-event-class? x 'note-event)) (filter f? (events vs))) +(define-method (rest-and-skip-events (vs )) + (define (f? x) + (or (ly:in-event-class? x 'rest-event) + (ly:in-event-class? x 'skip-event))) + (filter f? (events vs))) + +(define-method (any-mmrest-events (vs )) + (define (f? x) + (ly:in-event-class? x 'multi-measure-rest-event)) + (any f? (events vs))) + (define-method (previous-voice-state (vs )) (let ((i (slot-ref vs 'vector-index)) (v (slot-ref vs 'state-vector))) @@ -73,6 +84,19 @@ (display " synced ")) (display "\n" f)) +(define-method (current-or-previous-voice-states (ss )) + "Return voice states meeting the following conditions. For a voice +in sync, return the current voice state. For a voice out of sync, +return the previous voice state." + (let* ((vss (voice-states ss)) + (vs1 (car vss)) + (vs2 (cdr vss))) + (if (and vs1 (not (equal? (moment vs1) (moment ss)))) + (set! vs1 (previous-voice-state vs1))) + (if (and vs2 (not (equal? (moment vs2) (moment ss)))) + (set! vs2 (previous-voice-state vs2))) + (cons vs1 vs2))) + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -253,7 +277,7 @@ LilyPond version 2.8 and earlier." global) context-list)) -(define-public (make-part-combine-music parser music-list direction) +(define-public (make-part-combine-music parser music-list direction chord-range) (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"))) @@ -266,17 +290,19 @@ LilyPond version 2.8 and earlier." (set! (ly:music-property m 'split-list) (if (and (assoc "one" evs1) (assoc "two" evs2)) (determine-split-list (reverse! (assoc-get "one" evs1) '()) - (reverse! (assoc-get "two" evs2) '())) + (reverse! (assoc-get "two" evs2) '()) + chord-range) '())) m)) -(define-public (determine-split-list evl1 evl2) - "@var{evl1} and @var{evl2} should be ascending." +(define-public (determine-split-list evl1 evl2 chord-range) + "@var{evl1} and @var{evl2} should be ascending. @var{chord-range} is a pair of numbers (min . max) defining the distance in steps between notes that may be combined into a chord or unison." (let* ((pc-debug #f) - (chord-threshold 8) (voice-state-vec1 (make-voice-states evl1)) (voice-state-vec2 (make-voice-states evl2)) - (result (make-split-state voice-state-vec1 voice-state-vec2))) + (result (make-split-state voice-state-vec1 voice-state-vec2)) + (chord-min-diff (car chord-range)) + (chord-max-diff (cdr chord-range))) ;; Go through all moments recursively and check if the events of that ;; moment contain a part-combine-force-event override. If so, store its @@ -311,9 +337,11 @@ LilyPond version 2.8 and earlier." (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)) + (evts (if (synced? now-state) + (append + (part-combine-events (car (voice-states now-state))) + (part-combine-events (cdr (voice-states now-state)))) + '())) ;; result is (once-state permament-state): (state (fold forced-result (cons 'automatic prev-res) evts)) ;; Now let once override permanent changes: @@ -378,15 +406,13 @@ Only set if not set previously. (if (and (= (length pitches1) (length pitches2))) (if (and (pair? pitches1) (pair? pitches2) - (or - (< chord-threshold (ly:pitch-steps - (ly:pitch-diff (car pitches1) - (car pitches2)))) - - ;; voice crossings: - (> 0 (ly:pitch-steps (ly:pitch-diff (car pitches1) - (car pitches2)))) - )) + ; Is the interval outside of chord-range? + (let ((diff (ly:pitch-steps + (ly:pitch-diff (car pitches1) + (car pitches2))))) + (or (< diff chord-min-diff) + (> diff chord-max-diff) + ))) (put 'apart) ;; copy previous split state from spanner state (begin @@ -432,18 +458,82 @@ Only set if not set previously. (let* ((now-state (vector-ref result result-idx)) (vs1 (car (voice-states now-state))) (vs2 (cdr (voice-states now-state)))) - (if (and (equal? (configuration now-state) 'chords) - vs1 vs2) - (let ((notes1 (note-events vs1)) - (notes2 (note-events vs2))) - (cond ((and (= 1 (length notes1)) + + (define (analyse-synced-silence) + (let ((rests1 (if vs1 (rest-and-skip-events vs1) '())) + (rests2 (if vs2 (rest-and-skip-events vs2) '()))) + (cond + + ;; multi-measure rests (probably), which the + ;; part-combine iterator handles well + ((and (= 0 (length rests1)) + (= 0 (length rests2))) + (set! (configuration now-state) 'unisilence)) + + ;; equal rests or equal skips, but not one of each + ((and (= 1 (length rests1)) + (= 1 (length rests2)) + (equal? (ly:event-property (car rests1) 'class) + (ly:event-property (car rests2) 'class)) + (equal? (ly:event-property (car rests1) 'duration) + (ly:event-property (car rests2) 'duration))) + (set! (configuration now-state) 'unisilence)) + + ;; rests of different durations or mixed with + ;; skips or multi-measure rests + (else + ;; TODO For skips, route the rest to the shared + ;; voice and the skip to the voice for its part? + (set! (configuration now-state) 'apart-silence)) + + ))) + + (define (analyse-unsynced-silence vs1 vs2) + (let ((any-mmrests1 (if vs1 (any-mmrest-events vs1) #f)) + (any-mmrests2 (if vs2 (any-mmrest-events vs2) #f))) + (cond + ;; If a multi-measure rest begins now while the other + ;; part has an ongoing multi-measure rest (or has + ;; ended), start displaying the one that begins now. + ((and any-mmrests1 + (equal? (moment vs1) (moment now-state)) + (or (not vs2) any-mmrests2)) + (set! (configuration now-state) 'silence1)) + + ;; as above with parts swapped + ((and any-mmrests2 + (equal? (moment vs2) (moment now-state)) + (or (not vs1) any-mmrests1)) + (set! (configuration now-state) 'silence2)) + ))) + + (if (or vs1 vs2) + (let ((notes1 (if vs1 (note-events vs1) '())) + (notes2 (if vs2 (note-events vs2) '()))) + ; Todo: What about a2 chords, e.g. string multi-stops? + ; Sort and compare notes1 and notes2? + (cond ((and (equal? (configuration now-state) 'chords) + (= 1 (length notes1)) (= 1 (length notes2)) (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))))) + + ((synced? now-state) + (if (and (= 0 (length notes1)) + (= 0 (length notes2))) + (analyse-synced-silence))) + + (else ;; not synchronized + (let* ((vss + (current-or-previous-voice-states now-state)) + (vs1 (car vss)) + (vs2 (cdr vss))) + (if (and + (or (not vs1) (= 0 (length (note-events vs1)))) + (or (not vs2) (= 0 (length (note-events vs2))))) + (analyse-unsynced-silence vs1 vs2)))) + ))) (analyse-a2 (1+ result-idx))))) (define (analyse-solo12 result-idx) @@ -508,7 +598,50 @@ the mark when there are no spanners active. ;; try-solo start-idx)) - (define (analyse-moment result-idx) + (define (analyse-apart-silence result-idx) + "Analyse 'apart-silence starting at RESULT-IDX. Return next index." + (let* ((now-state (vector-ref result result-idx)) + (vs1 (current-voice-state now-state 1)) + (vs2 (current-voice-state now-state 2)) + (rests1 (if vs1 (rest-and-skip-events vs1) '())) + (rests2 (if vs2 (rest-and-skip-events vs2) '())) + (prev-state (if (> result-idx 0) + (vector-ref result (- result-idx 1)) + #f)) + (prev-config (if prev-state + (configuration prev-state) + 'apart-silence))) + (cond + ;; rest with multi-measure rest: choose the rest + ((and (synced? now-state) + (= 1 (length rests1)) + (ly:in-event-class? (car rests1) 'rest-event) + (= 0 (length rests2))) ; probably mmrest + (put 'silence1)) + + ;; as above with parts swapped + ((and (synced? now-state) + (= 1 (length rests2)) + (ly:in-event-class? (car rests2) 'rest-event) + (= 0 (length rests1))) ; probably mmrest + (put 'silence2)) + + ((synced? now-state) + (put 'apart-silence)) + + ;; remain in the silence1/2 states until resync + ((equal? prev-config 'silence1) + (put 'silence1)) + + ((equal? prev-config 'silence2) + (put 'silence2)) + + (else + (put 'apart-silence))) + + (1+ result-idx))) + + (define (analyse-apart result-idx) "Analyse 'apart starting at RESULT-IDX. Return next index." (let* ((now-state (vector-ref result result-idx)) (vs1 (current-voice-state now-state 1)) @@ -523,8 +656,10 @@ the mark when there are no spanners active. (max ;; we should always increase. (cond ((and (= n1 0) (= n2 0)) - (put 'apart-silence) - (1+ result-idx)) + ;; If we hit this, it means that the previous passes + ;; have designated as 'apart what is really + ;; 'apart-silence. + (analyse-apart-silence result-idx)) ((and (= n2 0) (equal? (moment vs1) (moment now-state)) (null? (previous-span-state vs1))) @@ -539,9 +674,14 @@ the mark when there are no spanners active. (1+ result-idx)))) (if (< result-idx (vector-length result)) - (if (equal? (configuration (vector-ref result result-idx)) 'apart) - (analyse-solo12 (analyse-moment result-idx)) - (analyse-solo12 (1+ result-idx))))) ; analyse-solo12 + (let ((conf (configuration (vector-ref result result-idx)))) + (cond + ((equal? conf 'apart) + (analyse-solo12 (analyse-apart result-idx))) + ((equal? conf 'apart-silence) + (analyse-solo12 (analyse-apart-silence result-idx))) + (else + (analyse-solo12 (1+ result-idx))))))) ; analyse-solo12 (analyse-spanner-states voice-state-vec1) (analyse-spanner-states voice-state-vec2)