% -*-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))
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% this file is alphabetically sorted.
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-#(use-modules (scm display-lily))
-#(display-lily-init parser)
+%% need SRFI-1 filter
+#(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?)
(lambda (c)
(let*
((cbn (ly:context-property c 'currentBarNumber)))
- (if (not (= cbn n))
+ (if (and (number? cbn) (not (= cbn n)))
(ly:input-message location "Barcheck failed got ~a expect ~a"
cbn n))))))
#(define-music-function (parser location) ()
(make-music 'EventChord
'origin location
- 'elements (list (make-music 'BreathingSignEvent))))
+ 'elements (list (make-music 'BreathingEvent))))
bendAfter =
#(define-music-function (parser location delta) (integer?)
(make-music 'BendAfterEvent
- 'delta-pitch delta))
+ 'delta-step delta))
clef =
#(define-music-function (parser location type)
'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?)
grace =
#(def-grace-function startGraceMusic stopGraceMusic)
+
+"instrument-definitions" = #'()
+
+addInstrumentDefinition =
+#(define-music-function
+ (parser location name lst) (string? list?)
+
+ (set! instrument-definitions (acons name lst instrument-definitions))
+
+ (make-music 'SequentialMusic 'void #t))
+
+
+instrumentSwitch =
+#(define-music-function
+ (parser location name) (string?)
+ (let*
+ ((handle (assoc name instrument-definitions))
+ (instrument-def (if handle (cdr handle) '()))
+ )
+
+ (if (not handle)
+ (ly:input-message "No such instrument: ~a" name))
+ (context-spec-music
+ (make-music 'SimultaneousMusic
+ 'elements
+ (map (lambda (kv)
+ (make-property-set
+ (car kv)
+ (cdr kv)))
+ instrument-def))
+ 'Staff)))
+
+
keepWithTag =
#(define-music-function
(parser location tag music) (symbol? ly:music?)
%% doing
%% define-music-function in a .scm causes crash.
-
octave =
#(define-music-function (parser location pitch-note) (ly:music?)
"octave check"
))
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 =
(display sec-note-events)))
main-note))
-
-
-
-
-
parenthesize =
#(define-music-function (parser loc arg) (ly:music?)
(set! (ly:music-property arg 'parenthesize) #t)
arg)
+%% for lambda*
+#(use-modules (ice-9 optargs))
+
parallelMusic =
#(define-music-function (parser location voice-ids music) (list? ly:music?)
"Define parallel music sequences, separated by '|' (bar check signs),
@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)
voices)
;;
;; check sequence length
- (apply for-each (lambda (. seqs)
+ (apply for-each (lambda* (#:rest seqs)
(let ((moment-reference (ly:music-length (car seqs))))
(for-each (lambda (seq moment)
(if (not (equal? moment moment-reference))
(lambda (x)
(shift-one-duration-log x dur dots)) arg))
-
-%% this is a stub. Write your own to suit the spacing tweak output.
spacingTweaks =
#(define-music-function (parser location parameters) (list?)
+ "Set the system stretch, by reading the 'system-stretch property of
+ the `parameters' assoc list."
+ #{
+ \overrideProperty #"Score.NonMusicalPaperColumn"
+ #'line-break-system-details
+ #$(list (cons 'alignment-extra-space (cdr (assoc 'system-stretch parameters))))
+ #})
+
+%% Parser used to read page-layout file, and then retreive score tweaks.
+#(define page-layout-parser #f)
+
+includePageLayoutFile =
+#(define-music-function (parser location) ()
+ "If page breaks and tweak dump is not asked, and the file
+ <basename>-page-layout.ly exists, include it."
+ (if (not (ly:get-option 'dump-tweaks))
+ (let ((tweak-filename (format #f "~a-page-layout.ly"
+ (ly:parser-output-name parser))))
+ (if (access? tweak-filename R_OK)
+ (begin
+ (ly:message "Including tweak file ~a" tweak-filename)
+ (set! page-layout-parser (ly:parser-clone parser))
+ (ly:parser-parse-string page-layout-parser
+ (format #f "\\include \"~a\""
+ tweak-filename))))))
(make-music 'SequentialMusic 'void #t))
-transposedCueDuring = #
-(define-music-function
+rightHandFinger =
+#(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?)
+ "Include the score tweak, if exists."
+ (if (and page-layout-parser (not (ly:get-option 'dump-tweaks)))
+ (let ((tweak-music (ly:parser-lookup page-layout-parser
+ (string->symbol name))))
+ (if (ly:music? tweak-music)
+ tweak-music
+ (make-music 'SequentialMusic)))
+ (make-music 'SequentialMusic)))
+
+transposedCueDuring =
+#(define-music-function
(parser location what dir pitch-note main-music)
(string? ly:dir? ly:music? ly:music?)
+transposition =
+#(define-music-function (parser location pitch-note) (ly:music?)
+ "Set instrument transposition"
+ (context-spec-music
+ (make-property-set 'instrumentTransposition
+ (ly:pitch-negate (pitch-of-note pitch-note)))
+ 'Staff))
tweak = #(define-music-function (parser location sym val arg)
(symbol? scheme? ly:music?)
unfoldRepeats =
#(define-music-function (parser location music) (ly:music?)
(unfold-repeats music))
+
+
+
+withMusicProperty =
+#(define-music-function (parser location sym val music) (symbol? scheme? ly:music?)
+ "Set @var{sym} to @var{val} in @var{music}."
+
+ (set! (ly:music-property music sym) val)
+ music)
+
+
projects / lilypond.git / blobdiff