23 files changed, 167 insertions, 167 deletions
diff --git a/tests/markups/valid-1.expected b/tests/markups/valid-1.expected
index 6ad9a22a..be01bfaf 100644
--- a/tests/markups/valid-1.expected
+++ b/tests/markups/valid-1.expected
@@ -4,11 +4,11 @@ Blue text is cool!
 ---
 
 range 0 9
-[0,9]scale=1.440000
-[0,9]foreground=#00000000ffff
+0 9 scale  1.440000
+0 9 foreground #00000000ffff
 range 9 13
 range 13 17
-[13,17]style=2
+13 17 style italic
 range 17 2147483647
 
 
diff --git a/tests/markups/valid-10.expected b/tests/markups/valid-10.expected
index 28f53835..24f3f8e3 100644
--- a/tests/markups/valid-10.expected
+++ b/tests/markups/valid-10.expected
@@ -4,17 +4,17 @@ Lots of attrs
 ---
 
 range 0 13
-[0,13]font-desc=Sans Italic 12 @wdth=100,wght=200
-[0,13]foreground=#0000ffff0000
-[0,13]background=#f0f0f0f0f0f0
-[0,13]underline=2
-[0,13]underline-color=#ffff00000000
-[0,13]gravity=0
-[0,13]gravity-hint=1
-[0,13]strikethrough=1
-[0,13]strikethrough-color=#00000000ffff
-[0,13]fallback=0
-[0,13]language=de
+0 13 font-desc "Sans Italic 12 @wdth=100,wght=200"
+0 13 foreground #0000ffff0000
+0 13 background #f0f0f0f0f0f0
+0 13 underline double
+0 13 underline-color #ffff00000000
+0 13 gravity south
+0 13 gravity-hint strong
+0 13 strikethrough true
+0 13 strikethrough-color #00000000ffff
+0 13 fallback false
+0 13 language de
 range 13 2147483647
 
 
diff --git a/tests/markups/valid-11.expected b/tests/markups/valid-11.expected
index 797ef399..2a551850 100644
--- a/tests/markups/valid-11.expected
+++ b/tests/markups/valid-11.expected
@@ -4,42 +4,42 @@ Lots of attrs
 ---
 
 range 0 5
-[0,13]font-desc=Sans Italic 12 @wdth=100,wght=200
-[0,13]foreground=#0000ffff0000
-[0,13]background=#f0f0f0f0f0f0
-[0,13]underline=2
-[0,13]underline-color=#ffff00000000
-[0,13]gravity=0
-[0,13]gravity-hint=1
-[0,13]strikethrough=1
-[0,13]strikethrough-color=#00000000ffff
-[0,13]fallback=0
-[0,13]language=de
+0 13 font-desc "Sans Italic 12 @wdth=100,wght=200"
+0 13 foreground #0000ffff0000
+0 13 background #f0f0f0f0f0f0
+0 13 underline double
+0 13 underline-color #ffff00000000
+0 13 gravity south
+0 13 gravity-hint strong
+0 13 strikethrough true
+0 13 strikethrough-color #00000000ffff
+0 13 fallback false
+0 13 language de
 range 5 7
-[0,13]font-desc=Sans Italic 12 @wdth=100,wght=200
-[0,13]foreground=#0000ffff0000
-[0,13]background=#f0f0f0f0f0f0
-[0,13]underline=2
-[0,13]underline-color=#ffff00000000
-[0,13]gravity=0
-[0,13]gravity-hint=1
-[0,13]strikethrough=1
-[0,13]strikethrough-color=#00000000ffff
-[0,13]fallback=0
-[0,13]language=de
-[5,7]font-desc=Bold
+0 13 font-desc "Sans Italic 12 @wdth=100,wght=200"
+0 13 foreground #0000ffff0000
+0 13 background #f0f0f0f0f0f0
+0 13 underline double
+0 13 underline-color #ffff00000000
+0 13 gravity south
+0 13 gravity-hint strong
+0 13 strikethrough true
+0 13 strikethrough-color #00000000ffff
+0 13 fallback false
+0 13 language de
+5 7 font-desc "Bold"
 range 7 13
