X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Fmarkup-scheme.ly;h=7f5fd19e057ec66a71a933d538b9f251bacb3f27;hb=4a03918c90866800b208ad12ffc019f577c8ab83;hp=c1f85aa4cf63209767a7ebd0ddf3144ee0a79650;hpb=e8d8cd2d45bc06046b85c81b3cd0ba5f55c9f462;p=lilypond.git

diff --git a/input/regression/markup-scheme.ly b/input/regression/markup-scheme.ly
index c1f85aa4cf..7f5fd19e05 100644
--- a/input/regression/markup-scheme.ly
+++ b/input/regression/markup-scheme.ly
@@ -1,69 +1,78 @@
 
 \header {
 
-    texidoc = "There is a Scheme macro @code{markup} to produce markup
+  texidoc = "There is a Scheme macro @code{markup} to produce markup
     texts using a similar syntax as @code{\\markup}.
 
 "
 
-    }
-\version "2.5.2"
-\score {
-     {
-        \fatText
-        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"
-            }
-            \musicglyph #"accidentals.-1"
-            \combine "X" "+"   
-            \combine "o" "/"
-            \box \column { \line { "string 1" } \line { "string 2" } }
-            "$\\emptyset$"
-            \italic Norsk
-            \super "2"
-            \dynamic sfzp
-            \huge { "A" \smaller "A" \smaller \smaller "A"
-                    \smaller \smaller \smaller "A" }
-            \sub "alike"
-        }	
-        \break
-        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) #:line (#:lookup "noteheads-0" 
-                                                       )
-              #:musicglyph "accidentals.-1"
-              #:combine "X" "+"   
-              #:combine "o" "/"
-              #:box #:column ("string 1" "string 2")
-              "$\\emptyset$"
-	      #:draw-circle 1 0.3
-	      " "
-              #:italic "Norsk"
-              #:super "2"
-	      #:circle #:dynamic "p"
-	      " "
-              #:dynamic "sfzp"
-              #:huge #:line ("A" #:smaller "A" #:smaller #:smaller "A" 
-                             #:smaller #:smaller #:smaller "A")
-              #:sub "alike")
-    }
-    \layout { 
-        raggedright = ##t
-        indent = #0
-        \context {
-            \Staff
-            \remove Time_signature_engraver 
-        }
+%{
+
+For maintenance reasons, we don't excercise the entire markup command set.
+
+%}
+
+\layout { 
+  ragged-right = ##t
+  indent = #0
+  \context {
+    \Staff
+    \remove Time_signature_engraver 
+  }
+}
+
+
+
+\version "2.14.0"
+
+{
+  \textLengthOn
+  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"
     }
+    \musicglyph #"accidentals.mirroredflat"
+    \combine "X" "+"   
+    \combine "o" "/"
+    \box \column { \line { "string 1" } \line { "string 2" } }
+    " "
+    \italic Norsk
+    \super "2"
+    \circle \dynamic "p"
+    " "
+    \dynamic sfzp
+    \huge { "A" \smaller "A" \smaller \smaller "A"
+	    \smaller \smaller \smaller "A" }
+    \larger \sub "alike"
+  }	
+  \break
+  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) #:line (#:lookup "noteheads-0" 
+						      )
+	#:musicglyph "accidentals.mirroredflat"
+	#:combine "X" "+"   
+	#:combine "o" "/"
+	#:box #:column ("string 1" "string 2")
+	" "
+	#:italic "Norsk"
+	#:super "2"
+	#:circle #:dynamic "p"
+	" "
+	#:dynamic "sfzp"
+	#:huge #:line ("A" #:smaller "A" #:smaller #:smaller "A" 
+		       #:smaller #:smaller #:smaller "A")
+	#:larger #:sub "alike")
 }