Bug 1516619 [wpt PR 14682] - [css-text][css2] Add refs and update links, a=testonly
authorFlorian Rivoal <git@florian.rivoal.net>
Thu, 31 Jan 2019 15:17:19 +0000
changeset 457828 00835cdf936896f74da73c26777c6ba8ef4022a3
parent 457827 225d68a4143baea23078e5a2083a5bc231b9c69f
child 457829 e8fb9679d85c855a32a7c68499010521c00d8dea
push id35518
push useropoprus@mozilla.com
push dateFri, 08 Feb 2019 09:55:14 +0000
treeherdermozilla-central@3a3e393396f4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstestonly
bugs1516619, 14682
milestone67.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1516619 [wpt PR 14682] - [css-text][css2] Add refs and update links, a=testonly Automatic update from web-platform-tests [css-text][css2] Add refs and update links A number of test from css 2 are still relevant to the css-text-3 spec, so I tagged them with the appropriate link rel=help. Along the way, I added refs to those that didn't have one, making a few tweaks to harmonize some tests in order to minimize the number of refs needed. This should cover all the tests for the white-space property, plus a handful of others. -- wpt-commits: e9f45b6c34000a63504d8c62b9e24a7bd8b55fc1 wpt-pr: 14682
testing/web-platform/tests/css/CSS2/bidi-005.xht
testing/web-platform/tests/css/CSS2/bidi-006.xht
testing/web-platform/tests/css/CSS2/bidi-007.xht
testing/web-platform/tests/css/CSS2/bidi-008.xht
testing/web-platform/tests/css/CSS2/bidi-009.xht
testing/web-platform/tests/css/CSS2/bidi-010.xht
testing/web-platform/tests/css/CSS2/bidi-text/bidi-002.xht
testing/web-platform/tests/css/CSS2/bidi-text/bidi-005a.xht
testing/web-platform/tests/css/CSS2/bidi-text/bidi-005b.xht
testing/web-platform/tests/css/CSS2/bidi-text/bidi-006a.xht
testing/web-platform/tests/css/CSS2/bidi-text/bidi-006b.xht
testing/web-platform/tests/css/CSS2/bidi-text/bidi-007a.xht
testing/web-platform/tests/css/CSS2/bidi-text/bidi-007b.xht
testing/web-platform/tests/css/CSS2/bidi-text/bidi-008a.xht
testing/web-platform/tests/css/CSS2/bidi-text/bidi-008b.xht
testing/web-platform/tests/css/CSS2/bidi-text/bidi-009a.xht
testing/web-platform/tests/css/CSS2/bidi-text/bidi-010a.xht
testing/web-platform/tests/css/CSS2/bidi-text/bidi-010b.xht
testing/web-platform/tests/css/CSS2/bidi-text/line-breaking-bidi-001.xht
testing/web-platform/tests/css/CSS2/bidi-text/line-breaking-bidi-002.xht
testing/web-platform/tests/css/CSS2/bidi-text/line-breaking-bidi-003.xht
testing/web-platform/tests/css/CSS2/css1/c562-white-sp-000.xht
testing/web-platform/tests/css/CSS2/reference/bidi-005-ref.xht
testing/web-platform/tests/css/CSS2/reference/bidi-007-ref.xht
testing/web-platform/tests/css/CSS2/text/text-align-white-space-001.xht
testing/web-platform/tests/css/CSS2/text/text-align-white-space-003.xht
testing/web-platform/tests/css/CSS2/text/text-align-white-space-005.xht
testing/web-platform/tests/css/CSS2/text/text-align-white-space-007.xht
testing/web-platform/tests/css/CSS2/text/white-space-001-ref.xht
testing/web-platform/tests/css/CSS2/text/white-space-001.xht
testing/web-platform/tests/css/CSS2/text/white-space-002-ref.xht
testing/web-platform/tests/css/CSS2/text/white-space-002.xht
testing/web-platform/tests/css/CSS2/text/white-space-003.xht
testing/web-platform/tests/css/CSS2/text/white-space-004-ref.xht
testing/web-platform/tests/css/CSS2/text/white-space-004.xht
testing/web-platform/tests/css/CSS2/text/white-space-005.xht
testing/web-platform/tests/css/CSS2/text/white-space-006.xht
testing/web-platform/tests/css/CSS2/text/white-space-007-ref.xht
testing/web-platform/tests/css/CSS2/text/white-space-007.xht
testing/web-platform/tests/css/CSS2/text/white-space-008-ref.xht
testing/web-platform/tests/css/CSS2/text/white-space-008.xht
testing/web-platform/tests/css/CSS2/text/white-space-applies-to-001.xht
testing/web-platform/tests/css/CSS2/text/white-space-applies-to-002.xht
testing/web-platform/tests/css/CSS2/text/white-space-applies-to-003-ref.xht
testing/web-platform/tests/css/CSS2/text/white-space-applies-to-003.xht
testing/web-platform/tests/css/CSS2/text/white-space-applies-to-005.xht
testing/web-platform/tests/css/CSS2/text/white-space-applies-to-006.xht
testing/web-platform/tests/css/CSS2/text/white-space-applies-to-007.xht
testing/web-platform/tests/css/CSS2/text/white-space-applies-to-008.xht
testing/web-platform/tests/css/CSS2/text/white-space-applies-to-009.xht
testing/web-platform/tests/css/CSS2/text/white-space-applies-to-010.xht
testing/web-platform/tests/css/CSS2/text/white-space-applies-to-011.xht
testing/web-platform/tests/css/CSS2/text/white-space-applies-to-012.xht
testing/web-platform/tests/css/CSS2/text/white-space-applies-to-013.xht
testing/web-platform/tests/css/CSS2/text/white-space-applies-to-014.xht
testing/web-platform/tests/css/CSS2/text/white-space-applies-to-015.xht
testing/web-platform/tests/css/CSS2/text/white-space-bidirectionality-001-ref.xht
testing/web-platform/tests/css/CSS2/text/white-space-bidirectionality-001.xht
testing/web-platform/tests/css/CSS2/text/white-space-collapsing-001.xht
testing/web-platform/tests/css/CSS2/text/white-space-collapsing-002.xht
testing/web-platform/tests/css/CSS2/text/white-space-collapsing-003-ref.xht
testing/web-platform/tests/css/CSS2/text/white-space-collapsing-003.xht
testing/web-platform/tests/css/CSS2/text/white-space-collapsing-004.xht
testing/web-platform/tests/css/CSS2/text/white-space-collapsing-005.xht
testing/web-platform/tests/css/CSS2/text/white-space-collapsing-bidi-001.xht
testing/web-platform/tests/css/CSS2/text/white-space-collapsing-bidi-002.xht
testing/web-platform/tests/css/CSS2/text/white-space-collapsing-bidi-003.xht
testing/web-platform/tests/css/CSS2/text/white-space-collapsing-breaks-001-ref.xht
testing/web-platform/tests/css/CSS2/text/white-space-collapsing-breaks-001.xht
testing/web-platform/tests/css/CSS2/text/white-space-generated-content-before-001-ref.xht
testing/web-platform/tests/css/CSS2/text/white-space-generated-content-before-001.xht
testing/web-platform/tests/css/CSS2/text/white-space-mixed-001.xht
testing/web-platform/tests/css/CSS2/text/white-space-mixed-002.xht
testing/web-platform/tests/css/CSS2/text/white-space-mixed-003.xht
testing/web-platform/tests/css/CSS2/text/white-space-normal-001.xht
testing/web-platform/tests/css/CSS2/text/white-space-normal-002.xht
testing/web-platform/tests/css/CSS2/text/white-space-normal-003.xht
testing/web-platform/tests/css/CSS2/text/white-space-normal-004.xht
testing/web-platform/tests/css/CSS2/text/white-space-normal-005.xht
testing/web-platform/tests/css/CSS2/text/white-space-normal-006.xht
testing/web-platform/tests/css/CSS2/text/white-space-normal-007.xht
testing/web-platform/tests/css/CSS2/text/white-space-normal-008.xht
testing/web-platform/tests/css/CSS2/text/white-space-normal-009.xht
testing/web-platform/tests/css/CSS2/text/white-space-nowrap-001.xht
testing/web-platform/tests/css/CSS2/text/white-space-nowrap-005.xht
testing/web-platform/tests/css/CSS2/text/white-space-nowrap-006.xht
testing/web-platform/tests/css/CSS2/text/white-space-nowrap-attribute-001.xht
testing/web-platform/tests/css/CSS2/text/white-space-p-element-001.xht
testing/web-platform/tests/css/CSS2/text/white-space-pre-001.xht
testing/web-platform/tests/css/CSS2/text/white-space-pre-005.xht
testing/web-platform/tests/css/CSS2/text/white-space-pre-006.xht
testing/web-platform/tests/css/CSS2/text/white-space-pre-element-001-ref.xht
testing/web-platform/tests/css/CSS2/text/white-space-pre-element-001.xht
testing/web-platform/tests/css/CSS2/text/white-space-processing-001.xht
testing/web-platform/tests/css/CSS2/text/white-space-processing-002-ref.xht
testing/web-platform/tests/css/CSS2/text/white-space-processing-002.xht
testing/web-platform/tests/css/CSS2/text/white-space-processing-003.xht
testing/web-platform/tests/css/CSS2/text/white-space-processing-004.xht
testing/web-platform/tests/css/CSS2/text/white-space-processing-008.xht
testing/web-platform/tests/css/CSS2/text/white-space-processing-009.xht
testing/web-platform/tests/css/CSS2/text/white-space-processing-010.xht
testing/web-platform/tests/css/CSS2/text/white-space-processing-011.xht
testing/web-platform/tests/css/CSS2/text/white-space-processing-012.xht
testing/web-platform/tests/css/CSS2/text/white-space-processing-013-ref.xht
testing/web-platform/tests/css/CSS2/text/white-space-processing-013.xht
testing/web-platform/tests/css/CSS2/text/white-space-processing-016-ref.xht
testing/web-platform/tests/css/CSS2/text/white-space-processing-016.xht
testing/web-platform/tests/css/CSS2/text/white-space-processing-017.xht
testing/web-platform/tests/css/CSS2/text/white-space-processing-018.xht
testing/web-platform/tests/css/CSS2/text/white-space-processing-019.xht
testing/web-platform/tests/css/CSS2/text/white-space-processing-020.xht
testing/web-platform/tests/css/CSS2/text/white-space-processing-021.xht
testing/web-platform/tests/css/CSS2/text/white-space-processing-022.xht
testing/web-platform/tests/css/CSS2/text/white-space-processing-023.xht
testing/web-platform/tests/css/CSS2/text/white-space-processing-024.xht
testing/web-platform/tests/css/CSS2/text/white-space-processing-025.xht
testing/web-platform/tests/css/CSS2/text/white-space-processing-026.xht
testing/web-platform/tests/css/CSS2/text/white-space-processing-027.xht
testing/web-platform/tests/css/CSS2/text/white-space-processing-028.xht
testing/web-platform/tests/css/CSS2/text/white-space-processing-029.xht
testing/web-platform/tests/css/CSS2/text/white-space-processing-030.xht
testing/web-platform/tests/css/CSS2/text/white-space-processing-031-ref.xht
testing/web-platform/tests/css/CSS2/text/white-space-processing-031.xht
testing/web-platform/tests/css/CSS2/text/white-space-processing-032.xht
testing/web-platform/tests/css/CSS2/text/white-space-processing-033.xht
testing/web-platform/tests/css/CSS2/text/white-space-processing-034.xht
testing/web-platform/tests/css/CSS2/text/white-space-processing-035.xht
testing/web-platform/tests/css/CSS2/text/white-space-processing-036.xht
testing/web-platform/tests/css/CSS2/text/white-space-processing-037-ref.xht
testing/web-platform/tests/css/CSS2/text/white-space-processing-037.xht
testing/web-platform/tests/css/CSS2/text/white-space-processing-039.xht
testing/web-platform/tests/css/CSS2/text/white-space-processing-040.xht
testing/web-platform/tests/css/CSS2/text/white-space-processing-041.xht
testing/web-platform/tests/css/CSS2/text/white-space-processing-042-ref.xht
testing/web-platform/tests/css/CSS2/text/white-space-processing-042.xht
testing/web-platform/tests/css/CSS2/text/white-space-processing-043-ref.xht
testing/web-platform/tests/css/CSS2/text/white-space-processing-043.xht
testing/web-platform/tests/css/CSS2/text/white-space-processing-044.xht
testing/web-platform/tests/css/CSS2/text/white-space-processing-045.xht
testing/web-platform/tests/css/CSS2/text/white-space-processing-046-ref.xht
testing/web-platform/tests/css/CSS2/text/white-space-processing-046.xht
testing/web-platform/tests/css/CSS2/text/white-space-processing-047.xht
testing/web-platform/tests/css/CSS2/text/white-space-processing-050.xht
testing/web-platform/tests/css/CSS2/text/white-space-processing-051.xht
testing/web-platform/tests/css/CSS2/text/white-space-processing-052-ref.xht
testing/web-platform/tests/css/CSS2/text/white-space-processing-052.xht
testing/web-platform/tests/css/CSS2/text/white-space-processing-053.xht
testing/web-platform/tests/css/CSS2/text/white-space-processing-054-ref.xht
testing/web-platform/tests/css/CSS2/text/white-space-processing-054.xht
testing/web-platform/tests/css/CSS2/text/white-space-processing-055-ref.xht
testing/web-platform/tests/css/CSS2/text/white-space-processing-055.xht
testing/web-platform/tests/css/CSS2/text/white-space-processing-056-ref.xht
testing/web-platform/tests/css/CSS2/text/white-space-processing-056.xht
--- a/testing/web-platform/tests/css/CSS2/bidi-005.xht
+++ b/testing/web-platform/tests/css/CSS2/bidi-005.xht
@@ -5,16 +5,17 @@
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/box/inline/bidi/005.html" type="text/html"/>
   <link rel="help" href="http://www.w3.org/TR/css-text-3/#letter-spacing-property"/>
   <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#bidi-box-model"/>
   <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#bidi-control-codes"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#bidi-box-model"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/visuren.html#direction"/>
   <link rel="help" href="http://unicode.org/reports/tr9/"/>
+  <link rel="match" href="reference/bidi-005-ref.xht" />
   <style type="text/css">
    div p { white-space: pre; margin: 1em; padding: 0.75em; background: black; color: yellow; font: 2em/1 serif; letter-spacing: 1em; }
    .one, .c, .j, .e { color: aqua; }
    .two, .i, .d, .k, .b { color: fuchsia; }
    .one, .two { border: solid; padding: 0.1em 0 0.1em 0; margin: 0 0.5em 0 0.5em; }
    .c, .b { border-style: solid none solid solid; padding: 0.1em 0 0.1em 0; margin: 0 0 0 0.5em; }
    .j, .k { border-style: solid solid solid none; padding: 0.1em 0 0.1em 0; margin: 0 0.5em 0 0; }
    .e, .i, .d { border-style: solid none solid none; padding: 0.1em 0 0.1em 0; margin: 0 0 0 0; }
--- a/testing/web-platform/tests/css/CSS2/bidi-006.xht
+++ b/testing/web-platform/tests/css/CSS2/bidi-006.xht
@@ -5,16 +5,17 @@
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/box/inline/bidi/006.html" type="text/html"/>
   <link rel="help" href="http://www.w3.org/TR/css-text-3/#letter-spacing-property"/>
   <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#bidi-box-model"/>
   <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#bidi-control-codes"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#bidi-box-model"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/visuren.html#direction"/>
   <link rel="help" href="http://unicode.org/reports/tr9/"/>
+  <link rel="match" href="reference/bidi-005-ref.xht" />
   <style type="text/css">
    div p { white-space: nowrap; margin: 1em; padding: 0.75em; background: black; color: yellow; font: 2em/1 serif; letter-spacing: 1em; }
    .one, .c, .j, .e { color: aqua; }
    .two, .i, .d, .k, .b { color: fuchsia; }
    .one, .two { border: solid; padding: 0.1em 0 0.1em 0; margin: 0 0.5em 0 0.5em; }
    .c, .b { border-style: solid none solid solid; padding: 0.1em 0 0.1em 0; margin: 0 0 0 0.5em; }
    .j, .k { border-style: solid solid solid none; padding: 0.1em 0 0.1em 0; margin: 0 0.5em 0 0; }
    .e, .i, .d { border-style: solid none solid none; padding: 0.1em 0 0.1em 0; margin: 0 0 0 0; }
--- a/testing/web-platform/tests/css/CSS2/bidi-007.xht
+++ b/testing/web-platform/tests/css/CSS2/bidi-007.xht
@@ -5,16 +5,17 @@
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/box/inline/bidi/007.html" type="text/html"/>
   <link rel="help" href="http://www.w3.org/TR/css-text-3/#letter-spacing-property"/>
   <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#bidi-box-model"/>
   <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#bidi-control-codes"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#bidi-box-model"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/visuren.html#direction"/>
   <link rel="help" href="http://unicode.org/reports/tr9/"/>
+  <link rel="match" href="reference/bidi-007-ref.xht" />
   <style type="text/css">
    div p { float: left; clear: left; margin: 0.5em 1em; padding: 0.75em; background: black; color: yellow; font: 2em/1 serif; letter-spacing: 1em; }
    .one, .c, .j, .e { color: aqua; }
    .two, .i, .d, .k, .b { color: fuchsia; }
    .one, .two { border: solid; padding: 0.1em 0 0.1em 0; margin: 0 0.5em 0 0.5em; }
    .c, .b { border-style: solid none solid solid; padding: 0.1em 0 0.1em 0; margin: 0 0 0 0.5em; }
    .j, .k { border-style: solid solid solid none; padding: 0.1em 0 0.1em 0; margin: 0 0.5em 0 0; }
    .e, .i, .d { border-style: solid none solid none; padding: 0.1em 0 0.1em 0; margin: 0 0 0 0; }
