Merge commit 'origin/dev/jneeman' into systems-per-page

[lilypond.git] / input / regression / lily-in-scheme.ly

diff --git a/input/regression/lily-in-scheme.ly b/input/regression/lily-in-scheme.ly
index 344fc69e79649ef8f3e119619873bc47a3978f77..e9b34f6ec5e361abdd947ce160a5268be061994c 100644 (file)
--- a/input/regression/lily-in-scheme.ly
+++ b/input/regression/lily-in-scheme.ly
@@ -8,45 +8,37 @@ In this example, the @code{\withpaddingA}, @code{\withpaddingB} and
 @code{\withpaddingC} music functions set different kinds of padding on
 the @code{TextScript} grob.
 
-FIXME: this is broken.
 "
-    
-}
+          
+      }
 
+\version "2.12.0"
+\layout { ragged-right = ##t }
 
-\score{ c'4^"FIXME" }
-%{
+withPaddingA = #(define-music-function (parser location padding music) (number? ly:music?)
+                #{ \override TextScript #'padding = #$padding
+                $music 
+                \revert TextScript #'padding #})
 
-\version "2.3.4"
-\paper { raggedright = ##t }
+withPaddingB = #(define-music-function (parser location padding music) (number? ly:music?)
+                #{ \override TextScript #'padding = #$(* padding 2)
+                $music 
+                \revert TextScript #'padding #})
 
-withPaddingA = #(def-music-function (location padding music) (number? ly:music?)
-                   #{ \override TextScript #'padding = #$padding
-                      $music 
-                      \revert TextScript #'padding #})
-  
-withPaddingB = #(def-music-function (location padding music) (number? ly:music?)
-                   #{ \override TextScript #'padding = #$(* padding 2)
-                      $music 
-                      \revert TextScript #'padding #})
-  
-withPaddingC = #(def-music-function (location padding music) (number? ly:music?)
-                   #{ \override TextScript #'padding = #(+ 1 $(* padding 2))
-                      $music 
-                      \revert TextScript #'padding #})
-  
-  \score {
-      \notes {
-          c'^"1"
-          \withPaddingA #2
-            { c'^"2" c'^"3"}
-          c'^"4"
-          \withPaddingB #2
-            { c'^"5" c'^"6"}
-          c'^"7"
-          \withPaddingC #2
-            { c'^"8" c'^"9"}
-          c'^"10"
-      }
-  }
-%}
+withPaddingC = #(define-music-function (parser location padding music) (number? ly:music?)
+                #{ \override TextScript #'padding = #(+ 1 $(* padding 2))
+                   $music 
+                   \revert TextScript #'padding #})
+
+{
+    c'^"1"
+    \withPaddingA #2
+    { c'^"2" c'^"3"}
+    c'^"4"
+    \withPaddingB #2
+    { c'^"5" c'^"6"}
+    c'^"7"
+    \withPaddingC #2
+    { c'^"8" c'^"9"}
+    c'^"10"
+}