-[0,13]font-desc=Sans Italic 12 @wdth=100,wght=200
-[0,13]foreground=#0000ffff0000
-[0,13]background=#f0f0f0f0f0f0
-[0,13]underline=2
-[0,13]underline-color=#ffff00000000
-[0,13]gravity=0
-[0,13]gravity-hint=1
-[0,13]strikethrough=1
-[0,13]strikethrough-color=#00000000ffff
-[0,13]fallback=0
-[0,13]language=de
+0 13 font-desc "Sans Italic 12 @wdth=100,wght=200"
+0 13 foreground #0000ffff0000
+0 13 background #f0f0f0f0f0f0
+0 13 underline double
+0 13 underline-color #ffff00000000
+0 13 gravity south
+0 13 gravity-hint strong
+0 13 strikethrough true
+0 13 strikethrough-color #00000000ffff
+0 13 fallback false
+0 13 language de
 range 13 2147483647
 
 
diff --git a/tests/markups/valid-12.expected b/tests/markups/valid-12.expected
index b6587ee8..45bbc10c 100644
--- a/tests/markups/valid-12.expected
+++ b/tests/markups/valid-12.expected
@@ -8,19 +8,19 @@ error-line
 ---
 
 range 0 8
-[0,8]overline=1
+0 8 overline single
 range 8 9
 range 9 23
-[9,23]overline-color=#ffff00000000
+9 23 overline-color #ffff00000000
 range 23 24
 range 24 35
-[24,35]underline=5
+24 35 underline single-line
 range 35 36
 range 36 47
-[36,47]underline=6
+36 47 underline double-line
 range 47 48
 range 48 58
-[48,58]underline=7
+48 58 underline error-line
 range 58 2147483647
 
 
diff --git a/tests/markups/valid-13.expected b/tests/markups/valid-13.expected
index c63a71c4..c573dd3d 100644
--- a/tests/markups/valid-13.expected
+++ b/tests/markups/valid-13.expected
@@ -5,7 +5,7 @@ abc def
 
 range 0 4
 range 4 5
-[4,5]underline=3
+4 5 underline low
 range 5 2147483647
 
 
diff --git a/tests/markups/valid-14.expected b/tests/markups/valid-14.expected
index 4aa87977..580f9166 100644
--- a/tests/markups/valid-14.expected
+++ b/tests/markups/valid-14.expected
@@ -4,10 +4,10 @@ abc def _x_
 ---
 
 range 0 1
-[0,1]underline=3
+0 1 underline low
 range 1 4
 range 4 5
-[4,5]underline=3
+4 5 underline low
 range 5 2147483647
 
 
diff --git a/tests/markups/valid-16.expected b/tests/markups/valid-16.expected
index c8b000a8..a8a0dcd2 100644
--- a/tests/markups/valid-16.expected
+++ b/tests/markups/valid-16.expected
@@ -4,16 +4,16 @@ larger and smaller and smaller now with base
 ---
 
 range 0 11
-[0,44]scale=1.200000
+0 44 scale  1.200000
 range 11 19
-[11,30]scale=1.000000
+11 30 scale  1.000000
 range 19 30
-[19,30]scale=0.833333
+19 30 scale  0.833333
 range 30 31
-[0,44]scale=1.200000
+0 44 scale  1.200000
 range 31 44
-[0,44]scale=1.200000
-[31,44]size=15360
+0 44 scale  1.200000
+31 44 size 15360
 range 44 2147483647
 
 
diff --git a/tests/markups/valid-17.expected b/tests/markups/valid-17.expected
index 8b9ce039..7614fde3 100644
--- a/tests/markups/valid-17.expected
+++ b/tests/markups/valid-17.expected
@@ -4,7 +4,7 @@ test
 ---
 
 range 0 4
-[0,4]show=3
+0 4 show 3
 range 4 2147483647
 
 
diff --git a/tests/markups/valid-18.expected b/tests/markups/valid-18.expected
index 6f372b15..78731074 100644
--- a/tests/markups/valid-18.expected
+++ b/tests/markups/valid-18.expected
@@ -4,17 +4,17 @@ Lots of attrs
 ---
 
 range 0 13