--- a/testing/web-platform/tests/css/CSS2/bidi-008.xht
+++ b/testing/web-platform/tests/css/CSS2/bidi-008.xht
@@ -5,16 +5,17 @@
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/box/inline/bidi/008.html" type="text/html"/>
   <link rel="help" href="http://www.w3.org/TR/css-text-3/#letter-spacing-property"/>
   <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#bidi-box-model"/>
   <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#bidi-control-codes"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#bidi-box-model"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/visuren.html#direction"/>
   <link rel="help" href="http://unicode.org/reports/tr9/"/>
+  <link rel="match" href="reference/bidi-007-ref.xht" />
   <style type="text/css">
    div p { display: table; margin: 1em; padding: 0.75em; background: black; color: yellow; font: 2em/1 serif; letter-spacing: 1em; }
    .one, .c, .j, .e { color: aqua; }
    .two, .i, .d, .k, .b { color: fuchsia; }
    .one, .two { border: solid; padding: 0.1em 0 0.1em 0; margin: 0 0.5em 0 0.5em; }
    .c, .b { border-style: solid none solid solid; padding: 0.1em 0 0.1em 0; margin: 0 0 0 0.5em; }
    .j, .k { border-style: solid solid solid none; padding: 0.1em 0 0.1em 0; margin: 0 0.5em 0 0; }
    .e, .i, .d { border-style: solid none solid none; padding: 0.1em 0 0.1em 0; margin: 0 0 0 0; }
--- a/testing/web-platform/tests/css/CSS2/bidi-009.xht
+++ b/testing/web-platform/tests/css/CSS2/bidi-009.xht
@@ -5,16 +5,17 @@
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/box/inline/bidi/009.html" type="text/html"/>
   <link rel="help" href="http://www.w3.org/TR/css-text-3/#letter-spacing-property"/>
   <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#bidi-box-model"/>
   <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#bidi-control-codes"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#bidi-box-model"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/visuren.html#direction"/>
   <link rel="help" href="http://unicode.org/reports/tr9/"/>
+  <link rel="match" href="reference/bidi-005-ref.xht" />
   <style type="text/css">
    div { margin: 1em; padding: 0.75em; background: black; color: yellow;
          letter-spacing: 1em; font: 2em/1 serif; }
    div p { display: table-row; }
    .one, .c, .j, .e { color: aqua; }
    .two, .i, .d, .k, .b { color: fuchsia; }
    .one, .two { border: solid; padding: 0.1em 0 0.1em 0; margin: 0 0.5em 0 0.5em; }
    .c, .b { border-style: solid none solid solid; padding: 0.1em 0 0.1em 0; margin: 0 0 0 0.5em; }
--- a/testing/web-platform/tests/css/CSS2/bidi-010.xht
+++ b/testing/web-platform/tests/css/CSS2/bidi-010.xht
@@ -5,16 +5,17 @@
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/box/inline/bidi/010.html" type="text/html"/>
   <link rel="help" href="http://www.w3.org/TR/css-text-3/#letter-spacing-property"/>
   <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#bidi-box-model"/>
   <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#bidi-control-codes"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#bidi-box-model"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/visuren.html#direction"/>
   <link rel="help" href="http://unicode.org/reports/tr9/"/>
+  <link rel="match" href="reference/bidi-007-ref.xht" />
   <style type="text/css">
    div { position: relative; }
    .reference { top: -.5em; }
    .test { top: 3em; }
    div p { position: absolute; margin: 1em; padding: 0.75em; background: black; color: yellow; font: 2em/1 serif; letter-spacing: 1em; }
    .one, .c, .j, .e { color: aqua; }
    .two, .i, .d, .k, .b { color: fuchsia; }
    .one, .two { border: solid; padding: 0.1em 0 0.1em 0; margin: 0 0.5em 0 0.5em; }
--- a/testing/web-platform/tests/css/CSS2/bidi-text/bidi-002.xht
+++ b/testing/web-platform/tests/css/CSS2/bidi-text/bidi-002.xht
@@ -8,16 +8,17 @@
                  reorders text, placing text correctly on each line
                  while also splitting inline and rendering borders and padding appropriately."/>
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
   <link rel="reviewer" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact"/>
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/box/inline/bidi/002.html" type="text/html"/>
 
   <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#bidi-box-model"/>
   <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#bidi-control-codes"/>
+  <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-processing"/>
 
   <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#bidi-box-model"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/visuren.html#direction"/>
   <link rel="help" href="http://unicode.org/reports/tr9/"/>
 
   <link rel="match" href="bidi-002-ref.xht" />
 
   <style type="text/css">
--- a/testing/web-platform/tests/css/CSS2/bidi-text/bidi-005a.xht
+++ b/testing/web-platform/tests/css/CSS2/bidi-text/bidi-005a.xht
@@ -3,16 +3,18 @@
  <head>
 
   <title>CSS Test: The bidi algorithm and inlines in CSS: embed levels and white-space: pre; </title>
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-07-01 -->
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/box/inline/bidi/005.html" type="text/html"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#bidi-box-model"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/visuren.html#direction"/>
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#bidi-box-model"/>
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#bidi-control-codes"/>
   <link rel="help" href="http://unicode.org/reports/tr9/"/>
   <link rel="match" href="bidi-005a-ref.xht" />
 
   <style type="text/css">
    div p { white-space: pre; margin: 1em; padding: 0.75em; background: black; color: yellow; font: 2em/1 serif; }
    .one, .c, .j, .e { color: aqua; }
    .two, .i, .d, .k, .b { color: fuchsia; }
    .one, .two { border: solid; padding: 0.1em 0 0.1em 0; margin: 0 0.5em 0 0.5em; }
--- a/testing/web-platform/tests/css/CSS2/bidi-text/bidi-005b.xht
+++ b/testing/web-platform/tests/css/CSS2/bidi-text/bidi-005b.xht
@@ -4,16 +4,19 @@
 
   <title>CSS Test: The bidi algorithm and inlines in CSS: embed levels and white-space: pre; </title>
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-07-01 -->
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/box/inline/bidi/005.html" type="text/html"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#bidi-box-model"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/visuren.html#direction"/>
   <link rel="help" href="http://unicode.org/reports/tr9/"/>
+  <link rel="help" href="http://www.w3.org/TR/css-text-3/#letter-spacing-property"/>
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#bidi-box-model"/>
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#bidi-control-codes"/>
   <link rel="match" href="bidi-005b-ref.xht" />
 
   <style type="text/css">
    div p { white-space: pre; margin: 1em; padding: 0.75em; background: black; color: yellow; font: 2em/1 serif; letter-spacing: 1em; }
    .one, .c, .j, .e { color: aqua; }
    .two, .i, .d, .k, .b { color: fuchsia; }
   </style>
  </head>
--- a/testing/web-platform/tests/css/CSS2/bidi-text/bidi-006a.xht
+++ b/testing/web-platform/tests/css/CSS2/bidi-text/bidi-006a.xht
@@ -3,16 +3,18 @@
  <head>
 
   <title>CSS Test: The bidi algorithm and inlines in CSS: embed levels and white-space: nowrap; </title>
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-07-01 -->
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/box/inline/bidi/006.html" type="text/html"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#bidi-box-model"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/visuren.html#direction"/>
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#bidi-box-model"/>
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#bidi-control-codes"/>
   <link rel="help" href="http://unicode.org/reports/tr9/"/>
   <link rel="match" href="bidi-005a-ref.xht" />
 
   <style type="text/css">
    div p { white-space: nowrap; margin: 1em; padding: 0.75em; background: black; color: yellow; font: 2em/1 serif; }
    .one, .c, .j, .e { color: aqua; }
    .two, .i, .d, .k, .b { color: fuchsia; }
    .one, .two { border: solid; padding: 0.1em 0 0.1em 0; margin: 0 0.5em 0 0.5em; }
--- a/testing/web-platform/tests/css/CSS2/bidi-text/bidi-006b.xht
+++ b/testing/web-platform/tests/css/CSS2/bidi-text/bidi-006b.xht
@@ -3,16 +3,19 @@
  <head>
 
   <title>CSS Test: The bidi algorithm and inlines in CSS: embed levels and white-space: nowrap; </title>
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-07-01 -->
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/box/inline/bidi/006.html" type="text/html"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#bidi-box-model"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/visuren.html#direction"/>
+  <link rel="help" href="http://www.w3.org/TR/css-text-3/#letter-spacing-property"/>
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#bidi-box-model"/>
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#bidi-control-codes"/>
   <link rel="help" href="http://unicode.org/reports/tr9/"/>
   <link rel="match" href="bidi-005b-ref.xht" />
 
   <style type="text/css">
    div p { white-space: nowrap; margin: 1em; padding: 0.75em; background: black; color: yellow; font: 2em/1 serif; letter-spacing: 1em; }
    .one, .c, .j, .e { color: aqua; }
    .two, .i, .d, .k, .b { color: fuchsia; }
   </style>
--- a/testing/web-platform/tests/css/CSS2/bidi-text/bidi-007a.xht
+++ b/testing/web-platform/tests/css/CSS2/bidi-text/bidi-007a.xht
@@ -3,16 +3,18 @@
  <head>
 
   <title>CSS Test: The bidi algorithm and inlines in CSS: embed levels and float: left; </title>
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-07-01 -->
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/box/inline/bidi/007.html" type="text/html"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#bidi-box-model"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/visuren.html#direction"/>
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#bidi-box-model"/>
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#bidi-control-codes"/>
   <link rel="help" href="http://unicode.org/reports/tr9/"/>
   <link rel="match" href="bidi-007a-ref.xht" />
 
   <style type="text/css">
    div p { float: left; clear: left; margin: 0.5em 1em; padding: 0.75em; background: black; color: yellow; font: 2em/1 serif; }
    .one, .c, .j, .e { color: aqua; }
    .two, .i, .d, .k, .b { color: fuchsia; }
    .one, .two { border: solid; padding: 0.1em 0 0.1em 0; margin: 0 0.5em 0 0.5em; }
--- a/testing/web-platform/tests/css/CSS2/bidi-text/bidi-007b.xht
+++ b/testing/web-platform/tests/css/CSS2/bidi-text/bidi-007b.xht
@@ -3,16 +3,19 @@
  <head>
 
   <title>CSS Test: The bidi algorithm and inlines in CSS: embed levels and float: left; </title>
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-07-01 -->
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/box/inline/bidi/007.html" type="text/html"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#bidi-box-model"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/visuren.html#direction"/>
+  <link rel="help" href="http://www.w3.org/TR/css-text-3/#letter-spacing-property"/>
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#bidi-box-model"/>
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#bidi-control-codes"/>
   <link rel="help" href="http://unicode.org/reports/tr9/"/>
   <link rel="match" href="bidi-007b-ref.xht" />
 
   <style type="text/css">
    div p { float: left; clear: left; margin: 0.5em 1em; padding: 0.75em; background: black; color: yellow; font: 2em/1 serif; letter-spacing: 1em; }
    .one, .c, .j, .e { color: aqua; }
    .two, .i, .d, .k, .b { color: fuchsia; }
   </style>
--- a/testing/web-platform/tests/css/CSS2/bidi-text/bidi-008a.xht
+++ b/testing/web-platform/tests/css/CSS2/bidi-text/bidi-008a.xht
@@ -3,16 +3,18 @@
  <head>
 
   <title>CSS Test: The bidi algorithm and inlines in CSS: embed levels and display: table; </title>
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-07-01 -->
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/box/inline/bidi/008.html" type="text/html"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#bidi-box-model"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/visuren.html#direction"/>
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#bidi-box-model"/>
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#bidi-control-codes"/>
   <link rel="help" href="http://unicode.org/reports/tr9/"/>
   <link rel="match" href="bidi-008a-ref.xht" />
 
   <style type="text/css">
    div p { display: table; margin: 1em; padding: 0.75em; background: black; color: yellow; font: 2em/1 serif; }
    .one, .c, .j, .e { color: aqua; }
    .two, .i, .d, .k, .b { color: fuchsia; }
    .one, .two { border: solid; padding: 0.1em 0 0.1em 0; margin: 0 0.5em 0 0.5em; }
--- a/testing/web-platform/tests/css/CSS2/bidi-text/bidi-008b.xht
+++ b/testing/web-platform/tests/css/CSS2/bidi-text/bidi-008b.xht
@@ -3,16 +3,19 @@
  <head>
 
   <title>CSS Test: The bidi algorithm and inlines in CSS: embed levels and display: table; </title>
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-07-01 -->
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/box/inline/bidi/008.html" type="text/html"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#bidi-box-model"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/visuren.html#direction"/>
+  <link rel="help" href="http://www.w3.org/TR/css-text-3/#letter-spacing-property"/>
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#bidi-box-model"/>
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#bidi-control-codes"/>
   <link rel="help" href="http://unicode.org/reports/tr9/"/>
   <link rel="match" href="bidi-008b-ref.xht" />
 
   <style type="text/css">
    div p { display: table; margin: 1em; padding: 0.75em; background: black; color: yellow; font: 2em/1 serif; letter-spacing: 1em; }
    .one, .c, .j, .e { color: aqua; }
    .two, .i, .d, .k, .b { color: fuchsia; }
   </style>
--- a/testing/web-platform/tests/css/CSS2/bidi-text/bidi-009a.xht
+++ b/testing/web-platform/tests/css/CSS2/bidi-text/bidi-009a.xht
@@ -3,16 +3,18 @@
  <head>
 
   <title>CSS Test: The bidi algorithm and inlines in CSS: embed levels and display: table-row; </title>
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-07-01 -->
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/box/inline/bidi/009.html" type="text/html"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#bidi-box-model"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/visuren.html#direction"/>
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#bidi-box-model"/>
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#bidi-control-codes"/>
   <link rel="help" href="http://unicode.org/reports/tr9/"/>
   <link rel="match" href="bidi-005a-ref.xht" />
 
   <style type="text/css">
    div { margin: 1em; padding: 0.75em; background: black; color: yellow;
         font: 2em/1 serif; }
    div p { display: table-row; }
    .one, .c, .j, .e { color: aqua; }
--- a/testing/web-platform/tests/css/CSS2/bidi-text/bidi-010a.xht
+++ b/testing/web-platform/tests/css/CSS2/bidi-text/bidi-010a.xht
@@ -3,16 +3,18 @@
  <head>
 
   <title>CSS Test: The bidi algorithm and inlines in CSS: embed levels and position: absolute </title>
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-07-01 -->
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/box/inline/bidi/010.html" type="text/html"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#bidi-box-model"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/visuren.html#direction"/>
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#bidi-box-model"/>
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#bidi-control-codes"/>
   <link rel="help" href="http://unicode.org/reports/tr9/"/>
   <link rel="match" href="bidi-007a-ref.xht" />
 
   <style type="text/css">
    div { position: relative; }
    .reference { top: -.5em; }
    .test { top: 3em; }
    div p { position: absolute; margin: 1em; padding: 0.75em; background: black; color: yellow; font: 2em/1 serif; }
--- a/testing/web-platform/tests/css/CSS2/bidi-text/bidi-010b.xht
+++ b/testing/web-platform/tests/css/CSS2/bidi-text/bidi-010b.xht
@@ -3,16 +3,19 @@
  <head>
 
   <title>CSS Test: The bidi algorithm and inlines in CSS: embed levels and position: absolute </title>
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-07-01 -->
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/box/inline/bidi/010.html" type="text/html"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/box.html#bidi-box-model"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/visuren.html#direction"/>
+  <link rel="help" href="http://www.w3.org/TR/css-text-3/#letter-spacing-property"/>
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#bidi-box-model"/>
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#bidi-control-codes"/>
   <link rel="help" href="http://unicode.org/reports/tr9/"/>
   <link rel="match" href="bidi-007b-ref.xht" />
 
   <style type="text/css">
    div { position: relative; }
    .reference { top: -.5em; }
    .test { top: 3em; }
    div p { position: absolute; margin: 1em; padding: 0.75em; background: black; color: yellow; font: 2em/1 serif; letter-spacing: 1em; }
--- a/testing/web-platform/tests/css/CSS2/bidi-text/line-breaking-bidi-001.xht
+++ b/testing/web-platform/tests/css/CSS2/bidi-text/line-breaking-bidi-001.xht
@@ -2,16 +2,17 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
  <head>
 
   <title>CSS Test: Line breaking and the bidi algorithm</title>
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-03-14 -->
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/text/white-space/normal/line-breaking/bidi/001.html" type="text/html"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+  <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-processing" />
   <link rel="match" href="line-breaking-bidi-001-ref.xht" />
 
   <meta name="flags" content="ahem" />
   <style type="text/css">
    .test { color: green; background: red; font: 1.25em/1 Ahem; white-space: normal; }
   </style>
  </head>
  <body>
--- a/testing/web-platform/tests/css/CSS2/bidi-text/line-breaking-bidi-002.xht
+++ b/testing/web-platform/tests/css/CSS2/bidi-text/line-breaking-bidi-002.xht
@@ -2,16 +2,17 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
  <head>
 
   <title>CSS Test: Line breaking and the bidi algorithm (with hebrew character)</title>
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-03-14 -->
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/text/white-space/normal/line-breaking/bidi/002.html" type="text/html"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+  <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-processing" />
   <link rel="match" href="line-breaking-bidi-002-ref.xht" />
 
   <meta name="flags" content="ahem" />
   <style type="text/css">
    .test { color: green; background: red; font: 1.25em/1 Ahem; white-space: normal; }
   </style>
  </head>
  <body>
