;;;;
;;;; source file of the GNU LilyPond music typesetter
;;;;
-;;;; (c) 2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 2004--2006 Han-Wen Nienhuys <hanwen@cs.uu.nl>
;; todo: figure out how to make module,
;; without breaking nested ly scopes
;; spanner-state is an alist
;; of (SYMBOL . RESULT-INDEX), which indicates where
;; said spanner was started.
- (spanner-state #:init-value '() #:accessor span-state) )
+ (spanner-state #:init-value '() #:accessor span-state))
(define-method (write (x <Voice-state> ) file)
(display (when x) file)
(display (events x) file)
(display " active = " file)
(display (span-state x) file)
- (display "\n" file) )
+ (display "\n" file))
(define-method (note-events (vs <Voice-state>))
(define (f? x)
(define-method (previous-voice-state (vs <Voice-state>))
(let ((i (slot-ref vs 'vector-index))
- (v (slot-ref vs 'state-vector)) )
+ (v (slot-ref vs 'state-vector)))
(if (< 0 i)
(vector-ref v (1- i))
#f)))
(display (configuration x) f)
(if (synced? x)
(display " synced "))
- (display "\n" f) )
+ (display "\n" f))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
#:tuning (cdar v)
#:events (map car (cdr v))))
evl))))
- (do ( (i 0 (1+ i)) )
- ( (= i (vector-length vec)) vec)
+ (do ((i 0 (1+ i)))
+ ((= i (vector-length vec)) vec)
(slot-set! (vector-ref vec i) 'vector-index i)
(slot-set! (vector-ref vec i) 'state-vector vec))))
ss-list)))
(list->vector (reverse! (helper 0 '() 0 0) '())))
-
(define (analyse-spanner-states voice-state-vec)
(define (helper index active)
active))
(define (analyse-absdyn-end active ev)
- (if (equal? (ly:music-property ev 'name) 'AbsoluteDynamicEvent)
+ (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))))
(assoc-remove! (assoc-remove! active 'cresc) 'decr)
active))
(helper 0 '()))
-
-
(define noticed '())
(define part-combine-listener '())
; UGH - should pass noticed setter to part-combine-listener
-(define-public (set-part-combine-listener x)
+(define-safe-public (set-part-combine-listener x)
(set! part-combine-listener x))
(define-public (notice-the-events-for-pc context lst)
(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))
- notes1)
- ly:duration<?))
+ (durs1 (sort (map (lambda (x) (ly:music-property x 'duration))
+ notes1)
+ ly:duration<?))
(pitches1 (sort (map (lambda (x) (ly:music-property x 'pitch))
notes1)
ly:pitch<?))
- (notes2 (note-events vs2))
- (durs2 (sort (map (lambda (x) (ly:music-property x 'duration))
- notes2)
- ly:duration<?))
+ (notes2 (note-events vs2))
+ (durs2 (sort (map (lambda (x) (ly:music-property x 'duration))
+ notes2)
+ ly:duration<?))
(pitches2 (sort (map (lambda (x) (ly:music-property x 'pitch))
notes2)
ly:pitch<?)))
(cond ((> (length notes1) 1) (put 'apart))
((> (length notes2) 1) (put 'apart))
+ ((= 1 (+ (length notes2) (length notes1))) (put 'apart))
((and (= (length durs1) 1)
(= (length durs2) 1)
(not (equal? (car durs1) (car durs2))))
(try-solo type (1+ current-idx) (1+ current-idx)))
(else
(try-solo type start-idx (1+ current-idx)))))
- start-idx)) ; try-solo
+ ;; try-solo
+ start-idx))
(define (analyse-moment result-idx)
"Analyse 'apart starting at RESULT-IDX. Return next index. "
(n1 (length notes1))
(n2 (length notes2)))
;; (display (list "analyzing step " result-idx " moment " (when now-state) vs1 vs2 "\n"))
- (max ; we should always increase.
-
+ (max
+ ;; we should always increase.
(cond ((and (= n1 0) (= n2 0))
(put 'apart-silence)
(1+ result-idx))
(try-solo 'solo2 result-idx result-idx))
(else (1+ result-idx)))
- (1+ result-idx)))) ; analyse-moment
+ ;; analyse-moment
+ (1+ result-idx))))
(if (< result-idx (vector-length result))
(if (equal? (configuration (vector-ref result result-idx)) 'apart)
(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 '())
- (let* ((tab (eval 'musicQuotes (current-module) ))
+ (let* ((tab (eval 'musicQuotes (current-module)))
(context (ly:run-translator (context-spec-music mus 'Voice)
part-combine-listener))
(first-voice-handle (last-pair noticed)))
projects / lilypond.git / blobdiff