\version "2.4.0"
-applymusic = #(def-music-function (location func music) (procedure? ly:music?)
+applymusic = #(def-music-function (parser location func music) (procedure? ly:music?)
(func music))
-oldaddlyrics = #(def-music-function (location music lyrics) (ly:music? ly:music?)
+oldaddlyrics = #(def-music-function (parser location music lyrics) (ly:music? ly:music?)
- (make-music 'LyricCombineMusic
+ (make-music 'OldLyricCombineMusic
'origin location
'elements (list music lyrics)))
grace = #(def-grace-function startGraceMusic stopGraceMusic)
+
acciaccatura = #(def-grace-function startAcciaccaturaMusic stopAcciaccaturaMusic)
appoggiatura = #(def-grace-function startAppoggiaturaMusic stopAppoggiaturaMusic)
-partcombine = #(def-music-function (location part1 part2) (ly:music? ly:music?)
+partcombine = #(def-music-function (parser location part1 part2) (ly:music? ly:music?)
(make-part-combine-music (list part1 part2)))
-autochange = #(def-music-function (location music) (ly:music?)
+autochange = #(def-music-function (parser location music) (ly:music?)
(make-autochange-music music))
-applycontext = #(def-music-function (location proc) (procedure?)
+applycontext = #(def-music-function (parser location proc) (procedure?)
(make-music 'ApplyContext
'origin location
'procedure proc))
-displayMusic = #(def-music-function (location music) (ly:music?)
- (display-music music)
+musicMap = #(def-music-function (parser location proc mus) (procedure? ly:music?)
+ (music-map proc mus))
+
+displayMusic = #(def-music-function (parser location music) (ly:music?)
+ (display-scheme-music music)
music)
-applyoutput = #(def-music-function (location proc) (procedure?)
+applyoutput = #(def-music-function (parser location proc) (procedure?)
(make-music 'ApplyOutputEvent
'origin location
'procedure proc))
-breathe = #(def-music-function (location) ()
+breathe = #(def-music-function (parser location) ()
(make-music 'EventChord
'origin location
'elements (list (make-music 'BreathingSignEvent))))
-unfoldrepeats = #(def-music-function (location music) (ly:music?)
+unfoldRepeats = #(def-music-function (parser location music) (ly:music?)
(unfold-repeats music))
-compressmusic = #(def-music-function
- (location fraction music) (number-pair? ly:music?)
+compressMusic = #(def-music-function
+ (parser location fraction music) (number-pair? ly:music?)
(ly:music-compress music (ly:make-moment (car fraction) (cdr fraction))))
makeClusters = #(def-music-function
- (location arg) (ly:music?)
+ (parser location arg) (ly:music?)
(music-map note-to-cluster arg))
removeWithTag =
#(def-music-function
- (location tag music) (symbol? ly:music?)
+ (parser location tag music) (symbol? ly:music?)
(music-filter
(lambda (m)
(let* ((tags (ly:music-property m 'tags))
- (res (memq tag tags)))
- (not res)))))
+ (res (memq tag tags)))
+ (not res)))
+ music))
keepWithTag =
#(def-music-function
- (location tag music) (symbol? ly:music?)
+ (parser location tag music) (symbol? ly:music?)
(music-filter
(lambda (m)
(let* ((tags (ly:music-property m 'tags))
- (res (memq tag tags)))
- (or
- (eq? tags '())
- (memq tag tags))))
+ (res (memq tag tags)))
+ (or
+ (eq? tags '())
+ res)))
music))
%% doing
%% def-music-function in a .scm causes crash.
+cueDuring =
+#(def-music-function
+ (parser location what dir main-music)
+ (string? ly:dir? ly:music?)
+ (make-music 'QuoteMusic
+ 'element main-music
+ 'quoted-context-type 'Voice
+ 'quoted-context-id "cue"
+ 'quoted-music-name what
+ 'quoted-voice-direction dir
+ 'origin location))
+
+
quoteDuring = #
(def-music-function
- (location what dir main-music)
- (string? ly:dir? ly:music?)
+ (parser location what main-music)
+ (string? ly:music?)
+ (make-music 'QuoteMusic
+ 'element main-music
+ 'quoted-music-name what
+ 'origin location))
+
+
+
+
+killCues =
+#(def-music-function
+ (parser location music)
+ (ly:music?)
+ (music-map
+ (lambda (mus)
+ (if (string? (ly:music-property mus 'quoted-music-name))
+ (ly:music-property mus 'element)
+ mus)) music))
+
+
+afterGraceFraction = #(cons 6 8)
+
+afterGrace =
+#(def-music-function
+ (parser location main grace)
+ (ly:music? ly:music?)
+
(let*
- ((quote-music
- (make-music 'NewQuoteMusic
- 'quoted-context-type 'Voice
- 'quoted-context-id "cue"
- 'quoted-music-name what
- 'origin location))
- (main-voice (if (= 1 dir) 2 1))
- (cue-voice (if (= 1 dir) 1 2))
- (return-value quote-music)
- )
-
- (if (not (= dir 0))
- (begin
- (set! return-value
- (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))
+ ((main-length (ly:music-length main))
+ (fraction (ly:parser-lookup parser 'afterGraceFraction)))
+
+ (make-simultaneous-music
+ (list
+ main
+ (make-sequential-music
+ (list
+
+ (make-music 'SkipMusic
+ 'duration (ly:make-duration
+ 0 0
+ (* (ly:moment-main-numerator main-length)
+ (car fraction))
+ (* (ly:moment-main-denominator main-length)
+ (cdr fraction)) ))
+ (make-music 'GraceMusic
+ 'element grace)))))))
%{
projects / lilypond.git / blobdiff