--- a/testing/web-platform/tests/css/CSS2/bidi-text/line-breaking-bidi-003.xht
+++ b/testing/web-platform/tests/css/CSS2/bidi-text/line-breaking-bidi-003.xht
@@ -2,16 +2,17 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
  <head>
 
   <title>CSS Test: Line breaking and the bidi algorithm (no breaks)</title>
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-03-14 -->
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/text/white-space/normal/line-breaking/bidi/003.html" type="text/html"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+  <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-processing" />
   <link rel="match" href="line-breaking-bidi-003-ref.xht" />
 
   <meta name="flags" content="ahem" />
   <style type="text/css">
    .test { font: 40px/1 Ahem; border: solid; width: 17em; background: red; }
    .test > span { background: lime; }
   </style>
  </head>
--- a/testing/web-platform/tests/css/CSS2/css1/c562-white-sp-000.xht
+++ b/testing/web-platform/tests/css/CSS2/css1/c562-white-sp-000.xht
@@ -11,16 +11,17 @@
   <style type="text/css"><![CDATA[
    div { font: 15px/1 Ahem; color: green; background: red url(support/css1test562.png) no-repeat; border: solid black; width: 15em; }
    div p { margin: 0; }
    .one {white-space: pre;}
    .two {white-space: nowrap;}
    .three {white-space: normal;}
   ]]></style>
   <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-prop" title="16.6 Whitespace: the 'white-space' property"/>
+  <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-property"/>
  </head>
  <body>
   <p>There should be a single green block below.</p>
   <div>
    <p class="one">x  x   x
  x    x   x
     x   x</p>
    <p class="two">x  x   x
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/CSS2/reference/bidi-005-ref.xht
@@ -0,0 +1,24 @@
+<!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" lang="en">
+ <head>
+  <title>CSS Test reference</title>
+  <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
+  <link rel="author" title="Florian Rivoal" href="https://florian.rivoal.net"/>
+  <style type="text/css">
+   div p { white-space: pre; margin: 1em; padding: 0.75em; background: black; color: yellow; font: 2em/1 serif; letter-spacing: 1em; }
+   .one, .c, .j, .e { color: aqua; }
+   .two, .i, .d, .k, .b { color: fuchsia; }
+   .one, .two { border: solid; padding: 0.1em 0 0.1em 0; margin: 0 0.5em 0 0.5em; }
+   .c, .b { border-style: solid none solid solid; padding: 0.1em 0 0.1em 0; margin: 0 0 0 0.5em; }
+   .j, .k { border-style: solid solid solid none; padding: 0.1em 0 0.1em 0; margin: 0 0.5em 0 0; }
+   .e, .i, .d { border-style: solid none solid none; padding: 0.1em 0 0.1em 0; margin: 0 0 0 0; }
+  </style>
+ </head>
+ <body>
+  <p> The following two blocks should be identical, including overflow. (Force bidi: &#x05D0;) </p>
+  <div>
+   <p class="reference"><span class="a">a</span><span class="b">b</span><span class="c">c</span><span class="d">d</span><span class="e">e</span><span class="f">f</span><span class="g">g</span><span class="h">h</span><span class="i">i</span><span class="j">j</span><span class="k">k</span><span class="l">l</span><span class="m">m</span></p>
+   <p class="reference"><span class="a">a</span><span class="b">b</span><span class="c">c</span><span class="d">d</span><span class="e">e</span><span class="f">f</span><span class="g">g</span><span class="h">h</span><span class="i">i</span><span class="j">j</span><span class="k">k</span><span class="l">l</span><span class="m">m</span></p>
+  </div>
+ </body>
+</html>
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/CSS2/reference/bidi-007-ref.xht
@@ -0,0 +1,24 @@
+<!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" lang="en">
+ <head>
+  <title>CSS Test: The bidi algorithm and inlines in CSS: embed levels and float: left; </title>
+  <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
+  <link rel="author" title="Florian Rivoal" href="https://florian.rivoal.net"/>
+  <style type="text/css">
+   div p { float: left; clear: left; margin: 0.5em 1em; padding: 0.75em; background: black; color: yellow; font: 2em/1 serif; letter-spacing: 1em; }
+   .one, .c, .j, .e { color: aqua; }
+   .two, .i, .d, .k, .b { color: fuchsia; }
+   .one, .two { border: solid; padding: 0.1em 0 0.1em 0; margin: 0 0.5em 0 0.5em; }
+   .c, .b { border-style: solid none solid solid; padding: 0.1em 0 0.1em 0; margin: 0 0 0 0.5em; }
+   .j, .k { border-style: solid solid solid none; padding: 0.1em 0 0.1em 0; margin: 0 0.5em 0 0; }
+   .e, .i, .d { border-style: solid none solid none; padding: 0.1em 0 0.1em 0; margin: 0 0 0 0; }
+  </style>
+ </head>
+ <body>
+  <p> The following two blocks should be identical, including overflow. (Force bidi: &#x05D0;) </p>
+  <div>
+   <p class="reference"><span class="a">a</span><span class="b">b</span><span class="c">c</span><span class="d">d</span><span class="e">e</span><span class="f">f</span><span class="g">g</span><span class="h">h</span><span class="i">i</span><span class="j">j</span><span class="k">k</span><span class="l">l</span><span class="m">m</span></p>
+   <p class="reference"><span class="a">a</span><span class="b">b</span><span class="c">c</span><span class="d">d</span><span class="e">e</span><span class="f">f</span><span class="g">g</span><span class="h">h</span><span class="i">i</span><span class="j">j</span><span class="k">k</span><span class="l">l</span><span class="m">m</span></p>
+  </div>
+ </body>
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/text-align-white-space-001.xht
+++ b/testing/web-platform/tests/css/CSS2/text/text-align-white-space-001.xht
@@ -2,18 +2,19 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
         <title>CSS Test: Text-align set to 'justify' with 'white-space' set to 'pre'</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-28 -->
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#alignment-prop" />
 		<link rel="match" href="text-align-white-space-001-ref.xht" />
 
-        <meta name="flags" content="ahem" />
+        <meta name="flags" content="ahem may" /> <!-- "may" because level 3 makes it no longer mandatory -->
         <meta name="assert" content="Setting 'text-align' to 'justify' and 'white-space' to 'pre', text-align is computed to its initial value." />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#text-align-property" />
         <style type="text/css">
             div
             {
                 font: 20px/1 Ahem;
                 position: relative;
                 width: 6em;
             }
             div div
--- a/testing/web-platform/tests/css/CSS2/text/text-align-white-space-003.xht
+++ b/testing/web-platform/tests/css/CSS2/text/text-align-white-space-003.xht
@@ -2,17 +2,18 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
         <title>CSS Test: Text-align set to 'justify' with 'white-space' set to 'pre-wrap'</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-28 -->
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#alignment-prop" />
 		<link rel="match" href="text-align-white-space-002-ref.xht" />
 
-        <meta name="flags" content="ahem" />
+	<meta name="flags" content="ahem may" /> <!-- "may" because level 3 makes it no longer mandatory -->
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#text-align-property" />
         <meta name="assert" content="Setting 'text-align' to 'justify' and 'white-space' to 'pre-wrap', text-align is computed to its initial value." />
         <style type="text/css">
             div
             {
                 font: 20px/1 Ahem;
                 position: relative;
                 width: 9em;
             }
@@ -41,9 +42,9 @@
         <div>
             <div><span class="red">xxx</span><span class="green">x</span><span class="red">xxx</span><span class="green">xx</span>
                 <span class="red">xxx</span><span class="green">x</span><span class="red">xxx</span><span class="green">xx</span>
                 <span class="red">xxx</span><span class="green">x</span><span class="red">xxx</span><span class="green">xx</span>
                 <span class="red">xxx</span><span class="green">x</span><span class="red">xxx</span><span class="green">xx</span></div>
             <div id="test">XXX XXX XXX XXX XXX XXX XXX XXX</div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/text-align-white-space-005.xht
+++ b/testing/web-platform/tests/css/CSS2/text/text-align-white-space-005.xht
@@ -2,17 +2,18 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
         <title>CSS Test: Text-align set to 'justify' with 'white-space' set to 'pre' and 'direction' set to 'rtl'</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-28 -->
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#alignment-prop" />
 		<link rel="match" href="text-align-white-space-005-ref.xht" />
 
-        <meta name="flags" content="ahem" />
+	<meta name="flags" content="ahem may" /> <!-- "may" because level 3 makes it no longer mandatory -->
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#text-align-property" />
         <meta name="assert" content="Setting 'text-align' to 'justify' and 'white-space' to 'pre', text-align is computed to its initial value." />
         <style type="text/css">
             div
             {
                 direction: rtl;
                 font: 20px/1 Ahem;
                 margin-left: 4em;
                 position: relative;
--- a/testing/web-platform/tests/css/CSS2/text/text-align-white-space-007.xht
+++ b/testing/web-platform/tests/css/CSS2/text/text-align-white-space-007.xht
@@ -2,17 +2,18 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
         <title>CSS Test: Text-align set to 'justify' with 'white-space' set to 'pre-wrap' and 'direction' set to 'rtl'</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-28 -->
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#alignment-prop" />
 		<link rel="match" href="text-align-white-space-002-ref.xht" />
 
-        <meta name="flags" content="ahem" />
+	<meta name="flags" content="ahem may" /> <!-- "may" because level 3 makes it no longer mandatory -->
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#text-align-property" />
         <meta name="assert" content="Setting 'text-align' to 'justify' and 'white-space' to 'pre-wrap', text-align is computed to its initial value." />
         <style type="text/css">
             div
             {
                 direction: rtl;
                 font: 20px/1 Ahem;
                 position: relative;
                 width: 9em;
@@ -42,9 +43,9 @@
         <div>
             <div><span class="green">x</span><span class="red">xxx</span><span class="green">x</span><span class="red">xxx</span><span class="green">x</span>
             <span class="green">x</span><span class="red">xxx</span><span class="green">x</span><span class="red">xxx</span><span class="green">x</span>
             <span class="green">x</span><span class="red">xxx</span><span class="green">x</span><span class="red">xxx</span><span class="green">x</span>
             <span class="green">xx</span><span class="red">xxx</span><span class="green">x</span><span class="red">xxx</span></div>
             <div id="test">XXX XXX XXX XXX XXX XXX XXX XXX</div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-001-ref.xht
@@ -0,0 +1,42 @@
+<!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 reference</title>
+        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
+        <link rel="author" title="Florian Rivoal" href="https://florian.rivoal.net" />
+        <meta name="flags" content="ahem" />
+
+        <style type="text/css">
+            div
+            {
+                font: 1em Ahem;
+                line-height: 1em;
+            }
+            #reference
+            {
+                height: 1em;
+                width: 5em;
+            }
+            #div1, #div3
+            {
+                background: black;
+            }
+            #div1, #div2, #div3
+            {
+                display: inline-block;
+                height: 1em;
+                width: 2em;
+            }
+            #div2
+            {
+                height: 1em;
+                width: 1em;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there are 2 filled black squares.</p>
+        <div id="reference"><div id="div1"></div><div id="div2"></div><div id="div3"></div></div>
+        <div id="reference"><div id="div1"></div><div id="div2"></div><div id="div3"></div></div>
+    </body>
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-001.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-001.xht
@@ -1,15 +1,17 @@
 <!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: White-space set to 'normal'</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-white-space" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-prop" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-1" />
+        <link rel="match" href="white-space-001-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'white-space' property set to 'normal' removes extra spacing when more than one space is next to another." />
 
         <style type="text/css">
             div
             {
                 font: 1em Ahem;
                 line-height: 1em;
@@ -40,9 +42,9 @@
             }
         </style>
     </head>
     <body>
         <p>Test passes if there are 2 filled black squares.</p>
         <div id="test">XX   XX</div>
         <div id="reference"><div id="div1"></div><div id="div2"></div><div id="div3"></div></div>
     </body>
-</html>
\ No newline at end of file
+</html>
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-002-ref.xht
@@ -0,0 +1,41 @@
+<!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 reference</title>
+        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
+        <link rel="author" title="Florian Rivoal" href="https://florian.rivoal.net" />
+        <meta name="flags" content="ahem" />
+        <style type="text/css">
+            div
+            {
+                font: 1em Ahem;
+                line-height: 1em;
+            }
+            #reference
+            {
+                height: 1em;
+                width: 7em;
+            }
+            #div1, #div3
+            {
+                background: black;
+            }
+            #div1, #div2, #div3
+            {
+                display: inline-block;
+                height: 1em;
+                width: 2em;
+            }
+            #div2
+            {
+                height: 1em;
+                width: 3em;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there are two black squares on the page.</p>
+        <div id="reference"><div id="div1"></div><div id="div2"></div><div id="div3"></div></div>
+        <div id="reference"><div id="div1"></div><div id="div2"></div><div id="div3"></div></div>
+    </body>
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-002.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-002.xht
@@ -1,15 +1,17 @@
 <!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: White-space set to 'pre'</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-white-space" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-prop" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-1" />
+        <link rel="match" href="white-space-002-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'white-space' property set to 'pre' does not remove extra spacing when more than one space is next to another." />
         <style type="text/css">
             div
             {
                 font: 1em Ahem;
                 line-height: 1em;
             }
@@ -39,9 +41,9 @@
             }
         </style>
     </head>
     <body>
         <p>Test passes if there are two black squares on the page.</p>
         <div id="test">XX   XX</div>
         <div id="reference"><div id="div1"></div><div id="div2"></div><div id="div3"></div></div>
     </body>
-</html>
\ No newline at end of file
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-003.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-003.xht
@@ -1,15 +1,17 @@
 <!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: White-space set to 'nowrap'</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-white-space" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-prop" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-1" />
+        <link rel="match" href="white-space-001-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'white-space' property set to 'nowrap' removes extra spacing when more than one space is next to another. And the text does not wrap when width is constrained." />
         <style type="text/css">
             div
             {
                 font: 1em Ahem;
                 line-height: 1em;
             }
@@ -40,9 +42,9 @@
             }
         </style>
     </head>
     <body>
         <p>Test passes if there are two black squares on the page.</p>
         <div id="test">XX   XX</div>
         <div id="reference"><div id="div1"></div><div id="div2"></div><div id="div3"></div></div>
     </body>
-</html>
\ No newline at end of file
+</html>
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-004-ref.xht
@@ -0,0 +1,29 @@
+<!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 reference</title>
+        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
+        <link rel="author" title="Florian Rivoal" href="https://florian.rivoal.net" />
+        <meta name="flags" content="ahem" />
+        <style type="text/css">
+            div
+            {
+                font: 20px/1em Ahem;
+                margin: 0;
+                padding: 0;
+            }
+            #reference
+            {
+                background: blue;
+                display: inline-block;
+                height: 1em;
+                width: 2em;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there is a single black box above a blue box (there can be white space between the boxes) and the black box has the same width as the blue box.</p>
+	<div>XX<br />XX</div>
+        <div id="reference"></div>
+    </body>
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-004.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-004.xht
@@ -1,15 +1,17 @@
 <!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: White-space set to 'pre-wrap'</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-white-space" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-prop" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-1" />
+        <link rel="match" href="white-space-004-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'white-space' property set to 'pre-wrap' does not remove extra spacing when two spaces are next to each other and introduces line breaking opportunities." />
         <style type="text/css">
             div
             {
                 font: 20px/1em Ahem;
                 margin: 0;
                 padding: 0;
@@ -28,9 +30,9 @@
             }
         </style>
     </head>
     <body>
         <p>Test passes if there is a single black box above a blue box (there can be white space between the boxes) and the black box has the same width as the blue box.</p>
         <div id="test">XX  XX</div>
         <div id="reference"></div>
     </body>
-</html>
\ No newline at end of file
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-005.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-005.xht
@@ -1,15 +1,17 @@
 <!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: White-space set to 'pre-line'</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-white-space" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-prop" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-1" />
+        <link rel="match" href="white-space-001-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'white-space' property set to 'pre-line' does remove extra spacing when two spaces are next to each other and breaks at new lines." />
         <style type="text/css">
             div
             {
                 font: 1em Ahem;
                 line-height: 1em;
             }
@@ -35,13 +37,13 @@
             #div2
             {
                 height: 1em;
                 width: 1em;
             }
         </style>
     </head>
     <body>
-        <p>Test passes if there are two black squares on the page.</p>
+        <p>Test passes if there are 2 filled black squares.</p>
         <div id="test">XX   XX</div>
         <div id="reference"><div id="div1"></div><div id="div2"></div><div id="div3"></div></div>
     </body>
-</html>
\ No newline at end of file
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-006.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-006.xht
@@ -1,15 +1,17 @@
 <!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: White-space set to 'inherit'</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-white-space" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-prop" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-property" />
+        <link rel="match" href="white-space-002-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'white-space' property set to 'inherit' causes the element to use its parent's white-space value." />
         <style type="text/css">
             #wrapper
             {
                 white-space: pre;
             }
             div
@@ -44,9 +46,9 @@
             }
         </style>
     </head>
     <body>
         <p>Test passes if there are two black squares on the page.</p>
         <div id="wrapper"><div id="test">XX   XX</div></div>
         <div id="reference"><div id="div1"></div><div id="div2"></div><div id="div3"></div></div>
     </body>
-</html>
\ No newline at end of file
+</html>
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-007-ref.xht
@@ -0,0 +1,41 @@
+<!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 reference</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="author" title="James Hopkins" href="http://idreamincode.co.uk/css21testsuite" />
+  <link rel="author" title="Justin Boss" href="http://www.bosspro.org/contactus/" />
+  <link rel="author" title="Florian Rivoal" href="https://florian.rivoal.net" />
+
+  <style type="text/css"><![CDATA[
+  div#test
+  {
+  background-color: orange;
+  height: 100px;
+  width: 500px;
+  }
+
+  div#control
+  {
+  background-color: blue;
+  height: 100px;
+  width: 500px;
+  }
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p>Test passes if the wide orange and blue rectangles are the <strong>same width</strong> and the <strong>same height</strong>.</p>
+
+  <div id="test">&nbsp;</div>
+
+  <div id="control">&nbsp;</div>
+
+ </body>
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-007.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-007.xht
@@ -7,16 +7,18 @@
   <title>CSS Test: white-space</title>
 
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
   <link rel="author" title="James Hopkins" href="http://idreamincode.co.uk/css21testsuite" />
   <link rel="author" title="Justin Boss" href="http://www.bosspro.org/contactus/" />
   <link rel="help" title="C.5.76 Section 16.6.1 The 'white-space' processing model" href="https://www.w3.org/TR/CSS21/changes.html#q21.363" />
   <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
   <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-prop" />
+  <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-1" />
+  <link rel="match" href="white-space-007-ref.xht" />
   <meta name="flags" content="ahem" />
   <meta name="assert" content="'white-space: normal' and 'white-space: nowrap' should collapse sequences of white space. Regarding wrapping, line breaking opportunities are determined on the text prior to white space collapsing steps." />
 
   <style type="text/css"><![CDATA[
   div#test
   {
   background-color: orange;
   color: orange;
@@ -44,9 +46,9 @@
 
   <p>Test passes if the wide orange and blue rectangles are the <strong>same width</strong> and the <strong>same height</strong>.</p>
 
   <div id="test"><span>X </span> <span>X </span> <span>X </span> <span>X </span> <span>X </span> <span>X </span> <span>X </span> <span>X </span> <span>X </span> <span>X </span></div>
 
   <div id="control">&nbsp;</div>
 
  </body>
-</html>
\ No newline at end of file
+</html>
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-008-ref.xht
@@ -0,0 +1,32 @@
+<!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 reference</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="author" title="Bruno Fassino" href="fassino[at]gmail.com" />
+  <link rel="author" title="Florian Rivoal" href="https://florian.rivoal.net" />
+  <meta content="" name="flags" />
+
+  <style type="text/css"><![CDATA[
+  #test-overlapping-green
+  {
+  background-color: lime;
+  }
+
+  ]]></style>
+
+ </head>
+
+ <body>
+
+  <p>Test passes if there is a wide bright green rectangle below with one "X" in it and if there is no red.</p>
+
+  <div id="test-overlapping-green"><br/><br/>X</div>
+
+
+ </body>
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-008.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-008.xht
@@ -2,16 +2,18 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 
  <head>
 
   <title>CSS Test: white-space - pre and newlines in source</title>
 
   <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-prop" />
+  <link rel="help" href="https://drafts.csswg.org/css-text-3/#line-break-transform" />
+  <link rel="match" href="white-space-008-ref.xht" />
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
   <link rel="author" title="Bruno Fassino" href="fassino[at]gmail.com" />
   <meta content="Newlines in source must be preserved with 'white-space: pre'" name="assert" />
   <meta content="" name="flags" />
 
   <style type="text/css"><![CDATA[
   #test-overlapping-green
   {
@@ -52,9 +54,9 @@ X</div>
     X<br />
 
     X
    </div>
 
   </div>
 
  </body>
-</html>
\ No newline at end of file
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-applies-to-001.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-applies-to-001.xht
@@ -1,15 +1,17 @@
 <!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: White-space application to 'display: inline' element</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-white-space" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-prop" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-property" />
+        <link rel="match" href="white-space-002-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'white-space' property applies to 'display: inline' elements." />
         <style type="text/css">
             div
             {
                 font: 16px/1em Ahem;
             }
             #div1
@@ -26,15 +28,15 @@
             }
             #div3
             {
                 margin-left: 3em;
             }
         </style>
     </head>
     <body>
-        <p>Test passes if there are only two boxes below.</p>
+        <p>Test passes if there are two black squares on the page.</p>
         <div>
             <div id="div1">XX   XX</div>
         </div>
         <div id="div2"></div><div id="div3"></div>
     </body>
-</html>
\ No newline at end of file
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-applies-to-002.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-applies-to-002.xht
@@ -1,15 +1,16 @@
 <!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: White-space application to 'display: block' element</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-white-space" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-prop" />
+        <link rel="match" href="white-space-002-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'white-space' property applies to 'display: block' elements." />
         <style type="text/css">
             div
             {
                 font: 16px/1em Ahem;
             }
             span
@@ -26,15 +27,15 @@
             }
             #div2
             {
                 margin-left: 3em;
             }
         </style>
     </head>
     <body>
-        <p>Test passes if there are only two boxes below.</p>
+        <p>Test passes if there are two black squares on the page.</p>
         <div>
             <span>XX   XX</span>
         </div>
         <div id="div1"></div><div id="div2"></div>
     </body>
-</html>
\ No newline at end of file
+</html>
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-applies-to-003-ref.xht
@@ -0,0 +1,39 @@
+<!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 reference</title>
+        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
+        <link rel="author" title="Florian Rivoal" href="https://florian.rivoal.net" />
+        <meta name="flags" content="ahem" />
+        <style type="text/css">
+            body
+            {
+                margin-left: 2em;
+            }
+            div
+            {
+                font: 16px/1em Ahem;
+            }
+            #test
+            {
+                display: list-item;
+            }
+            #ref1, #ref2
+            {
+                background: black;
+                display: inline-block;
+                height: 1em;
+                width: 2em;
+            }
+            #ref2
+            {
+                margin-left: 3em;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there are two squares below and the left most square has a marker bullet on the left-hand side.</p>
+        <div id="test">XX&nbsp;&nbsp;&nbsp;XX</div>
+        <div id="ref1"></div><div id="ref2"></div>
+    </body>
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-applies-to-003.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-applies-to-003.xht
@@ -1,15 +1,16 @@
 <!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: White-space application to 'display: list-item' element</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-white-space" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-prop" />
+        <link rel="match" href="white-space-applies-to-003-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'white-space' property applies to display: list-item elements." />
         <style type="text/css">
             body
             {
                 margin-left: 2em;
             }
             div
@@ -34,9 +35,9 @@
             }
         </style>
     </head>
     <body>
         <p>Test passes if there are two squares below and the left most square has a marker bullet on the left-hand side.</p>
         <div id="test">XX   XX</div>
         <div id="ref1"></div><div id="ref2"></div>
     </body>
-</html>
\ No newline at end of file
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-applies-to-005.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-applies-to-005.xht
@@ -1,15 +1,16 @@
 <!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: White-space application to 'display: inline-block' element</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-white-space" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-prop" />
+        <link rel="match" href="white-space-002-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'white-space' property applies to 'display: inline-block' elements." />
         <style type="text/css">
             div
             {
                 font: 16px/1em Ahem;
             }
             span
@@ -26,15 +27,15 @@
             }
             #div3
             {
                 margin-left: 3em;
             }
         </style>
     </head>
     <body>
-        <p>Test passes if there are only two boxes below.</p>
+        <p>Test passes if there are two black squares on the page.</p>
         <div>
             <span>XX   XX</span>
         </div>
         <div id="div2"></div><div id="div3"></div>
     </body>
-</html>
\ No newline at end of file
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-applies-to-006.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-applies-to-006.xht
@@ -1,15 +1,16 @@
 <!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: White-space application to 'display: table' element</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-white-space" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-prop" />
+        <link rel="match" href="white-space-002-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'white-space' property applies to 'display: table' elements." />
         <style type="text/css">
             div
             {
                 font: 16px/1em Ahem;
             }
             #table
@@ -34,17 +35,17 @@
             }
             #div2
             {
                 margin-left: 3em;
             }
         </style>
     </head>
     <body>
-        <p>Test passes if there are only two boxes below.</p>
+        <p>Test passes if there are two black squares on the page.</p>
         <div id="table">
             <div id="row">
                 <div id="cell">XX   XX</div>
             </div>
         </div>
         <div id="div1"></div><div id="div2"></div>
     </body>
-</html>
\ No newline at end of file
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-applies-to-007.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-applies-to-007.xht
@@ -1,15 +1,16 @@
 <!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: White-space application to 'display: inline-table' element</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-white-space" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-prop" />
+        <link rel="match" href="white-space-002-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'white-space' property applies to 'display: inline-table' elements." />
         <style type="text/css">
             div
             {
                 font: 16px/1em Ahem;
             }
             #table
@@ -34,19 +35,19 @@
             }
             #div2
             {
                 margin-left: 3em;
             }
         </style>
     </head>
     <body>
-        <p>Test passes if there are only two boxes below.</p>
+        <p>Test passes if there are two black squares on the page.</p>
         <div>
             <div id="table">
                 <div id="row">
                     <div id="cell">XX   XX</div>
                 </div>
             </div>
         </div>
         <div id="div1"></div><div id="div2"></div>
     </body>
-</html>
\ No newline at end of file
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-applies-to-008.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-applies-to-008.xht
@@ -1,15 +1,16 @@
 <!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: White-space application to 'display: table-row-group' element</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-white-space" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-prop" />
+        <link rel="match" href="white-space-002-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'white-space' property applies to 'display: table-row-group' elements." />
         <style type="text/css">
             div
             {
                 font: 16px/1em Ahem;
             }
             #table
@@ -39,19 +40,19 @@
             }
             #div2
             {
                 margin-left: 3em;
             }
         </style>
     </head>
     <body>
-        <p>Test passes if there are only two boxes below.</p>
+        <p>Test passes if there are two black squares on the page.</p>
         <div id="table">
             <div id="test">
                 <div id="row">
                     <div id="cell">XX   XX</div>
                 </div>
             </div>
         </div>
         <div id="div1"></div><div id="div2"></div>
     </body>
-</html>
\ No newline at end of file
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-applies-to-009.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-applies-to-009.xht
@@ -1,15 +1,16 @@
 <!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: White-space application to 'display: table-header-group' element</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-white-space" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-prop" />
+        <link rel="match" href="white-space-002-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'white-space' property applies to 'display: table-header-group' elements." />
         <style type="text/css">
             div
             {
                 font: 16px/1em Ahem;
             }
             #table
@@ -39,19 +40,19 @@
             }
             #div2
             {
                 margin-left: 3em;
             }
         </style>
     </head>
     <body>
-        <p>Test passes if there are only two boxes below.</p>
+        <p>Test passes if there are two black squares on the page.</p>
         <div id="table">
             <div id="test">
                 <div id="row">
                     <div id="cell">XX   XX</div>
                 </div>
             </div>
         </div>
         <div id="div1"></div><div id="div2"></div>
     </body>
-</html>
\ No newline at end of file
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-applies-to-010.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-applies-to-010.xht
@@ -1,15 +1,16 @@
 <!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: White-space application to 'display: table-footer-group' element</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-white-space" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-prop" />
+        <link rel="match" href="white-space-002-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'white-space' property applies to 'display: table-footer-group' elements." />
         <style type="text/css">
             div
             {
                 font: 16px/1em Ahem;
             }
             #table
@@ -39,19 +40,19 @@
             }
             #div2
             {
                 margin-left: 3em;
             }
         </style>
     </head>
     <body>
-        <p>Test passes if there are only two boxes below.</p>
+        <p>Test passes if there are two black squares on the page.</p>
         <div id="table">
             <div id="test">
                 <div id="row">
                     <div id="cell">XX   XX</div>
                 </div>
             </div>
         </div>
         <div id="div1"></div><div id="div2"></div>
     </body>
-</html>
\ No newline at end of file
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-applies-to-011.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-applies-to-011.xht
@@ -1,15 +1,16 @@
 <!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: White-space application to 'display:  table-row' element</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-white-space" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-prop" />
+        <link rel="match" href="white-space-002-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'white-space' property applies to 'display:  table-row' elements." />
         <style type="text/css">
             div
             {
                 font: 16px/1em Ahem;
             }
             #table
@@ -34,19 +35,19 @@
             }
             #div2
             {
                 margin-left: 3em;
             }
         </style>
     </head>
     <body>
-        <p>Test passes if there are only two boxes below.</p>
+        <p>Test passes if there are two black squares on the page.</p>
         <div>
             <div id="table">
                 <div id="row">
                     <div id="cell">XX   XX</div>
                 </div>
             </div>
         </div>
         <div id="div1"></div><div id="div2"></div>
     </body>
-</html>
\ No newline at end of file
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-applies-to-012.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-applies-to-012.xht
@@ -1,15 +1,16 @@
 <!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: White-space application to 'display: table-column-group' element</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-white-space" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-prop" />
+        <link rel="match" href="white-space-001-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'white-space' property is not applied to 'display: table-column-group' elements." />
         <style type="text/css">
             div
             {
                 font: 16px/1em Ahem;
             }
             #table
@@ -38,18 +39,18 @@
             }
             #div2
             {
                 margin-left: 1em;
             }
         </style>
     </head>
     <body>
-        <p>Test passes if there are only two boxes below.</p>
+        <p>Test passes if there are 2 filled black squares.</p>
         <div id="table">
             <div id="test"></div>
             <div id="row">
                 <div id="cell">XX   XX</div>
             </div>
         </div>
         <div id="div1"></div><div id="div2"></div>
     </body>
-</html>
\ No newline at end of file
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-applies-to-013.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-applies-to-013.xht
@@ -1,15 +1,16 @@
 <!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: White-space application to 'display: table-column' element</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-white-space" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-prop" />
+        <link rel="match" href="white-space-001-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'white-space' property is not applied to 'display: table-column' elements." />
         <style type="text/css">
             div
             {
                 font: 16px/1em Ahem;
             }
             #table
@@ -38,18 +39,18 @@
             }
             #div2
             {
                 margin-left: 1em;
             }
         </style>
     </head>
     <body>
-        <p>Test passes if there are only two boxes below.</p>
+        <p>Test passes if there are 2 filled black squares.</p>
         <div id="table">
             <div id="test"></div>
             <div id="row">
                 <div id="cell">XX   XX</div>
             </div>
         </div>
         <div id="div1"></div><div id="div2"></div>
     </body>
-</html>
\ No newline at end of file
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-applies-to-014.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-applies-to-014.xht
@@ -1,15 +1,16 @@
 <!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: White-space application to 'display: table-cell' element</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-white-space" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-prop" />
+        <link rel="match" href="white-space-002-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'white-space' property applies to 'display: table-cell' elements." />
         <style type="text/css">
             div
             {
                 font: 16px/1em Ahem;
             }
             #table
@@ -34,17 +35,17 @@
             }
             #div2
             {
                 margin-left: 3em;
             }
         </style>
     </head>
     <body>
