* lily/parser.yy (bass_number),

[lilypond.git] / input / regression / new-markup-scheme.ly

diff --git a/input/regression/new-markup-scheme.ly b/input/regression/new-markup-scheme.ly
index 5926fb295641a187757e1f7ab1f84e530fe17b3c..6a6dea24aa20991b03c454972083e254278b829d 100644 (file)
--- a/input/regression/new-markup-scheme.ly
+++ b/input/regression/new-markup-scheme.ly
@@ -2,28 +2,29 @@
 \header {
 
     texidoc = "There is a Scheme macro @code{markup} to produce markup
-    texts using a similar syntax as @code{\\markup}."
+    texts using a similar syntax as @code{\\markup}.
+
+"
 
     }
-\version "2.2.0"
+\version "2.5.2"
 \score {
-    \notes {
+     {
         \fatText
         f'1-\markup {
             foo
             \raise #0.2 \hbracket \bold bar
             \override #'(baseline-skip . 4)
 
-            \bracket \column < baz bazr bla >
+            \bracket \column { baz bazr bla }
             \hspace #2.0
-            \override #'(font-family . music) {
+            \override #'(font-encoding . fetaMusic) {
                 \lookup #"noteheads-0"
-                \char #53
             }
-            \musicglyph #"accidentals--1"
+            \musicglyph #"accidentals.-1"
             \combine "X" "+"   
             \combine "o" "/"
-            \box \column < { "string 1" } { "string 2" } >
+            \box \column { \line { "string 1" } \line { "string 2" } }
             "$\\emptyset$"
             \italic Norsk
             \super "2"
@@ -39,9 +40,9 @@
               #:override '(baseline-skip . 4) 
               #:bracket #:column ( "baz" "bazr" "bla" )
               #:hspace 2.0
-              #:override '(font-family . music) #:line (#:lookup "noteheads-0" 
-                                                        #:char 53)
-              #:musicglyph "accidentals--1"
+              #:override '(font-encoding . fetaMusic) #:line (#:lookup "noteheads-0" 
+                                                       )
+              #:musicglyph "accidentals.-1"
               #:combine "X" "+"   
               #:combine "o" "/"
               #:box #:column ("string 1" "string 2")
@@ -53,11 +54,11 @@
                              #:smaller #:smaller #:smaller "A")
               #:sub "alike")
     }
-    \paper { 
+    \layout { 
         raggedright = ##t
         indent = #0
         \context {
-            \StaffContext
+            \Staff
             \remove Time_signature_engraver 
         }
     }