From 34fc236550a686d947458a2ce7f9a081b2b6d22c Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Sun, 16 Nov 2014 12:08:47 +0000 Subject: Add column-rule-style to computed style dumper, and update unit tests. --- test/data/select/tests1.dat | 43 +++++++++++++++++++++++++++++++++++++++++++ test/dump_computed.h | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 86 insertions(+) diff --git a/test/data/select/tests1.dat b/test/data/select/tests1.dat index 8a1cd6c..5f4136e 100644 --- a/test/data/select/tests1.dat +++ b/test/data/select/tests1.dat @@ -41,6 +41,7 @@ column-count: auto column-fill: balance column-gap: normal column-rule-color: currentColor +column-rule-style: none content: normal counter-increment: none counter-reset: none @@ -142,6 +143,7 @@ column-count: auto column-fill: balance column-gap: normal column-rule-color: currentColor +column-rule-style: none content: normal counter-increment: none counter-reset: none @@ -243,6 +245,7 @@ column-count: auto column-fill: balance column-gap: normal column-rule-color: currentColor +column-rule-style: none content: normal counter-increment: none counter-reset: none @@ -344,6 +347,7 @@ column-count: auto column-fill: balance column-gap: normal column-rule-color: currentColor +column-rule-style: none content: normal counter-increment: none counter-reset: none @@ -437,6 +441,7 @@ column-count: auto column-fill: balance column-gap: normal column-rule-color: currentColor +column-rule-style: none content: normal counter-increment: none counter-reset: none @@ -528,6 +533,7 @@ column-count: auto column-fill: balance column-gap: normal column-rule-color: currentColor +column-rule-style: none content: normal counter-increment: none counter-reset: none @@ -620,6 +626,7 @@ column-count: auto column-fill: balance column-gap: normal column-rule-color: currentColor +column-rule-style: none content: normal counter-increment: none counter-reset: none @@ -712,6 +719,7 @@ column-count: auto column-fill: balance column-gap: normal column-rule-color: currentColor +column-rule-style: none content: normal counter-increment: none counter-reset: none @@ -803,6 +811,7 @@ column-count: auto column-fill: balance column-gap: normal column-rule-color: currentColor +column-rule-style: none content: normal counter-increment: none counter-reset: none @@ -899,6 +908,7 @@ column-count: auto column-fill: balance column-gap: normal column-rule-color: currentColor +column-rule-style: none content: normal counter-increment: none counter-reset: none @@ -995,6 +1005,7 @@ column-count: auto column-fill: balance column-gap: normal column-rule-color: currentColor +column-rule-style: none content: normal counter-increment: none counter-reset: none @@ -1092,6 +1103,7 @@ column-count: auto column-fill: balance column-gap: normal column-rule-color: currentColor +column-rule-style: none content: normal counter-increment: none counter-reset: none @@ -1192,6 +1204,7 @@ column-count: auto column-fill: balance column-gap: normal column-rule-color: currentColor +column-rule-style: none content: normal counter-increment: none counter-reset: none @@ -1291,6 +1304,7 @@ column-count: auto column-fill: balance column-gap: normal column-rule-color: currentColor +column-rule-style: none content: normal counter-increment: none counter-reset: none @@ -1396,6 +1410,7 @@ column-count: auto column-fill: balance column-gap: normal column-rule-color: currentColor +column-rule-style: none content: normal counter-increment: none counter-reset: none @@ -1501,6 +1516,7 @@ column-count: auto column-fill: balance column-gap: normal column-rule-color: currentColor +column-rule-style: none content: normal counter-increment: none counter-reset: none @@ -1606,6 +1622,7 @@ column-count: auto column-fill: balance column-gap: normal column-rule-color: currentColor +column-rule-style: none content: normal counter-increment: none counter-reset: none @@ -1715,6 +1732,7 @@ column-count: auto column-fill: balance column-gap: normal column-rule-color: currentColor +column-rule-style: none content: normal counter-increment: none counter-reset: none @@ -1823,6 +1841,7 @@ column-count: auto column-fill: balance column-gap: normal column-rule-color: currentColor +column-rule-style: none content: normal counter-increment: none counter-reset: none @@ -1929,6 +1948,7 @@ column-count: auto column-fill: balance column-gap: normal column-rule-color: currentColor +column-rule-style: none content: normal counter-increment: none counter-reset: none @@ -2034,6 +2054,7 @@ column-count: auto column-fill: balance column-gap: normal column-rule-color: inherit +column-rule-style: none content: normal counter-increment: none counter-reset: none @@ -2139,6 +2160,7 @@ column-count: auto column-fill: balance column-gap: normal column-rule-color: inherit +column-rule-style: none content: normal counter-increment: none counter-reset: none @@ -2244,6 +2266,7 @@ column-count: auto column-fill: balance column-gap: normal column-rule-color: inherit +column-rule-style: none content: normal counter-increment: none counter-reset: none @@ -2349,6 +2372,7 @@ column-count: auto column-fill: balance column-gap: normal column-rule-color: inherit +column-rule-style: none content: normal counter-increment: none counter-reset: none @@ -2454,6 +2478,7 @@ column-count: auto column-fill: balance column-gap: normal column-rule-color: inherit +column-rule-style: none content: normal counter-increment: none counter-reset: none @@ -2559,6 +2584,7 @@ column-count: auto column-fill: balance column-gap: normal column-rule-color: inherit +column-rule-style: none content: normal counter-increment: none counter-reset: none @@ -2664,6 +2690,7 @@ column-count: auto column-fill: balance column-gap: normal column-rule-color: inherit +column-rule-style: none content: normal counter-increment: none counter-reset: none @@ -2769,6 +2796,7 @@ column-count: auto column-fill: balance column-gap: normal column-rule-color: inherit +column-rule-style: none content: normal counter-increment: none counter-reset: none @@ -2874,6 +2902,7 @@ column-count: auto column-fill: balance column-gap: normal column-rule-color: inherit +column-rule-style: none content: normal counter-increment: none counter-reset: none @@ -2979,6 +3008,7 @@ column-count: auto column-fill: balance column-gap: normal column-rule-color: inherit +column-rule-style: none content: normal counter-increment: none counter-reset: none @@ -3084,6 +3114,7 @@ column-count: auto column-fill: balance column-gap: normal column-rule-color: inherit +column-rule-style: none content: normal counter-increment: none counter-reset: none @@ -3189,6 +3220,7 @@ column-count: auto column-fill: balance column-gap: normal column-rule-color: inherit +column-rule-style: none content: normal counter-increment: none counter-reset: none @@ -3294,6 +3326,7 @@ column-count: auto column-fill: balance column-gap: normal column-rule-color: inherit +column-rule-style: none content: normal counter-increment: none counter-reset: none @@ -3399,6 +3432,7 @@ column-count: auto column-fill: balance column-gap: normal column-rule-color: inherit +column-rule-style: none content: normal counter-increment: none counter-reset: none @@ -3504,6 +3538,7 @@ column-count: auto column-fill: balance column-gap: normal column-rule-color: inherit +column-rule-style: none content: normal counter-increment: none counter-reset: none @@ -3609,6 +3644,7 @@ column-count: auto column-fill: balance column-gap: normal column-rule-color: inherit +column-rule-style: none content: normal counter-increment: none counter-reset: none @@ -3714,6 +3750,7 @@ column-count: auto column-fill: balance column-gap: normal column-rule-color: inherit +column-rule-style: none content: normal counter-increment: none counter-reset: none @@ -3819,6 +3856,7 @@ column-count: auto column-fill: balance column-gap: normal column-rule-color: inherit +column-rule-style: none content: normal counter-increment: none counter-reset: none @@ -3924,6 +3962,7 @@ column-count: auto column-fill: balance column-gap: normal column-rule-color: inherit +column-rule-style: none content: normal counter-increment: none counter-reset: none @@ -4029,6 +4068,7 @@ column-count: auto column-fill: balance column-gap: normal column-rule-color: inherit +column-rule-style: none content: normal counter-increment: none counter-reset: none @@ -4127,6 +4167,7 @@ column-count: auto column-fill: balance column-gap: normal column-rule-color: currentColor +column-rule-style: none content: normal counter-increment: none counter-reset: none @@ -4225,6 +4266,7 @@ column-count: auto column-fill: balance column-gap: normal column-rule-color: inherit +column-rule-style: none content: normal counter-increment: none counter-reset: none @@ -4323,6 +4365,7 @@ column-count: auto column-fill: balance column-gap: normal column-rule-color: inherit +column-rule-style: none content: normal counter-increment: none counter-reset: none diff --git a/test/dump_computed.h b/test/dump_computed.h index 3da4617..00e9a10 100644 --- a/test/dump_computed.h +++ b/test/dump_computed.h @@ -906,6 +906,49 @@ static void dump_computed_style(const css_computed_style *style, char *buf, ptr += wrote; *len -= wrote; + /* column-rule-style */ + val = css_computed_column_rule_style(style); + switch (val) { + case CSS_COLUMN_RULE_STYLE_INHERIT: + wrote = snprintf(ptr, *len, "column-rule-style: inherit\n"); + break; + case CSS_COLUMN_RULE_STYLE_NONE: + wrote = snprintf(ptr, *len, "column-rule-style: none\n"); + break; + case CSS_COLUMN_RULE_STYLE_HIDDEN: + wrote = snprintf(ptr, *len, "column-rule-style: hidden\n"); + break; + case CSS_COLUMN_RULE_STYLE_DOTTED: + wrote = snprintf(ptr, *len, "column-rule-style: dotted\n"); + break; + case CSS_COLUMN_RULE_STYLE_DASHED: + wrote = snprintf(ptr, *len, "column-rule-style: dashed\n"); + break; + case CSS_COLUMN_RULE_STYLE_SOLID: + wrote = snprintf(ptr, *len, "column-rule-style: solid\n"); + break; + case CSS_COLUMN_RULE_STYLE_DOUBLE: + wrote = snprintf(ptr, *len, "column-rule-style: double\n"); + break; + case CSS_COLUMN_RULE_STYLE_GROOVE: + wrote = snprintf(ptr, *len, "column-rule-style: groove\n"); + break; + case CSS_COLUMN_RULE_STYLE_RIDGE: + wrote = snprintf(ptr, *len, "column-rule-style: ridge\n"); + break; + case CSS_COLUMN_RULE_STYLE_INSET: + wrote = snprintf(ptr, *len, "column-rule-style: inset\n"); + break; + case CSS_COLUMN_RULE_STYLE_OUTSET: + wrote = snprintf(ptr, *len, "column-rule-style: outset\n"); + break; + default: + wrote = 0; + break; + } + ptr += wrote; + *len -= wrote; + /* content */ val = css_computed_content(style, &content); switch (val) { -- cgit v1.2.3