Some test updates

Share the attribute printing code between
all the tests, update expected output to match.

11 files changed, 102 insertions, 102 deletions

diff --git a/tests/markups/valid-1.expected b/tests/markups/valid-1.expected
index 09546763..6ad9a22a 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=2
 range 17 2147483647
 
 
diff --git a/tests/markups/valid-10.expected b/tests/markups/valid-10.expected
index 1479696c..28f53835 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 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=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
 range 13 2147483647
 
 
diff --git a/tests/markups/valid-11.expected b/tests/markups/valid-11.expected
index a41b65b8..bd3f83f2 100644
--- a/tests/markups/valid-11.expected
+++ b/tests/markups/valid-11.expected
@@ -4,41 +4,41 @@ Lots of attrs
 ---
 
 range 0 5
-[0 13] font 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=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
 range 5 7
-[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 Bold
+[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
 range 7 13
-[0 13] font 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=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
 range 13 2147483647
 
 
diff --git a/tests/markups/valid-2.expected b/tests/markups/valid-2.expected
index 09546763..6ad9a22a 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.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=2
 range 17 2147483647
 
 
diff --git a/tests/markups/valid-3.expected b/tests/markups/valid-3.expected
index 1943fc37..6f372b15 100644
--- a/tests/markups/valid-3.expected
+++ b/tests/markups/valid-3.expected
@@ -4,17 +4,17 @@ Lots of attrs
 ---
 
 range 0 13
-[0 13] font 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=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
 range 13 2147483647
 
 
diff --git a/tests/markups/valid-4.expected b/tests/markups/valid-4.expected
index 171e84e1..0391ec8e 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=700
 range 5 8
-[0 15] weight 700
-[5 8] scale 1.200000
+[0,15]weight=700
+[5,8]scale=1.200000
 range 8 9
-[0 15] weight 700
+[0,15]weight=700
 range 9 15
-[0 15] weight 700
-[9 15] style 2
+[0,15]weight=700
+[9,15]style=2
 range 15 16
 range 16 29
-[16 41] strikethrough 1
+[16,41]strikethrough=1
 range 29 32
-[16 41] strikethrough 1
-[29 32] scale 0.833333
-[29 32] rise -5000
+[16,41]strikethrough=1
+[29,32]scale=0.833333
+[29,32]rise=-5000
 range 32 33
-[16 41] strikethrough 1
+[16,41]strikethrough=1
 range 33 38
-[16 41] strikethrough 1
-[33 38] scale 0.833333
+[16,41]strikethrough=1
+[33,38]scale=0.833333
 range 38 41
-[16 41] strikethrough 1
-[38 41] scale 0.833333
-[38 41] rise 5000
+[16,41]strikethrough=1
+[38,41]scale=0.833333
+[38,41]rise=5000
 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=1
 range 54 2147483647
 
 
diff --git a/tests/markups/valid-5.expected b/tests/markups/valid-5.expected
index ee3ae71e..a26c4f71 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 d5d6ea45..40807607 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 5555
+[0,4]foreground=#222233334444
+[0,4]foreground-alpha=21845
 range 4 5
 range 5 9
-[5 9] foreground #222233334444
-[5 9] foreground-alpha 5555
+[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 5555
+[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 d30d165d..0658ab27 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 de8eb6b8..4f16487f 100644
--- a/tests/markups/valid-8.expected
+++ b/tests/markups/valid-8.expected
@@ -7,20 +7,20 @@ Text
 ---
 
 range 0 4
-[0 4] foreground #00000000ffff
-[0 4] foreground-alpha ffff
+[0,4]foreground=#00000000ffff
+[0,4]foreground-alpha=65535
 range 4 5
 range 5 9
-[5 9] foreground #00000000ffff
-[5 9] foreground-alpha 7fff
+[5,9]foreground=#00000000ffff
+[5,9]foreground-alpha=32767
 range 9 10
 range 10 14
-[10 14] background #00000000ffff
-[10 14] background-alpha 0001
+[10,14]background=#00000000ffff
+[10,14]background-alpha=1
 range 14 15
 range 15 19
-[15 19] background #00000000ffff
-[15 19] background-alpha 547a
+[15,19]background=#00000000ffff
+[15,19]background-alpha=21626
 range 19 2147483647
 
 
diff --git a/tests/markups/valid-9.expected b/tests/markups/valid-9.expected
index 7931e705..71c370b2 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