From 78712605b55b767e220ea871eb74ae2ae2e273fe Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adam@10up.com>
Date: Thu, 11 Jan 2018 20:06:38 -0500
Subject: [PATCH 01/56] amp-mathml based on amp-gist: first pass

---
 extensions/amp-mathml/0.1/amp-mathml.js       | 110 ++++++++++++++++++
 .../amp-mathml/0.1/test/test-amp-mathml.js    |  64 ++++++++++
 extensions/amp-mathml/OWNERS.yaml             |   1 +
 extensions/amp-mathml/amp-mathml.md           |  86 ++++++++++++++
 .../validator-amp-mathml.protoascii           |  40 +++++++
 package.json                                  |   1 +
 yarn.lock                                     |  73 +++++++++++-
 7 files changed, 369 insertions(+), 6 deletions(-)
 create mode 100644 extensions/amp-mathml/0.1/amp-mathml.js
 create mode 100644 extensions/amp-mathml/0.1/test/test-amp-mathml.js
 create mode 100644 extensions/amp-mathml/OWNERS.yaml
 create mode 100644 extensions/amp-mathml/amp-mathml.md
 create mode 100644 extensions/amp-mathml/validator-amp-mathml.protoascii

diff --git a/extensions/amp-mathml/0.1/amp-mathml.js b/extensions/amp-mathml/0.1/amp-mathml.js
new file mode 100644
index 000000000000..595f4c3d14a1
--- /dev/null
+++ b/extensions/amp-mathml/0.1/amp-mathml.js
@@ -0,0 +1,110 @@
+/**
+ * Copyright 2017 The AMP HTML Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS-IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * @fileoverview Embeds a Github gist
+ *
+ * Example:
+ * <code>
+ * <amp-mathml
+ *   layout="fixed-height"
+ *   data-gistid="a19e811dcd7df10c4da0931641538497"
+ *   height="1613">
+ * </amp-mathml>
+ * </code>
+ */
+
+import {getIframe} from '../../../src/3p-frame';
+import {listenFor} from '../../../src/iframe-helper';
+import {removeElement} from '../../../src/dom';
+import {Layout} from '../../../src/layout';
+import {mjAPI} from 'mathjax-node';
+export class AmpMathML extends AMP.BaseElement {
+
+  /** @param {!AmpElement} element */
+  constructor(element) {
+    super(element);
+
+    /** @private {?HTMLIFrameElement} */
+    this.iframe_ = null;
+  }
+
+  /**
+  * @param {boolean=} opt_onLayout
+  * @override
+  */
+  preconnectCallback(opt_onLayout) {
+  }
+
+  /**
+   * Create the actual image element and set up instance variables.
+   * Called lazily in the first `#layoutCallback`.
+   */
+  initialize_ () {
+    if ( this.img_ ) {
+      return;
+    }
+    mjAPI.config( {
+      MathJax: {
+        // traditional MathJax configuration
+      }
+    } );
+    mjAPI.start();
+    mjAPI.typeset( {
+      math: this.element.getAttribute('formula'),
+      format: "MathML"
+      mml: true, //
+      svg: true,
+    }, function ( data ) {
+      if (!data.errors) {
+        this.img_ = data.svg;
+        this.element.appendChild( this.img_ );
+       }
+    } );
+  }
+
+  /** @override */
+  isLayoutSupported(layout) {
+    return layout == Layout.FIXED_HEIGHT;
+  }
+
+  /** @override */
+  layoutCallback() {
+    const iframe = getIframe(this.win, this.element);
+    this.applyFillContent(iframe);
+    // Triggered by window.context.requestResize() inside the iframe.
+    listenFor(iframe, 'embed-size', data => {
+      this./*OK*/changeHeight(data['height']);
+    }, /* opt_is3P */true);
+
+    this.element.appendChild(iframe);
+    this.iframe_ = iframe;
+    return this.loadPromise(iframe);
+  }
+
+  unlayoutCallback() {
+    if (this.iframe_) {
+      removeElement(this.iframe_);
+      this.iframe_ = null;
+    }
+    return true;
+  }
+}
+
+
+AMP.extension('amp-mathml', '0.1', AMP => {
+  AMP.registerElement('amp-mathml', AmpMathML);
+});
diff --git a/extensions/amp-mathml/0.1/test/test-amp-mathml.js b/extensions/amp-mathml/0.1/test/test-amp-mathml.js
new file mode 100644
index 000000000000..771fb7e7f644
--- /dev/null
+++ b/extensions/amp-mathml/0.1/test/test-amp-mathml.js
@@ -0,0 +1,64 @@
+/**
+ * Copyright 2017 The AMP HTML Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS-IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import '../amp-mathml';
+
+
+describes.realWin('amp-mathml', {
+  amp: {
+    extensions: ['amp-mathml'],
+  },
+}, env => {
+  let win, doc;
+
+  beforeEach(() => {
+    win = env.win;
+    doc = win.document;
+  });
+
+  function getIns(formula, file) {
+    const ins = doc.createElement('amp-mathml');
+    ins.setAttribute('data-formula', formula);
+    ins.setAttribute('height', '237');
+    if (file) {
+      ins.setAttribute('data-file', file);
+    }
+    doc.body.appendChild(ins);
+    return ins.build().then(() => ins.layoutCallback()).then(() => ins);
+  }
+
+  it('renders responsively', () => {
+    return getIns('b9bb35bc68df68259af94430f012425f').then(ins => {
+      const iframe = ins.querySelector('iframe');
+      expect(iframe).to.not.be.null;
+      expect(iframe.className).to.match(/i-amphtml-fill-content/);
+    });
+  });
+
+  it('renders responsively with specific file', () => {
+    return getIns('b9bb35bc68df68259af94430f012425f', 'hello-world.html')
+        .then(ins => {
+          const iframe = ins.querySelector('iframe');
+          expect(iframe).to.not.be.null;
+          expect(iframe.className).to.match(/i-amphtml-fill-content/);
+        });
+  });
+
+  it('Rejects because data-formula is missing', () => {
+    expect(getIns('')).to.be.rejectedWith(
+        /The data-formula attribute is required for/);
+  });
+});
diff --git a/extensions/amp-mathml/OWNERS.yaml b/extensions/amp-mathml/OWNERS.yaml
new file mode 100644
index 000000000000..842398613914
--- /dev/null
+++ b/extensions/amp-mathml/OWNERS.yaml
@@ -0,0 +1 @@
+- adamsilverstein
\ No newline at end of file
diff --git a/extensions/amp-mathml/amp-mathml.md b/extensions/amp-mathml/amp-mathml.md
new file mode 100644
index 000000000000..1b053ae425df
--- /dev/null
+++ b/extensions/amp-mathml/amp-mathml.md
@@ -0,0 +1,86 @@
+<!--
+Copyright 2017 The AMP HTML Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS-IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+# <a name="`amp-mathml`"></a> `amp-mathml`
+
+<table>
+  <tr>
+    <td width="40%"><strong>Description</strong></td>
+    <td>Displays a Math.</td>
+  </tr>
+  <tr>
+    <td width="40%"><strong>Required Script</strong></td>
+    <td><code>&lt;script async custom-element="amp-mathml" src="https://cdn.ampproject.org/v0/amp-mathml-0.1.js">&lt;/script></code></td>
+  </tr>
+  <tr>
+    <td class="col-fourty"><strong><a href="https://www.ampproject.org/docs/guides/responsive/control_layout.html">Supported Layouts</a></strong></td>
+    <td>fixed-height</td>
+  </tr>
+  <tr>
+    <td width="40%"><strong>Examples</strong></td>
+    <td><a href="https://ampbyexample.com/components/amp-mathml/">Annotated code example for amp-mathml</a></td>
+  </tr>
+</table>
+
+[TOC]
+
+## Behavior
+
+This extension creates an iframe and displays a [gist from GitHub](https://help.github.com/articles/about-gists/).
+
+#### Example: Embedding multiple files
+
+```html
+<amp-mathml
+    data-gistid="b9bb35bc68df68259af94430f012425f"
+    layout="fixed-height"
+    height="225">
+</amp-mathml>
+```
+
+#### Example: Embedding a single file
+
+```html
+<amp-mathml
+    data-gistid="a19e811dcd7df10c4da0931641538497"
+    data-file="hi.c"
+    layout="fixed-height"
+    height="185">
+</amp-mathml>
+```
+
+## Attributes
+
+##### data-gistid (required)
+
+The ID of the gist to embed.
+
+##### layout (required)
+
+Currently only supports `fixed-height`.
+
+##### height (required)
+
+The height of the gist or gist file in pixels.
+
+**Note**: You must find the height of the gist by inspecting it with your browser (e.g., Chrome Developer Tools).
+
+##### data-file (optional)
+
+If specified, display only one file in a gist.
+
+## Validation
+See [amp-mathml rules](https://github.com/ampproject/amphtml/blob/master/extensions/amp-mathml/validator-amp-gist.protoascii) in the AMP validator specification.
diff --git a/extensions/amp-mathml/validator-amp-mathml.protoascii b/extensions/amp-mathml/validator-amp-mathml.protoascii
new file mode 100644
index 000000000000..18cf98b248da
--- /dev/null
+++ b/extensions/amp-mathml/validator-amp-mathml.protoascii
@@ -0,0 +1,40 @@
+#
+# Copyright 2017 The AMP HTML Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS-IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the license.
+#
+
+tags: {  # amp-mathml
+  html_format: AMP
+  tag_name: "SCRIPT"
+  extension_spec: {
+    name: "amp-mathml"
+    allowed_versions: "0.1"
+    allowed_versions: "latest"
+  }
+  attr_lists: "common-extension-attrs"
+}
+tags: {  # <amp-mathml>
+  html_format: AMP
+  tag_name: "AMP-mathml"
+  requires_extension: "amp-mathml"
+  attrs: {
+    name: "data-formula"
+    mandatory: true
+  }
+  attr_lists: "extended-amp-global"
+  spec_url: "https://www.ampproject.org/docs/reference/components/amp-mathml"
+  amp_layout: {
+    supported_layouts: FIXED_HEIGHT
+  }
+}
diff --git a/package.json b/package.json
index 5fa3a814d3ce..bbc115d847f6 100644
--- a/package.json
+++ b/package.json
@@ -27,6 +27,7 @@
   "dependencies": {
     "babel-polyfill": "6.26.0",
     "document-register-element": "1.5.0",
+    "mathjax-node": "^1.3.0",
     "promise-pjs": "1.1.3",
     "react-dates": "13.0.6",
     "web-animations-js": "2.3.1"
diff --git a/yarn.lock b/yarn.lock
index 0f0086ab45b6..14ed2e58d8d5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -178,6 +178,12 @@ acorn-globals@4.1.0, acorn-globals@^4.0.0:
   dependencies:
     acorn "^5.0.0"
 
+acorn-globals@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-3.1.0.tgz#fd8270f71fbb4996b004fa880ee5d46573a731bf"
+  dependencies:
+    acorn "^4.0.4"
+
 acorn-jsx@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-3.0.1.tgz#afdf9488fb1ecefc8348f6fb22f464e32a58b36b"
@@ -192,7 +198,7 @@ acorn@^3.0.4:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
 
-acorn@^4.0.3:
+acorn@^4.0.3, acorn@^4.0.4:
   version "4.0.13"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787"
 
@@ -3395,7 +3401,7 @@ escodegen@1.8.x:
   optionalDependencies:
     source-map "~0.2.0"
 
-escodegen@1.9.0, escodegen@1.x.x, escodegen@^1.9.0:
+escodegen@1.9.0, escodegen@1.x.x, escodegen@^1.6.1, escodegen@^1.9.0:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.9.0.tgz#9811a2f265dc1cd3894420ee3717064b632b8852"
   dependencies:
@@ -5803,6 +5809,30 @@ jsdom@11.5.1:
     whatwg-url "^6.3.0"
     xml-name-validator "^2.0.1"
 
+"jsdom@7.0 - 9.12":
+  version "9.12.0"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-9.12.0.tgz#e8c546fffcb06c00d4833ca84410fed7f8a097d4"
+  dependencies:
+    abab "^1.0.3"
+    acorn "^4.0.4"
+    acorn-globals "^3.1.0"
+    array-equal "^1.0.0"
+    content-type-parser "^1.0.1"
+    cssom ">= 0.3.2 < 0.4.0"
+    cssstyle ">= 0.2.37 < 0.3.0"
+    escodegen "^1.6.1"
+    html-encoding-sniffer "^1.0.1"
+    nwmatcher ">= 1.3.9 < 2.0.0"
+    parse5 "^1.5.1"
+    request "^2.79.0"
+    sax "^1.2.1"
+    symbol-tree "^3.2.1"
+    tough-cookie "^2.3.2"
+    webidl-conversions "^4.0.0"
+    whatwg-encoding "^1.0.1"
+    whatwg-url "^4.3.0"
+    xml-name-validator "^2.0.1"
+
 jsesc@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"
@@ -6683,6 +6713,18 @@ matcher@^1.0.0:
   dependencies:
     escape-string-regexp "^1.0.4"
 
+mathjax-node@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/mathjax-node/-/mathjax-node-1.3.0.tgz#a58c90a185d909b6323b19c0db1501d14ac0070c"
+  dependencies:
+    is-fullwidth-code-point "^2.0.0"
+    jsdom "7.0 - 9.12"
+    mathjax "^2.7.2"
+
+mathjax@^2.7.2:
+  version "2.7.2"
+  resolved "https://registry.yarnpkg.com/mathjax/-/mathjax-2.7.2.tgz#97d78bbebfb65a8621ce33fb7c1f10917355a878"
+
 md5-hex@^1.2.0, md5-hex@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/md5-hex/-/md5-hex-1.3.0.tgz#d2c4afe983c4370662179b8cad145219135046c4"
@@ -7270,7 +7312,7 @@ number-is-nan@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
 
-nwmatcher@^1.4.3:
+"nwmatcher@>= 1.3.9 < 2.0.0", nwmatcher@^1.4.3:
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.4.3.tgz#64348e3b3d80f035b40ac11563d278f8b72db89c"
 
@@ -7612,6 +7654,10 @@ parse-passwd@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
 
+parse5@^1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-1.5.1.tgz#9b7f3b0de32be78dc2401b17573ccaf0f6f59d94"
+
 parse5@^3.0.2:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-3.0.3.tgz#042f792ffdd36851551cf4e9e066b3874ab45b5c"
@@ -8819,7 +8865,7 @@ request@2.81.0:
     tunnel-agent "^0.6.0"
     uuid "^3.0.0"
 
-request@2.83.0, request@^2.0.0, request@^2.74.0, request@^2.83.0:
+request@2.83.0, request@^2.0.0, request@^2.74.0, request@^2.79.0, request@^2.83.0:
   version "2.83.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.83.0.tgz#ca0b65da02ed62935887808e6f510381034e3356"
   dependencies:
@@ -10062,7 +10108,7 @@ touch@3.1.0, touch@^3.1.0:
   dependencies:
     nopt "~1.0.10"
 
-tough-cookie@>=2.3.3, tough-cookie@^2.3.3, tough-cookie@~2.3.0, tough-cookie@~2.3.3:
+tough-cookie@>=2.3.3, tough-cookie@^2.3.2, tough-cookie@^2.3.3, tough-cookie@~2.3.0, tough-cookie@~2.3.3:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.3.tgz#0b618a5565b6dea90bf3425d04d55edc475a7561"
   dependencies:
@@ -10074,6 +10120,10 @@ tr46@^1.0.0:
   dependencies:
     punycode "^2.1.0"
 
+tr46@~0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
+
 trim-newlines@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
@@ -10567,7 +10617,11 @@ web-animations-js@2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/web-animations-js/-/web-animations-js-2.3.1.tgz#3a6d9bc15196377a90f8e2803fa5262165b04510"
 
-webidl-conversions@^4.0.1, webidl-conversions@^4.0.2:
+webidl-conversions@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
+
+webidl-conversions@^4.0.0, webidl-conversions@^4.0.1, webidl-conversions@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
 
@@ -10596,6 +10650,13 @@ whatwg-fetch@>=0.10.0:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz#9c84ec2dcf68187ff00bc64e1274b442176e1c84"
 
+whatwg-url@^4.3.0:
+  version "4.8.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-4.8.0.tgz#d2981aa9148c1e00a41c5a6131166ab4683bbcc0"
+  dependencies:
+    tr46 "~0.0.3"
+    webidl-conversions "^3.0.0"
+
 whatwg-url@^6.3.0:
   version "6.4.0"
   resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-6.4.0.tgz#08fdf2b9e872783a7a1f6216260a1d66cc722e08"

From 4197b1c15f36e4c2416d98c3332ea915a7086dd4 Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adam@10up.com>
Date: Fri, 12 Jan 2018 14:12:24 -0500
Subject: [PATCH 02/56] update first pass

---
 examples/amp-mathml.amp.html                  |  28 +++++
 extensions/amp-mathml/0.1/amp-mathml.js       | 100 +++++-------------
 .../amp-mathml/0.1/test/test-amp-mathml.js    |  48 ++-------
 extensions/amp-mathml/OWNERS.yaml             |   1 -
 extensions/amp-mathml/amp-mathml.md           |  59 +++--------
 .../validator-amp-mathml.protoascii           |  57 +++++++---
 gulpfile.js                                   |   1 +
 package.json                                  |   2 +-
 .../testdata/feature_tests/amp-mathml.html    |  27 +++++
 9 files changed, 151 insertions(+), 172 deletions(-)
 create mode 100644 examples/amp-mathml.amp.html
 delete mode 100644 extensions/amp-mathml/OWNERS.yaml
 create mode 100644 validator/testdata/feature_tests/amp-mathml.html

diff --git a/examples/amp-mathml.amp.html b/examples/amp-mathml.amp.html
new file mode 100644
index 000000000000..3a798a8a2634
--- /dev/null
+++ b/examples/amp-mathml.amp.html
@@ -0,0 +1,28 @@
+<!doctype html>
+<html ⚡>
+<head>
+  <meta charset="utf-8">
+  <title>amp-mathml example</title>
+  <link rel="canonical" href="amps.html">
+  <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
+  <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
+  <style amp-custom>
+    amp-mathml {
+      color: red;
+    }
+  </style>
+  <script async custom-element="amp-mathml" src="https://cdn.ampproject.org/v0/amp-mathml-0.1.js"></script>
+  <script async src="https://cdn.ampproject.org/v0.js"></script>
+</head>
+<body>
+  <h2>The Quadratic Formula</h2>
+  <amp-mathml layout="container" width="250" height="100" formula="\[x = {-b \pm \sqrt{b^2-4ac} \over 2a}.\]">
+  </amp-mathml>
+  <h2>Cauchy's Integral Formula</h2>
+  <amp-mathml layout="container" width="250" height="100" formula="\[f(a) = \frac{1}{2\pi i} \oint\frac{f(z)}{z-a}dz\]">
+  </amp-mathml>
+  <h2>Double angle formula for Cosines</h2>
+  <amp-mathml layout="container" width="250" height="100" formula="\[ \cos(θ+φ)=\cos(θ)\cos(φ)−\sin(θ)\sin(φ) \]">
+  </amp-mathml>
+</body>
+</html>
diff --git a/extensions/amp-mathml/0.1/amp-mathml.js b/extensions/amp-mathml/0.1/amp-mathml.js
index 595f4c3d14a1..da9d13195959 100644
--- a/extensions/amp-mathml/0.1/amp-mathml.js
+++ b/extensions/amp-mathml/0.1/amp-mathml.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017 The AMP HTML Authors. All Rights Reserved.
+ * Copyright 2018 The AMP HTML Authors. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,97 +14,53 @@
  * limitations under the License.
  */
 
