Issue 4507/2: Fix display for \applyOutput, adapt display regtest

diff --git a/input/regression/display-lily-tests.ly b/input/regression/display-lily-tests.ly
index a483cc53d34c005826b5f6b262b9631ab4549079..649309ac6e448c2824577dfe5fe36337c75394b1 100644 (file)
--- a/input/regression/display-lily-tests.ly
+++ b/input/regression/display-lily-tests.ly
@@ -227,6 +227,7 @@ stderr of this run."
 
 %% \applyOutput
 \test ##[ \applyOutput Foo #(lambda (arg) (list)) #]
+\test ##[ \applyOutput Foo.NoteHead #(lambda (arg) (list)) #]
 %% \applyContext
 \test ##[ \applyContext #(lambda (arg) (list)) #]
 

diff --git a/scm/define-music-display-methods.scm b/scm/define-music-display-methods.scm
index 8708cc1d73a950627947f0cb52477333d0b6af61..01eae4bfbbfef9e7128a72af8b4c634115a9138e 100644 (file)
--- a/scm/define-music-display-methods.scm
+++ b/scm/define-music-display-methods.scm
@@ -985,9 +985,11 @@ Otherwise, return #f."
 
 (define-display-method ApplyOutputEvent (applyoutput)
   (let ((proc (ly:music-property applyoutput 'procedure))
-        (ctx  (ly:music-property applyoutput 'context-type)))
-    (format #f "\\applyOutput #'~a #~a"
+        (ctx  (ly:music-property applyoutput 'context-type))
+        (grob (ly:music-property applyoutput 'symbol)))
+    (format #f "\\applyOutput ~a~@[.~a~] #~a"
             ctx
+            (and (symbol? grob) grob)
             (or (procedure-name proc)
                 (with-output-to-string
                   (lambda ()