resolve merge

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

diff --git a/input/regression/markup-syntax.ly b/input/regression/markup-syntax.ly
index 8a59a454b6dbfdb9e0c52f88e4ff776112857ec6..899909df278eb9ca49d73a84f2c5fb9f5959c983 100644 (file)
--- a/input/regression/markup-syntax.ly
+++ b/input/regression/markup-syntax.ly
@@ -1,51 +1,61 @@
-\version "2.12.0"
+\version "2.14.0"
 
 \header {
   texidoc = "Demo of markup texts, using LilyPond syntax."
 }
 
-{
-  f'1-\markup {
-    foo
-    \raise #0.2 \hbracket \bold bar
+\score {
+  {
+    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 "o" "/"
     }
-    \hspace #2.0
-    \override #'(font-encoding . fetaMusic) {
-      \lookup #"noteheads-0"
+    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"
     }
-    \semiflat
-    { }
-    \combine "X" "+"
-    \combine "o" "/"
+    c''4
   }
-  g'1-\markup {
-                               %               \char-number #"abc1234abc"
-    \box \column {
-      \line { "string 1" }
-      \line { "string 2" }
-      \concat { "f" "i" }
+
+  \layout {
+    \context {
+      \Score
+      \override PaperColumn #'keep-inside-line = ##f
     }
-    " "
-    \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
+  }
+
 }