Finish migration to MathML WPT tests
authorfred.wang@free.fr <fred.wang@free.fr@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 14 Mar 2018 16:18:01 +0000 (16:18 +0000)
committerfred.wang@free.fr <fred.wang@free.fr@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 14 Mar 2018 16:18:01 +0000 (16:18 +0000)
https://bugs.webkit.org/show_bug.cgi?id=183628

Patch by Frederic Wang <fwang@igalia.com> on 2018-03-14
Reviewed by Manuel Rego Casasnovas.

In r225162, the MathML tests from the WPT repository were imported. They were intended to
replace the ones in imported/mathml-in-html5 but the migration was not fully possible. The
main issue was that many MathML tests use Web fonts to test the use of OpenType parameters
but document.fonts.ready is unreliable in WebKit (bug 174030). A workaround was implemented
in WPT ( https://github.com/w3c/web-platform-tests/pull/10025 ) so this commit finishes
the migration. We update the WPT MathML tests and now run them all, we remove
imported/mathml-in-html5 and the associated TestExpectations failures. Two cases unrelated to
font loading are still failing: One for the SuperscriptShiftUpCramped parameter (bug 156401)
and one for the RadicalDegreeBottomRaisePercent parameter (bug 183631).

LayoutTests/imported/w3c:

Reviewed by Manuel Rego Casasnovas.

* web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-1-expected.txt: Renamed from LayoutTests/imported/mathml-in-html5/mathml/presentation-markup/fractions/frac-parameters-1-expected.txt.
* web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-1.html: Import font loading workaround.
* web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-2-expected.txt: Renamed from LayoutTests/imported/mathml-in-html5/mathml/presentation-markup/fractions/frac-parameters-2-expected.txt.
* web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-2.html: Import font loading workaround.
* web-platform-tests/mathml/presentation-markup/operators/mo-axis-height-1.html: Import font loading workaround.
* web-platform-tests/mathml/presentation-markup/radicals/root-parameters-1-expected.txt: Renamed from LayoutTests/imported/mathml-in-html5/mathml/presentation-markup/radicals/root-parameters-1-expected.txt.
Also add the failure with RadicalDegreeBottomRaisePercent.
* web-platform-tests/mathml/presentation-markup/radicals/root-parameters-1.html: Import font loading workaround.
* web-platform-tests/mathml/presentation-markup/scripts/subsup-parameters-1-expected.txt: Renamed from LayoutTests/imported/mathml-in-html5/mathml/presentation-markup/scripts/subsup-parameters-1-expected.txt.
Also add the failure for SuperscriptShiftUpCramped.
* web-platform-tests/mathml/presentation-markup/scripts/subsup-parameters-1.html: Import font loading workaround.
* web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-1-expected.txt: Renamed from LayoutTests/imported/mathml-in-html5/mathml/presentation-markup/scripts/underover-parameters-1-expected.txt.
* web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-1.html: Import font loading workaround.
* web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-2-expected.txt: Renamed from LayoutTests/imported/mathml-in-html5/mathml/presentation-markup/scripts/underover-parameters-2-expected.txt.
* web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-2.html: Import font loading workaround.
* web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-3-expected.txt: Renamed from LayoutTests/imported/mathml-in-html5/mathml/presentation-markup/scripts/underover-parameters-3-expected.txt.
* web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-3.html: Import font loading workaround.
* web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-4-expected.txt: Renamed from LayoutTests/imported/mathml-in-html5/mathml/presentation-markup/scripts/underover-parameters-4-expected.txt.
* web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-4.html: Import font loading workaround.
* web-platform-tests/mathml/presentation-markup/tables/table-axis-height.html: Import font loading workaround.
* web-platform-tests/mathml/relations/css-styling/displaystyle-1.html: Import font loading workaround.
* web-platform-tests/mathml/relations/css-styling/lengths-3.html: Import font loading workaround.
* web-platform-tests/mathml/tools/utils/misc.py: Import update to Python 3.
(downloadWithProgressBar):

LayoutTests:

* TestExpectations: Unskip MathML WPT tests.
* imported/mathml-in-html5/LICENSE: Removed.
* imported/mathml-in-html5/README.md: Removed.
* imported/mathml-in-html5/mathml/presentation-markup/fractions/frac-parameters-1.html: Removed.
* imported/mathml-in-html5/mathml/presentation-markup/fractions/frac-parameters-2.html: Removed.
* imported/mathml-in-html5/mathml/presentation-markup/radicals/root-parameters-1.html: Removed.
* imported/mathml-in-html5/mathml/presentation-markup/scripts/subsup-parameters-1.html: Removed.
* imported/mathml-in-html5/mathml/presentation-markup/scripts/underover-parameters-1.html: Removed.
* imported/mathml-in-html5/mathml/presentation-markup/scripts/underover-parameters-2.html: Removed.
* imported/mathml-in-html5/mathml/presentation-markup/scripts/underover-parameters-3.html: Removed.
* imported/mathml-in-html5/mathml/presentation-markup/scripts/underover-parameters-4.html: Removed.
* platform/mac-wk2/TestExpectations: Remove the expectation.
* platform/win/TestExpectations: Remove the expectation.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@229601 268f45cc-cd09-0410-ab3c-d52691b4dbfc

36 files changed:
LayoutTests/ChangeLog
LayoutTests/TestExpectations
LayoutTests/imported/mathml-in-html5/LICENSE [deleted file]
LayoutTests/imported/mathml-in-html5/README.md [deleted file]
LayoutTests/imported/mathml-in-html5/mathml/presentation-markup/fractions/frac-parameters-1.html [deleted file]
LayoutTests/imported/mathml-in-html5/mathml/presentation-markup/fractions/frac-parameters-2.html [deleted file]
LayoutTests/imported/mathml-in-html5/mathml/presentation-markup/radicals/root-parameters-1.html [deleted file]
LayoutTests/imported/mathml-in-html5/mathml/presentation-markup/scripts/subsup-parameters-1.html [deleted file]
LayoutTests/imported/mathml-in-html5/mathml/presentation-markup/scripts/underover-parameters-1.html [deleted file]
LayoutTests/imported/mathml-in-html5/mathml/presentation-markup/scripts/underover-parameters-2.html [deleted file]
LayoutTests/imported/mathml-in-html5/mathml/presentation-markup/scripts/underover-parameters-3.html [deleted file]
LayoutTests/imported/mathml-in-html5/mathml/presentation-markup/scripts/underover-parameters-4.html [deleted file]
LayoutTests/imported/w3c/ChangeLog
LayoutTests/imported/w3c/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-1-expected.txt [moved from LayoutTests/imported/mathml-in-html5/mathml/presentation-markup/fractions/frac-parameters-1-expected.txt with 100% similarity]
LayoutTests/imported/w3c/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-1.html
LayoutTests/imported/w3c/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-2-expected.txt [moved from LayoutTests/imported/mathml-in-html5/mathml/presentation-markup/fractions/frac-parameters-2-expected.txt with 100% similarity]
LayoutTests/imported/w3c/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-2.html
LayoutTests/imported/w3c/web-platform-tests/mathml/presentation-markup/operators/mo-axis-height-1.html
LayoutTests/imported/w3c/web-platform-tests/mathml/presentation-markup/radicals/root-parameters-1-expected.txt [moved from LayoutTests/imported/mathml-in-html5/mathml/presentation-markup/radicals/root-parameters-1-expected.txt with 58% similarity]
LayoutTests/imported/w3c/web-platform-tests/mathml/presentation-markup/radicals/root-parameters-1.html
LayoutTests/imported/w3c/web-platform-tests/mathml/presentation-markup/scripts/subsup-parameters-1-expected.txt [moved from LayoutTests/imported/mathml-in-html5/mathml/presentation-markup/scripts/subsup-parameters-1-expected.txt with 71% similarity]
LayoutTests/imported/w3c/web-platform-tests/mathml/presentation-markup/scripts/subsup-parameters-1.html
LayoutTests/imported/w3c/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-1-expected.txt [moved from LayoutTests/imported/mathml-in-html5/mathml/presentation-markup/scripts/underover-parameters-1-expected.txt with 100% similarity]
LayoutTests/imported/w3c/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-1.html
LayoutTests/imported/w3c/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-2-expected.txt [moved from LayoutTests/imported/mathml-in-html5/mathml/presentation-markup/scripts/underover-parameters-2-expected.txt with 100% similarity]
LayoutTests/imported/w3c/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-2.html
LayoutTests/imported/w3c/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-3-expected.txt [moved from LayoutTests/imported/mathml-in-html5/mathml/presentation-markup/scripts/underover-parameters-3-expected.txt with 100% similarity]
LayoutTests/imported/w3c/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-3.html
LayoutTests/imported/w3c/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-4-expected.txt [moved from LayoutTests/imported/mathml-in-html5/mathml/presentation-markup/scripts/underover-parameters-4-expected.txt with 100% similarity]
LayoutTests/imported/w3c/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-4.html
LayoutTests/imported/w3c/web-platform-tests/mathml/presentation-markup/tables/table-axis-height.html
LayoutTests/imported/w3c/web-platform-tests/mathml/relations/css-styling/displaystyle-1.html
LayoutTests/imported/w3c/web-platform-tests/mathml/relations/css-styling/lengths-3.html
LayoutTests/imported/w3c/web-platform-tests/mathml/tools/utils/misc.py
LayoutTests/platform/mac-wk2/TestExpectations
LayoutTests/platform/win/TestExpectations

index c301810..758bd1a 100644 (file)
@@ -1,3 +1,34 @@
+2018-03-14  Frederic Wang  <fwang@igalia.com>
+
+        Finish migration to MathML WPT tests
+        https://bugs.webkit.org/show_bug.cgi?id=183628
+
+        Reviewed by Manuel Rego Casasnovas.
+
+        In r225162, the MathML tests from the WPT repository were imported. They were intended to
+        replace the ones in imported/mathml-in-html5 but the migration was not fully possible. The
+        main issue was that many MathML tests use Web fonts to test the use of OpenType parameters
+        but document.fonts.ready is unreliable in WebKit (bug 174030). A workaround was implemented
+        in WPT ( https://github.com/w3c/web-platform-tests/pull/10025 ) so this commit finishes
+        the migration. We update the WPT MathML tests and now run them all, we remove
+        imported/mathml-in-html5 and the associated TestExpectations failures. Two cases unrelated to
+        font loading are still failing: One for the SuperscriptShiftUpCramped parameter (bug 156401)
+        and one for the RadicalDegreeBottomRaisePercent parameter (bug 183631).
+
+        * TestExpectations: Unskip MathML WPT tests.
+        * imported/mathml-in-html5/LICENSE: Removed.
+        * imported/mathml-in-html5/README.md: Removed.
+        * imported/mathml-in-html5/mathml/presentation-markup/fractions/frac-parameters-1.html: Removed.
+        * imported/mathml-in-html5/mathml/presentation-markup/fractions/frac-parameters-2.html: Removed.
+        * imported/mathml-in-html5/mathml/presentation-markup/radicals/root-parameters-1.html: Removed.
+        * imported/mathml-in-html5/mathml/presentation-markup/scripts/subsup-parameters-1.html: Removed.
+        * imported/mathml-in-html5/mathml/presentation-markup/scripts/underover-parameters-1.html: Removed.
+        * imported/mathml-in-html5/mathml/presentation-markup/scripts/underover-parameters-2.html: Removed.
+        * imported/mathml-in-html5/mathml/presentation-markup/scripts/underover-parameters-3.html: Removed.
+        * imported/mathml-in-html5/mathml/presentation-markup/scripts/underover-parameters-4.html: Removed.
+        * platform/mac-wk2/TestExpectations: Remove the expectation.
+        * platform/win/TestExpectations: Remove the expectation.
+
 2018-03-13  John Wilander  <wilander@apple.com>
 
         Resource Load Statistics: Immediately forward cookie access for domains with previous user interaction when there's an opener document
index eb9725e..54fddee 100644 (file)
@@ -591,17 +591,6 @@ imported/w3c/web-platform-tests/dom/nodes/Document-createElement-namespace.html
 imported/w3c/web-platform-tests/html/browsers/windows/nested-browsing-contexts/frameElement.sub.html [ Pass Failure ]
 imported/w3c/web-platform-tests/html/browsers/windows/targeting-cross-origin-nested-browsing-contexts.sub.html [ Pass Failure ]
 
-# These MathML WPT tests are skipped because they are executed before Web fonts are available.
-# For now, tweaked versions remain in LayoutTests/imported/mathml-in-html5/.
-webkit.org/b/174030 imported/w3c/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-4.html [ Skip ]
-webkit.org/b/174030 imported/w3c/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-1.html [ Skip ]
-webkit.org/b/174030 imported/w3c/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-2.html [ Skip ]
-webkit.org/b/174030 imported/w3c/web-platform-tests/mathml/presentation-markup/scripts/subsup-parameters-1.html [ Skip ]
-webkit.org/b/174030 imported/w3c/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-3.html [ Skip ]
-webkit.org/b/174030 imported/w3c/web-platform-tests/mathml/presentation-markup/radicals/root-parameters-1.html [ Skip ]
-webkit.org/b/174030 imported/w3c/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-1.html [ Skip ]
-webkit.org/b/174030 imported/w3c/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-2.html [ Skip ]
-
 # These MathML WPT tests fail.
 webkit.org/b/180013 imported/w3c/web-platform-tests/mathml/relations/css-styling/lengths-1.html [ ImageOnlyFailure ]
 webkit.org/b/180013 imported/w3c/web-platform-tests/mathml/relations/css-styling/lengths-2.html [ ImageOnlyFailure ]
diff --git a/LayoutTests/imported/mathml-in-html5/LICENSE b/LayoutTests/imported/mathml-in-html5/LICENSE
deleted file mode 100644 (file)
index f3d6617..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-This repository is covered by the dual-licensing approach described in:
-
-    http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
diff --git a/LayoutTests/imported/mathml-in-html5/README.md b/LayoutTests/imported/mathml-in-html5/README.md
deleted file mode 100644 (file)
index c5bba1a..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-# Tests for the MathML in HTML5 implementation note
-
-This repository contains tests for the
-[MathML in HTML5 implementation note](http://www.mathml-association.org/MathMLinHTML5/).
-We follow the formats and conventions of
-[W3C's Test the Web Forward Project](http://testthewebforward.org/),
-please read their documentation for details. The main goals are:
-- helping implementers to verify conformance with the technical description
-  given in the MathML in HTML5 note.
-- provide a set of automatable tests to integrate into the testing framework of
-  web browser developers.
-
-## Installation
-
-You must at least install [git](http://git-scm.com/) and
-[python](http://python.org/). Clone the repository with
-
-    $ git clone --recursive https://github.com/username/MathMLinHTML5-tests.git
-
-If you cloned the repository without --recursive, you will likely have empty
-`resources` and `tools` directories at the root of your cloned repo. You can
-clone the submodules with these additional steps:
-
-    $ cd MathMLinHTML5-tests
-    $ git submodule update --init --recursive
-
-Next, generate the MANIFEST.json file with the following command:
-
-    $ python tools/manifest/update.py
-
-To verify the tests in your browser, you also need to setup a web server whose
-root points to the root of the cloned repo. For a quick setup, you can just run
-the `serve.py` Python script at the root:
-
-    $ python server.py
-
-Finally, open `index.html` at the web server root to get an overview of all the
-tests. Using W3C's wptserve has not been tried but the tests can easily be
-imported into other automated testing framework anyway.
-
-## Note on Web fonts
-
-Many of the tests verify OpenType features and require specific Web fonts for
-that purpose. WOFF fonts are generated using the Python API of
-[fontforge](https://github.com/fontforge/fontforge/). A recent enough version
-of FontForge is necessary so that it includes fixes for [WOFF checkSumAdjustment](https://github.com/fontforge/fontforge/issues/926), [USE_TYPO_METRICS flag](https://github.com/fontforge/fontforge/pull/2274) and various bugs in OpenType
-MATH.
diff --git a/LayoutTests/imported/mathml-in-html5/mathml/presentation-markup/fractions/frac-parameters-1.html b/LayoutTests/imported/mathml-in-html5/mathml/presentation-markup/fractions/frac-parameters-1.html
deleted file mode 100644 (file)
index cabd746..0000000
+++ /dev/null
@@ -1,243 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8">
-<title>Fraction parameters</title>
-<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S3.html#SS3.SSS2">
-<meta name="assert" content="Element mfrac correctly uses the fraction parameters from the MATH table.">
-<script src="../../../../../resources/testharness.js"></script>
-<script src="../../../../../resources/testharnessreport.js"></script>
-<style>
-  math, mspace {
-    font-size: 10px;
-  }
-  @font-face {
-    font-family: axisheight7000-rulethickness1000;
-    src: url("../../../../w3c/web-platform-tests/fonts/math/fraction-axisheight7000-rulethickness1000.woff");
-  }
-  @font-face {
-    font-family: denominatordisplaystylegapmin5000-rulethickness1000;
-    src: url("../../../../w3c/web-platform-tests/fonts/math/fraction-denominatordisplaystylegapmin5000-rulethickness1000.woff");
-  }
-  @font-face {
-    font-family: denominatordisplaystyleshiftdown6000-rulethickness1000;
-    src: url("../../../../w3c/web-platform-tests/fonts/math/fraction-denominatordisplaystyleshiftdown6000-rulethickness1000.woff");
-  }
-  @font-face {
-    font-family: denominatorgapmin4000-rulethickness1000;
-    src: url("../../../../w3c/web-platform-tests/fonts/math/fraction-denominatorgapmin4000-rulethickness1000.woff");
-  }
-  @font-face {
-    font-family: denominatorshiftdown3000-rulethickness1000;
-    src: url("../../../../w3c/web-platform-tests/fonts/math/fraction-denominatorshiftdown3000-rulethickness1000.woff");
-  }
-  @font-face {
-    font-family: numeratordisplaystylegapmin8000-rulethickness1000;
-    src: url("../../../../w3c/web-platform-tests/fonts/math/fraction-numeratordisplaystylegapmin8000-rulethickness1000.woff");
-  }
-  @font-face {
-    font-family: numeratordisplaystyleshiftup2000-rulethickness1000;
-    src: url("../../../../w3c/web-platform-tests/fonts/math/fraction-numeratordisplaystyleshiftup2000-rulethickness1000.woff");
-  }
-  @font-face {
-    font-family: numeratorgapmin9000-rulethickness1000;
-    src: url("../../../../w3c/web-platform-tests/fonts/math/fraction-numeratorgapmin9000-rulethickness1000.woff");
-  }
-  @font-face {
-    font-family: numeratorshiftup11000-rulethickness1000;
-    src: url("../../../../w3c/web-platform-tests/fonts/math/fraction-numeratorshiftup11000-rulethickness1000.woff");
-  }
-  @font-face {
-    font-family: rulethickness10000;
-    src: url("../../../../w3c/web-platform-tests/fonts/math/fraction-rulethickness10000.woff");
-  }
-</style>
-<script>
-  var emToPx = 10 / 1000; // font-size: 10px, font.em = 1000
-  var epsilon = 1;
-
-  function getBox(aId) {
-    return document.getElementById(aId).getBoundingClientRect();
-  }
-
-  setup({ explicit_done: true });
-  window.addEventListener("load", function() {
-    document.fonts.ready.then(function() {
-      window.setTimeout(runTests, 250);
-    });
-  });
-
-  function runTests() {
-    test(function() {
-      var v1 = 7000 * emToPx;
-      var v2 = 1000 * emToPx;
-      assert_approx_equals(getBox("ref0001").top - getBox("num0001").bottom,
-                           v1 + v2 / 2, epsilon, "mfrac: axis height");
-    }, "AxisHeight");
-
-    test(function() {
-      var v1 = 5000 * emToPx;
-      assert_approx_equals(getBox("den0002").top - getBox("ref0002").bottom,
-                           v1, epsilon, "mfrac: denominator gap");
-    }, "DenominatorDisplayStyleGapMin");
-
-    test(function() {
-      var v1 = 6000 * emToPx;
-      assert_approx_equals(getBox("den0003").top - getBox("ref0003").bottom,
-                           v1, epsilon, "mfrac: denominator shift");
-    }, "DenominatorDisplayStyleShiftDown");
-
-    test(function() {
-      var v1 = 4000 * emToPx;
-      assert_approx_equals(getBox("den0004").top - getBox("ref0004").bottom,
-                           v1, epsilon, "mfrac: denominator gap");
-    }, "DenominatorGapMin");
-
-    test(function() {
-      var v1 = 3000 * emToPx;
-      assert_approx_equals(getBox("den0005").top - getBox("ref0005").bottom,
-                           v1, epsilon, "mfrac: denominator shift");
-    }, "DenominatorShiftDown");
-
-    test(function() {
-      var v1 = 8000 * emToPx;
-      assert_approx_equals(getBox("ref0006").top - getBox("num0006").bottom,
-                           v1, epsilon, "mfrac: numerator gap");
-    }, "NumeratorDisplayStyleGapMin");
-
-    test(function() {
-      var v1 = 2000 * emToPx;
-      assert_approx_equals(getBox("ref0007").top - getBox("num0007").bottom,
-                           v1, epsilon, "mfrac: numerator shift");
-    }, "NumeratorDisplayStyleShiftDown");
-
-    test(function() {
-      var v1 = 9000 * emToPx;
-      assert_approx_equals(getBox("ref0008").top - getBox("num0008").bottom,
-                           v1, epsilon, "mfrac: numerator gap");
-    }, "NumeratorGapMin");
-
-    test(function() {
-      var v1 = 11000 * emToPx;
-      assert_approx_equals(getBox("ref0009").top - getBox("num0009").bottom,
-                           v1, epsilon, "mfrac: numerator shift");
-    }, "NumeratorShiftDown");
-
-    test(function() {
-      var v1 = 10000 * emToPx;
-      assert_approx_equals(getBox("den0010").top - getBox("num0010").bottom,
-                           v1, epsilon, "mfrac: rule thickness");
-    }, "FractionRuleThickness");
-
-    done();
-  }
-</script>
-</head>
-<body>
-  <p>
-    <math style="font-family: axisheight7000-rulethickness1000;">
-      <mspace id="ref0001" depth="1em" width="3em" mathbackground="green"/>
-      <mfrac>
-        <mspace width="3em" height="1em" id="num0001" mathbackground="blue"/>
-        <mspace width="3em"/>
-      </mfrac>
-    </math>
-  </p>
-  <hr/>
-  <p>
-    <math display="block" style="font-family: denominatordisplaystylegapmin5000-rulethickness1000;">
-      <mspace id="ref0002" width="3em"
-              height=".5em" depth=".5em" mathbackground="green"/>
-      <mfrac>
-        <mspace width="3em"/>
-        <mspace width="3em" height="1em" id="den0002" mathbackground="blue"/>
-      </mfrac>
-    </math>
-  </p>
-  <hr/>
-  <p>
-    <math display="block" style="font-family: denominatordisplaystyleshiftdown6000-rulethickness1000;">
-      <mspace id="ref0003" width="3em" height="1em" mathbackground="green"/>
-      <mfrac>
-        <mspace width="3em"/>
-        <mspace width="3em" depth="1em" id="den0003" mathbackground="blue"/>
-      </mfrac>
-    </math>
-  </p>
-  <hr/>
-  <p>
-    <math style="font-family: denominatorgapmin4000-rulethickness1000;">
-      <mspace id="ref0004" width="3em"
-              height=".5em" depth=".5em" mathbackground="green"/>
-      <mfrac>
-        <mspace width="3em"/>
-        <mspace width="3em" height="1em" id="den0004" mathbackground="blue"/>
-      </mfrac>
-    </math>
-  </p>
-  <hr/>
-  <p>
-    <math style="font-family: denominatorshiftdown3000-rulethickness1000;">
-      <mspace id="ref0005" width="3em" height="1em" mathbackground="green"/>
-      <mfrac>
-        <mspace width="3em"/>
-        <mspace width="3em" depth="1em" id="den0005" mathbackground="blue"/>
-      </mfrac>
-    </math>
-  </p>
-  <hr/>
-  <p>
-    <math display="block" style="font-family: numeratordisplaystylegapmin8000-rulethickness1000;">
-      <mspace id="ref0006" width="3em"
-              height=".5em" depth=".5em" mathbackground="green"/>
-      <mfrac>
-        <mspace width="3em" depth="1em" id="num0006" mathbackground="blue"/>
-        <mspace width="3em"/>
-      </mfrac>
-    </math>
-  </p>
-  <hr/>
-  <p>
-    <math display="block" style="font-family: numeratordisplaystyleshiftup2000-rulethickness1000;">
-      <mspace id="ref0007" width="3em"
-              depth="1em" mathbackground="green"/>
-      <mfrac>
-        <mspace width="3em" height="1em" id="num0007" mathbackground="blue"/>
-        <mspace width="3em"/>
-      </mfrac>
-    </math>
-  </p>
-  <hr/>
-  <p>
-    <math style="font-family: numeratorgapmin9000-rulethickness1000;">
-      <mspace id="ref0008" width="3em"
-              height=".5em" depth=".5em" mathbackground="green"/>
-      <mfrac>
-        <mspace width="3em" depth="1em" id="num0008" mathbackground="blue"/>
-        <mspace width="3em"/>
-      </mfrac>
-    </math>
-  </p>
-  <hr/>
-  <p>
-    <math style="font-family: numeratorshiftup11000-rulethickness1000;">
-      <mspace id="ref0009" width="3em"
-              depth="1em" mathbackground="green"/>
-      <mfrac>
-        <mspace width="3em" height="1em" id="num0009" mathbackground="blue"/>
-        <mspace width="3em"/>
-      </mfrac>
-    </math>
-  </p>
-  <hr/>
-  <p>
-    <math style="font-family: rulethickness10000">
-      <mfrac>
-        <mspace width="3em" height="1em" id="num0010" mathbackground="blue"/>
-        <mspace width="3em" depth="1em" id="den0010" mathbackground="green"/>
-      </mfrac>
-    </math>
-  </p>
-  <hr/>
-</body>
-</html>
diff --git a/LayoutTests/imported/mathml-in-html5/mathml/presentation-markup/fractions/frac-parameters-2.html b/LayoutTests/imported/mathml-in-html5/mathml/presentation-markup/fractions/frac-parameters-2.html
deleted file mode 100644 (file)
index 5636e09..0000000
+++ /dev/null
@@ -1,175 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8">
-<title>Stack parameters</title>
-<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S3.html#SS3.SSS2">
-<meta name="assert" content="Element mfrac correctly uses the stack parameters from the MATH table.">
-<script src="../../../../../resources/testharness.js"></script>
-<script src="../../../../../resources/testharnessreport.js"></script>
-<style>
-  math, mspace {
-    font-size: 10px;
-  }
-  @font-face {
-    font-family: axisheight7000;
-    src: url("../../../../w3c/web-platform-tests/fonts/math/stack-axisheight7000.woff");
-  }
-  @font-face {
-    font-family: bottomdisplaystyleshiftdown5000;
-    src: url("../../../../w3c/web-platform-tests/fonts/math/stack-bottomdisplaystyleshiftdown5000.woff");
-  }
-  @font-face {
-    font-family: bottomshiftdown6000;
-    src: url("../../../../w3c/web-platform-tests/fonts/math/stack-bottomshiftdown6000.woff");
-  }
-  @font-face {
-    font-family: displaystylegapmin4000;
-    src: url("../../../../w3c/web-platform-tests/fonts/math/stack-displaystylegapmin4000.woff");
-  }
-  @font-face {
-    font-family: gapmin8000;
-    src: url("../../../../w3c/web-platform-tests/fonts/math/stack-gapmin8000.woff");
-  }
-  @font-face {
-    font-family: topdisplaystyleshiftup3000;
-    src: url("../../../../w3c/web-platform-tests/fonts/math/stack-topdisplaystyleshiftup3000.woff");
-  }
-  @font-face {
-    font-family: topshiftup9000;
-    src: url("../../../../w3c/web-platform-tests/fonts/math/stack-topshiftup9000.woff");
-  }
-</style>
-<script>
-  var emToPx = 10 / 1000; // font-size: 10px, font.em = 1000
-  var epsilon = 1;
-
-  function getBox(aId) {
-    return document.getElementById(aId).getBoundingClientRect();
-  }
-
-  setup({ explicit_done: true });
-  window.addEventListener("load", function() {
-    document.fonts.ready.then(function() {
-      window.setTimeout(runTests, 250);
-    });
-  });
-
-  function runTests() {
-    test(function() {
-      var v = 7000 * emToPx;
-      assert_approx_equals(getBox("ref0001").top - getBox("num0001").bottom,
-                           v, epsilon, "mfrac: axis height");
-    }, "AxisHeight");
-
-    test(function() {
-      var v = 5000 * emToPx;
-      assert_approx_equals(getBox("den0002").top - getBox("ref0002").bottom,
-                           v, epsilon, "mfrac: denominator shift");
-    }, "BottomDisplayStyleShiftDown");
-
-    test(function() {
-      var v = 6000 * emToPx;
-      assert_approx_equals(getBox("den0003").top - getBox("ref0003").bottom,
-                           v, epsilon, "mfrac: denominator shift");
-    }, "BottomShiftDown");
-
-    test(function() {
-      var v = 4000 * emToPx;
-      assert_approx_equals(getBox("den0004").top - getBox("num0004").bottom,
-                           v, epsilon, "mfrac: gap");
-    }, "DisplayStyleGapMin");
-
-    test(function() {
-      var v = 8000 * emToPx;
-      assert_approx_equals(getBox("den0005").top - getBox("num0005").bottom,
-                           v, epsilon, "mfrac: gap");
-    }, "GapMin");
-
-    test(function() {
-      var v = 3000 * emToPx;
-      assert_approx_equals(getBox("ref0006").top - getBox("num0006").bottom,
-                           v, epsilon, "mfrac: numerator shift");
-    }, "TopDisplayStyleShiftUp");
-
-    test(function() {
-      var v = 9000 * emToPx;
-      assert_approx_equals(getBox("ref0007").top - getBox("num0007").bottom,
-                           v, epsilon, "mfrac: numerator shift");
-    }, "ToShiftUp");
-
-    done();
-  }
-</script>
-</head>
-<body>
-  <p>
-    <math style="font-family: axisheight7000;">
-      <mspace id="ref0001" depth="1em" width="3em" mathbackground="green"/>
-      <mfrac linethickness="0px">
-        <mspace width="3em" height="1em" id="num0001" mathbackground="blue"/>
-        <mspace width="3em"/>
-      </mfrac>
-    </math>
-  </p>
-  <hr/>
-  <p>
-    <math display="block" style="font-family: bottomdisplaystyleshiftdown5000;">
-      <mspace id="ref0002" width="3em" height="1em" mathbackground="green"/>
-      <mfrac linethickness="0px">
-        <mspace width="3em"/>
-        <mspace width="3em" depth="1em" id="den0002" mathbackground="blue"/>
-      </mfrac>
-    </math>
-  </p>
-  <hr/>
-  <p>
-    <math style="font-family: bottomshiftdown6000;">
-      <mspace id="ref0003" width="3em" height="1em" mathbackground="green"/>
-      <mfrac linethickness="0px">
-        <mspace width="3em"/>
-        <mspace width="3em" depth="1em" id="den0003" mathbackground="blue"/>
-      </mfrac>
-    </math>
-  </p>
-  <hr/>
-  <p>
-    <math display="block" style="font-family: displaystylegapmin4000;">
-      <mfrac linethickness="0px">
-        <mspace width="3em" height="1em" id="num0004" mathbackground="blue"/>
-        <mspace width="3em" depth="1em" id="den0004" mathbackground="green"/>
-      </mfrac>
-    </math>
-  </p>
-  <hr/>
-  <p>
-    <math style="font-family: gapmin8000;">
-      <mfrac linethickness="0px">
-        <mspace width="3em" height="1em" id="num0005" mathbackground="blue"/>
-        <mspace width="3em" depth="1em" id="den0005" mathbackground="green"/>
-      </mfrac>
-    </math>
-  </p>
-  <hr/>
-  <p>
-    <math display="block" style="font-family: topdisplaystyleshiftup3000;">
-      <mspace id="ref0006" width="3em" depth="1em" mathbackground="green"/>
-      <mfrac linethickness="0px">
-        <mspace width="3em" height="1em" id="num0006" mathbackground="blue"/>
-        <mspace width="3em"/>
-      </mfrac>
-    </math>
-  </p>
-  <hr/>
-  <p>
-    <math style="font-family: topshiftup9000;">
-      <mspace id="ref0007" width="3em" depth="1em" mathbackground="green"/>
-      <mfrac linethickness="0px">
-        <mspace width="3em" height="1em" id="num0007" mathbackground="blue"/>
-        <mspace width="3em"/>
-      </mfrac>
-    </math>
-  </p>
-  <hr/>
-</body>
-</html>
diff --git a/LayoutTests/imported/mathml-in-html5/mathml/presentation-markup/radicals/root-parameters-1.html b/LayoutTests/imported/mathml-in-html5/mathml/presentation-markup/radicals/root-parameters-1.html
deleted file mode 100644 (file)
index 9b48f30..0000000
+++ /dev/null
@@ -1,212 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8">
-<title>Radical parameters</title>
-<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S3.html#SS3.SSS3">
-<meta name="assert" content="Elements msqrt and mroot correctly use the radical parameters from the MATH table.">
-<script src="../../../../../resources/testharness.js"></script>
-<script src="../../../../../resources/testharnessreport.js"></script>
-<style>
-  math, mspace {
-    font-size: 10px;
-  }
-  @font-face {
-    font-family: degreebottomraisepercent25-rulethickness1000;
-    src: url("../../../../w3c/web-platform-tests/fonts/math/radical-degreebottomraisepercent25-rulethickness1000.woff");
-  }
-  @font-face {
-    font-family: displaystyleverticalgap7000-rulethickness1000;
-    src: url("../../../../w3c/web-platform-tests/fonts/math/radical-displaystyleverticalgap7000-rulethickness1000.woff");
-  }
-  @font-face {
-    font-family: extraascender3000-rulethickness1000;
-    src: url("../../../../w3c/web-platform-tests/fonts/math/radical-extraascender3000-rulethickness1000.woff");
-  }
-  @font-face {
-    font-family: kernafterdegreeminus5000-rulethickness1000;
-    src: url("../../../../w3c/web-platform-tests/fonts/math/radical-kernafterdegreeminus5000-rulethickness1000.woff");
-  }
-  @font-face {
-    font-family: kernbeforedegree4000-rulethickness1000;
-    src: url("../../../../w3c/web-platform-tests/fonts/math/radical-kernbeforedegree4000-rulethickness1000.woff");
-  }
-  @font-face {
-    font-family: verticalgap6000-rulethickness1000;
-    src: url("../../../../w3c/web-platform-tests/fonts/math/radical-verticalgap6000-rulethickness1000.woff");
-  }
-  @font-face {
-    font-family: rulethickness8000;
-    src: url("../../../../w3c/web-platform-tests/fonts/math/radical-rulethickness8000.woff");
-  }
-</style>
-<script>
-  var emToPx = 10 / 1000; // font-size: 10px, font.em = 1000
-  var epsilon = 1;
-
-  function getBox(aId) {
-    return document.getElementById(aId).getBoundingClientRect();
-  }
-
-  setup({ explicit_done: true });
-  window.addEventListener("load", function() {
-    document.fonts.ready.then(function() {
-      window.setTimeout(runTests, 250);
-    });
-  });
-
-  function runTests() {
-    test(function() {
-      var v1 = 25;
-      var v2 = 1000 * emToPx;
-      var radicalHeight = getBox("base001").height + v2;
-      // FIXME: The drawing and measuring of the radical's StretchyOperator seems weird... For now, we adjust the height to pass this test.
-      radicalHeight -= v2;
-      assert_approx_equals(getBox("ref001").top - getBox("index001").bottom,
-                           v1 * radicalHeight / 100, epsilon,
-                           "mroot: vertical position of index");
-    }, "RadicalDegreeBottomRaisePercent");
-
-    test(function() {
-      var v1 = 7000 * emToPx;
-      var v2 = 1000 * emToPx;
-      assert_approx_equals(getBox("base0021").top - getBox("radical0021").top,
-                           v1 + v2, epsilon,
-                           "msqrt: vertical gap");
-      assert_approx_equals(getBox("base0022").top - getBox("radical0022").top,
-                           v1 + v2, epsilon,
-                           "mroot: vertical gap");
-    }, "RadicalDisplayStyleVerticalGap");
-
-    test(function() {
-      var v1 = 3000 * emToPx;
-      var v2 = 1000 * emToPx;
-      assert_approx_equals(getBox("base0031").top - getBox("radical0031").top,
-                           v1 + v2, epsilon,
-                           "msqrt: vertical gap");
-      assert_approx_equals(getBox("base0032").top - getBox("radical0032").top,
-                           v1 + v2, epsilon,
-                           "mroot: vertical gap");
-    }, "RadicalExtraAscender");
-
-  test(function() {
-      // Note: the size variants of U+221A in this font have width 1000.
-      var v1 = 5000 * emToPx;
-      var radicalSymbolWidth = 1000 * emToPx;
-      var radicalLeft = getBox("base004").left - radicalSymbolWidth;
-      assert_approx_equals(getBox("index004").right - radicalLeft,
-                           v1, epsilon,
-                           "mroot: kern after degree");
-    }, "RadicalKernAfterDegree");
-
-    test(function() {
-      var v1 = 4000 * emToPx;
-      assert_approx_equals(getBox("index005").left - getBox("radical005").left,
-                           v1, epsilon,
-                           "mroot: kern before degree");
-    }, "RadicalKernBeforeDegree");
-
-    test(function() {
-      var v = 8000 * emToPx;
-      assert_approx_equals(getBox("base0061").top - getBox("radical0061").top,
-                           v, epsilon,
-                           "msqrt: vertical gap");
-      assert_approx_equals(getBox("base0062").top - getBox("radical0062").top,
-                           v, epsilon,
-                           "msqrt: vertical gap");
-    }, "RadicalRuleThickness");
-
-    test(function() {
-      var v1 = 6000 * emToPx;
-      var v2 = 1000 * emToPx;
-      assert_approx_equals(getBox("base0071").top - getBox("radical0071").top,
-                           v1 + v2, epsilon,
-                           "msqrt: vertical gap");
-      assert_approx_equals(getBox("base0072").top - getBox("radical0072").top,
-                           v1 + v2, epsilon,
-                           "msqrt: vertical gap");
-    }, "RadicalVerticalGap");
-
-    done();
-  }
-</script>
-</head>
-<body>
-  <p>
-    <math style="font-family: degreebottomraisepercent25-rulethickness1000;">
-      <mspace id="ref001" width="3em" depth="1em" mathbackground="green"/>
-      <mroot>
-        <mspace id="base001" width="3em" height="10em" mathbackground="green"/>
-        <mspace id="index001" width="3em" height="1em" mathbackground="blue"/>
-      </mroot>
-    </math>
-  </p>
-  <hr/>
-  <p>
-    <math display="block"
-          style="font-family: displaystyleverticalgap7000-rulethickness1000;">
-      <msqrt mathbackground="green" id="radical0021">
-        <mspace id="base0021" width="3em" height="1em" mathbackground="blue"/>
-      </msqrt>
-      <mroot mathbackground="green" id="radical0022">
-        <mspace id="base0022" width="3em" height="1em" mathbackground="blue"/>
-        <mspace width="3em" height="1em" mathbackground="black"/>
-      </mroot>
-    </math>
-  </p>
-  <hr/>
-  <p>
-    <math style="font-family: extraascender3000-rulethickness1000;">
-      <msqrt mathbackground="green" id="radical0031">
-        <mspace id="base0031" width="3em" height="1em" mathbackground="blue"/>
-      </msqrt>
-      <mroot mathbackground="green" id="radical0032">
-        <mspace id="base0032" width="3em" height="1em" mathbackground="blue"/>
-        <mspace width="3em" height="1em" mathbackground="black"/>
-      </mroot>
-    </math>
-  </p>
-  <hr/>
-  <p>
-    <math style="font-family: kernafterdegreeminus5000-rulethickness1000;">
-      <mroot>
-        <mspace id="base004" width="3em" height="2em"  mathbackground="blue"/>
-        <mspace id="index004" width="7em" height="1em" mathbackground="green"/>
-      </mroot>
-    </math>
-  </p>
-  <hr/>
-  <p>
-    <math style="font-family: kernbeforedegree4000-rulethickness1000;">
-      <mroot id="radical005" mathbackground="blue">
-        <mspace width="3em" height="1em"/>
-        <mspace id="index005" width="3em" height="1em" mathbackground="green"/>
-      </mroot>
-    </math>
-  </p>
-  <hr/>
-  <p>
-    <math style="font-family: rulethickness8000;">
-      <msqrt mathbackground="green" id="radical0061">
-        <mspace id="base0061" width="3em" height="1em" mathbackground="blue"/>
-      </msqrt>
-      <mroot mathbackground="green" id="radical0062">
-        <mspace id="base0062" width="3em" height="1em" mathbackground="blue"/>
-        <mspace width="3em" height="1em" mathbackground="black"/>
-      </mroot>
-    </math>
-  </p>
-  <p>
-    <math style="font-family: verticalgap6000-rulethickness1000;">
-      <msqrt mathbackground="green" id="radical0071">
-        <mspace id="base0071" width="3em" height="1em" mathbackground="blue"/>
-      </msqrt>
-      <mroot mathbackground="green" id="radical0072">
-        <mspace id="base0072" width="3em" height="1em" mathbackground="blue"/>
-        <mspace width="3em" height="1em" mathbackground="black"/>
-      </mroot>
-    </math>
-  </p>
-  <hr/>
-</body>
-</html>
diff --git a/LayoutTests/imported/mathml-in-html5/mathml/presentation-markup/scripts/subsup-parameters-1.html b/LayoutTests/imported/mathml-in-html5/mathml/presentation-markup/scripts/subsup-parameters-1.html
deleted file mode 100644 (file)
index 677e662..0000000
+++ /dev/null
@@ -1,338 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8">
-<title>Subscripts and Superscripts parameters</title>
-<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S3.html#SS4">
-<meta name="assert" content="Elements msub, msup, subsup and msubsup correctly use the subscript and superscript parameters from the MATH table.">
-<script src="../../../../../resources/testharness.js"></script>
-<script src="../../../../../resources/testharnessreport.js"></script>
-<style>
-  math, mspace {
-    font-size: 10px;
-  }
-  @font-face {
-    font-family: spaceafterscript3000;
-    src: url("../../../../w3c/web-platform-tests/fonts/math/scripts-spaceafterscript3000.woff");
-  }
-  @font-face {
-    font-family: superscriptshiftup7000;
-    src: url("../../../../w3c/web-platform-tests/fonts/math/scripts-superscriptshiftup7000.woff");
-  }
-  @font-face {
-    font-family: superscriptshiftupcramped5000;
-    src: url("../../../../w3c/web-platform-tests/fonts/math/scripts-superscriptshiftupcramped5000.woff");
-  }
-  @font-face {
-    font-family: subscriptshiftdown6000;
-    src: url("../../../../w3c/web-platform-tests/fonts/math/scripts-subscriptshiftdown6000.woff");
-  }
-  @font-face {
-    font-family: subsuperscriptgapmin11000;
-    src: url("../../../../w3c/web-platform-tests/fonts/math/scripts-subsuperscriptgapmin11000.woff");
-  }
-  @font-face {
-    font-family: subsuperscriptgapmin11000superscriptbottommaxwithsubscript3000;
-    src: url("../../../../w3c/web-platform-tests/fonts/math/scripts-subsuperscriptgapmin11000-superscriptbottommaxwithsubscript3000.woff");
-  }
-  @font-face {
-    font-family: subscripttopmax4000;
-    src: url("../../../../w3c/web-platform-tests/fonts/math/scripts-subscripttopmax4000.woff");
-  }
-  @font-face {
-    font-family: superscriptbottommin8000;
-    src: url("../../../../w3c/web-platform-tests/fonts/math/scripts-superscriptbottommin8000.woff");
-  }
-  @font-face {
-    font-family: subscriptbaselinedropmin9000;
-    src: url("../../../../w3c/web-platform-tests/fonts/math/scripts-subscriptbaselinedropmin9000.woff");
-  }
-  @font-face {
-    font-family: superscriptbaselinedropmax10000;
-    src: url("../../../../w3c/web-platform-tests/fonts/math/scripts-superscriptbaselinedropmax10000.woff");
-  }
-</style>
-<script>
-  var emToPx = 10 / 1000; // font-size: 10px, font.em = 1000
-  var epsilon = 1;
-
-  function getBox(aId) {
-    return document.getElementById(aId).getBoundingClientRect();
-  }
-
-  setup({ "explicit_done": true });
-  window.addEventListener("load", function() {
-    document.fonts.ready.then(function() {
-      window.setTimeout(runTests, 250);
-    });
-  });
-
-  function runTests() {
-    test(function() {
-      var v = 3000 * emToPx;
-      assert_approx_equals(getBox("ref001").left - getBox("sub001").right, v, epsilon, "msub: Space after subscript");
-      assert_approx_equals(getBox("ref002").left - getBox("sup002").right, v, epsilon, "msup: Space after superscript");
-      assert_approx_equals(getBox("ref003").left - getBox("sup003").right, v, epsilon, "msubsup: Space after superscript");
-      assert_approx_equals(getBox("sup0042").left - getBox("sup0041").right, v, epsilon, "mmultiscripts: Space after first superscript");
-      assert_approx_equals(getBox("sup0043").left - getBox("sup0042").right, v, epsilon, "mmultiscripts: Space after second superscript");
-      assert_approx_equals(getBox("ref004").left - getBox("sup0043").right, v, epsilon, "mmultiscripts: Space after last superscript");
-    }, "SpaceAfterScript");
-
-    test(function() {
-      var v = 7000 * emToPx;
-      assert_approx_equals(getBox("ref101").bottom - getBox("sup102").bottom, v, epsilon, "msup: Superscript shift");
-      assert_approx_equals(getBox("ref101").bottom - getBox("sup103").bottom, v, epsilon, "msubsup: Superscript shift");
-      assert_approx_equals(getBox("ref101").bottom - getBox("sup1041").bottom, v, epsilon, "mmultiscripts: First superscript shift");
-      assert_approx_equals(getBox("ref101").bottom - getBox("sup1042").bottom, v, epsilon, "mmultiscripts: Second superscript shift");
-      assert_approx_equals(getBox("ref101").bottom - getBox("sup1043").bottom, v, epsilon, "mmultiscripts: Last superscript shift");
-    }, "SuperscriptShiftUp");
-
-    /* FIXME: We do not support SuperscriptShiftUpCramped yet.
-       See http://webkit.org/b/156401
-    test(function() {
-      var v = 5000 * emToPx;
-      assert_approx_equals(getBox("ref201").bottom - getBox("sup202").bottom, v, epsilon, "msup: Superscript shift");
-      assert_approx_equals(getBox("ref201").bottom - getBox("sup203").bottom, v, epsilon, "msubsup: Superscript shift");
-      assert_approx_equals(getBox("ref201").bottom - getBox("sup2041").bottom, v, epsilon, "mmultiscripts: First superscript shift");
-      assert_approx_equals(getBox("ref201").bottom - getBox("sup2042").bottom, v, epsilon, "mmultiscripts: Second superscript shift");
-      assert_approx_equals(getBox("ref201").bottom - getBox("sup2043").bottom, v, epsilon, "mmultiscripts: Last superscript shift");
-    }, "SuperscriptShiftUpCramped"); */
-
-    test(function() {
-      var v = 6000 * emToPx;
-      assert_approx_equals(getBox("sub301").bottom - getBox("ref300").bottom, v, epsilon, "msup: Subscript shift");
-      assert_approx_equals(getBox("sub302").bottom - getBox("ref300").bottom, v, epsilon, "msubsup: Subscript shift");
-      assert_approx_equals(getBox("sub303").bottom - getBox("ref300").bottom, v, epsilon, "mmultiscripts: First subscript shift");
-      assert_approx_equals(getBox("sub304").bottom - getBox("ref300").bottom, v, epsilon, "mmultiscripts: Second subscript shift");
-    }, "SubscriptShiftDown");
-
-    test(function() {
-      var v = 11000 * emToPx;
-      assert_approx_equals(getBox("sub4011").top - getBox("sup4012").bottom, v, epsilon, "msubsup: SubSuperscript gap");
-      assert_approx_equals(getBox("sub4021").top - getBox("sup4022").bottom, v, epsilon, "mmultiscripts: SubSuperscript gap");
-    }, "SubSuperscriptGapMin");
-
-    test(function() {
-      var v1 = 11000 * emToPx;
-      var v2 = 3000 * emToPx;
-      assert_approx_equals(getBox("sub501").top - getBox("sup501").bottom, v1, epsilon, "msubsup: SubSuperscript gap");
-      assert_approx_equals(getBox("ref500").bottom - getBox("sup501").bottom, v2, epsilon, "msubsup: Superscript bottom");
-      assert_approx_equals(getBox("sub502").top - getBox("sup502").bottom, v1, epsilon, "mmultiscripts: SubSuperscript gap");
-      assert_approx_equals(getBox("ref500").bottom - getBox("sup502").bottom, v2, epsilon, "mmultiscripts: Superscript bottom");
-    }, "SuperscriptBottomMaxWithSubscript");
-
-    test(function() {
-      var v = 4000 * emToPx;
-      assert_approx_equals(getBox("ref600").bottom - getBox("sub601").top, v, epsilon, "msub: Subscript top");
-    }, "SubscriptTopMax");
-
-    test(function() {
-      var v = 8000 * emToPx;
-      assert_approx_equals(getBox("ref700").bottom - getBox("sub701").bottom, v, epsilon, "msub: Superscript bottom");
-    }, "SuperscriptBottomMin");
-
-    test(function() {
-      var v = 9000 * emToPx;
-      assert_approx_equals(getBox("sub801").bottom - getBox("base801").bottom, v, epsilon, "msub: Superscript drop");
-    }, "SubscriptBaselineDrop");
-
-    test(function() {
-      var v = 10000 * emToPx;
-      assert_approx_equals(getBox("sup901").bottom - getBox("base901").top, v, epsilon, "msup: Superscript drop");
-    }, "SuperscriptBaselineDrop");
-
-    done();
-  }
-</script>
-</head>
-<body>
-    <p>
-      <math style="font-family: spaceafterscript3000;">
-        <msub>
-          <mspace height="2em" width="2em" mathbackground="blue"/>
-          <mspace id="sub001" height="1em" width="1em" mathbackground="red"/>
-        </msub>
-        <mspace id="ref001" height="1em" width="1em" mathbackground="green"/>
-      </math>
-      <math style="font-family: spaceafterscript3000;">
-        <msup>
-          <mspace height="2em" width="2em" mathbackground="blue"/>
-          <mspace id="sup002" height="1em" width="1em" mathbackground="red"/>
-        </msup>
-        <mspace id="ref002" height="1em" width="1em" mathbackground="green"/>
-      </math>
-      <math style="font-family: spaceafterscript3000;">
-        <msubsup>
-          <mspace height="2em" width="2em" mathbackground="blue"/>
-          <mspace/>
-          <mspace id="sup003" height="1em" width="1em" mathbackground="red"/>
-        </msubsup>
-        <mspace id="ref003" height="1em" width="1em" mathbackground="green"/>
-      </math>
-      <math style="font-family: spaceafterscript3000;">
-        <mmultiscripts>
-          <mspace height="2em" width="2em" mathbackground="blue"/>
-          <none/>
-          <mspace id="sup0041" height="1em" width="1em" mathbackground="red"/>
-          <none/>
-          <mspace id="sup0042" height="1em" width="1em" mathbackground="red"/>
-          <none/>
-          <mspace id="sup0043" height="1em" width="1em" mathbackground="red"/>
-        </mmultiscripts>
-        <mspace id="ref004" height="1em" width="1em" mathbackground="green"/>
-      </math>
-    </p>
-    <hr/>
-    <p>
-      <math style="font-family: superscriptshiftup7000;">
-        <mspace id="ref101" height="1em" width="1em" mathbackground="green"/>
-        <msup>
-          <mspace height="2em" width="2em" mathbackground="blue"/>
-          <mspace id="sup102" height="1em" width="1em" mathbackground="red"/>
-        </msup>
-        <msubsup>
-          <mspace height="2em" width="2em" mathbackground="blue"/>
-          <mspace height="1em" width="1em" mathbackground="red"/>
-          <mspace id="sup103" height="1em" width="1em" mathbackground="red"/>
-        </msubsup>
-        <mmultiscripts>
-          <mspace height="2em" width="2em" mathbackground="blue"/>
-          <none/>
-          <mspace id="sup1041" height="1em" width="1em" mathbackground="red"/>
-          <none/>
-          <mspace id="sup1042" height="1em" width="1em" mathbackground="red"/>
-          <none/>
-          <mspace id="sup1043" height="1em" width="1em" mathbackground="red"/>
-        </mmultiscripts>
-      </math>
-    </p>
-    <hr/>
-    <p>
-      <math style="font-family: superscriptshiftupcramped5000;">
-        <msqrt>
-          <mspace id="ref201" height="1em" width="1em" mathbackground="green"/>
-          <msup>
-            <mspace height="2em" width="2em" mathbackground="blue"/>
-            <mspace id="sup202" height="1em" width="1em" mathbackground="red"/>
-          </msup>
-          <msubsup>
-            <mspace height="2em" width="2em" mathbackground="blue"/>
-            <mspace height="1em" width="1em" mathbackground="blue"/>
-            <mspace id="sup203" height="1em" width="1em" mathbackground="red"/>
-          </msubsup>
-          <mmultiscripts>
-            <mspace height="2em" width="2em" mathbackground="blue"/>
-            <none/>
-            <mspace id="sup2041" height="1em" width="1em" mathbackground="red"/>
-            <none/>
-            <mspace id="sup2042" height="1em" width="1em" mathbackground="red"/>
-            <none/>
-            <mspace id="sup2043" height="1em" width="1em" mathbackground="red"/>
-          </mmultiscripts>
-        </msqrt>
-      </math>
-    </p>
-    <hr/>
-    <p>
-      <math style="font-family: subscriptshiftdown6000;">
-        <mspace id="ref300" height="1em" width="1em" mathbackground="green"/>
-        <msub>
-          <mspace height="2em" width="2em" mathbackground="blue"/>
-          <mspace id="sub301" height="1em" width="1em" mathbackground="red"/>
-        </msub>
-        <msubsup>
-          <mspace height="2em" width="2em" mathbackground="blue"/>
-          <mspace id="sub302" height="1em" width="1em" mathbackground="red"/>
-          <mspace height="1em" width="1em" mathbackground="blue"/>
-        </msubsup>
-        <mmultiscripts>
-          <mspace height="2em" width="2em" mathbackground="blue"/>
-          <mspace id="sub303" height="1em" width="1em" mathbackground="red"/>
-          <none/>
-          <mspace id="sub304" height="1em" width="1em" mathbackground="red"/>
-          <none/>
-        </mmultiscripts>
-      </math>
-    </p>
-    <hr/>
-    <p>
-      <math style="font-family: subsuperscriptgapmin11000;">
-        <msubsup>
-          <mspace height="2em" width="2em" mathbackground="blue"/>
-          <mspace id="sub4011" height="1em" width="1em" mathbackground="red"/>
-          <mspace id="sup4012" height="1em" width="1em" mathbackground="red"/>
-        </msubsup>
-        <mmultiscripts>
-          <mspace height="2em" width="2em" mathbackground="blue"/>
-          <none/>
-          <none/>
-          <mspace id="sub4021" height="1em" width="1em" mathbackground="red"/>
-          <mspace id="sup4022" height="1em" width="1em" mathbackground="red"/>
-        </mmultiscripts>
-      </math>
-    </p>
-    <hr/>
-    <p>
-      <math style="font-family: subsuperscriptgapmin11000superscriptbottommaxwithsubscript3000;">
-        <mspace id="ref500" height="1em" width="1em" mathbackground="green"/>
-        <msubsup>
-          <mspace height="2em" width="2em" mathbackground="blue"/>
-          <mspace id="sub501" height="1em" width="1em" mathbackground="red"/>
-          <mspace id="sup501" height="1em" width="1em" mathbackground="red"/>
-        </msubsup>
-        <mmultiscripts>
-          <mspace height="2em" width="2em" mathbackground="blue"/>
-          <none/>
-          <none/>
-          <mspace id="sub502" height="1em" width="1em" mathbackground="red"/>
-          <mspace id="sup502" height="1em" width="1em" mathbackground="red"/>
-        </mmultiscripts>
-      </math>
-    </p>
-    <hr/>
-    <p>
-      <math style="font-family: subscripttopmax4000;">
-        <mspace id="ref600" height="1em"
-                width="1em" mathbackground="green"/>
-        <msub>
-          <mspace height="2em" width="2em" mathbackground="blue"/>
-          <mspace id="sub601" height="10em"
-                  width="1em" mathbackground="red"/>
-        </msub>
-      </math>
-    </p>
-    <hr/>
-    <p>
-      <math style="font-family: superscriptbottommin8000;">
-        <mspace id="ref700" height="1em"
-                width="1em" mathbackground="green"/>
-        <msup>
-          <mspace height="2em" width="2em" mathbackground="blue"/>
-          <mspace id="sub701" depth="1em"
-                  width="1em" mathbackground="red"/>
-        </msup>
-      </math>
-    </p>
-    <hr/>
-    <p>
-      <math style="font-family: subscriptbaselinedropmin9000;">
-        <msub>
-          <mspace id="base801" height="2em" width="2em" mathbackground="blue"/>
-          <mspace id="sub801" height="1em"
-                  width="1em" mathbackground="red"/>
-        </msub>
-      </math>
-    </p>
-    <hr/>
-    <p>
-      <math style="font-family: superscriptbaselinedropmax10000;">
-        <msup>
-          <mspace id="base901" height="15em" width="2em" mathbackground="blue"/>
-          <mspace id="sup901" height="1em"
-                  width="1em" mathbackground="red"/>
-        </msup>
-      </math>
-    </p>
-    <hr/>
-</body>
-</html>
diff --git a/LayoutTests/imported/mathml-in-html5/mathml/presentation-markup/scripts/underover-parameters-1.html b/LayoutTests/imported/mathml-in-html5/mathml/presentation-markup/scripts/underover-parameters-1.html
deleted file mode 100644 (file)
index 6d9e93c..0000000
+++ /dev/null
@@ -1,145 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8">
-<title>Underscripts and Overscripts parameters</title>
-<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S3.html#SS4">
-<meta name="assert" content="Elements munder, mover, munderover correctly use the limit parameters from the MATH table.">
-<script src="../../../../../resources/testharness.js"></script>
-<script src="../../../../../resources/testharnessreport.js"></script>
-<style>
-  math, mspace, mo {
-    font-size: 10px;
-  }
-  @font-face {
-    font-family: lowerlimitbaselinedropmin3000;
-    src: url("../../../../w3c/web-platform-tests/fonts/math/limits-lowerlimitbaselinedropmin3000.woff");
-  }
-  @font-face {
-    font-family: lowerlimitgapmin11000;
-    src: url("../../../../w3c/web-platform-tests/fonts/math/limits-lowerlimitgapmin11000.woff");
-  }
-  @font-face {
-    font-family: upperlimitbaselinerisemin5000;
-    src: url("../../../../w3c/web-platform-tests/fonts/math/limits-upperlimitbaselinerisemin5000.woff");
-  }
-  @font-face {
-    font-family: upperlimitgapmin7000;
-    src: url("../../../../w3c/web-platform-tests/fonts/math/limits-upperlimitgapmin7000.woff");
-  }
-</style>
-<script>
-  var emToPx = 10 / 1000; // font-size: 10px, font.em = 1000
-  var epsilon = 1;
-
-  function getBox(aId) {
-    return document.getElementById(aId).getBoundingClientRect();
-  }
-
-  setup({ explicit_done: true });
-  window.addEventListener("load", function() {
-    document.fonts.ready.then(function() {
-      window.setTimeout(runTests, 250);
-    });
-  });
-
-  function runTests() {
-    test(function() {
-      var v = 3000 * emToPx;
-      assert_approx_equals(getBox("under00011").top - getBox("ref0001").bottom,
-                           v, epsilon, "munder: under shift");
-      assert_approx_equals(getBox("under00012").top - getBox("ref0001").bottom,
-                           v, epsilon, "munderover: under shift");
-    }, "LowerLimitBaselineDropMin");
-
-    test(function() {
-      var v = 11000 * emToPx;
-      assert_approx_equals(getBox("under00021").top - getBox("ref0002").bottom,
-                           v, epsilon, "munder: under gap");
-      assert_approx_equals(getBox("under00022").top - getBox("ref0002").bottom,
-                           v, epsilon, "munderover: under gap");
-    }, "LowerLimitGapMin");
-
-    test(function() {
-      var v = 5000 * emToPx;
-      assert_approx_equals(getBox("ref0003").top - getBox("over00031").bottom,
-                           v, epsilon, "munder: over shift");
-      assert_approx_equals(getBox("ref0003").top - getBox("over00032").bottom,
-                           v, epsilon, "munderover: over shift");
-    }, "UpperLimitBaselineRiseMin");
-
-    test(function() {
-      var v = 7000 * emToPx;
-      assert_approx_equals(getBox("ref0004").top - getBox("over00041").bottom,
-                           v, epsilon, "munder: over shift");
-      assert_approx_equals(getBox("ref0004").top - getBox("over00042").bottom,
-                           v, epsilon, "munderover: over shift");
-    }, "UpperLimitGapMin");
-
-    done();
-  }
-</script>
-</head>
-<body>
-    <p>
-      <math style="font-family: lowerlimitbaselinedropmin3000;">
-        <mspace id="ref0001" height="1em" width="3em" mathbackground="green"/>
-        <munder>
-          <mo movablelimits="false">&#x2211;</mo>
-          <mspace id="under00011" depth="1em" width="3em" mathbackground="blue"/>
-        </munder>
-        <munderover>
-          <mo movablelimits="false">&#x2211;</mo>
-          <mspace id="under00012" depth="1em" width="3em" mathbackground="blue"/>
-          <mspace height="1em" width="3em" mathbackground="black"/>
-        </munderover>
-      </math>
-    </p>
-    <hr/>
-    <p>
-      <math style="font-family: lowerlimitgapmin11000;">
-        <mspace id="ref0002" height="1em" width="3em" mathbackground="green"/>
-        <munder>
-          <mo movablelimits="false">&#x2211;</mo>
-          <mspace id="under00021" depth="1em" width="3em" mathbackground="blue"/>
-        </munder>
-        <munderover>
-          <mo movablelimits="false">&#x2211;</mo>
-          <mspace id="under00022" depth="1em" width="3em" mathbackground="blue"/>
-          <mspace height="1em" width="3em" mathbackground="black"/>
-        </munderover>
-      </math>
-    </p>
-    <hr/>
-    <p>
-      <math style="font-family: upperlimitbaselinerisemin5000;">
-        <mspace id="ref0003" height="1em" width="3em" mathbackground="green"/>
-        <mover>
-          <mo movablelimits="false">&#x2211;</mo>
-          <mspace id="over00031" height="1em" width="3em" mathbackground="blue"/>
-        </mover>
-        <munderover>
-          <mo movablelimits="false">&#x2211;</mo>
-          <mspace height="1em" width="3em" mathbackground="black"/>
-          <mspace id="over00032" height="1em" width="3em" mathbackground="blue"/>
-        </munderover>
-      </math>
-    </p>
-    <hr/>
-    <p>
-      <math style="font-family: upperlimitgapmin7000;">
-        <mspace id="ref0004" height="1em" width="3em" mathbackground="green"/>
-        <mover>
-          <mo movablelimits="false">&#x2211;</mo>
-          <mspace id="over00041" depth="1em" width="3em" mathbackground="blue"/>
-        </mover>
-        <munderover>
-          <mo movablelimits="false">&#x2211;</mo>
-          <mspace height="1em" width="3em" mathbackground="black"/>
-          <mspace id="over00042" depth="1em" width="3em" mathbackground="blue"/>
-        </munderover>
-      </math>
-    </p>
-    <hr/>
-</body>
-</html>
diff --git a/LayoutTests/imported/mathml-in-html5/mathml/presentation-markup/scripts/underover-parameters-2.html b/LayoutTests/imported/mathml-in-html5/mathml/presentation-markup/scripts/underover-parameters-2.html
deleted file mode 100644 (file)
index e2c9da7..0000000
+++ /dev/null
@@ -1,145 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8">
-<title>Underscripts and Overscripts parameters</title>
-<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S3.html#SS4">
-<meta name="assert" content="Elements munder, mover, munderover correctly use the stretch stack parameters from the MATH table.">
-<script src="../../../../../resources/testharness.js"></script>
-<script src="../../../../../resources/testharnessreport.js"></script>
-<style>
-  math, mspace, mo {
-    font-size: 10px;
-  }
-  @font-face {
-    font-family: bottomshiftdown3000;
-    src: url("../../../../w3c/web-platform-tests/fonts/math/stretchstack-bottomshiftdown3000.woff");
-  }
-  @font-face {
-    font-family: gapbelowmin11000;
-    src: url("../../../../w3c/web-platform-tests/fonts/math/stretchstack-gapbelowmin11000.woff");
-  }
-  @font-face {
-    font-family: topshiftup5000;
-    src: url("../../../../w3c/web-platform-tests/fonts/math/stretchstack-topshiftup5000.woff");
-  }
-  @font-face {
-    font-family: gapabovemin7000;
-    src: url("../../../../w3c/web-platform-tests/fonts/math/stretchstack-gapabovemin7000.woff");
-  }
-</style>
-<script>
-  var emToPx = 10 / 1000; // font-size: 10px, font.em = 1000
-  var epsilon = 1;
-
-  function getBox(aId) {
-    return document.getElementById(aId).getBoundingClientRect();
-  }
-
-  setup({ explicit_done: true });
-  window.addEventListener("load", function() {
-    document.fonts.ready.then(function() {
-      window.setTimeout(runTests, 250);
-    });
-  });
-
-  function runTests() {
-    test(function() {
-      var v = 3000 * emToPx;
-      assert_approx_equals(getBox("under00011").top - getBox("ref0001").bottom,
-                           v, epsilon, "munder: under shift");
-      assert_approx_equals(getBox("under00012").top - getBox("ref0001").bottom,
-                           v, epsilon, "munderover: under shift");
-    }, "StretchStackBottomShiftDown");
-
-    test(function() {
-      var v = 11000 * emToPx;
-      assert_approx_equals(getBox("under00021").top - getBox("ref0002").bottom,
-                           v, epsilon, "munder: under gap");
-      assert_approx_equals(getBox("under00022").top - getBox("ref0002").bottom,
-                           v, epsilon, "munderover: under gap");
-    }, "StretchStackGapBelowMin");
-
-    test(function() {
-      var v = 5000 * emToPx;
-      assert_approx_equals(getBox("ref0003").top - getBox("over00031").bottom,
-                           v, epsilon, "mover: over shift");
-      assert_approx_equals(getBox("ref0003").top - getBox("over00032").bottom,
-                           v, epsilon, "munderover: over shift");
-    }, "StretchStackTopShiftUp");
-
-    test(function() {
-      var v = 7000 * emToPx;
-      assert_approx_equals(getBox("ref0004").top - getBox("over00041").bottom,
-                           v, epsilon, "mover: over shift");
-      assert_approx_equals(getBox("ref0004").top - getBox("over00042").bottom,
-                           v, epsilon, "munderover: over shift");
-    }, "StretchStackGapAboveMin");
-
-    done();
-  }
-</script>
-</head>
-<body>
-    <p>
-      <math style="font-family: bottomshiftdown3000;">
-        <mspace id="ref0001" height="1em" width="3em" mathbackground="green"/>
-        <munder>
-          <mo>&#x2192;</mo>
-          <mspace id="under00011" depth="1em" width="3em" mathbackground="blue"/>
-        </munder>
-        <munderover>
-          <mo>&#x2192;</mo>
-          <mspace id="under00012" depth="1em" width="3em" mathbackground="blue"/>
-          <mspace height="1em" width="3em" mathbackground="black"/>
-        </munderover>
-      </math>
-    </p>
-    <hr/>
-    <p>
-      <math style="font-family: gapbelowmin11000;">
-        <mspace id="ref0002" height="1em" width="3em" mathbackground="green"/>
-        <munder>
-          <mo>&#x2192;</mo>
-          <mspace id="under00021" depth="1em" width="3em" mathbackground="blue"/>
-        </munder>
-        <munderover>
-          <mo>&#x2192;</mo>
-          <mspace id="under00022" depth="1em" width="3em" mathbackground="blue"/>
-          <mspace height="1em" width="3em" mathbackground="black"/>
-        </munderover>
-      </math>
-    </p>
-    <hr/>
-    <p>
-      <math style="font-family: topshiftup5000;">
-        <mspace id="ref0003" height="1em" width="3em" mathbackground="green"/>
-        <mover>
-          <mo>&#x2192;</mo>
-          <mspace id="over00031" height="1em" width="3em" mathbackground="blue"/>
-        </mover>
-        <munderover>
-          <mo>&#x2192;</mo>
-          <mspace height="1em" width="3em" mathbackground="black"/>
-          <mspace id="over00032" height="1em" width="3em" mathbackground="blue"/>
-        </munderover>
-      </math>
-    </p>
-    <hr/>
-    <p>
-      <math style="font-family: gapabovemin7000;">
-        <mspace id="ref0004" height="1em" width="3em" mathbackground="green"/>
-        <mover>
-          <mo>&#x2192;</mo>
-          <mspace id="over00041" depth="1em" width="3em" mathbackground="blue"/>
-        </mover>
-        <munderover>
-          <mo>&#x2192;</mo>
-          <mspace height="1em" width="3em" mathbackground="black"/>
-          <mspace id="over00042" depth="1em" width="3em" mathbackground="blue"/>
-        </munderover>
-      </math>
-    </p>
-    <hr/>
-</body>
-</html>
diff --git a/LayoutTests/imported/mathml-in-html5/mathml/presentation-markup/scripts/underover-parameters-3.html b/LayoutTests/imported/mathml-in-html5/mathml/presentation-markup/scripts/underover-parameters-3.html
deleted file mode 100644 (file)
index 9b21600..0000000
+++ /dev/null
@@ -1,324 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8">
-<title>Underscripts and Overscripts parameters</title>
-<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S3.html#SS4">
-<meta name="assert" content="Elements munder, mover, munderover correctly use underbar/overbar and AccentBaseHeight parameters from the MATH table.">
-<script src="../../../../../resources/testharness.js"></script>
-<script src="../../../../../resources/testharnessreport.js"></script>
-<style>
-  math, mspace, mo {
-    font-size: 10px;
-  }
-  @font-face {
-    font-family: accentbaseheight4000underbarextradescender5000;
-    src: url("../../../../w3c/web-platform-tests/fonts/math/underover-accentbaseheight4000-underbarextradescender5000.woff");
-  }
-  @font-face {
-    font-family: accentbaseheight4000underbarverticalgap7000;
-    src: url("../../../../w3c/web-platform-tests/fonts/math/underover-accentbaseheight4000-underbarverticalgap7000.woff");
-  }
-  @font-face {
-    font-family: accentbaseheight4000overbarextraascender3000;
-    src: url("../../../../w3c/web-platform-tests/fonts/math/underover-accentbaseheight4000-overbarextraascender3000.woff");
-  }
-  @font-face {
-    font-family: accentbaseheight4000overbarverticalgap11000;
-    src: url("../../../../w3c/web-platform-tests/fonts/math/underover-accentbaseheight4000-overbarverticalgap11000.woff");
-  }
-</style>
-<script>
-  var emToPx = 10 / 1000; // font-size: 10px, font.em = 1000
-  var epsilon = 2;
-  var axisBaseHeight = 4000 *  emToPx;
-  var shortBaseHeight = 3000 * emToPx; // shortBaseHeight < axisBaseHeight
-  var tallBaseHeight = 5000 * emToPx; // tallBaseHeight > axisBaseHeight
-
-  function getBox(aId) {
-    return document.getElementById(aId).getBoundingClientRect();
-  }
-
-  setup({ explicit_done: true });
-  window.addEventListener("load", function() {
-    document.fonts.ready.then(function() {
-      window.setTimeout(runTests, 250);
-    });
-  });
-
-  function runTests() {
-    test(function() {
-      for (var i = 1; i <= 4; i++) {
-        for (var j = 1; j <= 6; j++) {
-           var baseId = ("base00" + i) + j;
-           assert_approx_equals(getBox("ref00" + i).bottom,
-                                getBox(baseId).bottom,
-                                epsilon,
-                                "alignment of " + baseId);
-        }
-      }
-    }, "Baseline alignment");
-
-    test(function() {
-      for (var i = 1; i <= 4; i++) {
-        for (var j = 1; j <= 6; j++) {
-           var baseId = ("base00" + i) + j;
-           assert_approx_equals(getBox(baseId).height,
-                                j == 2 || j == 5 ?
-                                tallBaseHeight :shortBaseHeight,
-                                epsilon,
-                                "height of " + baseId);
-        }
-      }
-    }, "Heights of bases");
-
-    test(function() {
-      var v = 5000 * emToPx;
-      assert_approx_equals(getBox("ref001").bottom - getBox("over0014").bottom,
-                           shortBaseHeight, epsilon,
-                           "munderover: nonaccent over short base");
-      assert_approx_equals(getBox("ref001").bottom - getBox("over0015").bottom,
-                           tallBaseHeight, epsilon,
-                           "munderover: accent over tall base");
-      assert_approx_equals(getBox("ref001").bottom - getBox("over0016").bottom,
-                           axisBaseHeight, epsilon,
-                           "munderover: accent over short base");
-      for (var j = 1; j <= 6; j++) {
-        var elId = "el001" + j;
-        var baseId = "base001" + j;
-        var underId = "under001" + j;
-        assert_approx_equals(getBox(underId).top - getBox(baseId).bottom,
-                             0, epsilon,
-                             "gap between " + baseId + " and " + underId);
-        assert_approx_equals(getBox(elId).bottom - getBox(underId).bottom,
-                             v, epsilon,
-                             "extra descender below " + underId);
-      }
-    }, "AccentBaseHeight, UnderbarExtraDescender");
-
-    test(function() {
-      var v = 7000 * emToPx;
-      assert_approx_equals(getBox("ref002").bottom - getBox("over0024").bottom,
-                           shortBaseHeight, epsilon,
-                           "munderover: nonaccent over short base");
-      assert_approx_equals(getBox("ref002").bottom - getBox("over0025").bottom,
-                           tallBaseHeight, epsilon,
-                           "munderover: accent over tall base");
-      assert_approx_equals(getBox("ref002").bottom - getBox("over0026").bottom,
-                           axisBaseHeight, epsilon,
-                           "munderover: accent over short base");
-      for (var j = 1; j <= 6; j++) {
-        var elId = "el002" + j;
-        var baseId = "base002" + j;
-        var underId = "under002" + j;
-        var gap = document.getElementById(elId).getAttribute("accentunder") === "true" ? 0 : v;
-        assert_approx_equals(getBox(underId).top - getBox(baseId).bottom,
-                             gap, epsilon,
-                             "gap between " + baseId + " and " + underId);
-      }
-    }, "AccentBaseHeight, UnderbarVerticalGap");
-
-    test(function() {
-      var v = 3000 * emToPx;
-      assert_approx_equals(getBox("ref003").bottom - getBox("over0031").bottom,
-                           shortBaseHeight, epsilon,
-                           "mover: nonaccent over short base");
-      assert_approx_equals(getBox("ref003").bottom - getBox("over0032").bottom,
-                           tallBaseHeight, epsilon,
-                           "mover: accent over tall base");
-      assert_approx_equals(getBox("ref003").bottom - getBox("over0033").bottom,
-                           axisBaseHeight, epsilon,
-                           "mover: accent over short base");
-      assert_approx_equals(getBox("ref003").bottom - getBox("over0034").bottom,
-                           shortBaseHeight, epsilon,
-                           "munderover: nonaccent over short base");
-      assert_approx_equals(getBox("ref003").bottom - getBox("over0035").bottom,
-                           tallBaseHeight, epsilon,
-                           "munderover: accent over tall base");
-      assert_approx_equals(getBox("ref003").bottom - getBox("over0036").bottom,
-                           axisBaseHeight, epsilon,
-                           "munderover: accent over short base");
-      for (var j = 1; j <= 6; j++) {
-        var elId = "el003" + j;
-        var baseId = "base003" + j;
-        if (j >= 4) {
-          var underId = "under003" + j;
-          assert_approx_equals(getBox(underId).top - getBox(baseId).bottom,
-                               0, epsilon,
-                               "gap between " + baseId + " and " + underId);
-        }
-        var overId = "over003" + j;
-        assert_approx_equals(getBox(overId).top - getBox(elId).top,
-                             v, epsilon,
-                             "extra ascender below " + overId);
-      }
-    }, "AccentBaseHeight, OverbarExtraAscender");
-
-    test(function() {
-      v = 11000 * emToPx;
-      assert_approx_equals(getBox("ref004").bottom - getBox("over0041").bottom,
-                           shortBaseHeight + v, epsilon,
-                           "mover: nonaccent over short base");
-      assert_approx_equals(getBox("ref004").bottom - getBox("over0042").bottom,
-                           tallBaseHeight, epsilon,
-                           "mover: accent over tall base");
-      assert_approx_equals(getBox("ref004").bottom - getBox("over0043").bottom,
-                           axisBaseHeight, epsilon,
-                           "mover: accent over short base");
-      assert_approx_equals(getBox("ref004").bottom - getBox("over0044").bottom,
-                           shortBaseHeight + v, epsilon,
-                           "munderover: nonaccent over short base");
-      assert_approx_equals(getBox("ref004").bottom - getBox("over0045").bottom,
-                           tallBaseHeight, epsilon,
-                           "munderover: accent over tall base");
-      assert_approx_equals(getBox("ref004").bottom - getBox("over0046").bottom,
-                           axisBaseHeight, epsilon,
-                           "munderover: accent over short base");
-      for (var j = 4; j <= 6; j++) {
-        var baseId = "base004" + j;
-        var underId = "under004" + j;
-        assert_approx_equals(getBox(underId).top - getBox(baseId).bottom,
-                             0, epsilon,
-                             "gap between " + baseId + " and " + underId);
-      }
-    }, "AccentBaseHeight, OverbarVerticalGap");
-
-    done();
-  }
-</script>
-</head>
-<body>
-    <p>
-      <math style="font-family: accentbaseheight4000underbarextradescender5000;">
-        <mspace id="ref001" height="1em" width="3em" mathbackground="green"/>
-        <munder mathbackground="cyan" id="el0011">
-          <mspace id="base0011" height="3em" width="1em" mathbackground="black"/>
-          <mspace id="under0011" height="1em" width="3em" mathbackground="blue"/>
-        </munder>
-        <munder mathbackground="cyan" id="el0012" accentunder="true">
-          <mspace id="base0012" height="5em" width="1em" mathbackground="black"/>
-          <mspace id="under0012" height="1em" width="3em" mathbackground="blue"/>
-        </munder>
-        <munder mathbackground="cyan" id="el0013" accentunder="true">
-          <mspace id="base0013" height="3em" width="1em" mathbackground="black"/>
-          <mspace id="under0013" height="1em" width="3em" mathbackground="blue"/>
-        </munder>
-        <munderover mathbackground="cyan" id="el0014">
-          <mspace id="base0014" height="3em" width="1em" mathbackground="black"/>
-          <mspace id="under0014" height="1em" width="3em" mathbackground="blue"/>
-          <mspace id="over0014" height="1em" width="3em" mathbackground="red"/>
-        </munderover>
-        <munderover mathbackground="cyan" id="el0015" accent="true">
-          <mspace id="base0015" height="5em" width="1em" mathbackground="black"/>
-          <mspace id="under0015" height="1em" width="3em" mathbackground="blue"/>
-          <mspace id="over0015" height="1em" width="3em" mathbackground="red"/>
-        </munderover>
-        <munderover mathbackground="cyan" id="el0016" accent="true">
-          <mspace id="base0016" height="3em" width="1em" mathbackground="black"/>
-          <mspace id="under0016" height="1em" width="3em" mathbackground="blue"/>
-          <mspace id="over0016" height="1em" width="3em" mathbackground="red"/>
-        </munderover>
-      </math>
-    </p>
-    <hr/>
-    <p>
-      <math style="font-family: accentbaseheight4000underbarverticalgap7000;">
-        <mspace id="ref002" height="1em" width="3em" mathbackground="green"/>
-        <munder mathbackground="cyan" id="el0021">
-          <mspace id="base0021" height="3em" width="1em" mathbackground="black"/>
-          <mspace id="under0021" height="1em" width="3em" mathbackground="blue"/>
-        </munder>
-        <munder mathbackground="cyan" id="el0022" accentunder="true">
-          <mspace id="base0022" height="5em" width="1em" mathbackground="black"/>
-          <mspace id="under0022" height="1em" width="3em" mathbackground="blue"/>
-        </munder>
-        <munder mathbackground="cyan" id="el0023" accentunder="true">
-          <mspace id="base0023" height="3em" width="1em" mathbackground="black"/>
-          <mspace id="under0023" height="1em" width="3em" mathbackground="blue"/>
-        </munder>
-        <munderover mathbackground="cyan" id="el0024">
-          <mspace id="base0024" height="3em" width="1em" mathbackground="black"/>
-          <mspace id="under0024" height="1em" width="3em" mathbackground="blue"/>
-          <mspace id="over0024" height="1em" width="3em" mathbackground="red"/>
-        </munderover>
-        <munderover mathbackground="cyan" id="el0025" accent="true">
-          <mspace id="base0025" height="5em" width="1em" mathbackground="black"/>
-          <mspace id="under0025" height="1em" width="3em" mathbackground="blue"/>
-          <mspace id="over0025" height="1em" width="3em" mathbackground="red"/>
-        </munderover>
-        <munderover mathbackground="cyan" id="el0026" accent="true">
-          <mspace id="base0026" height="3em" width="1em" mathbackground="black"/>
-          <mspace id="under0026" height="1em" width="3em" mathbackground="blue"/>
-          <mspace id="over0026" height="1em" width="3em" mathbackground="red"/>
-        </munderover>
-      </math>
-    </p>
-    <hr/>
-    <p>
-      <math style="font-family: accentbaseheight4000overbarextraascender3000;">
-        <mspace id="ref003" height="1em" width="3em" mathbackground="green"/>
-        <mover mathbackground="cyan" id="el0031">
-          <mspace id="base0031" height="3em" width="1em" mathbackground="black"/>
-          <mspace id="over0031" height="1em" width="3em" mathbackground="red"/>
-        </mover>
-        <mover mathbackground="cyan" id="el0032" accent="true">
-          <mspace id="base0032" height="5em" width="1em" mathbackground="black"/>
-          <mspace id="over0032" height="1em" width="3em" mathbackground="red"/>
-        </mover>
-        <mover mathbackground="cyan" id="el0033" accent="true">
-          <mspace id="base0033" height="3em" width="1em" mathbackground="black"/>
-          <mspace id="over0033" height="1em" width="3em" mathbackground="red"/>
-        </mover>
-        <munderover mathbackground="cyan" id="el0034">
-          <mspace id="base0034" height="3em" width="1em" mathbackground="black"/>
-          <mspace id="under0034" height="1em" width="3em" mathbackground="blue"/>
-          <mspace id="over0034" height="1em" width="3em" mathbackground="red"/>
-        </munderover>
-        <munderover mathbackground="cyan" id="el0035" accent="true">
-          <mspace id="base0035" height="5em" width="1em" mathbackground="black"/>
-          <mspace id="under0035" height="1em" width="3em" mathbackground="blue"/>
-          <mspace id="over0035" height="1em" width="3em" mathbackground="red"/>
-        </munderover>
-        <munderover mathbackground="cyan" id="el0036" accent="true">
-          <mspace id="base0036" height="3em" width="1em" mathbackground="black"/>
-          <mspace id="under0036" height="1em" width="3em" mathbackground="blue"/>
-          <mspace id="over0036" height="1em" width="3em" mathbackground="red"/>
-        </munderover>
-      </math>
-    </p>
-    <hr/>
-    <p>
-      <math style="font-family: accentbaseheight4000overbarverticalgap11000;">
-        <mspace id="ref004" height="1em" width="3em" mathbackground="green"/>
-        <mover mathbackground="cyan" id="el0041">
-          <mspace id="base0041" height="3em" width="1em" mathbackground="black"/>
-          <mspace id="over0041" height="1em" width="3em" mathbackground="red"/>
-        </mover>
-        <mover mathbackground="cyan" id="el0042" accent="true">
-          <mspace id="base0042" height="5em" width="1em" mathbackground="black"/>
-          <mspace id="over0042" height="1em" width="3em" mathbackground="red"/>
-        </mover>
-        <mover mathbackground="cyan" id="el0043" accent="true">
-          <mspace id="base0043" height="3em" width="1em" mathbackground="black"/>
-          <mspace id="over0043" height="1em" width="3em" mathbackground="red"/>
-        </mover>
-        <munderover mathbackground="cyan" id="el0044">
-          <mspace id="base0044" height="3em" width="1em" mathbackground="black"/>
-          <mspace id="under0044" height="1em" width="3em" mathbackground="blue"/>
-          <mspace id="over0044" height="1em" width="3em" mathbackground="red"/>
-        </munderover>
-        <munderover mathbackground="cyan" id="el0045" accent="true">
-          <mspace id="base0045" height="5em" width="1em" mathbackground="black"/>
-          <mspace id="under0045" height="1em" width="3em" mathbackground="blue"/>
-          <mspace id="over0045" height="1em" width="3em" mathbackground="red"/>
-        </munderover>
-        <munderover mathbackground="cyan" id="el0046" accent="true">
-          <mspace id="base0046" height="3em" width="1em" mathbackground="black"/>
-          <mspace id="under0046" height="1em" width="3em" mathbackground="blue"/>
-          <mspace id="over0046" height="1em" width="3em" mathbackground="red"/>
-        </munderover>
-      </math>
-    </p>
-    <hr/>
-</body>
-</html>
diff --git a/LayoutTests/imported/mathml-in-html5/mathml/presentation-markup/scripts/underover-parameters-4.html b/LayoutTests/imported/mathml-in-html5/mathml/presentation-markup/scripts/underover-parameters-4.html
deleted file mode 100644 (file)
index 985e8a9..0000000
+++ /dev/null
@@ -1,324 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8">
-<title>Underscripts and Overscripts parameters</title>
-<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S3.html#SS4">
-<meta name="assert" content="Elements munder, mover, munderover correctly use underbar/overbar and AccentBaseHeight parameters from the MATH table.">
-<script src="../../../../../resources/testharness.js"></script>
-<script src="../../../../../resources/testharnessreport.js"></script>
-<style>
-  math, mspace, mo {
-    font-size: 10px;
-  }
-  @font-face {
-    font-family: accentbaseheight4000underbarextradescender5000;
-    src: url("../../../../w3c/web-platform-tests/fonts/math/underover-accentbaseheight4000-underbarextradescender5000.woff");
-  }
-  @font-face {
-    font-family: accentbaseheight4000underbarverticalgap7000;
-    src: url("../../../../w3c/web-platform-tests/fonts/math/underover-accentbaseheight4000-underbarverticalgap7000.woff");
-  }
-  @font-face {
-    font-family: accentbaseheight4000overbarextraascender3000;
-    src: url("../../../../w3c/web-platform-tests/fonts/math/underover-accentbaseheight4000-overbarextraascender3000.woff");
-  }
-  @font-face {
-    font-family: accentbaseheight4000overbarverticalgap11000;
-    src: url("../../../../w3c/web-platform-tests/fonts/math/underover-accentbaseheight4000-overbarverticalgap11000.woff");
-  }
-</style>
-<script>
-  var emToPx = 10 / 1000; // font-size: 10px, font.em = 1000
-  var epsilon = 2;
-  var axisBaseHeight = 4000 *  emToPx;
-  var shortBaseHeight = 3000 * emToPx; // shortBaseHeight < axisBaseHeight
-  var tallBaseHeight = 5000 * emToPx; // tallBaseHeight > axisBaseHeight
-
-  function getBox(aId) {
-    return document.getElementById(aId).getBoundingClientRect();
-  }
-
-  setup({ explicit_done: true });
-  window.addEventListener("load", function() {
-    document.fonts.ready.then(function() {
-      window.setTimeout(runTests, 250);
-    });
-  });
-
-  function runTests() {
-    test(function() {
-      for (var i = 1; i <= 4; i++) {
-        for (var j = 1; j <= 6; j++) {
-           var baseId = ("base00" + i) + j;
-           assert_approx_equals(getBox("ref00" + i).bottom,
-                                getBox(baseId).bottom,
-                                epsilon,
-                                "alignment of " + baseId);
-        }
-      }
-    }, "Baseline alignment");
-
-    test(function() {
-      for (var i = 1; i <= 4; i++) {
-        for (var j = 1; j <= 6; j++) {
-           var baseId = ("base00" + i) + j;
-           assert_approx_equals(getBox(baseId).height,
-                                j == 2 || j == 5 ?
-                                tallBaseHeight :shortBaseHeight,
-                                epsilon,
-                                "height of " + baseId);
-        }
-      }
-    }, "Heights of bases");
-
-    test(function() {
-      var v = 5000 * emToPx;
-      assert_approx_equals(getBox("ref001").bottom - getBox("over0014").bottom,
-                           shortBaseHeight, epsilon,
-                           "munderover: nonaccent over short base");
-      assert_approx_equals(getBox("ref001").bottom - getBox("over0015").bottom,
-                           tallBaseHeight, epsilon,
-                           "munderover: accent over tall base");
-      assert_approx_equals(getBox("ref001").bottom - getBox("over0016").bottom,
-                           axisBaseHeight, epsilon,
-                           "munderover: accent over short base");
-      for (var j = 1; j <= 6; j++) {
-        var elId = "el001" + j;
-        var baseId = "base001" + j;
-        var underId = "under001" + j;
-        assert_approx_equals(getBox(underId).top - getBox(baseId).bottom,
-                             0, epsilon,
-                             "gap between " + baseId + " and " + underId);
-        assert_approx_equals(getBox(elId).bottom - getBox(underId).bottom,
-                             v, epsilon,
-                             "extra descender below " + underId);
-      }
-    }, "AccentBaseHeight, UnderbarExtraDescender");
-
-    test(function() {
-      var v = 7000 * emToPx;
-      assert_approx_equals(getBox("ref002").bottom - getBox("over0024").bottom,
-                           shortBaseHeight, epsilon,
-                           "munderover: nonaccent over short base");
-      assert_approx_equals(getBox("ref002").bottom - getBox("over0025").bottom,
-                           tallBaseHeight, epsilon,
-                           "munderover: accent over tall base");
-      assert_approx_equals(getBox("ref002").bottom - getBox("over0026").bottom,
-                           axisBaseHeight, epsilon,
-                           "munderover: accent over short base");
-      for (var j = 1; j <= 6; j++) {
-        var elId = "el002" + j;
-        var baseId = "base002" + j;
-        var underId = "under002" + j;
-        var gap = (j == 2 || j == 3 ? 0 : v);
-        assert_approx_equals(getBox(underId).top - getBox(baseId).bottom,
-                             gap, epsilon,
-                             "gap between " + baseId + " and " + underId);
-      }
-    }, "AccentBaseHeight, UnderbarVerticalGap");
-
-    test(function() {
-      var v = 3000 * emToPx;
-      assert_approx_equals(getBox("ref003").bottom - getBox("over0031").bottom,
-                           shortBaseHeight, epsilon,
-                           "mover: nonaccent over short base");
-      assert_approx_equals(getBox("ref003").bottom - getBox("over0032").bottom,
-                           tallBaseHeight, epsilon,
-                           "mover: accent over tall base");
-      assert_approx_equals(getBox("ref003").bottom - getBox("over0033").bottom,
-                           axisBaseHeight, epsilon,
-                           "mover: accent over short base");
-      assert_approx_equals(getBox("ref003").bottom - getBox("over0034").bottom,
-                           shortBaseHeight, epsilon,
-                           "munderover: nonaccent over short base");
-      assert_approx_equals(getBox("ref003").bottom - getBox("over0035").bottom,
-                           tallBaseHeight, epsilon,
-                           "munderover: accent over tall base");
-      assert_approx_equals(getBox("ref003").bottom - getBox("over0036").bottom,
-                           axisBaseHeight, epsilon,
-                           "munderover: accent over short base");
-      for (var j = 1; j <= 6; j++) {
-        var elId = "el003" + j;
-        var baseId = "base003" + j;
-        if (j >= 4) {
-          var underId = "under003" + j;
-          assert_approx_equals(getBox(underId).top - getBox(baseId).bottom,
-                               0, epsilon,
-                               "gap between " + baseId + " and " + underId);
-        }
-        var overId = "over003" + j;
-        assert_approx_equals(getBox(overId).top - getBox(elId).top,
-                             v, epsilon,
-                             "extra ascender below " + overId);
-      }
-    }, "AccentBaseHeight, OverbarExtraAscender");
-
-    test(function() {
-      v = 11000 * emToPx;
-      assert_approx_equals(getBox("ref004").bottom - getBox("over0041").bottom,
-                           shortBaseHeight + v, epsilon,
-                           "mover: nonaccent over short base");
-      assert_approx_equals(getBox("ref004").bottom - getBox("over0042").bottom,
-                           tallBaseHeight, epsilon,
-                           "mover: accent over tall base");
-      assert_approx_equals(getBox("ref004").bottom - getBox("over0043").bottom,
-                           axisBaseHeight, epsilon,
-                           "mover: accent over short base");
-      assert_approx_equals(getBox("ref004").bottom - getBox("over0044").bottom,
-                           shortBaseHeight + v, epsilon,
-                           "munderover: nonaccent over short base");
-      assert_approx_equals(getBox("ref004").bottom - getBox("over0045").bottom,
-                           tallBaseHeight, epsilon,
-                           "munderover: accent over tall base");
-      assert_approx_equals(getBox("ref004").bottom - getBox("over0046").bottom,
-                           axisBaseHeight, epsilon,
-                           "munderover: accent over short base");
-      for (var j = 4; j <= 6; j++) {
-        var baseId = "base004" + j;
-        var underId = "under004" + j;
-        assert_approx_equals(getBox(underId).top - getBox(baseId).bottom,
-                             0, epsilon,
-                             "gap between " + baseId + " and " + underId);
-      }
-    }, "AccentBaseHeight, OverbarVerticalGap");
-
-    done();
-  }
-</script>
-</head>
-<body>
-    <p>
-      <math style="font-family: accentbaseheight4000underbarextradescender5000;">
-        <mspace id="ref001" height="1em" width="3em" mathbackground="green"/>
-        <munder mathbackground="cyan" id="el0011">
-          <mspace id="base0011" height="3em" width="1em" mathbackground="black"/>
-          <mo id="under0011" mathcolor="blue">&#xB0;</mo>
-        </munder>
-        <munder mathbackground="cyan" id="el0012">
-          <mspace id="base0012" height="5em" width="1em" mathbackground="black"/>
-          <mo id="under0012" mathcolor="blue">&#x2D8;</mo>
-        </munder>
-        <munder mathbackground="cyan" id="el0013">
-          <mspace id="base0013" height="3em" width="1em" mathbackground="black"/>
-          <mo id="under0013" mathcolor="blue">&#x2D8;</mo>
-        </munder>
-        <munderover mathbackground="cyan" id="el0014">
-          <mspace id="base0014" height="3em" width="1em" mathbackground="black"/>
-          <mo id="under0014" mathcolor="blue">&#xB0;</mo>
-          <mo id="over0014" mathcolor="red">&#xB0;</mo>
-        </munderover>
-        <munderover mathbackground="cyan" id="el0015" accent="true">
-          <mspace id="base0015" height="5em" width="1em" mathbackground="black"/>
-          <mo id="under0015" mathcolor="blue">&#x2D8;</mo>
-          <mo id="over0015" mathcolor="red">&#x2D8;</mo>
-        </munderover>
-        <munderover mathbackground="cyan" id="el0016" accent="true">
-          <mspace id="base0016" height="3em" width="1em" mathbackground="black"/>
-          <mo id="under0016" mathcolor="blue">&#x2D8;</mo>
-          <mo id="over0016" mathcolor="red">&#x2D8;</mo>
-        </munderover>
-      </math>
-    </p>
-    <hr/>
-    <p>
-      <math style="font-family: accentbaseheight4000underbarverticalgap7000;">
-        <mspace id="ref002" height="1em" width="3em" mathbackground="green"/>
-        <munder mathbackground="cyan" id="el0021" accentunder="false">
-          <mspace id="base0021" height="3em" width="1em" mathbackground="black"/>
-          <mo id="under0021" mathcolor="blue">&#x2D8;</mo>
-        </munder>
-        <munder mathbackground="cyan" id="el0022">
-          <mspace id="base0022" height="5em" width="1em" mathbackground="black"/>
-          <mo id="under0022" mathcolor="blue" accent="true">&#x2D8;</mo>
-        </munder>
-        <munder mathbackground="cyan" id="el0023">
-          <mspace id="base0023" height="3em" width="1em" mathbackground="black"/>
-          <mo id="under0023" mathcolor="blue" accent="true">&#xB0;</mo>
-        </munder>
-        <munderover mathbackground="cyan" id="el0024">
-          <mspace id="base0024" height="3em" width="1em" mathbackground="black"/>
-          <mo id="under0024" mathcolor="blue" accent="false">&#x2D8;</mo>
-          <mo id="over0024" mathcolor="red" accent="false">&#x2D8;</mo>
-        </munderover>
-        <munderover mathbackground="cyan" id="el0025">
-          <mspace id="base0025" height="5em" width="1em" mathbackground="black"/>
-          <mo id="under0025" mathcolor="blue" accent="false">&#x2D8;</mo>
-          <mo id="over0025" mathcolor="red">&#x2D8;</mo>
-        </munderover>
-        <munderover mathbackground="cyan" id="el0026">
-          <mspace id="base0026" height="3em" width="1em" mathbackground="black"/>
-          <mo id="under0026" mathcolor="blue" accent="false">&#x2D8;</mo>
-          <mo id="over0026" mathcolor="red">&#x2D8;</mo>
-        </munderover>
-      </math>
-    </p>
-    <hr/>
-    <p>
-      <math style="font-family: accentbaseheight4000overbarextraascender3000;">
-        <mspace id="ref003" height="1em" width="3em" mathbackground="green"/>
-        <mover mathbackground="cyan" id="el0031">
-          <mspace id="base0031" height="3em" width="1em" mathbackground="black"/>
-          <mo id="over0031" mathcolor="red">&#xB0;</mo>
-        </mover>
-        <mover mathbackground="cyan" id="el0032" accent="true">
-          <mspace id="base0032" height="5em" width="1em" mathbackground="black"/>
-          <mo id="over0032" mathcolor="red">&#xB0;</mo>
-        </mover>
-        <mover mathbackground="cyan" id="el0033">
-          <mspace id="base0033" height="3em" width="1em" mathbackground="black"/>
-          <mo id="over0033" mathcolor="red">&#x2D8;</mo>
-        </mover>
-        <munderover mathbackground="cyan" id="el0034">
-          <mspace id="base0034" height="3em" width="1em" mathbackground="black"/>
-          <mo id="under0034" mathcolor="blue">&#xB0;</mo>
-          <mo id="over0034" mathcolor="red" accent="false">&#x2D8;</mo>
-        </munderover>
-        <munderover mathbackground="cyan" id="el0035" accent="true">
-          <mspace id="base0035" height="5em" width="1em" mathbackground="black"/>
-          <mo id="under0035" mathcolor="blue">&#x2D8;</mo>
-          <mo id="over0035" mathcolor="red">&#x2D8;</mo>
-        </munderover>
-        <munderover mathbackground="cyan" id="el0036" accent="true">
-          <mspace id="base0036" height="3em" width="1em" mathbackground="black"/>
-          <mo id="under0036" mathcolor="blue">&#x2D8;</mo>
-          <mo id="over0036" mathcolor="red">&#x2D8;</mo>
-        </munderover>
-      </math>
-    </p>
-    <hr/>
-    <p>
-      <math style="font-family: accentbaseheight4000overbarverticalgap11000;">
-        <mspace id="ref004" height="1em" width="3em" mathbackground="green"/>
-        <mover mathbackground="cyan" id="el0041">
-          <mspace id="base0041" height="3em" width="1em" mathbackground="black"/>
-          <mo id="over0041" mathcolor="red">&#xB0;</mo>
-        </mover>
-        <mover mathbackground="cyan" id="el0042" accent="true">
-          <mspace id="base0042" height="5em" width="1em" mathbackground="black"/>
-          <mo id="over0042" mathcolor="red">&#xB0;</mo>
-        </mover>
-        <mover mathbackground="cyan" id="el0043">
-          <mspace id="base0043" height="3em" width="1em" mathbackground="black"/>
-          <mo id="over0043" mathcolor="red">&#x2D8;</mo>
-        </mover>
-        <munderover mathbackground="cyan" id="el0044">
-          <mspace id="base0044" height="3em" width="1em" mathbackground="black"/>
-          <mo id="under0044" mathcolor="blue">&#xB0;</mo>
-          <mo id="over0044" mathcolor="red" accent="false">&#x2D8;</mo>
-        </munderover>
-        <munderover mathbackground="cyan" id="el0045" accent="true">
-          <mspace id="base0045" height="5em" width="1em" mathbackground="black"/>
-          <mo id="under0045" mathcolor="blue">&#x2D8;</mo>
-          <mo id="over0045" mathcolor="red">&#x2D8;</mo>
-        </munderover>
-        <munderover mathbackground="cyan" id="el0046" accent="true">
-          <mspace id="base0046" height="3em" width="1em" mathbackground="black"/>
-          <mo id="under0046" mathcolor="blue">&#x2D8;</mo>
-          <mo id="over0046" mathcolor="red">&#x2D8;</mo>
-        </munderover>
-      </math>
-    </p>
-    <hr/>
-</body>
-</html>
index a750aaa..2e284e4 100644 (file)
@@ -1,3 +1,47 @@
+2018-03-14  Frederic Wang  <fwang@igalia.com>
+
+        Finish migration to MathML WPT tests
+        https://bugs.webkit.org/show_bug.cgi?id=183628
+
+        Reviewed by Manuel Rego Casasnovas.
+
+        In r225162, the MathML tests from the WPT repository were imported. They were intended to
+        replace the ones in imported/mathml-in-html5 but the migration was not fully possible. The
+        main issue was that many MathML tests use Web fonts to test the use of OpenType parameters
+        but document.fonts.ready is unreliable in WebKit (bug 174030). A workaround was implemented
+        in WPT ( https://github.com/w3c/web-platform-tests/pull/10025 ) so this commit finishes
+        the migration. We update the WPT MathML tests and now run them all, we remove
+        imported/mathml-in-html5 and the associated TestExpectations failures. Two cases unrelated to
+        font loading are still failing: One for the SuperscriptShiftUpCramped parameter (bug 156401)
+        and one for the RadicalDegreeBottomRaisePercent parameter (bug 183631).
+
+        Reviewed by Manuel Rego Casasnovas.
+
+        * web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-1-expected.txt: Renamed from LayoutTests/imported/mathml-in-html5/mathml/presentation-markup/fractions/frac-parameters-1-expected.txt.
+        * web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-1.html: Import font loading workaround.
+        * web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-2-expected.txt: Renamed from LayoutTests/imported/mathml-in-html5/mathml/presentation-markup/fractions/frac-parameters-2-expected.txt.
+        * web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-2.html: Import font loading workaround.
+        * web-platform-tests/mathml/presentation-markup/operators/mo-axis-height-1.html: Import font loading workaround.
+        * web-platform-tests/mathml/presentation-markup/radicals/root-parameters-1-expected.txt: Renamed from LayoutTests/imported/mathml-in-html5/mathml/presentation-markup/radicals/root-parameters-1-expected.txt.
+        Also add the failure with RadicalDegreeBottomRaisePercent.
+        * web-platform-tests/mathml/presentation-markup/radicals/root-parameters-1.html: Import font loading workaround.
+        * web-platform-tests/mathml/presentation-markup/scripts/subsup-parameters-1-expected.txt: Renamed from LayoutTests/imported/mathml-in-html5/mathml/presentation-markup/scripts/subsup-parameters-1-expected.txt.
+        Also add the failure for SuperscriptShiftUpCramped.
+        * web-platform-tests/mathml/presentation-markup/scripts/subsup-parameters-1.html: Import font loading workaround.
+        * web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-1-expected.txt: Renamed from LayoutTests/imported/mathml-in-html5/mathml/presentation-markup/scripts/underover-parameters-1-expected.txt.
+        * web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-1.html: Import font loading workaround.
+        * web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-2-expected.txt: Renamed from LayoutTests/imported/mathml-in-html5/mathml/presentation-markup/scripts/underover-parameters-2-expected.txt.
+        * web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-2.html: Import font loading workaround.
+        * web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-3-expected.txt: Renamed from LayoutTests/imported/mathml-in-html5/mathml/presentation-markup/scripts/underover-parameters-3-expected.txt.
+        * web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-3.html: Import font loading workaround.
+        * web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-4-expected.txt: Renamed from LayoutTests/imported/mathml-in-html5/mathml/presentation-markup/scripts/underover-parameters-4-expected.txt.
+        * web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-4.html: Import font loading workaround.
+        * web-platform-tests/mathml/presentation-markup/tables/table-axis-height.html: Import font loading workaround.
+        * web-platform-tests/mathml/relations/css-styling/displaystyle-1.html: Import font loading workaround.
+        * web-platform-tests/mathml/relations/css-styling/lengths-3.html: Import font loading workaround.
+        * web-platform-tests/mathml/tools/utils/misc.py: Import update to Python 3.
+        (downloadWithProgressBar):
+
 2018-03-13  Youenn Fablet  <youenn@apple.com>
 
         Layout Test imported/w3c/web-platform-tests/service-workers/service-worker/register-closed-window.https.html is flaky
index f2b3251..a047a30 100644 (file)
@@ -62,7 +62,8 @@
 
   setup({ explicit_done: true });
   window.addEventListener("load", function() {
-    document.fonts.ready.then(runTests);
+    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
+    requestAnimationFrame(() => { document.fonts.ready.then(runTests); });
   });
 
   function runTests() {
index 08d639d..5445113 100644 (file)
@@ -50,7 +50,8 @@
 
   setup({ explicit_done: true });
   window.addEventListener("load", function() {
-    document.fonts.ready.then(runTests);
+    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
+    requestAnimationFrame(() => { document.fonts.ready.then(runTests); });
   });
 
   function runTests() {
index ee06e19..327a72e 100644 (file)
@@ -26,7 +26,8 @@
 
   setup({ explicit_done: true });
   window.addEventListener("load", function() {
-    document.fonts.ready.then(runTests);
+    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
+    requestAnimationFrame(() => { document.fonts.ready.then(runTests); });
   });
 
   function runTests() {
index beddc51..67a4613 100644 (file)
@@ -50,7 +50,8 @@
 
   setup({ explicit_done: true });
   window.addEventListener("load", function() {
-    document.fonts.ready.then(runTests);
+    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
+    requestAnimationFrame(() => { document.fonts.ready.then(runTests); });
   });
 
   function runTests() {
index bc710f3..9bc6bcb 100644 (file)
@@ -62,7 +62,8 @@
 
   setup({ explicit_done: true });
   window.addEventListener("load", function() {
-    document.fonts.ready.then(runTests);
+    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
+    requestAnimationFrame(() => { document.fonts.ready.then(runTests); });
   });
 
   function runTests() {
index 462c819..1e5a660 100644 (file)
@@ -38,7 +38,8 @@
 
   setup({ explicit_done: true });
   window.addEventListener("load", function() {
-    document.fonts.ready.then(runTests);
+    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
+    requestAnimationFrame(() => { document.fonts.ready.then(runTests); });
   });
 
   function runTests() {
index afd5b8e..c28f29c 100644 (file)
@@ -38,7 +38,8 @@
 
   setup({ explicit_done: true });
   window.addEventListener("load", function() {
-    document.fonts.ready.then(runTests);
+    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
+    requestAnimationFrame(() => { document.fonts.ready.then(runTests); });
   });
 
   function runTests() {
index 29b023b..0172ff1 100644 (file)
@@ -41,7 +41,8 @@
 
   setup({ explicit_done: true });
   window.addEventListener("load", function() {
-    document.fonts.ready.then(runTests);
+    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
+    requestAnimationFrame(() => {   document.fonts.ready.then(runTests); });
   });
 
   function runTests() {
index 4dfe2ea..061cda7 100644 (file)
@@ -41,7 +41,8 @@
 
   setup({ explicit_done: true });
   window.addEventListener("load", function() {
-    document.fonts.ready.then(runTests);
+    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
+    requestAnimationFrame(() => {   document.fonts.ready.then(runTests); });
   });
 
   function runTests() {
index f68f13d..50c3491 100644 (file)
@@ -26,7 +26,8 @@
 
   setup({ explicit_done: true });
   window.addEventListener("load", function() {
-    document.fonts.ready.then(runTests);
+    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
+    requestAnimationFrame(() => { document.fonts.ready.then(runTests); });
   });
 
   function runTests() {
index a616e7f..2749e09 100644 (file)
@@ -32,7 +32,8 @@
   }
 
   window.addEventListener("load", function() {
-    document.fonts.ready.then(runTests);
+    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
+    requestAnimationFrame(() => { document.fonts.ready.then(runTests); });
   });
 
   function runTests() {
index 3dadb39..a7133f8 100644 (file)
@@ -26,7 +26,8 @@
 
   setup({ explicit_done: true });
   window.addEventListener("load", function() {
-    document.fonts.ready.then(runTests);
+    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
+    requestAnimationFrame(() => { document.fonts.ready.then(runTests); });
   });
 
   function runTests() {
index 3907abf..e4d21d6 100644 (file)
@@ -1,7 +1,10 @@
 from __future__ import print_function
 import os
 import progressbar
-import urllib2
+try:
+    from urllib.request import urlopen
+except ImportError:
+    from urllib2 import urlopen
 
 MathMLAssociationCopyright = "Copyright (c) 2016 MathML Association"
 
@@ -13,14 +16,14 @@ def downloadWithProgressBar(url, outputDirectory="./", forceDownload=False):
     if not forceDownload and os.path.exists(fileName):
         return fileName
 
-    request = urllib2.urlopen(url)
+    request = urlopen(url)
     totalSize = int(request.info().getheader('Content-Length').strip())
     bar = progressbar.ProgressBar(maxval=totalSize).start()
 
     chunkSize = 16 * 1024
     downloaded = 0
     print("Downloading %s" % url)
-    os.umask(0002)
+    os.umask(0o002)
     with open(fileName, 'wb') as fp:
         while True:
             chunk = request.read(chunkSize)
index c502b0e..0fe1fc4 100644 (file)
@@ -654,8 +654,6 @@ webkit.org/b/164870 [ ElCapitan Release ] imported/w3c/web-platform-tests/Indexe
 
 webkit.org/b/165352 fast/dom/Window/window-resize-contents.html [ Pass Timeout ]
 
-webkit.org/b/165392 [ ElCapitan Release ] imported/mathml-in-html5/mathml/presentation-markup/fractions/frac-parameters-1.html [ Pass Failure ]
-
 webkit.org/b/167653 http/tests/contentextensions/block-everything-unless-domain.html [ Pass Timeout ]
 
 webkit.org/b/167206 [ Sierra Release ] mathml/opentype/large-operators-displaystyle-dynamic.html [ Pass ImageOnlyFailure ]
index 61893f2..c41279f 100644 (file)
@@ -3894,7 +3894,6 @@ webkit.org/b/182626 accessibility/aria-hidden-updates-alldescendants.html [ Fail
 
 # The following tests are failing only on ews203.
 webkit.org/b/182694 fast/text/tatechuyoko.html [ Failure ]
-webkit.org/b/182694 imported/mathml-in-html5/mathml/presentation-markup/fractions/frac-parameters-1.html [ Failure ]
 webkit.org/b/182694 fast/css/fontloader-svg-select.svg [ Crash ]
 webkit.org/b/182694 fast/dom/crash-moving-subtree-between-documents.html [ Crash ]
 webkit.org/b/182694 fast/dom/event-handler-attributes.html [ Crash ]