diff options
| -rw-r--r-- | test/data/select/tests1.dat | 44 | ||||
| -rw-r--r-- | test/dump_computed.h | 25 |
2 files changed, 66 insertions, 3 deletions
diff --git a/test/data/select/tests1.dat b/test/data/select/tests1.dat index 96e57bf..99eb44e 100644 --- a/test/data/select/tests1.dat +++ b/test/data/select/tests1.dat @@ -37,6 +37,7 @@ caption-side: inherit clear: none clip: auto color: #ffff0000 +column-count: auto content: normal counter-increment: none counter-reset: none @@ -134,6 +135,7 @@ caption-side: inherit clear: none clip: auto color: #ffff0000 +column-count: auto content: normal counter-increment: none counter-reset: none @@ -231,6 +233,7 @@ caption-side: inherit clear: none clip: auto color: inherit +column-count: auto content: normal counter-increment: none counter-reset: none @@ -328,6 +331,7 @@ caption-side: inherit clear: none clip: auto color: inherit +column-count: auto content: normal counter-increment: none counter-reset: none @@ -417,6 +421,7 @@ caption-side: top clear: none clip: auto color: #ff000000 +column-count: auto content: normal counter-increment: none counter-reset: none @@ -504,6 +509,7 @@ caption-side: top clear: none clip: auto color: #ff000000 +column-count: auto content: normal counter-increment: none counter-reset: none @@ -592,6 +598,7 @@ caption-side: top clear: none clip: auto color: #ff000000 +column-count: auto content: normal counter-increment: none counter-reset: none @@ -680,6 +687,7 @@ caption-side: inherit clear: none clip: auto color: inherit +column-count: auto content: normal counter-increment: none counter-reset: none @@ -767,6 +775,7 @@ caption-side: top clear: none clip: auto color: #ff000000 +column-count: auto content: normal counter-increment: none counter-reset: none @@ -859,6 +868,7 @@ caption-side: inherit clear: none clip: auto color: inherit +column-count: auto content: normal counter-increment: none counter-reset: none @@ -951,6 +961,7 @@ caption-side: inherit clear: none clip: auto color: inherit +column-count: auto content: normal counter-increment: none counter-reset: none @@ -1044,6 +1055,7 @@ caption-side: inherit clear: none clip: auto color: inherit +column-count: auto content: normal counter-increment: none counter-reset: none @@ -1140,6 +1152,7 @@ caption-side: inherit clear: none clip: auto color: inherit +column-count: auto content: normal counter-increment: none counter-reset: none @@ -1235,6 +1248,7 @@ caption-side: inherit clear: none clip: auto color: inherit +column-count: auto content: normal counter-increment: none counter-reset: none @@ -1336,6 +1350,7 @@ caption-side: inherit clear: none clip: auto color: inherit +column-count: auto content: normal counter-increment: none counter-reset: none @@ -1437,6 +1452,7 @@ caption-side: inherit clear: none clip: auto color: inherit +column-count: auto content: normal counter-increment: none counter-reset: none @@ -1538,6 +1554,7 @@ caption-side: inherit clear: none clip: auto color: inherit +column-count: auto content: normal counter-increment: none counter-reset: none @@ -1643,6 +1660,7 @@ caption-side: inherit clear: none clip: auto color: inherit +column-count: auto content: normal counter-increment: none counter-reset: none @@ -1747,6 +1765,7 @@ caption-side: inherit clear: none clip: auto color: inherit +column-count: auto content: normal counter-increment: none counter-reset: none @@ -1849,6 +1868,7 @@ caption-side: inherit clear: none clip: auto color: inherit +column-count: auto content: normal counter-increment: none counter-reset: none @@ -1950,6 +1970,7 @@ caption-side: inherit clear: none clip: auto color: inherit +column-count: auto content: normal counter-increment: none counter-reset: none @@ -2051,6 +2072,7 @@ caption-side: inherit clear: none clip: auto color: inherit +column-count: auto content: normal counter-increment: none counter-reset: none @@ -2152,6 +2174,7 @@ caption-side: inherit clear: none clip: auto color: inherit +column-count: auto content: normal counter-increment: none counter-reset: none @@ -2253,6 +2276,7 @@ caption-side: inherit clear: none clip: auto color: inherit +column-count: auto content: normal counter-increment: none counter-reset: none @@ -2354,6 +2378,7 @@ caption-side: inherit clear: inherit clip: auto color: inherit +column-count: auto content: normal counter-increment: none counter-reset: none @@ -2455,6 +2480,7 @@ caption-side: inherit clear: left clip: auto color: inherit +column-count: auto content: normal counter-increment: none counter-reset: none @@ -2556,6 +2582,7 @@ caption-side: inherit clear: both clip: auto color: inherit +column-count: auto content: normal counter-increment: none counter-reset: none @@ -2657,6 +2684,7 @@ caption-side: inherit clear: right clip: auto color: inherit +column-count: auto content: normal counter-increment: none counter-reset: none @@ -2758,6 +2786,7 @@ caption-side: inherit clear: right clip: auto color: inherit +column-count: auto content: normal counter-increment: none counter-reset: none @@ -2859,6 +2888,7 @@ caption-side: inherit clear: right clip: auto color: inherit +column-count: auto content: normal counter-increment: none counter-reset: none @@ -2960,6 +2990,7 @@ caption-side: inherit clear: right clip: auto color: inherit +column-count: auto content: normal counter-increment: none counter-reset: none @@ -3061,6 +3092,7 @@ caption-side: inherit clear: right clip: auto color: inherit +column-count: auto content: normal counter-increment: none counter-reset: none @@ -3162,6 +3194,7 @@ caption-side: inherit clear: right clip: auto color: inherit +column-count: auto content: normal counter-increment: none counter-reset: none @@ -3263,6 +3296,7 @@ caption-side: inherit clear: right clip: auto color: inherit +column-count: auto content: normal counter-increment: none counter-reset: none @@ -3364,6 +3398,7 @@ caption-side: inherit clear: right clip: auto color: inherit +column-count: auto content: normal counter-increment: none counter-reset: none @@ -3465,6 +3500,7 @@ caption-side: inherit clear: right clip: auto color: inherit +column-count: auto content: normal counter-increment: none counter-reset: none @@ -3566,6 +3602,7 @@ caption-side: inherit clear: right clip: auto color: inherit +column-count: auto content: normal counter-increment: none counter-reset: none @@ -3667,6 +3704,7 @@ caption-side: inherit clear: right clip: auto color: inherit +column-count: auto content: normal counter-increment: none counter-reset: none @@ -3768,6 +3806,7 @@ caption-side: inherit clear: right clip: auto color: inherit +column-count: auto content: normal counter-increment: none counter-reset: none @@ -3869,6 +3908,7 @@ caption-side: inherit clear: right clip: auto color: inherit +column-count: auto content: normal counter-increment: none counter-reset: none @@ -3963,6 +4003,7 @@ caption-side: inherit clear: none clip: auto color: inherit +column-count: auto content: normal counter-increment: none counter-reset: none @@ -4057,6 +4098,7 @@ caption-side: inherit clear: none clip: auto color: inherit +column-count: auto content: normal counter-increment: none counter-reset: none @@ -4151,6 +4193,7 @@ caption-side: inherit clear: none clip: auto color: inherit +column-count: auto content: normal counter-increment: none counter-reset: none @@ -4207,3 +4250,4 @@ word-spacing: inherit writing-mode: vertical-lr z-index: auto #reset + diff --git a/test/dump_computed.h b/test/dump_computed.h index 5f83767..e1519f0 100644 --- a/test/dump_computed.h +++ b/test/dump_computed.h @@ -151,7 +151,7 @@ static void dump_computed_style(const css_computed_style *style, char *buf, const css_computed_content_item *content = NULL; const css_computed_counter *counter = NULL; lwc_string **string_list = NULL; - int32_t zindex = 0; + int32_t integer = 0; /* background-attachment */ val = css_computed_background_attachment(style); @@ -824,6 +824,25 @@ static void dump_computed_style(const css_computed_style *style, char *buf, ptr += wrote; *len -= wrote; + /* column-count */ + val = css_computed_column_count(style, &integer); + switch (val) { + case CSS_COLUMN_COUNT_INHERIT: + wrote = snprintf(ptr, *len, "column-count: inherit\n"); + break; + case CSS_COLUMN_COUNT_AUTO: + wrote = snprintf(ptr, *len, "column-count: auto\n"); + break; + case CSS_COLUMN_COUNT_SET: + wrote = snprintf(ptr, *len, "column-count: %d\n", integer); + break; + default: + wrote = 0; + break; + } + ptr += wrote; + *len -= wrote; + /* content */ val = css_computed_content(style, &content); switch (val) { @@ -2520,7 +2539,7 @@ static void dump_computed_style(const css_computed_style *style, char *buf, *len -= wrote; /* z-index */ - val = css_computed_z_index(style, &zindex); + val = css_computed_z_index(style, &integer); switch (val) { case CSS_Z_INDEX_INHERIT: wrote = snprintf(ptr, *len, "z-index: inherit\n"); @@ -2529,7 +2548,7 @@ static void dump_computed_style(const css_computed_style *style, char *buf, wrote = snprintf(ptr, *len, "z-index: auto\n"); break; case CSS_Z_INDEX_SET: - wrote = snprintf(ptr, *len, "z-index: %d\n", zindex); + wrote = snprintf(ptr, *len, "z-index: %d\n", integer); break; default: wrote = 0; |