X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Fmarkup-scheme.ly;h=5dea41d01c20c06d2816c1d30be9955675ae8986;hb=fe2e679d876eba72077a9ced1b918ad330e79bb4;hp=d1f1aa5389cc78e23b1825620cc60c343d2ee467;hpb=617646bb3f5e82a2bcc23a954d3fd1f4636afc7c;p=lilypond.git

diff --git a/input/regression/markup-scheme.ly b/input/regression/markup-scheme.ly
index d1f1aa5389..5dea41d01c 100644
--- a/input/regression/markup-scheme.ly
+++ b/input/regression/markup-scheme.ly
@@ -10,12 +10,12 @@
 
 %{
 
-For maintenance reasons, we don't excercise the entire markup command set.
+For maintenance reasons, we don't exercise the entire markup command set.
 
 %}
 
 \layout { 
-  raggedright = ##t
+  ragged-right = ##t
   indent = #0
   \context {
     \Staff
@@ -25,10 +25,10 @@ For maintenance reasons, we don't excercise the entire markup command set.
 
 
 
-\version "2.6.0"
+\version "2.15.18"
 
 {
-  \fatText
+  \textLengthOn
   f'1-\markup {
     foo
     \raise #0.2 \hbracket \bold bar
@@ -39,19 +39,22 @@ For maintenance reasons, we don't excercise the entire markup command set.
     \override #'(font-encoding . fetaMusic) {
       \lookup #"noteheads-0"
     }
-    \musicglyph #"accidentals.-1"
+    \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" }
-    \sub "alike"
+    \larger \sub "alike"
   }	
   \break
-  f'1-#(markup* 
+  f'1-$(markup 
 	"foo"
 	#:raise 0.2 #:hbracket #:bold "bar"
 	#:override '(baseline-skip . 4) 
@@ -59,7 +62,7 @@ For maintenance reasons, we don't excercise the entire markup command set.
 	#:hspace 2.0
 	#:override '(font-encoding . fetaMusic) #:line (#:lookup "noteheads-0" 
 						      )
-	#:musicglyph "accidentals.-1"
+	#:musicglyph "accidentals.mirroredflat"
 	#:combine "X" "+"   
 	#:combine "o" "/"
 	#:box #:column ("string 1" "string 2")
@@ -71,5 +74,5 @@ For maintenance reasons, we don't excercise the entire markup command set.
 	#:dynamic "sfzp"
 	#:huge #:line ("A" #:smaller "A" #:smaller #:smaller "A" 
 		       #:smaller #:smaller #:smaller "A")
-	#:sub "alike")
+	#:larger #:sub "alike")
 }