Doc-es: various updates.

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

diff --git a/input/regression/markup-syntax.ly b/input/regression/markup-syntax.ly
index b4ac17530ad7e30e38acdeb3a608966a7dd8ca0f..1350a2447c1f64fad390fb3368c6af9134b259e5 100644 (file)
--- a/input/regression/markup-syntax.ly
+++ b/input/regression/markup-syntax.ly
@@ -1,47 +1,61 @@
-\header  {
-texidoc = "With the new markup syntax, text may be written in various manners."
-}
-
-\version "2.5.2"
+\version "2.19.32"
 
+\header {
+  texidoc = "Demo of markup texts, using LilyPond syntax."
+}
 
 \score {
-  
-   {
+  {
     f'1-\markup {
-               foo
-               \raise #0.2 \hbracket \bold bar
-               \override #'(baseline-skip . 4)
-
-               \bracket \column { baz bazr bla }
-               \hspace #2.0
-               \override #'(font-encoding . fetaMusic) {
-                       \lookup #"noteheads-0"
-               }
-               \semiflat
+      foo
+      \raise #0.2 \hbracket \bold bar
 
-               { }
-               
-               \combine "X" "+"   
-               \combine "o" "/"
-               }
+      \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" } }
-               "$\\emptyset$"
-               \draw-circle #1 #0.3
-               " "
-               \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"
-       }       
+                                  %            \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
+  }
+
+  \layout {
+    \context {
+      \Score
+      \override PaperColumn.keep-inside-line = ##f
     }
+  }
+
 }