aboutsummaryrefslogtreecommitdiffstats
path: root/tests/wpt/css-tests/css-writing-modes-3_dev/html
diff options
context:
space:
mode:
Diffstat (limited to 'tests/wpt/css-tests/css-writing-modes-3_dev/html')
-rw-r--r--tests/wpt/css-tests/css-writing-modes-3_dev/html/chapter-2.htm96
-rw-r--r--tests/wpt/css-tests/css-writing-modes-3_dev/html/chapter-3.htm78
-rw-r--r--tests/wpt/css-tests/css-writing-modes-3_dev/html/chapter-4.htm43
-rw-r--r--tests/wpt/css-tests/css-writing-modes-3_dev/html/chapter-5.htm48
-rw-r--r--tests/wpt/css-tests/css-writing-modes-3_dev/html/inline-block-alignment-007.htm7
-rw-r--r--tests/wpt/css-tests/css-writing-modes-3_dev/html/inline-block-alignment-009.htm61
-rw-r--r--tests/wpt/css-tests/css-writing-modes-3_dev/html/inline-block-alignment-orthogonal-vlr-003.htm2
-rw-r--r--tests/wpt/css-tests/css-writing-modes-3_dev/html/inline-block-alignment-orthogonal-vlr-005.htm2
-rw-r--r--tests/wpt/css-tests/css-writing-modes-3_dev/html/inline-block-alignment-orthogonal-vrl-002.htm2
-rw-r--r--tests/wpt/css-tests/css-writing-modes-3_dev/html/inline-block-alignment-orthogonal-vrl-004.htm2
-rw-r--r--tests/wpt/css-tests/css-writing-modes-3_dev/html/margin-vlr-003.htm2
-rw-r--r--tests/wpt/css-tests/css-writing-modes-3_dev/html/margin-vrl-002.htm2
-rw-r--r--tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/inline-block-alignment-007-ref.htm42
-rw-r--r--tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/inline-block-alignment-009-ref.htm42
-rw-r--r--tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/table-progression-001-ref.htm93
-rw-r--r--tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/text-baseline-007-ref.htm36
-rw-r--r--tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/text-indent-vlr-011-ref.htm2
-rw-r--r--tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/text-indent-vlr-013-ref.htm2
-rw-r--r--tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/text-indent-vrl-010-ref.htm2
-rw-r--r--tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/text-indent-vrl-012-ref.htm2
-rw-r--r--tests/wpt/css-tests/css-writing-modes-3_dev/html/reftest-toc.htm78
-rw-r--r--tests/wpt/css-tests/css-writing-modes-3_dev/html/reftest.list17
-rw-r--r--tests/wpt/css-tests/css-writing-modes-3_dev/html/table-progression-001-vlr.htm95
-rw-r--r--tests/wpt/css-tests/css-writing-modes-3_dev/html/table-progression-001-vrl.htm99
-rw-r--r--tests/wpt/css-tests/css-writing-modes-3_dev/html/table-progression-002-vlr.htm88
-rw-r--r--tests/wpt/css-tests/css-writing-modes-3_dev/html/table-progression-002-vrl.htm87
-rw-r--r--tests/wpt/css-tests/css-writing-modes-3_dev/html/table-progression-003-vlr.htm116
-rw-r--r--tests/wpt/css-tests/css-writing-modes-3_dev/html/table-progression-003-vrl.htm116
-rw-r--r--tests/wpt/css-tests/css-writing-modes-3_dev/html/table-progression-004-vlr.htm77
-rw-r--r--tests/wpt/css-tests/css-writing-modes-3_dev/html/table-progression-004-vrl.htm76
-rw-r--r--tests/wpt/css-tests/css-writing-modes-3_dev/html/text-baseline-007.htm5
-rw-r--r--tests/wpt/css-tests/css-writing-modes-3_dev/html/text-baseline-008.htm41
-rw-r--r--tests/wpt/css-tests/css-writing-modes-3_dev/html/text-baseline-009.htm41
-rw-r--r--tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vlr-003.htm2
-rw-r--r--tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vlr-005.htm2
-rw-r--r--tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vlr-007.htm2
-rw-r--r--tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vlr-009.htm2
-rw-r--r--tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vlr-011.htm2
-rw-r--r--tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vlr-013.htm2
-rw-r--r--tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vlr-015.htm2
-rw-r--r--tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vlr-017.htm2
-rw-r--r--tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vrl-002.htm2
-rw-r--r--tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vrl-004.htm2
-rw-r--r--tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vrl-006.htm2
-rw-r--r--tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vrl-008.htm2
-rw-r--r--tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vrl-010.htm2
-rw-r--r--tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vrl-012.htm2
-rw-r--r--tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vrl-014.htm2
-rw-r--r--tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vrl-016.htm2
-rw-r--r--tests/wpt/css-tests/css-writing-modes-3_dev/html/text-orientation-sideways-001.htm6
-rw-r--r--tests/wpt/css-tests/css-writing-modes-3_dev/html/text-orientation-sideways-right-001.htm6
-rw-r--r--tests/wpt/css-tests/css-writing-modes-3_dev/html/text-orientation-upright-001.htm6
-rw-r--r--tests/wpt/css-tests/css-writing-modes-3_dev/html/toc.htm8
53 files changed, 1005 insertions, 555 deletions
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/chapter-2.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/chapter-2.htm
index 1ae9aa42d12..646f4d4302b 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/chapter-2.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/chapter-2.htm
@@ -13,7 +13,7 @@
<body>
<h1>CSS Writing Modes Module Level 3 CR Test Suite</h1>
- <h2>Inline Direction and Bidirectionality (164 tests)</h2>
+ <h2>Inline Direction and Bidirectionality (172 tests)</h2>
<table width="100%">
<col id="test-column">
<col id="refs-column">
@@ -1102,7 +1102,7 @@
<tr><th colspan="4" scope="rowgroup">
<a href="#s2.1">+</a>
<a href="http://www.w3.org/TR/css-writing-modes-3/#direction">2.1 Specifying Directionality: the direction property</a></th></tr>
- <!-- 22 tests -->
+ <!-- 30 tests -->
<tr id="direction-001-2.1" class="primary">
<td><strong>
<a href="direction-001.htm">direction-001</a></strong></td>
@@ -1345,6 +1345,98 @@
</ul>
</td>
</tr>
+ <tr id="table-progression-001-vlr-2.1" class="">
+ <td>
+ <a href="table-progression-001-vlr.htm">table-progression-001-vlr</a></td>
+ <td><a href="table-progression-001-ref.orngtml">=</a> </td>
+ <td></td>
+ <td>vertical-lr Table Row/Rowgroup/Cell Ordering
+ <ul class="assert">
+ <li>This test checks that vertical-lr tables order rows/rowgroups left to right and cells top-to-bottom (LTR) or bottom-to-top (RTL) per 'direction'.</li>
+ <li>This test checks that 'writing-mode' and 'direction' do not apply to table rows and row groups.</li>
+ </ul>
+ </td>
+ </tr>
+ <tr id="table-progression-001-vrl-2.1" class="">
+ <td>
+ <a href="table-progression-001-vrl.htm">table-progression-001-vrl</a></td>
+ <td><a href="table-progression-001-ref.orngtml">=</a> </td>
+ <td></td>
+ <td>vertical-rl Table Row/Rowgroup/Cell Ordering
+ <ul class="assert">
+ <li>This test checks that vertical-rl tables order rows/rowgroups right to left and cells top-to-bottom (LTR) or bottom-to-top (RTL) per 'direction'.</li>
+ <li>This test checks that 'writing-mode' and 'direction' do not apply to table rows and row groups.</li>
+ </ul>
+ </td>
+ </tr>
+ <tr id="table-progression-002-vlr-2.1" class="">
+ <td>
+ <a href="table-progression-002-vlr.htm">table-progression-002-vlr</a></td>
+ <td><a href="table-progression-002-ref.orngtml">=</a> </td>
+ <td></td>
+ <td>vertical-lr Table Column/Colgroup Ordering
+ <ul class="assert">
+ <li>This test checks that vertical-lr tables order columns top-to-bottom (LTR) or bottom-to-top (RTL) per the table's 'direction'.</li>
+ <li>This test checks that 'writing-mode' and 'direction' do not apply to table columns and column groups.</li>
+ </ul>
+ </td>
+ </tr>
+ <tr id="table-progression-002-vrl-2.1" class="">
+ <td>
+ <a href="table-progression-002-vrl.htm">table-progression-002-vrl</a></td>
+ <td><a href="table-progression-002-ref.orngtml">=</a> </td>
+ <td></td>
+ <td>vertical-rl Table Column/Colgroup Ordering
+ <ul class="assert">
+ <li>This test checks that vertical-rl tables order columns top-to-bottom (LTR) or bottom-to-top (RTL) per the table's 'direction'.</li>
+ <li>This test checks that 'writing-mode' and 'direction' do not apply to table columns and column groups.</li>
+ </ul>
+ </td>
+ </tr>
+ <tr id="table-progression-003-vlr-2.1" class="">
+ <td>
+ <a href="table-progression-003-vlr.htm">table-progression-003-vlr</a></td>
+ <td><a href="table-progression-001-ref.orngtml">=</a> </td>
+ <td></td>
+ <td>vertical-lr upright orientation Table Row/Rowgroup/Cell Ordering
+ <ul class="assert">
+ <li>This test checks that vertical-lr tables, whether LTR or RTL, order rows/rowgroups right to left and cells top-to-bottom when text-orientation is upright.</li>
+ </ul>
+ </td>
+ </tr>
+ <tr id="table-progression-003-vrl-2.1" class="">
+ <td>
+ <a href="table-progression-003-vrl.htm">table-progression-003-vrl</a></td>
+ <td><a href="table-progression-001-ref.orngtml">=</a> </td>
+ <td></td>
+ <td>vertical-rl upright orientation Table Row/Rowgroup/Cell Ordering
+ <ul class="assert">
+ <li>This test checks that vertical-rl tables, whether LTR or RTL, order rows/rowgroups right to left and cells top-to-bottom when text-orientation is upright.</li>
+ </ul>
+ </td>
+ </tr>
+ <tr id="table-progression-004-vlr-2.1" class="">
+ <td>
+ <a href="table-progression-004-vlr.htm">table-progression-004-vlr</a></td>
+ <td><a href="table-progression-002-ref.orngtml">=</a> </td>
+ <td></td>
+ <td>vertical-lr upright orientation Table Column/Colgroup Ordering
+ <ul class="assert">
+ <li>This test checks that vertical-lr tables, whether LTR or RTL, order columns top-to-bottom when text-orientation is upright.</li>
+ </ul>
+ </td>
+ </tr>
+ <tr id="table-progression-004-vrl-2.1" class="">
+ <td>
+ <a href="table-progression-004-vrl.htm">table-progression-004-vrl</a></td>
+ <td><a href="table-progression-002-ref.orngtml">=</a> </td>
+ <td></td>
+ <td>vertical-rl upright orientation Table Column/Colgroup Ordering
+ <ul class="assert">
+ <li>This test checks that vertical-rl tables, whether LTR or RTL, order columns top-to-bottom when text-orientation is upright.</li>
+ </ul>
+ </td>
+ </tr>
</tbody>
<tbody id="s2.1.#propdef-direction">
<!-- 0 tests -->
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/chapter-3.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/chapter-3.htm
index 1d075dd77e5..c7270c347c5 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/chapter-3.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/chapter-3.htm
@@ -13,7 +13,7 @@
<body>
<h1>CSS Writing Modes Module Level 3 CR Test Suite</h1>
- <h2>Introduction to Vertical Text (84 tests)</h2>
+ <h2>Introduction to Vertical Text (90 tests)</h2>
<table width="100%">
<col id="test-column">
<col id="refs-column">
@@ -40,7 +40,7 @@
<tr><th colspan="4" scope="rowgroup">
<a href="#s3.1">+</a>
<a href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode">3.1 Block Flow Direction: the writing-mode property</a></th></tr>
- <!-- 68 tests -->
+ <!-- 74 tests -->
<tr id="block-flow-direction-001-3.1" class="primary ahem">
<td><strong>
<a href="block-flow-direction-001.htm">block-flow-direction-001</a></strong></td>
@@ -748,22 +748,92 @@
<tr id="table-progression-001-vlr-3.1" class="primary">
<td><strong>
<a href="table-progression-001-vlr.htm">table-progression-001-vlr</a></strong></td>
- <td><a href="reference/table-progression-001-ref.htm">=</a> </td>
+ <td><a href="table-progression-001-ref.orngtml">=</a> </td>
<td></td>
<td>vertical-lr Table Row/Rowgroup/Cell Ordering
<ul class="assert">
<li>This test checks that vertical-lr tables order rows/rowgroups left to right and cells top-to-bottom (LTR) or bottom-to-top (RTL) per 'direction'.</li>
+ <li>This test checks that 'writing-mode' and 'direction' do not apply to table rows and row groups.</li>
</ul>
</td>
</tr>
<tr id="table-progression-001-vrl-3.1" class="primary">
<td><strong>
<a href="table-progression-001-vrl.htm">table-progression-001-vrl</a></strong></td>
- <td><a href="reference/table-progression-001-ref.htm">=</a> </td>
+ <td><a href="table-progression-001-ref.orngtml">=</a> </td>
<td></td>
<td>vertical-rl Table Row/Rowgroup/Cell Ordering
<ul class="assert">
<li>This test checks that vertical-rl tables order rows/rowgroups right to left and cells top-to-bottom (LTR) or bottom-to-top (RTL) per 'direction'.</li>
+ <li>This test checks that 'writing-mode' and 'direction' do not apply to table rows and row groups.</li>
+ </ul>
+ </td>
+ </tr>
+ <tr id="table-progression-002-vlr-3.1" class="primary">
+ <td><strong>
+ <a href="table-progression-002-vlr.htm">table-progression-002-vlr</a></strong></td>
+ <td><a href="table-progression-002-ref.orngtml">=</a> </td>
+ <td></td>
+ <td>vertical-lr Table Column/Colgroup Ordering
+ <ul class="assert">
+ <li>This test checks that vertical-lr tables order columns top-to-bottom (LTR) or bottom-to-top (RTL) per the table's 'direction'.</li>
+ <li>This test checks that 'writing-mode' and 'direction' do not apply to table columns and column groups.</li>
+ </ul>
+ </td>
+ </tr>
+ <tr id="table-progression-002-vrl-3.1" class="primary">
+ <td><strong>
+ <a href="table-progression-002-vrl.htm">table-progression-002-vrl</a></strong></td>
+ <td><a href="table-progression-002-ref.orngtml">=</a> </td>
+ <td></td>
+ <td>vertical-rl Table Column/Colgroup Ordering
+ <ul class="assert">
+ <li>This test checks that vertical-rl tables order columns top-to-bottom (LTR) or bottom-to-top (RTL) per the table's 'direction'.</li>
+ <li>This test checks that 'writing-mode' and 'direction' do not apply to table columns and column groups.</li>
+ </ul>
+ </td>
+ </tr>
+ <tr id="table-progression-003-vlr-3.1" class="primary">
+ <td><strong>
+ <a href="table-progression-003-vlr.htm">table-progression-003-vlr</a></strong></td>
+ <td><a href="table-progression-001-ref.orngtml">=</a> </td>
+ <td></td>
+ <td>vertical-lr upright orientation Table Row/Rowgroup/Cell Ordering
+ <ul class="assert">
+ <li>This test checks that vertical-lr tables, whether LTR or RTL, order rows/rowgroups right to left and cells top-to-bottom when text-orientation is upright.</li>
+ </ul>
+ </td>
+ </tr>
+ <tr id="table-progression-003-vrl-3.1" class="primary">
+ <td><strong>
+ <a href="table-progression-003-vrl.htm">table-progression-003-vrl</a></strong></td>
+ <td><a href="table-progression-001-ref.orngtml">=</a> </td>
+ <td></td>
+ <td>vertical-rl upright orientation Table Row/Rowgroup/Cell Ordering
+ <ul class="assert">
+ <li>This test checks that vertical-rl tables, whether LTR or RTL, order rows/rowgroups right to left and cells top-to-bottom when text-orientation is upright.</li>
+ </ul>
+ </td>
+ </tr>
+ <tr id="table-progression-004-vlr-3.1" class="primary">
+ <td><strong>
+ <a href="table-progression-004-vlr.htm">table-progression-004-vlr</a></strong></td>
+ <td><a href="table-progression-002-ref.orngtml">=</a> </td>
+ <td></td>
+ <td>vertical-lr upright orientation Table Column/Colgroup Ordering
+ <ul class="assert">
+ <li>This test checks that vertical-lr tables, whether LTR or RTL, order columns top-to-bottom when text-orientation is upright.</li>
+ </ul>
+ </td>
+ </tr>
+ <tr id="table-progression-004-vrl-3.1" class="primary">
+ <td><strong>
+ <a href="table-progression-004-vrl.htm">table-progression-004-vrl</a></strong></td>
+ <td><a href="table-progression-002-ref.orngtml">=</a> </td>
+ <td></td>
+ <td>vertical-rl upright orientation Table Column/Colgroup Ordering
+ <ul class="assert">
+ <li>This test checks that vertical-rl tables, whether LTR or RTL, order columns top-to-bottom when text-orientation is upright.</li>
</ul>
</td>
</tr>
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/chapter-4.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/chapter-4.htm
index fda251efc08..d00797d9d08 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/chapter-4.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/chapter-4.htm
@@ -13,7 +13,7 @@
<body>
<h1>CSS Writing Modes Module Level 3 CR Test Suite</h1>
- <h2>Inline-level Alignment (34 tests)</h2>
+ <h2>Inline-level Alignment (31 tests)</h2>
<table width="100%">
<col id="test-column">
<col id="refs-column">
@@ -49,7 +49,7 @@
<tr><th colspan="4" scope="rowgroup">
<a href="#s4.2">+</a>
<a href="http://www.w3.org/TR/css-writing-modes-3/#text-baselines">4.2 Text Baselines</a></th></tr>
- <!-- 10 tests -->
+ <!-- 8 tests -->
<tr id="central-baseline-alignment-002-4.2" class="primary ahem">
<td><strong>
<a href="central-baseline-alignment-002.htm">central-baseline-alignment-002</a></strong></td>
@@ -130,33 +130,11 @@
<tr id="text-baseline-007-4.2" class="primary ahem">
<td><strong>
<a href="text-baseline-007.htm">text-baseline-007</a></strong></td>
- <td><a href="reference/text-baseline-007-ref.htm">=</a> </td>
- <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
- <td>text baseline alignment - alphabetical alignment with vertical layout
- <ul class="assert">
- <li>This test checks the generation of text baseline. When 'writing-mode' is 'vertical-lr' and when 'text-orientation' is 'sideways', then the alphabetical baseline is used as the dominant baseline.</li>
- </ul>
- </td>
- </tr>
- <tr id="text-baseline-008-4.2" class="primary ahem">
- <td><strong>
- <a href="text-baseline-008.htm">text-baseline-008</a></strong></td>
<td><a href="reference/text-baseline-006-ref.htm">=</a> </td>
<td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
<td>text baseline alignment - alphabetical alignment with vertical layout
<ul class="assert">
- <li>This test checks the generation of text baseline. When 'writing-mode' is 'vertical-rl' and when 'text-orientation' is 'sideways-right', then the alphabetical baseline is used as the dominant baseline.</li>
- </ul>
- </td>
- </tr>
- <tr id="text-baseline-009-4.2" class="primary ahem">
- <td><strong>
- <a href="text-baseline-009.htm">text-baseline-009</a></strong></td>
- <td><a href="reference/text-baseline-006-ref.htm">=</a> </td>
- <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
- <td>text baseline alignment - alphabetical alignment with vertical layout
- <ul class="assert">
- <li>This test checks the generation of text baseline. When 'writing-mode' is 'vertical-lr' and when 'text-orientation' is 'sideways-right', then the alphabetical baseline is used as the dominant baseline.</li>
+ <li>This test checks the generation of text baseline. When 'writing-mode' is 'vertical-lr' and when 'text-orientation' is 'sideways', then the alphabetical baseline is used as the dominant baseline.</li>
</ul>
</td>
</tr>
@@ -171,7 +149,7 @@
<tr><th colspan="4" scope="rowgroup">
<a href="#s4.3">+</a>
<a href="http://www.w3.org/TR/css-writing-modes-3/#replaced-baselines">4.3 Atomic Inline Baselines</a></th></tr>
- <!-- 24 tests -->
+ <!-- 23 tests -->
<tr id="baseline-inline-non-replaced-002-4.3" class="primary ahem">
<td><strong>
<a href="baseline-inline-non-replaced-002.htm">baseline-inline-non-replaced-002</a></strong></td>
@@ -296,7 +274,7 @@
<tr id="inline-block-alignment-007-4.3" class="primary ahem">
<td><strong>
<a href="inline-block-alignment-007.htm">inline-block-alignment-007</a></strong></td>
- <td><a href="reference/inline-block-alignment-007-ref.htm">=</a> </td>
+ <td><a href="reference/inline-block-alignment-006-ref.htm">=</a> </td>
<td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
<td>inline block alignment - alphabetical alignment with vertical layout
<ul class="assert">
@@ -315,17 +293,6 @@
</ul>
</td>
</tr>
- <tr id="inline-block-alignment-009-4.3" class="primary ahem">
- <td><strong>
- <a href="inline-block-alignment-009.htm">inline-block-alignment-009</a></strong></td>
- <td><a href="reference/inline-block-alignment-009-ref.htm">=</a> </td>
- <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
- <td>inline block alignment - alphabetical alignment with vertical layout
- <ul class="assert">
- <li>This test checks the generation of inline-block baseline. When 'writing-mode' is 'vertical-lr' and when 'text-orientation' is 'sideways-right', then the alphabetical baseline is used as the dominant baseline.</li>
- </ul>
- </td>
- </tr>
<tr id="inline-block-alignment-orthogonal-vlr-003-4.3" class="primary ahem">
<td><strong>
<a href="inline-block-alignment-orthogonal-vlr-003.htm">inline-block-alignment-orthogonal-vlr-003</a></strong></td>
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/chapter-5.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/chapter-5.htm
index 9d5d0150122..22f7e8c78b9 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/chapter-5.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/chapter-5.htm
@@ -13,7 +13,7 @@
<body>
<h1>CSS Writing Modes Module Level 3 CR Test Suite</h1>
- <h2>Introduction to Vertical Text Layout (25 tests)</h2>
+ <h2>Introduction to Vertical Text Layout (29 tests)</h2>
<table width="100%">
<col id="test-column">
<col id="refs-column">
@@ -55,7 +55,51 @@
<tr><th colspan="4" scope="rowgroup">
<a href="#s5.1">+</a>
<a href="http://www.w3.org/TR/css-writing-modes-3/#text-orientation">5.1 Orienting Text: the text-orientation property</a></th></tr>
- <!-- 25 tests -->
+ <!-- 29 tests -->
+ <tr id="table-progression-003-vlr-5.1" class="">
+ <td>
+ <a href="table-progression-003-vlr.htm">table-progression-003-vlr</a></td>
+ <td><a href="table-progression-001-ref.orngtml">=</a> </td>
+ <td></td>
+ <td>vertical-lr upright orientation Table Row/Rowgroup/Cell Ordering
+ <ul class="assert">
+ <li>This test checks that vertical-lr tables, whether LTR or RTL, order rows/rowgroups right to left and cells top-to-bottom when text-orientation is upright.</li>
+ </ul>
+ </td>
+ </tr>
+ <tr id="table-progression-003-vrl-5.1" class="">
+ <td>
+ <a href="table-progression-003-vrl.htm">table-progression-003-vrl</a></td>
+ <td><a href="table-progression-001-ref.orngtml">=</a> </td>
+ <td></td>
+ <td>vertical-rl upright orientation Table Row/Rowgroup/Cell Ordering
+ <ul class="assert">
+ <li>This test checks that vertical-rl tables, whether LTR or RTL, order rows/rowgroups right to left and cells top-to-bottom when text-orientation is upright.</li>
+ </ul>
+ </td>
+ </tr>
+ <tr id="table-progression-004-vlr-5.1" class="">
+ <td>
+ <a href="table-progression-004-vlr.htm">table-progression-004-vlr</a></td>
+ <td><a href="table-progression-002-ref.orngtml">=</a> </td>
+ <td></td>
+ <td>vertical-lr upright orientation Table Column/Colgroup Ordering
+ <ul class="assert">
+ <li>This test checks that vertical-lr tables, whether LTR or RTL, order columns top-to-bottom when text-orientation is upright.</li>
+ </ul>
+ </td>
+ </tr>
+ <tr id="table-progression-004-vrl-5.1" class="">
+ <td>
+ <a href="table-progression-004-vrl.htm">table-progression-004-vrl</a></td>
+ <td><a href="table-progression-002-ref.orngtml">=</a> </td>
+ <td></td>
+ <td>vertical-rl upright orientation Table Column/Colgroup Ordering
+ <ul class="assert">
+ <li>This test checks that vertical-rl tables, whether LTR or RTL, order columns top-to-bottom when text-orientation is upright.</li>
+ </ul>
+ </td>
+ </tr>
<tr id="text-orientation-010-5.1" class="primary ahem font">
<td><strong>
<a href="text-orientation-010.htm">text-orientation-010</a></strong></td>
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/inline-block-alignment-007.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/inline-block-alignment-007.htm
index f45eb1b0795..9e5074b06b3 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/inline-block-alignment-007.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/inline-block-alignment-007.htm
@@ -3,16 +3,15 @@
<head>
<title>CSS Writing Modes Test: inline block alignment - alphabetical alignment with vertical layout</title>
<link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
- <link rel="reviewer" title="Gerard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/"> <!-- 2015-07-21 -->
<link rel="help" title="CSS3 Writing modes: 4.3. Atomic Inline Baseline" href="http://www.w3.org/TR/css-writing-modes-3/#replaced-baselines">
<link rel="help" title="CSS2.1 9.2.2 Inline-level elements and inline boxes" href="http://www.w3.org/TR/CSS21/visuren.html#inline-boxes">
- <link rel="match" href="reference/inline-block-alignment-007-ref.htm">
+ <link rel="match" href="reference/inline-block-alignment-006-ref.htm">
<meta name="assert" content="This test checks the generation of inline-block baseline. When 'writing-mode' is 'vertical-lr' and when 'text-orientation' is 'sideways', then the alphabetical baseline is used as the dominant baseline.">
<meta name="flags" content="ahem">
<style type="text/css">
div#lr-sideways
{
- color: aqua;
+ color: fuchsia;
font: 60px/1 Ahem; /* computes to 60px/60px */
height: 4em;
writing-mode: vertical-lr;
@@ -50,7 +49,7 @@
<body>
- <p>Test passes if the <strong>right edge</strong> of an irregular polygon is straight and unbroken.</p>
+ <p>Test passes if the <strong>left edge</strong> of an irregular polygon is straight and unbroken.</p>
<div id="lr-sideways">É<div id="inline-block">
<span class="block-descendant">B</span>
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/inline-block-alignment-009.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/inline-block-alignment-009.htm
deleted file mode 100644
index cffdcdc9069..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/inline-block-alignment-009.htm
+++ /dev/null
@@ -1,61 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
- <head>
- <title>CSS Writing Modes Test: inline block alignment - alphabetical alignment with vertical layout</title>
- <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
- <link rel="reviewer" title="Gerard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/"> <!-- 2015-07-21 -->
- <link rel="help" title="CSS3 Writing modes: 4.3. Atomic Inline Baseline" href="http://www.w3.org/TR/css-writing-modes-3/#replaced-baselines">
- <link rel="help" title="CSS2.1 9.2.2 Inline-level elements and inline boxes" href="http://www.w3.org/TR/CSS21/visuren.html#inline-boxes">
- <link rel="match" href="reference/inline-block-alignment-009-ref.htm">
- <meta name="assert" content="This test checks the generation of inline-block baseline. When 'writing-mode' is 'vertical-lr' and when 'text-orientation' is 'sideways-right', then the alphabetical baseline is used as the dominant baseline.">
- <meta name="flags" content="ahem">
- <style type="text/css">
- div#lr-sideways-right
- {
- color: olive;
- font: 60px/1 Ahem; /* computes to 60px/60px */
- height: 4em;
- writing-mode: vertical-lr;
- text-orientation: sideways-right;
- }
-
- div#inline-block
- {
- display: inline-block;
- padding-left: 0.5em; /* computes to 60px */
- font-size: 2em; /* computes to 120px */
- /*
- such padding-left declaration is arbitrary and only serve to make the
- test a bit more challenging.
- */
- }
-
- span.block-descendant
- {
- display: block;
- }
-
- span#fuchsia30
- {
- padding-right: 4em; /* computes to 120px */
- font-size: 0.5em; /* computes to 30px */
- /*
- such padding-right declaration is arbitrary and only serve to make the
- test a bit more challenging.
- */
- }
- </style>
-
- </head>
-
- <body>
-
- <p>Test passes if the <strong>right edge</strong> of an irregular polygon is straight and unbroken.</p>
-
- <div id="lr-sideways-right">p<div id="inline-block">
- <span class="block-descendant">B</span>
- <span class="block-descendant last-line-box">p</span>
- </div><span id="fuchsia30">p</span></div>
-
- </body>
-</html> \ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/inline-block-alignment-orthogonal-vlr-003.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/inline-block-alignment-orthogonal-vlr-003.htm
index b1b6b2c2560..30f48d3d5a5 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/inline-block-alignment-orthogonal-vlr-003.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/inline-block-alignment-orthogonal-vlr-003.htm
@@ -13,7 +13,7 @@
div#horiz-tb
{
color: orange;
- font: 3.75em/1 Ahem; /* computes to 60px/60px */
+ font: 60px/1 Ahem; /* computes to 60px/60px */
writing-mode: horizontal-tb;
}
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/inline-block-alignment-orthogonal-vlr-005.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/inline-block-alignment-orthogonal-vlr-005.htm
index 973d908a8c8..21c5ca0a086 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/inline-block-alignment-orthogonal-vlr-005.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/inline-block-alignment-orthogonal-vlr-005.htm
@@ -13,7 +13,7 @@
div#horiz-tb
{
color: orange;
- font: 3.75em/1 Ahem; /* computes to 60px/60px */
+ font: 60px/1 Ahem; /* computes to 60px/60px */
writing-mode: horizontal-tb;
}
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/inline-block-alignment-orthogonal-vrl-002.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/inline-block-alignment-orthogonal-vrl-002.htm
index 19c9b26196d..8118a02f544 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/inline-block-alignment-orthogonal-vrl-002.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/inline-block-alignment-orthogonal-vrl-002.htm
@@ -13,7 +13,7 @@
div#horiz-tb
{
color: orange;
- font: 3.75em/1 Ahem; /* computes to 60px/60px */
+ font: 60px/1 Ahem; /* computes to 60px/60px */
writing-mode: horizontal-tb;
}
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/inline-block-alignment-orthogonal-vrl-004.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/inline-block-alignment-orthogonal-vrl-004.htm
index 79bb6b009be..437c57765c1 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/inline-block-alignment-orthogonal-vrl-004.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/inline-block-alignment-orthogonal-vrl-004.htm
@@ -13,7 +13,7 @@
div#horiz-tb
{
color: orange;
- font: 3.75em/1 Ahem; /* computes to 60px/60px */
+ font: 60px/1 Ahem; /* computes to 60px/60px */
writing-mode: horizontal-tb;
}
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/margin-vlr-003.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/margin-vlr-003.htm
index 27e7a08945d..e807b9c0646 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/margin-vlr-003.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/margin-vlr-003.htm
@@ -35,7 +35,7 @@
.inner
{
background-color: yellow;
- height: 50px; /* necessary, otherwise inner blocks must grow as tall as the height of viewport */
+ height: 50px;
width: 50px;
}
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/margin-vrl-002.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/margin-vrl-002.htm
index ab525cca860..dd630b02430 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/margin-vrl-002.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/margin-vrl-002.htm
@@ -35,7 +35,7 @@
.inner
{
background-color: yellow;
- height: 50px; /* necessary, otherwise inner blocks must grow as tall as the height of viewport */
+ height: 50px;
width: 50px;
}
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/inline-block-alignment-007-ref.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/inline-block-alignment-007-ref.htm
deleted file mode 100644
index dc08df26fba..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/inline-block-alignment-007-ref.htm
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
- <title>CSS Reftest Reference</title>
- <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
- <link rel="reviewer" title="Gerard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/"> <!-- 2015-07-21 -->
- <meta name="flags" content="image">
- <style type="text/css">
- img
- {
- vertical-align: top;
- }
-
- img
- {
- padding-left: 228px; /* 60 px (padding-left) + 120px (first line-block width) + 48px (the position difference of box) */
- }
-
- img + br + img
- {
- padding-left: 60px; /* 60 px (padding-left) */
- }
-
- img + br + img + br + img
- {
- padding-left: 252px; /* 60 px (padding-left) + 120px (first line-block width) + 72px (the position difference of box) */
- }
- </style>
-
- </head>
-
- <body>
-
- <p>Test passes if the <strong>right edge</strong> of an irregular polygon is straight and unbroken.</p>
-
- <div>
- <img src="support/swatch-aqua.png" width="48" height="60" alt="Image download support must be enabled"><br><!--
- --><img src="support/swatch-aqua.png" width="216" height="120" alt="Image download support must be enabled"><br><!--
- --><img src="support/swatch-aqua.png" width="24" height="30" alt="Image download support must be enabled">
- </div>
- </body>
-</html> \ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/inline-block-alignment-009-ref.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/inline-block-alignment-009-ref.htm
deleted file mode 100644
index 9594ecd1e81..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/inline-block-alignment-009-ref.htm
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
- <title>CSS Reftest Reference</title>
- <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
- <link rel="reviewer" title="Gerard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/"> <!-- 2015-07-21 -->
- <meta name="flags" content="image">
- <style type="text/css">
- img
- {
- vertical-align: top;
- }
-
- img
- {
- padding-left: 192px; /* 60 px (padding-left) + 120px (width of inline-block) + 12px (the position difference of box) */
- }
-
- img + br + img
- {
- padding-left: 60px; /* 60 px (padding-left) */
- }
-
- img + br + img + br + img
- {
- padding-left: 198px; /* 60 px (padding-left) + 120px (width of inline-block)+ 18px (the position difference of box) */
- }
- </style>
-
- </head>
-
- <body>
-
- <p>Test passes if the <strong>right edge</strong> of an irregular polygon is straight and unbroken.</p>
-
- <div>
- <img src="support/swatch-olive.png" width="12" height="60" alt="Image download support must be enabled"><br><!--
- --><img src="support/swatch-olive.png" width="144" height="120" alt="Image download support must be enabled"><br><!--
- --><img src="support/swatch-olive.png" width="6" height="30" alt="Image download support must be enabled">
- </div>
- </body>
-</html> \ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/table-progression-001-ref.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/table-progression-001-ref.htm
deleted file mode 100644
index 4994d5558e0..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/table-progression-001-ref.htm
+++ /dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE html>
-<html><head><title>CSS Reference</title>
-<link href="http://fantasai.inkedblade.net/contact" rel="author" title="Elika J. Etemad">
-
-<style>
- table {
- border-spacing: 0;
- margin: 1em;
- }
- td {
- width: 1em;
- height: 1em;
- border: solid gray;
- }
-
- .a { background: navy}
- .b { background: blue }
- .c { background: aqua }
- .d { background: teal }
- .e { background: purple }
- .f { background: fuchsia }
- .g { background: yellow }
- .h { background: orange }
- caption { background: green; }
-</style>
-
-</head><body><p>Test passes if the following three tables look identical.
-
-</p><table>
- <caption></caption>
- <tbody><tr>
- <td rowspan="2">
- </td><td class="h">
- </td><td colspan="3">
- </td><td class="a">
- </td></tr><tr>
- <td rowspan="3">
- </td><td class="g">
- </td><td class="f">
- </td><td rowspan="2">
- </td><td class="b">
- </td></tr><tr>
- <td class="c">
- </td><td colspan="2" rowspan="2">
- </td><td rowspan="2">
- </td></tr><tr>
- <td class="d">
- </td><td class="e">
-</td></tr></tbody></table>
-
-<table>
- <tbody><tr>
- <td rowspan="2">
- </td><td class="h">
- </td><td colspan="3">
- </td><td class="a">
- </td></tr><tr>
- <td rowspan="3">
- </td><td class="g">
- </td><td class="f">
- </td><td rowspan="2">
- </td><td class="b">
- </td></tr><tr>
- <td class="c">
- </td><td colspan="2" rowspan="2">
- </td><td rowspan="2">
- </td></tr><tr>
- <td class="d">
- </td><td class="e">
-</td></tr></tbody></table>
-
-<table>
- <tbody><tr>
- <td rowspan="2">
- </td><td class="h">
- </td><td colspan="3">
- </td><td class="a">
- </td></tr><tr>
- <td rowspan="3">
- </td><td class="g">
- </td><td class="f">
- </td><td rowspan="2">
- </td><td class="b">
- </td></tr><tr>
- <td class="c">
- </td><td colspan="2" rowspan="2">
- </td><td rowspan="2">
- </td></tr><tr>
- <td class="d">
- </td><td class="e">
-</td></tr></tbody></table>
-
-</body></html> \ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/text-baseline-007-ref.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/text-baseline-007-ref.htm
deleted file mode 100644
index b42b57f39b7..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/text-baseline-007-ref.htm
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
- <title>CSS Reftest Reference</title>
- <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
- <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/"> <!-- 2015-01-29 -->
- <meta name="flags" content="image">
- <style type="text/css">
-
- img
- {
- padding-left: 78px;
- vertical-align: top;
- }
-
- img + br + img
- {
- padding-left: 30px;
- }
-
- img + br + img + br + img
- {
- padding-left: 102px;
- }
- </style>
-
- </head>
-
- <body>
-
- <p>Test passes if the <strong>right edge</strong> of an irregular polygon is straight and unbroken.</p>
-
- <div><img src="support/swatch-fuchsia.png" width="48" height="60" alt="Image download support must be enabled"><br><img src="support/swatch-fuchsia.png" width="96" height="120" alt="Image download support must be enabled"><br><img src="support/swatch-fuchsia.png" width="24" height="30" alt="Image download support must be enabled"></div>
-
- </body>
-</html> \ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/text-indent-vlr-011-ref.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/text-indent-vlr-011-ref.htm
index be0eed3f423..0bcdea00fab 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/text-indent-vlr-011-ref.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/text-indent-vlr-011-ref.htm
@@ -12,7 +12,7 @@
<style type="text/css">
div
{
- margin-left: 0.5em;
+ margin-left: 8px;
}
img
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/text-indent-vlr-013-ref.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/text-indent-vlr-013-ref.htm
index 74c0a031e75..b256c60a80d 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/text-indent-vlr-013-ref.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/text-indent-vlr-013-ref.htm
@@ -12,7 +12,7 @@
<style type="text/css">
div
{
- margin-left: 0.5em;
+ margin-left: 8px;
}
img
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/text-indent-vrl-010-ref.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/text-indent-vrl-010-ref.htm
index 99b941a6293..797c2b9e541 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/text-indent-vrl-010-ref.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/text-indent-vrl-010-ref.htm
@@ -17,7 +17,7 @@
div
{
- margin-right: 0.5em;
+ margin-right: 8px;
}
img
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/text-indent-vrl-012-ref.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/text-indent-vrl-012-ref.htm
index 7280ce0e6f9..1ed2c0fffbc 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/text-indent-vrl-012-ref.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/reference/text-indent-vrl-012-ref.htm
@@ -17,7 +17,7 @@
div
{
- margin-right: 0.5em;
+ margin-right: 8px;
}
img
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/reftest-toc.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/reftest-toc.htm
index 9d7d14e3e4c..79145f6ec3d 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/reftest-toc.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/reftest-toc.htm
@@ -4428,7 +4428,7 @@
<tr>
<td rowspan="1" title="inline block alignment - alphabetical alignment with vertical layout">
<a href="inline-block-alignment-007.htm">inline-block-alignment-007</a></td>
- <td><a href="reference/inline-block-alignment-007-ref.htm">=</a> </td>
+ <td><a href="reference/inline-block-alignment-006-ref.htm">=</a> </td>
<td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
</tr>
</tbody>
@@ -4440,14 +4440,6 @@
<td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
</tr>
</tbody>
- <tbody id="inline-block-alignment-009" class="ahem">
- <tr>
- <td rowspan="1" title="inline block alignment - alphabetical alignment with vertical layout">
- <a href="inline-block-alignment-009.htm">inline-block-alignment-009</a></td>
- <td><a href="reference/inline-block-alignment-009-ref.htm">=</a> </td>
- <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
- </tr>
- </tbody>
<tbody id="inline-block-alignment-orthogonal-vlr-003" class="ahem">
<tr>
<td rowspan="1" title="text baseline alignment of inline-block in orthogonal flow">
@@ -5068,7 +5060,7 @@
<tr>
<td rowspan="1" title="vertical-lr Table Row/Rowgroup/Cell Ordering">
<a href="table-progression-001-vlr.htm">table-progression-001-vlr</a></td>
- <td><a href="reference/table-progression-001-ref.htm">=</a> </td>
+ <td><a href="table-progression-001-ref.orngtml">=</a> </td>
<td rowspan="1"></td>
</tr>
</tbody>
@@ -5076,7 +5068,55 @@
<tr>
<td rowspan="1" title="vertical-rl Table Row/Rowgroup/Cell Ordering">
<a href="table-progression-001-vrl.htm">table-progression-001-vrl</a></td>
- <td><a href="reference/table-progression-001-ref.htm">=</a> </td>
+ <td><a href="table-progression-001-ref.orngtml">=</a> </td>
+ <td rowspan="1"></td>
+ </tr>
+ </tbody>
+ <tbody id="table-progression-002-vlr" class="">
+ <tr>
+ <td rowspan="1" title="vertical-lr Table Column/Colgroup Ordering">
+ <a href="table-progression-002-vlr.htm">table-progression-002-vlr</a></td>
+ <td><a href="table-progression-002-ref.orngtml">=</a> </td>
+ <td rowspan="1"></td>
+ </tr>
+ </tbody>
+ <tbody id="table-progression-002-vrl" class="">
+ <tr>
+ <td rowspan="1" title="vertical-rl Table Column/Colgroup Ordering">
+ <a href="table-progression-002-vrl.htm">table-progression-002-vrl</a></td>
+ <td><a href="table-progression-002-ref.orngtml">=</a> </td>
+ <td rowspan="1"></td>
+ </tr>
+ </tbody>
+ <tbody id="table-progression-003-vlr" class="">
+ <tr>
+ <td rowspan="1" title="vertical-lr upright orientation Table Row/Rowgroup/Cell Ordering">
+ <a href="table-progression-003-vlr.htm">table-progression-003-vlr</a></td>
+ <td><a href="table-progression-001-ref.orngtml">=</a> </td>
+ <td rowspan="1"></td>
+ </tr>
+ </tbody>
+ <tbody id="table-progression-003-vrl" class="">
+ <tr>
+ <td rowspan="1" title="vertical-rl upright orientation Table Row/Rowgroup/Cell Ordering">
+ <a href="table-progression-003-vrl.htm">table-progression-003-vrl</a></td>
+ <td><a href="table-progression-001-ref.orngtml">=</a> </td>
+ <td rowspan="1"></td>
+ </tr>
+ </tbody>
+ <tbody id="table-progression-004-vlr" class="">
+ <tr>
+ <td rowspan="1" title="vertical-lr upright orientation Table Column/Colgroup Ordering">
+ <a href="table-progression-004-vlr.htm">table-progression-004-vlr</a></td>
+ <td><a href="table-progression-002-ref.orngtml">=</a> </td>
+ <td rowspan="1"></td>
+ </tr>
+ </tbody>
+ <tbody id="table-progression-004-vrl" class="">
+ <tr>
+ <td rowspan="1" title="vertical-rl upright orientation Table Column/Colgroup Ordering">
+ <a href="table-progression-004-vrl.htm">table-progression-004-vrl</a></td>
+ <td><a href="table-progression-002-ref.orngtml">=</a> </td>
<td rowspan="1"></td>
</tr>
</tbody>
@@ -5268,22 +5308,6 @@
<tr>
<td rowspan="1" title="text baseline alignment - alphabetical alignment with vertical layout">
<a href="text-baseline-007.htm">text-baseline-007</a></td>
- <td><a href="reference/text-baseline-007-ref.htm">=</a> </td>
- <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
- </tr>
- </tbody>
- <tbody id="text-baseline-008" class="ahem">
- <tr>
- <td rowspan="1" title="text baseline alignment - alphabetical alignment with vertical layout">
- <a href="text-baseline-008.htm">text-baseline-008</a></td>
- <td><a href="reference/text-baseline-006-ref.htm">=</a> </td>
- <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
- </tr>
- </tbody>
- <tbody id="text-baseline-009" class="ahem">
- <tr>
- <td rowspan="1" title="text baseline alignment - alphabetical alignment with vertical layout">
- <a href="text-baseline-009.htm">text-baseline-009</a></td>
<td><a href="reference/text-baseline-006-ref.htm">=</a> </td>
<td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
</tr>
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/reftest.list b/tests/wpt/css-tests/css-writing-modes-3_dev/html/reftest.list
index 43e15319ad1..b1c829a3227 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/reftest.list
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/reftest.list
@@ -549,9 +549,8 @@ inline-block-alignment-003.htm == reference/inline-block-alignment-003-ref.htm
inline-block-alignment-004.htm == reference/inline-block-alignment-002-ref.htm
inline-block-alignment-005.htm == reference/inline-block-alignment-003-ref.htm
inline-block-alignment-006.htm == reference/inline-block-alignment-006-ref.htm
-inline-block-alignment-007.htm == reference/inline-block-alignment-007-ref.htm
+inline-block-alignment-007.htm == reference/inline-block-alignment-006-ref.htm
inline-block-alignment-008.htm == reference/inline-block-alignment-006-ref.htm
-inline-block-alignment-009.htm == reference/inline-block-alignment-009-ref.htm
inline-block-alignment-orthogonal-vlr-003.htm == reference/inline-block-alignment-orthogonal-vrl-002-ref.htm
inline-block-alignment-orthogonal-vlr-005.htm == reference/inline-block-alignment-orthogonal-vrl-002-ref.htm
inline-block-alignment-orthogonal-vrl-002.htm == reference/inline-block-alignment-orthogonal-vrl-002-ref.htm
@@ -629,8 +628,14 @@ table-column-order-002.htm == reference/block-flow-direction-001-ref.htm
table-column-order-003.htm == reference/block-flow-direction-001-ref.htm
table-column-order-004.htm == reference/block-flow-direction-001-ref.htm
table-column-order-005.htm == reference/block-flow-direction-001-ref.htm
-table-progression-001-vlr.htm == reference/table-progression-001-ref.htm
-table-progression-001-vrl.htm == reference/table-progression-001-ref.htm
+table-progression-001-vlr.htm == table-progression-001-ref.orngtml
+table-progression-001-vrl.htm == table-progression-001-ref.orngtml
+table-progression-002-vlr.htm == table-progression-002-ref.orngtml
+table-progression-002-vrl.htm == table-progression-002-ref.orngtml
+table-progression-003-vlr.htm == table-progression-001-ref.orngtml
+table-progression-003-vrl.htm == table-progression-001-ref.orngtml
+table-progression-004-vlr.htm == table-progression-002-ref.orngtml
+table-progression-004-vrl.htm == table-progression-002-ref.orngtml
text-align-vlr-003.htm == reference/ref-filled-green-100px-square.htm
text-align-vlr-005.htm == reference/ref-filled-green-100px-square.htm
text-align-vlr-007.htm == reference/ref-filled-green-100px-square.htm
@@ -654,9 +659,7 @@ text-baseline-003.htm == reference/text-baseline-002-ref.htm
text-baseline-004.htm == reference/text-baseline-002-ref.htm
text-baseline-005.htm == reference/text-baseline-002-ref.htm
text-baseline-006.htm == reference/text-baseline-006-ref.htm
-text-baseline-007.htm == reference/text-baseline-007-ref.htm
-text-baseline-008.htm == reference/text-baseline-006-ref.htm
-text-baseline-009.htm == reference/text-baseline-006-ref.htm
+text-baseline-007.htm == reference/text-baseline-006-ref.htm
text-combine-upright-decorations-001.htm == reference/text-combine-upright-decorations-001.htm
text-combine-upright-inherit-all-001.htm == reference/text-combine-upright-inherit-all-001.htm
text-combine-upright-inherit-all-002.htm == reference/text-combine-upright-inherit-all-002.htm
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/table-progression-001-vlr.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/table-progression-001-vlr.htm
index d79b08674c8..286634c4298 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/table-progression-001-vlr.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/table-progression-001-vlr.htm
@@ -1,14 +1,19 @@
<!DOCTYPE html>
<html><head><title>CSS Test: vertical-lr Table Row/Rowgroup/Cell Ordering</title>
<link href="http://fantasai.inkedblade.net/contact" rel="author" title="Elika J. Etemad">
-<link href="reference/table-progression-001-ref.htm" rel="match">
+<link href="table-progression-001-ref.orngtml" rel="match">
<meta content="This test checks that vertical-lr tables order rows/rowgroups left to right and cells top-to-bottom (LTR) or bottom-to-top (RTL) per 'direction'." name="assert">
+<meta content="This test checks that 'writing-mode' and 'direction' do not apply to table rows and row groups." name="assert">
<link href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" rel="help">
+<link href="http://www.w3.org/TR/css-writing-modes-3/#direction" rel="help">
<style>
.test {
writing-mode: vertical-lr;
}
+ [dir=rtl] {
+ direction: rtl;
+ }
table {
border-spacing: 0;
@@ -20,14 +25,33 @@
border: solid gray;
}
- .a { background: navy}
- .b { background: blue }
- .c { background: aqua }
- .d { background: teal }
- .e { background: purple }
- .f { background: fuchsia }
- .g { background: yellow }
- .h { background: orange }
+ .navy { background: navy}
+ .blue { background: blue }
+ .aqua { background: aqua }
+ .teal { background: teal }
+ .purp { background: purple }
+ .pink { background: fuchsia }
+ .yllw { background: yellow }
+ .orng { background: orange }
+
+
+ /* These rules must have no effect. */
+ .test thead,
+ .test tfoot,
+ .test tbody,
+ .test tr,
+ .test td {
+ writing-mode: horizontal-tb; /* For UAs not supporting vertical-rl */
+ writing-mode: vertical-rl;
+ direction: rtl;
+ }
+ .test[dir=rtl] thead,
+ .test[dir=rtl] tfoot,
+ .test[dir=rtl] tbody,
+ .test[dir=rtl] tr,
+ .test[dir=rtl] td {
+ direction: ltr;
+ }
</style>
</head><body><p>Test passes if the following three tables look identical.
@@ -35,54 +59,54 @@
</p><table class="test">
<thead>
<tr>
- <td colspan="2">
- </td><td class="c">
- </td><td class="d">
+ <td colspan="2">
+ </td><td class="aqua">
+ </td><td class="teal">
</td></tr></thead><tfoot>
<tr>
- <td class="a">
- </td><td class="b">
+ <td class="navy">
+ </td><td class="blue">
</td><td colspan="2">
</td></tr></tfoot><tbody>
<tr>
- <td class="h">
+ <td class="orng">
</td><td colspan="3">
</td></tr></tbody><tbody>
<tr>
<td rowspan="3">
- </td><td class="g">
+ </td><td class="yllw">
</td><td colspan="2" rowspan="2">
</td></tr><tr>
- <td class="f">
+ <td class="pink">
</td></tr><tr>
<td colspan="2">
- </td><td class="e">
+ </td><td class="purp">
</td></tr></tbody></table>
<table class="test" dir="rtl">
<thead>
<tr>
- <td class="d">
- </td><td class="c">
- </td><td colspan="2">
+ <td class="teal">
+ </td><td class="aqua">
+ </td><td colspan="2">
</td></tr></thead><tfoot>
<tr>
<td colspan="2">
- </td><td class="b">
- </td><td class="a">
+ </td><td class="blue">
+ </td><td class="navy">
</td></tr></tfoot><tbody>
<tr>
<td colspan="3">
- </td><td class="h">
+ </td><td class="orng">
</td></tr></tbody><tbody>
<tr>
<td colspan="2" rowspan="2">
- </td><td class="g">
+ </td><td class="yllw">
</td><td rowspan="3">
</td></tr><tr>
- <td class="f">
+ <td class="pink">
</td></tr><tr>
- <td class="e">
+ <td class="purp">
</td><td colspan="2">
</td></tr></tbody></table>
@@ -90,22 +114,23 @@
<table class="reference">
<tbody><tr>
<td rowspan="2">
- </td><td class="h">
+ </td><td class="orng">
</td><td colspan="3">
- </td><td class="a">
+ </td><td class="navy">
+
</td></tr><tr>
<td rowspan="3">
- </td><td class="g">
- </td><td class="f">
+ </td><td class="yllw">
+ </td><td class="pink">
</td><td rowspan="2">
- </td><td class="b">
+ </td><td class="blue">
</td></tr><tr>
- <td class="c">
+ <td class="aqua">
</td><td colspan="2" rowspan="2">
</td><td rowspan="2">
</td></tr><tr>
- <td class="d">
- </td><td class="e">
+ <td class="teal">
+ </td><td class="purp">
</td></tr></tbody></table>
</body></html> \ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/table-progression-001-vrl.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/table-progression-001-vrl.htm
index d63847f1725..5436493a59b 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/table-progression-001-vrl.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/table-progression-001-vrl.htm
@@ -1,14 +1,19 @@
<!DOCTYPE html>
<html><head><title>CSS Test: vertical-rl Table Row/Rowgroup/Cell Ordering</title>
<link href="http://fantasai.inkedblade.net/contact" rel="author" title="Elika J. Etemad">
-<link href="reference/table-progression-001-ref.htm" rel="match">
+<link href="table-progression-001-ref.orngtml" rel="match">
<meta content="This test checks that vertical-rl tables order rows/rowgroups right to left and cells top-to-bottom (LTR) or bottom-to-top (RTL) per 'direction'." name="assert">
+<meta content="This test checks that 'writing-mode' and 'direction' do not apply to table rows and row groups." name="assert">
<link href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" rel="help">
+<link href="http://www.w3.org/TR/css-writing-modes-3/#direction" rel="help">
<style>
.test {
writing-mode: vertical-rl;
}
+ [dir=rtl] {
+ direction: rtl;
+ }
table {
border-spacing: 0;
@@ -20,14 +25,32 @@
border: solid gray;
}
- .a { background: navy}
- .b { background: blue }
- .c { background: aqua }
- .d { background: teal }
- .e { background: purple }
- .f { background: fuchsia }
- .g { background: yellow }
- .h { background: orange }
+ .navy { background: navy}
+ .blue { background: blue }
+ .aqua { background: aqua }
+ .teal { background: teal }
+ .purp { background: purple }
+ .pink { background: fuchsia }
+ .yllw { background: yellow }
+ .orng { background: orange }
+
+ /* These rules must have no effect. */
+ .test thead,
+ .test tfoot,
+ .test tbody,
+ .test tr,
+ .test td {
+ writing-mode: horizontal-tb; /* For UAs not supporting vertical-rl */
+ writing-mode: vertical-lr;
+ direction: rtl;
+ }
+ .test[dir=rtl] thead,
+ .test[dir=rtl] tfoot,
+ .test[dir=rtl] tbody,
+ .test[dir=rtl] tr,
+ .test[dir=rtl] td {
+ direction: ltr;
+ }
</style>
</head><body><p>Test passes if the following three tables look identical.
@@ -35,27 +58,27 @@
</p><table class="test">
<thead>
<tr>
- <td class="a">
- </td><td class="b">
+ <td class="navy">
+ </td><td class="blue">
</td><td colspan="2">
</td></tr></thead><tfoot>
<tr>
- <td colspan="2">
- </td><td class="c">
- </td><td class="d">
+ <td colspan="2">
+ </td><td class="aqua">
+ </td><td class="teal">
</td></tr></tfoot><tbody>
<tr>
<td rowspan="3">
</td><td colspan="2">
- </td><td class="e">
+ </td><td class="purp">
</td></tr><tr>
- <td class="f">
+ <td class="pink">
</td><td colspan="2" rowspan="2">
</td></tr><tr>
- <td class="g">
+ <td class="yllw">
</td></tr></tbody><tbody>
<tr>
- <td class="h">
+ <td class="orng">
</td><td colspan="3">
</td></tr></tbody></table>
@@ -63,48 +86,48 @@
<thead>
<tr>
<td colspan="2">
- </td><td class="b">
- </td><td class="a">
+ </td><td class="blue">
+ </td><td class="navy">
</td></tr></thead><tfoot>
<tr>
- <td class="d">
- </td><td class="c">
- </td><td colspan="2">
+ <td class="teal">
+ </td><td class="aqua">
+ </td><td colspan="2">
</td></tr></tfoot><tbody>
<tr>
- <td class="e">
+ <td class="purp">
</td><td colspan="2">
</td><td rowspan="3">
</td></tr><tr>
<td colspan="2" rowspan="2">
- </td><td class="f">
+ </td><td class="pink">
</td></tr><tr>
- <td class="g">
+ <td class="yllw">
</td></tr></tbody><tbody>
<tr>
<td colspan="3">
- </td><td class="h">
+ </td><td class="orng">
</td></tr></tbody></table>
<table class="reference">
<tbody><tr>
<td rowspan="2">
- </td><td class="h">
- </td><td colspan="3">
- </td><td class="a">
+ </td><td class="orng">
+ </td><td colspan='3"'>
+ </td><td class="navy">
</td></tr><tr>
- <td rowspan="3">
- </td><td class="g">
- </td><td class="f">
- </td><td rowspan="2">
- </td><td class="b">
+ <td rowspan='3"'>
+ </td><td class="yllw">
+ </td><td class="pink">
+ </td><td rowspan='2"'>
+ </td><td class="blue">
</td></tr><tr>
- <td class="c">
+ <td class="aqua">
</td><td colspan="2" rowspan="2">
</td><td rowspan="2">
</td></tr><tr>
- <td class="d">
- </td><td class="e">
+ <td class="teal">
+ </td><td class="purp">
</td></tr></tbody></table>
</body></html> \ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/table-progression-002-vlr.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/table-progression-002-vlr.htm
new file mode 100644
index 00000000000..eae0564cefa
--- /dev/null
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/table-progression-002-vlr.htm
@@ -0,0 +1,88 @@
+<!DOCTYPE html>
+<html><head><title>CSS Test: vertical-lr Table Column/Colgroup Ordering</title>
+<link href="http://fantasai.inkedblade.net/contact" rel="author" title="Elika J. Etemad">
+<link href="table-progression-002-ref.orngtml" rel="match">
+<meta content="This test checks that vertical-lr tables order columns top-to-bottom (LTR) or bottom-to-top (RTL) per the table's 'direction'." name="assert">
+<meta content="This test checks that 'writing-mode' and 'direction' do not apply to table columns and column groups." name="assert">
+<link href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" rel="help">
+<link href="http://www.w3.org/TR/css-writing-modes-3/#direction" rel="help">
+
+<style>
+ .test {
+ writing-mode: vertical-lr;
+ }
+ [dir=rtl] {
+ direction: rtl;
+ }
+
+
+ table {
+ border-spacing: 0;
+ border: solid gray;
+ margin: 1em;
+ float: left;
+ }
+ td {
+ width: 1em;
+ height: 1em;
+ }
+
+ .navy { background: navy}
+ .blue { background: blue }
+ .aqua { background: aqua }
+ .teal { background: teal }
+
+ /* These declarations must have no effect. */
+ .test col,
+ .test colgroup {
+ writing-mode: horizontal-tb;
+ writing-mode: vertical-rl;
+ direction: rtl;
+ }
+ .test[dir=rtl] col,
+ .test[dir=rtl] colgroup {
+ direction: ltr;
+ }
+</style>
+
+</head><body><p>Test passes if the following patterned boxes all look identical.
+
+</p><table class="test">
+ <colgroup><col span="2" class="navy">
+ <col class="blue">
+ <col span="2" class="aqua">
+ </colgroup><tbody><tr><td></td><td></td><td></td><td></td><td>
+</td></tr></tbody></table>
+<table class="test">
+ <colgroup span="2" class="navy"></colgroup>
+ <colgroup>
+ <col class="blue">
+ <col span="2" class="aqua">
+ </colgroup>
+ <tbody><tr><td></td><td></td><td></td><td></td><td>
+</td></tr></tbody></table>
+
+<table class="test" dir="rtl">
+ <colgroup><col span="2" class="aqua">
+ <col class="blue">
+ <col span="2" class="navy">
+ </colgroup><tbody><tr><td></td><td></td><td></td><td></td><td>
+</td></tr></tbody></table>
+<table class="test" dir="rtl">
+ <colgroup span="2" class="aqua"></colgroup>
+ <colgroup>
+ <col class="blue">
+ <col span="2" class="navy">
+ </colgroup>
+ <tbody><tr><td></td><td></td><td></td><td></td><td>
+</td></tr></tbody></table>
+
+<table class="reference">
+ <tbody><tr><td class="navy">
+ </td></tr><tr><td class="navy">
+ </td></tr><tr><td class="blue">
+ </td></tr><tr><td class="aqua">
+ </td></tr><tr><td class="aqua">
+</td></tr></tbody></table>
+
+</body></html> \ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/table-progression-002-vrl.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/table-progression-002-vrl.htm
new file mode 100644
index 00000000000..fb17937b16e
--- /dev/null
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/table-progression-002-vrl.htm
@@ -0,0 +1,87 @@
+<!DOCTYPE html>
+<html><head><title>CSS Test: vertical-rl Table Column/Colgroup Ordering</title>
+<link href="http://fantasai.inkedblade.net/contact" rel="author" title="Elika J. Etemad">
+<link href="table-progression-002-ref.orngtml" rel="match">
+<meta content="This test checks that vertical-rl tables order columns top-to-bottom (LTR) or bottom-to-top (RTL) per the table's 'direction'." name="assert">
+<meta content="This test checks that 'writing-mode' and 'direction' do not apply to table columns and column groups." name="assert">
+<link href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" rel="help">
+<link href="http://www.w3.org/TR/css-writing-modes-3/#direction" rel="help">
+
+<style>
+ .test {
+ writing-mode: vertical-rl;
+ }
+ [dir=rtl] {
+ direction: rtl;
+ }
+
+ table {
+ border-spacing: 0;
+ border: solid gray;
+ margin: 1em;
+ float: left;
+ }
+ td {
+ width: 1em;
+ height: 1em;
+ }
+
+ .navy { background: navy}
+ .blue { background: blue }
+ .aqua { background: aqua }
+ .teal { background: teal }
+
+ /* These declarations must have no effect. */
+ .test col,
+ .test colgroup {
+ writing-mode: horizontal-tb;
+ writing-mode: vertical-lr;
+ direction: rtl;
+ }
+ .test[dir=rtl] col,
+ .test[dir=rtl] colgroup {
+ direction: ltr;
+ }
+</style>
+
+</head><body><p>Test passes if the following patterned boxes all look identical.
+
+</p><table class="test">
+ <colgroup><col span="2" class="navy">
+ <col class="blue">
+ <col span="2" class="aqua">
+ </colgroup><tbody><tr><td></td><td></td><td></td><td></td><td>
+</td></tr></tbody></table>
+<table class="test">
+ <colgroup span="2" class="navy"></colgroup>
+ <colgroup>
+ <col class="blue">
+ <col span="2" class="aqua">
+ </colgroup>
+ <tbody><tr><td></td><td></td><td></td><td></td><td>
+</td></tr></tbody></table>
+
+<table class="test" dir="rtl">
+ <colgroup><col span="2" class="aqua">
+ <col class="blue">
+ <col span="2" class="navy">
+ </colgroup><tbody><tr><td></td><td></td><td></td><td></td><td>
+</td></tr></tbody></table>
+<table class="test" dir="rtl">
+ <colgroup span="2" class="aqua"></colgroup>
+ <colgroup>
+ <col class="blue">
+ <col span="2" class="navy">
+ </colgroup>
+ <tbody><tr><td></td><td></td><td></td><td></td><td>
+</td></tr></tbody></table>
+
+<table class="reference">
+ <tbody><tr><td class="navy">
+ </td></tr><tr><td class="navy">
+ </td></tr><tr><td class="blue">
+ </td></tr><tr><td class="aqua">
+ </td></tr><tr><td class="aqua">
+</td></tr></tbody></table>
+
+</body></html> \ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/table-progression-003-vlr.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/table-progression-003-vlr.htm
new file mode 100644
index 00000000000..420efd0e0c3
--- /dev/null
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/table-progression-003-vlr.htm
@@ -0,0 +1,116 @@
+<!DOCTYPE html>
+<html><head><title>CSS Test: vertical-lr upright orientation Table Row/Rowgroup/Cell Ordering</title>
+<link href="http://fantasai.inkedblade.net/contact" rel="author" title="Elika J. Etemad">
+<link href="table-progression-001-ref.orngtml" rel="match">
+<meta content="This test checks that vertical-lr tables, whether LTR or RTL, order rows/rowgroups right to left and cells top-to-bottom when text-orientation is upright." name="assert">
+<link href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" rel="help">
+<link href="http://www.w3.org/TR/css-writing-modes-3/#direction" rel="help">
+<link href="http://www.w3.org/TR/css-writing-modes-3/#text-orientation" rel="help">
+
+<style>
+ .test {
+ writing-mode: vertical-lr;
+ text-orientation: upright;
+ }
+ [dir=rtl] {
+ direction: rtl;
+ }
+
+ table {
+ border-spacing: 0;
+ margin: 1em;
+ }
+ td {
+ width: 1em;
+ height: 1em;
+ border: solid gray;
+ }
+
+ .navy { background: navy}
+ .blue { background: blue }
+ .aqua { background: aqua }
+ .teal { background: teal }
+ .purp { background: purple }
+ .pink { background: fuchsia }
+ .yllw { background: yellow }
+ .orng { background: orange }
+</style>
+
+</head><body><p>Test passes if the following three tables look identical.
+
+</p><table class="test">
+ <thead>
+ <tr>
+ <td colspan="2">
+ </td><td class="aqua">
+ </td><td class="teal">
+ </td></tr></thead><tfoot>
+ <tr>
+ <td class="navy">
+ </td><td class="blue">
+ </td><td colspan="2">
+ </td></tr></tfoot><tbody>
+ <tr>
+ <td class="orng">
+ </td><td colspan="3">
+ </td></tr></tbody><tbody>
+ <tr>
+ <td rowspan="3">
+ </td><td class="yllw">
+ </td><td colspan="2" rowspan="2">
+ </td></tr><tr>
+ <td class="pink">
+ </td></tr><tr>
+ <td colspan="2">
+ </td><td class="purp">
+</td></tr></tbody></table>
+
+<table class="test">
+ <thead>
+ <tr>
+ <td colspan="2">
+ </td><td class="aqua">
+ </td><td class="teal">
+ </td></tr></thead><tfoot>
+ <tr>
+ <td class="navy">
+ </td><td class="blue">
+ </td><td colspan="2">
+ </td></tr></tfoot><tbody>
+ <tr>
+ <td class="orng">
+ </td><td colspan="3">
+ </td></tr></tbody><tbody>
+ <tr>
+ <td rowspan="3">
+ </td><td class="yllw">
+ </td><td colspan="2" rowspan="2">
+ </td></tr><tr>
+ <td class="pink">
+ </td></tr><tr>
+ <td colspan="2">
+ </td><td class="purp">
+</td></tr></tbody></table>
+
+<table class="reference">
+ <tbody><tr>
+ <td rowspan="2">
+ </td><td class="orng">
+ </td><td colspan='3"'>
+ </td><td class="navy">
+ </td></tr><tr>
+ <td rowspan='3"'>
+ </td><td class="yllw">
+ </td><td class="pink">
+ </td><td rowspan='2"'>
+ </td><td class="blue">
+ </td></tr><tr>
+ <td class="aqua">
+ </td><td colspan="2" rowspan="2">
+ </td><td rowspan="2">
+ </td></tr><tr>
+ <td class="teal">
+ </td><td class="purp">
+</td></tr></tbody></table>
+
+</body></html> \ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/table-progression-003-vrl.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/table-progression-003-vrl.htm
new file mode 100644
index 00000000000..91a04dc6b02
--- /dev/null
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/table-progression-003-vrl.htm
@@ -0,0 +1,116 @@
+<!DOCTYPE html>
+<html><head><title>CSS Test: vertical-rl upright orientation Table Row/Rowgroup/Cell Ordering</title>
+<link href="http://fantasai.inkedblade.net/contact" rel="author" title="Elika J. Etemad">
+<link href="table-progression-001-ref.orngtml" rel="match">
+<meta content="This test checks that vertical-rl tables, whether LTR or RTL, order rows/rowgroups right to left and cells top-to-bottom when text-orientation is upright." name="assert">
+<link href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" rel="help">
+<link href="http://www.w3.org/TR/css-writing-modes-3/#direction" rel="help">
+<link href="http://www.w3.org/TR/css-writing-modes-3/#text-orientation" rel="help">
+
+<style>
+ .test {
+ writing-mode: vertical-rl;
+ text-orientation: upright;
+ }
+ [dir=rtl] {
+ direction: rtl;
+ }
+
+ table {
+ border-spacing: 0;
+ margin: 1em;
+ }
+ td {
+ width: 1em;
+ height: 1em;
+ border: solid gray;
+ }
+
+ .navy { background: navy}
+ .blue { background: blue }
+ .aqua { background: aqua }
+ .teal { background: teal }
+ .purp { background: purple }
+ .pink { background: fuchsia }
+ .yllw { background: yellow }
+ .orng { background: orange }
+</style>
+
+</head><body><p>Test passes if the following three tables look identical.
+
+</p><table class="test">
+ <thead>
+ <tr>
+ <td class="navy">
+ </td><td class="blue">
+ </td><td colspan="2">
+ </td></tr></thead><tfoot>
+ <tr>
+ <td colspan="2">
+ </td><td class="aqua">
+ </td><td class="teal">
+ </td></tr></tfoot><tbody>
+ <tr>
+ <td rowspan="3">
+ </td><td colspan="2">
+ </td><td class="purp">
+ </td></tr><tr>
+ <td class="pink">
+ </td><td colspan="2" rowspan="2">
+ </td></tr><tr>
+ <td class="yllw">
+ </td></tr></tbody><tbody>
+ <tr>
+ <td class="orng">
+ </td><td colspan="3">
+</td></tr></tbody></table>
+
+<table class="test">
+ <thead>
+ <tr>
+ <td class="navy">
+ </td><td class="blue">
+ </td><td colspan="2">
+ </td></tr></thead><tfoot>
+ <tr>
+ <td colspan="2">
+ </td><td class="aqua">
+ </td><td class="teal">
+ </td></tr></tfoot><tbody>
+ <tr>
+ <td rowspan="3">
+ </td><td colspan="2">
+ </td><td class="purp">
+ </td></tr><tr>
+ <td class="pink">
+ </td><td colspan="2" rowspan="2">
+ </td></tr><tr>
+ <td class="yllw">
+ </td></tr></tbody><tbody>
+ <tr>
+ <td class="orng">
+ </td><td colspan="3">
+</td></tr></tbody></table>
+
+<table class="reference">
+ <tbody><tr>
+ <td rowspan="2">
+ </td><td class="orng">
+ </td><td colspan='3"'>
+ </td><td class="navy">
+ </td></tr><tr>
+ <td rowspan='3"'>
+ </td><td class="yllw">
+ </td><td class="pink">
+ </td><td rowspan='2"'>
+ </td><td class="blue">
+ </td></tr><tr>
+ <td class="aqua">
+ </td><td colspan="2" rowspan="2">
+ </td><td rowspan="2">
+ </td></tr><tr>
+ <td class="teal">
+ </td><td class="purp">
+</td></tr></tbody></table>
+
+</body></html> \ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/table-progression-004-vlr.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/table-progression-004-vlr.htm
new file mode 100644
index 00000000000..938c9df8290
--- /dev/null
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/table-progression-004-vlr.htm
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<html><head><title>CSS Test: vertical-lr upright orientation Table Column/Colgroup Ordering</title>
+<link href="http://fantasai.inkedblade.net/contact" rel="author" title="Elika J. Etemad">
+<link href="table-progression-002-ref.orngtml" rel="match">
+<meta content="This test checks that vertical-lr tables, whether LTR or RTL, order columns top-to-bottom when text-orientation is upright." name="assert">
+<link href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" rel="help">
+<link href="http://www.w3.org/TR/css-writing-modes-3/#direction" rel="help">
+<link href="http://www.w3.org/TR/css-writing-modes-3/#text-orientation" rel="help">
+
+<style>
+ .test {
+ writing-mode: vertical-lr;
+ text-orientation: upright;
+ }
+ [dir=rtl] {
+ direction: rtl;
+ }
+
+
+ table {
+ border-spacing: 0;
+ border: solid gray;
+ margin: 1em;
+ float: left;
+ }
+ td {
+ width: 1em;
+ height: 1em;
+ }
+
+ .navy { background: navy}
+ .blue { background: blue }
+ .aqua { background: aqua }
+ .teal { background: teal }
+</style>
+
+</head><body><p>Test passes if the following patterned boxes all look identical.
+
+</p><table class="test">
+ <colgroup><col span="2" class="navy">
+ <col class="blue">
+ <col span="2" class="aqua">
+ </colgroup><tbody><tr><td></td><td></td><td></td><td></td><td>
+</td></tr></tbody></table>
+<table class="test">
+ <colgroup span="2" class="navy"></colgroup>
+ <colgroup>
+ <col class="blue">
+ <col span="2" class="aqua">
+ </colgroup>
+ <tbody><tr><td></td><td></td><td></td><td></td><td>
+</td></tr></tbody></table>
+
+<table class="test" dir="rtl">
+ <colgroup><col span="2" class="navy">
+ <col class="blue">
+ <col span="2" class="aqua">
+ </colgroup><tbody><tr><td></td><td></td><td></td><td></td><td>
+</td></tr></tbody></table>
+<table class="test" dir="rtl">
+ <colgroup span="2" class="navy"></colgroup>
+ <colgroup>
+ <col class="blue">
+ <col span="2" class="aqua">
+ </colgroup>
+ <tbody><tr><td></td><td></td><td></td><td></td><td>
+</td></tr></tbody></table>
+
+<table class="reference">
+ <tbody><tr><td class="navy">
+ </td></tr><tr><td class="navy">
+ </td></tr><tr><td class="blue">
+ </td></tr><tr><td class="aqua">
+ </td></tr><tr><td class="aqua">
+</td></tr></tbody></table>
+
+</body></html> \ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/table-progression-004-vrl.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/table-progression-004-vrl.htm
new file mode 100644
index 00000000000..b0883cda34c
--- /dev/null
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/table-progression-004-vrl.htm
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<html><head><title>CSS Test: vertical-rl upright orientation Table Column/Colgroup Ordering</title>
+<link href="http://fantasai.inkedblade.net/contact" rel="author" title="Elika J. Etemad">
+<link href="table-progression-002-ref.orngtml" rel="match">
+<meta content="This test checks that vertical-rl tables, whether LTR or RTL, order columns top-to-bottom when text-orientation is upright." name="assert">
+<link href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" rel="help">
+<link href="http://www.w3.org/TR/css-writing-modes-3/#direction" rel="help">
+<link href="http://www.w3.org/TR/css-writing-modes-3/#text-orientation" rel="help">
+
+<style>
+ .test {
+ writing-mode: vertical-rl;
+ text-orientation: upright;
+ }
+ [dir=rtl] {
+ direction: rtl;
+ }
+
+ table {
+ border-spacing: 0;
+ border: solid gray;
+ margin: 1em;
+ float: left;
+ }
+ td {
+ width: 1em;
+ height: 1em;
+ }
+
+ .navy { background: navy}
+ .blue { background: blue }
+ .aqua { background: aqua }
+ .teal { background: teal }
+</style>
+
+</head><body><p>Test passes if the following patterned boxes all look identical.
+
+</p><table class="test">
+ <colgroup><col span="2" class="navy">
+ <col class="blue">
+ <col span="2" class="aqua">
+ </colgroup><tbody><tr><td></td><td></td><td></td><td></td><td>
+</td></tr></tbody></table>
+<table class="test">
+ <colgroup span="2" class="navy"></colgroup>
+ <colgroup>
+ <col class="blue">
+ <col span="2" class="aqua">
+ </colgroup>
+ <tbody><tr><td></td><td></td><td></td><td></td><td>
+</td></tr></tbody></table>
+
+<table class="test" dir="rtl">
+ <colgroup><col span="2" class="navy">
+ <col class="blue">
+ <col span="2" class="aqua">
+ </colgroup><tbody><tr><td></td><td></td><td></td><td></td><td>
+</td></tr></tbody></table>
+<table class="test" dir="rtl">
+ <colgroup span="2" class="navy"></colgroup>
+ <colgroup>
+ <col class="blue">
+ <col span="2" class="aqua">
+ </colgroup>
+ <tbody><tr><td></td><td></td><td></td><td></td><td>
+</td></tr></tbody></table>
+
+<table class="reference">
+ <tbody><tr><td class="navy">
+ </td></tr><tr><td class="navy">
+ </td></tr><tr><td class="blue">
+ </td></tr><tr><td class="aqua">
+ </td></tr><tr><td class="aqua">
+</td></tr></tbody></table>
+
+</body></html> \ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-baseline-007.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-baseline-007.htm
index e04abe62648..7cb111ae647 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-baseline-007.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-baseline-007.htm
@@ -3,9 +3,8 @@
<head>
<title>CSS Writing Modes Test: text baseline alignment - alphabetical alignment with vertical layout</title>
<link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
- <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/"> <!-- 2015-02-20 -->
<link rel="help" title="4.2. Text Baseline" href="http://www.w3.org/TR/css-writing-modes-3/#text-baselines">
- <link rel="match" href="reference/text-baseline-007-ref.htm">
+ <link rel="match" href="reference/text-baseline-006-ref.htm">
<meta name="assert" content="This test checks the generation of text baseline. When 'writing-mode' is 'vertical-lr' and when 'text-orientation' is 'sideways', then the alphabetical baseline is used as the dominant baseline.">
<meta name="flags" content="ahem">
<style type="text/css">
@@ -33,7 +32,7 @@
<body>
- <p>Test passes if the <strong>right edge</strong> of an irregular polygon is straight and unbroken.</p>
+ <p>Test passes if the <strong>left edge</strong> of an irregular polygon is straight and unbroken.</p>
<div id="lr-sideways">É<span id="fuchsia120">É</span><span id="fuchsia30">É</span></div>
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-baseline-008.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-baseline-008.htm
deleted file mode 100644
index 0c605903d6a..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-baseline-008.htm
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
- <head>
- <title>CSS Writing Modes Test: text baseline alignment - alphabetical alignment with vertical layout</title>
- <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
- <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/"> <!-- 2015-02-20 -->
- <link rel="help" title="4.2. Text Baseline" href="http://www.w3.org/TR/css-writing-modes-3/#text-baselines">
- <link rel="match" href="reference/text-baseline-006-ref.htm">
- <meta name="assert" content="This test checks the generation of text baseline. When 'writing-mode' is 'vertical-rl' and when 'text-orientation' is 'sideways-right', then the alphabetical baseline is used as the dominant baseline.">
- <meta name="flags" content="ahem">
- <style type="text/css">
- div#rl-sideways-right
- {
- color: fuchsia;
- font: 60px/1.5 Ahem; /* computes to 60px/90px */
- height: 4em;
- writing-mode: vertical-rl;
- text-orientation: sideways-right;
- }
-
- span#fuchsia120
- {
- font-size: 2em; /* computes to 120px */
- }
-
- span#fuchsia30
- {
- font-size: 0.5em; /* computes to 30px */
- }
- </style>
-
- </head>
-
- <body>
-
- <p>Test passes if the <strong>left edge</strong> of an irregular polygon is straight and unbroken.</p>
-
- <div id="rl-sideways-right">É<span id="fuchsia120">É</span><span id="fuchsia30">É</span></div>
-
- </body>
-</html> \ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-baseline-009.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-baseline-009.htm
deleted file mode 100644
index 6f5f46ff824..00000000000
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-baseline-009.htm
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
- <head>
- <title>CSS Writing Modes Test: text baseline alignment - alphabetical alignment with vertical layout</title>
- <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com">
- <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/"> <!-- 2015-02-20 -->
- <link rel="help" title="4.2. Text Baseline" href="http://www.w3.org/TR/css-writing-modes-3/#text-baselines">
- <link rel="match" href="reference/text-baseline-006-ref.htm">
- <meta name="assert" content="This test checks the generation of text baseline. When 'writing-mode' is 'vertical-lr' and when 'text-orientation' is 'sideways-right', then the alphabetical baseline is used as the dominant baseline.">
- <meta name="flags" content="ahem">
- <style type="text/css">
- div#lr-sideways-right
- {
- color: fuchsia;
- font: 60px/1.5 Ahem; /* computes to 60px/90px */
- height: 4em;
- writing-mode: vertical-lr;
- text-orientation: sideways-right;
- }
-
- span#fuchsia120
- {
- font-size: 2em; /* computes to 120px */
- }
-
- span#fuchsia30
- {
- font-size: 0.5em; /* computes to 30px */
- }
- </style>
-
- </head>
-
- <body>
-
- <p>Test passes if the <strong>left edge</strong> of an irregular polygon is straight and unbroken.</p>
-
- <div id="lr-sideways-right">É<span id="fuchsia120">É</span><span id="fuchsia30">É</span></div>
-
- </body>
-</html> \ No newline at end of file
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vlr-003.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vlr-003.htm
index 3c7231cbda9..2991cb80d12 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vlr-003.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vlr-003.htm
@@ -16,7 +16,7 @@
div
{
color: green;
- font: 5em/1 Ahem; /* computes to 80px/80px */
+ font: 80px/1 Ahem; /* computes to 80px/80px */
height: 320px;
width: 320px;
}
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vlr-005.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vlr-005.htm
index fead1289e5d..ac46822c9dc 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vlr-005.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vlr-005.htm
@@ -16,7 +16,7 @@
div
{
color: green;
- font: 5em/1 Ahem; /* computes to 80px/80px */
+ font: 80px/1 Ahem; /* computes to 80px/80px */
height: 320px;
width: 320px;
}
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vlr-007.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vlr-007.htm
index 877bf002f1d..489ca0c15cd 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vlr-007.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vlr-007.htm
@@ -16,7 +16,7 @@
div#containing-block
{
color: green;
- font: 5em/1 Ahem; /* computes to 80px/80px */
+ font: 80px/1 Ahem; /* computes to 80px/80px */
height: 320px;
width: 160px;
}
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vlr-009.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vlr-009.htm
index 76d668ca11b..0f5c087f262 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vlr-009.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vlr-009.htm
@@ -16,7 +16,7 @@
div#containing-block
{
color: green;
- font: 5em/1 Ahem; /* computes to 80px/80px */
+ font: 80px/1 Ahem; /* computes to 80px/80px */
height: 320px;
width: 160px;
}
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vlr-011.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vlr-011.htm
index 00d141d5d36..6d91e8e9b24 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vlr-011.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vlr-011.htm
@@ -21,7 +21,7 @@
div
{
color: green;
- font: 5em/1 Ahem; /* computes to 80px/80px */
+ font: 80px/1 Ahem; /* computes to 80px/80px */
height: 320px;
width: 320px;
}
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vlr-013.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vlr-013.htm
index 6fae8001592..0f2fa4c50b1 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vlr-013.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vlr-013.htm
@@ -21,7 +21,7 @@
div
{
color: green;
- font: 5em/1 Ahem; /* computes to 80px/80px */
+ font: 80px/1 Ahem; /* computes to 80px/80px */
height: 320px;
width: 320px;
}
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vlr-015.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vlr-015.htm
index a5a456c00c4..16855c1b659 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vlr-015.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vlr-015.htm
@@ -21,7 +21,7 @@
div#containing-block
{
color: green;
- font: 5em/1 Ahem; /* computes to 80px/80px */
+ font: 80px/1 Ahem; /* computes to 80px/80px */
height: 320px;
width: 160px;
}
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vlr-017.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vlr-017.htm
index 48f88cd6d2e..20857115be5 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vlr-017.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vlr-017.htm
@@ -21,7 +21,7 @@
div#containing-block
{
color: green;
- font: 5em/1 Ahem; /* computes to 80px/80px */
+ font: 80px/1 Ahem; /* computes to 80px/80px */
height: 320px;
width: 160px;
}
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vrl-002.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vrl-002.htm
index b66deb50efb..f37f01d68bf 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vrl-002.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vrl-002.htm
@@ -17,7 +17,7 @@
div
{
color: green;
- font: 5em/1 Ahem; /* computes to 80px/80px */
+ font: 80px/1 Ahem; /* computes to 80px/80px */
height: 320px;
width: 320px;
}
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vrl-004.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vrl-004.htm
index ba88300a6d9..83c2fdb27e8 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vrl-004.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vrl-004.htm
@@ -16,7 +16,7 @@
div
{
color: green;
- font: 5em/1 Ahem; /* computes to 80px/80px */
+ font: 80px/1 Ahem; /* computes to 80px/80px */
height: 320px;
width: 320px;
}
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vrl-006.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vrl-006.htm
index d7e4303ca38..d57edbe5de6 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vrl-006.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vrl-006.htm
@@ -16,7 +16,7 @@
div#containing-block
{
color: green;
- font: 5em/1 Ahem; /* computes to 80px/80px */
+ font: 80px/1 Ahem; /* computes to 80px/80px */
height: 320px;
width: 160px;
}
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vrl-008.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vrl-008.htm
index a1b2fcd3dbd..3ac8dad7d54 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vrl-008.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vrl-008.htm
@@ -16,7 +16,7 @@
div#containing-block
{
color: green;
- font: 5em/1 Ahem; /* computes to 80px/80px */
+ font: 80px/1 Ahem; /* computes to 80px/80px */
height: 320px;
width: 160px;
}
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vrl-010.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vrl-010.htm
index c8676fe7fd2..11ef9df3127 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vrl-010.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vrl-010.htm
@@ -21,7 +21,7 @@
div
{
color: green;
- font: 5em/1 Ahem; /* computes to 80px/80px */
+ font: 80px/1 Ahem; /* computes to 80px/80px */
height: 320px;
width: 320px;
}
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vrl-012.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vrl-012.htm
index 9e850ebcf9e..d3ed8e89443 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vrl-012.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vrl-012.htm
@@ -21,7 +21,7 @@
div
{
color: green;
- font: 5em/1 Ahem; /* computes to 80px/80px */
+ font: 80px/1 Ahem; /* computes to 80px/80px */
height: 320px;
width: 320px;
}
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vrl-014.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vrl-014.htm
index 916c4e74f5f..bbe8ba32c46 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vrl-014.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vrl-014.htm
@@ -21,7 +21,7 @@
div#containing-block
{
color: green;
- font: 5em/1 Ahem; /* computes to 80px/80px */
+ font: 80px/1 Ahem; /* computes to 80px/80px */
height: 320px;
width: 160px;
}
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vrl-016.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vrl-016.htm
index cf4f9607146..94c848fb11b 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vrl-016.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-indent-vrl-016.htm
@@ -21,7 +21,7 @@
div#containing-block
{
color: green;
- font: 5em/1 Ahem; /* computes to 80px/80px */
+ font: 80px/1 Ahem; /* computes to 80px/80px */
height: 320px;
width: 160px;
}
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-orientation-sideways-001.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-orientation-sideways-001.htm
index 08deeae9066..f123bd894c4 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-orientation-sideways-001.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-orientation-sideways-001.htm
@@ -19,10 +19,10 @@
float: left;
color: blue;
font-family: "DejaVuSerifBook";
- font-size: 1.875em; /* equivalent to 30px */
+ font-size: 30px;
line-height: 1.4; /* equivalent to 42px:
- so that top-half-leading is 6px
- and bottom-half-leading is 6px */
+ so that top-half-leading outside content is 6px
+ and bottom-half-leading outside content is 6px */
margin: 10px;
}
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-orientation-sideways-right-001.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-orientation-sideways-right-001.htm
index 2aafcd859c2..de6fdbc81f5 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-orientation-sideways-right-001.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-orientation-sideways-right-001.htm
@@ -19,10 +19,10 @@
float: left;
color: blue;
font-family: "DejaVuSerifBook";
- font-size: 1.875em; /* equivalent to 30px */
+ font-size: 30px;
line-height: 1.4; /* equivalent to 42px:
- so that top-half-leading is 6px
- and bottom-half-leading is 6px */
+ so that top-half-leading outside content is 6px
+ and bottom-half-leading outside content is 6px */
margin: 10px;
}
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-orientation-upright-001.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-orientation-upright-001.htm
index fc18532e24f..0c1b1d382c4 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-orientation-upright-001.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/text-orientation-upright-001.htm
@@ -19,10 +19,10 @@
float: left;
color: blue;
font-family: "DejaVuSerifBook";
- font-size: 1.875em; /* equivalent to 30px */
+ font-size: 30px;
line-height: 1.4; /* equivalent to 42px:
- so that top-half-leading is 6px
- and bottom-half-leading is 6px */
+ so that top-half-leading outside content is 6px
+ and bottom-half-leading outside content is 6px */
margin: 10px;
}
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/html/toc.htm b/tests/wpt/css-tests/css-writing-modes-3_dev/html/toc.htm
index 9062d9da066..b94b7693089 100644
--- a/tests/wpt/css-tests/css-writing-modes-3_dev/html/toc.htm
+++ b/tests/wpt/css-tests/css-writing-modes-3_dev/html/toc.htm
@@ -27,22 +27,22 @@
<tbody id="s2">
<tr><th><a href="chapter-2.htm">Chapter 2 -
Inline Direction and Bidirectionality</a></th>
- <td>(164 Tests)</td></tr>
+ <td>(172 Tests)</td></tr>
</tbody>
<tbody id="s3">
<tr><th><a href="chapter-3.htm">Chapter 3 -
Introduction to Vertical Text</a></th>
- <td>(84 Tests)</td></tr>
+ <td>(90 Tests)</td></tr>
</tbody>
<tbody id="s4">
<tr><th><a href="chapter-4.htm">Chapter 4 -
Inline-level Alignment</a></th>
- <td>(34 Tests)</td></tr>
+ <td>(31 Tests)</td></tr>
</tbody>
<tbody id="s5">
<tr><th><a href="chapter-5.htm">Chapter 5 -
Introduction to Vertical Text Layout</a></th>
- <td>(25 Tests)</td></tr>
+ <td>(29 Tests)</td></tr>
</tbody>
<tbody id="s6">
<tr><th><a href="chapter-6.htm">Chapter 6 -