-        <p>Test passes if there are only two boxes below.</p>
+        <p>Test passes if there are two black squares on the page.</p>
         <div id="table">
             <div id="row">
                 <div id="cell">XX   XX</div>
             </div>
         </div>
         <div id="div1"></div><div id="div2"></div>
     </body>
-</html>
\ No newline at end of file
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-applies-to-015.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-applies-to-015.xht
@@ -1,15 +1,16 @@
 <!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: White-space application to 'display: table-caption' element</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-white-space" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-prop" />
+        <link rel="match" href="white-space-002-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'white-space' property applies to 'display: table-caption' elements." />
         <style type="text/css">
             div
             {
                 font: 16px/1em Ahem;
             }
             #table
@@ -38,18 +39,18 @@
             }
             #div2
             {
                 margin-left: 3em;
             }
         </style>
     </head>
     <body>
-        <p>Test passes if there are only two boxes below.</p>
+        <p>Test passes if there are two black squares on the page.</p>
         <div id="table">
             <div id="caption">XX   XX</div>
             <div id="row">
                 <div id="cell"></div>
             </div>
         </div>
         <div id="div1"></div><div id="div2"></div>
     </body>
-</html>
\ No newline at end of file
+</html>
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-bidirectionality-001-ref.xht
@@ -0,0 +1,14 @@
+<!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 reference</title>
+        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
+        <link rel="author" title="Florian Rivoal" href="https://florian.rivoal.net" />
+    </head>
+    <body>
+        <p>Test passes if the following text is below "A  BC" (there can be two spaces between letters 'A' and 'B').</p>
+        <div>
+            <bdo>A&nbsp;&nbsp;BC</bdo>
+        </div>
+    </body>
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-bidirectionality-001.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-bidirectionality-001.xht
@@ -1,22 +1,24 @@
 <!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: White-space and bidirectionality (example from spec)</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-prop" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-1" />
+        <link rel="match" href="white-space-bidirectionality-001-ref.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The white space processing model does not take bidi into account for the first half of the processing model but does for the second half." />
         <style type="text/css">
             div
             {
                 white-space: normal;
             }
         </style>
     </head>
     <body>
         <p>Test passes if the following text is below "A  BC" (there can be two spaces between letters 'A' and 'B').</p>
         <div>
             <bdo dir="ltr">A <bdo dir="rtl"> B </bdo> C</bdo>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-collapsing-001.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-collapsing-001.xht
@@ -1,16 +1,17 @@
 <!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: white-space normal: collapsing through padding, borders, margins</title>
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-28 -->
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/text/white-space/normal/collapsing/001.html" type="text/html"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+  <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-1" />
   <link rel="match" href="white-space-collapsing-001-ref.xht" />
 
   <meta name="flags" content="ahem"/>
   <style type="text/css">
     .test { font: 1.25em/1 Ahem; background: white; color: red; }
     .test span { background: red; color: green; }
     .a, .b, .c, .d, .e { margin-left: 1em; }
     .f span { margin-left: 1em; }
