Imported Upstream version 2.16.0

[lilypond.git] / input / regression / apply-output.ly

diff --git a/input/regression/apply-output.ly b/input/regression/apply-output.ly
index 488807170665771069645c622f0ee1f346085f9a..6e50ca5c448b067850495fbee03e76c04f8835b2 100644 (file)
--- a/input/regression/apply-output.ly
+++ b/input/regression/apply-output.ly
@@ -1,7 +1,7 @@
-\version "2.10.0"
+\version "2.16.0"
 
 \header {
-  texidoc = "The @code{\applyOutput} expression is the most flexible way to
+  texidoc = "The @code{\\applyOutput} expression is the most flexible way to
 tune properties for individual grobs.
 
 Here, the layout of a note head is changed depending on its vertical
@@ -9,39 +9,30 @@ position.
 "
 }
 
-\layout {
-  ragged-right = ##t
-}
-
 #(define (mc-squared gr org cur)
   (let*
-   (
-     (ifs (ly:grob-interfaces gr))
-     (sp (ly:grob-property gr 'staff-position))
-   )
-   (if (memq 'note-head-interface ifs)
-    (begin
-     (ly:grob-set-property! gr 'stencil ly:text-interface::print)
-     (ly:grob-set-property! gr 'font-family 'roman)
-     (ly:grob-set-property! gr 'text
-      (make-raise-markup -0.5
-       (case sp
-       ((-5) (make-simple-markup "m"))
-       ((-3) (make-simple-markup "c "))
-       ((-2) (make-smaller-markup (make-bold-markup "2")))
-       (else (make-simple-markup "bla"))
-      ))))
-  )))
-
-\context Voice \relative c' {
-  \stemUp
+    (
+      (ifs (ly:grob-interfaces gr))
+      (sp (ly:grob-property gr 'staff-position))
+      )
+    (if (memq 'note-head-interface ifs)
+      (begin
+        (ly:grob-set-property! gr 'stencil
+          (grob-interpret-markup gr
+            (make-raise-markup -0.5
+              (case sp
+                ((-5) (make-simple-markup "m"))
+                ((-3) (make-simple-markup "c "))
+                ((-2) (make-smaller-markup (make-bold-markup "2")))
+                (else (make-simple-markup "bla"))
+                ))))
+        ))))
+
+\new Voice \relative c' {
   \set autoBeaming = ##f
 
-  { <d f g b>8
+  <d f g b>8
 
-    \applyOutput #'Voice #mc-squared
-    <d f g b>
-  }
+  \applyOutput #'Voice #mc-squared
+  <d f g b>8
 }
-
-% EOF