Merge branch 'master' into dev/texi2html

[lilypond.git] / input / regression / balloon.ly

diff --git a/input/regression/balloon.ly b/input/regression/balloon.ly
index dc99fd557e394d219ad8e2fa3ebd6c072f851562..dadbe95d69cb9ed15e1ce581533694c3a75c3d9c 100644 (file)
--- a/input/regression/balloon.ly
+++ b/input/regression/balloon.ly
@@ -1,32 +1,18 @@
 
 \header {
-    texidoc = "With balloon texts, objects in the output can be marked,
+  
+  texidoc = "With balloon texts, objects in the output can be marked,
 with lines and explanatory text added."
-    }
-\version "2.3.17"
-
-\score  {
-  {
-     
-   \relative c'  {
-
-       %% by hand:
-       \once\override Stem  #'print-function = #Balloon_interface::print
-       \once\override Stem  #'balloon-original-callback = #Stem::print
-       \once\override Stem  #'balloon-text = #"I'm a stem"
-       \once\override Stem  #'balloon-text-offset = #'(3 . 4)
-       \once\override Stem  #'balloon-text-props
-      = #'((font-family .  roman))
-
+  
+}
+\version "2.11.51"
 
-       %% use predefd function. 
-       \context Voice \applyoutput #(add-balloon-text
-                                    'NoteHead "heads, or tails?"
-                                    '(0 . -3))
+\layout{ ragged-right = ##t }
 
-      
-       c8
-       }
+\new Voice \with {\consists "Balloon_engraver" }
+{
+  \relative c'  {
+    \balloonGrobText #'Stem #'(3 . 4) \markup { "I'm a Stem" }
+    <c-\balloonText #'(-2 . -2) \markup { \simple #"hoi" }  >8
   }
- \paper{ raggedright = ##t }
 }