--- a/testing/web-platform/tests/css/CSS2/text/white-space-collapsing-002.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-collapsing-002.xht
@@ -1,16 +1,17 @@
 <!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: white-space normal: collapsing through padding, borders, margins</title>
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-28 -->
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/text/white-space/normal/collapsing/002.html" type="text/html"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+  <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-1" />
   <link rel="match" href="white-space-collapsing-001-ref.xht" />
 
   <meta name="flags" content="ahem" />
   <style type="text/css">
     .test { font: 1.25em/1 Ahem; background: white; color: red; }
     .test span { background: red; color: green; }
     em { font: inherit; }
     .a, .b, .c, .d, .e { margin-left: 1em; }
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-collapsing-003-ref.xht
@@ -0,0 +1,22 @@
+<!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 reference</title>
+  <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
+  <link rel="author" title="Florian Rivoal" href="https://florian.rivoal.net"/>
+  <style type="text/css">
+   .test { margin: 0.25em; border: 0.25em solid navy; padding: 0.1em; background: blue; color: yellow; text-decoration: underline; width: 7em; text-align: center; font: 2em Ahem, monospace; }
+  </style>
+ </head>
+ <body>
+  <p>The following lines should all look identical:</p>
+  <div class="test">XXXX</div>
+  <div class="test">XXXX</div>
+  <div class="test">XXXX</div>
+  <div class="test">XXXX</div>
+  <div class="test"><span>XXXX</span></div>
+  <div class="test"><span>XXXX</span></div>
+  <div class="test"><span>XXXX</span></div>
+  <div class="test"><span>XXXX</span></div>
+ </body>
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-collapsing-003.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-collapsing-003.xht
@@ -1,15 +1,17 @@
 <!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: white-space normal: collapsing at line edges</title>
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/text/white-space/normal/collapsing/003.html" type="text/html"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+  <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-2" />
+  <link rel="match" href="white-space-collapsing-003-ref.xht" />
   <style type="text/css">
    .test { margin: 0.25em; border: 0.25em solid navy; padding: 0.1em; background: blue; color: yellow; text-decoration: underline; width: 7em; text-align: center; font: 2em Ahem, monospace; }
   </style>
  </head>
  <body>
   <p>The following lines should all look identical:</p>
   <div class="test a">XXXX</div>
   <div class="test b">XXXX </div>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-collapsing-004.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-collapsing-004.xht
@@ -1,16 +1,17 @@
 <!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: white-space normal: simple tests</title>
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-28 -->
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/text/white-space/normal/collapsing/none/001.html" type="text/html"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+  <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-1" />
   <link rel="match" href="white-space-collapsing-004-ref.xht" />
 
   <meta name="flags" content="ahem" />
 
   <style type="text/css">
    .test { font: 2.5em/1 Ahem; color: teal; background: aqua; white-space: normal; width: 3em; border: solid black; }
    .test span { display: none; color: red; background: maroon; }
    em { background: red; }
--- a/testing/web-platform/tests/css/CSS2/text/white-space-collapsing-005.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-collapsing-005.xht
@@ -1,16 +1,17 @@
 <!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: white-space normal: simple tests</title>
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-28 -->
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/text/white-space/normal/collapsing/none/002.html" type="text/html"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+  <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-1" />
   <link rel="match" href="white-space-collapsing-004-ref.xht" />
 
   <meta name="flags" content="ahem" />
 
   <style type="text/css">
    .test { font: 2.5em/1 Ahem; color: teal; background: aqua; white-space: normal; width: 3em; border: solid black; }
    .test span { display: none; color: red; background: maroon; }
    em { background: red; }
--- a/testing/web-platform/tests/css/CSS2/text/white-space-collapsing-bidi-001.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-collapsing-bidi-001.xht
@@ -1,16 +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" lang="en">
  <head>
   <title>CSS Test: White-space collapsing and the bidi algorithm</title>
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-29 -->
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/text/white-space/normal/collapsing/bidi/001.html" type="text/html"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#egbidiwscollapse" />
+  <link rel="help" href="https://www.w3.org/TR/css-writing-modes-3/#bidi-control-codes" />
+  <link rel="help" href="https://www.w3.org/TR/css-writing-modes-3/#bidi-box-model" />
+  <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-1" />
   <link rel="match" href="white-space-collapsing-bidi-001-ref.xht" />
 
   <meta name="flags" content="ahem" />
 
   <style type="text/css">
    td { background: red; padding: 0; border: solid; }
    .test span { color: aqua; background: yellow; font: 2.5em/1 Ahem; white-space: normal; }
    .reference .block { color: aqua; background: red; font: 2.5em/1 Ahem; white-space: normal; }
--- a/testing/web-platform/tests/css/CSS2/text/white-space-collapsing-bidi-002.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-collapsing-bidi-002.xht
@@ -1,16 +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" lang="en">
  <head>
   <title>CSS Test: White-space collapsing and the bidi algorithm (using &lt;dir&gt;)</title>
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-29 -->
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/text/white-space/normal/collapsing/bidi/002.html" type="text/html"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#egbidiwscollapse" />
+  <link rel="help" href="https://www.w3.org/TR/css-writing-modes-3/#bidi-control-codes" />
+  <link rel="help" href="https://www.w3.org/TR/css-writing-modes-3/#bidi-box-model" />
+  <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-1" />
   <link rel="match" href="white-space-collapsing-bidi-001-ref.xht" />
 
   <meta name="flags" content="ahem" />
 
   <style type="text/css">
    td { background: red; padding: 0; border: solid; }
    .test .test { color: aqua; background: yellow; font: 2.5em/1 Ahem; white-space: normal; }
    .reference .block { color: aqua; background: red; font: 2.5em/1 Ahem; white-space: normal; }
--- a/testing/web-platform/tests/css/CSS2/text/white-space-collapsing-bidi-003.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-collapsing-bidi-003.xht
@@ -1,16 +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" lang="en">
  <head>
   <title>CSS Test: Trailing spaces in table cells</title>
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-29 -->
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/text/white-space/normal/collapsing/bidi/003.html" type="text/html"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+  <link rel="help" href="https://www.w3.org/TR/css-writing-modes-3/#bidi-control-codes" />
+  <link rel="help" href="https://www.w3.org/TR/css-writing-modes-3/#bidi-box-model" />
+  <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-1" />
   <link rel="match" href="white-space-collapsing-bidi-003-ref.xht" />
 
   <meta name="flags" content="ahem" />
 
   <style type="text/css">
    td { border: solid; padding: 0; background: red; font: 1.25em/1 Ahem; color: green; white-space: normal; }
   </style>
  </head>
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-collapsing-breaks-001-ref.xht
@@ -0,0 +1,19 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+  <title>CSS Test reference</title>
+  <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/"/>
+  <link rel="author" title="Florian Rivoal" href="https:/florian.rivoal.net"/>
+  <style type="text/css">
+    div {
+      height: 2em;
+      background: green;
+    }
+  </style>
+
+ </head>
+ <body>
+  <p>There must be a green box below and no red.</p>
+  <div></div>
+ </body>
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-collapsing-breaks-001.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-collapsing-breaks-001.xht
@@ -1,14 +1,16 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
   <title>CSS Test: Line Breaking in Collapsed White Space</title>
   <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model"/>
+  <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-1"/>
+  <link rel="match" href="white-space-collapsing-breaks-001-ref.xht"/>
   <meta name="assert" content="Line break opportunities are determined before
     white space collapsing."/>
   <style type="text/css">
     .control {
       line-height: 1;
       height: 2em;
       background: red;
     }
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-generated-content-before-001-ref.xht
@@ -0,0 +1,15 @@
+<!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 Reference</title>
+        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
+        <link rel="author" title="Florian Rivoal" href="https://florian.rivoal.net/" />
+        <style type="text/css">
+        </style>
+    </head>
+    <body>
+        <p>Test passes if the two lines below have the exact same spacing.</p>
+        <div>The spacing on these two sentences need to be the same!</div>
+        <div>The spacing on these two sentences need to be the same!</div>
+    </body>
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-generated-content-before-001.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-generated-content-before-001.xht
@@ -1,14 +1,16 @@
 <!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: White-space 'pre-line' vs. ':before' assignment</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-prop" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-white-space-pre-line" />
+        <link rel="match" href="white-space-generated-content-before-001-ref.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The ':before' assignment and 'white-space: pre-line' assignment behave the same way with respect to white space." />
         <style type="text/css">
             #div1
             {
                 white-space: pre-line;
             }
             #div2:before
@@ -18,9 +20,9 @@
             }
         </style>
     </head>
     <body>
         <p>Test passes if the two lines below have the exact same spacing.</p>
         <div id="div1"> The   spacing  on      these         two  sentences need to be the    same!  </div>
         <div id="div2">two  sentences need to be the    same!  </div>
     </body>
-</html>
\ No newline at end of file
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-mixed-001.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-mixed-001.xht
@@ -6,16 +6,17 @@
  <!-- ================================================================ -->
 
  <head>
   <title>CSS Test: white-space: mixed tests</title>
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-29 -->
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/text/white-space/mixed/001.html" type="text/html"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+  <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-property" />
   <link rel="match" href="white-space-mixed-001-ref.xht" />
 
   <meta name="flags" content="ahem" />
 
   <style type="text/css">
    .test
    {
     background: yellow;
--- a/testing/web-platform/tests/css/CSS2/text/white-space-mixed-002.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-mixed-002.xht
@@ -1,16 +1,17 @@
 <!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: white-space: mixed tests (simple)</title>
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-29 -->
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/text/white-space/mixed/002.html" type="text/html"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+  <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-rules" />
   <link rel="match" href="white-space-mixed-002-ref.xht" />
 
   <meta name="flags" content="ahem" />
 
   <style type="text/css">
    .test { border: solid blue; font: 1.25em/1 Ahem; background: yellow; color: orange; float: left; clear: left; margin: 1em; }
    .normal { white-space: normal; }
    .nowrap { white-space: nowrap; }
--- a/testing/web-platform/tests/css/CSS2/text/white-space-mixed-003.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-mixed-003.xht
@@ -1,16 +1,17 @@
 <!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: white-space: mixed tests (simple)</title>
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-29 -->
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/text/white-space/mixed/003.html" type="text/html"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+  <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-property" />
   <link rel="match" href="white-space-mixed-003-ref.xht" />
 
   <meta name="flags" content="ahem" />
 
   <style type="text/css">
    .test { border: solid blue; font: 1.25em/1 Ahem; background: yellow; color: orange; float: left; margin: 1em; }
    .normal { white-space: normal; }
    .nowrap { white-space: nowrap; }
--- a/testing/web-platform/tests/css/CSS2/text/white-space-normal-001.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-normal-001.xht
@@ -1,16 +1,17 @@
 <!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: white-space normal: simple tests</title>
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-29 -->
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/text/white-space/normal/001.html" type="text/html"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+  <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-2" />
   <link rel="match" href="white-space-normal-001-ref.xht" />
 
   <meta name="flags" content="ahem" />
 
   <style type="text/css">
    * { white-space: normal; }
    div { display: block; }
    span { display: inline; }
--- a/testing/web-platform/tests/css/CSS2/text/white-space-normal-002.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-normal-002.xht
@@ -1,16 +1,18 @@
 <!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: white-space normal: simple tests</title>
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-29 -->
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/text/white-space/normal/002.html" type="text/html"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+  <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-2" />
+  <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-1" />
   <link rel="match" href="white-space-normal-001-ref.xht" />
 
   <meta name="flags" content="ahem" />
 
   <style type="text/css">
    * { white-space: normal; }
    div { display: block; }
    span { display: inline; }
--- a/testing/web-platform/tests/css/CSS2/text/white-space-normal-003.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-normal-003.xht
@@ -1,16 +1,17 @@
 <!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: white-space normal: UNICODE space characters</title>
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-29 -->
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/text/white-space/normal/003.html" type="text/html"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+  <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-rules" />
   <link rel="match" href="white-space-normal-003-ref.xht" />
 
   <meta name="flags" content="ahem" />
 
   <style type="text/css">
    /* setup */
    * { white-space: normal; font: inherit; }
    strong {font-weight: bold;}
--- a/testing/web-platform/tests/css/CSS2/text/white-space-normal-004.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-normal-004.xht
@@ -1,16 +1,17 @@
 <!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: white-space normal: UNICODE space characters with inline elements</title>
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-29 -->
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/text/white-space/normal/004.html" type="text/html"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+  <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-rules" />
   <link rel="match" href="white-space-normal-003-ref.xht" />
 
   <meta name="flags" content="ahem" />
 
   <style type="text/css">
    /* setup */
    * { white-space: normal; font: inherit; }
    strong {font-weight: bold;}
--- a/testing/web-platform/tests/css/CSS2/text/white-space-normal-005.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-normal-005.xht
@@ -1,16 +1,17 @@
 <!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: white-space normal: zero width non-breaking space</title>
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-29 -->
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/text/white-space/normal/005.html" type="text/html"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+  <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-rules" />
   <link rel="match" href="white-space-normal-005-ref.xht" />
 
   <meta name="flags" content="ahem" />
 
   <style type="text/css">
    /* setup */
    td * { white-space: normal; font: inherit; }
    div { display: block; }
--- a/testing/web-platform/tests/css/CSS2/text/white-space-normal-006.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-normal-006.xht
@@ -1,16 +1,17 @@
 <!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: white-space normal: zero width non-breaking space</title>
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-29 -->
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/text/white-space/normal/006.html" type="text/html"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+  <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-rules" />
   <link rel="match" href="white-space-normal-005-ref.xht" />
 
   <meta name="flags" content="ahem" />
 
   <style type="text/css">
    /* setup */
    td * { white-space: normal; font: inherit; }
    div { display: block; }
--- a/testing/web-platform/tests/css/CSS2/text/white-space-normal-007.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-normal-007.xht
@@ -4,16 +4,17 @@
  <!-- WARNING! This document contains significant trailing whitespace! -->
  <!-- ================================================================ -->
  <head>
   <title>CSS Test: white-space normal: zero width non-breaking space</title>
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-29 -->
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/text/white-space/normal/007.html" type="text/html" />
   <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+  <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-rules" />
   <link rel="match" href="white-space-normal-007-ref.xht" />
 
   <meta name="flags" content="ahem" />
 
   <style type="text/css">
    /* setup */
    * { white-space: normal; font: inherit; }
    strong {font-weight: bold;}
--- a/testing/web-platform/tests/css/CSS2/text/white-space-normal-008.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-normal-008.xht
@@ -1,16 +1,17 @@
 <!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: white-space normal: zero width non-breaking space</title>
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-29 -->
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/text/white-space/normal/008.html" type="text/html"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+  <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-rules" />
   <link rel="match" href="white-space-normal-008-ref.xht" />
 
   <meta name="flags" content="ahem" />
 
   <style type="text/css">
    /* setup */
    * { white-space: normal; font: inherit; }
    strong {font-weight: bold;}
--- a/testing/web-platform/tests/css/CSS2/text/white-space-normal-009.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-normal-009.xht
@@ -1,16 +1,17 @@
 <!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: white-space normal: zero width non-breaking space</title>
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-29 -->
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/text/white-space/normal/009.html" type="text/html"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+  <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-property" />
   <link rel="match" href="white-space-normal-009-ref.xht" />
 
   <meta name="flags" content="ahem" />
 
   <style type="text/css">
    /* setup */
    * { white-space: normal; font: inherit; }
    strong {font-weight: bold;}
--- a/testing/web-platform/tests/css/CSS2/text/white-space-nowrap-001.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-nowrap-001.xht
@@ -1,16 +1,17 @@
 <!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: white-space nowrap: basic test</title>
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-29 -->
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/text/white-space/nowrap/001.html" type="text/html"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+  <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-property" />
   <link rel="match" href="white-space-nowrap-001-ref.xht" />
 
   <meta name="flags" content="ahem" />
 
   <style type="text/css">
    .top { font: 20px/1 Ahem; }
    .outer { width: 10em; background: red; }
    .inner { width: 7em; color: lime; background: green; white-space: nowrap; }
--- a/testing/web-platform/tests/css/CSS2/text/white-space-nowrap-005.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-nowrap-005.xht
@@ -1,16 +1,17 @@
 <!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: white-space nowrap: zero width non-breaking space</title>
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-29 -->
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/text/white-space/nowrap/005.html" type="text/html"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+  <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-rules" />
   <link rel="match" href="white-space-normal-005-ref.xht" />
 
   <meta name="flags" content="ahem" />
 
   <style type="text/css">
    /* setup */
    td * { white-space: nowrap; font: inherit; }
    div { display: block; }
--- a/testing/web-platform/tests/css/CSS2/text/white-space-nowrap-006.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-nowrap-006.xht
@@ -1,16 +1,17 @@
 <!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: white-space nowrap: zero width non-breaking space</title>
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-29 -->
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/text/white-space/nowrap/006.html" type="text/html"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+  <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-rules" />
   <link rel="match" href="white-space-normal-005-ref.xht" />
 
   <meta name="flags" content="ahem" />
 
   <style type="text/css">
    /* setup */
    td * { white-space: nowrap; font: inherit; }
    div { display: block; }
--- a/testing/web-platform/tests/css/CSS2/text/white-space-nowrap-attribute-001.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-nowrap-attribute-001.xht
@@ -1,14 +1,15 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
         <title>CSS Test: White-space 'nowrap' vs. 'nowrap' attribute</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-prop" />
+        <link rel="match" href="white-space-generated-content-before-001-ref.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The 'nowrap' attribute and 'white-space: nowrap' assignment behave the same way with respect to white space." />
         <style type="text/css">
             div, td
             {
                 width: 2in;
             }
             div
@@ -29,9 +30,9 @@
         <p>Test passes if the two lines below have the exact same spacing.</p>
         <div>  The   spacing  on      these         two  sentences need to be the    same!  </div>
         <table cellspacing="0">
             <tr>
                 <td nowrap="nowrap">  The   spacing  on      these         two  sentences need to be the    same!  </td>
             </tr>
         </table>
     </body>
-</html>
\ No newline at end of file
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-p-element-001.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-p-element-001.xht
@@ -1,21 +1,23 @@
 <!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: White-space 'normal' vs. 'p' element</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-prop" />
+        <link rel="match" href="white-space-generated-content-before-001-ref.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The 'p' element and 'white-space: normal' assignment behave the same way with respect to white space." />
         <style type="text/css">
             div
             {
                 white-space: normal;
             }
+	    div + p { margin: 0; }
        </style>
     </head>
     <body>
         <p>Test passes if the two lines below have the exact same spacing.</p>
         <div> The   spacing  on      these         two  sentences need to be the    same!  </div>
         <p> The   spacing  on      these         two  sentences need to be the    same!  </p>
     </body>
-</html>
\ No newline at end of file
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-pre-001.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-pre-001.xht
@@ -1,16 +1,17 @@
 <!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: white-space pre: simple tests</title>
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-29 -->
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/text/white-space/pre/001.html" type="text/html"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+  <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-property" />
   <link rel="match" href="white-space-pre-001-ref.xht" />
 
   <meta name="flags" content="ahem" />
 
   <style type="text/css">
    pre { white-space: pre; font: 1.25em/1 Ahem; background: green; color: lime; }
   </style>
  </head>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-pre-005.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-pre-005.xht
@@ -1,16 +1,17 @@
 <!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: white-space pre: zero width non-breaking space</title>
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-29 -->
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/text/white-space/pre/005.html" type="text/html"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+  <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-rules" />
   <link rel="match" href="white-space-normal-005-ref.xht" />
 
   <meta name="flags" content="ahem" />
 
   <style type="text/css">
    /* setup */
    td * { white-space: pre; font: inherit; }
    div { display: block; }
--- a/testing/web-platform/tests/css/CSS2/text/white-space-pre-006.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-pre-006.xht
@@ -1,16 +1,17 @@
 <!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: white-space pre: zero width non-breaking space</title>
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-29 -->
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/text/white-space/pre/006.html" type="text/html"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+  <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-rules" />
   <link rel="match" href="white-space-normal-005-ref.xht" />
 
   <meta name="flags" content="ahem" />
 
   <style type="text/css">
    /* setup */
    td * { white-space: pre; font: inherit; }
    div { display: block; }
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-pre-element-001-ref.xht
@@ -0,0 +1,24 @@
+<!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 reference</title>
+        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
+        <link rel="author" title="Florian Rivoal" href="https://florian.rivoal.net" />
+        <style type="text/css">
+            pre, div
+            {
+                font-family: monospace;
+                font-size: 10pt;
+            }
+            div
+            {
+                white-space: pre;
+            }
+       </style>
+    </head>
+    <body>
+        <p>Test passes if the next two lines have the exact same spacing.</p>
+        <div> The   spacing  on      these         two  sentences need to be the    same!  </div>
+        <div> The   spacing  on      these         two  sentences need to be the    same!  </div>
+    </body>
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-pre-element-001.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-pre-element-001.xht
@@ -1,14 +1,15 @@
 <!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: White-space 'pre' vs. 'pre' element</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-prop" />
+        <link rel="match" href="white-space-pre-element-001-ref.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The 'pre' element and 'white-space: pre' assignment behave the same way with respect to white space." />
         <style type="text/css">
             pre, div
             {
                 font-family: monospace;
                 font-size: 10pt;
             }
@@ -18,9 +19,9 @@
             }
        </style>
     </head>
     <body>
         <p>Test passes if the next two lines have the exact same spacing.</p>
         <div> The   spacing  on      these         two  sentences need to be the    same!  </div>
         <pre> The   spacing  on      these         two  sentences need to be the    same!  </pre>
     </body>