-[0,13]font-desc=Sans Italic 12
-[0,13]foreground=#0000ffff0000
-[0,13]background=#f0f0f0f0f0f0
-[0,13]underline=2
-[0,13]underline-color=#ffff00000000
-[0,13]gravity=0
-[0,13]gravity-hint=1
-[0,13]strikethrough=1
-[0,13]strikethrough-color=#00000000ffff
-[0,13]fallback=0
-[0,13]language=de
+0 13 font-desc "Sans Italic 12"
+0 13 foreground #0000ffff0000
+0 13 background #f0f0f0f0f0f0
+0 13 underline double
+0 13 underline-color #ffff00000000
+0 13 gravity south
+0 13 gravity-hint strong
+0 13 strikethrough true
+0 13 strikethrough-color #00000000ffff
+0 13 fallback false
+0 13 language de
 range 13 2147483647
 
 
diff --git a/tests/markups/valid-19.expected b/tests/markups/valid-19.expected
index ea561c9d..5b84133f 100644
--- a/tests/markups/valid-19.expected
+++ b/tests/markups/valid-19.expected
@@ -4,11 +4,11 @@ test
 ---
 
 range 0 4
-[0,4]family=Times
-[0,4]weight=700
-[0,4]foreground=#ffff00000000
-[0,4]letter-spacing=1024
-[0,4]insert-hyphens=1
+0 4 family Times
+0 4 weight bold
+0 4 foreground #ffff00000000
+0 4 letter-spacing 1024
+0 4 insert-hyphens true
 range 4 2147483647
 
 
diff --git a/tests/markups/valid-2.expected b/tests/markups/valid-2.expected
index c372666a..63da62d4 100644
--- a/tests/markups/valid-2.expected
+++ b/tests/markups/valid-2.expected
@@ -4,11 +4,11 @@ Blue text is cool!
 ---
 
 range 0 9
-[0,9]scale=1.728000
-[0,9]foreground=#00000000ffff
+0 9 scale  1.728000
+0 9 foreground #00000000ffff
 range 9 13
 range 13 17
-[13,17]style=2
+13 17 style italic
 range 17 2147483647
 
 
diff --git a/tests/markups/valid-20.expected b/tests/markups/valid-20.expected
index bd3ac65f..e00c9ba3 100644
--- a/tests/markups/valid-20.expected
+++ b/tests/markups/valid-20.expected
@@ -4,7 +4,7 @@ test
 ---
 
 range 0 4
-[0,4]size=20480
+0 4 size 20480
 range 4 2147483647
 
 
diff --git a/tests/markups/valid-21.expected b/tests/markups/valid-21.expected
index 9dc37dc1..55b9bfb1 100644
--- a/tests/markups/valid-21.expected
+++ b/tests/markups/valid-21.expected
@@ -4,7 +4,7 @@ test
 ---
 
 range 0 4
-[0,4]rise=2560
+0 4 rise 2560
 range 4 2147483647
 
 
diff --git a/tests/markups/valid-22.expected b/tests/markups/valid-22.expected
index 194c1960..cb4ae998 100644
--- a/tests/markups/valid-22.expected
+++ b/tests/markups/valid-22.expected
@@ -4,7 +4,7 @@ test
 ---
 
 range 0 4
-[0,4]rise=-5000
+0 4 rise -5000
 range 4 2147483647
 
 
diff --git a/tests/markups/valid-23.expected b/tests/markups/valid-23.expected
index 43621301..296faf0a 100644
--- a/tests/markups/valid-23.expected
+++ b/tests/markups/valid-23.expected
@@ -4,10 +4,10 @@ test test
 ---
 
 range 0 5
-[0,9]font-desc=Cantarell 11
+0 9 font-desc "Cantarell 11"
 range 5 9
-[0,9]font-desc=Cantarell 11
-[5,9]scale=2.000000
+0 9 font-desc "Cantarell 11"
+5 9 scale  2.000000
 range 9 2147483647
 
 
diff --git a/tests/markups/valid-24.expected b/tests/markups/valid-24.expected
index 06eb6e0c..5e966bdc 100644
--- a/tests/markups/valid-24.expected
+++ b/tests/markups/valid-24.expected
@@ -4,10 +4,10 @@ straße up, up and away
 ---
 
 range 0 7
-[0,7]text-transform=2
+0 7 text-transform uppercase
 range 7 8
 range 8 23
-[8,23]text-transform=3
+8 23 text-transform capitalize
 range 23 2147483647
 
 
