diff options
author | Matthias Clasen <mclasen@redhat.com> | 2022-11-18 09:09:49 -0500 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2022-11-18 09:30:09 -0500 |
commit | 81fcb4d2c1050c5c34cbaa03896a2adfba562872 (patch) | |
tree | d71ca47383473cd5099a63926a7a000167f451a3 /tests | |
parent | 2d6e76591ceb908dd9ad7ef797b647925fc0ed70 (diff) | |
download | pango-81fcb4d2c1050c5c34cbaa03896a2adfba562872.tar.gz |
Improve PangoAttrList serialization
Document the format, and improve the parser a bit,
so we can use this format in GtkBuilder.
Update affected tests.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/markups/valid-19.expected | 2 | ||||
-rw-r--r-- | tests/markups/valid-4.expected | 4 | ||||
-rw-r--r-- | tests/testserialize.c | 16 |
3 files changed, 16 insertions, 6 deletions
diff --git a/tests/markups/valid-19.expected b/tests/markups/valid-19.expected index 5b84133f..9de3df07 100644 --- a/tests/markups/valid-19.expected +++ b/tests/markups/valid-19.expected @@ -4,7 +4,7 @@ test --- range 0 4 -0 4 family Times +0 4 family "Times" 0 4 weight bold 0 4 foreground #ffff00000000 0 4 letter-spacing 1024 diff --git a/tests/markups/valid-4.expected b/tests/markups/valid-4.expected index 345e8699..11ecfab1 100644 --- a/tests/markups/valid-4.expected +++ b/tests/markups/valid-4.expected @@ -31,9 +31,9 @@ range 38 41 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 +42 54 family "Monospace" 45 54 underline single range 54 2147483647 diff --git a/tests/testserialize.c b/tests/testserialize.c index e480da31..0021ffe0 100644 --- a/tests/testserialize.c +++ b/tests/testserialize.c @@ -30,6 +30,11 @@ test_serialize_attr_list (void) { const char *valid[] = { "5 16 style italic", + " 5 16 style italic ", + "0 -1 language de ", + "0 1 family Times", + "0 1 family \"Times\" ", + "0 1 family \"Times\\n\\\"New\\\" Roman\" ", "0 10 foreground red, 5 15 weight bold, 0 200 font-desc \"Sans Small-Caps 10\"", "0 10 foreground red\n5 15 weight bold\n0 200 font-desc \"Sans Small-Caps 10\"", " 0 10 fallback false,\n 5 15 weight semilight\n\n \n \n", @@ -37,18 +42,23 @@ test_serialize_attr_list (void) "0 -1 size 10", "0 1 weight 700, 2 4 weight book", "0 200 rise 100\n5 15 family Times\n10 11 size 10240\n11 100 fallback 0\n30 60 stretch 2\n", - "" + "", }; const char *roundtripped[] = { "5 16 style italic", + "5 16 style italic", + "0 4294967295 language de", + "0 1 family \"Times\"", + "0 1 family \"Times\"", + "0 1 family \"Times\\n\\\"New\\\" Roman\"", "0 10 foreground #ffff00000000\n5 15 weight bold\n0 200 font-desc \"Sans Small-Caps 10\"", "0 10 foreground #ffff00000000\n5 15 weight bold\n0 200 font-desc \"Sans Small-Caps 10\"", "0 10 fallback false\n5 15 weight semilight", "0 100 font-desc \"Cantarell,Sans Ultra-Light Italic 64\"\n10 11 weight thin", "0 4294967295 size 10", "0 1 weight bold\n2 4 weight book", - "0 200 rise 100\n5 15 family Times\n10 11 size 10240\n11 100 fallback false\n30 60 stretch condensed", - "" + "0 200 rise 100\n5 15 family \"Times\"\n10 11 size 10240\n11 100 fallback false\n30 60 stretch condensed", + "", }; const char *invalid[] = { "not an attr list", |