-</html>
\ No newline at end of file
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-processing-001.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-processing-001.xht
@@ -1,14 +1,16 @@
 <!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: Block level elements with text and white space</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-1" />
+        <link rel="match" href="white-space-001-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="Text within a block element is treated like an anonymous inline element for white space processing model." />
         <style type="text/css">
             div
             {
                 font: 16px/1em Ahem;
             }
             #div1, #div2
@@ -20,13 +22,13 @@
             }
             #div2
             {
                 margin-left: 1em;
             }
        </style>
     </head>
     <body>
-        <p>Test passes if there are only two boxes below.</p>
+        <p>Test passes if there are 2 filled black squares.</p>
         <div>XX   XX</div>
         <div id="div1"></div><div id="div2"></div>
      </body>
 </html>
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-processing-002-ref.xht
@@ -0,0 +1,30 @@
+<!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 reference</title>
+        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
+        <link rel="author" title="Florian Rivoal" href="https://florian.rivoal.net/" />
+        <style type="text/css">
+            div
+            {
+                height: 1em;
+                margin-bottom: 3px;
+            }
+            #div1
+            {
+                background-color: black;
+                width: 2em;
+            }
+            #div2
+            {
+                background-color: blue;
+                width: 3em;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if the black box below is shorter than the blue box.</p>
+        <div id="div1"></div>
+        <div id="div2"></div>
+    </body>
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-processing-002.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-processing-002.xht
@@ -1,16 +1,18 @@
 <!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: White-space 'normal' with tab adjoining linefeed</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
-        <meta name="flags" content="ahem may" />
-        <meta name="assert" content="A tab before a linefeed is removed if 'white-space' is set to 'normal'. The linefeed may be rendered as a space or not rendered." />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-1" />
+        <link rel="match" href="white-space-processing-002-ref.xht" />
+        <meta name="flags" content="ahem" />
+        <meta name="assert" content="A tab before a linefeed is removed if 'white-space' is set to 'normal'." />
         <style type="text/css">
             div
             {
                 font-family: Ahem;
                 height: 1em;
                 margin-bottom: 3px;
                 width: 3em;
             }
@@ -20,13 +22,13 @@
             }
             #div2
             {
                 background-color: blue;
             }
         </style>
     </head>
     <body>
-        <p>Test passes if the black box below is the same width, or shorter, than the blue box.</p>
+        <p>Test passes if the black box below is shorter than the blue box.</p>
         <div id="div1">XX&#09;&#10;</div>
         <div id="div2"></div>
     </body>
-</html>
\ No newline at end of file
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-processing-003.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-processing-003.xht
@@ -1,16 +1,18 @@
 <!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: White-space 'nowrap' with tab adjoining linefeed</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
-        <meta name="flags" content="ahem may" />
-        <meta name="assert" content="A tab before a linefeed is removed if 'white-space' is set to 'nowrap'. The linefeed may be rendered as a space or not rendered." />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-1" />
+        <link rel="match" href="white-space-processing-002-ref.xht" />
+        <meta name="flags" content="ahem" />
+        <meta name="assert" content="A tab before a linefeed is removed if 'white-space' is set to 'nowrap'." />
         <style type="text/css">
             div
             {
                 font-family: Ahem;
                 height: 1em;
                 margin-bottom: 3px;
                 width: 3em;
             }
@@ -20,13 +22,13 @@
             }
             #div2
             {
                 background-color: blue;
             }
         </style>
     </head>
     <body>
-        <p>Test passes if the black box below is the same width, or shorter, than the blue box.</p>
+        <p>Test passes if the black box below is shorter than the blue box.</p>
         <div id="div1">XX&#09;&#10;</div>
         <div id="div2"></div>
     </body>
-</html>
\ No newline at end of file
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-processing-004.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-processing-004.xht
@@ -1,16 +1,18 @@
 <!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: White-space 'pre-line' with tab adjoining linefeed</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
-        <meta name="flags" content="ahem may" />
-        <meta name="assert" content="A tab before a linefeed is removed if 'white-space' is set to 'pre-line'. The linefeed may be rendered as a space or not rendered." />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-1" />
+        <link rel="match" href="white-space-processing-002-ref.xht" />
+        <meta name="flags" content="ahem" />
+        <meta name="assert" content="A tab before a linefeed is removed if 'white-space' is set to 'pre-line'." />
         <style type="text/css">
             div
             {
                 font-family: Ahem;
                 height: 1em;
                 margin-bottom: 3px;
                 width: 3em;
             }
@@ -20,13 +22,13 @@
             }
             #div2
             {
                 background-color: blue;
             }
         </style>
     </head>
     <body>
-        <p>Test passes if the black box below is the same width, or shorter, than the blue box.</p>
+        <p>Test passes if the black box below is shorter than the blue box.</p>
         <div id="div1">XX&#09;&#10;</div>
         <div id="div2"></div>
     </body>
-</html>
\ No newline at end of file
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-processing-008.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-processing-008.xht
@@ -1,32 +1,34 @@
 <!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: White-space 'normal' with space adjoining linefeed</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
-        <meta name="flags" content="ahem may" />
-        <meta name="assert" content="A space before a linefeed is removed if 'white-space' is set to 'normal'. The linefeed may be rendered as a space or not rendered." />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-1" />
+        <link rel="match" href="white-space-processing-002-ref.xht" />
+        <meta name="flags" content="ahem" />
+        <meta name="assert" content="A space before a linefeed is removed if 'white-space' is set to 'normal'." />
         <style type="text/css">
             div
             {
                 font-family: Ahem;
                 height: 1em;
                 margin-bottom: 3px;
                 width: 3em;
             }
             #div1
             {
-                white-space: normal;
+                white-space: pre;
             }
             #div2
             {
                 background-color: blue;
             }
         </style>
     </head>
     <body>
-        <p>Test passes if the black box below is the same width, or shorter, than the blue box.</p>
+        <p>Test passes if the black box below is shorter than the blue box.</p>
         <div id="div1">XX&#32;&#10;</div>
         <div id="div2"></div>
     </body>
-</html>
\ No newline at end of file
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-processing-009.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-processing-009.xht
@@ -1,16 +1,18 @@
 <!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: White-space 'nowrap' with space adjoining linefeed</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
-        <meta name="flags" content="ahem may" />
-        <meta name="assert" content="A space before a linefeed is removed if 'white-space' is set to 'nowrap'. The linefeed may be rendered as a space or not rendered." />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-1" />
+        <link rel="match" href="white-space-processing-002-ref.xht" />
+        <meta name="flags" content="ahem" />
+        <meta name="assert" content="A space before a linefeed is removed if 'white-space' is set to 'nowrap'." />
         <style type="text/css">
             div
             {
                 font-family: Ahem;
                 height: 1em;
                 margin-bottom: 3px;
                 width: 3em;
             }
@@ -20,13 +22,13 @@
             }
             #div2
             {
                 background-color: blue;
             }
         </style>
     </head>
     <body>
-        <p>Test passes if the black box below is the same width, or shorter, than the blue box.</p>
+        <p>Test passes if the black box below is shorter than the blue box.</p>
         <div id="div1">XX&#32;&#10;</div>
         <div id="div2"></div>
     </body>
-</html>
\ No newline at end of file
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-processing-010.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-processing-010.xht
@@ -1,16 +1,18 @@
 <!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: White-space 'pre-line' with space adjoining linefeed</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
-        <meta name="flags" content="ahem may" />
-        <meta name="assert" content="A space before a linefeed is removed if 'white-space' is set to 'pre-line'. The linefeed may be rendered as a space or not rendered." />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-1" />
+        <link rel="match" href="white-space-processing-002-ref.xht" />
+        <meta name="flags" content="ahem" />
+        <meta name="assert" content="A space before a linefeed is removed if 'white-space' is set to 'pre-line'." />
         <style type="text/css">
             div
             {
                 font-family: Ahem;
                 height: 1em;
                 margin-bottom: 3px;
                 width: 3em;
             }
@@ -20,13 +22,13 @@
             }
             #div2
             {
                 background-color: blue;
             }
         </style>
     </head>
     <body>
-        <p>Test passes if the black box below is the same width, or shorter, than the blue box.</p>
+        <p>Test passes if the black box below is shorter than the blue box.</p>
         <div id="div1">XX&#32;&#10;</div>
         <div id="div2"></div>
     </body>
-</html>
\ No newline at end of file
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-processing-011.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-processing-011.xht
@@ -1,14 +1,16 @@
 <!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: White-space 'pre' with sequence of spaces</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-1" />
+        <link rel="match" href="white-space-002-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="A sequence of spaces are not collapsed when 'white-space' is set to 'pre'." />
         <style type="text/css">
             div
             {
                 font: 16px/1em Ahem;
             }
             #div1
@@ -24,13 +26,13 @@
             }
             #div3
             {
                 margin-left: 3em;
             }
         </style>
     </head>
     <body>
-        <p>Test passes if there are only two boxes below.</p>
+        <p>Test passes if there are two black squares on the page.</p>
         <div id="div1">XX&#32;&#32;&#32;XX</div>
         <div id="div2"></div><div id="div3"></div>
     </body>
-</html>
\ No newline at end of file
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-processing-012.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-processing-012.xht
@@ -1,14 +1,16 @@
 <!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: White-space 'pre-wrap' with sequence of spaces</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-1" />
+        <link rel="match" href="white-space-002-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="Sequence of spaces are not collapsed when 'white-space' is set to 'pre-wrap'." />
         <style type="text/css">
             div
             {
                 font: 16px/1em Ahem;
             }
             #div1
@@ -24,13 +26,13 @@
             }
             #div3
             {
                 margin-left: 3em;
             }
         </style>
     </head>
     <body>
-        <p>Test passes if there are only two boxes below.</p>
+        <p>Test passes if there are two black squares on the page.</p>
         <div id="div1">XX&#32;&#32;&#32;XX</div>
         <div id="div2"></div><div id="div3"></div>
     </body>