diff --git a/tests/markups/valid-3.expected b/tests/markups/valid-3.expected
index 3b69c218..bfc14213 100644
--- a/tests/markups/valid-3.expected
+++ b/tests/markups/valid-3.expected
@@ -4,18 +4,18 @@ Lots of attrs
 ---
 
 range 0 13
-[0,13]font-desc=Sans Italic 12
-[0,13]foreground=#0000ffff0000
-[0,13]background=#f0f0f0f0f0f0
-[0,13]underline=2
-[0,13]underline-color=#ffff00000000
-[0,13]gravity=0
-[0,13]gravity-hint=1
-[0,13]strikethrough=1
-[0,13]strikethrough-color=#00000000ffff
-[0,13]fallback=0
-[0,13]language=de
-[0,13]allow-breaks=1
+0 13 font-desc "Sans Italic 12"
+0 13 foreground #0000ffff0000
+0 13 background #f0f0f0f0f0f0
+0 13 underline double
+0 13 underline-color #ffff00000000
+0 13 gravity south
+0 13 gravity-hint strong
+0 13 strikethrough true
+0 13 strikethrough-color #00000000ffff
+0 13 fallback false
+0 13 language de
+0 13 allow-breaks true
 range 13 2147483647
 
 
diff --git a/tests/markups/valid-4.expected b/tests/markups/valid-4.expected
index a9e16728..615e2adc 100644
--- a/tests/markups/valid-4.expected
+++ b/tests/markups/valid-4.expected
@@ -4,37 +4,37 @@ bold big italic strikethroughsub smallsup tt underline
 ---
 
 range 0 5
-[0,15]weight=700
+0 15 weight bold
 range 5 8
-[0,15]weight=700
-[5,8]scale=1.200000
+0 15 weight bold
+5 8 scale  1.200000
 range 8 9
-[0,15]weight=700
+0 15 weight bold
 range 9 15
-[0,15]weight=700
-[9,15]style=2
+0 15 weight bold
+9 15 style italic
 range 15 16
 range 16 29
-[16,41]strikethrough=1
+16 41 strikethrough true
 range 29 32
-[16,41]strikethrough=1
-[29,32]font-scale=2
-[29,32]baseline-shift=2
+16 41 strikethrough true
+29 32 font-scale subscript
+29 32 baseline-shift subscript
 range 32 33
-[16,41]strikethrough=1
+16 41 strikethrough true
 range 33 38
-[16,41]strikethrough=1
-[33,38]scale=0.833333
+16 41 strikethrough true
+33 38 scale  0.833333
 range 38 41
-[16,41]strikethrough=1
-[38,41]font-scale=1
-[38,41]baseline-shift=1
+16 41 strikethrough true
+38 41 font-scale superscript
+38 41 baseline-shift superscript
 range 41 42
 range 42 45
-[42,54]family=Monospace
+42 54 family Monospace
 range 45 54
-[42,54]family=Monospace
-[45,54]underline=1
+42 54 family Monospace
+45 54 underline single
 range 54 2147483647
 
 
diff --git a/tests/markups/valid-5.expected b/tests/markups/valid-5.expected
index a26c4f71..d6e17249 100644
--- a/tests/markups/valid-5.expected
+++ b/tests/markups/valid-5.expected
@@ -7,16 +7,16 @@ Text
 ---
 
 range 0 4
-[0,4]foreground=#222233334444
+0 4 foreground #222233334444
 range 4 5
 range 5 9
-[5,9]foreground=#222233334444
+5 9 foreground #222233334444
 range 9 10
 range 10 14
-[10,14]foreground=#222233334444
+10 14 foreground #222233334444
 range 14 15
 range 15 19
-[15,19]foreground=#222233334444
+15 19 foreground #222233334444
 range 19 2147483647
 
 
diff --git a/tests/markups/valid-6.expected b/tests/markups/valid-6.expected
index 40807607..4f1920ad 100644
--- a/tests/markups/valid-6.expected
+++ b/tests/markups/valid-6.expected
@@ -7,19 +7,19 @@ Text
 ---
 
 range 0 4
-[0,4]foreground=#222233334444
-[0,4]foreground-alpha=21845
+0 4 foreground #222233334444
+0 4 foreground-alpha 21845
 range 4 5
 range 5 9
-[5,9]foreground=#222233334444
-[5,9]foreground-alpha=21845
+5 9 foreground #222233334444
+5 9 foreground-alpha 21845
 range 9 10
 range 10 14
