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 0dcb732eccf567b6554d947bd00ca201485d4a6a..5018c71849373d43e47a337746c9189692c286dd 100644 (file)
--- a/input/regression/markup-syntax.ly
+++ b/input/regression/markup-syntax.ly
@@ -1,33 +1,37 @@
-\header  {
-
-    texidoc = "Demo of markup texts, using LilyPond syntax. "
+\version "2.10.0"
 
+\header {
+  texidoc = "Demo of markup texts, using LilyPond syntax."
 }
 
-\version "2.10.0"
-
 {
   f'1-\markup {
     foo
     \raise #0.2 \hbracket \bold bar
-    \override #'(baseline-skip . 4)
 
-    \bracket \column { baz bazr bla }
+    \override #'(baseline-skip . 4)
+    \bracket \column {
+      baz
+      bazr
+      bla
+    }
     \hspace #2.0
     \override #'(font-encoding . fetaMusic) {
       \lookup #"noteheads-0"
     }
     \semiflat
-
     { }
-    
-    \combine "X" "+"   
+    \combine "X" "+"
     \combine "o" "/"
   }
   g'1-\markup {
                                %               \char-number #"abc1234abc"
-    \box \column { \line { "string 1" } \line { "string 2" } }
-    " " 
+    \box \column {
+      \line { "string 1" }
+      \line { "string 2" }
+      \concat { "f" "i" }
+    }
+    " "
     \draw-circle #1 #0.3 ##f
     " "
     \draw-circle #1 #0.3 ##t