*** empty log message ***

[lilypond.git] / ly / music-functions-init.ly

diff --git a/ly/music-functions-init.ly b/ly/music-functions-init.ly
index cf2a2745dea400225b9bf3d08f88b5a4347fffe6..f42bdd50d6542d7a8e58dc2b25cf2713827059b9 100644 (file)
--- a/ly/music-functions-init.ly
+++ b/ly/music-functions-init.ly
@@ -1,75 +1,80 @@
 \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))
 
 
@@ -79,7 +84,7 @@ keepWithTag =
 
 cueDuring = 
 #(def-music-function
-  (location what dir main-music)
+  (parser location what dir main-music)
   (string? ly:dir? ly:music?)
   (make-music 'QuoteMusic
              'element main-music 
@@ -92,7 +97,7 @@ cueDuring =
 
 quoteDuring = #
 (def-music-function
-  (location what main-music)
+  (parser location what main-music)
   (string? ly:music?)
   (make-music 'QuoteMusic
              'element main-music
@@ -104,7 +109,7 @@ quoteDuring = #
 
 killCues =
 #(def-music-function
-   (location music)
+   (parser location music)
    (ly:music?)
    (music-map
     (lambda (mus)
@@ -113,6 +118,32 @@ killCues =
          mus)) music))
    
 
+afterGraceFraction = #(cons 6 8)
+
+afterGrace =
+#(def-music-function
+  (parser location main grace)
+  (ly:music? ly:music?)
+
+  (let*
+      ((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)))))))
 
 %{