-[10,14]foreground=#222233334444
+10 14 foreground #222233334444
 range 14 15
 range 15 19
-[15,19]foreground=#222233334444
-[15,19]foreground-alpha=21845
+15 19 foreground #222233334444
+15 19 foreground-alpha 21845
 range 19 2147483647
 
 
diff --git a/tests/markups/valid-7.expected b/tests/markups/valid-7.expected
index 0658ab27..71ba77a9 100644
--- a/tests/markups/valid-7.expected
+++ b/tests/markups/valid-7.expected
@@ -5,10 +5,10 @@ Text
 ---
 
 range 0 4
-[0,4]underline-color=#222233334444
+0 4 underline-color #222233334444
 range 4 5
 range 5 9
-[5,9]strikethrough-color=#222233334444
+5 9 strikethrough-color #222233334444
 range 9 2147483647
 
 
diff --git a/tests/markups/valid-8.expected b/tests/markups/valid-8.expected
index 79a0f01d..89310b78 100644
--- a/tests/markups/valid-8.expected
+++ b/tests/markups/valid-8.expected
@@ -12,54 +12,54 @@ Text
 ---
 
 range 0 4
-[0,4]scale=0.578704
-[0,4]variant=0
-[0,4]stretch=0
-[0,4]foreground=#00000000ffff
-[0,4]foreground-alpha=65535
+0 4 scale  0.578704
+0 4 variant normal
+0 4 stretch ultra-condensed
+0 4 foreground #00000000ffff
+0 4 foreground-alpha 65535
 range 4 5
 range 5 9
-[5,9]scale=0.694444
-[5,9]variant=1
-[5,9]stretch=1
-[5,9]foreground=#00000000ffff
-[5,9]foreground-alpha=32767
+5 9 scale  0.694444
+5 9 variant small-caps
+5 9 stretch extra-condensed
+5 9 foreground #00000000ffff
+5 9 foreground-alpha 32767
 range 9 10
 range 10 14
-[10,14]scale=0.833333
-[10,14]stretch=2
-[10,14]background=#00000000ffff
-[10,14]background-alpha=1
+10 14 scale  0.833333
+10 14 stretch condensed
+10 14 background #00000000ffff
+10 14 background-alpha 1
 range 14 15
 range 15 19
-[15,19]scale=1.000000
-[15,19]stretch=3
-[15,19]background=#00000000ffff
-[15,19]background-alpha=21626
+15 19 scale  1.000000
+15 19 stretch semi-condensed
+15 19 background #00000000ffff
+15 19 background-alpha 21626
 range 19 20
 range 20 24
-[20,24]scale=1.200000
-[20,24]stretch=4
-[20,24]background=#00000000ffff
-[20,24]background-alpha=21626
+20 24 scale  1.200000
+20 24 stretch normal
+20 24 background #00000000ffff
+20 24 background-alpha 21626
 range 24 25
 range 25 29
-[25,29]scale=1.440000
-[25,29]stretch=5
-[25,29]background=#00000000ffff
-[25,29]background-alpha=43690
+25 29 scale  1.440000
+25 29 stretch semi-expanded
+25 29 background #00000000ffff
+25 29 background-alpha 43690
 range 29 30
 range 30 34
-[30,34]scale=1.728000
-[30,34]stretch=6
+30 34 scale  1.728000
+30 34 stretch expanded
 range 34 35
 range 35 39
-[35,39]scale=1.728000
-[35,39]stretch=7
+35 39 scale  1.728000
+35 39 stretch extra-expanded
 range 39 40
 range 40 44
-[40,44]scale=1.728000
-[40,44]stretch=8
+40 44 scale  1.728000
+40 44 stretch ultra-expanded
 range 44 2147483647
 
 
diff --git a/tests/markups/valid-9.expected b/tests/markups/valid-9.expected
index 71c370b2..cec75f68 100644
--- a/tests/markups/valid-9.expected
+++ b/tests/markups/valid-9.expected
@@ -4,7 +4,7 @@ Blue text
 ---
 
 range 0 9
-[0,9]font-features=kern 0, dlig, lnum 1, -pnum
+0 9 font-features "kern 0, dlig, lnum 1, -pnum"
 range 9 2147483647