;;;;
;;;; source file of the GNU LilyPond music typesetter
;;;;
-;;;; (c) 1998--2004 Jan Nieuwenhuizen <janneke@gnu.org>
-;;;; Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 1998--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; Han-Wen Nienhuys <hanwen@xs4all.nl>
;; (use-modules (ice-9 optargs))
(make-procedure-with-setter ly:music-property
ly:music-set-property!))
+(define-safe-public (music-is-of-type? mus type)
+ "Does @code{mus} belong to the music class @code{type}?"
+ (memq type (ly:music-property mus 'types)))
+
+;; TODO move this
(define-public ly:grob-property
(make-procedure-with-setter ly:grob-property
ly:grob-set-property!))
+(define-public ly:prob-property
+ (make-procedure-with-setter ly:prob-property
+ ly:prob-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 ": { ")
(let ((es (ly:music-property music 'elements))
(display " }\n")
music)
+;;;
+;;; A scheme music pretty printer
+;;;
+(define (markup-expression->make-markup markup-expression)
+ "Transform `markup-expression' into an equivalent, hopefuly readable, scheme expression.
+For instance,
+ \\markup \\bold \\italic hello
+==>
+ (markup #:line (#:bold (#:italic (#:simple \"hello\"))))"
+ (define (proc->command-keyword proc)
+ "Return a keyword, eg. `#:bold', from the `proc' function, eg. #<procedure bold-markup (layout props arg)>"
+ (let ((cmd-markup (symbol->string (procedure-name proc))))
+ (symbol->keyword (string->symbol (substring cmd-markup 0 (- (string-length cmd-markup)
+ (string-length "-markup")))))))
+ (define (transform-arg arg)
+ (cond ((and (pair? arg) (markup? (car arg))) ;; a markup list
+ (apply append (map inner-markup->make-markup arg)))
+ ((and (not (string? arg)) (markup? arg)) ;; a markup
+ (inner-markup->make-markup arg))
+ (else ;; scheme arg
+ arg)))
+ (define (inner-markup->make-markup mrkup)
+ (if (string? mrkup)
+ `(#:simple ,mrkup)
+ (let ((cmd (proc->command-keyword (car mrkup)))
+ (args (map transform-arg (cdr mrkup))))
+ `(,cmd ,@args))))
+ ;; body:
+ (if (string? markup-expression)
+ markup-expression
+ `(markup ,@(inner-markup->make-markup markup-expression))))
+
+(define-public (music->make-music obj)
+ "Generate a expression that, once evaluated, may return an object equivalent to `obj',
+that is, for a music expression, a (make-music ...) form."
+ (cond (;; markup expression
+ (markup? obj)
+ (markup-expression->make-markup obj))
+ (;; music expression
+ (ly:music? obj)
+ `(make-music
+ ',(ly:music-property obj 'name)
+ ,@(apply append (map (lambda (prop)
+ `(',(car prop)
+ ,(music->make-music (cdr prop))))
+ (remove (lambda (prop)
+ (eqv? (car prop) 'origin))
+ (ly:music-mutable-properties obj))))))
+ (;; moment
+ (ly:moment? obj)
+ `(ly:make-moment ,(ly:moment-main-numerator obj)
+ ,(ly:moment-main-denominator obj)
+ ,(ly:moment-grace-numerator obj)
+ ,(ly:moment-grace-denominator obj)))
+ (;; note duration
+ (ly:duration? obj)
+ `(ly:make-duration ,(ly:duration-log obj)
+ ,(ly:duration-dot-count obj)
+ ,(car (ly:duration-factor obj))
+ ,(cdr (ly:duration-factor obj))))
+ (;; note pitch
+ (ly:pitch? obj)
+ `(ly:make-pitch ,(ly:pitch-octave obj)
+ ,(ly:pitch-notename obj)
+ ,(ly:pitch-alteration obj)))
+ (;; scheme procedure
+ (procedure? obj)
+ (or (procedure-name obj) obj))
+ (;; a symbol (avoid having an unquoted symbol)
+ (symbol? obj)
+ `',obj)
+ (;; an empty list (avoid having an unquoted empty list)
+ (null? obj)
+ `'())
+ (;; a proper list
+ (list? obj)
+ `(list ,@(map music->make-music obj)))
+ (;; a pair
+ (pair? obj)
+ `(cons ,(music->make-music (car obj))
+ ,(music->make-music (cdr obj))))
+ (else
+ obj)))
+
+(use-modules (ice-9 pretty-print))
+(define*-public (display-scheme-music obj #:optional (port (current-output-port)))
+ "Displays `obj', typically a music expression, in a friendly fashion,
+which often can be read back in order to generate an equivalent expression.
+
+Returns `obj'.
+"
+ (pretty-print (music->make-music obj) port)
+ (newline)
+ obj)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(define (shift-one-duration-log music shift dot)
- " add SHIFT to ly:duration-log and optionally
+(define-public (shift-one-duration-log music shift dot)
+ " add SHIFT to duration-log of 'duration in music and optionally
a dot to any note encountered. This scales the music up by a factor
2^shift * (2 - (1/2)^dot)"
(let ((d (ly:music-property music 'duration)))
(set! (ly:music-property music 'duration) nd)))
music))
-
-
(define-public (shift-duration-log music shift dot)
(music-map (lambda (x) (shift-one-duration-log x shift dot))
music))
-
+
+(define-public (make-repeat name times main alts)
+ "create a repeat music expression, with all properties initialized properly"
+ (let ((talts (if (< times (length alts))
+ (begin
+ (ly:warning (_ "More alternatives than repeats. Junking excess alternatives"))
+ (take alts times))
+ alts))
+ (r (make-repeated-music name)))
+ (set! (ly:music-property r 'element) main)
+ (set! (ly:music-property r 'repeat-count) (max times 1))
+ (set! (ly:music-property r 'elements) talts)
+ (if (equal? name "tremolo")
+ (let* ((dot? (zero? (modulo times 3)))
+ (dots (if dot? 1 0))
+ (mult (if dot?
+ (quotient (* times 2) 3)
+ times))
+ (shift (- (ly:intlog2 mult))))
+
+ (if (memq 'sequential-music (ly:music-property main 'types))
+ ;; \repeat "tremolo" { c4 d4 }
+ (let ((children (length (ly:music-property main 'elements))))
+
+ ;; fixme: should be more generic.
+ (if (and (not (= children 2))
+ (not (= children 1)))
+ (ly:warning (_ "expecting 2 elements for chord tremolo, found ~a") children))
+ (ly:music-compress r (ly:make-moment 1 children))
+ (shift-duration-log r
+ (if (= children 2) (1- shift) shift)
+ dots))
+ ;; \repeat "tremolo" c4
+ (shift-duration-log r shift dots)))
+ r)))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; clusters.
(define-public (unfold-repeats music)
"
This function replaces all repeats with unfold repeats. "
-
+
(let ((es (ly:music-property music 'elements))
(e (ly:music-property music 'element))
- (n (ly:music-name music)))
- (if (equal? n "Repeated_music")
- (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))
- )
+ )
+ (if (memq 'repeated-music (ly:music-property music 'types))
+ (let*
+ ((props (ly:music-mutable-properties music))
+ (old-name (ly:music-property music 'name))
+ (flattened (flatten-alist props)))
+
+ (set! music (apply make-music (cons 'UnfoldedRepeatedMusic
+ flattened)))
+
+ (if (equal? old-name 'TremoloRepeatedMusic)
+ (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)
- Repeated_music::unfolded_music_length)
- (set! (ly:music-property music 'start-moment-function)
- Repeated_music::first_start)
- (set! (ly:music-property music 'iterator-ctor)
- Unfolded_repeat_iterator::constructor)))
(if (pair? es)
(set! (ly:music-property music 'elements)
(unfold-repeats e)))
music))
-
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; property setting music objs.
(define-public (make-grob-property-revert grob gprop)
"Revert the grob property GPROP for GROB."
- (make-music 'OverrideProperty
+ (make-music 'RevertProperty
'symbol grob
'grob-property gprop))
(define direction-polyphonic-grobs
- '(Stem Tie Rest Slur Script TextScript Dots DotColumn Fingering
- ))
+ '(Stem Tie Rest Slur PhrasingSlur Script TextScript Dots DotColumn Fingering))
-(define-public (make-voice-props-set n)
+(define-safe-public (make-voice-props-set n)
(make-sequential-music
(append
(map (lambda (x) (make-grob-property-set x 'direction
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)
+(define-safe-public (make-voice-props-revert)
(make-sequential-music
(append
(map (lambda (x) (make-grob-property-revert x 'direction))
(list (make-grob-property-revert 'MultiMeasureRest 'staff-position)))))
-(define*-public (context-spec-music m context #:optional id)
+(define-safe-public (context-spec-music m context #:optional id)
"Add \\context CONTEXT = ID to M. "
(let ((cm (make-music 'ContextSpeccedMusic
'element m
(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
(make-music 'SimultaneousMusic
'elements elts))
-(define-public (make-event-chord elts)
+(define-safe-public (make-event-chord elts)
(make-music 'EventChord
'elements elts))
;; mmrest
(define-public (make-multi-measure-rest duration location)
- (make-music 'MultiMeasureRestMusicGroup
+ (make-music 'MultiMeasureRestMusic
'origin location
- 'elements (list (make-music 'BarCheck
- 'origin location)
- (make-event-chord (list (make-music 'MultiMeasureRestEvent
- 'origin location
- 'duration duration)))
- (make-music 'BarCheck
- 'origin location))))
-
-(define-public (glue-mm-rest-texts music)
- "Check if we have R1*4-\\markup { .. }, and if applicable convert to
-a property set for MultiMeasureRestNumber."
- (define (script-to-mmrest-text script-music)
- "Extract 'direction and 'text from SCRIPT-MUSIC, and transform into property sets."
- (let ((dir (ly:music-property script-music 'direction))
- (p (make-music 'MultiMeasureTextEvent
- 'text (ly:music-property script-music 'text))))
- (if (ly:dir? dir)
- (set! (ly:music-property p 'direction) dir))
- p))
- (if (eq? (ly:music-property music 'name) 'MultiMeasureRestMusicGroup)
- (let* ((text? (lambda (x) (memq 'script-event (ly:music-property x 'types))))
- (es (ly:music-property music 'elements))
- (texts (map script-to-mmrest-text (filter text? es)))
- (others (remove text? es)))
- (if (pair? texts)
- (set! (ly:music-property music 'elements)
- (cons (make-event-chord texts) others)))))
- music)
-
+ 'duration duration))
(define-public (make-property-set sym val)
(make-music 'PropertySet
'symbol sym
'value val))
+(define-public (make-property-unset sym)
+ (make-music 'PropertyUnset
+ 'symbol sym))
+
(define-public (make-ottava-set octavation)
(let ((m (make-music 'ApplyContext)))
(define (ottava-modify context)
old middleCPosition, add OCTAVATION to middleCPosition, and set
OTTAVATION to `8va', or whatever appropriate."
(if (number? (ly:context-property context 'middleCPosition))
- (if (= octavation 0)
- (let ((where (ly:context-property-where-defined context 'middleCPosition))
- (oc0 (ly:context-property context 'originalCentralCPosition)))
- (ly:context-set-property! context 'middleCPosition oc0)
- (ly:context-unset-property where 'originalCentralCPosition)
- (ly:context-unset-property where 'ottavation))
- (let* ((where (ly:context-property-where-defined context 'middleCPosition))
- (c0 (ly:context-property context 'middleCPosition))
- (new-c0 (+ c0 (* -7 octavation)))
- (string (cdr (assoc octavation '((2 . "15ma")
- (1 . "8va")
- (0 . #f)
- (-1 . "8va bassa")
- (-2 . "15ma bassa"))))))
- (ly:context-set-property! context 'middleCPosition new-c0)
- (ly:context-set-property! context 'originalCentralCPosition c0)
- (ly:context-set-property! context 'ottavation string)))))
+ (begin
+ (if (number? (ly:context-property context 'originalMiddleCPosition))
+ (let ((where (ly:context-property-where-defined context 'middleCPosition)))
+
+ (ly:context-set-property! context 'middleCPosition
+ (ly:context-property context 'originalMiddleCPosition))
+ (ly:context-unset-property where 'originalMiddleCPosition)
+ (ly:context-unset-property where 'ottavation)))
+ot
+ (let* ((where (ly:context-property-where-defined context 'middleCPosition))
+ (c0 (ly:context-property context 'middleCPosition))
+ (new-c0 (+ c0 (* -7 octavation)))
+ (string (cdr (assoc octavation '((2 . "15ma")
+ (1 . "8va")
+ (0 . #f)
+ (-1 . "8vb")
+ (-2 . "15mb"))))))
+ (ly:context-set-property! context 'middleCPosition new-c0)
+ (ly:context-set-property! context 'originalMiddleCPosition c0)
+ (ly:context-set-property! context 'ottavation string)))))
(set! (ly:music-property m 'procedure) ottava-modify)
(context-spec-music m 'Staff)))
(define-public (make-time-signature-set num den . rest)
"Set properties for time signature NUM/DEN. Rest can contain a list
of beat groupings "
+
+ (define (standard-beat-grouping num den)
+
+ "Some standard subdivisions for time signatures."
+ (let*
+ ((key (cons num den))
+ (entry (assoc key '(((6 . 8) . (3 3))
+ ((5 . 8) . (3 2))
+ ((9 . 8) . (3 3 3))
+ ((12 . 8) . (3 3 3 3))
+ ((8 . 8) . (3 3 2))
+ ))))
+
+ (if entry
+ (cdr entry)
+ '())))
+
(let* ((set1 (make-property-set 'timeSignatureFraction (cons num den)))
(beat (ly:make-moment 1 den))
(len (ly:make-moment num den))
(set3 (make-property-set 'measureLength len))
(set4 (make-property-set 'beatGrouping (if (pair? rest)
(car rest)
- '())))
+ (standard-beat-grouping num den))))
(basic (list set1 set2 set3 set4)))
(descend-to-context
(context-spec-music (make-sequential-music basic) 'Timing) 'Score)))
(define-public (set-time-signature num den . rest)
(ly:export (apply make-time-signature-set `(,num ,den . ,rest))))
-(define-public (make-penalty-music pen page-pen)
- (make-music 'BreakEvent
- 'penalty pen
- 'page-penalty page-pen))
-
-(define-public (make-articulation name)
+(define-safe-public (make-articulation name)
(make-music 'ArticulationEvent
'articulation-type name))
'duration duration
'text string))
-(define-public (make-span-event type spandir)
+(define-safe-public (make-span-event type span-dir)
(make-music type
- 'span-direction spandir))
+ 'span-direction span-dir))
(define-public (set-mus-properties! m alist)
"Set all of ALIST as properties of M."
(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"
(let ((es (ly:music-property ch 'elements)))
(set! (ly:music-property ch 'elements)
- (voicify-list (split-list es music-separator?) 0))
+ (voicify-list (split-list-by-separator es music-separator?) 0))
ch))
(define-public (voicify-music m)
"Recursively split chords that are separated with \\ "
(if (not (ly:music? m))
- (begin (display m)
- (error "not music!")))
+ (ly:error (_ "music expected: ~S") m))
(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))))
;;
(let* ((bn (ly:context-property tr 'currentBarNumber)))
(if (= bn n)
#t
- (error
- (format "Bar check failed, we should have reached ~a, instead at ~a\n"
- n bn)))))
+ (ly:error
+ ;; FIXME: uncomprehensable message
+ (_ "Bar check failed. Expect to be at ~a, instead at ~a")
+ n bn))))
(set! (ly:music-property m 'procedure) checker)
m))
+
+(define-public (skip->rest mus)
+
+ "Replace MUS by RestEvent of the same duration if it is a
+SkipEvent. Useful for extracting parts from crowded scores"
+
+ (if (equal? (ly:music-property mus 'name) 'SkipEvent)
+ (make-music 'RestEvent 'duration (ly:music-property mus 'duration))
+ mus))
+
+
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; warn for bare chords at start.
(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)
+(define-public (ly:music-message music msg)
(let ((ip (ly:music-property music 'origin)))
(if (ly:input-location? ip)
(ly:input-message ip msg)
- (ly:warn msg))))
-
+ (ly:warning 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")
+ (ly:music-message music "Starting score with a chord.\nInsert 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?)
+ `(define-music-function (parser location music) (ly:music?)
(make-music 'GraceMusic
'origin location
'element (make-music 'SequentialMusic
music
(ly:music-deep-copy ,stop))))))
-(defmacro-public def-music-function (args signature . body)
+(defmacro-public define-music-function (args signature . body)
"Helper macro for `ly:make-music-function'.
Syntax:
- (def-music-function (location arg1 arg2 ...) (arg1-type? arg2-type? ...)
+ (define-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) 'CueVoice "cue")
+ quote-music
+ (context-spec-music (make-voice-props-revert) 'CueVoice "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)))
-
+ (if (vector? quoted-vector)
+ (begin
+ (set! (ly:music-property music 'quoted-events) quoted-vector)
+ (set! (ly:music-property music 'iterator-ctor)
+ ly:quote-iterator::constructor))
+ (ly:warning (_ "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 (skip-to-last music parser)
+
+ "Replace MUSIC by
+
+<< { \\set skipTypesetting = ##t
+ LENGTHOF(\\showLastLength)
+ \\set skipTypesetting = ##t }
+ MUSIC >>
+
+if appropriate.
+ "
+ (let*
+ ((show-last (ly:parser-lookup parser 'showLastLength)))
+
+ (if (ly:music? show-last)
+ (let*
+ ((orig-length (ly:music-length music))
+ (skip-length (ly:moment-sub orig-length (ly:music-length show-last))))
+
+ (make-simultaneous-music
+ (list
+ (make-sequential-music
+ (list
+ (context-spec-music (make-property-set 'skipTypesetting #t)
+ 'Score)
+ (make-music 'SkipMusic 'duration
+ (ly:make-duration
+ 0 0
+ (ly:moment-main-numerator skip-length)
+ (ly:moment-main-denominator skip-length)))
+ (context-spec-music (make-property-set 'skipTypesetting #f)
+ 'Score)))
+ 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))
+
+ (lambda (x parser)
+ (skip-to-last x parser)
+ )))
+
;;;;;;;;;;;;;;;;;
;; lyrics
(music-map apply-duration lyric-music))
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-
-(define-public ((add-balloon-text object-name text off) grob orig-context cur-context)
- "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)))
- (if (equal? nm object-name)
- (begin
- (set! (ly:grob-property grob 'print-function) Balloon_interface::print)
- (set! (ly:grob-property grob 'balloon-original-callback) cb)
- (set! (ly:grob-property grob 'balloon-text) text)
- (set! (ly:grob-property grob 'balloon-text-offset) off)
- (set! (ly:grob-property grob 'balloon-text-props) '((font-family . roman)))))))
-
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; accidentals
;; 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))
;; Accidentals are cancelled across the staves in the same grand staff as well
((equal? style 'piano)
(set-accidentals-properties #f
- '( Staff (same-octave . 0) (any-octave . 0) (same-octave . 1)
- GrandStaff (any-octave . 0) (same-octave . 1))
+ '(Staff (same-octave . 0)
+ (any-octave . 0) (same-octave . 1)
+ GrandStaff (any-octave . 0) (same-octave . 1))
'()
pcontext))
((equal? style 'piano-cautionary)
'()
context))
(else
- (ly:warn "Unknown accidental style: ~S" (symbol->string style))
+ (ly:warning (_ "unknown accidental style: ~S" style))
(make-sequential-music '()))))))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(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))
+
+(define-public (pitch-of-note event-chord)
+
(let*
- ((skip
- (make-multi-measure-rest
- (ly:make-duration 0 0) '() )))
- (ly:music-compress skip (ly:music-length mus))
- skip
-))
+ ((evs (filter (lambda (x) (memq 'note-event (ly:music-property x 'types)))
+ (ly:music-property event-chord 'elements))))
+ (if (pair? evs)
+ (ly:music-property (car evs) 'pitch)
+ #f)))
+