-/**
- * @fileoverview Embeds a Github gist
- *
- * Example:
- * <code>
- * <amp-mathml
- *   layout="fixed-height"
- *   data-gistid="a19e811dcd7df10c4da0931641538497"
- *   height="1613">
- * </amp-mathml>
- * </code>
- */
-
-import {getIframe} from '../../../src/3p-frame';
-import {listenFor} from '../../../src/iframe-helper';
-import {removeElement} from '../../../src/dom';
 import {Layout} from '../../../src/layout';
-import {mjAPI} from 'mathjax-node';
-export class AmpMathML extends AMP.BaseElement {
+import {cssstyle} from 'cssstyle';
+import {mathjaxNode} from 'mathjax-node';
+
+export class AmpMathml extends AMP.BaseElement {
 
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
 
-    /** @private {?HTMLIFrameElement} */
-    this.iframe_ = null;
-  }
+    /** @private {string} */
+    this.myText_ = 'hello world!!';
 
-  /**
-  * @param {boolean=} opt_onLayout
-  * @override
-  */
-  preconnectCallback(opt_onLayout) {
+    /** @private {!Element} */
+    this.container_ = this.win.document.createElement('div');
   }
 
-  /**
-   * Create the actual image element and set up instance variables.
-   * Called lazily in the first `#layoutCallback`.
-   */
-  initialize_ () {
-    if ( this.img_ ) {
+  /** @override */
+  buildCallback() {
+    const formula = this.element.getAttribute( 'formula' );
+    if(! formula || '' === formula){
       return;
     }
-    mjAPI.config( {
-      MathJax: {
-        // traditional MathJax configuration
-      }
-    } );
-    mjAPI.start();
-    mjAPI.typeset( {
-      math: this.element.getAttribute('formula'),
-      format: "MathML"
-      mml: true, //
+    console.log( mathjaxNode.typeset );
+    mathjaxNode.typeset( {
+      math: this.element.getAttribute( 'formula' ),
+      format: "MathML",
+      mml: true,
       svg: true,
     }, function ( data ) {
-      if (!data.errors) {
+      console.log( data );
+      if ( !data.errors ) {
         this.img_ = data.svg;
         this.element.appendChild( this.img_ );
-       }
+      }
     } );
-  }
 
-  /** @override */
-  isLayoutSupported(layout) {
-    return layout == Layout.FIXED_HEIGHT;
-  }
+    this.container_.textContent = this.myText_ + this.element.getAttribute( 'formula' );
+    this.element.appendChild( this.container_ );
+    this.applyFillContent( this.container_, /* replacedContent */ true );
+   }
 
   /** @override */
-  layoutCallback() {
-    const iframe = getIframe(this.win, this.element);
-    this.applyFillContent(iframe);
-    // Triggered by window.context.requestResize() inside the iframe.
-    listenFor(iframe, 'embed-size', data => {
-      this./*OK*/changeHeight(data['height']);
-    }, /* opt_is3P */true);
-
-    this.element.appendChild(iframe);
-    this.iframe_ = iframe;
-    return this.loadPromise(iframe);
-  }
-
-  unlayoutCallback() {
-    if (this.iframe_) {
-      removeElement(this.iframe_);
-      this.iframe_ = null;
-    }
-    return true;
+  isLayoutSupported(layout) {
+    return layout == Layout.CONTAINER;
   }
 }
 
 
-AMP.extension('amp-mathml', '0.1', AMP => {
-  AMP.registerElement('amp-mathml', AmpMathML);
-});
+AMP.registerElement('amp-mathml', AmpMathml);
diff --git a/extensions/amp-mathml/0.1/test/test-amp-mathml.js b/extensions/amp-mathml/0.1/test/test-amp-mathml.js
index 771fb7e7f644..98ff8418cf12 100644
--- a/extensions/amp-mathml/0.1/test/test-amp-mathml.js
+++ b/extensions/amp-mathml/0.1/test/test-amp-mathml.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017 The AMP HTML Authors. All Rights Reserved.
+ * Copyright 2018 The AMP HTML Authors. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,51 +14,25 @@
  * limitations under the License.
  */
 
-import '../amp-mathml';
-
+import {AmpMathml} from '../amp-mathml';
 
 describes.realWin('amp-mathml', {
   amp: {
     extensions: ['amp-mathml'],
-  },
+  }
 }, env => {
-  let win, doc;
+
+  let win;
+  let element;
 
   beforeEach(() => {
     win = env.win;
-    doc = win.document;
-  });
-
-  function getIns(formula, file) {
-    const ins = doc.createElement('amp-mathml');
-    ins.setAttribute('data-formula', formula);
-    ins.setAttribute('height', '237');
-    if (file) {
-      ins.setAttribute('data-file', file);
-    }
-    doc.body.appendChild(ins);
-    return ins.build().then(() => ins.layoutCallback()).then(() => ins);
-  }
-
-  it('renders responsively', () => {
-    return getIns('b9bb35bc68df68259af94430f012425f').then(ins => {
-      const iframe = ins.querySelector('iframe');
-      expect(iframe).to.not.be.null;
-      expect(iframe.className).to.match(/i-amphtml-fill-content/);
-    });
-  });
-
-  it('renders responsively with specific file', () => {
-    return getIns('b9bb35bc68df68259af94430f012425f', 'hello-world.html')
-        .then(ins => {
-          const iframe = ins.querySelector('iframe');
-          expect(iframe).to.not.be.null;
-          expect(iframe.className).to.match(/i-amphtml-fill-content/);
-        });
+    element = win.document.createElement('amp-mathml');
+    win.document.body.appendChild(element);
   });
 
-  it('Rejects because data-formula is missing', () => {
-    expect(getIns('')).to.be.rejectedWith(
-        /The data-formula attribute is required for/);
+  it('should have hello world when built', () => {
+    element.build();
+    expect(element.querySelector('div').textContent).to.equal('hello world');
   });
 });
diff --git a/extensions/amp-mathml/OWNERS.yaml b/extensions/amp-mathml/OWNERS.yaml
deleted file mode 100644
index 842398613914..000000000000
--- a/extensions/amp-mathml/OWNERS.yaml
+++ /dev/null
@@ -1 +0,0 @@
-- adamsilverstein
\ No newline at end of file
diff --git a/extensions/amp-mathml/amp-mathml.md b/extensions/amp-mathml/amp-mathml.md
index 1b053ae425df..ccbc5db0e2d1 100644
--- a/extensions/amp-mathml/amp-mathml.md
+++ b/extensions/amp-mathml/amp-mathml.md
@@ -1,5 +1,5 @@
 <!--
-Copyright 2017 The AMP HTML Authors. All Rights Reserved.
+Copyright 2018 The AMP HTML Authors. All Rights Reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -19,68 +19,33 @@ limitations under the License.
 <table>
   <tr>
     <td width="40%"><strong>Description</strong></td>
-    <td>Displays a Math.</td>
+    <td>FILL THIS IN</td>
+  </tr>
+  <tr>
+    <td width="40%"><strong>Availability</strong></td>
+    <td>FILL THIS IN</td>
   </tr>
   <tr>
     <td width="40%"><strong>Required Script</strong></td>
-    <td><code>&lt;script async custom-element="amp-mathml" src="https://cdn.ampproject.org/v0/amp-mathml-0.1.js">&lt;/script></code></td>
+    <td><code>&lt;script async custom-element="amp-form" src="https://cdn.ampproject.org/v0/amp-mathml-0.1.js">&lt;/script></code></td>
   </tr>
   <tr>
     <td class="col-fourty"><strong><a href="https://www.ampproject.org/docs/guides/responsive/control_layout.html">Supported Layouts</a></strong></td>
-    <td>fixed-height</td>
+    <td>FILL THIS IN</td>
   </tr>
   <tr>
     <td width="40%"><strong>Examples</strong></td>
-    <td><a href="https://ampbyexample.com/components/amp-mathml/">Annotated code example for amp-mathml</a></td>
+    <td>FILL THIS IN</td>
   </tr>
 </table>
 
-[TOC]
-
 ## Behavior
 
-This extension creates an iframe and displays a [gist from GitHub](https://help.github.com/articles/about-gists/).
-
-#### Example: Embedding multiple files
-
-```html
-<amp-mathml
-    data-gistid="b9bb35bc68df68259af94430f012425f"
-    layout="fixed-height"
-    height="225">
-</amp-mathml>
-```
-
-#### Example: Embedding a single file
-
-```html
-<amp-mathml
-    data-gistid="a19e811dcd7df10c4da0931641538497"
-    data-file="hi.c"
-    layout="fixed-height"
-    height="185">
-</amp-mathml>
-```
+FILL THIS IN. What does this extension do?
 
 ## Attributes
 
-##### data-gistid (required)
-
-The ID of the gist to embed.
-
-##### layout (required)
-
-Currently only supports `fixed-height`.
-
-##### height (required)
-
-The height of the gist or gist file in pixels.
-
-**Note**: You must find the height of the gist by inspecting it with your browser (e.g., Chrome Developer Tools).
-
-##### data-file (optional)
-
-If specified, display only one file in a gist.
+FILL THIS IN. Does this extension allow for properties to configure?
 
 ## Validation
-See [amp-mathml rules](https://github.com/ampproject/amphtml/blob/master/extensions/amp-mathml/validator-amp-gist.protoascii) in the AMP validator specification.
+See [amp-mathml rules](https://github.com/ampproject/amphtml/blob/master/extensions/amp-mathml/validator-amp-mathml.protoascii) in the AMP validator specification.
diff --git a/extensions/amp-mathml/validator-amp-mathml.protoascii b/extensions/amp-mathml/validator-amp-mathml.protoascii
index 18cf98b248da..3fc6ca052e72 100644
--- a/extensions/amp-mathml/validator-amp-mathml.protoascii
+++ b/extensions/amp-mathml/validator-amp-mathml.protoascii
@@ -1,5 +1,5 @@
 #
-# Copyright 2017 The AMP HTML Authors. All Rights Reserved.
+# Copyright 2018 The AMP HTML Authors. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,24 +17,53 @@
 tags: {  # amp-mathml
   html_format: AMP
   tag_name: "SCRIPT"
-  extension_spec: {
-    name: "amp-mathml"
-    allowed_versions: "0.1"
-    allowed_versions: "latest"
+  spec_name: "amp-mathml extension .js script"
+  satisfies: "amp-mathml extension .js script"
+  requires: "amp-mathml"
+  mandatory_parent: "HEAD"
+  unique: true
+  extension_unused_unless_tag_present: "amp-mathml"
+  attrs: {
+    name: "async"
+    mandatory: true
+    value: ""
   }
-  attr_lists: "common-extension-attrs"
-}
-tags: {  # <amp-mathml>
-  html_format: AMP
-  tag_name: "AMP-mathml"
-  requires_extension: "amp-mathml"
   attrs: {
-    name: "data-formula"
+    name: "formula"
     mandatory: true
   }
-  attr_lists: "extended-amp-global"
+  attrs: {
+    name: "custom-element"
+    mandatory: true
+    value: "amp-mathml"
+    dispatch_key: true
+  }
+  attrs: { name: "nonce" }
+  attrs: {
+    name: "src"
+    mandatory: true
+    value_regex: "https://cdn\.ampproject\.org/v0/amp-mathml-(latest|0\.1).js"
+  }
+  attrs: {
+    name: "type"
+    value: "text/javascript"
+  }
+  cdata: {
+    blacklisted_cdata_regex: {
+      regex: "."
+      error_message: "contents"
+    }
+  }
   spec_url: "https://www.ampproject.org/docs/reference/components/amp-mathml"
+}
+tags: {  # <amp-mathml>
+  html_format: AMP
+  tag_name: "AMP-MATHML"
+  satisfies: "amp-mathml"
+  requires: "amp-mathml extension .js script"
+  attr_lists: "extended-amp-global"
+  spec_url: "https://www.ampproject.org/docs/reference/components/amp-hello-world"
   amp_layout: {
-    supported_layouts: FIXED_HEIGHT
+    supported_layouts: RESPONSIVE
   }
 }
diff --git a/gulpfile.js b/gulpfile.js
index b7d005279bea..8d4d1661b35c 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -112,6 +112,7 @@ declareExtension('amp-lightbox', '0.1', true);
 declareExtension('amp-lightbox-viewer', '0.1', true);
 declareExtension('amp-list', '0.1', false);
 declareExtension('amp-live-list', '0.1', true);
+declareExtension('amp-mathml', '0.1', false);
 declareExtension('amp-mustache', '0.1', false);
 declareExtension('amp-nexxtv-player', '0.1', false);
 declareExtension('amp-o2-player', '0.1', false);
diff --git a/package.json b/package.json
index bbc115d847f6..db5059eece23 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,6 @@
   "dependencies": {
     "babel-polyfill": "6.26.0",
     "document-register-element": "1.5.0",
-    "mathjax-node": "^1.3.0",
     "promise-pjs": "1.1.3",
     "react-dates": "13.0.6",
     "web-animations-js": "2.3.1"
@@ -123,6 +122,7 @@
     "lazypipe": "1.0.1",
     "lolex": "2.3.1",
     "markdown-link-check": "3.1.6",
+    "mathjax-node": "1.3.0",
     "minimatch": "3.0.4",
     "minimist": "1.2.0",
     "mocha": "4.1.0",
diff --git a/validator/testdata/feature_tests/amp-mathml.html b/validator/testdata/feature_tests/amp-mathml.html
new file mode 100644
index 000000000000..ad5c9b73a67c
--- /dev/null
+++ b/validator/testdata/feature_tests/amp-mathml.html
@@ -0,0 +1,27 @@
+<!doctype html>
+<html ⚡>
+<head>
+  <meta charset="utf-8">
+  <title>amp-mathml example</title>
+  <link rel="canonical" href="amps.html">
+  <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
+  <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
+  <style amp-custom>
+    amp-mathml {
+      color: red;
+    }
+  </style>
+  <script async custom-element="amp-mathml" src="https://cdn.ampproject.org/v0/amp-mathml-0.1.js"></script>
+  <script async src="https://cdn.ampproject.org/v0.js"></script>
+</head>
+<body>
+    <amp-mathml formula="\[x = {-b \pm \sqrt{b^2-4ac} \over 2a}.\]">
+    </amp-mathml>
+    <h2>Cauchy's Integral Formula</h2>
+    <amp-mathml formula="\[f(a) = \frac{1}{2\pi i} \oint\frac{f(z)}{z-a}dz\]">
+    </amp-mathml>
+    <h2>Double angle formula for Cosines</h2>
+    <amp-mathml formula="\[ \cos(θ+φ)=\cos(θ)\cos(φ)−\sin(θ)\sin(φ) \]">
+    </amp-mathml>
+</body>
+</html>

From 555d3c105df69d44d6013ee2edb92ba3b14b5d42 Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adam@10up.com>
Date: Fri, 12 Jan 2018 14:13:58 -0500
Subject: [PATCH 03/56] simplify callback

---
 extensions/amp-mathml/0.1/amp-mathml.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/extensions/amp-mathml/0.1/amp-mathml.js b/extensions/amp-mathml/0.1/amp-mathml.js
index da9d13195959..be06da49cd2c 100644
--- a/extensions/amp-mathml/0.1/amp-mathml.js
+++ b/extensions/amp-mathml/0.1/amp-mathml.js
@@ -46,8 +46,7 @@ export class AmpMathml extends AMP.BaseElement {
     }, function ( data ) {
       console.log( data );
       if ( !data.errors ) {
-        this.img_ = data.svg;
-        this.element.appendChild( this.img_ );
+        this.element.appendChild( data.svg );
       }
     } );
 

From b614b6589d85d259cde71660bf5b6006ef258a27 Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adam@10up.com>
Date: Fri, 12 Jan 2018 14:28:49 -0500
Subject: [PATCH 04/56] cleanup

---
 extensions/amp-mathml/0.1/amp-mathml.js | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/extensions/amp-mathml/0.1/amp-mathml.js b/extensions/amp-mathml/0.1/amp-mathml.js
index be06da49cd2c..b2a5df1ce11f 100644
--- a/extensions/amp-mathml/0.1/amp-mathml.js
+++ b/extensions/amp-mathml/0.1/amp-mathml.js
@@ -16,7 +16,7 @@
 
 import {Layout} from '../../../src/layout';
 import {cssstyle} from 'cssstyle';
-import {mathjaxNode} from 'mathjax-node';
+import {typeset} from 'mathjax-node';
 
 export class AmpMathml extends AMP.BaseElement {
 
@@ -24,9 +24,6 @@ export class AmpMathml extends AMP.BaseElement {
   constructor(element) {
     super(element);
 
-    /** @private {string} */
-    this.myText_ = 'hello world!!';
-
     /** @private {!Element} */
     this.container_ = this.win.document.createElement('div');
   }
@@ -37,22 +34,16 @@ export class AmpMathml extends AMP.BaseElement {
     if(! formula || '' === formula){
       return;
     }
-    console.log( mathjaxNode.typeset );
-    mathjaxNode.typeset( {
+    typeset( {
       math: this.element.getAttribute( 'formula' ),
       format: "MathML",
       mml: true,
       svg: true,
     }, function ( data ) {
-      console.log( data );
       if ( !data.errors ) {
         this.element.appendChild( data.svg );
       }
     } );
-
-    this.container_.textContent = this.myText_ + this.element.getAttribute( 'formula' );
-    this.element.appendChild( this.container_ );
-    this.applyFillContent( this.container_, /* replacedContent */ true );
    }
 
   /** @override */

From 9fe5d53920248ee027431441aee580c34a4b803f Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adam@10up.com>
Date: Fri, 12 Jan 2018 14:30:13 -0500
Subject: [PATCH 05/56] no tests for now

---
 extensions/amp-mathml/0.1/test/test-amp-mathml.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/extensions/amp-mathml/0.1/test/test-amp-mathml.js b/extensions/amp-mathml/0.1/test/test-amp-mathml.js
index 98ff8418cf12..fa39b8bf5941 100644
--- a/extensions/amp-mathml/0.1/test/test-amp-mathml.js
+++ b/extensions/amp-mathml/0.1/test/test-amp-mathml.js
@@ -31,8 +31,4 @@ describes.realWin('amp-mathml', {
     win.document.body.appendChild(element);
   });
 
-  it('should have hello world when built', () => {
-    element.build();
-    expect(element.querySelector('div').textContent).to.equal('hello world');
-  });
 });

From ff4dd23c64919138643f8b12c242114651be4fa5 Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adam@10up.com>
Date: Fri, 12 Jan 2018 20:19:30 -0500
Subject: [PATCH 06/56] Rendering! First pass at resizing

---
 examples/amp-mathml.amp.html                  | 27 +++++-
 extensions/amp-mathml/0.1/amp-mathml.js       | 89 +++++++++++++++----
 .../testdata/feature_tests/amp-mathml.html    |  6 +-
 3 files changed, 99 insertions(+), 23 deletions(-)

diff --git a/examples/amp-mathml.amp.html b/examples/amp-mathml.amp.html
index 3a798a8a2634..bccd224b434c 100644
--- a/examples/amp-mathml.amp.html
+++ b/examples/amp-mathml.amp.html
@@ -16,13 +16,34 @@
 </head>
 <body>
   <h2>The Quadratic Formula</h2>
-  <amp-mathml layout="container" width="250" height="100" formula="\[x = {-b \pm \sqrt{b^2-4ac} \over 2a}.\]">
+  <amp-mathml
+    resizable
+    width="250" height="100" formula="\[x = {-b \pm \sqrt{b^2-4ac} \over 2a}.\]">
+      <div overflow
+    tabindex="0"
+    role="button"
+    class="ampstart-card py1"
+    aria-label="Show more">Click to show more</div>
   </amp-mathml>
   <h2>Cauchy's Integral Formula</h2>
-  <amp-mathml layout="container" width="250" height="100" formula="\[f(a) = \frac{1}{2\pi i} \oint\frac{f(z)}{z-a}dz\]">
+  <amp-mathml
+    resizable
+    width="250" height="100" formula="\[f(a) = \frac{1}{2\pi i} \oint\frac{f(z)}{z-a}dz\]">
+      <div overflow
+    tabindex="0"
+    role="button"
+    class="ampstart-card py1"
+    aria-label="Show more">Click to show more</div>
   </amp-mathml>
   <h2>Double angle formula for Cosines</h2>
-  <amp-mathml layout="container" width="250" height="100" formula="\[ \cos(θ+φ)=\cos(θ)\cos(φ)−\sin(θ)\sin(φ) \]">
+  <amp-mathml
+    resizable
+    width="250" height="100" formula="\[ \cos(θ+φ)=\cos(θ)\cos(φ)−\sin(θ)\sin(φ) \]">
+      <div overflow
+    tabindex="0"
+    role="button"
+    class="ampstart-card py1"
+    aria-label="Show more">Click to show more</div>
   </amp-mathml>
 </body>
 </html>
diff --git a/extensions/amp-mathml/0.1/amp-mathml.js b/extensions/amp-mathml/0.1/amp-mathml.js
index b2a5df1ce11f..3cc1a48169ac 100644
--- a/extensions/amp-mathml/0.1/amp-mathml.js
+++ b/extensions/amp-mathml/0.1/amp-mathml.js
@@ -13,10 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
+import {isLayoutSizeDefined} from '../../../src/layout';
 import {Layout} from '../../../src/layout';
 import {cssstyle} from 'cssstyle';
-import {typeset} from 'mathjax-node';
+import {getIframe} from '../../../src/3p-frame';
+import { addParamsToUrl } from '../../../src/url';
+import { getDataParamsFromAttributes, removeElement } from '../../../src/dom';
+import { listenFor } from '../../../src/iframe-helper';
 
 export class AmpMathml extends AMP.BaseElement {
 
@@ -26,30 +29,82 @@ export class AmpMathml extends AMP.BaseElement {
 
     /** @private {!Element} */
     this.container_ = this.win.document.createElement('div');
+
+    /** @private {?HTMLIFrameElement} */
+    this.iframe_ = null;
   }
 
+  /**
+  * @param {boolean=} opt_onLayout
+  * @override
+  */
+  preconnectCallback () {
+    this.preconnect.url('https://cdnjs.cloudflare.com');
+  }
   /** @override */
   buildCallback() {
-    const formula = this.element.getAttribute( 'formula' );
-    if(! formula || '' === formula){
+    const formula = this.element.getAttribute('formula');
+    if ( !formula || '' === formula ) {
       return;
     }
-    typeset( {
-      math: this.element.getAttribute( 'formula' ),
-      format: "MathML",
-      mml: true,
-      svg: true,
-    }, function ( data ) {
-      if ( !data.errors ) {
-        this.element.appendChild( data.svg );
-      }
-    } );
-   }
+    this._formula = formula;
+  }
+
+  getIframeHeader () {
+    return "<script src='https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/MathJax.js?config=TeX-MML-AM_CHTML'></script>";
+  }
+  getIframeContents() {
+
+    const formula = this.element.getAttribute( 'formula' );
+    if ( !formula || '' === formula ) {
+      return false;
+    }
+
+    let src = formula +
+     ' <script type="text/javascript">' +
+     '   ' +
+     '   document.addEventListener( "DOMContentLoaded", function () {' +
+     '     window.parent.postMessage( {' +
+     '       sentinel: "amp",' +
+     '       type: "embed-size",' +
+     '       height: document.body.scrollHeight' +
+     '     }, "*" );' +
+     '   } );' +
+     '   </script>';
+    return src;
+  }
+
+  layoutCallback () {
+    const iframe = this.element.ownerDocument.createElement('iframe');
+
+    iframe.setAttribute( 'frameborder', '0' );
+    iframe.setAttribute('scrolling', 'no');
+    iframe.setAttribute('frameborder', '0');
+    iframe.setAttribute('sandbox','allow-scripts allow-same-origin allow-popups');
+    const html =
+      '<head>' + this.getIframeHeader() + '</head>' +
+      '<body>' + this.getIframeContents() + '</body>';
+    if (html) {
+      iframe.src = 'data:text/html;charset=utf-8,' + encodeURI(html);
+      this.element.appendChild(iframe);
+      this.iframe_ = iframe;
+    }
+    return this.loadPromise(iframe);
+  }
+
+  unlayoutCallback () {
+    if ( this.iframe_ ) {
+      removeElement( this.iframe_ );
+      this.iframe_ = null;
+    }
+    return true;
+  }
 
   /** @override */
-  isLayoutSupported(layout) {
-    return layout == Layout.CONTAINER;
+  isLayoutSupported (layout) {
+    return isLayoutSizeDefined(layout);
   }
+
 }
 
 
diff --git a/validator/testdata/feature_tests/amp-mathml.html b/validator/testdata/feature_tests/amp-mathml.html
index ad5c9b73a67c..45da650d0724 100644
--- a/validator/testdata/feature_tests/amp-mathml.html
+++ b/validator/testdata/feature_tests/amp-mathml.html
@@ -15,13 +15,13 @@
   <script async src="https://cdn.ampproject.org/v0.js"></script>
 </head>
 <body>
-    <amp-mathml formula="\[x = {-b \pm \sqrt{b^2-4ac} \over 2a}.\]">
+    <amp-mathml layout="responsive" formula="\[x = {-b \pm \sqrt{b^2-4ac} \over 2a}.\]">
     </amp-mathml>
     <h2>Cauchy's Integral Formula</h2>
-    <amp-mathml formula="\[f(a) = \frac{1}{2\pi i} \oint\frac{f(z)}{z-a}dz\]">
+    <amp-mathml layout="responsive" formula="\[f(a) = \frac{1}{2\pi i} \oint\frac{f(z)}{z-a}dz\]">
     </amp-mathml>
     <h2>Double angle formula for Cosines</h2>
-    <amp-mathml formula="\[ \cos(θ+φ)=\cos(θ)\cos(φ)−\sin(θ)\sin(φ) \]">
+    <amp-mathml layout="responsive" formula="\[ \cos(θ+φ)=\cos(θ)\cos(φ)−\sin(θ)\sin(φ) \]">
     </amp-mathml>
 </body>
 </html>

From d96cafc4473d609f05799f981dc37869029559ca Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adam@10up.com>
Date: Fri, 12 Jan 2018 21:22:31 -0500
Subject: [PATCH 07/56] cleanup

---
 extensions/amp-mathml/0.1/amp-mathml.js | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/extensions/amp-mathml/0.1/amp-mathml.js b/extensions/amp-mathml/0.1/amp-mathml.js
index 3cc1a48169ac..63c16a1e390d 100644
--- a/extensions/amp-mathml/0.1/amp-mathml.js
+++ b/extensions/amp-mathml/0.1/amp-mathml.js
@@ -75,20 +75,18 @@ export class AmpMathml extends AMP.BaseElement {
   }
 
   layoutCallback () {
-    const iframe = this.element.ownerDocument.createElement('iframe');
-
-    iframe.setAttribute( 'frameborder', '0' );
-    iframe.setAttribute('scrolling', 'no');
-    iframe.setAttribute('frameborder', '0');
-    iframe.setAttribute('sandbox','allow-scripts allow-same-origin allow-popups');
+    const iframe = getIframe( this.win, this.element, 'mathml' );
+    this.applyFillContent( iframe );
+    listenFor( iframe, 'embed-size', data => {
+      this./*OK*/changeHeight( data[ 'height' ] );
+    }, /* opt_is3P */true );
     const html =
       '<head>' + this.getIframeHeader() + '</head>' +
       '<body>' + this.getIframeContents() + '</body>';
-    if (html) {
-      iframe.src = 'data:text/html;charset=utf-8,' + encodeURI(html);
-      this.element.appendChild(iframe);
-      this.iframe_ = iframe;
-    }
+    iframe.src = 'data:text/html;charset=utf-8,' + encodeURI(html);
+    this.element.appendChild(iframe);
+    this.iframe_ = iframe;
+    con
     return this.loadPromise(iframe);
   }
 

From f1c81b66d141a4b0e662498fab1f1f114981f0b9 Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adam@10up.com>
Date: Fri, 12 Jan 2018 21:24:30 -0500
Subject: [PATCH 08/56] remove mathjax-node

---
 package.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package.json b/package.json
index db5059eece23..5fa3a814d3ce 100644
--- a/package.json
+++ b/package.json
@@ -122,7 +122,6 @@
     "lazypipe": "1.0.1",
     "lolex": "2.3.1",
     "markdown-link-check": "3.1.6",
-    "mathjax-node": "1.3.0",
     "minimatch": "3.0.4",
     "minimist": "1.2.0",
     "mocha": "4.1.0",

From 248fcd06f5e363c0c5b6e0e5110a4cb5e1a9147f Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adam@10up.com>
Date: Mon, 15 Jan 2018 23:20:41 -0500
Subject: [PATCH 09/56] add mathml.js, first pass

---
 3p/mathml.js | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)
 create mode 100644 3p/mathml.js

diff --git a/3p/mathml.js b/3p/mathml.js
new file mode 100644
index 000000000000..8b6eb73b9997
--- /dev/null
+++ b/3p/mathml.js
@@ -0,0 +1,68 @@
+/**
+ * Copyright 2017 The AMP HTML Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS-IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+console.log( 'mathml.js' );
+
+import {writeScript} from './3p';
+import {user} from '../src/log';
+
+/**
+ * Get the correct script for the gist.
+ *
+ * Use writeScript: Failed to execute 'write' on 'Document': It isn't possible
+ * to write into a document from an asynchronously-loaded external script unless
+ * it is explicitly opened.
+ *
+ * @param {!Window} global
+ * @param {string} scriptSource The source of the script, different for post and comment embeds.
+ */
+function getMathmlJs(global, scriptSource, cb) {
+ writeScript(global, scriptSource, function() {
+    cb(global.gist);
+  });
+}
+
+/**
+ * @param {!Window} global
+ * @param {!Object} data
+ */
+export function mathml(global, data) {
+  user().assert(
+      data.formula,
+      'The formula attribute is required for <amp-mathml> %s',
+      data.element);
+
+  getMathmlJs(
+    global,
+    'https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/MathJax.js?config=TeX-MML-AM_CHTML',
+    function() {
+      // Dimensions are given by the parent frame.
+      delete data.width;
+      delete data.height;
+      const div = document.createElement('div');
+      div.setAttribute('id','mathmlformula');
+      div.innerHTML = data.formula;
+      document.body.appendChild(div);
+      MathJax.Hub.Queue( function () {
+        const rendered = document.getElementById('MathJax-Element-1-Frame');
+        context.requestResize(
+                rendered./*OK*/offsetWidth + 20,
+                rendered./*OK*/offsetHeight + 20
+            );
+      } );
+
+    }
+  );
+}

From 008516190efdd0581c81a0d9fb288a6d267ac99d Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adam@10up.com>
Date: Mon, 15 Jan 2018 23:21:03 -0500
Subject: [PATCH 10/56] make example methml items responsive

---
 examples/amp-mathml.amp.html | 32 ++++++--------------------------
 1 file changed, 6 insertions(+), 26 deletions(-)

diff --git a/examples/amp-mathml.amp.html b/examples/amp-mathml.amp.html
index bccd224b434c..b24293f59bf6 100644
--- a/examples/amp-mathml.amp.html
+++ b/examples/amp-mathml.amp.html
@@ -6,44 +6,24 @@
   <link rel="canonical" href="amps.html">
   <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
   <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
-  <style amp-custom>
-    amp-mathml {
-      color: red;
-    }
-  </style>
   <script async custom-element="amp-mathml" src="https://cdn.ampproject.org/v0/amp-mathml-0.1.js"></script>
   <script async src="https://cdn.ampproject.org/v0.js"></script>
 </head>
 <body>
   <h2>The Quadratic Formula</h2>
   <amp-mathml
-    resizable
-    width="250" height="100" formula="\[x = {-b \pm \sqrt{b^2-4ac} \over 2a}.\]">
-      <div overflow
-    tabindex="0"
-    role="button"
-    class="ampstart-card py1"
-    aria-label="Show more">Click to show more</div>
+    layout="responsive"
+    width="100" height="100" data-formula="\[x = {-b \pm \sqrt{b^2-4ac} \over 2a}.\]">
   </amp-mathml>
   <h2>Cauchy's Integral Formula</h2>
   <amp-mathml
-    resizable
-    width="250" height="100" formula="\[f(a) = \frac{1}{2\pi i} \oint\frac{f(z)}{z-a}dz\]">
-      <div overflow
-    tabindex="0"
-    role="button"
-    class="ampstart-card py1"
-    aria-label="Show more">Click to show more</div>
+    layout="responsive"
+    width="100" height="100" data-formula="\[f(a) = \frac{1}{2\pi i} \oint\frac{f(z)}{z-a}dz\]">
   </amp-mathml>
   <h2>Double angle formula for Cosines</h2>
   <amp-mathml
-    resizable
-    width="250" height="100" formula="\[ \cos(θ+φ)=\cos(θ)\cos(φ)−\sin(θ)\sin(φ) \]">
-      <div overflow
-    tabindex="0"
-    role="button"
-    class="ampstart-card py1"
-    aria-label="Show more">Click to show more</div>
+    layout="responsive"
+    width="100" height="100" data-formula="\[ \cos(θ+φ)=\cos(θ)\cos(φ)−\sin(θ)\sin(φ) \]">
   </amp-mathml>
 </body>
 </html>

From 70160b0ca00077b488d1b2ddd588989c576ebb8f Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adam@10up.com>
Date: Mon, 15 Jan 2018 23:21:16 -0500
Subject: [PATCH 11/56] register mathml integration

---
 3p/integration.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/3p/integration.js b/3p/integration.js
index 166ea162e9c5..9b6cc8472fdb 100644
--- a/3p/integration.js
+++ b/3p/integration.js
@@ -63,6 +63,7 @@ import {MessageType} from '../src/3p-frame-messaging';
 // 3P - please keep in alphabetic order
 import {facebook} from './facebook';
 import {github} from './github';
+import {mathml} from './mathml';
 import {reddit} from './reddit';
 import {twitter} from './twitter';
 
@@ -327,6 +328,7 @@ register('loka', loka);
 register('mads', mads);
 register('mantis-display', mantisDisplay);
 register('mantis-recommend', mantisRecommend);
+register('mathml', mathml);
 register('mediaimpact', mediaimpact);
 register('medianet', medianet);
 register('mediavine', mediavine);

From 45064bf73d5dcfedaf5ee5a00ae3d7f4f393778b Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adam@10up.com>
Date: Mon, 15 Jan 2018 23:21:56 -0500
Subject: [PATCH 12/56] amp-mathml cleanup

---
 extensions/amp-mathml/0.1/amp-mathml.js | 38 +++++++------------------
 1 file changed, 11 insertions(+), 27 deletions(-)

diff --git a/extensions/amp-mathml/0.1/amp-mathml.js b/extensions/amp-mathml/0.1/amp-mathml.js
index 63c16a1e390d..7b04efb81cf2 100644
--- a/extensions/amp-mathml/0.1/amp-mathml.js
+++ b/extensions/amp-mathml/0.1/amp-mathml.js
@@ -50,43 +50,25 @@ export class AmpMathml extends AMP.BaseElement {
     this._formula = formula;
   }
 
-  getIframeHeader () {
-    return "<script src='https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/MathJax.js?config=TeX-MML-AM_CHTML'></script>";
-  }
+
   getIframeContents() {
 
-    const formula = this.element.getAttribute( 'formula' );
+    const formula = this.element.getAttribute('formula');
     if ( !formula || '' === formula ) {
       return false;
     }
 
-    let src = formula +
-     ' <script type="text/javascript">' +
-     '   ' +
-     '   document.addEventListener( "DOMContentLoaded", function () {' +
-     '     window.parent.postMessage( {' +
-     '       sentinel: "amp",' +
-     '       type: "embed-size",' +
-     '       height: document.body.scrollHeight' +
-     '     }, "*" );' +
-     '   } );' +
-     '   </script>';
-    return src;
+    return formula;
   }
-
   layoutCallback () {
-    const iframe = getIframe( this.win, this.element, 'mathml' );
-    this.applyFillContent( iframe );
-    listenFor( iframe, 'embed-size', data => {
-      this./*OK*/changeHeight( data[ 'height' ] );
+    const iframe = getIframe(this.win, this.element, 'mathml');
+    this.applyFillContent(iframe);
+    // Triggered by context.updateDimensions() inside the iframe.
+    listenFor(iframe, 'embed-size', data => {
+      this.updateSize_( data[ 'height' ], data[ 'width' ] );
     }, /* opt_is3P */true );
-    const html =
-      '<head>' + this.getIframeHeader() + '</head>' +
-      '<body>' + this.getIframeContents() + '</body>';
-    iframe.src = 'data:text/html;charset=utf-8,' + encodeURI(html);
     this.element.appendChild(iframe);
     this.iframe_ = iframe;
-    con
     return this.loadPromise(iframe);
   }
 
@@ -106,4 +88,6 @@ export class AmpMathml extends AMP.BaseElement {
 }
 
 
-AMP.registerElement('amp-mathml', AmpMathml);
+AMP.extension('amp-mathl', '0.1', AMP => {
+  AMP.registerElement('amp-mathl', AmpMathml);
+} );

From 744208a8d690df6f040110f6b207c75bf08757a3 Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adam@10up.com>
Date: Mon, 15 Jan 2018 23:29:51 -0500
Subject: [PATCH 13/56] more cleanup

---
 extensions/amp-mathml/0.1/amp-mathml.js | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/extensions/amp-mathml/0.1/amp-mathml.js b/extensions/amp-mathml/0.1/amp-mathml.js
index 7b04efb81cf2..821ed722529e 100644
--- a/extensions/amp-mathml/0.1/amp-mathml.js
+++ b/extensions/amp-mathml/0.1/amp-mathml.js
@@ -44,28 +44,17 @@ export class AmpMathml extends AMP.BaseElement {
   /** @override */
   buildCallback() {
     const formula = this.element.getAttribute('formula');
-    if ( !formula || '' === formula ) {
+    if (!formula || '' === formula) {
       return;
     }
     this._formula = formula;
   }
-
-
-  getIframeContents() {
-
-    const formula = this.element.getAttribute('formula');
-    if ( !formula || '' === formula ) {
-      return false;
-    }
-
-    return formula;
-  }
   layoutCallback () {
     const iframe = getIframe(this.win, this.element, 'mathml');
     this.applyFillContent(iframe);
     // Triggered by context.updateDimensions() inside the iframe.
     listenFor(iframe, 'embed-size', data => {
-      this.updateSize_( data[ 'height' ], data[ 'width' ] );
+      this./*OK*/changeHeight(data['height']);
     }, /* opt_is3P */true );
     this.element.appendChild(iframe);
     this.iframe_ = iframe;
@@ -73,8 +62,8 @@ export class AmpMathml extends AMP.BaseElement {
   }
 
   unlayoutCallback () {
-    if ( this.iframe_ ) {
-      removeElement( this.iframe_ );
+    if (this.iframe_) {
+      removeElement(this.iframe_);
       this.iframe_ = null;
     }
     return true;
@@ -88,6 +77,6 @@ export class AmpMathml extends AMP.BaseElement {
 }
 
 
-AMP.extension('amp-mathl', '0.1', AMP => {
-  AMP.registerElement('amp-mathl', AmpMathml);
+AMP.extension('amp-mathml', '0.1', AMP => {
+  AMP.registerElement('amp-mathml', AmpMathml);
 } );

From 4a893497c065189d7794c9962a6f9fa1910197ab Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adam@10up.com>
Date: Wed, 17 Jan 2018 12:19:14 -0500
Subject: [PATCH 14/56] copyright should be 2018

---
 3p/mathml.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/3p/mathml.js b/3p/mathml.js
index 8b6eb73b9997..884d8e52fbcd 100644
--- a/3p/mathml.js
+++ b/3p/mathml.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017 The AMP HTML Authors. All Rights Reserved.
+ * Copyright 2018 The AMP HTML Authors. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From c2e79d156ca6c24369d182cf1fbfb3264e076438 Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adam@10up.com>
Date: Wed, 17 Jan 2018 12:27:26 -0500
Subject: [PATCH 15/56] remove some console logging

---
 3p/mathml.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/3p/mathml.js b/3p/mathml.js
index 884d8e52fbcd..ffcb84f78bf1 100644
--- a/3p/mathml.js
+++ b/3p/mathml.js
@@ -13,8 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-console.log( 'mathml.js' );
-
 import {writeScript} from './3p';
 import {user} from '../src/log';
 

From b204fb234b64f11167c4935023eea9418ac6fc33 Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adam@10up.com>
Date: Wed, 17 Jan 2018 12:28:49 -0500
Subject: [PATCH 16/56] inline docs: mathml not gist

---
 3p/mathml.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/3p/mathml.js b/3p/mathml.js
index ffcb84f78bf1..7c164aac181c 100644
--- a/3p/mathml.js
+++ b/3p/mathml.js
@@ -17,7 +17,7 @@ import {writeScript} from './3p';
 import {user} from '../src/log';
 
 /**
- * Get the correct script for the gist.
+ * Get the correct script for the mathml formula.
  *
  * Use writeScript: Failed to execute 'write' on 'Document': It isn't possible
  * to write into a document from an asynchronously-loaded external script unless

From 8afa5c1877e02939d9650aafb3854348698ddca9 Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adam@10up.com>
Date: Wed, 17 Jan 2018 12:29:57 -0500
Subject: [PATCH 17/56] use the MathJax global

---
 3p/mathml.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/3p/mathml.js b/3p/mathml.js
index 7c164aac181c..81a0f41b0348 100644
--- a/3p/mathml.js
+++ b/3p/mathml.js
@@ -28,7 +28,7 @@ import {user} from '../src/log';
  */
 function getMathmlJs(global, scriptSource, cb) {
  writeScript(global, scriptSource, function() {
-    cb(global.gist);
+   cb(global.MathJax);
   });
 }
 

From 7d1854feb5ba442b039287a37074f45980928aea Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adam@10up.com>
Date: Wed, 17 Jan 2018 12:33:31 -0500
Subject: [PATCH 18/56] switch callback to arrow function, passing mathjax

---
 3p/mathml.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/3p/mathml.js b/3p/mathml.js
index 81a0f41b0348..6923273f77e9 100644
--- a/3p/mathml.js
+++ b/3p/mathml.js
@@ -45,7 +45,7 @@ export function mathml(global, data) {
   getMathmlJs(
     global,
     'https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/MathJax.js?config=TeX-MML-AM_CHTML',
-    function() {
+    mathjax => {
       // Dimensions are given by the parent frame.
       delete data.width;
       delete data.height;

From 2145996352c9132eb5be4e0ca34e6c5c326724ca Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adam@10up.com>
Date: Wed, 17 Jan 2018 12:33:48 -0500
Subject: [PATCH 19/56] used the passed mathjax object instead of the global

---
 3p/mathml.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/3p/mathml.js b/3p/mathml.js
index 6923273f77e9..695e102994bf 100644
--- a/3p/mathml.js
+++ b/3p/mathml.js
@@ -53,7 +53,7 @@ export function mathml(global, data) {
       div.setAttribute('id','mathmlformula');
       div.innerHTML = data.formula;
       document.body.appendChild(div);
-      MathJax.Hub.Queue( function () {
+      mathjax.Hub.Queue( function () {
         const rendered = document.getElementById('MathJax-Element-1-Frame');
         context.requestResize(
                 rendered./*OK*/offsetWidth + 20,

From 1962ff49f96f8d197c94f6ade2ef2f5ffbf35c5c Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adam@10up.com>
Date: Wed, 17 Jan 2018 12:38:50 -0500
Subject: [PATCH 20/56] switch div.innerHTML to div.textContent

---
 3p/mathml.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/3p/mathml.js b/3p/mathml.js
index 695e102994bf..75920394fd26 100644
--- a/3p/mathml.js
+++ b/3p/mathml.js
@@ -51,7 +51,7 @@ export function mathml(global, data) {
       delete data.height;
       const div = document.createElement('div');
       div.setAttribute('id','mathmlformula');
-      div.innerHTML = data.formula;
+      div.textContent = data.formula;
       document.body.appendChild(div);
       mathjax.Hub.Queue( function () {
         const rendered = document.getElementById('MathJax-Element-1-Frame');

From 6b9c92b565046f76098c5a8d92a3e7dff2238cf9 Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adam@10up.com>
Date: Wed, 17 Jan 2018 12:39:28 -0500
Subject: [PATCH 21/56] document -> global.document

---
 3p/mathml.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/3p/mathml.js b/3p/mathml.js
index 75920394fd26..15b56026be9e 100644
--- a/3p/mathml.js
+++ b/3p/mathml.js
@@ -52,7 +52,7 @@ export function mathml(global, data) {
       const div = document.createElement('div');
       div.setAttribute('id','mathmlformula');
       div.textContent = data.formula;
-      document.body.appendChild(div);
+      global.document.body.appendChild(div);
       mathjax.Hub.Queue( function () {
         const rendered = document.getElementById('MathJax-Element-1-Frame');
         context.requestResize(

From 41057a82ee93d2e171fd1f06e0163a4a2437b88e Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adam@10up.com>
Date: Wed, 17 Jan 2018 12:41:39 -0500
Subject: [PATCH 22/56] =?UTF-8?q?add=20=E2=80=98mathml=E2=80=99=20to=20the?=
 =?UTF-8?q?=20embed=20types=20allowd=20in=20updateDimensionsEnabled=5F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 3p/ampcontext-integration.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/3p/ampcontext-integration.js b/3p/ampcontext-integration.js
index fd4385e97140..f07dcc3004d8 100644
--- a/3p/ampcontext-integration.js
+++ b/3p/ampcontext-integration.js
@@ -69,7 +69,8 @@ export class IntegrationAmpContext extends AbstractAmpContext {
     // available.
     return (this.embedType_ === 'facebook'
         || this.embedType_ === 'twitter'
-        || this.embedType_ == 'github');
+        || this.embedType_ == 'github'
+        || this.embedType_ === 'mathml');
   }
 
   /** @return {!Window} */

From 70e7b22601609c53227c095d2b159c81d56f16d5 Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adam@10up.com>
Date: Wed, 17 Jan 2018 13:05:29 -0500
Subject: [PATCH 23/56] Remove built in mathjax margins, remove extra padding

---
 3p/mathml.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/3p/mathml.js b/3p/mathml.js
index 15b56026be9e..7e1995b6ed1f 100644
--- a/3p/mathml.js
+++ b/3p/mathml.js
@@ -55,9 +55,12 @@ export function mathml(global, data) {
       global.document.body.appendChild(div);
       mathjax.Hub.Queue( function () {
         const rendered = document.getElementById('MathJax-Element-1-Frame');
+        // Remove built in mathjax margins.
+        const display = document.getElementsByClassName('MJXc-display');
+        display[0].setAttribute('style','margin-top:0;margin-bottom:0');
         context.requestResize(
-                rendered./*OK*/offsetWidth + 20,
-                rendered./*OK*/offsetHeight + 20
+                rendered./*OK*/offsetWidth,
+                rendered./*OK*/offsetHeight
             );
       } );
 

From ded09a7d44669f00d90a3b44f847e0b667c78788 Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adam@10up.com>
Date: Wed, 17 Jan 2018 13:08:44 -0500
Subject: [PATCH 24/56] remove unused container

---
 extensions/amp-mathml/0.1/amp-mathml.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/extensions/amp-mathml/0.1/amp-mathml.js b/extensions/amp-mathml/0.1/amp-mathml.js
index 821ed722529e..1d449f90ddc2 100644
--- a/extensions/amp-mathml/0.1/amp-mathml.js
+++ b/extensions/amp-mathml/0.1/amp-mathml.js
@@ -27,9 +27,6 @@ export class AmpMathml extends AMP.BaseElement {
   constructor(element) {
     super(element);
 
-    /** @private {!Element} */
-    this.container_ = this.win.document.createElement('div');
-
     /** @private {?HTMLIFrameElement} */
     this.iframe_ = null;
   }

From 60aea545d1041fb8b025abb63bc4fa4f46eb1b4a Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adam@10up.com>
Date: Wed, 17 Jan 2018 13:19:24 -0500
Subject: [PATCH 25/56] remove buildCallback

---
 extensions/amp-mathml/0.1/amp-mathml.js | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/extensions/amp-mathml/0.1/amp-mathml.js b/extensions/amp-mathml/0.1/amp-mathml.js
index 1d449f90ddc2..6e1866ccfdfc 100644
--- a/extensions/amp-mathml/0.1/amp-mathml.js
+++ b/extensions/amp-mathml/0.1/amp-mathml.js
@@ -38,14 +38,7 @@ export class AmpMathml extends AMP.BaseElement {
   preconnectCallback () {
     this.preconnect.url('https://cdnjs.cloudflare.com');
   }
-  /** @override */
-  buildCallback() {
-    const formula = this.element.getAttribute('formula');
-    if (!formula || '' === formula) {
-      return;
-    }
-    this._formula = formula;
-  }
+
   layoutCallback () {
     const iframe = getIframe(this.win, this.element, 'mathml');
     this.applyFillContent(iframe);

From 767313637f2680939f72c2a289969000f6d6c61e Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adam@10up.com>
Date: Wed, 17 Jan 2018 13:21:03 -0500
Subject: [PATCH 26/56] Add amp-mathml.out

---
 validator/testdata/feature_tests/amp-mathml.out | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 validator/testdata/feature_tests/amp-mathml.out

diff --git a/validator/testdata/feature_tests/amp-mathml.out b/validator/testdata/feature_tests/amp-mathml.out
new file mode 100644
index 000000000000..465701e3460a
--- /dev/null
+++ b/validator/testdata/feature_tests/amp-mathml.out
@@ -0,0 +1 @@
+PASS
\ No newline at end of file

From a8c7474a41e450d22a5482f2bff1d2aecfff297c Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adam@10up.com>
Date: Wed, 17 Jan 2018 13:25:08 -0500
Subject: [PATCH 27/56] revert yarn.lock

---
 yarn.lock | 73 +++++--------------------------------------------------
 1 file changed, 6 insertions(+), 67 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 14ed2e58d8d5..0f0086ab45b6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -178,12 +178,6 @@ acorn-globals@4.1.0, acorn-globals@^4.0.0:
   dependencies:
     acorn "^5.0.0"
 
-acorn-globals@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-3.1.0.tgz#fd8270f71fbb4996b004fa880ee5d46573a731bf"
-  dependencies:
-    acorn "^4.0.4"
-
 acorn-jsx@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-3.0.1.tgz#afdf9488fb1ecefc8348f6fb22f464e32a58b36b"
@@ -198,7 +192,7 @@ acorn@^3.0.4:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
 
-acorn@^4.0.3, acorn@^4.0.4:
+acorn@^4.0.3:
   version "4.0.13"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787"
 
@@ -3401,7 +3395,7 @@ escodegen@1.8.x:
   optionalDependencies:
     source-map "~0.2.0"
 
-escodegen@1.9.0, escodegen@1.x.x, escodegen@^1.6.1, escodegen@^1.9.0:
+escodegen@1.9.0, escodegen@1.x.x, escodegen@^1.9.0:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.9.0.tgz#9811a2f265dc1cd3894420ee3717064b632b8852"
   dependencies:
@@ -5809,30 +5803,6 @@ jsdom@11.5.1:
     whatwg-url "^6.3.0"
     xml-name-validator "^2.0.1"
 
-"jsdom@7.0 - 9.12":
-  version "9.12.0"
-  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-9.12.0.tgz#e8c546fffcb06c00d4833ca84410fed7f8a097d4"
-  dependencies:
-    abab "^1.0.3"
-    acorn "^4.0.4"
-    acorn-globals "^3.1.0"
-    array-equal "^1.0.0"
-    content-type-parser "^1.0.1"
-    cssom ">= 0.3.2 < 0.4.0"
-    cssstyle ">= 0.2.37 < 0.3.0"
-    escodegen "^1.6.1"
-    html-encoding-sniffer "^1.0.1"
-    nwmatcher ">= 1.3.9 < 2.0.0"
-    parse5 "^1.5.1"
-    request "^2.79.0"
-    sax "^1.2.1"
-    symbol-tree "^3.2.1"
-    tough-cookie "^2.3.2"
-    webidl-conversions "^4.0.0"
-    whatwg-encoding "^1.0.1"
-    whatwg-url "^4.3.0"
-    xml-name-validator "^2.0.1"
-
 jsesc@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"
@@ -6713,18 +6683,6 @@ matcher@^1.0.0:
   dependencies:
     escape-string-regexp "^1.0.4"
 
-mathjax-node@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/mathjax-node/-/mathjax-node-1.3.0.tgz#a58c90a185d909b6323b19c0db1501d14ac0070c"
-  dependencies:
-    is-fullwidth-code-point "^2.0.0"
-    jsdom "7.0 - 9.12"
-    mathjax "^2.7.2"
-
-mathjax@^2.7.2:
-  version "2.7.2"
-  resolved "https://registry.yarnpkg.com/mathjax/-/mathjax-2.7.2.tgz#97d78bbebfb65a8621ce33fb7c1f10917355a878"
-
 md5-hex@^1.2.0, md5-hex@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/md5-hex/-/md5-hex-1.3.0.tgz#d2c4afe983c4370662179b8cad145219135046c4"
@@ -7312,7 +7270,7 @@ number-is-nan@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
 
-"nwmatcher@>= 1.3.9 < 2.0.0", nwmatcher@^1.4.3:
+nwmatcher@^1.4.3:
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.4.3.tgz#64348e3b3d80f035b40ac11563d278f8b72db89c"
 
@@ -7654,10 +7612,6 @@ parse-passwd@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
 
-parse5@^1.5.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/parse5/-/parse5-1.5.1.tgz#9b7f3b0de32be78dc2401b17573ccaf0f6f59d94"
-
 parse5@^3.0.2:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-3.0.3.tgz#042f792ffdd36851551cf4e9e066b3874ab45b5c"
@@ -8865,7 +8819,7 @@ request@2.81.0:
     tunnel-agent "^0.6.0"
     uuid "^3.0.0"
 
-request@2.83.0, request@^2.0.0, request@^2.74.0, request@^2.79.0, request@^2.83.0:
+request@2.83.0, request@^2.0.0, request@^2.74.0, request@^2.83.0:
   version "2.83.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.83.0.tgz#ca0b65da02ed62935887808e6f510381034e3356"
   dependencies:
@@ -10108,7 +10062,7 @@ touch@3.1.0, touch@^3.1.0:
   dependencies:
     nopt "~1.0.10"
 
-tough-cookie@>=2.3.3, tough-cookie@^2.3.2, tough-cookie@^2.3.3, tough-cookie@~2.3.0, tough-cookie@~2.3.3:
+tough-cookie@>=2.3.3, tough-cookie@^2.3.3, tough-cookie@~2.3.0, tough-cookie@~2.3.3:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.3.tgz#0b618a5565b6dea90bf3425d04d55edc475a7561"
   dependencies:
@@ -10120,10 +10074,6 @@ tr46@^1.0.0:
   dependencies:
     punycode "^2.1.0"
 
-tr46@~0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
-
 trim-newlines@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
@@ -10617,11 +10567,7 @@ web-animations-js@2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/web-animations-js/-/web-animations-js-2.3.1.tgz#3a6d9bc15196377a90f8e2803fa5262165b04510"
 
-webidl-conversions@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
-
-webidl-conversions@^4.0.0, webidl-conversions@^4.0.1, webidl-conversions@^4.0.2:
+webidl-conversions@^4.0.1, webidl-conversions@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
 
@@ -10650,13 +10596,6 @@ whatwg-fetch@>=0.10.0:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz#9c84ec2dcf68187ff00bc64e1274b442176e1c84"
 
-whatwg-url@^4.3.0:
-  version "4.8.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-4.8.0.tgz#d2981aa9148c1e00a41c5a6131166ab4683bbcc0"
-  dependencies:
-    tr46 "~0.0.3"
-    webidl-conversions "^3.0.0"
-
 whatwg-url@^6.3.0:
   version "6.4.0"
   resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-6.4.0.tgz#08fdf2b9e872783a7a1f6216260a1d66cc722e08"

From 9dae400b7e43b3d71597700a55507d6932db7dbf Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adam@10up.com>
Date: Thu, 18 Jan 2018 09:40:03 -0500
Subject: [PATCH 28/56] clean up validator-amp-mathml file

---
 .../validator-amp-mathml.protoascii           | 60 +++++++------------
 1 file changed, 20 insertions(+), 40 deletions(-)

diff --git a/extensions/amp-mathml/validator-amp-mathml.protoascii b/extensions/amp-mathml/validator-amp-mathml.protoascii
index 3fc6ca052e72..4c7c32915cf2 100644
--- a/extensions/amp-mathml/validator-amp-mathml.protoascii
+++ b/extensions/amp-mathml/validator-amp-mathml.protoascii
@@ -17,53 +17,33 @@
 tags: {  # amp-mathml
   html_format: AMP
   tag_name: "SCRIPT"
-  spec_name: "amp-mathml extension .js script"
-  satisfies: "amp-mathml extension .js script"
-  requires: "amp-mathml"
-  mandatory_parent: "HEAD"
-  unique: true
-  extension_unused_unless_tag_present: "amp-mathml"
-  attrs: {
-    name: "async"
-    mandatory: true
-    value: ""
+  extension_spec: {
+    name: "amp-html"
+    allowed_versions: "0.1"
+    allowed_versions: "latest"
   }
+  attr_lists: "common-extension-attrs"
+}
+
+tags: {  # <amp-mathml>
+  html_format: AMP
+  tag_name: "AMP-mathml"
+  requires_extension: "amp-mathml"
   attrs: {
-    name: "formula"
-    mandatory: true
+    name: "data-selected-cat"
+    value_regex_casei: "(oscar|chloe|bella)"
   }
   attrs: {
-    name: "custom-element"
-    mandatory: true
-    value: "amp-mathml"
-    dispatch_key: true
-  }
-  attrs: { name: "nonce" }
-  attrs: {
-    name: "src"
+    name: "formula"
     mandatory: true
-    value_regex: "https://cdn\.ampproject\.org/v0/amp-mathml-(latest|0\.1).js"
-  }
-  attrs: {
-    name: "type"
-    value: "text/javascript"
-  }
-  cdata: {
-    blacklisted_cdata_regex: {
-      regex: "."
-      error_message: "contents"
-    }
   }
-  spec_url: "https://www.ampproject.org/docs/reference/components/amp-mathml"
-}
-tags: {  # <amp-mathml>
-  html_format: AMP
-  tag_name: "AMP-MATHML"
-  satisfies: "amp-mathml"
-  requires: "amp-mathml extension .js script"
   attr_lists: "extended-amp-global"
-  spec_url: "https://www.ampproject.org/docs/reference/components/amp-hello-world"
   amp_layout: {
+    supported_layouts: FILL
+    supported_layouts: FIXED
+    supported_layouts: FIXED_HEIGHT
+    supported_layouts: FLEX_ITEM
+    supported_layouts: NODISPLAY
     supported_layouts: RESPONSIVE
   }
-}
+}
\ No newline at end of file

From 82344f0e72c66e33b8daaa72bc32fd8248aeee60 Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adam@10up.com>
Date: Thu, 18 Jan 2018 09:40:29 -0500
Subject: [PATCH 29/56] use full equality check for github string

---
 3p/ampcontext-integration.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/3p/ampcontext-integration.js b/3p/ampcontext-integration.js
index f07dcc3004d8..5a517fd29b26 100644
--- a/3p/ampcontext-integration.js
+++ b/3p/ampcontext-integration.js
@@ -69,7 +69,7 @@ export class IntegrationAmpContext extends AbstractAmpContext {
     // available.
     return (this.embedType_ === 'facebook'
         || this.embedType_ === 'twitter'
-        || this.embedType_ == 'github'
+        || this.embedType_ === 'github'
         || this.embedType_ === 'mathml');
   }
 

From cabddc8c7815048c2448305b350364a55b061684 Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adam@10up.com>
Date: Thu, 18 Jan 2018 09:55:59 -0500
Subject: [PATCH 30/56] Add an inline example, switch to container layout

---
 examples/amp-mathml.amp.html | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/examples/amp-mathml.amp.html b/examples/amp-mathml.amp.html
index b24293f59bf6..983d31f5c4af 100644
--- a/examples/amp-mathml.amp.html
+++ b/examples/amp-mathml.amp.html
@@ -12,18 +12,21 @@
 <body>
   <h2>The Quadratic Formula</h2>
   <amp-mathml
-    layout="responsive"
+    layout="container"
     width="100" height="100" data-formula="\[x = {-b \pm \sqrt{b^2-4ac} \over 2a}.\]">
   </amp-mathml>
   <h2>Cauchy's Integral Formula</h2>
   <amp-mathml
-    layout="responsive"
+    layout="container"
     width="100" height="100" data-formula="\[f(a) = \frac{1}{2\pi i} \oint\frac{f(z)}{z-a}dz\]">
   </amp-mathml>
   <h2>Double angle formula for Cosines</h2>
   <amp-mathml
-    layout="responsive"
+    layout="container"
     width="100" height="100" data-formula="\[ \cos(θ+φ)=\cos(θ)\cos(φ)−\sin(θ)\sin(φ) \]">
   </amp-mathml>
+  <h2>Inline formula.</h2>
+  This is an example of a formula placed <amp-mathml layout="container" width="100" height="100" data-formula="\left(\frac{\sqrt x}{y^3}\right)">
+  </amp-mathml> inline in the middle of a block of text. This shows how the formula will fit inside a block of text.
 </body>
 </html>

From a3a9d94a4b18c957b9d40869944777bcda96be8c Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adam@10up.com>
Date: Thu, 18 Jan 2018 09:56:13 -0500
Subject: [PATCH 31/56] enable container layout

---
 extensions/amp-mathml/0.1/amp-mathml.js               | 2 +-
 extensions/amp-mathml/validator-amp-mathml.protoascii | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/extensions/amp-mathml/0.1/amp-mathml.js b/extensions/amp-mathml/0.1/amp-mathml.js
index 6e1866ccfdfc..dfd35c509176 100644
--- a/extensions/amp-mathml/0.1/amp-mathml.js
+++ b/extensions/amp-mathml/0.1/amp-mathml.js
@@ -61,7 +61,7 @@ export class AmpMathml extends AMP.BaseElement {
 
   /** @override */
   isLayoutSupported (layout) {
-    return isLayoutSizeDefined(layout);
+    return layout == Layout.CONTAINER;
   }
 
 }
diff --git a/extensions/amp-mathml/validator-amp-mathml.protoascii b/extensions/amp-mathml/validator-amp-mathml.protoascii
index 4c7c32915cf2..227daedb3810 100644
--- a/extensions/amp-mathml/validator-amp-mathml.protoascii
+++ b/extensions/amp-mathml/validator-amp-mathml.protoascii
@@ -39,11 +39,6 @@ tags: {  # <amp-mathml>
   }
   attr_lists: "extended-amp-global"
   amp_layout: {
-    supported_layouts: FILL
-    supported_layouts: FIXED
-    supported_layouts: FIXED_HEIGHT
-    supported_layouts: FLEX_ITEM
-    supported_layouts: NODISPLAY
-    supported_layouts: RESPONSIVE
+    supported_layouts: CONTAINER
   }
 }
\ No newline at end of file

From d3bc0977b55de7c733106f1799d702160098b43b Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adam@10up.com>
Date: Thu, 18 Jan 2018 09:56:46 -0500
Subject: [PATCH 32/56] remove example width/height

---
 examples/amp-mathml.amp.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/amp-mathml.amp.html b/examples/amp-mathml.amp.html
index 983d31f5c4af..90e8519573b7 100644
--- a/examples/amp-mathml.amp.html
+++ b/examples/amp-mathml.amp.html
@@ -13,20 +13,20 @@
   <h2>The Quadratic Formula</h2>
   <amp-mathml
     layout="container"
-    width="100" height="100" data-formula="\[x = {-b \pm \sqrt{b^2-4ac} \over 2a}.\]">
+    data-formula="\[x = {-b \pm \sqrt{b^2-4ac} \over 2a}.\]">
   </amp-mathml>
   <h2>Cauchy's Integral Formula</h2>
   <amp-mathml
     layout="container"
-    width="100" height="100" data-formula="\[f(a) = \frac{1}{2\pi i} \oint\frac{f(z)}{z-a}dz\]">
+    data-formula="\[f(a) = \frac{1}{2\pi i} \oint\frac{f(z)}{z-a}dz\]">
   </amp-mathml>
   <h2>Double angle formula for Cosines</h2>
   <amp-mathml
     layout="container"
-    width="100" height="100" data-formula="\[ \cos(θ+φ)=\cos(θ)\cos(φ)−\sin(θ)\sin(φ) \]">
+    data-formula="\[ \cos(θ+φ)=\cos(θ)\cos(φ)−\sin(θ)\sin(φ) \]">
   </amp-mathml>
   <h2>Inline formula.</h2>
-  This is an example of a formula placed <amp-mathml layout="container" width="100" height="100" data-formula="\left(\frac{\sqrt x}{y^3}\right)">
+  This is an example of a formula placed <amp-mathml layout="container" data-formula="\left(\frac{\sqrt x}{y^3}\right)">
   </amp-mathml> inline in the middle of a block of text. This shows how the formula will fit inside a block of text.
 </body>
 </html>

From c5189299d76514d379bff9428e0b01eaa39e72d5 Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adam@10up.com>
Date: Thu, 18 Jan 2018 10:00:00 -0500
Subject: [PATCH 33/56] only update width if not inlined

---
 extensions/amp-mathml/0.1/amp-mathml.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/extensions/amp-mathml/0.1/amp-mathml.js b/extensions/amp-mathml/0.1/amp-mathml.js
index dfd35c509176..fde91748574c 100644
--- a/extensions/amp-mathml/0.1/amp-mathml.js
+++ b/extensions/amp-mathml/0.1/amp-mathml.js
@@ -44,7 +44,12 @@ export class AmpMathml extends AMP.BaseElement {
     this.applyFillContent(iframe);
     // Triggered by context.updateDimensions() inside the iframe.
     listenFor(iframe, 'embed-size', data => {
-      this./*OK*/changeHeight(data['height']);
+      if(!this.element.hasAttribute('inline') ) {
+        // Don't change the width if not inlined.
+        newWidth = undefined;
+        }
+      this.element.getResources()./*OK*/changeSize(
+      this.element, newHeight, /* newWidth */ newWidth);
     }, /* opt_is3P */true );
     this.element.appendChild(iframe);
     this.iframe_ = iframe;

From 873bb8f88af4e73b17555944c61e83c32e3a43c3 Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adam@10up.com>
Date: Thu, 18 Jan 2018 10:34:31 -0500
Subject: [PATCH 34/56] fix up variable names used for resizing

---
 3p/mathml.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/3p/mathml.js b/3p/mathml.js
index 7e1995b6ed1f..b57081fe45b2 100644
--- a/3p/mathml.js
+++ b/3p/mathml.js
@@ -57,13 +57,14 @@ export function mathml(global, data) {
         const rendered = document.getElementById('MathJax-Element-1-Frame');
         // Remove built in mathjax margins.
         const display = document.getElementsByClassName('MJXc-display');
-        display[0].setAttribute('style','margin-top:0;margin-bottom:0');
-        context.requestResize(
-                rendered./*OK*/offsetWidth,
-                rendered./*OK*/offsetHeight
-            );
+        if (display[0]) {
+          display[0].setAttribute('style','margin-top:0;margin-bottom:0');
+          context.requestResize(
+              rendered./*OK*/offsetWidth,
+              rendered./*OK*/offsetHeight
+          );
+        }
       } );
-
     }
   );
 }

From d9bd1f9faa9a181b5df35b0a10cc8883f4ff6940 Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adam@10up.com>
Date: Thu, 18 Jan 2018 10:34:43 -0500
Subject: [PATCH 35/56] smaller inline example that actually fits inline

---
 examples/amp-mathml.amp.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/examples/amp-mathml.amp.html b/examples/amp-mathml.amp.html
index 90e8519573b7..26a0b6e9787a 100644
--- a/examples/amp-mathml.amp.html
+++ b/examples/amp-mathml.amp.html
@@ -26,7 +26,6 @@ <h2>Double angle formula for Cosines</h2>
     data-formula="\[ \cos(θ+φ)=\cos(θ)\cos(φ)−\sin(θ)\sin(φ) \]">
   </amp-mathml>
   <h2>Inline formula.</h2>
-  This is an example of a formula placed <amp-mathml layout="container" data-formula="\left(\frac{\sqrt x}{y^3}\right)">
-  </amp-mathml> inline in the middle of a block of text. This shows how the formula will fit inside a block of text.
+  This is an example of a formula placed  inline in the middle of a block of text. <amp-mathml layout="container" inline data-formula="\[ \cos(θ+φ) \]"></amp-mathml> This shows how the formula will fit inside a block of text and can be styled with CSS.
 </body>
 </html>

From 0cd73f6a34e53f61819d0e456b125d5f80720740 Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adam@10up.com>
Date: Thu, 18 Jan 2018 10:35:18 -0500
Subject: [PATCH 36/56] add amp-mathml.css

---
 extensions/amp-mathml/0.1/amp-mathml.css | 27 ++++++++++++++++++++++++
 extensions/amp-mathml/0.1/amp-mathml.js  |  3 ++-
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 extensions/amp-mathml/0.1/amp-mathml.css

diff --git a/extensions/amp-mathml/0.1/amp-mathml.css b/extensions/amp-mathml/0.1/amp-mathml.css
new file mode 100644
index 000000000000..d921456cb690
--- /dev/null
+++ b/extensions/amp-mathml/0.1/amp-mathml.css
@@ -0,0 +1,27 @@
+/**
+ * Copyright 2018 The AMP HTML Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software'
+ * distributed under the License is distributed on an "AS-IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+amp-mathml[inline] {
+  display: inline-block;
+}
+
+amp-mathml {
+  height: 1px;
+}
+
+amp-mathml[inline] {
+  width: 1px;
+}
\ No newline at end of file
diff --git a/extensions/amp-mathml/0.1/amp-mathml.js b/extensions/amp-mathml/0.1/amp-mathml.js
index fde91748574c..cd605780cee0 100644
--- a/extensions/amp-mathml/0.1/amp-mathml.js
+++ b/extensions/amp-mathml/0.1/amp-mathml.js
@@ -20,6 +20,7 @@ import {getIframe} from '../../../src/3p-frame';
 import { addParamsToUrl } from '../../../src/url';
 import { getDataParamsFromAttributes, removeElement } from '../../../src/dom';
 import { listenFor } from '../../../src/iframe-helper';
+import {CSS} from '../../../build/amp-mathml-0.1.css';
 
 export class AmpMathml extends AMP.BaseElement {
 
@@ -73,5 +74,5 @@ export class AmpMathml extends AMP.BaseElement {
 
 
 AMP.extension('amp-mathml', '0.1', AMP => {
-  AMP.registerElement('amp-mathml', AmpMathml);
+  AMP.registerElement('amp-mathml', AmpMathml, CSS);
 } );

From 17ae03a7695d499a4e5a949e53a5a03ae55b3a03 Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adam@10up.com>
Date: Thu, 18 Jan 2018 10:35:56 -0500
Subject: [PATCH 37/56] cleanup; proper naming for data width/height

---
 extensions/amp-mathml/0.1/amp-mathml.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/extensions/amp-mathml/0.1/amp-mathml.js b/extensions/amp-mathml/0.1/amp-mathml.js
index cd605780cee0..c6658e52c031 100644
--- a/extensions/amp-mathml/0.1/amp-mathml.js
+++ b/extensions/amp-mathml/0.1/amp-mathml.js
@@ -17,9 +17,9 @@ import {isLayoutSizeDefined} from '../../../src/layout';
 import {Layout} from '../../../src/layout';
 import {cssstyle} from 'cssstyle';
 import {getIframe} from '../../../src/3p-frame';
-import { addParamsToUrl } from '../../../src/url';
-import { getDataParamsFromAttributes, removeElement } from '../../../src/dom';
-import { listenFor } from '../../../src/iframe-helper';
+import {addParamsToUrl} from '../../../src/url';
+import {getDataParamsFromAttributes, removeElement} from '../../../src/dom';
+import {listenFor} from '../../../src/iframe-helper';
 import {CSS} from '../../../build/amp-mathml-0.1.css';
 
 export class AmpMathml extends AMP.BaseElement {
@@ -47,10 +47,10 @@ export class AmpMathml extends AMP.BaseElement {
     listenFor(iframe, 'embed-size', data => {
       if(!this.element.hasAttribute('inline') ) {
         // Don't change the width if not inlined.
-        newWidth = undefined;
+        data['width'] = undefined;
         }
       this.element.getResources()./*OK*/changeSize(
-      this.element, newHeight, /* newWidth */ newWidth);
+      this.element, data['height'], /* newWidth */ data['width']);
     }, /* opt_is3P */true );
     this.element.appendChild(iframe);
     this.iframe_ = iframe;

From d5a9f3f99f581511ba2c6f34ca9e0c01ad3e57b7 Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adam@10up.com>
Date: Thu, 18 Jan 2018 10:36:07 -0500
Subject: [PATCH 38/56] declare: mathml needs css support

---
 gulpfile.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gulpfile.js b/gulpfile.js
index 8d4d1661b35c..b4f01e7c9d33 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -112,7 +112,7 @@ declareExtension('amp-lightbox', '0.1', true);
 declareExtension('amp-lightbox-viewer', '0.1', true);
 declareExtension('amp-list', '0.1', false);
 declareExtension('amp-live-list', '0.1', true);
-declareExtension('amp-mathml', '0.1', false);
+declareExtension('amp-mathml', '0.1', true);
 declareExtension('amp-mustache', '0.1', false);
 declareExtension('amp-nexxtv-player', '0.1', false);
 declareExtension('amp-o2-player', '0.1', false);

From a1bd16493f0748d31ca622e0769310f93ae4bbe0 Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adam@10up.com>
Date: Thu, 18 Jan 2018 22:12:26 -0500
Subject: [PATCH 39/56] cleanup for linter

---
 3p/mathml.js                                  | 50 +++++++++----------
 extensions/amp-mathml/0.1/amp-mathml.js       | 22 ++++----
 .../amp-mathml/0.1/test/test-amp-mathml.js    |  4 +-
 3 files changed, 36 insertions(+), 40 deletions(-)

diff --git a/3p/mathml.js b/3p/mathml.js
index b57081fe45b2..4b53b7d7abb7 100644
--- a/3p/mathml.js
+++ b/3p/mathml.js
@@ -27,8 +27,8 @@ import {user} from '../src/log';
  * @param {string} scriptSource The source of the script, different for post and comment embeds.
  */
 function getMathmlJs(global, scriptSource, cb) {
- writeScript(global, scriptSource, function() {
-   cb(global.MathJax);
+  writeScript(global, scriptSource, function() {
+    cb(global.MathJax);
   });
 }
 
@@ -43,28 +43,28 @@ export function mathml(global, data) {
       data.element);
 
   getMathmlJs(
-    global,
-    'https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/MathJax.js?config=TeX-MML-AM_CHTML',
-    mathjax => {
-      // Dimensions are given by the parent frame.
-      delete data.width;
-      delete data.height;
-      const div = document.createElement('div');
-      div.setAttribute('id','mathmlformula');
-      div.textContent = data.formula;
-      global.document.body.appendChild(div);
-      mathjax.Hub.Queue( function () {
-        const rendered = document.getElementById('MathJax-Element-1-Frame');
-        // Remove built in mathjax margins.
-        const display = document.getElementsByClassName('MJXc-display');
-        if (display[0]) {
-          display[0].setAttribute('style','margin-top:0;margin-bottom:0');
-          context.requestResize(
-              rendered./*OK*/offsetWidth,
-              rendered./*OK*/offsetHeight
-          );
-        }
-      } );
-    }
+      global,
+      'https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/MathJax.js?config=TeX-MML-AM_CHTML',
+      mathjax => {
+        // Dimensions are given by the parent frame.
+        delete data.width;
+        delete data.height;
+        const div = document.createElement('div');
+        div.setAttribute('id','mathmlformula');
+        div.textContent = data.formula;
+        global.document.body.appendChild(div);
+        mathjax.Hub.Queue(function() {
+          const rendered = document.getElementById('MathJax-Element-1-Frame');
+          // Remove built in mathjax margins.
+          const display = document.getElementsByClassName('MJXc-display');
+          if (display[0]) {
+            display[0].setAttribute('style','margin-top:0;margin-bottom:0');
+            context.requestResize(
+                rendered./*OK*/offsetWidth,
+                rendered./*OK*/offsetHeight
+            );
+          }
+        });
+      }
   );
 }
diff --git a/extensions/amp-mathml/0.1/amp-mathml.js b/extensions/amp-mathml/0.1/amp-mathml.js
index c6658e52c031..aaf55f5c1349 100644
--- a/extensions/amp-mathml/0.1/amp-mathml.js
+++ b/extensions/amp-mathml/0.1/amp-mathml.js
@@ -15,10 +15,8 @@
  */
 import {isLayoutSizeDefined} from '../../../src/layout';
 import {Layout} from '../../../src/layout';
-import {cssstyle} from 'cssstyle';
 import {getIframe} from '../../../src/3p-frame';
-import {addParamsToUrl} from '../../../src/url';
-import {getDataParamsFromAttributes, removeElement} from '../../../src/dom';
+import {removeElement} from '../../../src/dom';
 import {listenFor} from '../../../src/iframe-helper';
 import {CSS} from '../../../build/amp-mathml-0.1.css';
 
@@ -36,28 +34,28 @@ export class AmpMathml extends AMP.BaseElement {
   * @param {boolean=} opt_onLayout
   * @override
   */
-  preconnectCallback () {
+  preconnectCallback() {
     this.preconnect.url('https://cdnjs.cloudflare.com');
   }
 
-  layoutCallback () {
+  layoutCallback() {
     const iframe = getIframe(this.win, this.element, 'mathml');
     this.applyFillContent(iframe);
     // Triggered by context.updateDimensions() inside the iframe.
     listenFor(iframe, 'embed-size', data => {
-      if(!this.element.hasAttribute('inline') ) {
+      if (!this.element.hasAttribute('inline')) {
         // Don't change the width if not inlined.
         data['width'] = undefined;
-        }
+      }
       this.element.getResources()./*OK*/changeSize(
-      this.element, data['height'], /* newWidth */ data['width']);
-    }, /* opt_is3P */true );
+          this.element, data['height'], data['width']);
+    }, /* opt_is3P */true);
     this.element.appendChild(iframe);
     this.iframe_ = iframe;
     return this.loadPromise(iframe);
   }
 
-  unlayoutCallback () {
+  unlayoutCallback() {
     if (this.iframe_) {
       removeElement(this.iframe_);
       this.iframe_ = null;
@@ -66,7 +64,7 @@ export class AmpMathml extends AMP.BaseElement {
   }
 
   /** @override */
-  isLayoutSupported (layout) {
+  isLayoutSupported(layout) {
     return layout == Layout.CONTAINER;
   }
 
@@ -75,4 +73,4 @@ export class AmpMathml extends AMP.BaseElement {
 
 AMP.extension('amp-mathml', '0.1', AMP => {
   AMP.registerElement('amp-mathml', AmpMathml, CSS);
-} );
+});
diff --git a/extensions/amp-mathml/0.1/test/test-amp-mathml.js b/extensions/amp-mathml/0.1/test/test-amp-mathml.js
index fa39b8bf5941..2a77203263d5 100644
--- a/extensions/amp-mathml/0.1/test/test-amp-mathml.js
+++ b/extensions/amp-mathml/0.1/test/test-amp-mathml.js
@@ -14,12 +14,10 @@
  * limitations under the License.
  */
 
-import {AmpMathml} from '../amp-mathml';
-
 describes.realWin('amp-mathml', {
   amp: {
     extensions: ['amp-mathml'],
-  }
+  },
 }, env => {
 
   let win;

From d3adab3a6a35a7c1b54c6286f0f4ca47eced2435 Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adam@10up.com>
Date: Sat, 20 Jan 2018 12:34:33 -0500
Subject: [PATCH 40/56] Define types and remove documentation for missing
 variable to clear gul check-types errors

---
 ads/ads.extern.js                       | 7 +++++++
 extensions/amp-mathml/0.1/amp-mathml.js | 4 ----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ads/ads.extern.js b/ads/ads.extern.js
index df81451be5f8..1092dbbe4a57 100644
--- a/ads/ads.extern.js
+++ b/ads/ads.extern.js
@@ -49,6 +49,13 @@ data.src;
 //twitter.js
 data.tweetid
 
+//mathml.js
+data.formula
+var mathjax
+mathjax.Hub
+mathjax.Hub.Queue
+window.MathJax
+
 // Under ads/google folder
 
 // adsense.js
diff --git a/extensions/amp-mathml/0.1/amp-mathml.js b/extensions/amp-mathml/0.1/amp-mathml.js
index aaf55f5c1349..0a616bde773a 100644
--- a/extensions/amp-mathml/0.1/amp-mathml.js
+++ b/extensions/amp-mathml/0.1/amp-mathml.js
@@ -30,10 +30,6 @@ export class AmpMathml extends AMP.BaseElement {
     this.iframe_ = null;
   }
 
-  /**
-  * @param {boolean=} opt_onLayout
-  * @override
-  */
   preconnectCallback() {
     this.preconnect.url('https://cdnjs.cloudflare.com');
   }

From 73679083c93de557065424770e20d5d954143b36 Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adam@10up.com>
Date: Sat, 20 Jan 2018 12:36:17 -0500
Subject: [PATCH 41/56] add new line at end of file

---
 extensions/amp-mathml/0.1/amp-mathml.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/amp-mathml/0.1/amp-mathml.css b/extensions/amp-mathml/0.1/amp-mathml.css
index d921456cb690..3af74c01e39c 100644
--- a/extensions/amp-mathml/0.1/amp-mathml.css
+++ b/extensions/amp-mathml/0.1/amp-mathml.css
@@ -24,4 +24,4 @@ amp-mathml {
 
 amp-mathml[inline] {
   width: 1px;
-}
\ No newline at end of file
+}

From 6353cfef88e2ba709c506e892d9e0001db5a9630 Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adam@10up.com>
Date: Sat, 20 Jan 2018 12:38:07 -0500
Subject: [PATCH 42/56] removed unused isLayoutSizeDefined import

---
 extensions/amp-mathml/0.1/amp-mathml.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/extensions/amp-mathml/0.1/amp-mathml.js b/extensions/amp-mathml/0.1/amp-mathml.js
index 0a616bde773a..1867e173945c 100644
--- a/extensions/amp-mathml/0.1/amp-mathml.js
+++ b/extensions/amp-mathml/0.1/amp-mathml.js
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {isLayoutSizeDefined} from '../../../src/layout';
 import {Layout} from '../../../src/layout';
 import {getIframe} from '../../../src/3p-frame';
 import {removeElement} from '../../../src/dom';

From 2dbbdeac295b9928a3d34f2d661685af7bea354f Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adam@10up.com>
Date: Sat, 20 Jan 2018 12:39:12 -0500
Subject: [PATCH 43/56] remove unused atts in validator-amp-mathml.protoascii

---
 extensions/amp-mathml/validator-amp-mathml.protoascii | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/extensions/amp-mathml/validator-amp-mathml.protoascii b/extensions/amp-mathml/validator-amp-mathml.protoascii
index 227daedb3810..52e1c06446e7 100644
--- a/extensions/amp-mathml/validator-amp-mathml.protoascii
+++ b/extensions/amp-mathml/validator-amp-mathml.protoascii
@@ -29,10 +29,6 @@ tags: {  # <amp-mathml>
   html_format: AMP
   tag_name: "AMP-mathml"
   requires_extension: "amp-mathml"
-  attrs: {
-    name: "data-selected-cat"
-    value_regex_casei: "(oscar|chloe|bella)"
-  }
   attrs: {
     name: "formula"
     mandatory: true

From 51fe660a44f5eff5fe2192ea72f7938dbdb6c2c4 Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adam@10up.com>
Date: Sat, 20 Jan 2018 12:41:21 -0500
Subject: [PATCH 44/56] Add inline attr in validator-amp-mathml.protoascii

---
 extensions/amp-mathml/validator-amp-mathml.protoascii | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/extensions/amp-mathml/validator-amp-mathml.protoascii b/extensions/amp-mathml/validator-amp-mathml.protoascii
index 52e1c06446e7..441acdfd3a40 100644
--- a/extensions/amp-mathml/validator-amp-mathml.protoascii
+++ b/extensions/amp-mathml/validator-amp-mathml.protoascii
@@ -33,6 +33,9 @@ tags: {  # <amp-mathml>
     name: "formula"
     mandatory: true
   }
+  attrs: {
+    name: "inline"
+  }
   attr_lists: "extended-amp-global"
   amp_layout: {
     supported_layouts: CONTAINER

From 6f0728abcff9743783448350888bcdd5ce9a67d6 Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adam@10up.com>
Date: Sat, 20 Jan 2018 12:41:54 -0500
Subject: [PATCH 45/56] new line at end of validator-amp-mathml.protoascii

---
 extensions/amp-mathml/validator-amp-mathml.protoascii | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/amp-mathml/validator-amp-mathml.protoascii b/extensions/amp-mathml/validator-amp-mathml.protoascii
index 441acdfd3a40..60f2a68f8cbf 100644
--- a/extensions/amp-mathml/validator-amp-mathml.protoascii
+++ b/extensions/amp-mathml/validator-amp-mathml.protoascii
@@ -40,4 +40,4 @@ tags: {  # <amp-mathml>
   amp_layout: {
     supported_layouts: CONTAINER
   }
-}
\ No newline at end of file
+}

From c9b91319b12b8e1285334c354dde6a5be6005c7b Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adam@10up.com>
Date: Sat, 20 Jan 2018 12:45:04 -0500
Subject: [PATCH 46/56] clean up tests to match examples

---
 .../testdata/feature_tests/amp-mathml.html    | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/validator/testdata/feature_tests/amp-mathml.html b/validator/testdata/feature_tests/amp-mathml.html
index 45da650d0724..5720032ec02d 100644
--- a/validator/testdata/feature_tests/amp-mathml.html
+++ b/validator/testdata/feature_tests/amp-mathml.html
@@ -15,13 +15,16 @@
   <script async src="https://cdn.ampproject.org/v0.js"></script>
 </head>
 <body>
-    <amp-mathml layout="responsive" formula="\[x = {-b \pm \sqrt{b^2-4ac} \over 2a}.\]">
-    </amp-mathml>
-    <h2>Cauchy's Integral Formula</h2>
-    <amp-mathml layout="responsive" formula="\[f(a) = \frac{1}{2\pi i} \oint\frac{f(z)}{z-a}dz\]">
-    </amp-mathml>
-    <h2>Double angle formula for Cosines</h2>
-    <amp-mathml layout="responsive" formula="\[ \cos(θ+φ)=\cos(θ)\cos(φ)−\sin(θ)\sin(φ) \]">
-    </amp-mathml>
+  <h2>The Quadratic Formula</h2>
+  <amp-mathml layout="container" data-formula="\[x = {-b \pm \sqrt{b^2-4ac} \over 2a}.\]">
+  </amp-mathml>
+  <h2>Cauchy's Integral Formula</h2>
+  <amp-mathml layout="container" data-formula="\[f(a) = \frac{1}{2\pi i} \oint\frac{f(z)}{z-a}dz\]">
+  </amp-mathml>
+  <h2>Double angle formula for Cosines</h2>
+  <amp-mathml layout="container" data-formula="\[ \cos(θ+φ)=\cos(θ)\cos(φ)−\sin(θ)\sin(φ) \]">
+  </amp-mathml>
+  <h2>Inline formula.</h2>
+  This is an example of a formula placed  inline in the middle of a block of text. <amp-mathml layout="container" inline data-formula="\[ \cos(θ+φ) \]"></amp-mathml> This shows how the formula will fit inside a block of text and can be styled with CSS.
 </body>
 </html>

From 6e2afd1362e125a66d21660f1bb95431876e2738 Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adam@10up.com>
Date: Sat, 20 Jan 2018 12:56:27 -0500
Subject: [PATCH 47/56] Readme cleanup

---
 extensions/amp-mathml/amp-mathml.md | 40 ++++++++++++++++++++++-------
 1 file changed, 31 insertions(+), 9 deletions(-)

diff --git a/extensions/amp-mathml/amp-mathml.md b/extensions/amp-mathml/amp-mathml.md
index ccbc5db0e2d1..9e7937331d19 100644
--- a/extensions/amp-mathml/amp-mathml.md
+++ b/extensions/amp-mathml/amp-mathml.md
@@ -19,11 +19,7 @@ limitations under the License.
 <table>
   <tr>
     <td width="40%"><strong>Description</strong></td>
-    <td>FILL THIS IN</td>
-  </tr>
-  <tr>
-    <td width="40%"><strong>Availability</strong></td>
-    <td>FILL THIS IN</td>
+    <td>Displays a <a href="https://www.w3.org/Math/">MathML formula</a>.</td>
   </tr>
   <tr>
     <td width="40%"><strong>Required Script</strong></td>
@@ -31,21 +27,47 @@ limitations under the License.
   </tr>
   <tr>
     <td class="col-fourty"><strong><a href="https://www.ampproject.org/docs/guides/responsive/control_layout.html">Supported Layouts</a></strong></td>
-    <td>FILL THIS IN</td>
+    <td>container</td>
   </tr>
   <tr>
     <td width="40%"><strong>Examples</strong></td>
-    <td>FILL THIS IN</td>
+    <td><a href="https://ampbyexample.com/components/amp-mathml/">Annotated code example for amp-mathml</a></td>
   </tr>
 </table>
 
 ## Behavior
 
-FILL THIS IN. What does this extension do?
+This extension creates an iframe and renders a MathML formula.
+
+#### Example: The Quadratic Formula
+
+```html
+<amp-mathml layout="container" data-formula="\[x = {-b \pm \sqrt{b^2-4ac} \over 2a}.\]">
+</amp-mathml>
+```
+
+#### Example: Cauchy's Integral Formula
 
+```html
+<amp-mathml layout="container" data-formula="\[f(a) = \frac{1}{2\pi i} \oint\frac{f(z)}{z-a}dz\]">
+</amp-mathml>
+```
+#### Example: Double angle formula for Cosines
+
+```html
+<amp-mathml layout="container" data-formula="\[ \cos(θ+φ)=\cos(θ)\cos(φ)−\sin(θ)\sin(φ) \]">
+</amp-mathml>
+```
+#### Example: Inline formula.
+
+This is an example of a formula placed  inline in the middle of a block of text. `<amp-mathml layout="container" inline data-formula="\[ \cos(θ+φ) \]"></amp-mathml>` This shows how the formula will fit inside a block of text and can be styled with CSS.
 ## Attributes
 
-FILL THIS IN. Does this extension allow for properties to configure?
+## Attributes
+
+##### data-formula (required)
+
+The formula to render.
 
 ## Validation
 See [amp-mathml rules](https://github.com/ampproject/amphtml/blob/master/extensions/amp-mathml/validator-amp-mathml.protoascii) in the AMP validator specification.

From 0e3dc5f4d21f5037caea06cdfc8c5e25941c558f Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adam@10up.com>
Date: Sat, 20 Jan 2018 12:57:57 -0500
Subject: [PATCH 48/56] remove duplicate Attributes line in readme

---
 extensions/amp-mathml/amp-mathml.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/extensions/amp-mathml/amp-mathml.md b/extensions/amp-mathml/amp-mathml.md
index 9e7937331d19..0e157dcc18e4 100644
--- a/extensions/amp-mathml/amp-mathml.md
+++ b/extensions/amp-mathml/amp-mathml.md
@@ -61,7 +61,6 @@ This extension creates an iframe and renders a MathML formula.
 #### Example: Inline formula.
 
 This is an example of a formula placed  inline in the middle of a block of text. `<amp-mathml layout="container" inline data-formula="\[ \cos(θ+φ) \]"></amp-mathml>` This shows how the formula will fit inside a block of text and can be styled with CSS.
-## Attributes
 
 ## Attributes
 

From 0286f09ebea179706d234afc03d8fde76aec7ff3 Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adam@10up.com>
Date: Sun, 21 Jan 2018 10:45:34 -0500
Subject: [PATCH 49/56] Add integration test, first pass

---
 .../0.1/test/integration/test-amp-mathml.js   | 65 +++++++++++++++++++
 1 file changed, 65 insertions(+)
 create mode 100644 extensions/amp-mathml/0.1/test/integration/test-amp-mathml.js

diff --git a/extensions/amp-mathml/0.1/test/integration/test-amp-mathml.js b/extensions/amp-mathml/0.1/test/integration/test-amp-mathml.js
new file mode 100644
index 000000000000..013a13c45d7a
--- /dev/null
+++ b/extensions/amp-mathml/0.1/test/integration/test-amp-mathml.js
@@ -0,0 +1,65 @@
+/**
+ * Copyright 2018 The AMP HTML Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS-IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import {poll} from '../../../../../testing/iframe';
+
+describe.configure().skipSafari().skipEdge().run('amp-mathml', function() {
+  this.timeout(5000);
+  const extensions = ['amp-mathml'];
+
+  const mathmlBody = `
+  <h2>The Quadratic Formula</h2>
+  <amp-mathml layout="container" data-formula="\[x = {-b \pm \sqrt{b^2-4ac} \over 2a}.\]">
+  </amp-mathml>
+  <h2>Cauchy's Integral Formula</h2>
+  <amp-mathml layout="container" data-formula="\[f(a) = \frac{1}{2\pi i} \oint\frac{f(z)}{z-a}dz\]">
+  </amp-mathml>
+  <h2>Double angle formula for Cosines</h2>
+  <amp-mathml layout="container" data-formula="\[ \cos(θ+φ)=\cos(θ)\cos(φ)−\sin(θ)\sin(φ) \]">
+  </amp-mathml>
+  <h2>Inline formula.</h2>
+  This is an example of a formula placed  inline in the middle of a block of text. <amp-mathml layout="container" inline data-formula="\[ \cos(θ+φ) \]"></amp-mathml> This shows how the formula will fit inside a block of text and can be styled with CSS.
+
+  `;
+  describes.integration('mathml render', {
+    body: '<amp-mathml layout="container" data-formula="\[x = {-b \pm \sqrt{b^2-4ac} \over 2a}.\]"></amp-mathml>',
+    extensions,
+  }, env => {
+
+    let win;
+    beforeEach(() => {
+      win = env.win;
+    });
+console.log('test';)
+    it('should create iframe that is resized to something bigger than 1px', () => {
+      const mathiframe = win.document.getElementById('sidebarOpener');
+      console.log( 'waitForIframeToLoad' );
+      const openedPromise = waitForIframeToLoad(win.document);
+
+      return openedPromise.then(() => {
+
+        expect(win.document.activeElement).to.equal(openerButton);
+      });
+    });
+  });
+});
+
+function waitForIframeToLoad(document) {
+  return poll('wait for mathml iframe to render', () => {
+    const rendered = document.getElementById('MathJax-Element-1-Frame');
+    return rendered.style.display == '';
+  });
+}

From 0e9bd9ab135350796669a17d33bfea70f86a79b8 Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adam@10up.com>
Date: Mon, 22 Jan 2018 08:48:47 -0500
Subject: [PATCH 50/56] cleanup test-mathml.js

---
 .../0.1/test/integration/test-amp-mathml.js   | 30 +++++--------------
 1 file changed, 7 insertions(+), 23 deletions(-)

diff --git a/extensions/amp-mathml/0.1/test/integration/test-amp-mathml.js b/extensions/amp-mathml/0.1/test/integration/test-amp-mathml.js
index 013a13c45d7a..cf7dd1e57031 100644
--- a/extensions/amp-mathml/0.1/test/integration/test-amp-mathml.js
+++ b/extensions/amp-mathml/0.1/test/integration/test-amp-mathml.js
@@ -17,25 +17,10 @@
 import {poll} from '../../../../../testing/iframe';
 
 describe.configure().skipSafari().skipEdge().run('amp-mathml', function() {
-  this.timeout(5000);
   const extensions = ['amp-mathml'];
 
-  const mathmlBody = `
-  <h2>The Quadratic Formula</h2>
-  <amp-mathml layout="container" data-formula="\[x = {-b \pm \sqrt{b^2-4ac} \over 2a}.\]">
-  </amp-mathml>
-  <h2>Cauchy's Integral Formula</h2>
-  <amp-mathml layout="container" data-formula="\[f(a) = \frac{1}{2\pi i} \oint\frac{f(z)}{z-a}dz\]">
-  </amp-mathml>
-  <h2>Double angle formula for Cosines</h2>
-  <amp-mathml layout="container" data-formula="\[ \cos(θ+φ)=\cos(θ)\cos(φ)−\sin(θ)\sin(φ) \]">
-  </amp-mathml>
-  <h2>Inline formula.</h2>
-  This is an example of a formula placed  inline in the middle of a block of text. <amp-mathml layout="container" inline data-formula="\[ \cos(θ+φ) \]"></amp-mathml> This shows how the formula will fit inside a block of text and can be styled with CSS.
-
-  `;
   describes.integration('mathml render', {
-    body: '<amp-mathml layout="container" data-formula="\[x = {-b \pm \sqrt{b^2-4ac} \over 2a}.\]"></amp-mathml>',
+    body: '<div id="mathml-test"><amp-mathml layout="container" data-formula="\[x = {-b \pm \sqrt{b^2-4ac} \over 2a}.\]"></amp-mathml></div>',
     extensions,
   }, env => {
 
@@ -43,15 +28,14 @@ describe.configure().skipSafari().skipEdge().run('amp-mathml', function() {
     beforeEach(() => {
       win = env.win;
     });
-console.log('test';)
     it('should create iframe that is resized to something bigger than 1px', () => {
-      const mathiframe = win.document.getElementById('sidebarOpener');
-      console.log( 'waitForIframeToLoad' );
+      const mathiframe = win.document.getElementById('mathml-test');
       const openedPromise = waitForIframeToLoad(win.document);
 
       return openedPromise.then(() => {
-
-        expect(win.document.activeElement).to.equal(openerButton);
+        this.timeout(15000);
+        expect(mathiframe.innerHeight>1).to.be(true);
+        expect(mathiframe.innerWidth>1).to.be(true);
       });
     });
   });
@@ -59,7 +43,7 @@ console.log('test';)
 
 function waitForIframeToLoad(document) {
   return poll('wait for mathml iframe to render', () => {
-    const rendered = document.getElementById('MathJax-Element-1-Frame');
-    return rendered.style.display == '';
+    const mathmltest = document.getElementById('mathml-test');
+    return mathmltest.style.display == 'none';
   });
 }

From 6fdb6e4d6fa7697e347954537ff0617f8f469e68 Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adam@10up.com>
Date: Mon, 22 Jan 2018 15:37:49 -0500
Subject: [PATCH 51/56] tag name should be all caps

---
 extensions/amp-mathml/validator-amp-mathml.protoascii | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/amp-mathml/validator-amp-mathml.protoascii b/extensions/amp-mathml/validator-amp-mathml.protoascii
index 60f2a68f8cbf..bc0bd4e68c20 100644
--- a/extensions/amp-mathml/validator-amp-mathml.protoascii
+++ b/extensions/amp-mathml/validator-amp-mathml.protoascii
@@ -27,7 +27,7 @@ tags: {  # amp-mathml
 
 tags: {  # <amp-mathml>
   html_format: AMP
-  tag_name: "AMP-mathml"
+  tag_name: "AMP-MATHML"
   requires_extension: "amp-mathml"
   attrs: {
     name: "formula"

From 0746c112e752f56ac8c4e00916cb2e9b1d0daa9f Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adam@10up.com>
Date: Mon, 22 Jan 2018 15:40:22 -0500
Subject: [PATCH 52/56] Add OWNERS.yaml

---
 extensions/amp-mathml/OWNERS.yaml | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 extensions/amp-mathml/OWNERS.yaml

diff --git a/extensions/amp-mathml/OWNERS.yaml b/extensions/amp-mathml/OWNERS.yaml
new file mode 100644
index 000000000000..c412bf2a6d87
--- /dev/null
+++ b/extensions/amp-mathml/OWNERS.yaml
@@ -0,0 +1 @@
+- adamsilverstein

From 37c39b5ebd6874cf70cc18230fbfb82cb526aadc Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adam@10up.com>
Date: Mon, 22 Jan 2018 15:50:00 -0500
Subject: [PATCH 53/56] Fix some linting issues

---
 .../0.1/test/integration/test-amp-mathml.js      | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/extensions/amp-mathml/0.1/test/integration/test-amp-mathml.js b/extensions/amp-mathml/0.1/test/integration/test-amp-mathml.js
index cf7dd1e57031..0f9cb75b623e 100644
--- a/extensions/amp-mathml/0.1/test/integration/test-amp-mathml.js
+++ b/extensions/amp-mathml/0.1/test/integration/test-amp-mathml.js
@@ -18,9 +18,17 @@ import {poll} from '../../../../../testing/iframe';
 
 describe.configure().skipSafari().skipEdge().run('amp-mathml', function() {
   const extensions = ['amp-mathml'];
+  const mathbody = `
+    <div id="mathml-test">
+      <amp-mathml
+        layout="container"
+        data-formul  a="\[x = {-b \pm \sqrt{b^2-4ac} \over 2a}.\]">
+      </amp-mathml>
+    </div>
+  `;
 
   describes.integration('mathml render', {
-    body: '<div id="mathml-test"><amp-mathml layout="container" data-formula="\[x = {-b \pm \sqrt{b^2-4ac} \over 2a}.\]"></amp-mathml></div>',
+    body: mathbody,
     extensions,
   }, env => {
 
@@ -28,14 +36,14 @@ describe.configure().skipSafari().skipEdge().run('amp-mathml', function() {
     beforeEach(() => {
       win = env.win;
     });
-    it('should create iframe that is resized to something bigger than 1px', () => {
+    it('should create an iframe larger than 1px', () => {
       const mathiframe = win.document.getElementById('mathml-test');
       const openedPromise = waitForIframeToLoad(win.document);
 
       return openedPromise.then(() => {
         this.timeout(15000);
-        expect(mathiframe.innerHeight>1).to.be(true);
-        expect(mathiframe.innerWidth>1).to.be(true);
+        expect(mathiframe.innerHeight > 1).to.be(true);
+        expect(mathiframe.innerWidth > 1).to.be(true);
       });
     });
   });

From 31cad0468fee46ecf58185578fd445a3e7471015 Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adam@10up.com>
Date: Mon, 22 Jan 2018 16:12:20 -0500
Subject: [PATCH 54/56] remove integration tests for now

---
 .../0.1/test/integration/test-amp-mathml.js   | 57 -------------------
 1 file changed, 57 deletions(-)
 delete mode 100644 extensions/amp-mathml/0.1/test/integration/test-amp-mathml.js

diff --git a/extensions/amp-mathml/0.1/test/integration/test-amp-mathml.js b/extensions/amp-mathml/0.1/test/integration/test-amp-mathml.js
deleted file mode 100644
index 0f9cb75b623e..000000000000
--- a/extensions/amp-mathml/0.1/test/integration/test-amp-mathml.js
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- * Copyright 2018 The AMP HTML Authors. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS-IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import {poll} from '../../../../../testing/iframe';
-
-describe.configure().skipSafari().skipEdge().run('amp-mathml', function() {
-  const extensions = ['amp-mathml'];
-  const mathbody = `
-    <div id="mathml-test">
-      <amp-mathml
-        layout="container"
-        data-formul  a="\[x = {-b \pm \sqrt{b^2-4ac} \over 2a}.\]">
-      </amp-mathml>
-    </div>
-  `;
-
-  describes.integration('mathml render', {
-    body: mathbody,
-    extensions,
-  }, env => {
-
-    let win;
-    beforeEach(() => {
-      win = env.win;
-    });
-    it('should create an iframe larger than 1px', () => {
-      const mathiframe = win.document.getElementById('mathml-test');
-      const openedPromise = waitForIframeToLoad(win.document);
-
-      return openedPromise.then(() => {
-        this.timeout(15000);
-        expect(mathiframe.innerHeight > 1).to.be(true);
-        expect(mathiframe.innerWidth > 1).to.be(true);
-      });
-    });
-  });
-});
-
-function waitForIframeToLoad(document) {
-  return poll('wait for mathml iframe to render', () => {
-    const mathmltest = document.getElementById('mathml-test');
-    return mathmltest.style.display == 'none';
-  });
-}

From 98d003979f57758aaca472254544aa52dfa35cf4 Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adam@10up.com>
Date: Mon, 22 Jan 2018 19:45:11 -0500
Subject: [PATCH 55/56] move test and out file to mathml tests folder

---
 .../amp-mathml/0.1/test}/amp-mathml.out                           | 0
 .../amp-mathml/0.1/test/validator-amp-mathml.html                 | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename {validator/testdata/feature_tests => extensions/amp-mathml/0.1/test}/amp-mathml.out (100%)
 rename validator/testdata/feature_tests/amp-mathml.html => extensions/amp-mathml/0.1/test/validator-amp-mathml.html (100%)

diff --git a/validator/testdata/feature_tests/amp-mathml.out b/extensions/amp-mathml/0.1/test/amp-mathml.out
similarity index 100%
rename from validator/testdata/feature_tests/amp-mathml.out
rename to extensions/amp-mathml/0.1/test/amp-mathml.out
diff --git a/validator/testdata/feature_tests/amp-mathml.html b/extensions/amp-mathml/0.1/test/validator-amp-mathml.html
similarity index 100%
rename from validator/testdata/feature_tests/amp-mathml.html
rename to extensions/amp-mathml/0.1/test/validator-amp-mathml.html

From 85bf03906ffe7be6362638824a0f029bd2742e87 Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adam@10up.com>
Date: Tue, 23 Jan 2018 12:28:32 -0500
Subject: [PATCH 56/56] remove incomplete/broken test files from PR for now,
 will add back later

---
 extensions/amp-mathml/0.1/test/amp-mathml.out |  1 -
 .../amp-mathml/0.1/test/test-amp-mathml.js    | 32 -------------------
 .../0.1/test/validator-amp-mathml.html        | 30 -----------------
 3 files changed, 63 deletions(-)
 delete mode 100644 extensions/amp-mathml/0.1/test/amp-mathml.out
 delete mode 100644 extensions/amp-mathml/0.1/test/test-amp-mathml.js
 delete mode 100644 extensions/amp-mathml/0.1/test/validator-amp-mathml.html

diff --git a/extensions/amp-mathml/0.1/test/amp-mathml.out b/extensions/amp-mathml/0.1/test/amp-mathml.out
deleted file mode 100644
index 465701e3460a..000000000000
--- a/extensions/amp-mathml/0.1/test/amp-mathml.out
+++ /dev/null
@@ -1 +0,0 @@
-PASS
\ No newline at end of file
diff --git a/extensions/amp-mathml/0.1/test/test-amp-mathml.js b/extensions/amp-mathml/0.1/test/test-amp-mathml.js
deleted file mode 100644
index 2a77203263d5..000000000000
--- a/extensions/amp-mathml/0.1/test/test-amp-mathml.js
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * Copyright 2018 The AMP HTML Authors. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS-IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-describes.realWin('amp-mathml', {
-  amp: {
-    extensions: ['amp-mathml'],
-  },
-}, env => {
-
-  let win;
-  let element;
-
-  beforeEach(() => {
-    win = env.win;
-    element = win.document.createElement('amp-mathml');
-    win.document.body.appendChild(element);
-  });
-
-});
diff --git a/extensions/amp-mathml/0.1/test/validator-amp-mathml.html b/extensions/amp-mathml/0.1/test/validator-amp-mathml.html
deleted file mode 100644
index 5720032ec02d..000000000000
--- a/extensions/amp-mathml/0.1/test/validator-amp-mathml.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!doctype html>
-<html ⚡>
-<head>
-  <meta charset="utf-8">
-  <title>amp-mathml example</title>
-  <link rel="canonical" href="amps.html">
-  <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
-  <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
-  <style amp-custom>
-    amp-mathml {
-      color: red;
-    }
-  </style>
-  <script async custom-element="amp-mathml" src="https://cdn.ampproject.org/v0/amp-mathml-0.1.js"></script>
-  <script async src="https://cdn.ampproject.org/v0.js"></script>
-</head>
-<body>
-  <h2>The Quadratic Formula</h2>
-  <amp-mathml layout="container" data-formula="\[x = {-b \pm \sqrt{b^2-4ac} \over 2a}.\]">
-  </amp-mathml>
-  <h2>Cauchy's Integral Formula</h2>
-  <amp-mathml layout="container" data-formula="\[f(a) = \frac{1}{2\pi i} \oint\frac{f(z)}{z-a}dz\]">
-  </amp-mathml>
-  <h2>Double angle formula for Cosines</h2>
-  <amp-mathml layout="container" data-formula="\[ \cos(θ+φ)=\cos(θ)\cos(φ)−\sin(θ)\sin(φ) \]">
-  </amp-mathml>
-  <h2>Inline formula.</h2>
-  This is an example of a formula placed  inline in the middle of a block of text. <amp-mathml layout="container" inline data-formula="\[ \cos(θ+φ) \]"></amp-mathml> This shows how the formula will fit inside a block of text and can be styled with CSS.
-</body>
-</html>