Merge branch 'jneeman' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

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

diff --git a/input/regression/markup-syntax.ly b/input/regression/markup-syntax.ly
index ca59620d6d3ce541159953251cbe2c661fa4ceb1..5018c71849373d43e47a337746c9189692c286dd 100644 (file)
--- a/input/regression/markup-syntax.ly
+++ b/input/regression/markup-syntax.ly
@@ -1,43 +1,51 @@
-\header  {
-texidoc = "With the new markup syntax, text may be written in various manners."
-}
-
-\version "2.5.2"
-
+\version "2.10.0"
 
-\score {
-  
-   {
-    f'-\markup {
-               foo
-               \raise #0.2 \hbracket \bold bar
-               \override #'(baseline-skip . 4)
+\header {
+  texidoc = "Demo of markup texts, using LilyPond syntax."
+}
 
-               \bracket \column { baz bazr bla }
-               \hspace #2.0
-               \override #'(font-encoding . fetaMusic) {
-                       \lookup #"noteheads-0"
-               }
-               \semiflat
+{
+  f'1-\markup {
+    foo
+    \raise #0.2 \hbracket \bold bar
 
-               { }
-               
-               \combine "X" "+"   
-               \combine "o" "/"
-%              \char-number #"abc1234abc"
-               \box \column { \line { "string 1" } \line { "string 2" } }
-               "$\\emptyset$"
-               \draw-circle #1 #0.3
-               " "
-               \italic Norsk
-               \super "2"
-               " "
-               \circle \dynamic p
-               \dynamic sfzp
-               \huge { "A" \smaller "A" \smaller \smaller "A"
-                       \smaller \smaller \smaller "A" }
-               \sub "alike"
-       }       
-    c''4
+    \override #'(baseline-skip . 4)
+    \bracket \column {
+      baz
+      bazr
+      bla
+    }
+    \hspace #2.0
+    \override #'(font-encoding . fetaMusic) {
+      \lookup #"noteheads-0"
+    }
+    \semiflat
+    { }
+    \combine "X" "+"
+    \combine "o" "/"
+  }
+  g'1-\markup {
+                               %               \char-number #"abc1234abc"
+    \box \column {
+      \line { "string 1" }
+      \line { "string 2" }
+      \concat { "f" "i" }
     }
+    " "
+    \draw-circle #1 #0.3 ##f
+    " "
+    \draw-circle #1 #0.3 ##t
+    " "
+    \italic Norsk
+    \super "2"
+    " "
+    \raise #3.0 \whiteout white-out
+    \circle \dynamic p
+    \with-color #green Green
+    \dynamic sfzp
+    \huge { "A" \smaller "A" \smaller \smaller "A"
+           \smaller \smaller \smaller "A" }
+    \sub "alike"
+  }    
+  c''4
 }