Make \balloonText into post-event, \balloonGrobText into proper event

This is a stopgap measure for getting some consistency into music
function use.  The real fix would be to convert \ballonText and
\balloonGrobText to the same kind of interface that \footnote uses.
Indeed, it might be saner to retire the whole AnnotateOutputEvent
folderol and instead just use footnotes without footnote-text.

diff --git a/ly/music-functions-init.ly b/ly/music-functions-init.ly
index 379eb933ba192169821a9177991c19e52816ee96..559d9777d5a3f78fe3f5b7611d05e810200650d2 100644 (file)
--- a/ly/music-functions-init.ly
+++ b/ly/music-functions-init.ly
@@ -178,14 +178,16 @@ balloonGrobText =
    (symbol? number-pair? markup?)
    (_i "Attach @var{text} to @var{grob-name} at offset @var{offset}
  (use like @code{\\once})")
-   (make-music 'AnnotateOutputEvent
-              'symbol grob-name
-              'X-offset (car offset)
-              'Y-offset (cdr offset)
-              'text text))
+   (make-event-chord
+    (list
+     (make-music 'AnnotateOutputEvent
+                 'symbol grob-name
+                 'X-offset (car offset)
+                 'Y-offset (cdr offset)
+                 'text text))))
 
 balloonText =
-#(define-music-function (parser location offset text) (number-pair? markup?)
+#(define-event-function (parser location offset text) (number-pair? markup?)
    (_i "Attach @var{text} at @var{offset} (use like @code{\\tweak})")
    (make-music 'AnnotateOutputEvent
               'X-offset (car offset)

diff --git a/scm/define-music-types.scm b/scm/define-music-types.scm
index e7d121b411c210be1685e4b5e8362429ed7217e1..d816b269ce36dba94436da49eae0ead72b3e48b2 100644 (file)
--- a/scm/define-music-types.scm
+++ b/scm/define-music-types.scm
@@ -39,7 +39,7 @@ Syntax: @var{note}@code{\\x}, where @code{\\x} is a dynamic mark like
 
     (AnnotateOutputEvent
      . ((description . "Print an annotation of an output element.")
-       (types . (general-music event annotate-output-event))
+       (types . (general-music event annotate-output-event post-event))
        ))
 
     (ApplyContext