-</html>
\ No newline at end of file
+</html>
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-processing-013-ref.xht
@@ -0,0 +1,21 @@
+<!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 reference</title>
+        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
+        <link rel="author" title="Florian Rivoal" href="https://florian.rivoal.net/" />
+        <meta name="flags" content="ahem" />
+        <style type="text/css">
+            div
+            {
+                font-family: Ahem;
+                line-height: 1em;
+                width: 5em;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there is one box below.</p>
+	<div>XX<br />XX</div>
+    </body>
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-processing-013.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-processing-013.xht
@@ -1,23 +1,25 @@
 <!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: White-space 'pre-wrap' and line opportunity with sequence of spaces</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-1" />
+        <link rel="match" href="white-space-processing-013-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="A line breaking opportunity is introduced at the end of a sequence of spaces when 'white-space' is set to 'pre-wrap'." />
         <style type="text/css">
             div
             {
                 font-family: Ahem;
                 line-height: 1em;
                 white-space: pre-wrap;
                 width: 5em;
             }
         </style>
     </head>
     <body>
         <p>Test passes if there is one box below.</p>
         <div>XX&#32;&#32;&#32;XX</div>
     </body>
-</html>
\ No newline at end of file
+</html>
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-processing-016-ref.xht
@@ -0,0 +1,21 @@
+<!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 reference</title>
+        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
+        <meta name="flags" content="ahem" />
+        <style type="text/css">
+            span
+            {
+                background-color: black;
+                font-family: Ahem;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there are two boxes below, one above the other.</p>
+        <div>
+	    <span>XX<br />XX</span>
+        </div>
+    </body>
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-processing-016.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-processing-016.xht
@@ -1,14 +1,17 @@
 <!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: White-space 'pre' and linefeed characters</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#line-break-transform" />
+        <link rel="match" href="white-space-processing-016-ref.xht" />
+
         <meta name="flags" content="ahem" />
         <meta name="assert" content="Linefeed characters are not transformed when 'white-space' is set to 'pre'." />
         <style type="text/css">
             span
             {
                 background-color: black;
                 font-family: Ahem;
                 white-space: pre;
@@ -16,9 +19,9 @@
         </style>
     </head>
     <body>
         <p>Test passes if there are two boxes below, one above the other.</p>
         <div>
             <span>XX&#10;XX</span>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-processing-017.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-processing-017.xht
@@ -1,14 +1,16 @@
 <!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: White-space 'pre-line' and linefeed characters</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#line-break-transform" />
+        <link rel="match" href="white-space-processing-016-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="Linefeed characters are not transformed when 'white-space' is set to 'pre-line'." />
         <style type="text/css">
             span
             {
                 background-color: black;
                 font-family: Ahem;
                 white-space: pre-line;
@@ -16,9 +18,9 @@
         </style>
     </head>
     <body>
         <p>Test passes if there are two boxes below, one above the other.</p>
         <div>
             <span>XX&#10;XX</span>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-processing-018.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-processing-018.xht
@@ -1,14 +1,16 @@
 <!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: White-space 'pre-wrap' and linefeed characters</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#line-break-transform" />
+        <link rel="match" href="white-space-processing-016-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="Linefeed characters are not transformed when 'white-space' is set to 'pre-wrap'." />
         <style type="text/css">
             span
             {
                 background-color: black;
                 font-family: Ahem;
                 white-space: pre-wrap;
@@ -16,9 +18,9 @@
         </style>
     </head>
     <body>
         <p>Test passes if there are two boxes below, one above the other.</p>
         <div>
             <span>XX&#10;XX</span>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-processing-019.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-processing-019.xht
@@ -1,36 +1,38 @@
 <!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: White-space 'normal' and tabs</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-1" />
+        <link rel="match" href="white-space-001-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="Tabs are converted to spaces when 'white-space' is set to 'normal'." />
         <style type="text/css">
             div
             {
                 font: 16px/1em Ahem;
             }
             #div1
             {
                 white-space: normal;
             }
             #div2, #div3
             {
                 background: black;
                 display: inline-block;
                 height: 1em;
-                width: 1em;
+                width: 2em;
             }
             #div3
             {
                 margin-left: 1em;
             }
         </style>
     </head>
     <body>
-        <p>Test passes if there are only two boxes below.</p>
-        <div id="div1">X&#09;X</div>
+        <p>Test passes if there are 2 filled black squares.</p>
+        <div id="div1">XX&#09;XX</div>
         <div id="div2"></div><div id="div3"></div>
     </body>
-</html>
\ No newline at end of file
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-processing-020.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-processing-020.xht
@@ -1,36 +1,38 @@
 <!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: White-space 'nowrap' and tabs</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-1" />
+        <link rel="match" href="white-space-001-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="Tabs are converted to spaces when 'white-space' is set to 'nowrap'." />
         <style type="text/css">
             div
             {
                 font: 16px/1em Ahem;
             }
             #div1
             {
                 white-space: nowrap;
             }
             #div2, #div3
             {
                 background: black;
                 display: inline-block;
                 height: 1em;
-                width: 1em;
+                width: 2em;
             }
             #div3
             {
                 margin-left: 1em;
             }
         </style>
     </head>
     <body>
-        <p>Test passes if there are only two boxes below.</p>
-        <div id="div1">X&#09;X</div>
+        <p>Test passes if there are 2 filled black squares.</p>
+        <div id="div1">XX&#09;XX</div>
         <div id="div2"></div><div id="div3"></div>
     </body>
-</html>
\ No newline at end of file
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-processing-021.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-processing-021.xht
@@ -1,36 +1,38 @@
 <!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: White-space 'pre-line' and tabs</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-1" />
+        <link rel="match" href="white-space-001-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="Tabs are converted to spaces when 'white-space' is set to 'pre-line'." />
         <style type="text/css">
             div
             {
                 font: 16px/1em Ahem;
             }
             #div1
             {
                 white-space: pre-line;
             }
             #div2, #div3
             {
                 background: black;
                 display: inline-block;
                 height: 1em;
-                width: 1em;
+                width: 2em;
             }
             #div3
             {
                 margin-left: 1em;
             }
         </style>
     </head>
     <body>
-        <p>Test passes if there are only two boxes below.</p>
-        <div id="div1">X&#09;X</div>
+        <p>Test passes if there are 2 filled black squares.</p>
+        <div id="div1">XX&#09;XX</div>
         <div id="div2"></div><div id="div3"></div>
     </body>
-</html>
\ No newline at end of file
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-processing-022.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-processing-022.xht
@@ -1,36 +1,38 @@
 <!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: White space processing model with 'space' characters</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-1" />
+        <link rel="match" href="white-space-001-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="One space with 'white-space' set to 'normal' adjoining a space with 'white-space' set to 'normal' collapse into one space." />
         <style type="text/css">
             div
             {
                 font: 16px/1em Ahem;
             }
             #div1
             {
                 white-space: normal;
             }
             #div2, #div3
             {
                 background: black;
                 display: inline-block;
                 height: 1em;
-                width: 1em;
+                width: 2em;
             }
             #div3
             {
                 margin-left: 1em;
             }
         </style>
     </head>
     <body>
-        <p>Test passes if there are only two boxes below.</p>
-        <div id="div1">X&#32;&#32;&#32;X</div>
+        <p>Test passes if there are 2 filled black squares.</p>
+        <div id="div1">XX&#32;&#32;&#32;XX</div>
         <div id="div2"></div><div id="div3"></div>
     </body>
-</html>
\ No newline at end of file
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-processing-023.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-processing-023.xht
@@ -1,14 +1,16 @@
 <!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: Two spaces adjoining with 'white-space' 'normal'/'nowrap'</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-1" />
+        <link rel="match" href="white-space-001-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="One space with 'white-space' set to 'normal' adjoining a space with 'white-space' set to 'nowrap' collapse into one space." />
         <style type="text/css">
             #div1
             {
                 font: 16px/1em Ahem;
             }
             #span1
@@ -19,27 +21,26 @@
             {
                 white-space: nowrap;
             }
             #div2, #div3
             {
                 background: black;
                 display: inline-block;
                 height: 1em;
-                width: 1em;
+                width: 2em;
             }
             #div3
             {
                 margin-left: 1em;
             }
         </style>
     </head>
     <body>
-        <p>Test passes if there are only two boxes below.</p>
+        <p>Test passes if there are 2 filled black squares.</p>
         <div id="div1">
-            <span id="span1">X&#32;</span>
-            <span id="span2">&#32;X</span>
+            <span id="span1">XX&#32;</span><span id="span2">&#32;XX</span>
             <div>
                 <div id="div2"></div><div id="div3"></div>
             </div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-processing-024.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-processing-024.xht
@@ -1,14 +1,16 @@
 <!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: Two spaces adjoining with 'white-space' 'normal'/'pre-line'</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-1" />
+        <link rel="match" href="white-space-001-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="One space with 'white-space' set to 'normal' adjoining a space with 'white-space' set to 'pre-line' collapse into one space." />
         <style type="text/css">
             #div1
             {
                 font: 16px/1em Ahem;
             }
             #span1
@@ -19,27 +21,26 @@
             {
                 white-space: pre-line;
             }
             #div2, #div3
             {
                 background: black;
                 display: inline-block;
                 height: 1em;
-                width: 1em;
+                width: 2em;
             }
             #div3
             {
                 margin-left: 1em;
             }
         </style>
     </head>
     <body>
-        <p>Test passes if there are only two boxes below.</p>
+        <p>Test passes if there are 2 filled black squares.</p>
         <div id="div1">
-            <span id="span1">X&#32;</span>
-            <span id="span2">&#32;X</span>
+            <span id="span1">XX&#32;</span><span id="span2">&#32;XX</span>
             <div>
                 <div id="div2"></div><div id="div3"></div>
             </div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-processing-025.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-processing-025.xht
@@ -1,14 +1,16 @@
 <!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: Two spaces adjoining with 'white-space' 'nowrap'/'normal'</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-1" />
+        <link rel="match" href="white-space-001-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="One space with 'white-space' set to 'nowrap' adjoining a space with 'white-space' set to 'normal' collapse into one space." />
         <style type="text/css">
             #div1
             {
                 font: 16px/1em Ahem;
             }
             #span1
@@ -19,27 +21,26 @@
             {
                 white-space: normal;
             }
             #div2, #div3
             {
                 background: black;
                 display: inline-block;
                 height: 1em;
-                width: 1em;
+                width: 2em;
             }
             #div3
             {
                 margin-left: 1em;
             }
         </style>
     </head>
     <body>
-        <p>Test passes if there are only two boxes below.</p>
+        <p>Test passes if there are 2 filled black squares.</p>
         <div id="div1">
-            <span id="span1">X&#32;</span>
-            <span id="span2">&#32;X</span>
+            <span id="span1">XX&#32;</span><span id="span2">&#32;XX</span>
             <div>
                 <div id="div2"></div><div id="div3"></div>
             </div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-processing-026.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-processing-026.xht
@@ -1,14 +1,16 @@
 <!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: Two spaces adjoining with 'white-space' 'nowrap'/'nowrap'</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-1" />
+        <link rel="match" href="white-space-001-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="One space with 'white-space' set to 'nowrap' adjoining a space with 'white-space' set to 'nowrap' collapse into one space." />
         <style type="text/css">
             #div1
             {
                 font: 16px/1em Ahem;
             }
             #span1
@@ -19,27 +21,26 @@
             {
                 white-space: nowrap;
             }
             #div2, #div3
             {
                 background: black;
                 display: inline-block;
                 height: 1em;
-                width: 1em;
+                width: 2em;
             }
             #div3
             {
                 margin-left: 1em;
             }
         </style>
     </head>
     <body>
-        <p>Test passes if there are only two boxes below.</p>
+        <p>Test passes if there are 2 filled black squares.</p>
         <div id="div1">
-            <span id="span1">X&#32;</span>
-            <span id="span2">&#32;X</span>
+            <span id="span1">XX&#32;</span><span id="span2">&#32;XX</span>
             <div>
                 <div id="div2"></div><div id="div3"></div>
             </div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-processing-027.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-processing-027.xht
@@ -1,14 +1,16 @@
 <!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: Two spaces adjoining with 'white-space' 'nowrap'/'pre-line'</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-1" />
+        <link rel="match" href="white-space-001-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="One space with 'white-space' set to 'nowrap' adjoining a space with 'white-space' set to 'pre-line' collapse into one space." />
         <style type="text/css">
             #div1
             {
                 font: 16px/1em Ahem;
             }
             #span1
@@ -19,27 +21,26 @@
             {
                 white-space: pre-line;
             }
             #div2, #div3
             {
                 background: black;
                 display: inline-block;
                 height: 1em;
-                width: 1em;
+                width: 2em;
             }
             #div3
             {
                 margin-left: 1em;
             }
         </style>
     </head>
     <body>
-        <p>Test passes if there are only two boxes below.</p>
+        <p>Test passes if there are 2 filled black squares.</p>
         <div id="div1">
-            <span id="span1">X&#32;</span>
-            <span id="span2">&#32;X</span>
+            <span id="span1">XX&#32;</span><span id="span2">&#32;XX</span>
             <div>
                 <div id="div2"></div><div id="div3"></div>
             </div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-processing-028.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-processing-028.xht
@@ -1,14 +1,16 @@
 <!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: Two spaces adjoining with 'white-space' 'pre-line'/'normal'</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-1" />
+        <link rel="match" href="white-space-001-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="One space with 'white-space' set to 'pre-line' adjoining a space with 'white-space' set to 'normal' collapse into one space." />
         <style type="text/css">
             #div1
             {
                 font: 16px/1em Ahem;
             }
             #span1
@@ -19,27 +21,26 @@
             {
                 white-space: normal;
             }
             #div2, #div3
             {
                 background: black;
                 display: inline-block;
                 height: 1em;
-                width: 1em;
+                width: 2em;
             }
             #div3
             {
                 margin-left: 1em;
             }
         </style>
     </head>
     <body>
-        <p>Test passes if there are only two boxes below.</p>
+        <p>Test passes if there are 2 filled black squares.</p>
         <div id="div1">
-            <span id="span1">X&#32;</span>
-            <span id="span2">&#32;X</span>
+            <span id="span1">XX&#32;</span><span id="span2">&#32;XX</span>
             <div>
                 <div id="div2"></div><div id="div3"></div>
             </div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-processing-029.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-processing-029.xht
@@ -1,14 +1,16 @@
 <!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: Two spaces adjoining with 'white-space' 'pre-line'/'nowrap'</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-1" />
+        <link rel="match" href="white-space-001-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="One space with 'white-space' set to 'pre-line' adjoining a space with 'white-space' set to 'nowrap' collapse into one space." />
         <style type="text/css">
             #div1
             {
                 font: 16px/1em Ahem;
             }
             #span1
@@ -19,27 +21,26 @@
             {
                 white-space: nowrap;
             }
             #div2, #div3
             {
                 background: black;
                 display: inline-block;
                 height: 1em;
-                width: 1em;
+                width: 2em;
             }
             #div3
             {
                 margin-left: 1em;
             }
         </style>
     </head>
     <body>
-        <p>Test passes if there are only two boxes below.</p>
+        <p>Test passes if there are 2 filled black squares.</p>
         <div id="div1">
-            <span id="span1">X&#32;</span>
-            <span id="span2">&#32;X</span>
+            <span id="span1">XX&#32;</span><span id="span2">&#32;XX</span>
             <div>
                 <div id="div2"></div><div id="div3"></div>
             </div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-processing-030.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-processing-030.xht
@@ -1,14 +1,16 @@
 <!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: Two spaces adjoining with 'white-space' 'pre-line'/'pre-line'</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-1" />
+        <link rel="match" href="white-space-001-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="One space with 'white-space' set to 'pre-line' adjoining a space with 'white-space' set to 'pre-line' collapse into one space." />
         <style type="text/css">
             #div1
             {
                 font: 16px/1em Ahem;
             }
             #span1
@@ -19,27 +21,26 @@
             {
                 white-space: pre-line;
             }
             #div2, #div3
             {
                 background: black;
                 display: inline-block;
                 height: 1em;
-                width: 1em;
+                width: 2em;
             }
             #div3
             {
                 margin-left: 1em;
             }
         </style>
     </head>
     <body>
-        <p>Test passes if there are only two boxes below.</p>
+        <p>Test passes if there are 2 filled black squares.</p>
         <div id="div1">
-            <span id="span1">X&#32;</span>
-            <span id="span2">&#32;X</span>
+            <span id="span1">XX&#32;</span><span id="span2">&#32;XX</span>
             <div>
                 <div id="div2"></div><div id="div3"></div>
             </div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-processing-031-ref.xht
@@ -0,0 +1,34 @@
+<!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 reference</title>
+        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
+        <link rel="author" title="Florian Rivoal" href="https://florian.rivoal.net" />
+        <style type="text/css">
+            div
+            {
+                height: 1em;
+            }
+            #div2, #div3
+            {
+                background: black;
+                display: inline-block;
+                height: 1em;
+                width: 1em;
+            }
+            #div3
+            {
+                margin-left: 2em;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there are only two boxes below.</p>
+            <div>
+                <div id="div2"></div><div id="div3"></div>
+            </div>
+            <div>
+                <div id="div2"></div><div id="div3"></div>
+            </div>
+    </body>
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-processing-031.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-processing-031.xht
@@ -1,14 +1,16 @@
 <!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: Two spaces adjoining with 'white-space' 'normal'/'pre'</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-1" />
+	<link rel="match" href="white-space-processing-031-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="One space with 'white-space' set to 'normal' adjoining a space with 'white-space' set to 'pre' remain two spaces." />
         <style type="text/css">
             #div1
             {
                 font: 16px/1em Ahem;
             }
             #span1
@@ -30,16 +32,15 @@
             {
                 margin-left: 2em;
             }
         </style>
     </head>
     <body>
         <p>Test passes if there are only two boxes below.</p>
         <div id="div1">
-            <span id="span1">X&#32;</span>
-            <span id="span2">&#32;X</span>
+            <span id="span1">X&#32;</span><span id="span2">&#32;X</span>
             <div>
                 <div id="div2"></div><div id="div3"></div>
             </div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-processing-032.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-processing-032.xht
@@ -1,14 +1,16 @@
 <!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: Two spaces adjoining with 'white-space' 'normal'/'pre-wrap'</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-1" />
+	<link rel="match" href="white-space-processing-031-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="One space with 'white-space' set to 'normal' adjoining a space with 'white-space' set to 'pre-wrap' remain two spaces." />
         <style type="text/css">
             #div1
             {
                 font: 16px/1em Ahem;
             }
             #span1
@@ -30,16 +32,15 @@
             {
                 margin-left: 2em;
             }
         </style>
     </head>
     <body>
         <p>Test passes if there are only two boxes below.</p>
         <div id="div1">
-            <span id="span1">X&#32;</span>
-            <span id="span2">&#32;X</span>
+            <span id="span1">X&#32;</span><span id="span2">&#32;X</span>
             <div>
                 <div id="div2"></div><div id="div3"></div>
             </div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-processing-033.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-processing-033.xht
@@ -1,14 +1,16 @@
 <!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: Two spaces adjoining with 'white-space' 'nowrap'/'pre'</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-1" />
+	<link rel="match" href="white-space-processing-031-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="One space with 'white-space' set to 'nowrap' adjoining a space with 'white-space' set to 'pre' remain two spaces." />
         <style type="text/css">
             #div1
             {
                 font: 16px/1em Ahem;
             }
             #span1
@@ -30,16 +32,15 @@
             {
                 margin-left: 2em;
             }
         </style>
     </head>
     <body>
         <p>Test passes if there are only two boxes below.</p>
         <div id="div1">
-            <span id="span1">X&#32;</span>
-            <span id="span2">&#32;X</span>
+            <span id="span1">X&#32;</span><span id="span2">&#32;X</span>
             <div>
                 <div id="div2"></div><div id="div3"></div>
             </div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-processing-034.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-processing-034.xht
@@ -1,14 +1,16 @@
 <!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: Two spaces adjoining with 'white-space' 'nowrap'/'pre-wrap'</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-1" />
+	<link rel="match" href="white-space-processing-031-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="One space with 'white-space' set to 'nowrap' adjoining a space with 'white-space' set to 'pre-wrap' remain two spaces." />
         <style type="text/css">
             #div1
             {
                 font: 16px/1em Ahem;
             }
             #span1
@@ -30,16 +32,15 @@
             {
                 margin-left: 2em;
             }
         </style>
     </head>
     <body>
         <p>Test passes if there are only two boxes below.</p>
         <div id="div1">
-            <span id="span1">X&#32;</span>
-            <span id="span2">&#32;X</span>
+            <span id="span1">X&#32;</span><span id="span2">&#32;X</span>
             <div>
                 <div id="div2"></div><div id="div3"></div>
             </div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-processing-035.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-processing-035.xht
@@ -1,14 +1,16 @@
 <!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: Two spaces adjoining with 'white-space' 'pre-line'/'pre'</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-1" />
+	<link rel="match" href="white-space-processing-031-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="One space with 'white-space' set to 'pre-line' adjoining a space with 'white-space' set to 'pre' retain two spaces." />
         <style type="text/css">
             #div1
             {
                 font: 16px/1em Ahem;
             }
             #span1
@@ -30,16 +32,15 @@
             {
                 margin-left: 2em;
             }
         </style>
     </head>
     <body>
         <p>Test passes if there are only two boxes below.</p>
         <div id="div1">
-            <span id="span1">X&#32;</span>
-            <span id="span2">&#32;X</span>
+            <span id="span1">X&#32;</span><span id="span2">&#32;X</span>
             <div>
                 <div id="div2"></div><div id="div3"></div>
             </div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-processing-036.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-processing-036.xht
@@ -1,14 +1,16 @@
 <!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: Two spaces adjoining with 'white-space' 'pre-line'/'pre-wrap'</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-1" />
+	<link rel="match" href="white-space-processing-031-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="One space with 'white-space' set to 'pre-line' adjoining a space with 'white-space' set to 'pre-wrap' retain two spaces." />
         <style type="text/css">
             #div1
             {
                 font: 16px/1em Ahem;
             }
             #span1
@@ -30,16 +32,15 @@
             {
                 margin-left: 2em;
             }
         </style>
     </head>
     <body>
         <p>Test passes if there are only two boxes below.</p>
         <div id="div1">
-            <span id="span1">X&#32;</span>
-            <span id="span2">&#32;X</span>
+            <span id="span1">X&#32;</span><span id="span2">&#32;X</span>
             <div>
                 <div id="div2"></div><div id="div3"></div>
             </div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-processing-037-ref.xht
@@ -0,0 +1,21 @@
+<!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: White-space 'normal' and space at beginning of line</title>
+        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
+        <link rel="author" title="Florian Rivoal" href="https://florian.rivoal.net" />
+        <style type="text/css">
+            div
+            {
+                background: black;
+                height: 1em;
+                width: 1em;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there is only one box below.</p>
+        <div></div>
+        <div></div>
+    </body>
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-processing-037.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-processing-037.xht
@@ -1,14 +1,16 @@
 <!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: White-space 'normal' and space at beginning of line</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-2" />
+        <link rel="match" href="white-space-processing-037-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="Space at beginning of line is removed when 'white-space' is set to 'normal'." />
         <style type="text/css">
             div
             {
                 font: 16px/1em Ahem;
             }
             #div1
@@ -23,9 +25,9 @@
             }
         </style>
     </head>
     <body>
         <p>Test passes if there is only one box below.</p>
         <div id="div1">&#32;X</div>
         <div id="div2"></div>
     </body>
-</html>
\ No newline at end of file
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-processing-039.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-processing-039.xht
@@ -1,14 +1,16 @@
 <!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: White-space 'pre-line' and space at beginning of line</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-2" />
+        <link rel="match" href="white-space-processing-037-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="Space at beginning of line is removed when 'white-space' is set to 'pre-line'." />
         <style type="text/css">
             div
             {
                 font: 16px/1em Ahem;
             }
             #div1
@@ -23,9 +25,9 @@
             }
         </style>
     </head>
     <body>
         <p>Test passes if there is only one box below.</p>
         <div id="div1">&#32;X</div>
         <div id="div2"></div>
     </body>
-</html>
\ No newline at end of file
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-processing-040.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-processing-040.xht
@@ -1,14 +1,16 @@
 <!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: White-space 'pre-wrap' and space at beginning of line</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-2" />
+        <link rel="match" href="white-space-processing-037-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="Space at beginning of line is not removed when 'white-space' is set to 'pre-wrap'." />
         <style type="text/css">
             div
             {
                 font: 16px/1em Ahem;
             }
             #div1
@@ -24,9 +26,9 @@
             }
         </style>
     </head>
     <body>
         <p>Test passes if there is only one box below.</p>
         <div id="div1">&#32;X</div>
         <div id="div2"></div>
     </body>
-</html>
\ No newline at end of file
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-processing-041.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-processing-041.xht
@@ -1,32 +1,34 @@
 <!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: White-space 'pre' and space at beginning of line</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-2" />
+        <link rel="match" href="white-space-processing-037-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="Space at beginning of line is not removed when 'white-space' is set to 'pre'." />
         <style type="text/css">
             div
             {
                 font: 16px/1em Ahem;
             }
             #div1
             {
                 white-space: pre;
+                margin-left: -1em;
             }
             #div2
             {
                 background: black;
                 height: 1em;
-                margin-left: 1em;
                 width: 1em;
             }
         </style>
     </head>
     <body>
         <p>Test passes if there is only one box below.</p>
         <div id="div1">&#32;X</div>
         <div id="div2"></div>
     </body>
-</html>
\ No newline at end of file
+</html>
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-processing-042-ref.xht
@@ -0,0 +1,34 @@
+<!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 reference</title>
+        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
+        <link rel="author" title="Florian Rivol" href="https://florian.rivoal.net" />
+        <style type="text/css">
+            div
+            {
+                height: 1em;
+            }
+            #div2, #div3
+            {
+                background: black;
+                display: inline-block;
+                height: 1em;
+                width: 2em;
+            }
+            #div3
+            {
+                margin-left: 6em;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there are only two boxes below.</p>
+        <div>
+            <div id="div2"></div><div id="div3"></div>
+        </div>
+        <div>
+            <div id="div2"></div><div id="div3"></div>
+        </div>
+    </body>
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-processing-042.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-processing-042.xht
@@ -1,14 +1,16 @@
 <!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: Tab width</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-2" />
+        <link rel="match" href="white-space-processing-042-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="Tabs (when rendered) render spaces at 8 character stops. That is, within a line, split the line into 8 character lengths. The tab would continue until the end of the next length. So if there are already 3 characters in a line, the tab would be rendered as 5 spaces." />
         <style type="text/css">
             div
             {
                 font: 16px/1em Ahem;
             }
             #div1
@@ -30,9 +32,9 @@
     </head>
     <body>
         <p>Test passes if there are only two boxes below.</p>
         <div>
             <div id="div1">XX&#09;XX</div>
             <div id="div2"></div><div id="div3"></div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-processing-043-ref.xht
@@ -0,0 +1,22 @@
+<!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 reference</title>
+        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
+        <link rel="author" title="Florian Rivoal" href="https://florian.rivoal.net" />
+        <meta name="flags" content="ahem" />
+        <style type="text/css">
+            span
+            {
+                font: 1.25em/1 Ahem;
+                white-space: normal;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there is <strong>no red</strong>.</p>
+        <div>
+            <span>X</span>
+        </div>
+    </body>
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-processing-043.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-processing-043.xht
@@ -1,15 +1,17 @@
 <!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: White-space 'normal' and space at end of line</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-08-11 -->
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-2" />
+        <link rel="match" href="white-space-processing-043-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="Space is removed at the end of the line when 'white-space' is set to 'normal'." />
         <style type="text/css">
             span
             {
                 background-color: red;
                 font: 1.25em/1 Ahem;
                 white-space: normal;
@@ -17,9 +19,9 @@
         </style>
     </head>
     <body>
         <p>Test passes if there is <strong>no red</strong>.</p>
         <div>
             <span>X&#32;</span>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-processing-044.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-processing-044.xht
@@ -1,15 +1,17 @@
 <!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: White-space 'nowrap' and space at end of line</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-08-11 -->
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-2" />
+        <link rel="match" href="white-space-processing-043-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="Space is removed at the end of the line when 'white-space' is set to 'nowrap'." />
         <style type="text/css">
             span
             {
                 background-color: red;
                 font: 1.25em/1 Ahem;
                 white-space: nowrap;
@@ -17,9 +19,9 @@
         </style>
     </head>
     <body>
         <p>Test passes if there is <strong>no red</strong>.</p>
         <div>
             <span>X&#32;</span>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-processing-045.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-processing-045.xht
@@ -1,15 +1,17 @@
 <!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: White-space 'pre-line' and space at end of line</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-08-11 -->
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-2" />
+        <link rel="match" href="white-space-processing-043-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="Space is removed at the end of the line when 'white-space' is set to 'pre-line'." />
         <style type="text/css">
             span
             {
                 background-color: red;
                 font: 1.25em/1 Ahem;
                 white-space: pre-line;
@@ -17,9 +19,9 @@
         </style>
     </head>
     <body>
         <p>Test passes if there is <strong>no red</strong>.</p>
         <div>
             <span>X&#32;</span>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-processing-046-ref.xht
@@ -0,0 +1,23 @@
+<!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 reference</title>
+        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
+        <link rel="author" title="Florian Rivoal" href="https://florian.rivoa.net" />
+        <meta name="flags" content="ahem" />
+        <style type="text/css">
+            span
+            {
+                background-color:black;
+                font-family: Ahem;
+                white-space: pre;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there is a box below.</p>
+        <div>
+            <span>&nbsp;</span>
+        </div>
+    </body>
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-processing-046.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-processing-046.xht
@@ -1,14 +1,16 @@
 <!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: White-space 'pre' and space at end of line</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-2" />
+        <link rel="match" href="white-space-processing-046-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="Space is not removed at the end of the line when 'white-space' is set to 'pre'." />
         <style type="text/css">
             span
             {
                 background-color:black;
                 font-family: Ahem;
                 white-space: pre;
@@ -16,9 +18,9 @@
         </style>
     </head>
     <body>
         <p>Test passes if there is a box below.</p>
         <div>
             <span>&#32;</span>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-processing-047.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-processing-047.xht
@@ -1,14 +1,16 @@
 <!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: White-space 'pre-wrap' and space at end of line</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-2" />
+        <link rel="match" href="white-space-processing-046-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="Space is not removed at the end of the line when 'white-space' is set to 'pre-wrap'." />
         <style type="text/css">
             span
             {
                 background-color: black;
                 font-family: Ahem;
                 white-space: pre-wrap;
@@ -16,9 +18,9 @@
         </style>
     </head>
     <body>
         <p>Test passes if there is a box below.</p>
         <div>
             <span>&#32;</span>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-processing-050.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-processing-050.xht
@@ -1,14 +1,16 @@
 <!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: White-space 'normal' on a 'pre' element</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-1" />
+        <link rel="match" href="white-space-001-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'white-space' property set to 'normal' removes extra spacing when two spaces are next to each other when set on 'pre' element." />
         <style type="text/css">
             pre
             {
                 font: 16px/1em Ahem;
                 margin: 0;
                 padding: 0;
@@ -30,13 +32,13 @@
                 background: black;
                 display: inline-block;
                 height: 1em;
                 width: 2em;
             }
         </style>
     </head>
     <body>
-        <p>Test passes if there are only two boxes below.</p>
+        <p>Test passes if there are 2 filled black squares.</p>
         <pre id="pre1">XX   XX</pre>
         <pre id="pre2"></pre><pre id="pre3"></pre>
     </body>
-</html>
\ No newline at end of file
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-processing-051.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-processing-051.xht
@@ -1,14 +1,16 @@
 <!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: White-space 'nowrap' on a 'pre' element</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-1" />
+        <link rel="match" href="white-space-001-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'white-space' property set to 'nowrap' does not remove extra spacing when two spaces are next to each other." />
         <style type="text/css">
             pre
             {
                 font: 16px/1em Ahem;
                 margin: 0;
                 padding: 0;
@@ -27,13 +29,13 @@
             }
             #pre3
             {
                 margin-left: 1em;
             }
         </style>
     </head>
     <body>
-        <p>Test passes if there are only two boxes below.</p>
+        <p>Test passes if there are 2 filled black squares.</p>
         <pre id="pre1">XX   XX</pre>
         <pre id="pre2"></pre><pre id="pre3"></pre>
     </body>
-</html>
\ No newline at end of file
+</html>
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-processing-052-ref.xht
@@ -0,0 +1,34 @@
+<!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 reference</title>
+        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
+        <link rel="author" title="Florian Rivoal" href="https://florian.rivoal.net" />
+        <meta name="flags" content="ahem" />
+        <style type="text/css">
+            pre
+            {
+                font: 16px/1em Ahem;
+                margin: 0;
+                padding: 0;
+            }
+            #pre1
+            {
+                white-space: pre-wrap;
+                width: 5em;
+            }
+            #pre2
+            {
+                background: black;
+                display: inline-block;
+                height: 1em;
+                width: 2em;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there is one box below.</p>
+	<pre id="pre1">XX<br />XX</pre>
+        <pre id="pre2"></pre>
+    </body>
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-processing-052.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-processing-052.xht
@@ -1,14 +1,16 @@
 <!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: White-space 'pre-wrap' on a 'pre' element</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-1" />
+        <link rel="match" href="white-space-processing-052-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'white-space' property set to 'pre-wrap' does not remove extra spacing when two spaces are next to each other and introduces line breaking opportunities when set on a 'pre' element." />
         <style type="text/css">
             pre
             {
                 font: 16px/1em Ahem;
                 margin: 0;
                 padding: 0;
@@ -27,9 +29,9 @@
             }
         </style>
     </head>
     <body>
         <p>Test passes if there is one box below.</p>
         <pre id="pre1">XX  XX</pre>
         <pre id="pre2"></pre>
     </body>
-</html>
\ No newline at end of file
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-processing-053.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-processing-053.xht
@@ -1,14 +1,16 @@
 <!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: White-space 'pre-line' on a 'pre' element</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-1" />
+        <link rel="match" href="white-space-processing-052-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'white-space' property set to 'pre-line' does remove extra spacing when two spaces are next to each other and breaks at new lines when set on a 'pre' element." />
         <style type="text/css">
             pre
             {
                 font: 16px/1em Ahem;
                 margin: 0;
                 padding: 0;
@@ -27,9 +29,9 @@
         </style>
     </head>
     <body>
         <p>Test passes if there is one box below.</p>
         <pre id="pre1">  XX
         XX</pre>
         <pre id="pre2"></pre>
     </body>
-</html>
\ No newline at end of file
+</html>
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-processing-054-ref.xht
@@ -0,0 +1,30 @@
+<!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 reference</title>
+        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
+        <link rel="author" title="Florian Rivoal" href="https://florian.rivoal.net/" />
+        <style type="text/css">
+            div
+            {
+                height: 1em;
+            }
+            #div2, #div3
+            {
+                background: black;
+                display: inline-block;
+                height: 1em;
+                width: 2em;
+            }
+            #div3
+            {
+                margin-left: 1.5em;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there are only two boxes below.</p>
+	<div><div id="div2"></div><div id="div3"></div></div>
+	<div><div id="div2"></div><div id="div3"></div></div>
+    </body>
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-processing-054.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-processing-054.xht
@@ -1,14 +1,16 @@
 <!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: White space processing model with 'en quad' characters</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-rules" />
+        <link rel="match" href="white-space-processing-054-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="An 'en quad' characters is not collapsed by the white space processing model." />
         <style type="text/css">
             div
             {
                 font: 16px/1em Ahem;
             }
             #div1
@@ -28,9 +30,9 @@
             }
         </style>
     </head>
     <body>
         <p>Test passes if there are only two boxes below.</p>
         <div id="div1">XX&#8192;&#8192;&#8192;XX</div>
         <div id="div2"></div><div id="div3"></div>
     </body>
-</html>
\ No newline at end of file
+</html>
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-processing-055-ref.xht
@@ -0,0 +1,22 @@
+<!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 reference</title>
+        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
+        <link rel="author" title="Florian Rivoal" href="https://florian.rivoal.net" />
+        <style type="text/css">
+            div
+            {
+                font: 16px/1em Ahem;
+                background: black;
+                display: inline-block;
+                height: 2em;
+                width: 4em;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there is only one box below.</p>
+        <div></div>
+    </body>
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-processing-055.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-processing-055.xht
@@ -1,14 +1,16 @@
 <!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: White space processing model with 'zero width no break space' character</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-rules" />
+        <link rel="match" href="white-space-processing-055-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="A 'zero width no break space' character is not collapsed by the white space processing model." />
         <style type="text/css">
             div
             {
                 font: 16px/1em Ahem;
             }
             #div1
@@ -24,9 +26,9 @@
             }
         </style>
     </head>
     <body>
         <p>Test passes if there is only one box below.</p>
         <div id="div1">XX&#65279;&#65279;&#65279;XX</div>
         <div id="div2"></div>
     </body>
-</html>
\ No newline at end of file
+</html>
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-processing-056-ref.xht
@@ -0,0 +1,29 @@
+<!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 reference</title>
+        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
+        <link rel="author" title="Florian Rivoal" href="https://florian.rivoal.net" />
+        <style type="text/css">
+            div
+            {
+                font-size: 1.25em;
+            }
+            #div2, #div3
+            {
+                background: black;
+                display: inline-block;
+                height: 2em;
+                width: 2em;
+            }
+            #div3
+            {
+                margin-left: 3em;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there are 2 small filled black squares.</p>
+        <div id="div2"></div><div id="div3"></div>
+    </body>
+</html>
--- a/testing/web-platform/tests/css/CSS2/text/white-space-processing-056.xht
+++ b/testing/web-platform/tests/css/CSS2/text/white-space-processing-056.xht
@@ -1,14 +1,16 @@
 <!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: White space processing model with 'ideographic space' character</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-rules" />
+        <link rel="match" href="white-space-processing-056-ref.xht" />
 
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'ideographic space' character is not collapsed by the white space processing model." />
         <style type="text/css">
             div
             {
                 font: 1.25em/1 Ahem;
             }
@@ -29,9 +31,9 @@
             }
         </style>
     </head>
     <body>
         <p>Test passes if there are 2 small filled black squares.</p>
         <div id="div1">XX&#12288;&#12288;&#12288;XX</div>
         <div id="div2"></div><div id="div3"></div>
     </body>
-</html>
\ No newline at end of file
+</html>