* Documentation/user/instrument-notation.itely (String number

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

diff --git a/input/regression/new-markup-syntax.ly b/input/regression/new-markup-syntax.ly
index 6c88014b20d20e6332b09850ae88fcc4aee249b1..d35606a59a114eb4f49be47dd774323dc3789675 100644 (file)
--- a/input/regression/new-markup-syntax.ly
+++ b/input/regression/new-markup-syntax.ly
@@ -2,7 +2,7 @@
 texidoc = "With the new markup syntax, text may be written in various manners."
 }
 
-\version "2.3.4"
+\version "2.5.2"
 
 
 \score {
@@ -13,11 +13,10 @@ texidoc = "With the new markup syntax, text may be written in various manners."
                \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
                }
                \semiflat
 
@@ -26,8 +25,9 @@ texidoc = "With the new markup syntax, text may be written in various manners."
                \combine "X" "+"   
                \combine "o" "/"
 %              \char-number #"abc1234abc"
-               \box \column < { "string 1" } { "string 2" } >
+               \box \column { \line { "string 1" } \line { "string 2" } }
                "$\\emptyset$"
+               \circle #4 #0.2
                \italic Norsk
                \super "2"
                \dynamic sfzp