diff options
Diffstat (limited to 'tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1')
53 files changed, 1005 insertions, 555 deletions
diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/chapter-2.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/chapter-2.xht index 064a2f7e5d9..cf853a1987d 100644 --- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/chapter-2.xht +++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/chapter-2.xht @@ -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> <col id="refs-column"></col> @@ -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.xht">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.xht">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.xht">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.xht">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.xht">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.xht">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.xht">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.xht">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.xht">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/xhtml1/chapter-3.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/chapter-3.xht index b0db598fed4..2c67433470d 100644 --- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/chapter-3.xht +++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/chapter-3.xht @@ -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> <col id="refs-column"></col> @@ -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.xht">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.xht">table-progression-001-vlr</a></strong></td> - <td><a href="reference/table-progression-001-ref.xht">=</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.xht">table-progression-001-vrl</a></strong></td> - <td><a href="reference/table-progression-001-ref.xht">=</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.xht">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.xht">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.xht">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.xht">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.xht">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.xht">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/xhtml1/chapter-4.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/chapter-4.xht index e51dd69afff..ab467fc9288 100644 --- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/chapter-4.xht +++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/chapter-4.xht @@ -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> <col id="refs-column"></col> @@ -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.xht">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.xht">text-baseline-007</a></strong></td> - <td><a href="reference/text-baseline-007-ref.xht">=</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.xht">text-baseline-008</a></strong></td> <td><a href="reference/text-baseline-006-ref.xht">=</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.xht">text-baseline-009</a></strong></td> - <td><a href="reference/text-baseline-006-ref.xht">=</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.xht">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.xht">inline-block-alignment-007</a></strong></td> - <td><a href="reference/inline-block-alignment-007-ref.xht">=</a> </td> + <td><a href="reference/inline-block-alignment-006-ref.xht">=</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.xht">inline-block-alignment-009</a></strong></td> - <td><a href="reference/inline-block-alignment-009-ref.xht">=</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.xht">inline-block-alignment-orthogonal-vlr-003</a></strong></td> diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/chapter-5.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/chapter-5.xht index f30bd707b69..a6512290c2c 100644 --- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/chapter-5.xht +++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/chapter-5.xht @@ -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> <col id="refs-column"></col> @@ -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.xht">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.xht">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.xht">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.xht">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.xht">text-orientation-010</a></strong></td> diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/inline-block-alignment-007.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/inline-block-alignment-007.xht index c62a3102cab..f84a27c247d 100644 --- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/inline-block-alignment-007.xht +++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/inline-block-alignment-007.xht @@ -3,16 +3,15 @@ <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <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.xht" /> + <link rel="match" href="reference/inline-block-alignment-006-ref.xht" /> <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"><![CDATA[ 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/xhtml1/inline-block-alignment-009.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/inline-block-alignment-009.xht deleted file mode 100644 index 415bf31786c..00000000000 --- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/inline-block-alignment-009.xht +++ /dev/null @@ -1,61 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> - <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> - <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.xht" /> - <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"><![CDATA[ - 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/xhtml1/inline-block-alignment-orthogonal-vlr-003.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/inline-block-alignment-orthogonal-vlr-003.xht index 38088a3543f..2c346b178d2 100644 --- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/inline-block-alignment-orthogonal-vlr-003.xht +++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/inline-block-alignment-orthogonal-vlr-003.xht @@ -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/xhtml1/inline-block-alignment-orthogonal-vlr-005.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/inline-block-alignment-orthogonal-vlr-005.xht index 745a4be1c3b..0d673b1fb09 100644 --- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/inline-block-alignment-orthogonal-vlr-005.xht +++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/inline-block-alignment-orthogonal-vlr-005.xht @@ -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/xhtml1/inline-block-alignment-orthogonal-vrl-002.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/inline-block-alignment-orthogonal-vrl-002.xht index 0663aca1ebb..03eb2bdbb9b 100644 --- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/inline-block-alignment-orthogonal-vrl-002.xht +++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/inline-block-alignment-orthogonal-vrl-002.xht @@ -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/xhtml1/inline-block-alignment-orthogonal-vrl-004.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/inline-block-alignment-orthogonal-vrl-004.xht index 666dffec360..1232fd52bac 100644 --- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/inline-block-alignment-orthogonal-vrl-004.xht +++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/inline-block-alignment-orthogonal-vrl-004.xht @@ -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/xhtml1/margin-vlr-003.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/margin-vlr-003.xht index 997ea486236..3ba1f8a4f71 100644 --- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/margin-vlr-003.xht +++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/margin-vlr-003.xht @@ -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/xhtml1/margin-vrl-002.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/margin-vrl-002.xht index 6dcf446f87d..c58b71cb1a4 100644 --- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/margin-vrl-002.xht +++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/margin-vrl-002.xht @@ -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/xhtml1/reference/inline-block-alignment-007-ref.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/inline-block-alignment-007-ref.xht deleted file mode 100644 index af276765500..00000000000 --- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/inline-block-alignment-007-ref.xht +++ /dev/null @@ -1,42 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> -<head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> - <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"><![CDATA[ - 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/xhtml1/reference/inline-block-alignment-009-ref.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/inline-block-alignment-009-ref.xht deleted file mode 100644 index 750090cd261..00000000000 --- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/inline-block-alignment-009-ref.xht +++ /dev/null @@ -1,42 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> -<head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> - <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"><![CDATA[ - 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/xhtml1/reference/table-progression-001-ref.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/table-progression-001-ref.xht deleted file mode 100644 index 527b6273f7b..00000000000 --- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/table-progression-001-ref.xht +++ /dev/null @@ -1,93 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"><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/xhtml1/reference/text-baseline-007-ref.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/text-baseline-007-ref.xht deleted file mode 100644 index 833aa250594..00000000000 --- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/text-baseline-007-ref.xht +++ /dev/null @@ -1,36 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> -<head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> - <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"><![CDATA[ - - 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/xhtml1/reference/text-indent-vlr-011-ref.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/text-indent-vlr-011-ref.xht index 1eb0b8af894..8dcfcd37393 100644 --- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/text-indent-vlr-011-ref.xht +++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/text-indent-vlr-011-ref.xht @@ -12,7 +12,7 @@ <style type="text/css"><![CDATA[ div { - margin-left: 0.5em; + margin-left: 8px; } img diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/text-indent-vlr-013-ref.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/text-indent-vlr-013-ref.xht index 337b9586537..1f4bfa99e25 100644 --- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/text-indent-vlr-013-ref.xht +++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/text-indent-vlr-013-ref.xht @@ -12,7 +12,7 @@ <style type="text/css"><![CDATA[ div { - margin-left: 0.5em; + margin-left: 8px; } img diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/text-indent-vrl-010-ref.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/text-indent-vrl-010-ref.xht index 45b1d9c5e7d..f869d59a43a 100644 --- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/text-indent-vrl-010-ref.xht +++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/text-indent-vrl-010-ref.xht @@ -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/xhtml1/reference/text-indent-vrl-012-ref.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/text-indent-vrl-012-ref.xht index 04021c089bb..61142bf38ee 100644 --- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/text-indent-vrl-012-ref.xht +++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reference/text-indent-vrl-012-ref.xht @@ -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/xhtml1/reftest-toc.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reftest-toc.xht index 5856ad23274..d0569d960c8 100644 --- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reftest-toc.xht +++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reftest-toc.xht @@ -4428,7 +4428,7 @@ <tr> <td rowspan="1" title="inline block alignment - alphabetical alignment with vertical layout"> <a href="inline-block-alignment-007.xht">inline-block-alignment-007</a></td> - <td><a href="reference/inline-block-alignment-007-ref.xht">=</a> </td> + <td><a href="reference/inline-block-alignment-006-ref.xht">=</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.xht">inline-block-alignment-009</a></td> - <td><a href="reference/inline-block-alignment-009-ref.xht">=</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.xht">table-progression-001-vlr</a></td> - <td><a href="reference/table-progression-001-ref.xht">=</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.xht">table-progression-001-vrl</a></td> - <td><a href="reference/table-progression-001-ref.xht">=</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.xht">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.xht">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.xht">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.xht">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.xht">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.xht">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.xht">text-baseline-007</a></td> - <td><a href="reference/text-baseline-007-ref.xht">=</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.xht">text-baseline-008</a></td> - <td><a href="reference/text-baseline-006-ref.xht">=</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.xht">text-baseline-009</a></td> <td><a href="reference/text-baseline-006-ref.xht">=</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/xhtml1/reftest.list b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reftest.list index 2ed3eb1cc82..d096d1035ab 100644 --- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reftest.list +++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/reftest.list @@ -549,9 +549,8 @@ inline-block-alignment-003.xht == reference/inline-block-alignment-003-ref.xht inline-block-alignment-004.xht == reference/inline-block-alignment-002-ref.xht inline-block-alignment-005.xht == reference/inline-block-alignment-003-ref.xht inline-block-alignment-006.xht == reference/inline-block-alignment-006-ref.xht -inline-block-alignment-007.xht == reference/inline-block-alignment-007-ref.xht +inline-block-alignment-007.xht == reference/inline-block-alignment-006-ref.xht inline-block-alignment-008.xht == reference/inline-block-alignment-006-ref.xht -inline-block-alignment-009.xht == reference/inline-block-alignment-009-ref.xht inline-block-alignment-orthogonal-vlr-003.xht == reference/inline-block-alignment-orthogonal-vrl-002-ref.xht inline-block-alignment-orthogonal-vlr-005.xht == reference/inline-block-alignment-orthogonal-vrl-002-ref.xht inline-block-alignment-orthogonal-vrl-002.xht == reference/inline-block-alignment-orthogonal-vrl-002-ref.xht @@ -629,8 +628,14 @@ table-column-order-002.xht == reference/block-flow-direction-001-ref.xht table-column-order-003.xht == reference/block-flow-direction-001-ref.xht table-column-order-004.xht == reference/block-flow-direction-001-ref.xht table-column-order-005.xht == reference/block-flow-direction-001-ref.xht -table-progression-001-vlr.xht == reference/table-progression-001-ref.xht -table-progression-001-vrl.xht == reference/table-progression-001-ref.xht +table-progression-001-vlr.xht == table-progression-001-ref.orngtml +table-progression-001-vrl.xht == table-progression-001-ref.orngtml +table-progression-002-vlr.xht == table-progression-002-ref.orngtml +table-progression-002-vrl.xht == table-progression-002-ref.orngtml +table-progression-003-vlr.xht == table-progression-001-ref.orngtml +table-progression-003-vrl.xht == table-progression-001-ref.orngtml +table-progression-004-vlr.xht == table-progression-002-ref.orngtml +table-progression-004-vrl.xht == table-progression-002-ref.orngtml text-align-vlr-003.xht == reference/ref-filled-green-100px-square.xht text-align-vlr-005.xht == reference/ref-filled-green-100px-square.xht text-align-vlr-007.xht == reference/ref-filled-green-100px-square.xht @@ -654,9 +659,7 @@ text-baseline-003.xht == reference/text-baseline-002-ref.xht text-baseline-004.xht == reference/text-baseline-002-ref.xht text-baseline-005.xht == reference/text-baseline-002-ref.xht text-baseline-006.xht == reference/text-baseline-006-ref.xht -text-baseline-007.xht == reference/text-baseline-007-ref.xht -text-baseline-008.xht == reference/text-baseline-006-ref.xht -text-baseline-009.xht == reference/text-baseline-006-ref.xht +text-baseline-007.xht == reference/text-baseline-006-ref.xht text-combine-upright-decorations-001.xht == reference/text-combine-upright-decorations-001.xht text-combine-upright-inherit-all-001.xht == reference/text-combine-upright-inherit-all-001.xht text-combine-upright-inherit-all-002.xht == reference/text-combine-upright-inherit-all-002.xht diff --git a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/table-progression-001-vlr.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/table-progression-001-vlr.xht index 5f4df1d4530..4f2ef3415d1 100644 --- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/table-progression-001-vlr.xht +++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/table-progression-001-vlr.xht @@ -1,14 +1,19 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"><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.xht" 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/xhtml1/table-progression-001-vrl.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/table-progression-001-vrl.xht index 0f243e8f0e4..da278075005 100644 --- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/table-progression-001-vrl.xht +++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/table-progression-001-vrl.xht @@ -1,14 +1,19 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"><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.xht" 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/xhtml1/table-progression-002-vlr.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/table-progression-002-vlr.xht new file mode 100644 index 00000000000..4ea3b3fb4f0 --- /dev/null +++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/table-progression-002-vlr.xht @@ -0,0 +1,88 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"><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/xhtml1/table-progression-002-vrl.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/table-progression-002-vrl.xht new file mode 100644 index 00000000000..933f6539936 --- /dev/null +++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/table-progression-002-vrl.xht @@ -0,0 +1,87 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"><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/xhtml1/table-progression-003-vlr.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/table-progression-003-vlr.xht new file mode 100644 index 00000000000..83b7dc8241b --- /dev/null +++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/table-progression-003-vlr.xht @@ -0,0 +1,116 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"><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/xhtml1/table-progression-003-vrl.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/table-progression-003-vrl.xht new file mode 100644 index 00000000000..1ec2a45c556 --- /dev/null +++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/table-progression-003-vrl.xht @@ -0,0 +1,116 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"><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/xhtml1/table-progression-004-vlr.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/table-progression-004-vlr.xht new file mode 100644 index 00000000000..bcc840e6c9e --- /dev/null +++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/table-progression-004-vlr.xht @@ -0,0 +1,77 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"><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/xhtml1/table-progression-004-vrl.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/table-progression-004-vrl.xht new file mode 100644 index 00000000000..9bb5a65cfdf --- /dev/null +++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/table-progression-004-vrl.xht @@ -0,0 +1,76 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"><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/xhtml1/text-baseline-007.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-baseline-007.xht index 5d2268830bd..49d091a3384 100644 --- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-baseline-007.xht +++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-baseline-007.xht @@ -3,9 +3,8 @@ <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <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.xht" /> + <link rel="match" href="reference/text-baseline-006-ref.xht" /> <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"><![CDATA[ @@ -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/xhtml1/text-baseline-008.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-baseline-008.xht deleted file mode 100644 index 93b735c2950..00000000000 --- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-baseline-008.xht +++ /dev/null @@ -1,41 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> - <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> - <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.xht" /> - <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"><![CDATA[ - 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/xhtml1/text-baseline-009.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-baseline-009.xht deleted file mode 100644 index 14b3f8f5c29..00000000000 --- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-baseline-009.xht +++ /dev/null @@ -1,41 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> - <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> - <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.xht" /> - <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"><![CDATA[ - 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/xhtml1/text-indent-vlr-003.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vlr-003.xht index 406e394caf2..4046251e9c8 100644 --- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vlr-003.xht +++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vlr-003.xht @@ -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/xhtml1/text-indent-vlr-005.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vlr-005.xht index 6b5f54eed4f..2c874362d74 100644 --- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vlr-005.xht +++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vlr-005.xht @@ -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/xhtml1/text-indent-vlr-007.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vlr-007.xht index 1d8493bf835..b2465c807fd 100644 --- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vlr-007.xht +++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vlr-007.xht @@ -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/xhtml1/text-indent-vlr-009.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vlr-009.xht index 853539122b1..0f0ded18c28 100644 --- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vlr-009.xht +++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vlr-009.xht @@ -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/xhtml1/text-indent-vlr-011.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vlr-011.xht index 445c58d7a3b..e5ef9fd23e9 100644 --- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vlr-011.xht +++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vlr-011.xht @@ -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/xhtml1/text-indent-vlr-013.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vlr-013.xht index 85cc28e0c13..c1504296979 100644 --- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vlr-013.xht +++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vlr-013.xht @@ -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/xhtml1/text-indent-vlr-015.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vlr-015.xht index 0b686cad80f..60fb10f9f7d 100644 --- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vlr-015.xht +++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vlr-015.xht @@ -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/xhtml1/text-indent-vlr-017.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vlr-017.xht index be541bfae6c..aa9c800dfe0 100644 --- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vlr-017.xht +++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vlr-017.xht @@ -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/xhtml1/text-indent-vrl-002.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vrl-002.xht index 48e5e323f36..02398feedd8 100644 --- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vrl-002.xht +++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vrl-002.xht @@ -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/xhtml1/text-indent-vrl-004.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vrl-004.xht index 2c50ec5beb1..6e45897fc08 100644 --- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vrl-004.xht +++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vrl-004.xht @@ -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/xhtml1/text-indent-vrl-006.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vrl-006.xht index 65d2d879d7b..c9724ae3bd2 100644 --- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vrl-006.xht +++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vrl-006.xht @@ -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/xhtml1/text-indent-vrl-008.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vrl-008.xht index 4027e20fcc3..d5395f8d233 100644 --- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vrl-008.xht +++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vrl-008.xht @@ -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/xhtml1/text-indent-vrl-010.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vrl-010.xht index 2b76537a030..bc4df1b6a75 100644 --- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vrl-010.xht +++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vrl-010.xht @@ -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/xhtml1/text-indent-vrl-012.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vrl-012.xht index 3cd01af1fac..87734fa7ca8 100644 --- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vrl-012.xht +++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vrl-012.xht @@ -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/xhtml1/text-indent-vrl-014.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vrl-014.xht index bf26957e8bb..e501555f466 100644 --- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vrl-014.xht +++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vrl-014.xht @@ -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/xhtml1/text-indent-vrl-016.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vrl-016.xht index 82b26c1a9b3..cd83250492b 100644 --- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vrl-016.xht +++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-indent-vrl-016.xht @@ -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/xhtml1/text-orientation-sideways-001.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-orientation-sideways-001.xht index a7746542aa6..dc8746dd85c 100644 --- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-orientation-sideways-001.xht +++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-orientation-sideways-001.xht @@ -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/xhtml1/text-orientation-sideways-right-001.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-orientation-sideways-right-001.xht index 4021aaa6552..6ec48b6c90f 100644 --- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-orientation-sideways-right-001.xht +++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-orientation-sideways-right-001.xht @@ -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/xhtml1/text-orientation-upright-001.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-orientation-upright-001.xht index a4c3bb8e7c2..4950fa07367 100644 --- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-orientation-upright-001.xht +++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/text-orientation-upright-001.xht @@ -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/xhtml1/toc.xht b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/toc.xht index 2cb05ededb4..8c26f28062c 100644 --- a/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/toc.xht +++ b/tests/wpt/css-tests/css-writing-modes-3_dev/xhtml1/toc.xht @@ -27,22 +27,22 @@ <tbody id="s2"> <tr><th><a href="chapter-2.xht">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.xht">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.xht">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.xht">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.xht">Chapter 6 - |