[pango/pango2: 20/168] Update markup tests

From: Matthias Clasen <matthiasc src gnome org>
To: commits-list gnome org
Cc:
Subject: [pango/pango2: 20/168] Update markup tests
Date: Mon, 20 Jun 2022 16:28:37 +0000 (UTC)

commit 0fa050e39b6485216f833d5892ecf2cd3deb3657
Author: Matthias Clasen <mclasen redhat com>
Date:   Sat Jun 4 16:49:41 2022 -0400

    Update markup tests

 tests/markups/convenience.expected |  2 +-
 tests/markups/custom.expected      | 13 +++++++------
 tests/markups/fail-10.markup       |  2 +-
 tests/markups/fail-27.expected     | 15 ++++++++++++++-
 tests/markups/fail-9.expected      |  2 +-
 tests/markups/valid-10.expected    |  2 +-
 tests/markups/valid-10.markup      |  2 +-
 tests/markups/valid-11.expected    |  6 +++---
 tests/markups/valid-11.markup      |  2 +-
 tests/markups/valid-12.expected    |  9 ++++++---
 tests/markups/valid-12.markup      |  6 +++---
 tests/markups/valid-13.expected    |  3 ++-
 tests/markups/valid-14.expected    |  6 ++++--
 tests/markups/valid-18.expected    |  2 +-
 tests/markups/valid-18.markup      |  2 +-
 tests/markups/valid-3.expected     |  2 +-
 tests/markups/valid-3.markup       |  2 +-
 tests/markups/valid-4.expected     | 10 +++++-----
 18 files changed, 54 insertions(+), 34 deletions(-)
---
diff --git a/tests/markups/convenience.expected b/tests/markups/convenience.expected
index 70215ba5..dba83d49 100644
--- a/tests/markups/convenience.expected
+++ b/tests/markups/convenience.expected
@@ -56,7 +56,7 @@ range 43 44
 range 44 54
 1 79 font-desc "Cantarell 20"
 1 79 language en
-44 54 strikethrough single
+44 54 strikethrough 1
 range 54 55
 1 79 font-desc "Cantarell 20"
 1 79 language en
diff --git a/tests/markups/custom.expected b/tests/markups/custom.expected
index e82d3324..5af8b0fc 100644
--- a/tests/markups/custom.expected
+++ b/tests/markups/custom.expected
@@ -57,32 +57,33 @@ range 52 55
 1 160 font-desc "Cantarell 20"
 range 55 58
 1 160 font-desc "Cantarell 20"
-55 58 foreground #ffff00000000ffff
+55 58 foreground #ffff00000000
 range 58 61
 1 160 font-desc "Cantarell 20"
 range 61 64
 1 160 font-desc "Cantarell 20"
-61 64 foreground #ffff00000000ffff
+61 64 foreground #ffff00000000
 range 64 67
 1 160 font-desc "Cantarell 20"
 range 67 74
 1 160 font-desc "Cantarell 20"
-67 74 background #0000aaaabbbbcccc
+67 74 background #0000aaaabbbb
+67 74 background-alpha 52428
 range 74 77
 1 160 font-desc "Cantarell 20"
 range 77 81
 1 160 font-desc "Cantarell 20"
-77 81 word  true
+77 81 word true
 range 81 84
 1 160 font-desc "Cantarell 20"
 range 84 103
 1 160 font-desc "Cantarell 20"
-84 103 sentence  true
+84 103 sentence true
 range 103 106
 1 160 font-desc "Cantarell 20"
 range 106 126
 1 160 font-desc "Cantarell 20"
-106 126 sentence  true
+106 126 sentence true
 range 126 129
 1 160 font-desc "Cantarell 20"
 range 129 136
diff --git a/tests/markups/fail-10.markup b/tests/markups/fail-10.markup
index 692f49a9..80edbc9d 100644
--- a/tests/markups/fail-10.markup
+++ b/tests/markups/fail-10.markup
@@ -3,7 +3,7 @@
       background="#f0f0f0"
       underline="double"
       underline_color="red"
-      strikethrough="true"
+      strikethrough="single"
       strikethrough_color="blue"
       fallback="x"
       lang="de"
