X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fmusic-functions-init.ly;h=842da9ace606dc026169808b6b5e664603cfc214;hb=3ea291c21ce16aeaf00b6a6f500bf0a3a9b790d9;hp=7adb1b7c788ae98db097585eed68c31382007d8e;hpb=2944a83e59f487894a214769392ce27289accb71;p=lilypond.git

diff --git a/ly/music-functions-init.ly b/ly/music-functions-init.ly
index 7adb1b7c78..842da9ace6 100644
--- a/ly/music-functions-init.ly
+++ b/ly/music-functions-init.ly
@@ -178,7 +178,7 @@ barNumberCheck =
 					 cbn n))))))
 
 bendAfter =
-#(define-music-function (parser location delta) (real?)
+#(define-event-function (parser location delta) (real?)
    (_i "Create a fall or doit of pitch interval @var{delta}.")
    (make-music 'BendAfterEvent
 	       'delta-step delta))
@@ -342,7 +342,7 @@ featherDurations=
      argument))
 
 footnote =
-#(define-music-function (parser location text offset grob-name footnote)
+#(define-event-function (parser location text offset grob-name footnote)
    ((markup?) number-pair? (symbol? '()) markup?)
    (_i "Attach @var{text} at @var{offset} with @var{text} referring to
 @var{footnote}.  If @var{text} is given as @code{\\default}, use
@@ -952,7 +952,7 @@ for time signatures of @var{time-signature}.")
    (revert-time-signature-setting time-signature))
 
 rightHandFinger =
-#(define-music-function (parser location finger) (number-or-string?)
+#(define-event-function (parser location finger) (number-or-string?)
    (_i "Apply @var{finger} as a fingering indication.")
 
    (make-music
@@ -988,21 +988,27 @@ a context modification duplicating their effect.")
 	       (list 'unset
 		     (ly:music-property m 'symbol)))
 	      ((OverrideProperty)
-	       (list 'push
-		     (ly:music-property m 'symbol)
-		     (ly:music-property m 'grob-value)
-		     (ly:music-property m 'grob-property-path)))
+	       (cons* 'push
+		      (ly:music-property m 'symbol)
+		      (ly:music-property m 'grob-value)
+		      (ly:music-property m 'grob-property-path)))
 	      ((RevertProperty)
-	       (list 'pop
-		     (ly:music-property m 'symbol)
-		     (ly:music-property m 'grob-property-path)))))
+	       (cons* 'pop
+		      (ly:music-property m 'symbol)
+		      (ly:music-property m 'grob-property-path)))))
 	   (case (ly:music-property m 'name)
-	     ((SequentialMusic SimultaneousMusic)
-	      (for-each musicop (ly:music-property m 'elements)))
+	     ((ApplyContext)
+	      (ly:add-context-mod mods
+				  (list 'apply
+					(ly:music-property m 'procedure))))
 	     ((ContextSpeccedMusic)
 	      (if (or (not ctx)
 		      (eq? ctx (ly:music-property m 'context-type)))
-		  (musicop (ly:music-property m 'element)))))))
+		  (musicop (ly:music-property m 'element))))
+	     (else
+	      (let ((callback (ly:music-property m 'elements-callback)))
+		(if (procedure? callback)
+		    (for-each musicop (callback m))))))))
      (musicop music)
      mods))