% -*-Scheme-*-
-\version "2.9.12"
+\version "2.10.0"
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% need SRFI-1 filter
-#(use-modules (srfi srfi-1))
-%% FIXME: guile-1.7 required?
-%#(use-modules (scm display-lily))invalid module name for use-syntax ((srfi srfi-39))
-
-#(use-modules (scm display-lily))
-#(display-lily-init parser)
-
+#(use-modules (srfi srfi-1))
acciaccatura =
#(def-grace-function startAcciaccaturaMusic stopAcciaccaturaMusic)
addquote =
#(define-music-function (parser location name music) (string? ly:music?)
"Add a piece of music to be quoted "
- (add-quotable name music)
+ (add-quotable parser name music)
(make-music 'SequentialMusic 'void #t))
autochange =
#(define-music-function (parser location music) (ly:music?)
- (make-autochange-music music))
+ (make-autochange-music parser music))
applyContext =
#(define-music-function (parser location proc) (procedure?)
'origin location
'procedure proc))
+
+balloonText =
+#(define-music-function (parser location offset text) (number-pair? markup?)
+
+ (make-music 'AnnotateOutputEvent
+ 'X-offset (car offset)
+ 'Y-offset (cdr offset)
+ 'text text))
+
+balloonGrobText =
+#(define-music-function (parser location grob-name offset text) (symbol? number-pair? markup?)
+
+ (make-music 'AnnotateOutputEvent
+ 'symbol grob-name
+ 'X-offset (car offset)
+ 'Y-offset (cdr offset)
+ 'text text))
+
bar =
#(define-music-function (parser location type)
(string?)
'quoted-voice-direction dir
'origin location))
+%% The following causes an error with guile 1.6.8 (guile 1.6.7 and 1.8.x are fine)
+#(use-modules (scm display-lily))
displayLilyMusic =
#(define-music-function (parser location music) (ly:music?)
- (display-lily-music music)
+ (newline)
+ (display-lily-music music parser)
music)
displayMusic =
#(define-music-function (parser location music) (ly:music?)
- (display-scheme-music music)
- music)
+ (newline)
+ (display-scheme-music music)
+ music)
featherDurations=
#(define-music-function (parser location factor argument) (ly:moment? ly:music?)
))
partcombine =
#(define-music-function (parser location part1 part2) (ly:music? ly:music?)
- (make-part-combine-music (list part1 part2)))
+ (make-part-combine-music parser
+ (list part1 part2)))
pitchedTrill =
@var{music}: a music sequence, containing BarChecks as limiting expressions.
Example:
+
+@verbatim
\\parallelMusic #'(A B C) {
c c | d d | e e |
d d | e e | f f |
A = { c c | d d | }
B = { d d | e e | }
C = { e e | f f | }
+@end verbatim
"
(let* ((voices (apply circular-list (make-list (length voice-ids) (list))))
(current-voices voices)
(if (access? tweak-filename R_OK)
(begin
(ly:message "Including tweak file ~a" tweak-filename)
- (set! page-layout-parser (ly:clone-parser parser))
+ (set! page-layout-parser (ly:parser-clone parser))
(ly:parser-parse-string page-layout-parser
(format #f "\\include \"~a\""
tweak-filename))))))
rightHandFinger =
-#(define-music-function (parser location finger) (number?)
- "Define a StringFingerEvent"
- (make-music 'StringFingerEvent
- 'origin location
- 'digit finger))
+#(define-music-function (parser location finger) (number-or-string?)
+ "Define a StrokeFingerEvent"
+
+ (apply make-music
+ (append
+ (list
+ 'StrokeFingerEvent
+ 'origin location)
+ (if (string? finger)
+ (list 'text finger)
+ (list 'digit finger)))))
scoreTweak =
#(define-music-function (parser location name) (string?)