diff --git a/tests/markups/fail-27.expected b/tests/markups/fail-27.expected
index 0f3610ba..46f13761 100644
--- a/tests/markups/fail-27.expected
+++ b/tests/markups/fail-27.expected
@@ -1 +1,14 @@
-ERROR: 'dotted' is not a valid value for the 'underline' attribute on <span> tag, line 1; valid values are 
none/single/double/low/error/single-line/double-line/error-line
\ No newline at end of file
+test
+
+
+---
+
+range 0 4
+0 4 underline dotted
+range 4 2147483647
+
+
+---
+
+[0:4] (null) Normal
+[4:2147483647] (null) Normal
diff --git a/tests/markups/fail-9.expected b/tests/markups/fail-9.expected
index a81ca513..fbb61383 100644
--- a/tests/markups/fail-9.expected
+++ b/tests/markups/fail-9.expected
@@ -1 +1 @@
-ERROR: Value of 'strikethrough' attribute on <span> tag line 11 should have one of 'true/yes/t/y' or 
'false/no/f/n': 'x' is not valid
\ No newline at end of file
+ERROR: 'x' is not a valid value for the 'strikethrough' attribute on <span> tag, line 11; valid values are 
none/single/double/dotted
\ No newline at end of file
diff --git a/tests/markups/valid-10.expected b/tests/markups/valid-10.expected
index 24f3f8e3..7476f0bf 100644
--- a/tests/markups/valid-10.expected
+++ b/tests/markups/valid-10.expected
@@ -11,7 +11,7 @@ range 0 13
 0 13 underline-color #ffff00000000
 0 13 gravity south
 0 13 gravity-hint strong
-0 13 strikethrough true
+0 13 strikethrough 1
 0 13 strikethrough-color #00000000ffff
 0 13 fallback false
 0 13 language de
diff --git a/tests/markups/valid-10.markup b/tests/markups/valid-10.markup
index 5bd94408..86853269 100644
--- a/tests/markups/valid-10.markup
+++ b/tests/markups/valid-10.markup
@@ -3,7 +3,7 @@
       background="#f0f0f0"
       underline="double"
       underline_color="red"
-      strikethrough="yes"
+      strikethrough="single"
       strikethrough_color="blue"
       fallback="no"
       lang="de"
diff --git a/tests/markups/valid-11.expected b/tests/markups/valid-11.expected
index 2a551850..663f55e8 100644
--- a/tests/markups/valid-11.expected
+++ b/tests/markups/valid-11.expected
@@ -11,7 +11,7 @@ range 0 5
 0 13 underline-color #ffff00000000
 0 13 gravity south
 0 13 gravity-hint strong
-0 13 strikethrough true
+0 13 strikethrough 1
 0 13 strikethrough-color #00000000ffff
 0 13 fallback false
 0 13 language de
@@ -23,7 +23,7 @@ range 5 7
 0 13 underline-color #ffff00000000
 0 13 gravity south
 0 13 gravity-hint strong
-0 13 strikethrough true
+0 13 strikethrough 1
 0 13 strikethrough-color #00000000ffff
 0 13 fallback false
 0 13 language de
@@ -36,7 +36,7 @@ range 7 13
 0 13 underline-color #ffff00000000
 0 13 gravity south
 0 13 gravity-hint strong
-0 13 strikethrough true
+0 13 strikethrough 1
 0 13 strikethrough-color #00000000ffff
 0 13 fallback false
 0 13 language de
diff --git a/tests/markups/valid-11.markup b/tests/markups/valid-11.markup
index 6f5828fd..9ded942a 100644
--- a/tests/markups/valid-11.markup
+++ b/tests/markups/valid-11.markup
@@ -3,7 +3,7 @@
       background="#f0f0f0"
       underline="double"
       underline_color="red"
-      strikethrough="t"
+      strikethrough="single"
       strikethrough_color="blue"
       fallback="f"
       lang="de"
diff --git a/tests/markups/valid-12.expected b/tests/markups/valid-12.expected
index 45bbc10c..8c48c084 100644
--- a/tests/markups/valid-12.expected
+++ b/tests/markups/valid-12.expected
@@ -14,13 +14,16 @@ range 9 23
 9 23 overline-color #ffff00000000
 range 23 24
 range 24 35
-24 35 underline single-line
+24 35 underline single
+24 35 underline-position 1
 range 35 36
 range 36 47
-36 47 underline double-line
+36 47 underline double
+36 47 underline-position 1
 range 47 48
 range 48 58
-48 58 underline error-line
+48 58 underline dotted
+48 58 underline-position 1
 range 58 2147483647
 
 
