;;;;
;;;; source file of the GNU LilyPond music typesetter
;;;;
-;;;; (c) 1998--2004 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; (c) 1998--2005 Jan Nieuwenhuizen <janneke@gnu.org>
;;;; Han-Wen Nienhuys <hanwen@cs.uu.nl>
;; (use-modules (ice-9 optargs))
ly:grob-set-property!))
(define-public (music-map function music)
- "Apply @var{function} to @var{music} and all of the music it contains. "
+ "Apply @var{function} to @var{music} and all of the music it contains.
+
+First it recurses over the children, then the function is applied to MUSIC.
+"
(let ((es (ly:music-property music 'elements))
(e (ly:music-property music 'element)))
(set! (ly:music-property music 'elements)
(set! (ly:music-property music 'elements) filtered-es)
(set! (ly:music-property music 'articulations) filtered-as)
;; if filtering emptied the expression, we remove it completely.
- (if (or (pred? music)
+ (if (or (not (pred? music))
(and (eq? filtered-es '()) (not (ly:music? e))
(or (not (eq? es '()))
(ly:music? e))))
music
(make-music 'Music))) ;must return music.
-(define-public (remove-tag tag)
- (lambda (mus)
- (music-filter
- (lambda (m)
- (let* ((tags (ly:music-property m 'tags))
- (res (memq tag tags)))
- res))
- mus)))
-
(define-public (display-music music)
"Display music, not done with music-map for clarity of presentation."
(display music)
(display " }\n")
music)
-
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define (shift-one-duration-log music shift dot)
(define-public (shift-duration-log music shift dot)
(music-map (lambda (x) (shift-one-duration-log x shift dot))
music))
-
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; clusters.
(let ((es (ly:music-property music 'elements))
(e (ly:music-property music 'element))
- (n (ly:music-name music)))
- (if (equal? n "Repeated_music")
+ )
+ (if (memq 'repeated-music (ly:music-property music 'types))
(begin
-
(if (equal? (ly:music-property music 'iterator-ctor)
Chord_tremolo_iterator::constructor)
- (let*
- ((seq-arg? (memq 'sequential-music
- (ly:music-property e 'types)))
- (count (ly:music-property music 'repeat-count))
- (dot-shift (if (= 0 (remainder count 3))
- -1 0))
- )
+ (let* ((seq-arg? (memq 'sequential-music
+ (ly:music-property e 'types)))
+ (count (ly:music-property music 'repeat-count))
+ (dot-shift (if (= 0 (remainder count 3))
+ -1 0)))
(if (= 0 -1)
(set! count (* 2 (quotient count 3))))
(ly:intlog2 count)) dot-shift)
(if seq-arg?
- (ly:music-compress e (ly:make-moment (length (ly:music-property e 'elements)) 1)))
- ))
+ (ly:music-compress e (ly:make-moment (length (ly:music-property e 'elements)) 1)))))
- (set! (ly:music-property music 'length)
+ (set! (ly:music-property music 'length-callback)
Repeated_music::unfolded_music_length)
- (set! (ly:music-property music 'start-moment-function)
+ (set! (ly:music-property music 'start-callback)
Repeated_music::first_start)
(set! (ly:music-property music 'iterator-ctor)
Unfolded_repeat_iterator::constructor)))
(unfold-repeats e)))
music))
-
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; property setting music objs.
'grob-property gprop))
(define direction-polyphonic-grobs
- '(Stem Tie Rest Slur Script TextScript Dots DotColumn Fingering
- ))
+ '(Stem Tie Rest Slur Script TextScript Dots DotColumn Fingering))
(define-public (make-voice-props-set n)
(make-sequential-music
direction-polyphonic-grobs)
(list
(make-grob-property-set 'NoteColumn 'horizontal-shift (quotient n 2))
- (make-grob-property-set 'MultiMeasureRest 'staff-position (if (odd? n) -4 4))
-
- ))))
-
+ (make-grob-property-set 'MultiMeasureRest 'staff-position (if (odd? n) -4 4))))))
(define-public (make-voice-props-revert)
(make-sequential-music
(set! (ly:music-property cm 'context-id) id))
cm))
-
(define-public (descend-to-context m context)
"Like context-spec-music, but only descending. "
(let ((cm (context-spec-music m context)))
(define-public (make-non-relative-music mus)
(make-music 'UnrelativableMusic
- 'element mus
- ))
+ 'element mus))
(define-public (make-apply-context func)
(make-music 'ApplyContext
(let ((ts (ly:music-property m 'types)))
(memq 'separator ts)))
-
;;; splitting chords into voices.
(define (voicify-list lst number)
- "Make a list of Musics.
+ "Make a list of Musics.
voicify-list :: [ [Music ] ] -> number -> [Music]
LST is a list music-lists.
NUMBER is 0-base, i.e. Voice=1 (upstems) has number 0.
"
- (if (null? lst)
- '()
- (cons (context-spec-music
- (make-sequential-music
- (list (make-voice-props-set number)
- (make-simultaneous-music (car lst))))
- 'Voice (number->string (1+ number)))
- (voicify-list (cdr lst) (1+ number)))))
+ (if (null? lst)
+ '()
+ (cons (context-spec-music
+ (make-sequential-music
+ (list (make-voice-props-set number)
+ (make-simultaneous-music (car lst))))
+ 'Voice (number->string (1+ number)))
+ (voicify-list (cdr lst) (1+ number)))))
(define (voicify-chord ch)
"Split the parts of a chord into different Voices using separator"
(error "not music!")))
(let ((es (ly:music-property m 'elements))
(e (ly:music-property m 'element)))
+
(if (pair? es)
(set! (ly:music-property m 'elements) (map voicify-music es)))
(if (ly:music? e)
(set! (ly:music-property m 'element) (voicify-music e)))
- (if (and (equal? (ly:music-name m) "Simultaneous_music")
+ (if (and (equal? (ly:music-property m 'name) 'SimultaneousMusic)
(reduce (lambda (x y ) (or x y)) #f (map music-separator? es)))
(set! m (context-spec-music (voicify-chord m) 'Staff)))
m))
(ly:export (make-music 'Music)))
;;;
-; Make a function that checks score element for being of a specific type.
+ ; Make a function that checks score element for being of a specific type.
(define-public (make-type-checker symbol)
(lambda (elt)
;;(display symbol)
(define-public ((set-output-property grob-name symbol val) grob grob-c context)
- "Usage:
+ "Usage:
\\applyoutput #(set-output-property 'Clef 'extra-offset '(0 . 1))
"
- (let ((meta (ly:grob-property grob 'meta)))
- (if (equal? (cdr (assoc 'name meta)) grob-name)
- (set! (ly:grob-property grob symbol) val))))
+ (let ((meta (ly:grob-property grob 'meta)))
+ (if (equal? (cdr (assoc 'name meta)) grob-name)
+ (set! (ly:grob-property grob symbol) val))))
;;
(define (has-request-chord elts)
(reduce (lambda (x y) (or x y)) #f
(map (lambda (x)
- (equal? (ly:music-name x) "Request_chord"))
+ (equal? (ly:music-property x 'name) 'RequestChord))
elts)))
(define (ly:music-message music msg)
(if (ly:input-location? ip)
(ly:input-message ip msg)
(ly:warn msg))))
-
+
(define (check-start-chords music)
"Check music expression for a Simultaneous_music containing notes\n(ie. Request_chords),
without context specification. Called from parser."
(let ((es (ly:music-property music 'elements))
(e (ly:music-property music 'element))
- (name (ly:music-name music)))
+ (name (ly:music-property music 'name)))
(cond ((equal? name "Context_specced_music") #t)
((equal? name "Simultaneous_music")
(if (has-request-chord es)
(ly:music-message music "Starting score with a chord.\nPlease insert an explicit \\context before chord")
(map check-start-chords es)))
- ((equal? name "Sequential_music")
+ ((equal? name "SequentialMusic")
(if (pair? es)
(check-start-chords (car es))))
(else (if (ly:music? e) (check-start-chords e)))))
(define (vector-extend v x)
"Make a new vector consisting of V, with X added to the end."
- (let*
- ((n (vector-length v))
- (nv (make-vector (+ n 1) '())))
+ (let* ((n (vector-length v))
+ (nv (make-vector (+ n 1) '())))
(vector-move-left! v 0 n nv 0)
(vector-set! nv n x)
nv))
(define (set-prop context)
(let* ((where (ly:context-property-where-defined context 'graceSettings))
(current (ly:context-property where 'graceSettings))
- (new-settings (vector-extend current (list context-name grob sym val))))
+ (new-settings (append current
+ (list (list context-name grob sym val)))))
(ly:context-set-property! where 'graceSettings new-settings)))
(ly:export (context-spec-music (make-apply-context set-prop) 'Voice)))
-(define-public (set-start-grace-properties context)
- (define (execute-1 x)
- (let ((tr (ly:context-find context (car x))))
- (if (ly:context? tr)
- (ly:context-pushpop-property tr (cadr x) (caddr x) (cadddr x)))))
-
- (let ((props (ly:context-property context 'graceSettings)))
- (if (vector? props)
- (vector-map execute-1 props))))
-
-(define-public (set-stop-grace-properties context)
- (define (execute-1 x)
- (let ((tr (ly:context-find context (car x))))
- (if (ly:context? tr)
- (ly:context-pushpop-property tr (cadr x) (caddr x)))))
-
- (let ((props (ly:context-property context 'graceSettings)))
- (if (vector? props)
- (vector-reverse-map execute-1 props))))
-
-
(defmacro-public def-grace-function (start stop)
- `(def-music-function (location music) (ly:music?)
+ `(def-music-function (parser location music) (ly:music?)
(make-music 'GraceMusic
'origin location
'element (make-music 'SequentialMusic
(defmacro-public def-music-function (args signature . body)
"Helper macro for `ly:make-music-function'.
Syntax:
- (def-music-function (location arg1 arg2 ...) (arg1-type? arg2-type? ...)
+ (def-music-function (parser location arg1 arg2 ...) (arg1-type? arg2-type? ...)
...function body...)
"
`(ly:make-music-function (list ,@signature)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(define-public (cue-substitute quote-music)
+ "Must happen after quote-substitute."
+
+ (if (vector? (ly:music-property quote-music 'quoted-events))
+ (let* ((dir (ly:music-property quote-music 'quoted-voice-direction))
+ (main-voice (if (eq? 1 dir) 1 0))
+ (cue-voice (if (eq? 1 dir) 0 1))
+ (main-music (ly:music-property quote-music 'element))
+ (return-value quote-music))
+
+ (if (or (eq? 1 dir) (eq? -1 dir))
+
+ ;; if we have stem dirs, change both quoted and main music
+ ;; to have opposite stems.
+ (begin
+ (set! return-value
+
+ ;; cannot context-spec Quote-music, since context
+ ;; for the quotes is determined in the iterator.
+ (make-sequential-music
+ (list
+ (context-spec-music (make-voice-props-set cue-voice) 'Voice "cue")
+ quote-music
+ (context-spec-music (make-voice-props-revert) 'Voice "cue"))))
+ (set! main-music
+ (make-sequential-music
+ (list
+ (make-voice-props-set main-voice)
+ main-music
+ (make-voice-props-revert))))
+ (set! (ly:music-property quote-music 'element) main-music)))
+
+ return-value)
+ quote-music))
+
(define-public ((quote-substitute quote-tab) music)
- (let*
- ((quoted-name (ly:music-property music 'quoted-music-name))
- (quoted-vector (if (string? quoted-name)
- (hash-ref quote-tab quoted-name #f)
- #f
- ))
-
- )
+ (let* ((quoted-name (ly:music-property music 'quoted-music-name))
+ (quoted-vector (if (string? quoted-name)
+ (hash-ref quote-tab quoted-name #f)
+ #f)))
+
(if (string? quoted-name)
(if (vector? quoted-vector)
(set! (ly:music-property music 'quoted-events) quoted-vector)
(ly:warn "Cannot find quoted music `~S'" quoted-name)))
music))
-
+
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; switch it on here, so parsing and init isn't checked (too slow!)
(set-debug-cell-accesses! 15000))
m)
+(define (music-check-error music)
+ (define found #f)
+ (define (signal m)
+ (if (and (ly:music? m)
+ (eq? (ly:music-property m 'error-found) #t))
+ (set! found #t)))
+
+ (for-each signal (ly:music-property music 'elements))
+ (signal (ly:music-property music 'element))
+
+ (if found
+ (set! (ly:music-property music 'error-found) #t))
+ music)
+
+(define (precompute-music-length music)
+ (set! (ly:music-property music 'length)
+ (ly:music-length music))
+ music)
+
(define-public toplevel-music-functions
(list
;; check-start-chords ; ; no longer needed with chord syntax.
(lambda (music parser) (voicify-music music))
(lambda (x parser) (music-map glue-mm-rest-texts x))
+ (lambda (x parser) (music-map music-check-error x))
+ (lambda (x parser) (music-map precompute-music-length x))
(lambda (music parser)
(music-map (quote-substitute (ly:parser-lookup parser 'musicQuotes)) music))
;; switch-on-debugging
- ))
+ (lambda (x parser) (music-map cue-substitute x))))
;;;;;;;;;;;;;;;;;
;; lyrics
;;
(define-public ((add-balloon-text object-name text off) grob orig-context cur-context)
- "Usage: see input/regression/balloon.ly "
+ "Usage: see input/regression/balloon.ly "
(let* ((meta (ly:grob-property grob 'meta))
(nm (if (pair? meta) (cdr (assoc 'name meta)) "nonexistant"))
(cb (ly:grob-property grob 'print-function)))
;; as cautionaries
((equal? style 'modern-voice-cautionary)
(set-accidentals-properties #f
- '(Voice (same-octave . 0) )
+ '(Voice (same-octave . 0))
'(Voice (any-octave . 0) (same-octave . 1)
Staff (same-octave . 0) (any-octave . 0) (same-octave . 1))
context))
(define-public (skip-of-length mus)
"Create a skip of exactly the same length as MUS."
- (let*
- ((skip
- (make-music
- 'SkipEvent
- 'duration (ly:make-duration 0 0))))
-
- (make-event-chord (list (ly:music-compress skip (ly:music-length mus))))
-))
+ (let* ((skip
+ (make-music
+ 'SkipEvent
+ 'duration (ly:make-duration 0 0))))
+ (make-event-chord (list (ly:music-compress skip (ly:music-length mus))))))
(define-public (mmrest-of-length mus)
"Create a mmrest of exactly the same length as MUS."
- (let*
- ((skip
- (make-multi-measure-rest
- (ly:make-duration 0 0) '() )))
- (ly:music-compress skip (ly:music-length mus))
- skip
-))
-
+ (let* ((skip
+ (make-multi-measure-rest
+ (ly:make-duration 0 0) '())))
+ (ly:music-compress skip (ly:music-length mus))
+ skip))
projects / lilypond.git / blobdiff