Index: ly/music-functions-init.ly
===================================================================
RCS file: /sources/lilypond/lilypond/ly/music-functions-init.ly,v
retrieving revision 1.59
diff -u -r1.59 music-functions-init.ly
--- ly/music-functions-init.ly	24 May 2006 07:00:41 -0000	1.59
+++ ly/music-functions-init.ly	3 Jun 2006 17:18:02 -0000
@@ -133,17 +133,15 @@
 	   (set! grob-name (string->symbol (list-ref name-components 1)))
 	   (set! context-name (string->symbol (list-ref name-components 0)))))
 
-     (context-spec-music
-      (make-music 'ApplyOutputEvent
-		  'origin location
-		  'procedure
-		  (lambda (grob orig-context context)
-		    (if (equal?
-			 (cdr (assoc 'name (ly:grob-property grob 'meta)))
-			 grob-name)
-			(set! (ly:grob-property grob property) value))))
-
-      context-name)))
+     (make-music 'ApplyOutputEvent
+		 'origin location
+		 'context-type context-name
+		 'procedure
+		 (lambda (grob orig-context context)
+		   (if (equal?
+			(cdr (assoc 'name (ly:grob-property grob 'meta)))
+			grob-name)
+		       (set! (ly:grob-property grob property) value))))))
 
 breathe =
 #(define-music-function (parser location) ()