diff --git a/tests/markups/valid-12.markup b/tests/markups/valid-12.markup
index 360944d0..61fe819b 100644
--- a/tests/markups/valid-12.markup
+++ b/tests/markups/valid-12.markup
@@ -1,5 +1,5 @@
 <span overline="single">overline</span>
 <span overline_color="red">overline-color</span>
-<span underline="single-line">single-line</span>
-<span underline="double-line">double-line</span>
-<span underline="error-line">error-line</span>
+<span underline="single" underline-position="under">single-line</span>
+<span underline="double" underline-position="under">double-line</span>
+<span underline="dotted" underline-position="under">error-line</span>
diff --git a/tests/markups/valid-13.expected b/tests/markups/valid-13.expected
index c573dd3d..92829d01 100644
--- a/tests/markups/valid-13.expected
+++ b/tests/markups/valid-13.expected
@@ -5,7 +5,8 @@ abc def
 
 range 0 4
 range 4 5
-4 5 underline low
+4 5 underline single
+4 5 underline-position 1
 range 5 2147483647
 
 
diff --git a/tests/markups/valid-14.expected b/tests/markups/valid-14.expected
index 580f9166..7d4fc8c6 100644
--- a/tests/markups/valid-14.expected
+++ b/tests/markups/valid-14.expected
@@ -4,10 +4,12 @@ abc def _x_
 ---
 
 range 0 1
-0 1 underline low
+0 1 underline single
+0 1 underline-position 1
 range 1 4
 range 4 5
-4 5 underline low
+4 5 underline single
+4 5 underline-position 1
 range 5 2147483647
 
 
diff --git a/tests/markups/valid-18.expected b/tests/markups/valid-18.expected
index 78731074..af454075 100644
--- a/tests/markups/valid-18.expected
+++ b/tests/markups/valid-18.expected
@@ -11,7 +11,7 @@ range 0 13
 0 13 underline-color #ffff00000000
 0 13 gravity south
 0 13 gravity-hint strong
-0 13 strikethrough true
+0 13 strikethrough 1
 0 13 strikethrough-color #00000000ffff
 0 13 fallback false
 0 13 language de
diff --git a/tests/markups/valid-18.markup b/tests/markups/valid-18.markup
index acc4fb51..ee54cb47 100644
--- a/tests/markups/valid-18.markup
+++ b/tests/markups/valid-18.markup
@@ -3,7 +3,7 @@
       background="#f0f0f0"
       underline="double"
       underline_color="red"
-      strikethrough="y"
+      strikethrough="single"
       strikethrough_color="blue"
       fallback="n"
       lang="de"
diff --git a/tests/markups/valid-3.expected b/tests/markups/valid-3.expected
index bfc14213..0239dd9b 100644
--- a/tests/markups/valid-3.expected
+++ b/tests/markups/valid-3.expected
@@ -11,7 +11,7 @@ range 0 13
 0 13 underline-color #ffff00000000
 0 13 gravity south
 0 13 gravity-hint strong
-0 13 strikethrough true
+0 13 strikethrough 1
 0 13 strikethrough-color #00000000ffff
 0 13 fallback false
 0 13 language de
diff --git a/tests/markups/valid-3.markup b/tests/markups/valid-3.markup
index a17409b0..370d61cc 100644
--- a/tests/markups/valid-3.markup
+++ b/tests/markups/valid-3.markup
@@ -3,7 +3,7 @@
       background="#f0f0f0"
       underline="double"
       underline_color="red"
-      strikethrough="true"
+      strikethrough="single"
       strikethrough_color="blue"
       fallback="false"
       allow_breaks="true"
diff --git a/tests/markups/valid-4.expected b/tests/markups/valid-4.expected
index 11ecfab1..52df3afd 100644
--- a/tests/markups/valid-4.expected
+++ b/tests/markups/valid-4.expected
@@ -15,18 +15,18 @@ range 9 15
 9 15 style italic
 range 15 16
 range 16 29
-16 41 strikethrough true
+16 41 strikethrough 1
 range 29 32
-16 41 strikethrough true
+16 41 strikethrough 1
 29 32 font-scale subscript
 29 32 baseline-shift subscript
 range 32 33
-16 41 strikethrough true
+16 41 strikethrough 1
 range 33 38
-16 41 strikethrough true
+16 41 strikethrough 1
 33 38 scale 0.833333
 range 38 41
-16 41 strikethrough true
+16 41 strikethrough 1
 38 41 font-scale superscript
 38 41 baseline-shift superscript
 range 41 42
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]