From 838561f3dd9cbeade8362142847f1cd105ff2e9f Mon Sep 17 00:00:00 2001 From: Vitor Roriz Date: Fri, 16 Jun 2023 02:52:55 -0700 Subject: [PATCH] [css-counter-styles] cjk-earthly-branch and cjk-heavenly-stem should have 'fixed' system (258089) https://bugs.webkit.org/show_bug.cgi?id=258089 rdar://110796633 Reviewed by Tim Nguyen. According to spec, cjk-earthly-branch and cjk-heavenly-stem counter-styles should have 'fixed' system instead of 'alphabetic'. See w3c/csswg-drafts#8596 * LayoutTests/imported/w3c/web-platform-tests/css/css-counter-styles/cjk-earthly-branch/css3-counter-styles-202-expected.html: * LayoutTests/imported/w3c/web-platform-tests/css/css-counter-styles/cjk-earthly-branch/css3-counter-styles-202.html: * LayoutTests/imported/w3c/web-platform-tests/css/css-counter-styles/cjk-heavenly-stem/css3-counter-styles-205-expected.html: * LayoutTests/imported/w3c/web-platform-tests/css/css-counter-styles/cjk-heavenly-stem/css3-counter-styles-205.html: * Source/WebCore/css/counterStyles.css: (@counter-style cjk-earthly-branch): (@counter-style cjk-heavenly-stem): Canonical link: https://commits.webkit.org/265235@main --- .../css3-counter-styles-202-expected.html | 44 +++++++++--------- .../css3-counter-styles-202-ref.html | 44 +++++++++--------- .../css3-counter-styles-202.html | 44 +++++++++--------- .../css3-counter-styles-205-expected.html | 46 +++++++++---------- .../css3-counter-styles-205-ref.html | 46 +++++++++---------- .../css3-counter-styles-205.html | 46 +++++++++---------- Source/WebCore/css/counterStyles.css | 5 +- 7 files changed, 137 insertions(+), 138 deletions(-) diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-counter-styles/cjk-earthly-branch/css3-counter-styles-202-expected.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-counter-styles/cjk-earthly-branch/css3-counter-styles-202-expected.html index 52712e3fd07fb..e7abaad87e537 100644 --- a/LayoutTests/imported/w3c/web-platform-tests/css/css-counter-styles/cjk-earthly-branch/css3-counter-styles-202-expected.html +++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-counter-styles/cjk-earthly-branch/css3-counter-styles-202-expected.html @@ -10,33 +10,33 @@ ol li { list-style-type: cjk-earthly-branch; } /* the following CSS is not part of the test */ .test { font-size: 25px; } -ol { margin: 0; padding-left: 8em; } +ol { margin: 0; padding-left: 8em; line-height: 100%;}

Test passes if the two columns are the same, IGNORING the suffix.

-
    子子、子子
-
    子丑、子丑
-
    巳辰、巳辰
-
    巳未、巳未
-
    未寅、未寅
-
    未卯、未卯
-
    未辰、未辰
-
    子巳巳、子巳巳
-
    寅未亥、寅未亥
-
    巳戌寅、巳戌寅
-
    巳戌卯、巳戌卯
-
    巳戌申、巳戌申
-
    午卯卯、午卯卯
-
    午卯申、午卯申
-
    亥辰亥、亥辰亥
-
    亥酉亥、亥酉亥
-
    寅卯未申、寅卯未申
-
    寅亥午申、寅亥午申
-
    卯巳子亥、卯巳子亥
-
    卯巳午卯、卯巳午卯
-
    辰申辰寅、辰申辰寅
+
    13、13
+
    14、14
+
    77、77
+
    80、80
+
    99、99
+
    100、100
+
    101、101
+
    222、222
+
    540、540
+
    999、999
+
    1000、1000
+
    1005、1005
+
    1060、1060
+
    1065、1065
+
    1800、1800
+
    1860、1860
+
    5865、5865
+
    7005、7005
+
    7800、7800
+
    7864、7864
+
    9999、9999