Merge commit 'origin' into beamlets2

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

diff --git a/input/regression/apply-output.ly b/input/regression/apply-output.ly
index 29f6cfd30b4452e621189f5f8e013908671f189a..d107e4a42f3263d895d7c798929280efdcfd00b3 100644 (file)
--- a/input/regression/apply-output.ly
+++ b/input/regression/apply-output.ly
@@ -1,51 +1,38 @@
+\version "2.12.0"
 
-\version "2.1.36" 
 \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
 position.
 "
-
 }
 
-#(define  (mc-squared gr org cur)
+#(define (mc-squared gr org cur)
   (let*
-      (
-       (ifs (ly:grob-property gr 'interfaces))
-       (sp (ly:grob-property gr 'staff-position))
-       )
-  (if (and (memq 'note-head-interface ifs)
-          (memq sp '(-2 -3 -5)))
+    (
+      (ifs (ly:grob-interfaces gr))
+      (sp (ly:grob-property gr 'staff-position))
+      )
+    (if (memq 'note-head-interface ifs)
       (begin
-       (ly:grob-set-property! gr 'print-function brew-new-markup-stencil)
-       (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"))
-                             ))))
-      )))
-
-\score {
-
-\notes \context Voice \relative  c' {
-                                     \stemUp
-                                     \set autoBeaming =  ##f
-   { <d f g b>8
-     \context Voice \applyoutput #mc-squared
-
-        <d f g b>
-   }
-             
-   }
-\paper { raggedright = ##t
-%                   outputscale = 5
-                    } 
+        (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
+
+  \applyOutput #'Voice #mc-squared
+  <d f g b>8
 }