From 49b376e9c8bb5295efdd31378aa22192c60fac46 Mon Sep 17 00:00:00 2001
From: FuzzyTree <amirw29@gmail.com>
Date: Thu, 22 Sep 2016 18:10:25 -0700
Subject: [PATCH 01/16] Add fixed layout option by width for images

---
 src/Pass/ImgTagTransformPass.php                  | 15 ++++++++++++++-
 .../fragment-html/img-test-fragment.html          |  2 +-
 .../img-test-fragment.html.options.json           |  3 +++
 .../fragment-html/img-test-fragment.html.out      |  6 +++---
 4 files changed, 21 insertions(+), 5 deletions(-)
 create mode 100644 tests/test-data/fragment-html/img-test-fragment.html.options.json

diff --git a/src/Pass/ImgTagTransformPass.php b/src/Pass/ImgTagTransformPass.php
index 89757773..50b0cfcf 100644
--- a/src/Pass/ImgTagTransformPass.php
+++ b/src/Pass/ImgTagTransformPass.php
@@ -121,11 +121,24 @@ protected function convertAmpImg($el, $lineno, $context_string)
         $dom_el = $el->get(0);
         $new_dom_el = $this->cloneAndRenameDomElement($dom_el, 'amp-img');
         $new_el = $el->prev();
-        $this->setLayoutIfNoLayout($new_el, 'responsive');
+        $this->setLayoutIfNoLayout($new_el, $this->getLayout($el));
         $this->addActionTaken(new ActionTakenLine('img', ActionTakenType::IMG_CONVERTED, $lineno, $context_string));
         return $new_dom_el;
     }
 
+    /**
+     * Given an image DOMQuery
+     * Returns whether the image should have 'fixed' or 'responsive' layout
+     *
+     * @param DOMQuery $el
+     * @return string
+     */
+    protected function getLayout($el) {
+        return (isset($this->options['img_max_fixed_layout_width'])
+            && $this->options['img_max_fixed_layout_width'] >= $el->attr('width'))
+            ? 'fixed' : 'responsive';
+    }
+
     /**
      * Given an image src attribute, try to get its dimensions
      * Returns false on failure
diff --git a/tests/test-data/fragment-html/img-test-fragment.html b/tests/test-data/fragment-html/img-test-fragment.html
index 504490de..348842c8 100644
--- a/tests/test-data/fragment-html/img-test-fragment.html
+++ b/tests/test-data/fragment-html/img-test-fragment.html
@@ -3,7 +3,7 @@
 <!-- should transform to amp-img -->
 <img src="https://upload.wikimedia.org/wikipedia/commons/e/ee/%22Birdcatcher%22_with_jockey_up.jpg">
 
-<!-- should transform to amp-img with responsive layout, preserving the width and height -->
+<!-- should transform to amp-img with fixed layout, preserving the width and height -->
 <img src="https://upload.wikimedia.org/wikipedia/commons/e/ee/%22Birdcatcher%22_with_jockey_up.jpg" width="125" height="96">
 
 <!-- nonexistent image, should refuse to convert to amp-img -->
diff --git a/tests/test-data/fragment-html/img-test-fragment.html.options.json b/tests/test-data/fragment-html/img-test-fragment.html.options.json
new file mode 100644
index 00000000..161df05d
--- /dev/null
+++ b/tests/test-data/fragment-html/img-test-fragment.html.options.json
@@ -0,0 +1,3 @@
+{
+  "img_max_fixed_layout_width" : 200
+}
\ No newline at end of file
diff --git a/tests/test-data/fragment-html/img-test-fragment.html.out b/tests/test-data/fragment-html/img-test-fragment.html.out
index 6309a45c..e52f7f55 100644
--- a/tests/test-data/fragment-html/img-test-fragment.html.out
+++ b/tests/test-data/fragment-html/img-test-fragment.html.out
@@ -3,8 +3,8 @@
 <!-- should transform to amp-img -->
 <amp-img src="https://upload.wikimedia.org/wikipedia/commons/e/ee/%22Birdcatcher%22_with_jockey_up.jpg" width="625" height="480" layout="responsive"></amp-img>
 
-<!-- should transform to amp-img with responsive layout, preserving the width and height -->
-<amp-img src="https://upload.wikimedia.org/wikipedia/commons/e/ee/%22Birdcatcher%22_with_jockey_up.jpg" width="125" height="96" layout="responsive"></amp-img>
+<!-- should transform to amp-img with fixed layout, preserving the width and height -->
+<amp-img src="https://upload.wikimedia.org/wikipedia/commons/e/ee/%22Birdcatcher%22_with_jockey_up.jpg" width="125" height="96" layout="fixed"></amp-img>
 
 <!-- nonexistent image, should refuse to convert to amp-img -->
 <img src="https://upload.wikimedia.org/wikipedia/commons/e/ee/non-existent-image1234.jpg">
@@ -31,7 +31,7 @@ Line  2:
 Line  3: <!-- should transform to amp-img -->
 Line  4: <img src="https://upload.wikimedia.org/wikipedia/commons/e/ee/%22Birdcatcher%22_with_jockey_up.jpg">
 Line  5: 
-Line  6: <!-- should transform to amp-img with responsive layout, preserving the width and height -->
+Line  6: <!-- should transform to amp-img with fixed layout, preserving the width and height -->
 Line  7: <img src="https://upload.wikimedia.org/wikipedia/commons/e/ee/%22Birdcatcher%22_with_jockey_up.jpg" width="125" height="96">
 Line  8: 
 Line  9: <!-- nonexistent image, should refuse to convert to amp-img -->

From 0f71259f4359bd947f9b99a4071409c620d437e6 Mon Sep 17 00:00:00 2001
From: FuzzyTree <amirw29@gmail.com>
Date: Fri, 23 Sep 2016 22:19:35 -0700
Subject: [PATCH 02/16] Add amp-ad support. Regenerated validator-generated.php
 file with custom script tags from:
 https://github.com/ampproject/amphtml/blob/master/extensions/amp-ad/0.1/validator-amp-ad.protoascii

Regenerating the validator was necessary to avoid flagging the script tag for <amp-ad> in <head> as an error
---
 src/Pass/StandardFixPass.php                  |    5 +
 src/Spec/validator-generated.php              | 4344 +++++++++--------
 src/Validate/Context.php                      |    1 +
 .../full-html/mandatory_dimensions.html.out   |    1 +
 .../full-html/several_errors.html.out         |    1 +
 .../test-data/full-html/spec_example.html.out |    3 +-
 tests/test-data/full-html/urls.html.out       |    1 +
 .../full-html/validator-amp-sidebar.html.out  |    1 +
 8 files changed, 2200 insertions(+), 2157 deletions(-)

diff --git a/src/Pass/StandardFixPass.php b/src/Pass/StandardFixPass.php
index c5771d8d..fc52c4a4 100644
--- a/src/Pass/StandardFixPass.php
+++ b/src/Pass/StandardFixPass.php
@@ -58,6 +58,11 @@ class StandardFixPass extends BasePass
 
     public function pass()
     {
+        $all_ampad = $this->q->top()->find('amp-ad');
+        if ($all_ampad->length > 0) {
+            $this->addComponentJsToHead('amp-ad');
+        }
+
         /** @var SValidationError $error */
         foreach ($this->validation_result->errors as $error) {
             // If the error was resolved, continue
diff --git a/src/Spec/validator-generated.php b/src/Spec/validator-generated.php
index 082bb58a..6523ef92 100644
--- a/src/Spec/validator-generated.php
+++ b/src/Spec/validator-generated.php
@@ -2358,33 +2358,39 @@ public static function createValidationRules() {
   $o_564->tag_name = 'o:p';
   $o_0->tags[] = $o_564;
   $o_565 = new TagSpec();
-  $o_565->tag_name = 'amp-ad';
+  $o_565->tag_name = 'script';
+  $o_565->spec_name = 'amp-ad extension .js script';
+  $o_565->mandatory_parent = 'head';
   $o_566 = new AttrSpec();
-  $o_566->name = 'alt';
+  $o_566->name = 'async';
+  $o_566->mandatory = true;
+  $o_566->value = '';
   $o_565->attrs[] = $o_566;
   $o_567 = new AttrSpec();
-  $o_567->name = 'json';
+  $o_567->name = 'custom-element';
+  $o_567->mandatory = true;
+  $o_567->value = 'amp-ad';
+  $o_567->dispatch_key = true;
   $o_565->attrs[] = $o_567;
   $o_568 = new AttrSpec();
   $o_568->name = 'src';
-  $o_569 = new UrlSpec();
-  $o_569->allowed_protocol = ['https'];
-  $o_569->allow_relative = true;
-  $o_568->value_url = $o_569;
+  $o_568->mandatory = true;
+  $o_568->value_regex = 'https://cdn\\.ampproject\\.org/v0/amp-ad-(latest|0\\.1).js';
   $o_565->attrs[] = $o_568;
-  $o_570 = new AttrSpec();
-  $o_570->name = 'type';
-  $o_570->mandatory = true;
-  $o_565->attrs[] = $o_570;
-  $o_565->attr_lists = ['extended-amp-global'];
-  $o_565->spec_url = 'https://www.ampproject.org/docs/reference/amp-ad.html';
-  $o_571 = new AmpLayout();
-  $o_571->supported_layouts = [AmpLayoutLayout::FILL, AmpLayoutLayout::FIXED, AmpLayoutLayout::FIXED_HEIGHT, AmpLayoutLayout::FLEX_ITEM, AmpLayoutLayout::NODISPLAY, AmpLayoutLayout::RESPONSIVE];
-  $o_565->amp_layout = $o_571;
-  $o_565->disallowed_ancestor = ['amp-sidebar'];
+  $o_569 = new AttrSpec();
+  $o_569->name = 'type';
+  $o_569->value = 'text/javascript';
+  $o_565->attrs[] = $o_569;
+  $o_565->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-ad.html';
+  $o_570 = new CdataSpec();
+  $o_571 = new BlackListedCDataRegex();
+  $o_571->regex = '.';
+  $o_571->error_message = 'contents';
+  $o_570->blacklisted_cdata_regex[] = $o_571;
+  $o_565->cdata = $o_570;
   $o_0->tags[] = $o_565;
   $o_572 = new TagSpec();
-  $o_572->tag_name = 'amp-embed';
+  $o_572->tag_name = 'amp-ad';
   $o_573 = new AttrSpec();
   $o_573->name = 'alt';
   $o_572->attrs[] = $o_573;
@@ -2403,723 +2409,717 @@ public static function createValidationRules() {
   $o_577->mandatory = true;
   $o_572->attrs[] = $o_577;
   $o_572->attr_lists = ['extended-amp-global'];
-  $o_572->spec_url = 'https://www.ampproject.org/docs/reference/amp-embed.html';
+  $o_572->spec_url = 'https://www.ampproject.org/docs/reference/amp-ad.html';
   $o_578 = new AmpLayout();
   $o_578->supported_layouts = [AmpLayoutLayout::FILL, AmpLayoutLayout::FIXED, AmpLayoutLayout::FIXED_HEIGHT, AmpLayoutLayout::FLEX_ITEM, AmpLayoutLayout::NODISPLAY, AmpLayoutLayout::RESPONSIVE];
   $o_572->amp_layout = $o_578;
   $o_572->disallowed_ancestor = ['amp-sidebar'];
   $o_0->tags[] = $o_572;
   $o_579 = new TagSpec();
-  $o_579->tag_name = 'amp-img';
+  $o_579->tag_name = 'amp-embed';
   $o_580 = new AttrSpec();
   $o_580->name = 'alt';
   $o_579->attrs[] = $o_580;
   $o_581 = new AttrSpec();
-  $o_581->name = 'attribution';
+  $o_581->name = 'json';
   $o_579->attrs[] = $o_581;
   $o_582 = new AttrSpec();
-  $o_582->name = 'placeholder';
+  $o_582->name = 'src';
+  $o_583 = new UrlSpec();
+  $o_583->allowed_protocol = ['https'];
+  $o_583->allow_relative = true;
+  $o_582->value_url = $o_583;
   $o_579->attrs[] = $o_582;
-  $o_579->attr_lists = ['extended-amp-global', 'mandatory-src-or-srcset'];
-  $o_579->spec_url = 'https://www.ampproject.org/docs/reference/amp-img.html';
-  $o_583 = new AmpLayout();
-  $o_583->supported_layouts = [AmpLayoutLayout::FILL, AmpLayoutLayout::FIXED, AmpLayoutLayout::FIXED_HEIGHT, AmpLayoutLayout::FLEX_ITEM, AmpLayoutLayout::NODISPLAY, AmpLayoutLayout::RESPONSIVE];
-  $o_579->amp_layout = $o_583;
+  $o_584 = new AttrSpec();
+  $o_584->name = 'type';
+  $o_584->mandatory = true;
+  $o_579->attrs[] = $o_584;
+  $o_579->attr_lists = ['extended-amp-global'];
+  $o_579->spec_url = 'https://www.ampproject.org/docs/reference/amp-embed.html';
+  $o_585 = new AmpLayout();
+  $o_585->supported_layouts = [AmpLayoutLayout::FILL, AmpLayoutLayout::FIXED, AmpLayoutLayout::FIXED_HEIGHT, AmpLayoutLayout::FLEX_ITEM, AmpLayoutLayout::NODISPLAY, AmpLayoutLayout::RESPONSIVE];
+  $o_579->amp_layout = $o_585;
+  $o_579->disallowed_ancestor = ['amp-sidebar'];
   $o_0->tags[] = $o_579;
-  $o_584 = new TagSpec();
-  $o_584->tag_name = 'amp-pixel';
-  $o_585 = new AttrSpec();
-  $o_585->name = 'src';
-  $o_585->mandatory = true;
-  $o_586 = new UrlSpec();
-  $o_586->allowed_protocol = ['https'];
-  $o_586->allow_relative = true;
-  $o_585->value_url = $o_586;
-  $o_584->attrs[] = $o_585;
-  $o_584->attr_lists = ['extended-amp-global'];
-  $o_584->spec_url = 'https://www.ampproject.org/docs/reference/amp-pixel.html';
-  $o_587 = new AmpLayout();
-  $o_587->supported_layouts = [AmpLayoutLayout::FIXED, AmpLayoutLayout::NODISPLAY];
-  $o_587->defines_default_width = true;
-  $o_587->defines_default_height = true;
-  $o_584->amp_layout = $o_587;
-  $o_584->disallowed_ancestor = ['amp-sidebar'];
-  $o_0->tags[] = $o_584;
-  $o_588 = new TagSpec();
-  $o_588->tag_name = 'amp-video';
+  $o_586 = new TagSpec();
+  $o_586->tag_name = 'amp-img';
+  $o_587 = new AttrSpec();
+  $o_587->name = 'alt';
+  $o_586->attrs[] = $o_587;
+  $o_588 = new AttrSpec();
+  $o_588->name = 'attribution';
+  $o_586->attrs[] = $o_588;
   $o_589 = new AttrSpec();
-  $o_589->name = 'alt';
-  $o_588->attrs[] = $o_589;
-  $o_590 = new AttrSpec();
-  $o_590->name = 'attribution';
-  $o_588->attrs[] = $o_590;
-  $o_591 = new AttrSpec();
-  $o_591->name = 'autoplay';
-  $o_591->value = '';
-  $o_588->attrs[] = $o_591;
+  $o_589->name = 'placeholder';
+  $o_586->attrs[] = $o_589;
+  $o_586->attr_lists = ['extended-amp-global', 'mandatory-src-or-srcset'];
+  $o_586->spec_url = 'https://www.ampproject.org/docs/reference/amp-img.html';
+  $o_590 = new AmpLayout();
+  $o_590->supported_layouts = [AmpLayoutLayout::FILL, AmpLayoutLayout::FIXED, AmpLayoutLayout::FIXED_HEIGHT, AmpLayoutLayout::FLEX_ITEM, AmpLayoutLayout::NODISPLAY, AmpLayoutLayout::RESPONSIVE];
+  $o_586->amp_layout = $o_590;
+  $o_0->tags[] = $o_586;
+  $o_591 = new TagSpec();
+  $o_591->tag_name = 'amp-pixel';
   $o_592 = new AttrSpec();
-  $o_592->name = 'controls';
-  $o_592->value = '';
-  $o_588->attrs[] = $o_592;
-  $o_593 = new AttrSpec();
-  $o_593->name = 'loop';
-  $o_593->value = '';
-  $o_588->attrs[] = $o_593;
-  $o_594 = new AttrSpec();
-  $o_594->name = 'muted';
-  $o_594->value = '';
-  $o_588->attrs[] = $o_594;
-  $o_595 = new AttrSpec();
-  $o_595->name = 'placeholder';
-  $o_588->attrs[] = $o_595;
+  $o_592->name = 'src';
+  $o_592->mandatory = true;
+  $o_593 = new UrlSpec();
+  $o_593->allowed_protocol = ['https'];
+  $o_593->allow_relative = true;
+  $o_592->value_url = $o_593;
+  $o_591->attrs[] = $o_592;
+  $o_591->attr_lists = ['extended-amp-global'];
+  $o_591->spec_url = 'https://www.ampproject.org/docs/reference/amp-pixel.html';
+  $o_594 = new AmpLayout();
+  $o_594->supported_layouts = [AmpLayoutLayout::FIXED, AmpLayoutLayout::NODISPLAY];
+  $o_594->defines_default_width = true;
+  $o_594->defines_default_height = true;
+  $o_591->amp_layout = $o_594;
+  $o_591->disallowed_ancestor = ['amp-sidebar'];
+  $o_0->tags[] = $o_591;
+  $o_595 = new TagSpec();
+  $o_595->tag_name = 'amp-video';
   $o_596 = new AttrSpec();
-  $o_596->name = 'poster';
-  $o_588->attrs[] = $o_596;
+  $o_596->name = 'alt';
+  $o_595->attrs[] = $o_596;
   $o_597 = new AttrSpec();
-  $o_597->name = 'preload';
-  $o_597->value_regex = '(none|metadata|auto|)';
-  $o_588->attrs[] = $o_597;
+  $o_597->name = 'attribution';
+  $o_595->attrs[] = $o_597;
   $o_598 = new AttrSpec();
-  $o_598->name = 'src';
-  $o_599 = new UrlSpec();
-  $o_599->allowed_protocol = ['https'];
-  $o_599->allow_relative = true;
-  $o_598->value_url = $o_599;
-  $o_588->attrs[] = $o_598;
-  $o_588->attr_lists = ['extended-amp-global'];
-  $o_588->spec_url = 'https://www.ampproject.org/docs/reference/amp-video.html';
-  $o_600 = new AmpLayout();
-  $o_600->supported_layouts = [AmpLayoutLayout::FILL, AmpLayoutLayout::FIXED, AmpLayoutLayout::FIXED_HEIGHT, AmpLayoutLayout::FLEX_ITEM, AmpLayoutLayout::NODISPLAY, AmpLayoutLayout::RESPONSIVE];
-  $o_588->amp_layout = $o_600;
-  $o_588->disallowed_ancestor = ['amp-sidebar'];
-  $o_0->tags[] = $o_588;
-  $o_601 = new TagSpec();
-  $o_601->tag_name = 'script';
-  $o_601->spec_name = 'amp-access extension .js script';
-  $o_601->mandatory_parent = 'head';
+  $o_598->name = 'autoplay';
+  $o_598->value = '';
+  $o_595->attrs[] = $o_598;
+  $o_599 = new AttrSpec();
+  $o_599->name = 'controls';
+  $o_599->value = '';
+  $o_595->attrs[] = $o_599;
+  $o_600 = new AttrSpec();
+  $o_600->name = 'loop';
+  $o_600->value = '';
+  $o_595->attrs[] = $o_600;
+  $o_601 = new AttrSpec();
+  $o_601->name = 'muted';
+  $o_601->value = '';
+  $o_595->attrs[] = $o_601;
   $o_602 = new AttrSpec();
-  $o_602->name = 'async';
-  $o_602->mandatory = true;
-  $o_602->value = '';
-  $o_601->attrs[] = $o_602;
+  $o_602->name = 'placeholder';
+  $o_595->attrs[] = $o_602;
   $o_603 = new AttrSpec();
-  $o_603->name = 'custom-element';
-  $o_603->mandatory = true;
-  $o_603->value = 'amp-access';
-  $o_603->dispatch_key = true;
-  $o_601->attrs[] = $o_603;
+  $o_603->name = 'poster';
+  $o_595->attrs[] = $o_603;
   $o_604 = new AttrSpec();
-  $o_604->name = 'src';
-  $o_604->mandatory = true;
-  $o_604->value_regex = 'https://cdn\\.ampproject\\.org/v0/amp-access-(latest|0\\.1).js';
-  $o_601->attrs[] = $o_604;
+  $o_604->name = 'preload';
+  $o_604->value_regex = '(none|metadata|auto|)';
+  $o_595->attrs[] = $o_604;
   $o_605 = new AttrSpec();
-  $o_605->name = 'type';
-  $o_605->value = 'text/javascript';
-  $o_601->attrs[] = $o_605;
-  $o_601->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-access.html';
-  $o_606 = new CdataSpec();
-  $o_607 = new BlackListedCDataRegex();
-  $o_607->regex = '.';
-  $o_607->error_message = 'contents';
-  $o_606->blacklisted_cdata_regex[] = $o_607;
-  $o_601->cdata = $o_606;
-  $o_0->tags[] = $o_601;
+  $o_605->name = 'src';
+  $o_606 = new UrlSpec();
+  $o_606->allowed_protocol = ['https'];
+  $o_606->allow_relative = true;
+  $o_605->value_url = $o_606;
+  $o_595->attrs[] = $o_605;
+  $o_595->attr_lists = ['extended-amp-global'];
+  $o_595->spec_url = 'https://www.ampproject.org/docs/reference/amp-video.html';
+  $o_607 = new AmpLayout();
+  $o_607->supported_layouts = [AmpLayoutLayout::FILL, AmpLayoutLayout::FIXED, AmpLayoutLayout::FIXED_HEIGHT, AmpLayoutLayout::FLEX_ITEM, AmpLayoutLayout::NODISPLAY, AmpLayoutLayout::RESPONSIVE];
+  $o_595->amp_layout = $o_607;
+  $o_595->disallowed_ancestor = ['amp-sidebar'];
+  $o_0->tags[] = $o_595;
   $o_608 = new TagSpec();
   $o_608->tag_name = 'script';
-  $o_608->spec_name = 'amp-access extension .json script';
+  $o_608->spec_name = 'amp-access extension .js script';
   $o_608->mandatory_parent = 'head';
   $o_609 = new AttrSpec();
-  $o_609->name = 'id';
+  $o_609->name = 'async';
   $o_609->mandatory = true;
-  $o_609->value = 'amp-access';
-  $o_609->dispatch_key = true;
+  $o_609->value = '';
   $o_608->attrs[] = $o_609;
   $o_610 = new AttrSpec();
-  $o_610->name = 'type';
+  $o_610->name = 'custom-element';
   $o_610->mandatory = true;
-  $o_610->value = 'application/json';
+  $o_610->value = 'amp-access';
+  $o_610->dispatch_key = true;
   $o_608->attrs[] = $o_610;
-  $o_608->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-access-spec.html';
-  $o_611 = new CdataSpec();
-  $o_612 = new BlackListedCDataRegex();
-  $o_612->regex = '<!--';
-  $o_612->error_message = 'html comments';
-  $o_611->blacklisted_cdata_regex[] = $o_612;
-  $o_608->cdata = $o_611;
-  $o_608->also_requires_tag = ['amp-access extension .js script', 'amp-analytics extension .js script'];
+  $o_611 = new AttrSpec();
+  $o_611->name = 'src';
+  $o_611->mandatory = true;
+  $o_611->value_regex = 'https://cdn\\.ampproject\\.org/v0/amp-access-(latest|0\\.1).js';
+  $o_608->attrs[] = $o_611;
+  $o_612 = new AttrSpec();
+  $o_612->name = 'type';
+  $o_612->value = 'text/javascript';
+  $o_608->attrs[] = $o_612;
+  $o_608->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-access.html';
+  $o_613 = new CdataSpec();
+  $o_614 = new BlackListedCDataRegex();
+  $o_614->regex = '.';
+  $o_614->error_message = 'contents';
+  $o_613->blacklisted_cdata_regex[] = $o_614;
+  $o_608->cdata = $o_613;
   $o_0->tags[] = $o_608;
-  $o_613 = new TagSpec();
-  $o_613->tag_name = 'script';
-  $o_613->spec_name = 'amp-accordion extension .js script';
-  $o_613->mandatory_parent = 'head';
-  $o_614 = new AttrSpec();
-  $o_614->name = 'async';
-  $o_614->mandatory = true;
-  $o_614->value = '';
-  $o_613->attrs[] = $o_614;
-  $o_615 = new AttrSpec();
-  $o_615->name = 'custom-element';
-  $o_615->mandatory = true;
-  $o_615->value = 'amp-accordion';
-  $o_615->dispatch_key = true;
-  $o_613->attrs[] = $o_615;
+  $o_615 = new TagSpec();
+  $o_615->tag_name = 'script';
+  $o_615->spec_name = 'amp-access extension .json script';
+  $o_615->mandatory_parent = 'head';
   $o_616 = new AttrSpec();
-  $o_616->name = 'src';
+  $o_616->name = 'id';
   $o_616->mandatory = true;
-  $o_616->value_regex = 'https://cdn\\.ampproject\\.org/v0/amp-accordion-(latest|0\\.1).js';
-  $o_613->attrs[] = $o_616;
+  $o_616->value = 'amp-access';
+  $o_616->dispatch_key = true;
+  $o_615->attrs[] = $o_616;
   $o_617 = new AttrSpec();
   $o_617->name = 'type';
-  $o_617->value = 'text/javascript';
-  $o_613->attrs[] = $o_617;
-  $o_613->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-accordion.html';
+  $o_617->mandatory = true;
+  $o_617->value = 'application/json';
+  $o_615->attrs[] = $o_617;
+  $o_615->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-access-spec.html';
   $o_618 = new CdataSpec();
   $o_619 = new BlackListedCDataRegex();
-  $o_619->regex = '.';
-  $o_619->error_message = 'contents';
+  $o_619->regex = '<!--';
+  $o_619->error_message = 'html comments';
   $o_618->blacklisted_cdata_regex[] = $o_619;
-  $o_613->cdata = $o_618;
-  $o_0->tags[] = $o_613;
+  $o_615->cdata = $o_618;
+  $o_615->also_requires_tag = ['amp-access extension .js script', 'amp-analytics extension .js script'];
+  $o_0->tags[] = $o_615;
   $o_620 = new TagSpec();
-  $o_620->tag_name = 'amp-accordion';
+  $o_620->tag_name = 'script';
+  $o_620->spec_name = 'amp-accordion extension .js script';
+  $o_620->mandatory_parent = 'head';
   $o_621 = new AttrSpec();
-  $o_621->name = 'animate';
+  $o_621->name = 'async';
+  $o_621->mandatory = true;
   $o_621->value = '';
   $o_620->attrs[] = $o_621;
+  $o_622 = new AttrSpec();
+  $o_622->name = 'custom-element';
+  $o_622->mandatory = true;
+  $o_622->value = 'amp-accordion';
+  $o_622->dispatch_key = true;
+  $o_620->attrs[] = $o_622;
+  $o_623 = new AttrSpec();
+  $o_623->name = 'src';
+  $o_623->mandatory = true;
+  $o_623->value_regex = 'https://cdn\\.ampproject\\.org/v0/amp-accordion-(latest|0\\.1).js';
+  $o_620->attrs[] = $o_623;
+  $o_624 = new AttrSpec();
+  $o_624->name = 'type';
+  $o_624->value = 'text/javascript';
+  $o_620->attrs[] = $o_624;
   $o_620->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-accordion.html';
-  $o_622 = new AmpLayout();
-  $o_622->supported_layouts = [AmpLayoutLayout::CONTAINER];
-  $o_620->amp_layout = $o_622;
-  $o_620->disallowed_ancestor = ['head'];
-  $o_620->also_requires_tag = ['amp-accordion extension .js script'];
-  $o_623 = new ChildTagSpec();
-  $o_623->child_tag_name_oneof = ['section'];
-  $o_620->child_tags = $o_623;
+  $o_625 = new CdataSpec();
+  $o_626 = new BlackListedCDataRegex();
+  $o_626->regex = '.';
+  $o_626->error_message = 'contents';
+  $o_625->blacklisted_cdata_regex[] = $o_626;
+  $o_620->cdata = $o_625;
   $o_0->tags[] = $o_620;
-  $o_624 = new TagSpec();
-  $o_624->tag_name = 'section';
-  $o_624->spec_name = 'amp-accordion > section';
-  $o_624->mandatory_parent = 'amp-accordion';
-  $o_625 = new AttrSpec();
-  $o_625->name = 'expanded';
-  $o_625->value = '';
-  $o_624->attrs[] = $o_625;
-  $o_624->disallowed_ancestor = ['head'];
-  $o_626 = new ChildTagSpec();
-  $o_626->mandatory_num_child_tags = 2;
-  $o_626->first_child_tag_name_oneof = ['h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'header'];
-  $o_624->child_tags = $o_626;
-  $o_0->tags[] = $o_624;
   $o_627 = new TagSpec();
-  $o_627->tag_name = 'script';
-  $o_627->spec_name = 'amp-analytics extension .js script';
-  $o_627->mandatory_parent = 'head';
+  $o_627->tag_name = 'amp-accordion';
   $o_628 = new AttrSpec();
-  $o_628->name = 'async';
-  $o_628->mandatory = true;
+  $o_628->name = 'animate';
   $o_628->value = '';
   $o_627->attrs[] = $o_628;
-  $o_629 = new AttrSpec();
-  $o_629->name = 'custom-element';
-  $o_629->mandatory = true;
-  $o_629->value = 'amp-analytics';
-  $o_629->dispatch_key = true;
-  $o_627->attrs[] = $o_629;
-  $o_630 = new AttrSpec();
-  $o_630->name = 'src';
-  $o_630->mandatory = true;
-  $o_630->value_regex = 'https://cdn\\.ampproject\\.org/v0/amp-analytics-(latest|0\\.1).js';
-  $o_627->attrs[] = $o_630;
-  $o_631 = new AttrSpec();
-  $o_631->name = 'type';
-  $o_631->value = 'text/javascript';
-  $o_627->attrs[] = $o_631;
-  $o_627->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-analytics.html';
-  $o_632 = new CdataSpec();
-  $o_633 = new BlackListedCDataRegex();
-  $o_633->regex = '.';
-  $o_633->error_message = 'contents';
-  $o_632->blacklisted_cdata_regex[] = $o_633;
-  $o_627->cdata = $o_632;
+  $o_627->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-accordion.html';
+  $o_629 = new AmpLayout();
+  $o_629->supported_layouts = [AmpLayoutLayout::CONTAINER];
+  $o_627->amp_layout = $o_629;
+  $o_627->disallowed_ancestor = ['head'];
+  $o_627->also_requires_tag = ['amp-accordion extension .js script'];
+  $o_630 = new ChildTagSpec();
+  $o_630->child_tag_name_oneof = ['section'];
+  $o_627->child_tags = $o_630;
   $o_0->tags[] = $o_627;
+  $o_631 = new TagSpec();
+  $o_631->tag_name = 'section';
+  $o_631->spec_name = 'amp-accordion > section';
+  $o_631->mandatory_parent = 'amp-accordion';
+  $o_632 = new AttrSpec();
+  $o_632->name = 'expanded';
+  $o_632->value = '';
+  $o_631->attrs[] = $o_632;
+  $o_631->disallowed_ancestor = ['head'];
+  $o_633 = new ChildTagSpec();
+  $o_633->mandatory_num_child_tags = 2;
+  $o_633->first_child_tag_name_oneof = ['h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'header'];
+  $o_631->child_tags = $o_633;
+  $o_0->tags[] = $o_631;
   $o_634 = new TagSpec();
   $o_634->tag_name = 'script';
-  $o_634->spec_name = 'amp-analytics extension .json script';
-  $o_634->mandatory_parent = 'amp-analytics';
+  $o_634->spec_name = 'amp-analytics extension .js script';
+  $o_634->mandatory_parent = 'head';
   $o_635 = new AttrSpec();
-  $o_635->name = 'type';
+  $o_635->name = 'async';
   $o_635->mandatory = true;
-  $o_635->value = 'application/json';
-  $o_635->dispatch_key = true;
+  $o_635->value = '';
   $o_634->attrs[] = $o_635;
+  $o_636 = new AttrSpec();
+  $o_636->name = 'custom-element';
+  $o_636->mandatory = true;
+  $o_636->value = 'amp-analytics';
+  $o_636->dispatch_key = true;
+  $o_634->attrs[] = $o_636;
+  $o_637 = new AttrSpec();
+  $o_637->name = 'src';
+  $o_637->mandatory = true;
+  $o_637->value_regex = 'https://cdn\\.ampproject\\.org/v0/amp-analytics-(latest|0\\.1).js';
+  $o_634->attrs[] = $o_637;
+  $o_638 = new AttrSpec();
+  $o_638->name = 'type';
+  $o_638->value = 'text/javascript';
+  $o_634->attrs[] = $o_638;
   $o_634->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-analytics.html';
-  $o_636 = new CdataSpec();
-  $o_637 = new BlackListedCDataRegex();
-  $o_637->regex = '<!--';
-  $o_637->error_message = 'html comments';
-  $o_636->blacklisted_cdata_regex[] = $o_637;
-  $o_634->cdata = $o_636;
+  $o_639 = new CdataSpec();
+  $o_640 = new BlackListedCDataRegex();
+  $o_640->regex = '.';
+  $o_640->error_message = 'contents';
+  $o_639->blacklisted_cdata_regex[] = $o_640;
+  $o_634->cdata = $o_639;
   $o_0->tags[] = $o_634;
-  $o_638 = new TagSpec();
-  $o_638->tag_name = 'script';
-  $o_638->spec_name = 'amp-ad-metadata .json script';
-  $o_638->mandatory_parent = 'body';
-  $o_639 = new AttrSpec();
-  $o_639->name = 'type';
-  $o_639->mandatory = true;
-  $o_639->value = 'application/json';
-  $o_638->attrs[] = $o_639;
-  $o_640 = new AttrSpec();
-  $o_640->name = 'amp-ad-metadata';
-  $o_640->mandatory = true;
-  $o_640->value = '';
-  $o_640->dispatch_key = true;
-  $o_638->attrs[] = $o_640;
-  $o_638->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-analytics.html';
-  $o_641 = new CdataSpec();
-  $o_642 = new BlackListedCDataRegex();
-  $o_642->regex = '<!--';
-  $o_642->error_message = 'html comments';
-  $o_641->blacklisted_cdata_regex[] = $o_642;
-  $o_638->cdata = $o_641;
-  $o_0->tags[] = $o_638;
-  $o_643 = new TagSpec();
-  $o_643->tag_name = 'amp-analytics';
-  $o_644 = new AttrSpec();
-  $o_644->name = 'type';
-  $o_643->attrs[] = $o_644;
-  $o_645 = new AttrSpec();
-  $o_645->name = 'config';
-  $o_646 = new UrlSpec();
-  $o_646->allowed_protocol = ['https'];
-  $o_646->allow_relative = true;
-  $o_645->value_url = $o_646;
-  $o_643->attrs[] = $o_645;
-  $o_643->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-analytics.html';
-  $o_643->disallowed_ancestor = ['head', 'amp-sidebar'];
-  $o_643->also_requires_tag = ['amp-analytics extension .js script'];
-  $o_0->tags[] = $o_643;
-  $o_647 = new TagSpec();
-  $o_647->tag_name = 'script';
-  $o_647->spec_name = 'amp-anim extension .js script';
-  $o_647->mandatory_parent = 'head';
-  $o_648 = new AttrSpec();
-  $o_648->name = 'async';
-  $o_648->mandatory = true;
-  $o_648->value = '';
-  $o_647->attrs[] = $o_648;
-  $o_649 = new AttrSpec();
-  $o_649->name = 'custom-element';
-  $o_649->mandatory = true;
-  $o_649->value = 'amp-anim';
-  $o_649->dispatch_key = true;
-  $o_647->attrs[] = $o_649;
-  $o_650 = new AttrSpec();
-  $o_650->name = 'src';
-  $o_650->mandatory = true;
-  $o_650->value_regex = 'https://cdn\\.ampproject\\.org/v0/amp-anim-(latest|0\\.1).js';
-  $o_647->attrs[] = $o_650;
+  $o_641 = new TagSpec();
+  $o_641->tag_name = 'script';
+  $o_641->spec_name = 'amp-analytics extension .json script';
+  $o_641->mandatory_parent = 'amp-analytics';
+  $o_642 = new AttrSpec();
+  $o_642->name = 'type';
+  $o_642->mandatory = true;
+  $o_642->value = 'application/json';
+  $o_642->dispatch_key = true;
+  $o_641->attrs[] = $o_642;
+  $o_641->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-analytics.html';
+  $o_643 = new CdataSpec();
+  $o_644 = new BlackListedCDataRegex();
+  $o_644->regex = '<!--';
+  $o_644->error_message = 'html comments';
+  $o_643->blacklisted_cdata_regex[] = $o_644;
+  $o_641->cdata = $o_643;
+  $o_0->tags[] = $o_641;
+  $o_645 = new TagSpec();
+  $o_645->tag_name = 'script';
+  $o_645->spec_name = 'amp-ad-metadata .json script';
+  $o_645->mandatory_parent = 'body';
+  $o_646 = new AttrSpec();
+  $o_646->name = 'type';
+  $o_646->mandatory = true;
+  $o_646->value = 'application/json';
+  $o_645->attrs[] = $o_646;
+  $o_647 = new AttrSpec();
+  $o_647->name = 'amp-ad-metadata';
+  $o_647->mandatory = true;
+  $o_647->value = '';
+  $o_647->dispatch_key = true;
+  $o_645->attrs[] = $o_647;
+  $o_645->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-analytics.html';
+  $o_648 = new CdataSpec();
+  $o_649 = new BlackListedCDataRegex();
+  $o_649->regex = '<!--';
+  $o_649->error_message = 'html comments';
+  $o_648->blacklisted_cdata_regex[] = $o_649;
+  $o_645->cdata = $o_648;
+  $o_0->tags[] = $o_645;
+  $o_650 = new TagSpec();
+  $o_650->tag_name = 'amp-analytics';
   $o_651 = new AttrSpec();
   $o_651->name = 'type';
-  $o_651->value = 'text/javascript';
-  $o_647->attrs[] = $o_651;
-  $o_647->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-anim.html';
-  $o_652 = new CdataSpec();
-  $o_653 = new BlackListedCDataRegex();
-  $o_653->regex = '.';
-  $o_653->error_message = 'contents';
-  $o_652->blacklisted_cdata_regex[] = $o_653;
-  $o_647->cdata = $o_652;
-  $o_0->tags[] = $o_647;
+  $o_650->attrs[] = $o_651;
+  $o_652 = new AttrSpec();
+  $o_652->name = 'config';
+  $o_653 = new UrlSpec();
+  $o_653->allowed_protocol = ['https'];
+  $o_653->allow_relative = true;
+  $o_652->value_url = $o_653;
+  $o_650->attrs[] = $o_652;
+  $o_650->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-analytics.html';
+  $o_650->disallowed_ancestor = ['head', 'amp-sidebar'];
+  $o_650->also_requires_tag = ['amp-analytics extension .js script'];
+  $o_0->tags[] = $o_650;
   $o_654 = new TagSpec();
-  $o_654->tag_name = 'amp-anim';
+  $o_654->tag_name = 'script';
+  $o_654->spec_name = 'amp-anim extension .js script';
+  $o_654->mandatory_parent = 'head';
   $o_655 = new AttrSpec();
-  $o_655->name = 'alt';
+  $o_655->name = 'async';
+  $o_655->mandatory = true;
+  $o_655->value = '';
   $o_654->attrs[] = $o_655;
   $o_656 = new AttrSpec();
-  $o_656->name = 'attribution';
+  $o_656->name = 'custom-element';
+  $o_656->mandatory = true;
+  $o_656->value = 'amp-anim';
+  $o_656->dispatch_key = true;
   $o_654->attrs[] = $o_656;
   $o_657 = new AttrSpec();
-  $o_657->name = 'autoplay';
-  $o_657->value = '';
+  $o_657->name = 'src';
+  $o_657->mandatory = true;
+  $o_657->value_regex = 'https://cdn\\.ampproject\\.org/v0/amp-anim-(latest|0\\.1).js';
   $o_654->attrs[] = $o_657;
   $o_658 = new AttrSpec();
-  $o_658->name = 'controls';
+  $o_658->name = 'type';
+  $o_658->value = 'text/javascript';
   $o_654->attrs[] = $o_658;
-  $o_654->attr_lists = ['extended-amp-global', 'mandatory-src-or-srcset'];
   $o_654->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-anim.html';
-  $o_659 = new AmpLayout();
-  $o_659->supported_layouts = [AmpLayoutLayout::FILL, AmpLayoutLayout::FIXED, AmpLayoutLayout::FIXED_HEIGHT, AmpLayoutLayout::FLEX_ITEM, AmpLayoutLayout::NODISPLAY, AmpLayoutLayout::RESPONSIVE];
-  $o_654->amp_layout = $o_659;
-  $o_654->disallowed_ancestor = ['head', 'amp-sidebar'];
-  $o_654->also_requires_tag = ['amp-anim extension .js script'];
+  $o_659 = new CdataSpec();
+  $o_660 = new BlackListedCDataRegex();
+  $o_660->regex = '.';
+  $o_660->error_message = 'contents';
+  $o_659->blacklisted_cdata_regex[] = $o_660;
+  $o_654->cdata = $o_659;
   $o_0->tags[] = $o_654;
-  $o_660 = new TagSpec();
-  $o_660->tag_name = 'script';
-  $o_660->spec_name = 'amp-audio extension .js script';
-  $o_660->mandatory_parent = 'head';
-  $o_661 = new AttrSpec();
-  $o_661->name = 'async';
-  $o_661->mandatory = true;
-  $o_661->value = '';
-  $o_660->attrs[] = $o_661;
+  $o_661 = new TagSpec();
+  $o_661->tag_name = 'amp-anim';
   $o_662 = new AttrSpec();
-  $o_662->name = 'custom-element';
-  $o_662->mandatory = true;
-  $o_662->value = 'amp-audio';
-  $o_662->dispatch_key = true;
-  $o_660->attrs[] = $o_662;
+  $o_662->name = 'alt';
+  $o_661->attrs[] = $o_662;
   $o_663 = new AttrSpec();
-  $o_663->name = 'src';
-  $o_663->mandatory = true;
-  $o_663->value_regex = 'https://cdn\\.ampproject\\.org/v0/amp-audio-(latest|0\\.1).js';
-  $o_660->attrs[] = $o_663;
+  $o_663->name = 'attribution';
+  $o_661->attrs[] = $o_663;
   $o_664 = new AttrSpec();
-  $o_664->name = 'type';
-  $o_664->value = 'text/javascript';
-  $o_660->attrs[] = $o_664;
-  $o_660->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-audio.html';
-  $o_665 = new CdataSpec();
-  $o_666 = new BlackListedCDataRegex();
-  $o_666->regex = '.';
-  $o_666->error_message = 'contents';
-  $o_665->blacklisted_cdata_regex[] = $o_666;
-  $o_660->cdata = $o_665;
-  $o_0->tags[] = $o_660;
+  $o_664->name = 'autoplay';
+  $o_664->value = '';
+  $o_661->attrs[] = $o_664;
+  $o_665 = new AttrSpec();
+  $o_665->name = 'controls';
+  $o_661->attrs[] = $o_665;
+  $o_661->attr_lists = ['extended-amp-global', 'mandatory-src-or-srcset'];
+  $o_661->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-anim.html';
+  $o_666 = new AmpLayout();
+  $o_666->supported_layouts = [AmpLayoutLayout::FILL, AmpLayoutLayout::FIXED, AmpLayoutLayout::FIXED_HEIGHT, AmpLayoutLayout::FLEX_ITEM, AmpLayoutLayout::NODISPLAY, AmpLayoutLayout::RESPONSIVE];
+  $o_661->amp_layout = $o_666;
+  $o_661->disallowed_ancestor = ['head', 'amp-sidebar'];
+  $o_661->also_requires_tag = ['amp-anim extension .js script'];
+  $o_0->tags[] = $o_661;
   $o_667 = new TagSpec();
-  $o_667->tag_name = 'amp-audio';
+  $o_667->tag_name = 'script';
+  $o_667->spec_name = 'amp-audio extension .js script';
+  $o_667->mandatory_parent = 'head';
   $o_668 = new AttrSpec();
-  $o_668->name = 'autoplay';
-  $o_668->value_regex = '^$|desktop|tablet|mobile|autoplay';
+  $o_668->name = 'async';
+  $o_668->mandatory = true;
+  $o_668->value = '';
   $o_667->attrs[] = $o_668;
   $o_669 = new AttrSpec();
-  $o_669->name = 'controls';
+  $o_669->name = 'custom-element';
+  $o_669->mandatory = true;
+  $o_669->value = 'amp-audio';
+  $o_669->dispatch_key = true;
   $o_667->attrs[] = $o_669;
   $o_670 = new AttrSpec();
-  $o_670->name = 'loop';
-  $o_670->value = '';
+  $o_670->name = 'src';
+  $o_670->mandatory = true;
+  $o_670->value_regex = 'https://cdn\\.ampproject\\.org/v0/amp-audio-(latest|0\\.1).js';
   $o_667->attrs[] = $o_670;
   $o_671 = new AttrSpec();
-  $o_671->name = 'muted';
-  $o_671->value = '';
+  $o_671->name = 'type';
+  $o_671->value = 'text/javascript';
   $o_667->attrs[] = $o_671;
-  $o_672 = new AttrSpec();
-  $o_672->name = 'src';
-  $o_673 = new UrlSpec();
-  $o_673->allowed_protocol = ['https'];
-  $o_673->allow_relative = true;
-  $o_672->value_url = $o_673;
-  $o_667->attrs[] = $o_672;
-  $o_667->attr_lists = ['extended-amp-global'];
   $o_667->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-audio.html';
-  $o_674 = new AmpLayout();
-  $o_674->supported_layouts = [AmpLayoutLayout::FIXED, AmpLayoutLayout::FIXED_HEIGHT, AmpLayoutLayout::NODISPLAY];
-  $o_674->defines_default_width = true;
-  $o_674->defines_default_height = true;
-  $o_667->amp_layout = $o_674;
-  $o_667->disallowed_ancestor = ['head', 'amp-sidebar'];
-  $o_667->also_requires_tag = ['amp-audio extension .js script'];
+  $o_672 = new CdataSpec();
+  $o_673 = new BlackListedCDataRegex();
+  $o_673->regex = '.';
+  $o_673->error_message = 'contents';
+  $o_672->blacklisted_cdata_regex[] = $o_673;
+  $o_667->cdata = $o_672;
   $o_0->tags[] = $o_667;
-  $o_675 = new TagSpec();
-  $o_675->tag_name = 'script';
-  $o_675->spec_name = 'amp-brid-player extension .js script';
-  $o_675->mandatory_parent = 'head';
+  $o_674 = new TagSpec();
+  $o_674->tag_name = 'amp-audio';
+  $o_675 = new AttrSpec();
+  $o_675->name = 'autoplay';
+  $o_675->value_regex = '^$|desktop|tablet|mobile|autoplay';
+  $o_674->attrs[] = $o_675;
   $o_676 = new AttrSpec();
-  $o_676->name = 'async';
-  $o_676->mandatory = true;
-  $o_676->value = '';
-  $o_675->attrs[] = $o_676;
+  $o_676->name = 'controls';
+  $o_674->attrs[] = $o_676;
   $o_677 = new AttrSpec();
-  $o_677->name = 'custom-element';
-  $o_677->mandatory = true;
-  $o_677->value = 'amp-brid-player';
-  $o_677->dispatch_key = true;
-  $o_675->attrs[] = $o_677;
+  $o_677->name = 'loop';
+  $o_677->value = '';
+  $o_674->attrs[] = $o_677;
   $o_678 = new AttrSpec();
-  $o_678->name = 'src';
-  $o_678->mandatory = true;
-  $o_678->value_regex = 'https://cdn\\.ampproject\\.org/v0/amp-brid-player-(latest|0\\.1).js';
-  $o_675->attrs[] = $o_678;
+  $o_678->name = 'muted';
+  $o_678->value = '';
+  $o_674->attrs[] = $o_678;
   $o_679 = new AttrSpec();
-  $o_679->name = 'type';
-  $o_679->value = 'text/javascript';
-  $o_675->attrs[] = $o_679;
-  $o_675->spec_url = 'https://github.com/ampproject/amphtml/blob/master/extensions/amp-brid-player/amp-brid-player.md';
-  $o_680 = new CdataSpec();
-  $o_681 = new BlackListedCDataRegex();
-  $o_681->regex = '.';
-  $o_681->error_message = 'contents';
-  $o_680->blacklisted_cdata_regex[] = $o_681;
-  $o_675->cdata = $o_680;
-  $o_0->tags[] = $o_675;
+  $o_679->name = 'src';
+  $o_680 = new UrlSpec();
+  $o_680->allowed_protocol = ['https'];
+  $o_680->allow_relative = true;
+  $o_679->value_url = $o_680;
+  $o_674->attrs[] = $o_679;
+  $o_674->attr_lists = ['extended-amp-global'];
+  $o_674->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-audio.html';
+  $o_681 = new AmpLayout();
+  $o_681->supported_layouts = [AmpLayoutLayout::FIXED, AmpLayoutLayout::FIXED_HEIGHT, AmpLayoutLayout::NODISPLAY];
+  $o_681->defines_default_width = true;
+  $o_681->defines_default_height = true;
+  $o_674->amp_layout = $o_681;
+  $o_674->disallowed_ancestor = ['head', 'amp-sidebar'];
+  $o_674->also_requires_tag = ['amp-audio extension .js script'];
+  $o_0->tags[] = $o_674;
   $o_682 = new TagSpec();
-  $o_682->tag_name = 'amp-brid-player';
+  $o_682->tag_name = 'script';
+  $o_682->spec_name = 'amp-brid-player extension .js script';
+  $o_682->mandatory_parent = 'head';
   $o_683 = new AttrSpec();
-  $o_683->name = 'data-partner';
+  $o_683->name = 'async';
   $o_683->mandatory = true;
-  $o_683->value_regex = '[0-9]+';
+  $o_683->value = '';
   $o_682->attrs[] = $o_683;
   $o_684 = new AttrSpec();
-  $o_684->name = 'data-player';
+  $o_684->name = 'custom-element';
   $o_684->mandatory = true;
-  $o_684->value_regex = '[0-9]+';
+  $o_684->value = 'amp-brid-player';
+  $o_684->dispatch_key = true;
   $o_682->attrs[] = $o_684;
   $o_685 = new AttrSpec();
-  $o_685->name = 'data-playlist';
-  $o_685->mandatory_oneof = '[\'data-playlist\', \'data-video\']';
-  $o_685->value_regex = '[0-9]+';
+  $o_685->name = 'src';
+  $o_685->mandatory = true;
+  $o_685->value_regex = 'https://cdn\\.ampproject\\.org/v0/amp-brid-player-(latest|0\\.1).js';
   $o_682->attrs[] = $o_685;
   $o_686 = new AttrSpec();
-  $o_686->name = 'data-video';
-  $o_686->mandatory_oneof = '[\'data-playlist\', \'data-video\']';
-  $o_686->value_regex = '[0-9]+';
+  $o_686->name = 'type';
+  $o_686->value = 'text/javascript';
   $o_682->attrs[] = $o_686;
-  $o_682->attr_lists = ['extended-amp-global'];
   $o_682->spec_url = 'https://github.com/ampproject/amphtml/blob/master/extensions/amp-brid-player/amp-brid-player.md';
-  $o_687 = new AmpLayout();
-  $o_687->supported_layouts = [AmpLayoutLayout::FILL, AmpLayoutLayout::FIXED, AmpLayoutLayout::FIXED_HEIGHT, AmpLayoutLayout::FLEX_ITEM, AmpLayoutLayout::NODISPLAY, AmpLayoutLayout::RESPONSIVE];
-  $o_682->amp_layout = $o_687;
-  $o_682->disallowed_ancestor = ['head', 'amp-sidebar'];
-  $o_682->also_requires_tag = ['amp-brid-player extension .js script'];
+  $o_687 = new CdataSpec();
+  $o_688 = new BlackListedCDataRegex();
+  $o_688->regex = '.';
+  $o_688->error_message = 'contents';
+  $o_687->blacklisted_cdata_regex[] = $o_688;
+  $o_682->cdata = $o_687;
   $o_0->tags[] = $o_682;
-  $o_688 = new TagSpec();
-  $o_688->tag_name = 'script';
-  $o_688->spec_name = 'amp-brightcove extension .js script';
-  $o_688->mandatory_parent = 'head';
-  $o_689 = new AttrSpec();
-  $o_689->name = 'async';
-  $o_689->mandatory = true;
-  $o_689->value = '';
-  $o_688->attrs[] = $o_689;
+  $o_689 = new TagSpec();
+  $o_689->tag_name = 'amp-brid-player';
   $o_690 = new AttrSpec();
-  $o_690->name = 'custom-element';
+  $o_690->name = 'data-partner';
   $o_690->mandatory = true;
-  $o_690->value = 'amp-brightcove';
-  $o_690->dispatch_key = true;
-  $o_688->attrs[] = $o_690;
+  $o_690->value_regex = '[0-9]+';
+  $o_689->attrs[] = $o_690;
   $o_691 = new AttrSpec();
-  $o_691->name = 'src';
+  $o_691->name = 'data-player';
   $o_691->mandatory = true;
-  $o_691->value_regex = 'https://cdn\\.ampproject\\.org/v0/amp-brightcove-(latest|0\\.1).js';
-  $o_688->attrs[] = $o_691;
+  $o_691->value_regex = '[0-9]+';
+  $o_689->attrs[] = $o_691;
   $o_692 = new AttrSpec();
-  $o_692->name = 'type';
-  $o_692->value = 'text/javascript';
-  $o_688->attrs[] = $o_692;
-  $o_688->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-brightcove.html';
-  $o_693 = new CdataSpec();
-  $o_694 = new BlackListedCDataRegex();
-  $o_694->regex = '.';
-  $o_694->error_message = 'contents';
-  $o_693->blacklisted_cdata_regex[] = $o_694;
-  $o_688->cdata = $o_693;
-  $o_0->tags[] = $o_688;
+  $o_692->name = 'data-playlist';
+  $o_692->mandatory_oneof = '[\'data-playlist\', \'data-video\']';
+  $o_692->value_regex = '[0-9]+';
+  $o_689->attrs[] = $o_692;
+  $o_693 = new AttrSpec();
+  $o_693->name = 'data-video';
+  $o_693->mandatory_oneof = '[\'data-playlist\', \'data-video\']';
+  $o_693->value_regex = '[0-9]+';
+  $o_689->attrs[] = $o_693;
+  $o_689->attr_lists = ['extended-amp-global'];
+  $o_689->spec_url = 'https://github.com/ampproject/amphtml/blob/master/extensions/amp-brid-player/amp-brid-player.md';
+  $o_694 = new AmpLayout();
+  $o_694->supported_layouts = [AmpLayoutLayout::FILL, AmpLayoutLayout::FIXED, AmpLayoutLayout::FIXED_HEIGHT, AmpLayoutLayout::FLEX_ITEM, AmpLayoutLayout::NODISPLAY, AmpLayoutLayout::RESPONSIVE];
+  $o_689->amp_layout = $o_694;
+  $o_689->disallowed_ancestor = ['head', 'amp-sidebar'];
+  $o_689->also_requires_tag = ['amp-brid-player extension .js script'];
+  $o_0->tags[] = $o_689;
   $o_695 = new TagSpec();
-  $o_695->tag_name = 'amp-brightcove';
+  $o_695->tag_name = 'script';
+  $o_695->spec_name = 'amp-brightcove extension .js script';
+  $o_695->mandatory_parent = 'head';
   $o_696 = new AttrSpec();
-  $o_696->name = 'data-account';
+  $o_696->name = 'async';
   $o_696->mandatory = true;
+  $o_696->value = '';
   $o_695->attrs[] = $o_696;
   $o_697 = new AttrSpec();
-  $o_697->name = 'data-embed';
+  $o_697->name = 'custom-element';
+  $o_697->mandatory = true;
+  $o_697->value = 'amp-brightcove';
+  $o_697->dispatch_key = true;
   $o_695->attrs[] = $o_697;
   $o_698 = new AttrSpec();
-  $o_698->name = 'data-player';
+  $o_698->name = 'src';
+  $o_698->mandatory = true;
+  $o_698->value_regex = 'https://cdn\\.ampproject\\.org/v0/amp-brightcove-(latest|0\\.1).js';
   $o_695->attrs[] = $o_698;
   $o_699 = new AttrSpec();
-  $o_699->name = 'data-playlist-id';
+  $o_699->name = 'type';
+  $o_699->value = 'text/javascript';
   $o_695->attrs[] = $o_699;
-  $o_700 = new AttrSpec();
-  $o_700->name = 'data-video-id';
-  $o_695->attrs[] = $o_700;
-  $o_695->attr_lists = ['extended-amp-global'];
   $o_695->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-brightcove.html';
-  $o_701 = new AmpLayout();
-  $o_701->supported_layouts = [AmpLayoutLayout::FILL, AmpLayoutLayout::FIXED, AmpLayoutLayout::FIXED_HEIGHT, AmpLayoutLayout::FLEX_ITEM, AmpLayoutLayout::NODISPLAY, AmpLayoutLayout::RESPONSIVE];
-  $o_695->amp_layout = $o_701;
-  $o_695->disallowed_ancestor = ['head', 'amp-sidebar'];
-  $o_695->also_requires_tag = ['amp-brightcove extension .js script'];
+  $o_700 = new CdataSpec();
+  $o_701 = new BlackListedCDataRegex();
+  $o_701->regex = '.';
+  $o_701->error_message = 'contents';
+  $o_700->blacklisted_cdata_regex[] = $o_701;
+  $o_695->cdata = $o_700;
   $o_0->tags[] = $o_695;
   $o_702 = new TagSpec();
-  $o_702->tag_name = 'script';
-  $o_702->spec_name = 'amp-carousel extension .js script';
-  $o_702->mandatory_parent = 'head';
+  $o_702->tag_name = 'amp-brightcove';
   $o_703 = new AttrSpec();
-  $o_703->name = 'async';
+  $o_703->name = 'data-account';
   $o_703->mandatory = true;
-  $o_703->value = '';
   $o_702->attrs[] = $o_703;
   $o_704 = new AttrSpec();
-  $o_704->name = 'custom-element';
-  $o_704->mandatory = true;
-  $o_704->value = 'amp-carousel';
-  $o_704->dispatch_key = true;
+  $o_704->name = 'data-embed';
   $o_702->attrs[] = $o_704;
   $o_705 = new AttrSpec();
-  $o_705->name = 'src';
-  $o_705->mandatory = true;
-  $o_705->value_regex = 'https://cdn\\.ampproject\\.org/v0/amp-carousel-(latest|0\\.1).js';
+  $o_705->name = 'data-player';
   $o_702->attrs[] = $o_705;
   $o_706 = new AttrSpec();
-  $o_706->name = 'type';
-  $o_706->value = 'text/javascript';
+  $o_706->name = 'data-playlist-id';
   $o_702->attrs[] = $o_706;
-  $o_702->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-carousel.html';
-  $o_707 = new CdataSpec();
-  $o_708 = new BlackListedCDataRegex();
-  $o_708->regex = '.';
-  $o_708->error_message = 'contents';
-  $o_707->blacklisted_cdata_regex[] = $o_708;
-  $o_702->cdata = $o_707;
+  $o_707 = new AttrSpec();
+  $o_707->name = 'data-video-id';
+  $o_702->attrs[] = $o_707;
+  $o_702->attr_lists = ['extended-amp-global'];
+  $o_702->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-brightcove.html';
+  $o_708 = new AmpLayout();
+  $o_708->supported_layouts = [AmpLayoutLayout::FILL, AmpLayoutLayout::FIXED, AmpLayoutLayout::FIXED_HEIGHT, AmpLayoutLayout::FLEX_ITEM, AmpLayoutLayout::NODISPLAY, AmpLayoutLayout::RESPONSIVE];
+  $o_702->amp_layout = $o_708;
+  $o_702->disallowed_ancestor = ['head', 'amp-sidebar'];
+  $o_702->also_requires_tag = ['amp-brightcove extension .js script'];
   $o_0->tags[] = $o_702;
   $o_709 = new TagSpec();
-  $o_709->tag_name = 'amp-carousel';
+  $o_709->tag_name = 'script';
+  $o_709->spec_name = 'amp-carousel extension .js script';
+  $o_709->mandatory_parent = 'head';
   $o_710 = new AttrSpec();
-  $o_710->name = 'arrows';
+  $o_710->name = 'async';
+  $o_710->mandatory = true;
   $o_710->value = '';
   $o_709->attrs[] = $o_710;
   $o_711 = new AttrSpec();
-  $o_711->name = 'autoplay';
-  $o_711->value = '';
+  $o_711->name = 'custom-element';
+  $o_711->mandatory = true;
+  $o_711->value = 'amp-carousel';
+  $o_711->dispatch_key = true;
   $o_709->attrs[] = $o_711;
   $o_712 = new AttrSpec();
-  $o_712->name = 'controls';
+  $o_712->name = 'src';
+  $o_712->mandatory = true;
+  $o_712->value_regex = 'https://cdn\\.ampproject\\.org/v0/amp-carousel-(latest|0\\.1).js';
   $o_709->attrs[] = $o_712;
   $o_713 = new AttrSpec();
-  $o_713->name = 'delay';
-  $o_713->value_regex = '[0-9]+';
+  $o_713->name = 'type';
+  $o_713->value = 'text/javascript';
   $o_709->attrs[] = $o_713;
-  $o_714 = new AttrSpec();
-  $o_714->name = 'dots';
-  $o_714->value = '';
-  $o_709->attrs[] = $o_714;
-  $o_715 = new AttrSpec();
-  $o_715->name = 'loop';
-  $o_715->value = '';
-  $o_709->attrs[] = $o_715;
-  $o_716 = new AttrSpec();
-  $o_716->name = 'type';
-  $o_716->value_regex = 'slides|carousel';
-  $o_709->attrs[] = $o_716;
-  $o_709->attr_lists = ['extended-amp-global'];
   $o_709->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-carousel.html';
-  $o_717 = new AmpLayout();
-  $o_717->supported_layouts = [AmpLayoutLayout::FILL, AmpLayoutLayout::FIXED, AmpLayoutLayout::FIXED_HEIGHT, AmpLayoutLayout::FLEX_ITEM, AmpLayoutLayout::NODISPLAY, AmpLayoutLayout::RESPONSIVE];
-  $o_709->amp_layout = $o_717;
-  $o_709->disallowed_ancestor = ['head', 'amp-sidebar'];
-  $o_709->also_requires_tag = ['amp-carousel extension .js script'];
+  $o_714 = new CdataSpec();
+  $o_715 = new BlackListedCDataRegex();
+  $o_715->regex = '.';
+  $o_715->error_message = 'contents';
+  $o_714->blacklisted_cdata_regex[] = $o_715;
+  $o_709->cdata = $o_714;
   $o_0->tags[] = $o_709;
-  $o_718 = new TagSpec();
-  $o_718->tag_name = 'script';
-  $o_718->spec_name = 'amp-dailymotion extension .js script';
-  $o_718->mandatory_parent = 'head';
+  $o_716 = new TagSpec();
+  $o_716->tag_name = 'amp-carousel';
+  $o_717 = new AttrSpec();
+  $o_717->name = 'arrows';
+  $o_717->value = '';
+  $o_716->attrs[] = $o_717;
+  $o_718 = new AttrSpec();
+  $o_718->name = 'autoplay';
+  $o_718->value = '';
+  $o_716->attrs[] = $o_718;
   $o_719 = new AttrSpec();
-  $o_719->name = 'async';
-  $o_719->mandatory = true;
-  $o_719->value = '';
-  $o_718->attrs[] = $o_719;
+  $o_719->name = 'controls';
+  $o_716->attrs[] = $o_719;
   $o_720 = new AttrSpec();
-  $o_720->name = 'custom-element';
-  $o_720->mandatory = true;
-  $o_720->value = 'amp-dailymotion';
-  $o_720->dispatch_key = true;
-  $o_718->attrs[] = $o_720;
+  $o_720->name = 'delay';
+  $o_720->value_regex = '[0-9]+';
+  $o_716->attrs[] = $o_720;
   $o_721 = new AttrSpec();
-  $o_721->name = 'src';
-  $o_721->mandatory = true;
-  $o_721->value_regex = 'https://cdn\\.ampproject\\.org/v0/amp-dailymotion-(latest|0\\.1)\\.js';
-  $o_718->attrs[] = $o_721;
+  $o_721->name = 'dots';
+  $o_721->value = '';
+  $o_716->attrs[] = $o_721;
   $o_722 = new AttrSpec();
-  $o_722->name = 'type';
-  $o_722->value = 'text/javascript';
-  $o_718->attrs[] = $o_722;
-  $o_718->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-dailymotion.html';
-  $o_723 = new CdataSpec();
-  $o_724 = new BlackListedCDataRegex();
-  $o_724->regex = '.';
-  $o_724->error_message = 'contents';
-  $o_723->blacklisted_cdata_regex[] = $o_724;
-  $o_718->cdata = $o_723;
-  $o_0->tags[] = $o_718;
+  $o_722->name = 'loop';
+  $o_722->value = '';
+  $o_716->attrs[] = $o_722;
+  $o_723 = new AttrSpec();
+  $o_723->name = 'type';
+  $o_723->value_regex = 'slides|carousel';
+  $o_716->attrs[] = $o_723;
+  $o_716->attr_lists = ['extended-amp-global'];
+  $o_716->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-carousel.html';
+  $o_724 = new AmpLayout();
+  $o_724->supported_layouts = [AmpLayoutLayout::FILL, AmpLayoutLayout::FIXED, AmpLayoutLayout::FIXED_HEIGHT, AmpLayoutLayout::FLEX_ITEM, AmpLayoutLayout::NODISPLAY, AmpLayoutLayout::RESPONSIVE];
+  $o_716->amp_layout = $o_724;
+  $o_716->disallowed_ancestor = ['head', 'amp-sidebar'];
+  $o_716->also_requires_tag = ['amp-carousel extension .js script'];
+  $o_0->tags[] = $o_716;
   $o_725 = new TagSpec();
-  $o_725->tag_name = 'amp-dailymotion';
+  $o_725->tag_name = 'script';
+  $o_725->spec_name = 'amp-dailymotion extension .js script';
+  $o_725->mandatory_parent = 'head';
   $o_726 = new AttrSpec();
-  $o_726->name = 'data-endscreen-enable';
-  $o_726->value_regex = 'true|false';
+  $o_726->name = 'async';
+  $o_726->mandatory = true;
+  $o_726->value = '';
   $o_725->attrs[] = $o_726;
   $o_727 = new AttrSpec();
-  $o_727->name = 'data-info';
-  $o_727->value_regex = 'true|false';
+  $o_727->name = 'custom-element';
+  $o_727->mandatory = true;
+  $o_727->value = 'amp-dailymotion';
+  $o_727->dispatch_key = true;
   $o_725->attrs[] = $o_727;
   $o_728 = new AttrSpec();
-  $o_728->name = 'data-mute';
-  $o_728->value_regex = 'true|false';
+  $o_728->name = 'src';
+  $o_728->mandatory = true;
+  $o_728->value_regex = 'https://cdn\\.ampproject\\.org/v0/amp-dailymotion-(latest|0\\.1)\\.js';
   $o_725->attrs[] = $o_728;
   $o_729 = new AttrSpec();
-  $o_729->name = 'data-sharing-enable';
-  $o_729->value_regex = 'true|false';
+  $o_729->name = 'type';
+  $o_729->value = 'text/javascript';
   $o_725->attrs[] = $o_729;
-  $o_730 = new AttrSpec();
-  $o_730->name = 'data-start';
-  $o_730->value_regex = '[0-9]+';
-  $o_725->attrs[] = $o_730;
-  $o_731 = new AttrSpec();
-  $o_731->name = 'data-ui-highlight';
-  $o_731->value_regex_casei = '([0-9a-f]{3}){1,2}';
-  $o_725->attrs[] = $o_731;
-  $o_732 = new AttrSpec();
-  $o_732->name = 'data-ui-logo';
-  $o_732->value_regex = 'true|false';
-  $o_725->attrs[] = $o_732;
-  $o_733 = new AttrSpec();
-  $o_733->name = 'data-videoid';
-  $o_733->mandatory = true;
-  $o_733->value_regex_casei = '[a-z0-9]+';
-  $o_725->attrs[] = $o_733;
-  $o_725->attr_lists = ['extended-amp-global'];
   $o_725->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-dailymotion.html';
-  $o_734 = new AmpLayout();
-  $o_734->supported_layouts = [AmpLayoutLayout::FILL, AmpLayoutLayout::FIXED, AmpLayoutLayout::FIXED_HEIGHT, AmpLayoutLayout::FLEX_ITEM, AmpLayoutLayout::RESPONSIVE];
-  $o_725->amp_layout = $o_734;
-  $o_725->disallowed_ancestor = ['head', 'amp-sidebar'];
-  $o_725->also_requires_tag = ['amp-dailymotion extension .js script'];
+  $o_730 = new CdataSpec();
+  $o_731 = new BlackListedCDataRegex();
+  $o_731->regex = '.';
+  $o_731->error_message = 'contents';
+  $o_730->blacklisted_cdata_regex[] = $o_731;
+  $o_725->cdata = $o_730;
   $o_0->tags[] = $o_725;
-  $o_735 = new TagSpec();
-  $o_735->tag_name = 'script';
-  $o_735->spec_name = 'amp-dynamic-css-classes extension .js script';
-  $o_735->mandatory_parent = 'head';
+  $o_732 = new TagSpec();
+  $o_732->tag_name = 'amp-dailymotion';
+  $o_733 = new AttrSpec();
+  $o_733->name = 'data-endscreen-enable';
+  $o_733->value_regex = 'true|false';
+  $o_732->attrs[] = $o_733;
+  $o_734 = new AttrSpec();
+  $o_734->name = 'data-info';
+  $o_734->value_regex = 'true|false';
+  $o_732->attrs[] = $o_734;
+  $o_735 = new AttrSpec();
+  $o_735->name = 'data-mute';
+  $o_735->value_regex = 'true|false';
+  $o_732->attrs[] = $o_735;
   $o_736 = new AttrSpec();
-  $o_736->name = 'async';
-  $o_736->mandatory = true;
-  $o_736->value = '';
-  $o_735->attrs[] = $o_736;
+  $o_736->name = 'data-sharing-enable';
+  $o_736->value_regex = 'true|false';
+  $o_732->attrs[] = $o_736;
   $o_737 = new AttrSpec();
-  $o_737->name = 'custom-element';
-  $o_737->mandatory = true;
-  $o_737->value = 'amp-dynamic-css-classes';
-  $o_737->dispatch_key = true;
-  $o_735->attrs[] = $o_737;
+  $o_737->name = 'data-start';
+  $o_737->value_regex = '[0-9]+';
+  $o_732->attrs[] = $o_737;
   $o_738 = new AttrSpec();
-  $o_738->name = 'src';
-  $o_738->mandatory = true;
-  $o_738->value_regex = 'https://cdn\\.ampproject\\.org/v0/amp-dynamic-css-classes-(latest|0\\.1).js';
-  $o_735->attrs[] = $o_738;
+  $o_738->name = 'data-ui-highlight';
+  $o_738->value_regex_casei = '([0-9a-f]{3}){1,2}';
+  $o_732->attrs[] = $o_738;
   $o_739 = new AttrSpec();
-  $o_739->name = 'type';
-  $o_739->value = 'text/javascript';
-  $o_735->attrs[] = $o_739;
-  $o_735->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-dynamic-css-classes.html';
-  $o_740 = new CdataSpec();
-  $o_741 = new BlackListedCDataRegex();
-  $o_741->regex = '.';
-  $o_741->error_message = 'contents';
-  $o_740->blacklisted_cdata_regex[] = $o_741;
-  $o_735->cdata = $o_740;
-  $o_0->tags[] = $o_735;
+  $o_739->name = 'data-ui-logo';
+  $o_739->value_regex = 'true|false';
+  $o_732->attrs[] = $o_739;
+  $o_740 = new AttrSpec();
+  $o_740->name = 'data-videoid';
+  $o_740->mandatory = true;
+  $o_740->value_regex_casei = '[a-z0-9]+';
+  $o_732->attrs[] = $o_740;
+  $o_732->attr_lists = ['extended-amp-global'];
+  $o_732->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-dailymotion.html';
+  $o_741 = new AmpLayout();
+  $o_741->supported_layouts = [AmpLayoutLayout::FILL, AmpLayoutLayout::FIXED, AmpLayoutLayout::FIXED_HEIGHT, AmpLayoutLayout::FLEX_ITEM, AmpLayoutLayout::RESPONSIVE];
+  $o_732->amp_layout = $o_741;
+  $o_732->disallowed_ancestor = ['head', 'amp-sidebar'];
+  $o_732->also_requires_tag = ['amp-dailymotion extension .js script'];
+  $o_0->tags[] = $o_732;
   $o_742 = new TagSpec();
   $o_742->tag_name = 'script';
-  $o_742->spec_name = 'amp-facebook extension .js script';
+  $o_742->spec_name = 'amp-dynamic-css-classes extension .js script';
   $o_742->mandatory_parent = 'head';
   $o_743 = new AttrSpec();
   $o_743->name = 'async';
@@ -3129,19 +3129,19 @@ public static function createValidationRules() {
   $o_744 = new AttrSpec();
   $o_744->name = 'custom-element';
   $o_744->mandatory = true;
-  $o_744->value = 'amp-facebook';
+  $o_744->value = 'amp-dynamic-css-classes';
   $o_744->dispatch_key = true;
   $o_742->attrs[] = $o_744;
   $o_745 = new AttrSpec();
   $o_745->name = 'src';
   $o_745->mandatory = true;
-  $o_745->value_regex = 'https://cdn\\.ampproject\\.org/v0/amp-facebook-(latest|0\\.1).js';
+  $o_745->value_regex = 'https://cdn\\.ampproject\\.org/v0/amp-dynamic-css-classes-(latest|0\\.1).js';
   $o_742->attrs[] = $o_745;
   $o_746 = new AttrSpec();
   $o_746->name = 'type';
   $o_746->value = 'text/javascript';
   $o_742->attrs[] = $o_746;
-  $o_742->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-facebook.html';
+  $o_742->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-dynamic-css-classes.html';
   $o_747 = new CdataSpec();
   $o_748 = new BlackListedCDataRegex();
   $o_748->regex = '.';
@@ -3150,795 +3150,795 @@ public static function createValidationRules() {
   $o_742->cdata = $o_747;
   $o_0->tags[] = $o_742;
   $o_749 = new TagSpec();
-  $o_749->tag_name = 'amp-facebook';
+  $o_749->tag_name = 'script';
+  $o_749->spec_name = 'amp-facebook extension .js script';
+  $o_749->mandatory_parent = 'head';
   $o_750 = new AttrSpec();
-  $o_750->name = 'data-href';
+  $o_750->name = 'async';
   $o_750->mandatory = true;
+  $o_750->value = '';
   $o_749->attrs[] = $o_750;
-  $o_749->attr_lists = ['extended-amp-global'];
+  $o_751 = new AttrSpec();
+  $o_751->name = 'custom-element';
+  $o_751->mandatory = true;
+  $o_751->value = 'amp-facebook';
+  $o_751->dispatch_key = true;
+  $o_749->attrs[] = $o_751;
+  $o_752 = new AttrSpec();
+  $o_752->name = 'src';
+  $o_752->mandatory = true;
+  $o_752->value_regex = 'https://cdn\\.ampproject\\.org/v0/amp-facebook-(latest|0\\.1).js';
+  $o_749->attrs[] = $o_752;
+  $o_753 = new AttrSpec();
+  $o_753->name = 'type';
+  $o_753->value = 'text/javascript';
+  $o_749->attrs[] = $o_753;
   $o_749->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-facebook.html';
-  $o_751 = new AmpLayout();
-  $o_751->supported_layouts = [AmpLayoutLayout::FILL, AmpLayoutLayout::FIXED, AmpLayoutLayout::FIXED_HEIGHT, AmpLayoutLayout::FLEX_ITEM, AmpLayoutLayout::NODISPLAY, AmpLayoutLayout::RESPONSIVE];
-  $o_749->amp_layout = $o_751;
-  $o_749->disallowed_ancestor = ['head', 'amp-sidebar'];
-  $o_749->also_requires_tag = ['amp-facebook extension .js script'];
+  $o_754 = new CdataSpec();
+  $o_755 = new BlackListedCDataRegex();
+  $o_755->regex = '.';
+  $o_755->error_message = 'contents';
+  $o_754->blacklisted_cdata_regex[] = $o_755;
+  $o_749->cdata = $o_754;
   $o_0->tags[] = $o_749;
-  $o_752 = new TagSpec();
-  $o_752->tag_name = 'script';
-  $o_752->spec_name = 'amp-fit-text extension .js script';
-  $o_752->mandatory_parent = 'head';
-  $o_753 = new AttrSpec();
-  $o_753->name = 'async';
-  $o_753->mandatory = true;
-  $o_753->value = '';
-  $o_752->attrs[] = $o_753;
-  $o_754 = new AttrSpec();
-  $o_754->name = 'custom-element';
-  $o_754->mandatory = true;
-  $o_754->value = 'amp-fit-text';
-  $o_754->dispatch_key = true;
-  $o_752->attrs[] = $o_754;
-  $o_755 = new AttrSpec();
-  $o_755->name = 'src';
-  $o_755->mandatory = true;
-  $o_755->value_regex = 'https://cdn\\.ampproject\\.org/v0/amp-fit-text-(latest|0\\.1).js';
-  $o_752->attrs[] = $o_755;
-  $o_756 = new AttrSpec();
-  $o_756->name = 'type';
-  $o_756->value = 'text/javascript';
-  $o_752->attrs[] = $o_756;
-  $o_752->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-fit-text.html';
-  $o_757 = new CdataSpec();
-  $o_758 = new BlackListedCDataRegex();
-  $o_758->regex = '.';
-  $o_758->error_message = 'contents';
-  $o_757->blacklisted_cdata_regex[] = $o_758;
-  $o_752->cdata = $o_757;
-  $o_0->tags[] = $o_752;
+  $o_756 = new TagSpec();
+  $o_756->tag_name = 'amp-facebook';
+  $o_757 = new AttrSpec();
+  $o_757->name = 'data-href';
+  $o_757->mandatory = true;
+  $o_756->attrs[] = $o_757;
+  $o_756->attr_lists = ['extended-amp-global'];
+  $o_756->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-facebook.html';
+  $o_758 = new AmpLayout();
+  $o_758->supported_layouts = [AmpLayoutLayout::FILL, AmpLayoutLayout::FIXED, AmpLayoutLayout::FIXED_HEIGHT, AmpLayoutLayout::FLEX_ITEM, AmpLayoutLayout::NODISPLAY, AmpLayoutLayout::RESPONSIVE];
+  $o_756->amp_layout = $o_758;
+  $o_756->disallowed_ancestor = ['head', 'amp-sidebar'];
+  $o_756->also_requires_tag = ['amp-facebook extension .js script'];
+  $o_0->tags[] = $o_756;
   $o_759 = new TagSpec();
-  $o_759->tag_name = 'amp-fit-text';
+  $o_759->tag_name = 'script';
+  $o_759->spec_name = 'amp-fit-text extension .js script';
+  $o_759->mandatory_parent = 'head';
   $o_760 = new AttrSpec();
-  $o_760->name = 'max-font-size';
+  $o_760->name = 'async';
+  $o_760->mandatory = true;
+  $o_760->value = '';
   $o_759->attrs[] = $o_760;
   $o_761 = new AttrSpec();
-  $o_761->name = 'min-font-size';
+  $o_761->name = 'custom-element';
+  $o_761->mandatory = true;
+  $o_761->value = 'amp-fit-text';
+  $o_761->dispatch_key = true;
   $o_759->attrs[] = $o_761;
-  $o_759->attr_lists = ['extended-amp-global'];
+  $o_762 = new AttrSpec();
+  $o_762->name = 'src';
+  $o_762->mandatory = true;
+  $o_762->value_regex = 'https://cdn\\.ampproject\\.org/v0/amp-fit-text-(latest|0\\.1).js';
+  $o_759->attrs[] = $o_762;
+  $o_763 = new AttrSpec();
+  $o_763->name = 'type';
+  $o_763->value = 'text/javascript';
+  $o_759->attrs[] = $o_763;
   $o_759->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-fit-text.html';
-  $o_762 = new AmpLayout();
-  $o_762->supported_layouts = [AmpLayoutLayout::FILL, AmpLayoutLayout::FIXED, AmpLayoutLayout::FIXED_HEIGHT, AmpLayoutLayout::FLEX_ITEM, AmpLayoutLayout::NODISPLAY, AmpLayoutLayout::RESPONSIVE];
-  $o_759->amp_layout = $o_762;
-  $o_759->disallowed_ancestor = ['head'];
-  $o_759->also_requires_tag = ['amp-fit-text extension .js script'];
+  $o_764 = new CdataSpec();
+  $o_765 = new BlackListedCDataRegex();
+  $o_765->regex = '.';
+  $o_765->error_message = 'contents';
+  $o_764->blacklisted_cdata_regex[] = $o_765;
+  $o_759->cdata = $o_764;
   $o_0->tags[] = $o_759;
-  $o_763 = new TagSpec();
-  $o_763->tag_name = 'script';
-  $o_763->spec_name = 'amp-font extension .js script';
-  $o_763->mandatory_parent = 'head';
-  $o_764 = new AttrSpec();
-  $o_764->name = 'async';
-  $o_764->mandatory = true;
-  $o_764->value = '';
-  $o_763->attrs[] = $o_764;
-  $o_765 = new AttrSpec();
-  $o_765->name = 'custom-element';
-  $o_765->mandatory = true;
-  $o_765->value = 'amp-font';
-  $o_765->dispatch_key = true;
-  $o_763->attrs[] = $o_765;
-  $o_766 = new AttrSpec();
-  $o_766->name = 'src';
-  $o_766->mandatory = true;
-  $o_766->value_regex = 'https://cdn\\.ampproject\\.org/v0/amp-font-(latest|0\\.1).js';
-  $o_763->attrs[] = $o_766;
+  $o_766 = new TagSpec();
+  $o_766->tag_name = 'amp-fit-text';
   $o_767 = new AttrSpec();
-  $o_767->name = 'type';
-  $o_767->value = 'text/javascript';
-  $o_763->attrs[] = $o_767;
-  $o_763->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-font.html';
-  $o_768 = new CdataSpec();
-  $o_769 = new BlackListedCDataRegex();
-  $o_769->regex = '.';
-  $o_769->error_message = 'contents';
-  $o_768->blacklisted_cdata_regex[] = $o_769;
-  $o_763->cdata = $o_768;
-  $o_0->tags[] = $o_763;
+  $o_767->name = 'max-font-size';
+  $o_766->attrs[] = $o_767;
+  $o_768 = new AttrSpec();
+  $o_768->name = 'min-font-size';
+  $o_766->attrs[] = $o_768;
+  $o_766->attr_lists = ['extended-amp-global'];
+  $o_766->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-fit-text.html';
+  $o_769 = new AmpLayout();
+  $o_769->supported_layouts = [AmpLayoutLayout::FILL, AmpLayoutLayout::FIXED, AmpLayoutLayout::FIXED_HEIGHT, AmpLayoutLayout::FLEX_ITEM, AmpLayoutLayout::NODISPLAY, AmpLayoutLayout::RESPONSIVE];
+  $o_766->amp_layout = $o_769;
+  $o_766->disallowed_ancestor = ['head'];
+  $o_766->also_requires_tag = ['amp-fit-text extension .js script'];
+  $o_0->tags[] = $o_766;
   $o_770 = new TagSpec();
-  $o_770->tag_name = 'amp-font';
+  $o_770->tag_name = 'script';
+  $o_770->spec_name = 'amp-font extension .js script';
+  $o_770->mandatory_parent = 'head';
   $o_771 = new AttrSpec();
-  $o_771->name = 'font-family';
+  $o_771->name = 'async';
   $o_771->mandatory = true;
+  $o_771->value = '';
   $o_770->attrs[] = $o_771;
   $o_772 = new AttrSpec();
-  $o_772->name = 'font-style';
+  $o_772->name = 'custom-element';
+  $o_772->mandatory = true;
+  $o_772->value = 'amp-font';
+  $o_772->dispatch_key = true;
   $o_770->attrs[] = $o_772;
   $o_773 = new AttrSpec();
-  $o_773->name = 'font-variant';
+  $o_773->name = 'src';
+  $o_773->mandatory = true;
+  $o_773->value_regex = 'https://cdn\\.ampproject\\.org/v0/amp-font-(latest|0\\.1).js';
   $o_770->attrs[] = $o_773;
   $o_774 = new AttrSpec();
-  $o_774->name = 'timeout';
-  $o_774->value_regex = '[0-9]+';
+  $o_774->name = 'type';
+  $o_774->value = 'text/javascript';
   $o_770->attrs[] = $o_774;
-  $o_775 = new AttrSpec();
-  $o_775->name = 'font-weight';
-  $o_770->attrs[] = $o_775;
-  $o_776 = new AttrSpec();
-  $o_776->name = 'on-error-add-class';
-  $o_770->attrs[] = $o_776;
-  $o_777 = new AttrSpec();
-  $o_777->name = 'on-error-remove-class';
-  $o_770->attrs[] = $o_777;
-  $o_778 = new AttrSpec();
-  $o_778->name = 'on-load-add-class';
-  $o_770->attrs[] = $o_778;
-  $o_779 = new AttrSpec();
-  $o_779->name = 'on-load-remove-class';
-  $o_770->attrs[] = $o_779;
-  $o_770->attr_lists = ['extended-amp-global'];
   $o_770->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-font.html';
-  $o_780 = new AmpLayout();
-  $o_780->supported_layouts = [AmpLayoutLayout::NODISPLAY];
-  $o_770->amp_layout = $o_780;
-  $o_770->disallowed_ancestor = ['head', 'amp-sidebar'];
-  $o_770->also_requires_tag = ['amp-font extension .js script'];
+  $o_775 = new CdataSpec();
+  $o_776 = new BlackListedCDataRegex();
+  $o_776->regex = '.';
+  $o_776->error_message = 'contents';
+  $o_775->blacklisted_cdata_regex[] = $o_776;
+  $o_770->cdata = $o_775;
   $o_0->tags[] = $o_770;
-  $o_781 = new TagSpec();
-  $o_781->tag_name = 'script';
-  $o_781->spec_name = 'amp-iframe extension .js script';
-  $o_781->mandatory_parent = 'head';
+  $o_777 = new TagSpec();
+  $o_777->tag_name = 'amp-font';
+  $o_778 = new AttrSpec();
+  $o_778->name = 'font-family';
+  $o_778->mandatory = true;
+  $o_777->attrs[] = $o_778;
+  $o_779 = new AttrSpec();
+  $o_779->name = 'font-style';
+  $o_777->attrs[] = $o_779;
+  $o_780 = new AttrSpec();
+  $o_780->name = 'font-variant';
+  $o_777->attrs[] = $o_780;
+  $o_781 = new AttrSpec();
+  $o_781->name = 'timeout';
+  $o_781->value_regex = '[0-9]+';
+  $o_777->attrs[] = $o_781;
   $o_782 = new AttrSpec();
-  $o_782->name = 'async';
-  $o_782->mandatory = true;
-  $o_782->value = '';
-  $o_781->attrs[] = $o_782;
+  $o_782->name = 'font-weight';
+  $o_777->attrs[] = $o_782;
   $o_783 = new AttrSpec();
-  $o_783->name = 'custom-element';
-  $o_783->mandatory = true;
-  $o_783->value = 'amp-iframe';
-  $o_783->dispatch_key = true;
-  $o_781->attrs[] = $o_783;
+  $o_783->name = 'on-error-add-class';
+  $o_777->attrs[] = $o_783;
   $o_784 = new AttrSpec();
-  $o_784->name = 'src';
-  $o_784->mandatory = true;
-  $o_784->value_regex = 'https://cdn\\.ampproject\\.org/v0/amp-iframe-(latest|0\\.1).js';
-  $o_781->attrs[] = $o_784;
+  $o_784->name = 'on-error-remove-class';
+  $o_777->attrs[] = $o_784;
   $o_785 = new AttrSpec();
-  $o_785->name = 'type';
-  $o_785->value = 'text/javascript';
-  $o_781->attrs[] = $o_785;
-  $o_781->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-iframe.html';
-  $o_786 = new CdataSpec();
-  $o_787 = new BlackListedCDataRegex();
-  $o_787->regex = '.';
-  $o_787->error_message = 'contents';
-  $o_786->blacklisted_cdata_regex[] = $o_787;
-  $o_781->cdata = $o_786;
-  $o_0->tags[] = $o_781;
+  $o_785->name = 'on-load-add-class';
+  $o_777->attrs[] = $o_785;
+  $o_786 = new AttrSpec();
+  $o_786->name = 'on-load-remove-class';
+  $o_777->attrs[] = $o_786;
+  $o_777->attr_lists = ['extended-amp-global'];
+  $o_777->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-font.html';
+  $o_787 = new AmpLayout();
+  $o_787->supported_layouts = [AmpLayoutLayout::NODISPLAY];
+  $o_777->amp_layout = $o_787;
+  $o_777->disallowed_ancestor = ['head', 'amp-sidebar'];
+  $o_777->also_requires_tag = ['amp-font extension .js script'];
+  $o_0->tags[] = $o_777;
   $o_788 = new TagSpec();
-  $o_788->tag_name = 'amp-iframe';
+  $o_788->tag_name = 'script';
+  $o_788->spec_name = 'amp-iframe extension .js script';
+  $o_788->mandatory_parent = 'head';
   $o_789 = new AttrSpec();
-  $o_789->name = 'allowfullscreen';
+  $o_789->name = 'async';
+  $o_789->mandatory = true;
   $o_789->value = '';
   $o_788->attrs[] = $o_789;
   $o_790 = new AttrSpec();
-  $o_790->name = 'allowtransparency';
-  $o_790->value = '';
+  $o_790->name = 'custom-element';
+  $o_790->mandatory = true;
+  $o_790->value = 'amp-iframe';
+  $o_790->dispatch_key = true;
   $o_788->attrs[] = $o_790;
   $o_791 = new AttrSpec();
-  $o_791->name = 'frameborder';
-  $o_791->value_regex = '0|1';
+  $o_791->name = 'src';
+  $o_791->mandatory = true;
+  $o_791->value_regex = 'https://cdn\\.ampproject\\.org/v0/amp-iframe-(latest|0\\.1).js';
   $o_788->attrs[] = $o_791;
   $o_792 = new AttrSpec();
-  $o_792->name = 'resizable';
-  $o_792->value = '';
+  $o_792->name = 'type';
+  $o_792->value = 'text/javascript';
   $o_788->attrs[] = $o_792;
-  $o_793 = new AttrSpec();
-  $o_793->name = 'sandbox';
-  $o_788->attrs[] = $o_793;
-  $o_794 = new AttrSpec();
-  $o_794->name = 'scrolling';
-  $o_794->value_regex = 'auto|yes|no';
-  $o_788->attrs[] = $o_794;
-  $o_795 = new AttrSpec();
-  $o_795->name = 'src';
-  $o_795->mandatory_oneof = '[\'src\', \'srcdoc\']';
-  $o_796 = new UrlSpec();
-  $o_796->allowed_protocol = ['data', 'https'];
-  $o_796->allow_relative = true;
-  $o_795->value_url = $o_796;
-  $o_788->attrs[] = $o_795;
-  $o_797 = new AttrSpec();
-  $o_797->name = 'srcdoc';
-  $o_797->mandatory_oneof = '[\'src\', \'srcdoc\']';
-  $o_788->attrs[] = $o_797;
-  $o_788->attr_lists = ['extended-amp-global'];
   $o_788->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-iframe.html';
-  $o_798 = new AmpLayout();
-  $o_798->supported_layouts = [AmpLayoutLayout::FILL, AmpLayoutLayout::FIXED, AmpLayoutLayout::FIXED_HEIGHT, AmpLayoutLayout::FLEX_ITEM, AmpLayoutLayout::NODISPLAY, AmpLayoutLayout::RESPONSIVE];
-  $o_788->amp_layout = $o_798;
-  $o_788->disallowed_ancestor = ['head', 'amp-sidebar'];
-  $o_788->also_requires_tag = ['amp-iframe extension .js script'];
+  $o_793 = new CdataSpec();
+  $o_794 = new BlackListedCDataRegex();
+  $o_794->regex = '.';
+  $o_794->error_message = 'contents';
+  $o_793->blacklisted_cdata_regex[] = $o_794;
+  $o_788->cdata = $o_793;
   $o_0->tags[] = $o_788;
-  $o_799 = new TagSpec();
-  $o_799->tag_name = 'script';
-  $o_799->spec_name = 'amp-image-lightbox extension .js script';
-  $o_799->mandatory_parent = 'head';
+  $o_795 = new TagSpec();
+  $o_795->tag_name = 'amp-iframe';
+  $o_796 = new AttrSpec();
+  $o_796->name = 'allowfullscreen';
+  $o_796->value = '';
+  $o_795->attrs[] = $o_796;
+  $o_797 = new AttrSpec();
+  $o_797->name = 'allowtransparency';
+  $o_797->value = '';
+  $o_795->attrs[] = $o_797;
+  $o_798 = new AttrSpec();
+  $o_798->name = 'frameborder';
+  $o_798->value_regex = '0|1';
+  $o_795->attrs[] = $o_798;
+  $o_799 = new AttrSpec();
+  $o_799->name = 'resizable';
+  $o_799->value = '';
+  $o_795->attrs[] = $o_799;
   $o_800 = new AttrSpec();
-  $o_800->name = 'async';
-  $o_800->mandatory = true;
-  $o_800->value = '';
-  $o_799->attrs[] = $o_800;
+  $o_800->name = 'sandbox';
+  $o_795->attrs[] = $o_800;
   $o_801 = new AttrSpec();
-  $o_801->name = 'custom-element';
-  $o_801->mandatory = true;
-  $o_801->value = 'amp-image-lightbox';
-  $o_801->dispatch_key = true;
-  $o_799->attrs[] = $o_801;
+  $o_801->name = 'scrolling';
+  $o_801->value_regex = 'auto|yes|no';
+  $o_795->attrs[] = $o_801;
   $o_802 = new AttrSpec();
   $o_802->name = 'src';
-  $o_802->mandatory = true;
-  $o_802->value_regex = 'https://cdn\\.ampproject\\.org/v0/amp-image-lightbox-(latest|0\\.1).js';
-  $o_799->attrs[] = $o_802;
-  $o_803 = new AttrSpec();
-  $o_803->name = 'type';
-  $o_803->value = 'text/javascript';
-  $o_799->attrs[] = $o_803;
-  $o_799->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-image-lightbox.html';
-  $o_804 = new CdataSpec();
-  $o_805 = new BlackListedCDataRegex();
-  $o_805->regex = '.';
-  $o_805->error_message = 'contents';
-  $o_804->blacklisted_cdata_regex[] = $o_805;
-  $o_799->cdata = $o_804;
-  $o_0->tags[] = $o_799;
+  $o_802->mandatory_oneof = '[\'src\', \'srcdoc\']';
+  $o_803 = new UrlSpec();
+  $o_803->allowed_protocol = ['data', 'https'];
+  $o_803->allow_relative = true;
+  $o_802->value_url = $o_803;
+  $o_795->attrs[] = $o_802;
+  $o_804 = new AttrSpec();
+  $o_804->name = 'srcdoc';
+  $o_804->mandatory_oneof = '[\'src\', \'srcdoc\']';
+  $o_795->attrs[] = $o_804;
+  $o_795->attr_lists = ['extended-amp-global'];
+  $o_795->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-iframe.html';
+  $o_805 = new AmpLayout();
+  $o_805->supported_layouts = [AmpLayoutLayout::FILL, AmpLayoutLayout::FIXED, AmpLayoutLayout::FIXED_HEIGHT, AmpLayoutLayout::FLEX_ITEM, AmpLayoutLayout::NODISPLAY, AmpLayoutLayout::RESPONSIVE];
+  $o_795->amp_layout = $o_805;
+  $o_795->disallowed_ancestor = ['head', 'amp-sidebar'];
+  $o_795->also_requires_tag = ['amp-iframe extension .js script'];
+  $o_0->tags[] = $o_795;
   $o_806 = new TagSpec();
-  $o_806->tag_name = 'amp-image-lightbox';
+  $o_806->tag_name = 'script';
+  $o_806->spec_name = 'amp-image-lightbox extension .js script';
+  $o_806->mandatory_parent = 'head';
   $o_807 = new AttrSpec();
-  $o_807->name = 'controls';
+  $o_807->name = 'async';
+  $o_807->mandatory = true;
+  $o_807->value = '';
   $o_806->attrs[] = $o_807;
-  $o_806->attr_lists = ['extended-amp-global'];
+  $o_808 = new AttrSpec();
+  $o_808->name = 'custom-element';
+  $o_808->mandatory = true;
+  $o_808->value = 'amp-image-lightbox';
+  $o_808->dispatch_key = true;
+  $o_806->attrs[] = $o_808;
+  $o_809 = new AttrSpec();
+  $o_809->name = 'src';
+  $o_809->mandatory = true;
+  $o_809->value_regex = 'https://cdn\\.ampproject\\.org/v0/amp-image-lightbox-(latest|0\\.1).js';
+  $o_806->attrs[] = $o_809;
+  $o_810 = new AttrSpec();
+  $o_810->name = 'type';
+  $o_810->value = 'text/javascript';
+  $o_806->attrs[] = $o_810;
   $o_806->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-image-lightbox.html';
-  $o_808 = new AmpLayout();
-  $o_808->supported_layouts = [AmpLayoutLayout::NODISPLAY];
-  $o_806->amp_layout = $o_808;
-  $o_806->disallowed_ancestor = ['head', 'amp-sidebar'];
-  $o_806->also_requires_tag = ['amp-image-lightbox extension .js script'];
+  $o_811 = new CdataSpec();
+  $o_812 = new BlackListedCDataRegex();
+  $o_812->regex = '.';
+  $o_812->error_message = 'contents';
+  $o_811->blacklisted_cdata_regex[] = $o_812;
+  $o_806->cdata = $o_811;
   $o_0->tags[] = $o_806;
-  $o_809 = new TagSpec();
-  $o_809->tag_name = 'script';
-  $o_809->spec_name = 'amp-instagram extension .js script';
-  $o_809->mandatory_parent = 'head';
-  $o_810 = new AttrSpec();
-  $o_810->name = 'async';
-  $o_810->mandatory = true;
-  $o_810->value = '';
-  $o_809->attrs[] = $o_810;
-  $o_811 = new AttrSpec();
-  $o_811->name = 'custom-element';
-  $o_811->mandatory = true;
-  $o_811->value = 'amp-instagram';
-  $o_811->dispatch_key = true;
-  $o_809->attrs[] = $o_811;
-  $o_812 = new AttrSpec();
-  $o_812->name = 'src';
-  $o_812->mandatory = true;
-  $o_812->value_regex = 'https://cdn\\.ampproject\\.org/v0/amp-instagram-(latest|0\\.1).js';
-  $o_809->attrs[] = $o_812;
-  $o_813 = new AttrSpec();
-  $o_813->name = 'type';
-  $o_813->value = 'text/javascript';
-  $o_809->attrs[] = $o_813;
-  $o_809->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-instagram.html';
-  $o_814 = new CdataSpec();
-  $o_815 = new BlackListedCDataRegex();
-  $o_815->regex = '.';
-  $o_815->error_message = 'contents';
-  $o_814->blacklisted_cdata_regex[] = $o_815;
-  $o_809->cdata = $o_814;
-  $o_0->tags[] = $o_809;
+  $o_813 = new TagSpec();
+  $o_813->tag_name = 'amp-image-lightbox';
+  $o_814 = new AttrSpec();
+  $o_814->name = 'controls';
+  $o_813->attrs[] = $o_814;
+  $o_813->attr_lists = ['extended-amp-global'];
+  $o_813->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-image-lightbox.html';
+  $o_815 = new AmpLayout();
+  $o_815->supported_layouts = [AmpLayoutLayout::NODISPLAY];
+  $o_813->amp_layout = $o_815;
+  $o_813->disallowed_ancestor = ['head', 'amp-sidebar'];
+  $o_813->also_requires_tag = ['amp-image-lightbox extension .js script'];
+  $o_0->tags[] = $o_813;
   $o_816 = new TagSpec();
-  $o_816->tag_name = 'amp-instagram';
+  $o_816->tag_name = 'script';
+  $o_816->spec_name = 'amp-instagram extension .js script';
+  $o_816->mandatory_parent = 'head';
   $o_817 = new AttrSpec();
-  $o_817->name = 'alt';
+  $o_817->name = 'async';
+  $o_817->mandatory = true;
+  $o_817->value = '';
   $o_816->attrs[] = $o_817;
   $o_818 = new AttrSpec();
-  $o_818->name = 'data-shortcode';
-  $o_818->mandatory_oneof = '[\'data-shortcode\', \'src\']';
+  $o_818->name = 'custom-element';
+  $o_818->mandatory = true;
+  $o_818->value = 'amp-instagram';
+  $o_818->dispatch_key = true;
   $o_816->attrs[] = $o_818;
   $o_819 = new AttrSpec();
-  $o_819->name = 'shortcode';
-  $o_819->deprecation = 'data-shortcode';
-  $o_819->deprecation_url = 'https://www.ampproject.org/docs/reference/extended/amp-instagram.html';
-  $o_819->mandatory_oneof = '[\'data-shortcode\', \'src\']';
+  $o_819->name = 'src';
+  $o_819->mandatory = true;
+  $o_819->value_regex = 'https://cdn\\.ampproject\\.org/v0/amp-instagram-(latest|0\\.1).js';
   $o_816->attrs[] = $o_819;
   $o_820 = new AttrSpec();
-  $o_820->name = 'src';
-  $o_820->mandatory_oneof = '[\'data-shortcode\', \'src\']';
-  $o_821 = new UrlSpec();
-  $o_821->allowed_protocol = ['http', 'https'];
-  $o_821->allow_relative = true;
-  $o_820->value_url = $o_821;
+  $o_820->name = 'type';
+  $o_820->value = 'text/javascript';
   $o_816->attrs[] = $o_820;
-  $o_816->attr_lists = ['extended-amp-global'];
   $o_816->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-instagram.html';
-  $o_822 = new AmpLayout();
-  $o_822->supported_layouts = [AmpLayoutLayout::FILL, AmpLayoutLayout::FIXED, AmpLayoutLayout::FIXED_HEIGHT, AmpLayoutLayout::FLEX_ITEM, AmpLayoutLayout::NODISPLAY, AmpLayoutLayout::RESPONSIVE];
-  $o_816->amp_layout = $o_822;
-  $o_816->disallowed_ancestor = ['head', 'amp-sidebar'];
-  $o_816->also_requires_tag = ['amp-instagram extension .js script'];
+  $o_821 = new CdataSpec();
+  $o_822 = new BlackListedCDataRegex();
+  $o_822->regex = '.';
+  $o_822->error_message = 'contents';
+  $o_821->blacklisted_cdata_regex[] = $o_822;
+  $o_816->cdata = $o_821;
   $o_0->tags[] = $o_816;
   $o_823 = new TagSpec();
-  $o_823->tag_name = 'script';
-  $o_823->spec_name = 'amp-install-serviceworker extension .js script';
-  $o_823->mandatory_parent = 'head';
+  $o_823->tag_name = 'amp-instagram';
   $o_824 = new AttrSpec();
-  $o_824->name = 'async';
-  $o_824->mandatory = true;
-  $o_824->value = '';
+  $o_824->name = 'alt';
   $o_823->attrs[] = $o_824;
   $o_825 = new AttrSpec();
-  $o_825->name = 'custom-element';
-  $o_825->mandatory = true;
-  $o_825->value = 'amp-install-serviceworker';
-  $o_825->dispatch_key = true;
+  $o_825->name = 'data-shortcode';
+  $o_825->mandatory_oneof = '[\'data-shortcode\', \'src\']';
   $o_823->attrs[] = $o_825;
   $o_826 = new AttrSpec();
-  $o_826->name = 'src';
-  $o_826->mandatory = true;
-  $o_826->value_regex = 'https://cdn\\.ampproject\\.org/v0/amp-install-serviceworker-(latest|0\\.1).js';
+  $o_826->name = 'shortcode';
+  $o_826->deprecation = 'data-shortcode';
+  $o_826->deprecation_url = 'https://www.ampproject.org/docs/reference/extended/amp-instagram.html';
+  $o_826->mandatory_oneof = '[\'data-shortcode\', \'src\']';
   $o_823->attrs[] = $o_826;
   $o_827 = new AttrSpec();
-  $o_827->name = 'type';
-  $o_827->value = 'text/javascript';
+  $o_827->name = 'src';
+  $o_827->mandatory_oneof = '[\'data-shortcode\', \'src\']';
+  $o_828 = new UrlSpec();
+  $o_828->allowed_protocol = ['http', 'https'];
+  $o_828->allow_relative = true;
+  $o_827->value_url = $o_828;
   $o_823->attrs[] = $o_827;
-  $o_823->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-install-serviceworker.html';
-  $o_828 = new CdataSpec();
-  $o_829 = new BlackListedCDataRegex();
-  $o_829->regex = '.';
-  $o_829->error_message = 'contents';
-  $o_828->blacklisted_cdata_regex[] = $o_829;
-  $o_823->cdata = $o_828;
+  $o_823->attr_lists = ['extended-amp-global'];
+  $o_823->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-instagram.html';
+  $o_829 = new AmpLayout();
+  $o_829->supported_layouts = [AmpLayoutLayout::FILL, AmpLayoutLayout::FIXED, AmpLayoutLayout::FIXED_HEIGHT, AmpLayoutLayout::FLEX_ITEM, AmpLayoutLayout::NODISPLAY, AmpLayoutLayout::RESPONSIVE];
+  $o_823->amp_layout = $o_829;
+  $o_823->disallowed_ancestor = ['head', 'amp-sidebar'];
+  $o_823->also_requires_tag = ['amp-instagram extension .js script'];
   $o_0->tags[] = $o_823;
   $o_830 = new TagSpec();
-  $o_830->tag_name = 'amp-install-serviceworker';
+  $o_830->tag_name = 'script';
+  $o_830->spec_name = 'amp-install-serviceworker extension .js script';
+  $o_830->mandatory_parent = 'head';
   $o_831 = new AttrSpec();
-  $o_831->name = 'src';
+  $o_831->name = 'async';
   $o_831->mandatory = true;
-  $o_832 = new UrlSpec();
-  $o_832->allowed_protocol = ['https'];
-  $o_832->allow_relative = true;
-  $o_831->value_url = $o_832;
+  $o_831->value = '';
   $o_830->attrs[] = $o_831;
+  $o_832 = new AttrSpec();
+  $o_832->name = 'custom-element';
+  $o_832->mandatory = true;
+  $o_832->value = 'amp-install-serviceworker';
+  $o_832->dispatch_key = true;
+  $o_830->attrs[] = $o_832;
+  $o_833 = new AttrSpec();
+  $o_833->name = 'src';
+  $o_833->mandatory = true;
+  $o_833->value_regex = 'https://cdn\\.ampproject\\.org/v0/amp-install-serviceworker-(latest|0\\.1).js';
+  $o_830->attrs[] = $o_833;
+  $o_834 = new AttrSpec();
+  $o_834->name = 'type';
+  $o_834->value = 'text/javascript';
+  $o_830->attrs[] = $o_834;
   $o_830->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-install-serviceworker.html';
-  $o_833 = new AmpLayout();
-  $o_833->supported_layouts = [AmpLayoutLayout::NODISPLAY];
-  $o_830->amp_layout = $o_833;
-  $o_830->disallowed_ancestor = ['head', 'amp-sidebar'];
-  $o_830->also_requires_tag = ['amp-install-serviceworker extension .js script'];
+  $o_835 = new CdataSpec();
+  $o_836 = new BlackListedCDataRegex();
+  $o_836->regex = '.';
+  $o_836->error_message = 'contents';
+  $o_835->blacklisted_cdata_regex[] = $o_836;
+  $o_830->cdata = $o_835;
   $o_0->tags[] = $o_830;
-  $o_834 = new TagSpec();
-  $o_834->tag_name = 'script';
-  $o_834->spec_name = 'amp-jwplayer extension .js script';
-  $o_834->mandatory_parent = 'head';
-  $o_835 = new AttrSpec();
-  $o_835->name = 'async';
-  $o_835->mandatory = true;
-  $o_835->value = '';
-  $o_834->attrs[] = $o_835;
-  $o_836 = new AttrSpec();
-  $o_836->name = 'custom-element';
-  $o_836->mandatory = true;
-  $o_836->value = 'amp-jwplayer';
-  $o_836->dispatch_key = true;
-  $o_834->attrs[] = $o_836;
-  $o_837 = new AttrSpec();
-  $o_837->name = 'src';
-  $o_837->mandatory = true;
-  $o_837->value_regex = 'https://cdn\\.ampproject\\.org/v0/amp-jwplayer-(latest|0\\.1).js';
-  $o_834->attrs[] = $o_837;
+  $o_837 = new TagSpec();
+  $o_837->tag_name = 'amp-install-serviceworker';
   $o_838 = new AttrSpec();
-  $o_838->name = 'type';
-  $o_838->value = 'text/javascript';
-  $o_834->attrs[] = $o_838;
-  $o_834->spec_url = 'https://github.com/ampproject/amphtml/blob/master/extensions/amp-jwplayer/amp-jwplayer.md';
-  $o_839 = new CdataSpec();
-  $o_840 = new BlackListedCDataRegex();
-  $o_840->regex = '.';
-  $o_840->error_message = 'contents';
-  $o_839->blacklisted_cdata_regex[] = $o_840;
-  $o_834->cdata = $o_839;
-  $o_0->tags[] = $o_834;
+  $o_838->name = 'src';
+  $o_838->mandatory = true;
+  $o_839 = new UrlSpec();
+  $o_839->allowed_protocol = ['https'];
+  $o_839->allow_relative = true;
+  $o_838->value_url = $o_839;
+  $o_837->attrs[] = $o_838;
+  $o_837->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-install-serviceworker.html';
+  $o_840 = new AmpLayout();
+  $o_840->supported_layouts = [AmpLayoutLayout::NODISPLAY];
+  $o_837->amp_layout = $o_840;
+  $o_837->disallowed_ancestor = ['head', 'amp-sidebar'];
+  $o_837->also_requires_tag = ['amp-install-serviceworker extension .js script'];
+  $o_0->tags[] = $o_837;
   $o_841 = new TagSpec();
-  $o_841->tag_name = 'amp-jwplayer';
+  $o_841->tag_name = 'script';
+  $o_841->spec_name = 'amp-jwplayer extension .js script';
+  $o_841->mandatory_parent = 'head';
   $o_842 = new AttrSpec();
-  $o_842->name = 'data-media-id';
-  $o_842->value_regex_casei = '[0-9a-z]{8}';
-  $o_842->mandatory_oneof = 'data-media-id or data-playlist-id';
+  $o_842->name = 'async';
+  $o_842->mandatory = true;
+  $o_842->value = '';
   $o_841->attrs[] = $o_842;
   $o_843 = new AttrSpec();
-  $o_843->name = 'data-player-id';
+  $o_843->name = 'custom-element';
   $o_843->mandatory = true;
-  $o_843->value_regex_casei = '[0-9a-z]{8}';
+  $o_843->value = 'amp-jwplayer';
+  $o_843->dispatch_key = true;
   $o_841->attrs[] = $o_843;
   $o_844 = new AttrSpec();
-  $o_844->name = 'data-playlist-id';
-  $o_844->value_regex_casei = '[0-9a-z]{8}';
-  $o_844->mandatory_oneof = 'data-media-id or data-playlist-id';
+  $o_844->name = 'src';
+  $o_844->mandatory = true;
+  $o_844->value_regex = 'https://cdn\\.ampproject\\.org/v0/amp-jwplayer-(latest|0\\.1).js';
   $o_841->attrs[] = $o_844;
+  $o_845 = new AttrSpec();
+  $o_845->name = 'type';
+  $o_845->value = 'text/javascript';
+  $o_841->attrs[] = $o_845;
   $o_841->spec_url = 'https://github.com/ampproject/amphtml/blob/master/extensions/amp-jwplayer/amp-jwplayer.md';
-  $o_845 = new AmpLayout();
-  $o_845->supported_layouts = [AmpLayoutLayout::FILL, AmpLayoutLayout::FIXED, AmpLayoutLayout::FIXED_HEIGHT, AmpLayoutLayout::FLEX_ITEM, AmpLayoutLayout::NODISPLAY, AmpLayoutLayout::RESPONSIVE];
-  $o_841->amp_layout = $o_845;
-  $o_841->disallowed_ancestor = ['head', 'amp-sidebar'];
-  $o_841->also_requires_tag = ['amp-jwplayer extension .js script'];
+  $o_846 = new CdataSpec();
+  $o_847 = new BlackListedCDataRegex();
+  $o_847->regex = '.';
+  $o_847->error_message = 'contents';
+  $o_846->blacklisted_cdata_regex[] = $o_847;
+  $o_841->cdata = $o_846;
   $o_0->tags[] = $o_841;
-  $o_846 = new TagSpec();
-  $o_846->tag_name = 'script';
-  $o_846->spec_name = 'amp-kaltura-player extension .js script';
-  $o_846->mandatory_parent = 'head';
-  $o_847 = new AttrSpec();
-  $o_847->name = 'async';
-  $o_847->mandatory = true;
-  $o_847->value = '';
-  $o_846->attrs[] = $o_847;
-  $o_848 = new AttrSpec();
-  $o_848->name = 'custom-element';
-  $o_848->mandatory = true;
-  $o_848->value = 'amp-kaltura-player';
-  $o_848->dispatch_key = true;
-  $o_846->attrs[] = $o_848;
+  $o_848 = new TagSpec();
+  $o_848->tag_name = 'amp-jwplayer';
   $o_849 = new AttrSpec();
-  $o_849->name = 'src';
-  $o_849->mandatory = true;
-  $o_849->value_regex = 'https://cdn\\.ampproject\\.org/v0/amp-kaltura-player-(latest|0\\.1)\\.js';
-  $o_846->attrs[] = $o_849;
+  $o_849->name = 'data-media-id';
+  $o_849->value_regex_casei = '[0-9a-z]{8}';
+  $o_849->mandatory_oneof = 'data-media-id or data-playlist-id';
+  $o_848->attrs[] = $o_849;
   $o_850 = new AttrSpec();
-  $o_850->name = 'type';
-  $o_850->value = 'text/javascript';
-  $o_846->attrs[] = $o_850;
-  $o_846->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-kaltura-player.html';
-  $o_851 = new CdataSpec();
-  $o_852 = new BlackListedCDataRegex();
-  $o_852->regex = '.';
-  $o_852->error_message = 'contents';
-  $o_851->blacklisted_cdata_regex[] = $o_852;
-  $o_846->cdata = $o_851;
-  $o_0->tags[] = $o_846;
+  $o_850->name = 'data-player-id';
+  $o_850->mandatory = true;
+  $o_850->value_regex_casei = '[0-9a-z]{8}';
+  $o_848->attrs[] = $o_850;
+  $o_851 = new AttrSpec();
+  $o_851->name = 'data-playlist-id';
+  $o_851->value_regex_casei = '[0-9a-z]{8}';
+  $o_851->mandatory_oneof = 'data-media-id or data-playlist-id';
+  $o_848->attrs[] = $o_851;
+  $o_848->spec_url = 'https://github.com/ampproject/amphtml/blob/master/extensions/amp-jwplayer/amp-jwplayer.md';
+  $o_852 = new AmpLayout();
+  $o_852->supported_layouts = [AmpLayoutLayout::FILL, AmpLayoutLayout::FIXED, AmpLayoutLayout::FIXED_HEIGHT, AmpLayoutLayout::FLEX_ITEM, AmpLayoutLayout::NODISPLAY, AmpLayoutLayout::RESPONSIVE];
+  $o_848->amp_layout = $o_852;
+  $o_848->disallowed_ancestor = ['head', 'amp-sidebar'];
+  $o_848->also_requires_tag = ['amp-jwplayer extension .js script'];
+  $o_0->tags[] = $o_848;
   $o_853 = new TagSpec();
-  $o_853->tag_name = 'amp-kaltura-player';
+  $o_853->tag_name = 'script';
+  $o_853->spec_name = 'amp-kaltura-player extension .js script';
+  $o_853->mandatory_parent = 'head';
   $o_854 = new AttrSpec();
-  $o_854->name = 'data-partner';
+  $o_854->name = 'async';
   $o_854->mandatory = true;
+  $o_854->value = '';
   $o_853->attrs[] = $o_854;
-  $o_853->attr_lists = ['extended-amp-global'];
+  $o_855 = new AttrSpec();
+  $o_855->name = 'custom-element';
+  $o_855->mandatory = true;
+  $o_855->value = 'amp-kaltura-player';
+  $o_855->dispatch_key = true;
+  $o_853->attrs[] = $o_855;
+  $o_856 = new AttrSpec();
+  $o_856->name = 'src';
+  $o_856->mandatory = true;
+  $o_856->value_regex = 'https://cdn\\.ampproject\\.org/v0/amp-kaltura-player-(latest|0\\.1)\\.js';
+  $o_853->attrs[] = $o_856;
+  $o_857 = new AttrSpec();
+  $o_857->name = 'type';
+  $o_857->value = 'text/javascript';
+  $o_853->attrs[] = $o_857;
   $o_853->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-kaltura-player.html';
-  $o_855 = new AmpLayout();
-  $o_855->supported_layouts = [AmpLayoutLayout::FILL, AmpLayoutLayout::FIXED, AmpLayoutLayout::FIXED_HEIGHT, AmpLayoutLayout::FLEX_ITEM, AmpLayoutLayout::NODISPLAY, AmpLayoutLayout::RESPONSIVE];
-  $o_853->amp_layout = $o_855;
-  $o_853->disallowed_ancestor = ['head', 'amp-sidebar'];
-  $o_853->also_requires_tag = ['amp-kaltura-player extension .js script'];
+  $o_858 = new CdataSpec();
+  $o_859 = new BlackListedCDataRegex();
+  $o_859->regex = '.';
+  $o_859->error_message = 'contents';
+  $o_858->blacklisted_cdata_regex[] = $o_859;
+  $o_853->cdata = $o_858;
   $o_0->tags[] = $o_853;
-  $o_856 = new TagSpec();
-  $o_856->tag_name = 'script';
-  $o_856->spec_name = 'amp-lightbox extension .js script';
-  $o_856->mandatory_parent = 'head';
-  $o_857 = new AttrSpec();
-  $o_857->name = 'async';
-  $o_857->mandatory = true;
-  $o_857->value = '';
-  $o_856->attrs[] = $o_857;
-  $o_858 = new AttrSpec();
-  $o_858->name = 'custom-element';
-  $o_858->mandatory = true;
-  $o_858->value = 'amp-lightbox';
-  $o_858->dispatch_key = true;
-  $o_856->attrs[] = $o_858;
-  $o_859 = new AttrSpec();
-  $o_859->name = 'src';
-  $o_859->mandatory = true;
-  $o_859->value_regex = 'https://cdn\\.ampproject\\.org/v0/amp-lightbox-(latest|0\\.1).js';
-  $o_856->attrs[] = $o_859;
-  $o_860 = new AttrSpec();
-  $o_860->name = 'type';
-  $o_860->value = 'text/javascript';
-  $o_856->attrs[] = $o_860;
-  $o_856->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-lightbox.html';
-  $o_861 = new CdataSpec();
-  $o_862 = new BlackListedCDataRegex();
-  $o_862->regex = '.';
-  $o_862->error_message = 'contents';
-  $o_861->blacklisted_cdata_regex[] = $o_862;
-  $o_856->cdata = $o_861;
-  $o_0->tags[] = $o_856;
+  $o_860 = new TagSpec();
+  $o_860->tag_name = 'amp-kaltura-player';
+  $o_861 = new AttrSpec();
+  $o_861->name = 'data-partner';
+  $o_861->mandatory = true;
+  $o_860->attrs[] = $o_861;
+  $o_860->attr_lists = ['extended-amp-global'];
+  $o_860->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-kaltura-player.html';
+  $o_862 = new AmpLayout();
+  $o_862->supported_layouts = [AmpLayoutLayout::FILL, AmpLayoutLayout::FIXED, AmpLayoutLayout::FIXED_HEIGHT, AmpLayoutLayout::FLEX_ITEM, AmpLayoutLayout::NODISPLAY, AmpLayoutLayout::RESPONSIVE];
+  $o_860->amp_layout = $o_862;
+  $o_860->disallowed_ancestor = ['head', 'amp-sidebar'];
+  $o_860->also_requires_tag = ['amp-kaltura-player extension .js script'];
+  $o_0->tags[] = $o_860;
   $o_863 = new TagSpec();
-  $o_863->tag_name = 'amp-lightbox';
+  $o_863->tag_name = 'script';
+  $o_863->spec_name = 'amp-lightbox extension .js script';
+  $o_863->mandatory_parent = 'head';
   $o_864 = new AttrSpec();
-  $o_864->name = 'controls';
+  $o_864->name = 'async';
+  $o_864->mandatory = true;
+  $o_864->value = '';
   $o_863->attrs[] = $o_864;
   $o_865 = new AttrSpec();
-  $o_865->name = 'from';
+  $o_865->name = 'custom-element';
+  $o_865->mandatory = true;
+  $o_865->value = 'amp-lightbox';
+  $o_865->dispatch_key = true;
   $o_863->attrs[] = $o_865;
-  $o_863->attr_lists = ['extended-amp-global'];
+  $o_866 = new AttrSpec();
+  $o_866->name = 'src';
+  $o_866->mandatory = true;
+  $o_866->value_regex = 'https://cdn\\.ampproject\\.org/v0/amp-lightbox-(latest|0\\.1).js';
+  $o_863->attrs[] = $o_866;
+  $o_867 = new AttrSpec();
+  $o_867->name = 'type';
+  $o_867->value = 'text/javascript';
+  $o_863->attrs[] = $o_867;
   $o_863->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-lightbox.html';
-  $o_866 = new AmpLayout();
-  $o_866->supported_layouts = [AmpLayoutLayout::NODISPLAY];
-  $o_863->amp_layout = $o_866;
-  $o_863->disallowed_ancestor = ['head', 'amp-sidebar'];
-  $o_863->also_requires_tag = ['amp-lightbox extension .js script'];
+  $o_868 = new CdataSpec();
+  $o_869 = new BlackListedCDataRegex();
+  $o_869->regex = '.';
+  $o_869->error_message = 'contents';
+  $o_868->blacklisted_cdata_regex[] = $o_869;
+  $o_863->cdata = $o_868;
   $o_0->tags[] = $o_863;
-  $o_867 = new TagSpec();
-  $o_867->tag_name = 'script';
-  $o_867->spec_name = 'amp-list extension .js script';
-  $o_867->mandatory_parent = 'head';
-  $o_868 = new AttrSpec();
-  $o_868->name = 'async';
-  $o_868->mandatory = true;
-  $o_868->value = '';
-  $o_867->attrs[] = $o_868;
-  $o_869 = new AttrSpec();
-  $o_869->name = 'custom-element';
-  $o_869->mandatory = true;
-  $o_869->value = 'amp-list';
-  $o_869->dispatch_key = true;
-  $o_867->attrs[] = $o_869;
-  $o_870 = new AttrSpec();
-  $o_870->name = 'src';
-  $o_870->mandatory = true;
-  $o_870->value_regex = 'https://cdn\\.ampproject\\.org/v0/amp-list-(latest|0\\.1).js';
-  $o_867->attrs[] = $o_870;
+  $o_870 = new TagSpec();
+  $o_870->tag_name = 'amp-lightbox';
   $o_871 = new AttrSpec();
-  $o_871->name = 'type';
-  $o_871->value = 'text/javascript';
-  $o_867->attrs[] = $o_871;
-  $o_867->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-list.html';
-  $o_872 = new CdataSpec();
-  $o_873 = new BlackListedCDataRegex();
-  $o_873->regex = '.';
-  $o_873->error_message = 'contents';
-  $o_872->blacklisted_cdata_regex[] = $o_873;
-  $o_867->cdata = $o_872;
-  $o_0->tags[] = $o_867;
+  $o_871->name = 'controls';
+  $o_870->attrs[] = $o_871;
+  $o_872 = new AttrSpec();
+  $o_872->name = 'from';
+  $o_870->attrs[] = $o_872;
+  $o_870->attr_lists = ['extended-amp-global'];
+  $o_870->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-lightbox.html';
+  $o_873 = new AmpLayout();
+  $o_873->supported_layouts = [AmpLayoutLayout::NODISPLAY];
+  $o_870->amp_layout = $o_873;
+  $o_870->disallowed_ancestor = ['head', 'amp-sidebar'];
+  $o_870->also_requires_tag = ['amp-lightbox extension .js script'];
+  $o_0->tags[] = $o_870;
   $o_874 = new TagSpec();
-  $o_874->tag_name = 'amp-list';
+  $o_874->tag_name = 'script';
+  $o_874->spec_name = 'amp-list extension .js script';
+  $o_874->mandatory_parent = 'head';
   $o_875 = new AttrSpec();
-  $o_875->name = 'credentials';
+  $o_875->name = 'async';
+  $o_875->mandatory = true;
+  $o_875->value = '';
   $o_874->attrs[] = $o_875;
   $o_876 = new AttrSpec();
-  $o_876->name = 'src';
+  $o_876->name = 'custom-element';
   $o_876->mandatory = true;
-  $o_877 = new UrlSpec();
-  $o_877->allowed_protocol = ['https'];
-  $o_877->allow_relative = true;
-  $o_876->value_url = $o_877;
+  $o_876->value = 'amp-list';
+  $o_876->dispatch_key = true;
   $o_874->attrs[] = $o_876;
+  $o_877 = new AttrSpec();
+  $o_877->name = 'src';
+  $o_877->mandatory = true;
+  $o_877->value_regex = 'https://cdn\\.ampproject\\.org/v0/amp-list-(latest|0\\.1).js';
+  $o_874->attrs[] = $o_877;
   $o_878 = new AttrSpec();
-  $o_878->name = 'template';
+  $o_878->name = 'type';
+  $o_878->value = 'text/javascript';
   $o_874->attrs[] = $o_878;
-  $o_874->attr_lists = ['extended-amp-global'];
   $o_874->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-list.html';
-  $o_879 = new AmpLayout();
-  $o_879->supported_layouts = [AmpLayoutLayout::FILL, AmpLayoutLayout::FIXED, AmpLayoutLayout::FIXED_HEIGHT, AmpLayoutLayout::FLEX_ITEM, AmpLayoutLayout::NODISPLAY, AmpLayoutLayout::RESPONSIVE];
-  $o_874->amp_layout = $o_879;
-  $o_874->disallowed_ancestor = ['head', 'amp-sidebar'];
-  $o_874->also_requires_tag = ['amp-list extension .js script'];
+  $o_879 = new CdataSpec();
+  $o_880 = new BlackListedCDataRegex();
+  $o_880->regex = '.';
+  $o_880->error_message = 'contents';
+  $o_879->blacklisted_cdata_regex[] = $o_880;
+  $o_874->cdata = $o_879;
   $o_0->tags[] = $o_874;
-  $o_880 = new TagSpec();
-  $o_880->tag_name = 'script';
-  $o_880->spec_name = 'amp-mustache extension .js script';
-  $o_880->mandatory_parent = 'head';
-  $o_881 = new AttrSpec();
-  $o_881->name = 'async';
-  $o_881->mandatory = true;
-  $o_881->value = '';
-  $o_880->attrs[] = $o_881;
+  $o_881 = new TagSpec();
+  $o_881->tag_name = 'amp-list';
   $o_882 = new AttrSpec();
-  $o_882->name = 'custom-template';
-  $o_882->mandatory = true;
-  $o_882->value = 'amp-mustache';
-  $o_882->dispatch_key = true;
-  $o_880->attrs[] = $o_882;
+  $o_882->name = 'credentials';
+  $o_881->attrs[] = $o_882;
   $o_883 = new AttrSpec();
   $o_883->name = 'src';
   $o_883->mandatory = true;
-  $o_883->value_regex = 'https://cdn\\.ampproject\\.org/v0/amp-mustache-(latest|0\\.1).js';
-  $o_880->attrs[] = $o_883;
-  $o_884 = new AttrSpec();
-  $o_884->name = 'type';
-  $o_884->value = 'text/javascript';
-  $o_880->attrs[] = $o_884;
-  $o_880->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-mustache.html';
-  $o_885 = new CdataSpec();
-  $o_886 = new BlackListedCDataRegex();
-  $o_886->regex = '.';
-  $o_886->error_message = 'contents';
-  $o_885->blacklisted_cdata_regex[] = $o_886;
-  $o_880->cdata = $o_885;
-  $o_0->tags[] = $o_880;
+  $o_884 = new UrlSpec();
+  $o_884->allowed_protocol = ['https'];
+  $o_884->allow_relative = true;
+  $o_883->value_url = $o_884;
+  $o_881->attrs[] = $o_883;
+  $o_885 = new AttrSpec();
+  $o_885->name = 'template';
+  $o_881->attrs[] = $o_885;
+  $o_881->attr_lists = ['extended-amp-global'];
+  $o_881->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-list.html';
+  $o_886 = new AmpLayout();
+  $o_886->supported_layouts = [AmpLayoutLayout::FILL, AmpLayoutLayout::FIXED, AmpLayoutLayout::FIXED_HEIGHT, AmpLayoutLayout::FLEX_ITEM, AmpLayoutLayout::NODISPLAY, AmpLayoutLayout::RESPONSIVE];
+  $o_881->amp_layout = $o_886;
+  $o_881->disallowed_ancestor = ['head', 'amp-sidebar'];
+  $o_881->also_requires_tag = ['amp-list extension .js script'];
+  $o_0->tags[] = $o_881;
   $o_887 = new TagSpec();
-  $o_887->tag_name = 'template';
+  $o_887->tag_name = 'script';
+  $o_887->spec_name = 'amp-mustache extension .js script';
+  $o_887->mandatory_parent = 'head';
   $o_888 = new AttrSpec();
-  $o_888->name = 'type';
+  $o_888->name = 'async';
   $o_888->mandatory = true;
-  $o_888->value = 'amp-mustache';
+  $o_888->value = '';
   $o_887->attrs[] = $o_888;
-  $o_887->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-mustache.html';
-  $o_887->disallowed_ancestor = ['template'];
-  $o_887->also_requires_tag = ['amp-mustache extension .js script'];
-  $o_0->tags[] = $o_887;
-  $o_889 = new TagSpec();
-  $o_889->tag_name = 'script';
-  $o_889->spec_name = 'amp-pinterest extension .js script';
-  $o_889->mandatory_parent = 'head';
+  $o_889 = new AttrSpec();
+  $o_889->name = 'custom-template';
+  $o_889->mandatory = true;
+  $o_889->value = 'amp-mustache';
+  $o_889->dispatch_key = true;
+  $o_887->attrs[] = $o_889;
   $o_890 = new AttrSpec();
-  $o_890->name = 'async';
+  $o_890->name = 'src';
   $o_890->mandatory = true;
-  $o_890->value = '';
-  $o_889->attrs[] = $o_890;
+  $o_890->value_regex = 'https://cdn\\.ampproject\\.org/v0/amp-mustache-(latest|0\\.1).js';
+  $o_887->attrs[] = $o_890;
   $o_891 = new AttrSpec();
-  $o_891->name = 'custom-element';
-  $o_891->mandatory = true;
-  $o_891->value = 'amp-pinterest';
-  $o_891->dispatch_key = true;
-  $o_889->attrs[] = $o_891;
-  $o_892 = new AttrSpec();
-  $o_892->name = 'src';
-  $o_892->mandatory = true;
-  $o_892->value_regex = 'https://cdn\\.ampproject\\.org/v0/amp-pinterest-(latest|0\\.1).js';
-  $o_889->attrs[] = $o_892;
-  $o_893 = new AttrSpec();
-  $o_893->name = 'type';
-  $o_893->value = 'text/javascript';
-  $o_889->attrs[] = $o_893;
-  $o_889->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-pinterest.html';
-  $o_894 = new CdataSpec();
-  $o_895 = new BlackListedCDataRegex();
-  $o_895->regex = '.';
-  $o_895->error_message = 'contents';
-  $o_894->blacklisted_cdata_regex[] = $o_895;
-  $o_889->cdata = $o_894;
-  $o_0->tags[] = $o_889;
+  $o_891->name = 'type';
+  $o_891->value = 'text/javascript';
+  $o_887->attrs[] = $o_891;
+  $o_887->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-mustache.html';
+  $o_892 = new CdataSpec();
+  $o_893 = new BlackListedCDataRegex();
+  $o_893->regex = '.';
+  $o_893->error_message = 'contents';
+  $o_892->blacklisted_cdata_regex[] = $o_893;
+  $o_887->cdata = $o_892;
+  $o_0->tags[] = $o_887;
+  $o_894 = new TagSpec();
+  $o_894->tag_name = 'template';
+  $o_895 = new AttrSpec();
+  $o_895->name = 'type';
+  $o_895->mandatory = true;
+  $o_895->value = 'amp-mustache';
+  $o_894->attrs[] = $o_895;
+  $o_894->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-mustache.html';
+  $o_894->disallowed_ancestor = ['template'];
+  $o_894->also_requires_tag = ['amp-mustache extension .js script'];
+  $o_0->tags[] = $o_894;
   $o_896 = new TagSpec();
-  $o_896->tag_name = 'amp-pinterest';
+  $o_896->tag_name = 'script';
+  $o_896->spec_name = 'amp-pinterest extension .js script';
+  $o_896->mandatory_parent = 'head';
   $o_897 = new AttrSpec();
-  $o_897->name = 'data-do';
+  $o_897->name = 'async';
   $o_897->mandatory = true;
+  $o_897->value = '';
   $o_896->attrs[] = $o_897;
-  $o_896->attr_lists = ['extended-amp-global'];
+  $o_898 = new AttrSpec();
+  $o_898->name = 'custom-element';
+  $o_898->mandatory = true;
+  $o_898->value = 'amp-pinterest';
+  $o_898->dispatch_key = true;
+  $o_896->attrs[] = $o_898;
+  $o_899 = new AttrSpec();
+  $o_899->name = 'src';
+  $o_899->mandatory = true;
+  $o_899->value_regex = 'https://cdn\\.ampproject\\.org/v0/amp-pinterest-(latest|0\\.1).js';
+  $o_896->attrs[] = $o_899;
+  $o_900 = new AttrSpec();
+  $o_900->name = 'type';
+  $o_900->value = 'text/javascript';
+  $o_896->attrs[] = $o_900;
   $o_896->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-pinterest.html';
-  $o_898 = new AmpLayout();
-  $o_898->supported_layouts = [AmpLayoutLayout::FILL, AmpLayoutLayout::FIXED, AmpLayoutLayout::FIXED_HEIGHT, AmpLayoutLayout::FLEX_ITEM, AmpLayoutLayout::NODISPLAY, AmpLayoutLayout::RESPONSIVE];
-  $o_896->amp_layout = $o_898;
-  $o_896->disallowed_ancestor = ['head', 'amp-sidebar'];
-  $o_896->also_requires_tag = ['amp-pinterest extension .js script'];
+  $o_901 = new CdataSpec();
+  $o_902 = new BlackListedCDataRegex();
+  $o_902->regex = '.';
+  $o_902->error_message = 'contents';
+  $o_901->blacklisted_cdata_regex[] = $o_902;
+  $o_896->cdata = $o_901;
   $o_0->tags[] = $o_896;
-  $o_899 = new TagSpec();
-  $o_899->tag_name = 'script';
-  $o_899->spec_name = 'amp-reach-player extension .js script';
-  $o_899->mandatory_parent = 'head';
-  $o_900 = new AttrSpec();
-  $o_900->name = 'async';
-  $o_900->mandatory = true;
-  $o_900->value = '';
-  $o_899->attrs[] = $o_900;
-  $o_901 = new AttrSpec();
-  $o_901->name = 'custom-element';
-  $o_901->mandatory = true;
-  $o_901->value = 'amp-reach-player';
-  $o_901->dispatch_key = true;
-  $o_899->attrs[] = $o_901;
-  $o_902 = new AttrSpec();
-  $o_902->name = 'src';
-  $o_902->mandatory = true;
-  $o_902->value_regex = 'https://cdn\\.ampproject\\.org/v0/amp-reach-player-(latest|0\\.1).js';
-  $o_899->attrs[] = $o_902;
-  $o_903 = new AttrSpec();
-  $o_903->name = 'type';
-  $o_903->value = 'text/javascript';
-  $o_899->attrs[] = $o_903;
-  $o_904 = new CdataSpec();
-  $o_905 = new BlackListedCDataRegex();
-  $o_905->regex = '.';
-  $o_905->error_message = 'contents';
-  $o_904->blacklisted_cdata_regex[] = $o_905;
-  $o_899->cdata = $o_904;
-  $o_0->tags[] = $o_899;
+  $o_903 = new TagSpec();
+  $o_903->tag_name = 'amp-pinterest';
+  $o_904 = new AttrSpec();
+  $o_904->name = 'data-do';
+  $o_904->mandatory = true;
+  $o_903->attrs[] = $o_904;
+  $o_903->attr_lists = ['extended-amp-global'];
+  $o_903->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-pinterest.html';
+  $o_905 = new AmpLayout();
+  $o_905->supported_layouts = [AmpLayoutLayout::FILL, AmpLayoutLayout::FIXED, AmpLayoutLayout::FIXED_HEIGHT, AmpLayoutLayout::FLEX_ITEM, AmpLayoutLayout::NODISPLAY, AmpLayoutLayout::RESPONSIVE];
+  $o_903->amp_layout = $o_905;
+  $o_903->disallowed_ancestor = ['head', 'amp-sidebar'];
+  $o_903->also_requires_tag = ['amp-pinterest extension .js script'];
+  $o_0->tags[] = $o_903;
   $o_906 = new TagSpec();
-  $o_906->tag_name = 'amp-reach-player';
+  $o_906->tag_name = 'script';
+  $o_906->spec_name = 'amp-reach-player extension .js script';
+  $o_906->mandatory_parent = 'head';
   $o_907 = new AttrSpec();
-  $o_907->name = 'data-embed-id';
+  $o_907->name = 'async';
   $o_907->mandatory = true;
-  $o_907->value_regex = '[0-9a-z-]+';
+  $o_907->value = '';
   $o_906->attrs[] = $o_907;
-  $o_906->attr_lists = ['extended-amp-global'];
-  $o_908 = new AmpLayout();
-  $o_908->supported_layouts = [AmpLayoutLayout::FILL, AmpLayoutLayout::FIXED, AmpLayoutLayout::FIXED_HEIGHT, AmpLayoutLayout::FLEX_ITEM, AmpLayoutLayout::RESPONSIVE];
-  $o_906->amp_layout = $o_908;
-  $o_906->disallowed_ancestor = ['head', 'amp-sidebar'];
-  $o_906->also_requires_tag = ['amp-reach-player extension .js script'];
-  $o_0->tags[] = $o_906;
-  $o_909 = new TagSpec();
-  $o_909->tag_name = 'script';
-  $o_909->spec_name = 'amp-sidebar extension .js script';
-  $o_909->mandatory_parent = 'head';
+  $o_908 = new AttrSpec();
+  $o_908->name = 'custom-element';
+  $o_908->mandatory = true;
+  $o_908->value = 'amp-reach-player';
+  $o_908->dispatch_key = true;
+  $o_906->attrs[] = $o_908;
+  $o_909 = new AttrSpec();
+  $o_909->name = 'src';
+  $o_909->mandatory = true;
+  $o_909->value_regex = 'https://cdn\\.ampproject\\.org/v0/amp-reach-player-(latest|0\\.1).js';
+  $o_906->attrs[] = $o_909;
   $o_910 = new AttrSpec();
-  $o_910->name = 'async';
-  $o_910->mandatory = true;
-  $o_910->value = '';
-  $o_909->attrs[] = $o_910;
-  $o_911 = new AttrSpec();
-  $o_911->name = 'custom-element';
-  $o_911->mandatory = true;
-  $o_911->value = 'amp-sidebar';
-  $o_911->dispatch_key = true;
-  $o_909->attrs[] = $o_911;
-  $o_912 = new AttrSpec();
-  $o_912->name = 'src';
-  $o_912->mandatory = true;
-  $o_912->value_regex = 'https://cdn\\.ampproject\\.org/v0/amp-sidebar-(latest|0\\.1).js';
-  $o_909->attrs[] = $o_912;
-  $o_913 = new AttrSpec();
-  $o_913->name = 'type';
-  $o_913->value = 'text/javascript';
-  $o_909->attrs[] = $o_913;
-  $o_909->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-sidebar.html';
-  $o_914 = new CdataSpec();
-  $o_915 = new BlackListedCDataRegex();
-  $o_915->regex = '.';
-  $o_915->error_message = 'contents';
-  $o_914->blacklisted_cdata_regex[] = $o_915;
-  $o_909->cdata = $o_914;
-  $o_0->tags[] = $o_909;
+  $o_910->name = 'type';
+  $o_910->value = 'text/javascript';
+  $o_906->attrs[] = $o_910;
+  $o_911 = new CdataSpec();
+  $o_912 = new BlackListedCDataRegex();
+  $o_912->regex = '.';
+  $o_912->error_message = 'contents';
+  $o_911->blacklisted_cdata_regex[] = $o_912;
+  $o_906->cdata = $o_911;
+  $o_0->tags[] = $o_906;
+  $o_913 = new TagSpec();
+  $o_913->tag_name = 'amp-reach-player';
+  $o_914 = new AttrSpec();
+  $o_914->name = 'data-embed-id';
+  $o_914->mandatory = true;
+  $o_914->value_regex = '[0-9a-z-]+';
+  $o_913->attrs[] = $o_914;
+  $o_913->attr_lists = ['extended-amp-global'];
+  $o_915 = new AmpLayout();
+  $o_915->supported_layouts = [AmpLayoutLayout::FILL, AmpLayoutLayout::FIXED, AmpLayoutLayout::FIXED_HEIGHT, AmpLayoutLayout::FLEX_ITEM, AmpLayoutLayout::RESPONSIVE];
+  $o_913->amp_layout = $o_915;
+  $o_913->disallowed_ancestor = ['head', 'amp-sidebar'];
+  $o_913->also_requires_tag = ['amp-reach-player extension .js script'];
+  $o_0->tags[] = $o_913;
   $o_916 = new TagSpec();
-  $o_916->tag_name = 'amp-sidebar';
-  $o_916->unique = true;
-  $o_916->mandatory_parent = 'body';
+  $o_916->tag_name = 'script';
+  $o_916->spec_name = 'amp-sidebar extension .js script';
+  $o_916->mandatory_parent = 'head';
   $o_917 = new AttrSpec();
-  $o_917->name = 'side';
-  $o_917->value_regex = '(left|right)';
+  $o_917->name = 'async';
+  $o_917->mandatory = true;
+  $o_917->value = '';
   $o_916->attrs[] = $o_917;
-  $o_916->attr_lists = ['extended-amp-global'];
-  $o_916->spec_url = 'https://github.com/ampproject/amphtml/blob/master/extensions/amp-sidebar/amp-sidebar.md';
-  $o_918 = new AmpLayout();
-  $o_918->supported_layouts = [AmpLayoutLayout::NODISPLAY];
-  $o_916->amp_layout = $o_918;
-  $o_916->disallowed_ancestor = ['head', 'amp-sidebar'];
-  $o_916->also_requires_tag = ['amp-sidebar extension .js script'];
-  $o_0->tags[] = $o_916;
-  $o_919 = new TagSpec();
-  $o_919->tag_name = 'script';
-  $o_919->spec_name = 'amp-slides extension .js script';
-  $o_919->mandatory_parent = 'head';
+  $o_918 = new AttrSpec();
+  $o_918->name = 'custom-element';
+  $o_918->mandatory = true;
+  $o_918->value = 'amp-sidebar';
+  $o_918->dispatch_key = true;
+  $o_916->attrs[] = $o_918;
+  $o_919 = new AttrSpec();
+  $o_919->name = 'src';
+  $o_919->mandatory = true;
+  $o_919->value_regex = 'https://cdn\\.ampproject\\.org/v0/amp-sidebar-(latest|0\\.1).js';
+  $o_916->attrs[] = $o_919;
   $o_920 = new AttrSpec();
-  $o_920->name = 'async';
-  $o_920->mandatory = true;
-  $o_920->value = '';
-  $o_919->attrs[] = $o_920;
-  $o_921 = new AttrSpec();
-  $o_921->name = 'custom-element';
-  $o_921->mandatory = true;
-  $o_921->value = 'amp-slides';
-  $o_921->dispatch_key = true;
-  $o_919->attrs[] = $o_921;
-  $o_922 = new AttrSpec();
-  $o_922->name = 'src';
-  $o_922->mandatory = true;
-  $o_922->value_regex = 'https://cdn\\.ampproject\\.org/v0/amp-slides-(latest|0\\.1).js';
-  $o_919->attrs[] = $o_922;
-  $o_923 = new AttrSpec();
-  $o_923->name = 'type';
-  $o_923->value = 'text/javascript';
-  $o_919->attrs[] = $o_923;
-  $o_919->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-slides.html';
-  $o_924 = new CdataSpec();
-  $o_925 = new BlackListedCDataRegex();
-  $o_925->regex = '.';
-  $o_925->error_message = 'contents';
-  $o_924->blacklisted_cdata_regex[] = $o_925;
-  $o_919->cdata = $o_924;
-  $o_0->tags[] = $o_919;
+  $o_920->name = 'type';
+  $o_920->value = 'text/javascript';
+  $o_916->attrs[] = $o_920;
+  $o_916->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-sidebar.html';
+  $o_921 = new CdataSpec();
+  $o_922 = new BlackListedCDataRegex();
+  $o_922->regex = '.';
+  $o_922->error_message = 'contents';
+  $o_921->blacklisted_cdata_regex[] = $o_922;
+  $o_916->cdata = $o_921;
+  $o_0->tags[] = $o_916;
+  $o_923 = new TagSpec();
+  $o_923->tag_name = 'amp-sidebar';
+  $o_923->unique = true;
+  $o_923->mandatory_parent = 'body';
+  $o_924 = new AttrSpec();
+  $o_924->name = 'side';
+  $o_924->value_regex = '(left|right)';
+  $o_923->attrs[] = $o_924;
+  $o_923->attr_lists = ['extended-amp-global'];
+  $o_923->spec_url = 'https://github.com/ampproject/amphtml/blob/master/extensions/amp-sidebar/amp-sidebar.md';
+  $o_925 = new AmpLayout();
+  $o_925->supported_layouts = [AmpLayoutLayout::NODISPLAY];
+  $o_923->amp_layout = $o_925;
+  $o_923->disallowed_ancestor = ['head', 'amp-sidebar'];
+  $o_923->also_requires_tag = ['amp-sidebar extension .js script'];
+  $o_0->tags[] = $o_923;
   $o_926 = new TagSpec();
   $o_926->tag_name = 'script';
-  $o_926->spec_name = 'amp-social-share extension .js script';
+  $o_926->spec_name = 'amp-slides extension .js script';
   $o_926->mandatory_parent = 'head';
   $o_927 = new AttrSpec();
   $o_927->name = 'async';
@@ -3948,19 +3948,19 @@ public static function createValidationRules() {
   $o_928 = new AttrSpec();
   $o_928->name = 'custom-element';
   $o_928->mandatory = true;
-  $o_928->value = 'amp-social-share';
+  $o_928->value = 'amp-slides';
   $o_928->dispatch_key = true;
   $o_926->attrs[] = $o_928;
   $o_929 = new AttrSpec();
   $o_929->name = 'src';
   $o_929->mandatory = true;
-  $o_929->value_regex = 'https://cdn\\.ampproject\\.org/v0/amp-social-share-(latest|0\\.1)\\.js';
+  $o_929->value_regex = 'https://cdn\\.ampproject\\.org/v0/amp-slides-(latest|0\\.1).js';
   $o_926->attrs[] = $o_929;
   $o_930 = new AttrSpec();
   $o_930->name = 'type';
   $o_930->value = 'text/javascript';
   $o_926->attrs[] = $o_930;
-  $o_926->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-social-share.html';
+  $o_926->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-slides.html';
   $o_931 = new CdataSpec();
   $o_932 = new BlackListedCDataRegex();
   $o_932->regex = '.';
@@ -3969,510 +3969,517 @@ public static function createValidationRules() {
   $o_926->cdata = $o_931;
   $o_0->tags[] = $o_926;
   $o_933 = new TagSpec();
-  $o_933->tag_name = 'amp-social-share';
+  $o_933->tag_name = 'script';
+  $o_933->spec_name = 'amp-social-share extension .js script';
+  $o_933->mandatory_parent = 'head';
   $o_934 = new AttrSpec();
-  $o_934->name = 'type';
+  $o_934->name = 'async';
   $o_934->mandatory = true;
+  $o_934->value = '';
   $o_933->attrs[] = $o_934;
   $o_935 = new AttrSpec();
-  $o_935->name = 'data-share-endpoint';
-  $o_936 = new UrlSpec();
-  $o_936->allowed_protocol = ['ftp', 'http', 'https', 'mailto', 'fb-messenger', 'snapchat', 'sms', 'tel', 'viber', 'whatsapp'];
-  $o_936->allow_relative = false;
-  $o_935->value_url = $o_936;
+  $o_935->name = 'custom-element';
+  $o_935->mandatory = true;
+  $o_935->value = 'amp-social-share';
+  $o_935->dispatch_key = true;
   $o_933->attrs[] = $o_935;
-  $o_933->attr_lists = ['extended-amp-global'];
+  $o_936 = new AttrSpec();
+  $o_936->name = 'src';
+  $o_936->mandatory = true;
+  $o_936->value_regex = 'https://cdn\\.ampproject\\.org/v0/amp-social-share-(latest|0\\.1)\\.js';
+  $o_933->attrs[] = $o_936;
+  $o_937 = new AttrSpec();
+  $o_937->name = 'type';
+  $o_937->value = 'text/javascript';
+  $o_933->attrs[] = $o_937;
   $o_933->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-social-share.html';
-  $o_937 = new AmpLayout();
-  $o_937->supported_layouts = [AmpLayoutLayout::CONTAINER, AmpLayoutLayout::FILL, AmpLayoutLayout::FIXED, AmpLayoutLayout::FIXED_HEIGHT, AmpLayoutLayout::FLEX_ITEM, AmpLayoutLayout::NODISPLAY, AmpLayoutLayout::RESPONSIVE];
-  $o_933->amp_layout = $o_937;
-  $o_933->disallowed_ancestor = ['head', 'amp-sidebar'];
-  $o_933->also_requires_tag = ['amp-social-share extension .js script'];
+  $o_938 = new CdataSpec();
+  $o_939 = new BlackListedCDataRegex();
+  $o_939->regex = '.';
+  $o_939->error_message = 'contents';
+  $o_938->blacklisted_cdata_regex[] = $o_939;
+  $o_933->cdata = $o_938;
   $o_0->tags[] = $o_933;
-  $o_938 = new TagSpec();
-  $o_938->tag_name = 'script';
-  $o_938->spec_name = 'amp-soundcloud extension .js script';
-  $o_938->mandatory_parent = 'head';
-  $o_939 = new AttrSpec();
-  $o_939->name = 'async';
-  $o_939->mandatory = true;
-  $o_939->value = '';
-  $o_938->attrs[] = $o_939;
-  $o_940 = new AttrSpec();
-  $o_940->name = 'custom-element';
-  $o_940->mandatory = true;
-  $o_940->value = 'amp-soundcloud';
-  $o_940->dispatch_key = true;
-  $o_938->attrs[] = $o_940;
+  $o_940 = new TagSpec();
+  $o_940->tag_name = 'amp-social-share';
   $o_941 = new AttrSpec();
-  $o_941->name = 'src';
+  $o_941->name = 'type';
   $o_941->mandatory = true;
-  $o_941->value_regex = 'https://cdn\\.ampproject\\.org/v0/amp-soundcloud-(latest|0\\.1)\\.js';
-  $o_938->attrs[] = $o_941;
+  $o_940->attrs[] = $o_941;
   $o_942 = new AttrSpec();
-  $o_942->name = 'type';
-  $o_942->value = 'text/javascript';
-  $o_938->attrs[] = $o_942;
-  $o_938->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-soundcloud.html';
-  $o_943 = new CdataSpec();
-  $o_944 = new BlackListedCDataRegex();
-  $o_944->regex = '.';
-  $o_944->error_message = 'contents';
-  $o_943->blacklisted_cdata_regex[] = $o_944;
-  $o_938->cdata = $o_943;
-  $o_0->tags[] = $o_938;
+  $o_942->name = 'data-share-endpoint';
+  $o_943 = new UrlSpec();
+  $o_943->allowed_protocol = ['ftp', 'http', 'https', 'mailto', 'fb-messenger', 'snapchat', 'sms', 'tel', 'viber', 'whatsapp'];
+  $o_943->allow_relative = false;
+  $o_942->value_url = $o_943;
+  $o_940->attrs[] = $o_942;
+  $o_940->attr_lists = ['extended-amp-global'];
+  $o_940->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-social-share.html';
+  $o_944 = new AmpLayout();
+  $o_944->supported_layouts = [AmpLayoutLayout::CONTAINER, AmpLayoutLayout::FILL, AmpLayoutLayout::FIXED, AmpLayoutLayout::FIXED_HEIGHT, AmpLayoutLayout::FLEX_ITEM, AmpLayoutLayout::NODISPLAY, AmpLayoutLayout::RESPONSIVE];
+  $o_940->amp_layout = $o_944;
+  $o_940->disallowed_ancestor = ['head', 'amp-sidebar'];
+  $o_940->also_requires_tag = ['amp-social-share extension .js script'];
+  $o_0->tags[] = $o_940;
   $o_945 = new TagSpec();
-  $o_945->tag_name = 'amp-soundcloud';
+  $o_945->tag_name = 'script';
+  $o_945->spec_name = 'amp-soundcloud extension .js script';
+  $o_945->mandatory_parent = 'head';
   $o_946 = new AttrSpec();
-  $o_946->name = 'data-color';
-  $o_946->value_regex_casei = '([0-9a-f]{3}){1,2}';
+  $o_946->name = 'async';
+  $o_946->mandatory = true;
+  $o_946->value = '';
   $o_945->attrs[] = $o_946;
   $o_947 = new AttrSpec();
-  $o_947->name = 'data-trackid';
+  $o_947->name = 'custom-element';
   $o_947->mandatory = true;
-  $o_947->value_regex = '[0-9]+';
+  $o_947->value = 'amp-soundcloud';
+  $o_947->dispatch_key = true;
   $o_945->attrs[] = $o_947;
   $o_948 = new AttrSpec();
-  $o_948->name = 'data-visual';
-  $o_948->value_regex = 'true|false';
+  $o_948->name = 'src';
+  $o_948->mandatory = true;
+  $o_948->value_regex = 'https://cdn\\.ampproject\\.org/v0/amp-soundcloud-(latest|0\\.1)\\.js';
   $o_945->attrs[] = $o_948;
-  $o_945->attr_lists = ['extended-amp-global'];
+  $o_949 = new AttrSpec();
+  $o_949->name = 'type';
+  $o_949->value = 'text/javascript';
+  $o_945->attrs[] = $o_949;
   $o_945->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-soundcloud.html';
-  $o_949 = new AmpLayout();
-  $o_949->supported_layouts = [AmpLayoutLayout::FIXED_HEIGHT];
-  $o_945->amp_layout = $o_949;
-  $o_945->disallowed_ancestor = ['head', 'amp-sidebar'];
-  $o_945->also_requires_tag = ['amp-soundcloud extension .js script'];
+  $o_950 = new CdataSpec();
+  $o_951 = new BlackListedCDataRegex();
+  $o_951->regex = '.';
+  $o_951->error_message = 'contents';
+  $o_950->blacklisted_cdata_regex[] = $o_951;
+  $o_945->cdata = $o_950;
   $o_0->tags[] = $o_945;
-  $o_950 = new TagSpec();
-  $o_950->tag_name = 'script';
-  $o_950->spec_name = 'amp-springboard-player extension .js script';
-  $o_950->mandatory_parent = 'head';
-  $o_951 = new AttrSpec();
-  $o_951->name = 'async';
-  $o_951->mandatory = true;
-  $o_951->value = '';
-  $o_950->attrs[] = $o_951;
-  $o_952 = new AttrSpec();
-  $o_952->name = 'custom-element';
-  $o_952->mandatory = true;
-  $o_952->value = 'amp-springboard-player';
-  $o_952->dispatch_key = true;
-  $o_950->attrs[] = $o_952;
+  $o_952 = new TagSpec();
+  $o_952->tag_name = 'amp-soundcloud';
   $o_953 = new AttrSpec();
-  $o_953->name = 'src';
-  $o_953->mandatory = true;
-  $o_953->value_regex = 'https://cdn\\.ampproject\\.org/v0/amp-springboard-player-(latest|0\\.1)\\.js';
-  $o_950->attrs[] = $o_953;
+  $o_953->name = 'data-color';
+  $o_953->value_regex_casei = '([0-9a-f]{3}){1,2}';
+  $o_952->attrs[] = $o_953;
   $o_954 = new AttrSpec();
-  $o_954->name = 'type';
-  $o_954->value = 'text/javascript';
-  $o_950->attrs[] = $o_954;
-  $o_950->spec_url = 'https://github.com/ampproject/amphtml/blob/master/extensions/amp-springboard-player/amp-springboard-player.html';
-  $o_955 = new CdataSpec();
-  $o_956 = new BlackListedCDataRegex();
-  $o_956->regex = '.';
-  $o_956->error_message = 'contents';
-  $o_955->blacklisted_cdata_regex[] = $o_956;
-  $o_950->cdata = $o_955;
-  $o_0->tags[] = $o_950;
+  $o_954->name = 'data-trackid';
+  $o_954->mandatory = true;
+  $o_954->value_regex = '[0-9]+';
+  $o_952->attrs[] = $o_954;
+  $o_955 = new AttrSpec();
+  $o_955->name = 'data-visual';
+  $o_955->value_regex = 'true|false';
+  $o_952->attrs[] = $o_955;
+  $o_952->attr_lists = ['extended-amp-global'];
+  $o_952->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-soundcloud.html';
+  $o_956 = new AmpLayout();
+  $o_956->supported_layouts = [AmpLayoutLayout::FIXED_HEIGHT];
+  $o_952->amp_layout = $o_956;
+  $o_952->disallowed_ancestor = ['head', 'amp-sidebar'];
+  $o_952->also_requires_tag = ['amp-soundcloud extension .js script'];
+  $o_0->tags[] = $o_952;
   $o_957 = new TagSpec();
-  $o_957->tag_name = 'amp-springboard-player';
+  $o_957->tag_name = 'script';
+  $o_957->spec_name = 'amp-springboard-player extension .js script';
+  $o_957->mandatory_parent = 'head';
   $o_958 = new AttrSpec();
-  $o_958->name = 'data-content-id';
+  $o_958->name = 'async';
   $o_958->mandatory = true;
+  $o_958->value = '';
   $o_957->attrs[] = $o_958;
   $o_959 = new AttrSpec();
-  $o_959->name = 'data-domain';
+  $o_959->name = 'custom-element';
   $o_959->mandatory = true;
+  $o_959->value = 'amp-springboard-player';
+  $o_959->dispatch_key = true;
   $o_957->attrs[] = $o_959;
   $o_960 = new AttrSpec();
-  $o_960->name = 'data-items';
+  $o_960->name = 'src';
   $o_960->mandatory = true;
+  $o_960->value_regex = 'https://cdn\\.ampproject\\.org/v0/amp-springboard-player-(latest|0\\.1)\\.js';
   $o_957->attrs[] = $o_960;
   $o_961 = new AttrSpec();
-  $o_961->name = 'data-mode';
-  $o_961->mandatory = true;
-  $o_961->value_regex_casei = 'playlist|video';
+  $o_961->name = 'type';
+  $o_961->value = 'text/javascript';
   $o_957->attrs[] = $o_961;
-  $o_962 = new AttrSpec();
-  $o_962->name = 'data-player-id';
-  $o_962->mandatory = true;
-  $o_962->value_regex_casei = '[a-z0-9]+';
-  $o_957->attrs[] = $o_962;
-  $o_963 = new AttrSpec();
-  $o_963->name = 'data-site-id';
-  $o_963->mandatory = true;
-  $o_963->value_regex = '[0-9]+';
-  $o_957->attrs[] = $o_963;
-  $o_957->attr_lists = ['extended-amp-global'];
   $o_957->spec_url = 'https://github.com/ampproject/amphtml/blob/master/extensions/amp-springboard-player/amp-springboard-player.html';
-  $o_964 = new AmpLayout();
-  $o_964->supported_layouts = [AmpLayoutLayout::FILL, AmpLayoutLayout::FIXED, AmpLayoutLayout::FLEX_ITEM, AmpLayoutLayout::RESPONSIVE];
-  $o_957->amp_layout = $o_964;
-  $o_957->disallowed_ancestor = ['head', 'amp-sidebar'];
-  $o_957->also_requires_tag = ['amp-springboard-player extension .js script'];
+  $o_962 = new CdataSpec();
+  $o_963 = new BlackListedCDataRegex();
+  $o_963->regex = '.';
+  $o_963->error_message = 'contents';
+  $o_962->blacklisted_cdata_regex[] = $o_963;
+  $o_957->cdata = $o_962;
   $o_0->tags[] = $o_957;
-  $o_965 = new TagSpec();
-  $o_965->tag_name = 'script';
-  $o_965->spec_name = 'amp-sticky-ad extension .js script';
-  $o_965->mandatory_parent = 'head';
+  $o_964 = new TagSpec();
+  $o_964->tag_name = 'amp-springboard-player';
+  $o_965 = new AttrSpec();
+  $o_965->name = 'data-content-id';
+  $o_965->mandatory = true;
+  $o_964->attrs[] = $o_965;
   $o_966 = new AttrSpec();
-  $o_966->name = 'async';
+  $o_966->name = 'data-domain';
   $o_966->mandatory = true;
-  $o_966->value = '';
-  $o_965->attrs[] = $o_966;
+  $o_964->attrs[] = $o_966;
   $o_967 = new AttrSpec();
-  $o_967->name = 'custom-element';
+  $o_967->name = 'data-items';
   $o_967->mandatory = true;
-  $o_967->value = 'amp-sticky-ad';
-  $o_967->dispatch_key = true;
-  $o_965->attrs[] = $o_967;
+  $o_964->attrs[] = $o_967;
   $o_968 = new AttrSpec();
-  $o_968->name = 'src';
+  $o_968->name = 'data-mode';
   $o_968->mandatory = true;
-  $o_968->value_regex = 'https://cdn\\.ampproject\\.org/v0/amp-sticky-ad-(latest|0\\.1)\\.js';
-  $o_965->attrs[] = $o_968;
+  $o_968->value_regex_casei = 'playlist|video';
+  $o_964->attrs[] = $o_968;
   $o_969 = new AttrSpec();
-  $o_969->name = 'type';
-  $o_969->value = 'text/javascript';
-  $o_965->attrs[] = $o_969;
-  $o_965->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-sticky-ad.html';
-  $o_970 = new CdataSpec();
-  $o_971 = new BlackListedCDataRegex();
-  $o_971->regex = '.';
-  $o_971->error_message = 'contents';
-  $o_970->blacklisted_cdata_regex[] = $o_971;
-  $o_965->cdata = $o_970;
-  $o_0->tags[] = $o_965;
+  $o_969->name = 'data-player-id';
+  $o_969->mandatory = true;
+  $o_969->value_regex_casei = '[a-z0-9]+';
+  $o_964->attrs[] = $o_969;
+  $o_970 = new AttrSpec();
+  $o_970->name = 'data-site-id';
+  $o_970->mandatory = true;
+  $o_970->value_regex = '[0-9]+';
+  $o_964->attrs[] = $o_970;
+  $o_964->attr_lists = ['extended-amp-global'];
+  $o_964->spec_url = 'https://github.com/ampproject/amphtml/blob/master/extensions/amp-springboard-player/amp-springboard-player.html';
+  $o_971 = new AmpLayout();
+  $o_971->supported_layouts = [AmpLayoutLayout::FILL, AmpLayoutLayout::FIXED, AmpLayoutLayout::FLEX_ITEM, AmpLayoutLayout::RESPONSIVE];
+  $o_964->amp_layout = $o_971;
+  $o_964->disallowed_ancestor = ['head', 'amp-sidebar'];
+  $o_964->also_requires_tag = ['amp-springboard-player extension .js script'];
+  $o_0->tags[] = $o_964;
   $o_972 = new TagSpec();
-  $o_972->tag_name = 'amp-sticky-ad';
-  $o_972->unique = true;
-  $o_972->attr_lists = ['extended-amp-global'];
+  $o_972->tag_name = 'script';
+  $o_972->spec_name = 'amp-sticky-ad extension .js script';
+  $o_972->mandatory_parent = 'head';
+  $o_973 = new AttrSpec();
+  $o_973->name = 'async';
+  $o_973->mandatory = true;
+  $o_973->value = '';
+  $o_972->attrs[] = $o_973;
+  $o_974 = new AttrSpec();
+  $o_974->name = 'custom-element';
+  $o_974->mandatory = true;
+  $o_974->value = 'amp-sticky-ad';
+  $o_974->dispatch_key = true;
+  $o_972->attrs[] = $o_974;
+  $o_975 = new AttrSpec();
+  $o_975->name = 'src';
+  $o_975->mandatory = true;
+  $o_975->value_regex = 'https://cdn\\.ampproject\\.org/v0/amp-sticky-ad-(latest|0\\.1)\\.js';
+  $o_972->attrs[] = $o_975;
+  $o_976 = new AttrSpec();
+  $o_976->name = 'type';
+  $o_976->value = 'text/javascript';
+  $o_972->attrs[] = $o_976;
   $o_972->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-sticky-ad.html';
-  $o_973 = new AmpLayout();
-  $o_973->supported_layouts = [AmpLayoutLayout::NODISPLAY];
-  $o_972->amp_layout = $o_973;
-  $o_972->disallowed_ancestor = ['amp-sidebar'];
-  $o_972->also_requires_tag = ['amp-sticky-ad extension .js script'];
-  $o_974 = new ChildTagSpec();
-  $o_974->mandatory_num_child_tags = 1;
-  $o_974->first_child_tag_name_oneof = ['amp-ad'];
-  $o_972->child_tags = $o_974;
+  $o_977 = new CdataSpec();
+  $o_978 = new BlackListedCDataRegex();
+  $o_978->regex = '.';
+  $o_978->error_message = 'contents';
+  $o_977->blacklisted_cdata_regex[] = $o_978;
+  $o_972->cdata = $o_977;
   $o_0->tags[] = $o_972;
-  $o_975 = new TagSpec();
-  $o_975->tag_name = 'script';
-  $o_975->spec_name = 'amp-twitter extension .js script';
-  $o_975->mandatory_parent = 'head';
-  $o_976 = new AttrSpec();
-  $o_976->name = 'async';
-  $o_976->mandatory = true;
-  $o_976->value = '';
-  $o_975->attrs[] = $o_976;
-  $o_977 = new AttrSpec();
-  $o_977->name = 'custom-element';
-  $o_977->mandatory = true;
-  $o_977->value = 'amp-twitter';
-  $o_977->dispatch_key = true;
-  $o_975->attrs[] = $o_977;
-  $o_978 = new AttrSpec();
-  $o_978->name = 'src';
-  $o_978->mandatory = true;
-  $o_978->value_regex = 'https://cdn\\.ampproject\\.org/v0/amp-twitter-(latest|0\\.1).js';
-  $o_975->attrs[] = $o_978;
-  $o_979 = new AttrSpec();
-  $o_979->name = 'type';
-  $o_979->value = 'text/javascript';
-  $o_975->attrs[] = $o_979;
-  $o_975->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-twitter.html';
-  $o_980 = new CdataSpec();
-  $o_981 = new BlackListedCDataRegex();
-  $o_981->regex = '.';
-  $o_981->error_message = 'contents';
-  $o_980->blacklisted_cdata_regex[] = $o_981;
-  $o_975->cdata = $o_980;
-  $o_0->tags[] = $o_975;
+  $o_979 = new TagSpec();
+  $o_979->tag_name = 'amp-sticky-ad';
+  $o_979->unique = true;
+  $o_979->attr_lists = ['extended-amp-global'];
+  $o_979->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-sticky-ad.html';
+  $o_980 = new AmpLayout();
+  $o_980->supported_layouts = [AmpLayoutLayout::NODISPLAY];
+  $o_979->amp_layout = $o_980;
+  $o_979->disallowed_ancestor = ['amp-sidebar'];
+  $o_979->also_requires_tag = ['amp-sticky-ad extension .js script'];
+  $o_981 = new ChildTagSpec();
+  $o_981->mandatory_num_child_tags = 1;
+  $o_981->first_child_tag_name_oneof = ['amp-ad'];
+  $o_979->child_tags = $o_981;
+  $o_0->tags[] = $o_979;
   $o_982 = new TagSpec();
-  $o_982->tag_name = 'amp-twitter';
+  $o_982->tag_name = 'script';
+  $o_982->spec_name = 'amp-twitter extension .js script';
+  $o_982->mandatory_parent = 'head';
   $o_983 = new AttrSpec();
-  $o_983->name = 'data-tweetid';
-  $o_983->mandatory_oneof = '[\'data-tweetid\', \'src\']';
+  $o_983->name = 'async';
+  $o_983->mandatory = true;
+  $o_983->value = '';
   $o_982->attrs[] = $o_983;
   $o_984 = new AttrSpec();
-  $o_984->name = 'src';
-  $o_984->mandatory_oneof = '[\'data-tweetid\', \'src\']';
-  $o_985 = new UrlSpec();
-  $o_985->allowed_protocol = ['http', 'https'];
-  $o_985->allow_relative = true;
-  $o_984->value_url = $o_985;
+  $o_984->name = 'custom-element';
+  $o_984->mandatory = true;
+  $o_984->value = 'amp-twitter';
+  $o_984->dispatch_key = true;
   $o_982->attrs[] = $o_984;
-  $o_982->attr_lists = ['extended-amp-global'];
+  $o_985 = new AttrSpec();
+  $o_985->name = 'src';
+  $o_985->mandatory = true;
+  $o_985->value_regex = 'https://cdn\\.ampproject\\.org/v0/amp-twitter-(latest|0\\.1).js';
+  $o_982->attrs[] = $o_985;
+  $o_986 = new AttrSpec();
+  $o_986->name = 'type';
+  $o_986->value = 'text/javascript';
+  $o_982->attrs[] = $o_986;
   $o_982->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-twitter.html';
-  $o_986 = new AmpLayout();
-  $o_986->supported_layouts = [AmpLayoutLayout::FILL, AmpLayoutLayout::FIXED, AmpLayoutLayout::FIXED_HEIGHT, AmpLayoutLayout::FLEX_ITEM, AmpLayoutLayout::NODISPLAY, AmpLayoutLayout::RESPONSIVE];
-  $o_982->amp_layout = $o_986;
-  $o_982->disallowed_ancestor = ['head', 'amp-sidebar'];
-  $o_982->also_requires_tag = ['amp-twitter extension .js script'];
+  $o_987 = new CdataSpec();
+  $o_988 = new BlackListedCDataRegex();
+  $o_988->regex = '.';
+  $o_988->error_message = 'contents';
+  $o_987->blacklisted_cdata_regex[] = $o_988;
+  $o_982->cdata = $o_987;
   $o_0->tags[] = $o_982;
-  $o_987 = new TagSpec();
-  $o_987->tag_name = 'script';
-  $o_987->spec_name = 'amp-user-notification extension .js script';
-  $o_987->mandatory_parent = 'head';
-  $o_988 = new AttrSpec();
-  $o_988->name = 'async';
-  $o_988->mandatory = true;
-  $o_988->value = '';
-  $o_987->attrs[] = $o_988;
-  $o_989 = new AttrSpec();
-  $o_989->name = 'custom-element';
-  $o_989->mandatory = true;
-  $o_989->value = 'amp-user-notification';
-  $o_989->dispatch_key = true;
-  $o_987->attrs[] = $o_989;
+  $o_989 = new TagSpec();
+  $o_989->tag_name = 'amp-twitter';
   $o_990 = new AttrSpec();
-  $o_990->name = 'src';
-  $o_990->mandatory = true;
-  $o_990->value_regex = 'https://cdn\\.ampproject\\.org/v0/amp-user-notification-(latest|0\\.1).js';
-  $o_987->attrs[] = $o_990;
+  $o_990->name = 'data-tweetid';
+  $o_990->mandatory_oneof = '[\'data-tweetid\', \'src\']';
+  $o_989->attrs[] = $o_990;
   $o_991 = new AttrSpec();
-  $o_991->name = 'type';
-  $o_991->value = 'text/javascript';
-  $o_987->attrs[] = $o_991;
-  $o_987->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-user-notification.html';
-  $o_992 = new CdataSpec();
-  $o_993 = new BlackListedCDataRegex();
-  $o_993->regex = '.';
-  $o_993->error_message = 'contents';
-  $o_992->blacklisted_cdata_regex[] = $o_993;
-  $o_987->cdata = $o_992;
-  $o_0->tags[] = $o_987;
+  $o_991->name = 'src';
+  $o_991->mandatory_oneof = '[\'data-tweetid\', \'src\']';
+  $o_992 = new UrlSpec();
+  $o_992->allowed_protocol = ['http', 'https'];
+  $o_992->allow_relative = true;
+  $o_991->value_url = $o_992;
+  $o_989->attrs[] = $o_991;
+  $o_989->attr_lists = ['extended-amp-global'];
+  $o_989->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-twitter.html';
+  $o_993 = new AmpLayout();
+  $o_993->supported_layouts = [AmpLayoutLayout::FILL, AmpLayoutLayout::FIXED, AmpLayoutLayout::FIXED_HEIGHT, AmpLayoutLayout::FLEX_ITEM, AmpLayoutLayout::NODISPLAY, AmpLayoutLayout::RESPONSIVE];
+  $o_989->amp_layout = $o_993;
+  $o_989->disallowed_ancestor = ['head', 'amp-sidebar'];
+  $o_989->also_requires_tag = ['amp-twitter extension .js script'];
+  $o_0->tags[] = $o_989;
   $o_994 = new TagSpec();
-  $o_994->tag_name = 'amp-user-notification';
-  $o_994->attr_lists = ['extended-amp-global'];
-  $o_994->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-user-notification.html';
-  $o_995 = new AmpLayout();
-  $o_995->supported_layouts = [AmpLayoutLayout::NODISPLAY];
-  $o_994->amp_layout = $o_995;
-  $o_994->disallowed_ancestor = ['head', 'amp-sidebar'];
-  $o_994->also_requires_tag = ['amp-analytics extension .js script', 'amp-user-notification extension .js script'];
-  $o_0->tags[] = $o_994;
-  $o_996 = new TagSpec();
-  $o_996->tag_name = 'script';
-  $o_996->spec_name = 'amp-vimeo extension .js script';
-  $o_996->mandatory_parent = 'head';
+  $o_994->tag_name = 'script';
+  $o_994->spec_name = 'amp-user-notification extension .js script';
+  $o_994->mandatory_parent = 'head';
+  $o_995 = new AttrSpec();
+  $o_995->name = 'async';
+  $o_995->mandatory = true;
+  $o_995->value = '';
+  $o_994->attrs[] = $o_995;
+  $o_996 = new AttrSpec();
+  $o_996->name = 'custom-element';
+  $o_996->mandatory = true;
+  $o_996->value = 'amp-user-notification';
+  $o_996->dispatch_key = true;
+  $o_994->attrs[] = $o_996;
   $o_997 = new AttrSpec();
-  $o_997->name = 'async';
+  $o_997->name = 'src';
   $o_997->mandatory = true;
-  $o_997->value = '';
-  $o_996->attrs[] = $o_997;
+  $o_997->value_regex = 'https://cdn\\.ampproject\\.org/v0/amp-user-notification-(latest|0\\.1).js';
+  $o_994->attrs[] = $o_997;
   $o_998 = new AttrSpec();
-  $o_998->name = 'custom-element';
-  $o_998->mandatory = true;
-  $o_998->value = 'amp-vimeo';
-  $o_998->dispatch_key = true;
-  $o_996->attrs[] = $o_998;
-  $o_999 = new AttrSpec();
-  $o_999->name = 'src';
-  $o_999->mandatory = true;
-  $o_999->value_regex = 'https://cdn\\.ampproject\\.org/v0/amp-vimeo-(latest|0\\.1)\\.js';
-  $o_996->attrs[] = $o_999;
-  $o_1000 = new AttrSpec();
-  $o_1000->name = 'type';
-  $o_1000->value = 'text/javascript';
-  $o_996->attrs[] = $o_1000;
-  $o_996->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-vimeo.html';
-  $o_1001 = new CdataSpec();
-  $o_1002 = new BlackListedCDataRegex();
-  $o_1002->regex = '.';
-  $o_1002->error_message = 'contents';
-  $o_1001->blacklisted_cdata_regex[] = $o_1002;
-  $o_996->cdata = $o_1001;
-  $o_0->tags[] = $o_996;
+  $o_998->name = 'type';
+  $o_998->value = 'text/javascript';
+  $o_994->attrs[] = $o_998;
+  $o_994->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-user-notification.html';
+  $o_999 = new CdataSpec();
+  $o_1000 = new BlackListedCDataRegex();
+  $o_1000->regex = '.';
+  $o_1000->error_message = 'contents';
+  $o_999->blacklisted_cdata_regex[] = $o_1000;
+  $o_994->cdata = $o_999;
+  $o_0->tags[] = $o_994;
+  $o_1001 = new TagSpec();
+  $o_1001->tag_name = 'amp-user-notification';
+  $o_1001->attr_lists = ['extended-amp-global'];
+  $o_1001->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-user-notification.html';
+  $o_1002 = new AmpLayout();
+  $o_1002->supported_layouts = [AmpLayoutLayout::NODISPLAY];
+  $o_1001->amp_layout = $o_1002;
+  $o_1001->disallowed_ancestor = ['head', 'amp-sidebar'];
+  $o_1001->also_requires_tag = ['amp-analytics extension .js script', 'amp-user-notification extension .js script'];
+  $o_0->tags[] = $o_1001;
   $o_1003 = new TagSpec();
-  $o_1003->tag_name = 'amp-vimeo';
+  $o_1003->tag_name = 'script';
+  $o_1003->spec_name = 'amp-vimeo extension .js script';
+  $o_1003->mandatory_parent = 'head';
   $o_1004 = new AttrSpec();
-  $o_1004->name = 'data-videoid';
+  $o_1004->name = 'async';
   $o_1004->mandatory = true;
-  $o_1004->value_regex = '[0-9]+';
+  $o_1004->value = '';
   $o_1003->attrs[] = $o_1004;
-  $o_1003->attr_lists = ['extended-amp-global'];
+  $o_1005 = new AttrSpec();
+  $o_1005->name = 'custom-element';
+  $o_1005->mandatory = true;
+  $o_1005->value = 'amp-vimeo';
+  $o_1005->dispatch_key = true;
+  $o_1003->attrs[] = $o_1005;
+  $o_1006 = new AttrSpec();
+  $o_1006->name = 'src';
+  $o_1006->mandatory = true;
+  $o_1006->value_regex = 'https://cdn\\.ampproject\\.org/v0/amp-vimeo-(latest|0\\.1)\\.js';
+  $o_1003->attrs[] = $o_1006;
+  $o_1007 = new AttrSpec();
+  $o_1007->name = 'type';
+  $o_1007->value = 'text/javascript';
+  $o_1003->attrs[] = $o_1007;
   $o_1003->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-vimeo.html';
-  $o_1005 = new AmpLayout();
-  $o_1005->supported_layouts = [AmpLayoutLayout::FILL, AmpLayoutLayout::FIXED, AmpLayoutLayout::FIXED_HEIGHT, AmpLayoutLayout::FLEX_ITEM, AmpLayoutLayout::RESPONSIVE];
-  $o_1003->amp_layout = $o_1005;
-  $o_1003->disallowed_ancestor = ['head', 'amp-sidebar'];
-  $o_1003->also_requires_tag = ['amp-vimeo extension .js script'];
+  $o_1008 = new CdataSpec();
+  $o_1009 = new BlackListedCDataRegex();
+  $o_1009->regex = '.';
+  $o_1009->error_message = 'contents';
+  $o_1008->blacklisted_cdata_regex[] = $o_1009;
+  $o_1003->cdata = $o_1008;
   $o_0->tags[] = $o_1003;
-  $o_1006 = new TagSpec();
-  $o_1006->tag_name = 'script';
-  $o_1006->spec_name = 'amp-vine extension .js script';
-  $o_1006->mandatory_parent = 'head';
-  $o_1007 = new AttrSpec();
-  $o_1007->name = 'async';
-  $o_1007->mandatory = true;
-  $o_1007->value = '';
-  $o_1006->attrs[] = $o_1007;
-  $o_1008 = new AttrSpec();
-  $o_1008->name = 'custom-element';
-  $o_1008->mandatory = true;
-  $o_1008->value = 'amp-vine';
-  $o_1008->dispatch_key = true;
-  $o_1006->attrs[] = $o_1008;
-  $o_1009 = new AttrSpec();
-  $o_1009->name = 'src';
-  $o_1009->mandatory = true;
-  $o_1009->value_regex = 'https://cdn\\.ampproject\\.org/v0/amp-vine-(latest|0\\.1).js';
-  $o_1006->attrs[] = $o_1009;
-  $o_1010 = new AttrSpec();
-  $o_1010->name = 'type';
-  $o_1010->value = 'text/javascript';
-  $o_1006->attrs[] = $o_1010;
-  $o_1006->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-vine.html';
-  $o_1011 = new CdataSpec();
-  $o_1012 = new BlackListedCDataRegex();
-  $o_1012->regex = '.';
-  $o_1012->error_message = 'contents';
-  $o_1011->blacklisted_cdata_regex[] = $o_1012;
-  $o_1006->cdata = $o_1011;
-  $o_0->tags[] = $o_1006;
+  $o_1010 = new TagSpec();
+  $o_1010->tag_name = 'amp-vimeo';
+  $o_1011 = new AttrSpec();
+  $o_1011->name = 'data-videoid';
+  $o_1011->mandatory = true;
+  $o_1011->value_regex = '[0-9]+';
+  $o_1010->attrs[] = $o_1011;
+  $o_1010->attr_lists = ['extended-amp-global'];
+  $o_1010->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-vimeo.html';
+  $o_1012 = new AmpLayout();
+  $o_1012->supported_layouts = [AmpLayoutLayout::FILL, AmpLayoutLayout::FIXED, AmpLayoutLayout::FIXED_HEIGHT, AmpLayoutLayout::FLEX_ITEM, AmpLayoutLayout::RESPONSIVE];
+  $o_1010->amp_layout = $o_1012;
+  $o_1010->disallowed_ancestor = ['head', 'amp-sidebar'];
+  $o_1010->also_requires_tag = ['amp-vimeo extension .js script'];
+  $o_0->tags[] = $o_1010;
   $o_1013 = new TagSpec();
-  $o_1013->tag_name = 'amp-vine';
+  $o_1013->tag_name = 'script';
+  $o_1013->spec_name = 'amp-vine extension .js script';
+  $o_1013->mandatory_parent = 'head';
   $o_1014 = new AttrSpec();
-  $o_1014->name = 'data-vineid';
+  $o_1014->name = 'async';
   $o_1014->mandatory = true;
+  $o_1014->value = '';
   $o_1013->attrs[] = $o_1014;
-  $o_1013->attr_lists = ['extended-amp-global'];
+  $o_1015 = new AttrSpec();
+  $o_1015->name = 'custom-element';
+  $o_1015->mandatory = true;
+  $o_1015->value = 'amp-vine';
+  $o_1015->dispatch_key = true;
+  $o_1013->attrs[] = $o_1015;
+  $o_1016 = new AttrSpec();
+  $o_1016->name = 'src';
+  $o_1016->mandatory = true;
+  $o_1016->value_regex = 'https://cdn\\.ampproject\\.org/v0/amp-vine-(latest|0\\.1).js';
+  $o_1013->attrs[] = $o_1016;
+  $o_1017 = new AttrSpec();
+  $o_1017->name = 'type';
+  $o_1017->value = 'text/javascript';
+  $o_1013->attrs[] = $o_1017;
   $o_1013->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-vine.html';
-  $o_1015 = new AmpLayout();
-  $o_1015->supported_layouts = [AmpLayoutLayout::FILL, AmpLayoutLayout::FIXED, AmpLayoutLayout::FIXED_HEIGHT, AmpLayoutLayout::FLEX_ITEM, AmpLayoutLayout::NODISPLAY, AmpLayoutLayout::RESPONSIVE];
-  $o_1013->amp_layout = $o_1015;
-  $o_1013->disallowed_ancestor = ['head', 'amp-sidebar'];
-  $o_1013->also_requires_tag = ['amp-vine extension .js script'];
+  $o_1018 = new CdataSpec();
+  $o_1019 = new BlackListedCDataRegex();
+  $o_1019->regex = '.';
+  $o_1019->error_message = 'contents';
+  $o_1018->blacklisted_cdata_regex[] = $o_1019;
+  $o_1013->cdata = $o_1018;
   $o_0->tags[] = $o_1013;
-  $o_1016 = new TagSpec();
-  $o_1016->tag_name = 'script';
-  $o_1016->spec_name = 'amp-youtube extension .js script';
-  $o_1016->mandatory_parent = 'head';
-  $o_1017 = new AttrSpec();
-  $o_1017->name = 'async';
-  $o_1017->mandatory = true;
-  $o_1017->value = '';
-  $o_1016->attrs[] = $o_1017;
-  $o_1018 = new AttrSpec();
-  $o_1018->name = 'custom-element';
-  $o_1018->mandatory = true;
-  $o_1018->value = 'amp-youtube';
-  $o_1018->dispatch_key = true;
-  $o_1016->attrs[] = $o_1018;
-  $o_1019 = new AttrSpec();
-  $o_1019->name = 'src';
-  $o_1019->mandatory = true;
-  $o_1019->value_regex = 'https://cdn\\.ampproject\\.org/v0/amp-youtube-(latest|0\\.1)\\.js';
-  $o_1016->attrs[] = $o_1019;
-  $o_1020 = new AttrSpec();
-  $o_1020->name = 'type';
-  $o_1020->value = 'text/javascript';
-  $o_1016->attrs[] = $o_1020;
-  $o_1016->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-youtube.html';
-  $o_1021 = new CdataSpec();
-  $o_1022 = new BlackListedCDataRegex();
-  $o_1022->regex = '.';
-  $o_1022->error_message = 'contents';
-  $o_1021->blacklisted_cdata_regex[] = $o_1022;
-  $o_1016->cdata = $o_1021;
-  $o_0->tags[] = $o_1016;
+  $o_1020 = new TagSpec();
+  $o_1020->tag_name = 'amp-vine';
+  $o_1021 = new AttrSpec();
+  $o_1021->name = 'data-vineid';
+  $o_1021->mandatory = true;
+  $o_1020->attrs[] = $o_1021;
+  $o_1020->attr_lists = ['extended-amp-global'];
+  $o_1020->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-vine.html';
+  $o_1022 = new AmpLayout();
+  $o_1022->supported_layouts = [AmpLayoutLayout::FILL, AmpLayoutLayout::FIXED, AmpLayoutLayout::FIXED_HEIGHT, AmpLayoutLayout::FLEX_ITEM, AmpLayoutLayout::NODISPLAY, AmpLayoutLayout::RESPONSIVE];
+  $o_1020->amp_layout = $o_1022;
+  $o_1020->disallowed_ancestor = ['head', 'amp-sidebar'];
+  $o_1020->also_requires_tag = ['amp-vine extension .js script'];
+  $o_0->tags[] = $o_1020;
   $o_1023 = new TagSpec();
-  $o_1023->tag_name = 'amp-youtube';
+  $o_1023->tag_name = 'script';
+  $o_1023->spec_name = 'amp-youtube extension .js script';
+  $o_1023->mandatory_parent = 'head';
   $o_1024 = new AttrSpec();
-  $o_1024->name = 'data-videoid';
-  $o_1024->mandatory_oneof = '[\'src\', \'data-videoid\']';
+  $o_1024->name = 'async';
+  $o_1024->mandatory = true;
+  $o_1024->value = '';
   $o_1023->attrs[] = $o_1024;
   $o_1025 = new AttrSpec();
-  $o_1025->name = 'src';
-  $o_1025->mandatory_oneof = '[\'src\', \'data-videoid\']';
-  $o_1026 = new UrlSpec();
-  $o_1026->allowed_protocol = ['http', 'https'];
-  $o_1026->allow_relative = true;
-  $o_1025->value_url = $o_1026;
+  $o_1025->name = 'custom-element';
+  $o_1025->mandatory = true;
+  $o_1025->value = 'amp-youtube';
+  $o_1025->dispatch_key = true;
   $o_1023->attrs[] = $o_1025;
+  $o_1026 = new AttrSpec();
+  $o_1026->name = 'src';
+  $o_1026->mandatory = true;
+  $o_1026->value_regex = 'https://cdn\\.ampproject\\.org/v0/amp-youtube-(latest|0\\.1)\\.js';
+  $o_1023->attrs[] = $o_1026;
   $o_1027 = new AttrSpec();
-  $o_1027->name = 'video-id';
-  $o_1027->deprecation = 'data-videoid';
-  $o_1027->deprecation_url = 'https://www.ampproject.org/docs/reference/extended/amp-youtube.html';
-  $o_1027->mandatory_oneof = '[\'src\', \'data-videoid\']';
+  $o_1027->name = 'type';
+  $o_1027->value = 'text/javascript';
   $o_1023->attrs[] = $o_1027;
-  $o_1023->attr_lists = ['extended-amp-global'];
   $o_1023->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-youtube.html';
-  $o_1028 = new AmpLayout();
-  $o_1028->supported_layouts = [AmpLayoutLayout::FILL, AmpLayoutLayout::FIXED, AmpLayoutLayout::FIXED_HEIGHT, AmpLayoutLayout::FLEX_ITEM, AmpLayoutLayout::NODISPLAY, AmpLayoutLayout::RESPONSIVE];
-  $o_1023->amp_layout = $o_1028;
-  $o_1023->disallowed_ancestor = ['head', 'amp-sidebar'];
-  $o_1023->also_requires_tag = ['amp-youtube extension .js script'];
+  $o_1028 = new CdataSpec();
+  $o_1029 = new BlackListedCDataRegex();
+  $o_1029->regex = '.';
+  $o_1029->error_message = 'contents';
+  $o_1028->blacklisted_cdata_regex[] = $o_1029;
+  $o_1023->cdata = $o_1028;
   $o_0->tags[] = $o_1023;
-  $o_0->min_validator_revision_required = 135;
-  $o_0->spec_file_revision = 228;
-  $o_1029 = new AttrList();
-  $o_1029->name = 'common-link-attrs';
-  $o_1030 = new AttrSpec();
-  $o_1030->name = 'media';
-  $o_1029->attrs[] = $o_1030;
+  $o_1030 = new TagSpec();
+  $o_1030->tag_name = 'amp-youtube';
   $o_1031 = new AttrSpec();
-  $o_1031->name = 'sizes';
-  $o_1029->attrs[] = $o_1031;
+  $o_1031->name = 'data-videoid';
+  $o_1031->mandatory_oneof = '[\'src\', \'data-videoid\']';
+  $o_1030->attrs[] = $o_1031;
   $o_1032 = new AttrSpec();
-  $o_1032->name = 'target';
-  $o_1029->attrs[] = $o_1032;
-  $o_1033 = new AttrSpec();
-  $o_1033->name = 'type';
-  $o_1029->attrs[] = $o_1033;
+  $o_1032->name = 'src';
+  $o_1032->mandatory_oneof = '[\'src\', \'data-videoid\']';
+  $o_1033 = new UrlSpec();
+  $o_1033->allowed_protocol = ['http', 'https'];
+  $o_1033->allow_relative = true;
+  $o_1032->value_url = $o_1033;
+  $o_1030->attrs[] = $o_1032;
   $o_1034 = new AttrSpec();
-  $o_1034->name = 'hreflang';
-  $o_1029->attrs[] = $o_1034;
-  $o_1035 = new AttrSpec();
-  $o_1035->name = 'charset';
-  $o_1035->value = 'utf-8';
-  $o_1029->attrs[] = $o_1035;
-  $o_1036 = new AttrSpec();
-  $o_1036->name = 'color';
-  $o_1029->attrs[] = $o_1036;
-  $o_0->attr_lists[] = $o_1029;
-  $o_1037 = new AttrList();
-  $o_1037->name = 'cite-attr';
+  $o_1034->name = 'video-id';
+  $o_1034->deprecation = 'data-videoid';
+  $o_1034->deprecation_url = 'https://www.ampproject.org/docs/reference/extended/amp-youtube.html';
+  $o_1034->mandatory_oneof = '[\'src\', \'data-videoid\']';
+  $o_1030->attrs[] = $o_1034;
+  $o_1030->attr_lists = ['extended-amp-global'];
+  $o_1030->spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-youtube.html';
+  $o_1035 = new AmpLayout();
+  $o_1035->supported_layouts = [AmpLayoutLayout::FILL, AmpLayoutLayout::FIXED, AmpLayoutLayout::FIXED_HEIGHT, AmpLayoutLayout::FLEX_ITEM, AmpLayoutLayout::NODISPLAY, AmpLayoutLayout::RESPONSIVE];
+  $o_1030->amp_layout = $o_1035;
+  $o_1030->disallowed_ancestor = ['head', 'amp-sidebar'];
+  $o_1030->also_requires_tag = ['amp-youtube extension .js script'];
+  $o_0->tags[] = $o_1030;
+  $o_0->min_validator_revision_required = 135;
+  $o_0->spec_file_revision = 228;
+  $o_1036 = new AttrList();
+  $o_1036->name = 'common-link-attrs';
+  $o_1037 = new AttrSpec();
+  $o_1037->name = 'media';
+  $o_1036->attrs[] = $o_1037;
   $o_1038 = new AttrSpec();
-  $o_1038->name = 'cite';
-  $o_1039 = new UrlSpec();
-  $o_1039->allowed_protocol = ['http', 'https', 'mailto', 'ftp', 'fb-messenger', 'sms', 'tel', 'viber', 'whatsapp'];
-  $o_1039->allow_relative = true;
-  $o_1038->value_url = $o_1039;
-  $o_1037->attrs[] = $o_1038;
-  $o_0->attr_lists[] = $o_1037;
-  $o_1040 = new AttrList();
-  $o_1040->name = 'track-attrs-no-subtitles';
+  $o_1038->name = 'sizes';
+  $o_1036->attrs[] = $o_1038;
+  $o_1039 = new AttrSpec();
+  $o_1039->name = 'target';
+  $o_1036->attrs[] = $o_1039;
+  $o_1040 = new AttrSpec();
+  $o_1040->name = 'type';
+  $o_1036->attrs[] = $o_1040;
   $o_1041 = new AttrSpec();
-  $o_1041->name = 'src';
-  $o_1041->mandatory = true;
-  $o_1042 = new UrlSpec();
-  $o_1042->allowed_protocol = ['https'];
-  $o_1042->allow_relative = false;
-  $o_1041->value_url = $o_1042;
-  $o_1040->attrs[] = $o_1041;
+  $o_1041->name = 'hreflang';
+  $o_1036->attrs[] = $o_1041;
+  $o_1042 = new AttrSpec();
+  $o_1042->name = 'charset';
+  $o_1042->value = 'utf-8';
+  $o_1036->attrs[] = $o_1042;
   $o_1043 = new AttrSpec();
-  $o_1043->name = 'default';
-  $o_1043->value = '';
-  $o_1040->attrs[] = $o_1043;
-  $o_1044 = new AttrSpec();
-  $o_1044->name = 'kind';
-  $o_1044->value_regex = '(captions|descriptions|chapters|metadata)';
-  $o_1040->attrs[] = $o_1044;
+  $o_1043->name = 'color';
+  $o_1036->attrs[] = $o_1043;
+  $o_0->attr_lists[] = $o_1036;
+  $o_1044 = new AttrList();
+  $o_1044->name = 'cite-attr';
   $o_1045 = new AttrSpec();
-  $o_1045->name = 'label';
-  $o_1040->attrs[] = $o_1045;
-  $o_1046 = new AttrSpec();
-  $o_1046->name = 'srclang';
-  $o_1040->attrs[] = $o_1046;
-  $o_0->attr_lists[] = $o_1040;
+  $o_1045->name = 'cite';
+  $o_1046 = new UrlSpec();
+  $o_1046->allowed_protocol = ['http', 'https', 'mailto', 'ftp', 'fb-messenger', 'sms', 'tel', 'viber', 'whatsapp'];
+  $o_1046->allow_relative = true;
+  $o_1045->value_url = $o_1046;
+  $o_1044->attrs[] = $o_1045;
+  $o_0->attr_lists[] = $o_1044;
   $o_1047 = new AttrList();
-  $o_1047->name = 'track-attrs-subtitles';
+  $o_1047->name = 'track-attrs-no-subtitles';
   $o_1048 = new AttrSpec();
   $o_1048->name = 'src';
   $o_1048->mandatory = true;
@@ -4487,789 +4494,814 @@ public static function createValidationRules() {
   $o_1047->attrs[] = $o_1050;
   $o_1051 = new AttrSpec();
   $o_1051->name = 'kind';
-  $o_1051->mandatory = true;
-  $o_1051->value = 'subtitles';
+  $o_1051->value_regex = '(captions|descriptions|chapters|metadata)';
   $o_1047->attrs[] = $o_1051;
   $o_1052 = new AttrSpec();
   $o_1052->name = 'label';
   $o_1047->attrs[] = $o_1052;
   $o_1053 = new AttrSpec();
   $o_1053->name = 'srclang';
-  $o_1053->mandatory = true;
   $o_1047->attrs[] = $o_1053;
   $o_0->attr_lists[] = $o_1047;
   $o_1054 = new AttrList();
-  $o_1054->name = 'svg-conditional-processing-attributes';
+  $o_1054->name = 'track-attrs-subtitles';
   $o_1055 = new AttrSpec();
-  $o_1055->name = 'requiredextensions';
+  $o_1055->name = 'src';
+  $o_1055->mandatory = true;
+  $o_1056 = new UrlSpec();
+  $o_1056->allowed_protocol = ['https'];
+  $o_1056->allow_relative = false;
+  $o_1055->value_url = $o_1056;
   $o_1054->attrs[] = $o_1055;
-  $o_1056 = new AttrSpec();
-  $o_1056->name = 'requiredfeatures';
-  $o_1054->attrs[] = $o_1056;
   $o_1057 = new AttrSpec();
-  $o_1057->name = 'systemlanguage';
+  $o_1057->name = 'default';
+  $o_1057->value = '';
   $o_1054->attrs[] = $o_1057;
-  $o_0->attr_lists[] = $o_1054;
-  $o_1058 = new AttrList();
-  $o_1058->name = 'svg-core-attributes';
+  $o_1058 = new AttrSpec();
+  $o_1058->name = 'kind';
+  $o_1058->mandatory = true;
+  $o_1058->value = 'subtitles';
+  $o_1054->attrs[] = $o_1058;
   $o_1059 = new AttrSpec();
-  $o_1059->name = 'xml:base';
-  $o_1058->attrs[] = $o_1059;
+  $o_1059->name = 'label';
+  $o_1054->attrs[] = $o_1059;
   $o_1060 = new AttrSpec();
-  $o_1060->name = 'xml:lang';
-  $o_1058->attrs[] = $o_1060;
-  $o_1061 = new AttrSpec();
-  $o_1061->name = 'xml:space';
-  $o_1058->attrs[] = $o_1061;
+  $o_1060->name = 'srclang';
+  $o_1060->mandatory = true;
+  $o_1054->attrs[] = $o_1060;
+  $o_0->attr_lists[] = $o_1054;
+  $o_1061 = new AttrList();
+  $o_1061->name = 'svg-conditional-processing-attributes';
   $o_1062 = new AttrSpec();
-  $o_1062->name = 'xmlns';
-  $o_1058->attrs[] = $o_1062;
+  $o_1062->name = 'requiredextensions';
+  $o_1061->attrs[] = $o_1062;
   $o_1063 = new AttrSpec();
-  $o_1063->name = 'xmlns:xlink';
-  $o_1058->attrs[] = $o_1063;
-  $o_0->attr_lists[] = $o_1058;
-  $o_1064 = new AttrList();
-  $o_1064->name = 'svg-filter-primitive-attributes';
-  $o_1065 = new AttrSpec();
-  $o_1065->name = 'height';
-  $o_1064->attrs[] = $o_1065;
+  $o_1063->name = 'requiredfeatures';
+  $o_1061->attrs[] = $o_1063;
+  $o_1064 = new AttrSpec();
+  $o_1064->name = 'systemlanguage';
+  $o_1061->attrs[] = $o_1064;
+  $o_0->attr_lists[] = $o_1061;
+  $o_1065 = new AttrList();
+  $o_1065->name = 'svg-core-attributes';
   $o_1066 = new AttrSpec();
-  $o_1066->name = 'result';
-  $o_1064->attrs[] = $o_1066;
+  $o_1066->name = 'xml:base';
+  $o_1065->attrs[] = $o_1066;
   $o_1067 = new AttrSpec();
-  $o_1067->name = 'width';
-  $o_1064->attrs[] = $o_1067;
+  $o_1067->name = 'xml:lang';
+  $o_1065->attrs[] = $o_1067;
   $o_1068 = new AttrSpec();
-  $o_1068->name = 'x';
-  $o_1064->attrs[] = $o_1068;
+  $o_1068->name = 'xml:space';
+  $o_1065->attrs[] = $o_1068;
   $o_1069 = new AttrSpec();
-  $o_1069->name = 'y';
-  $o_1064->attrs[] = $o_1069;
-  $o_0->attr_lists[] = $o_1064;
-  $o_1070 = new AttrList();
-  $o_1070->name = 'svg-presentation-attributes';
-  $o_1071 = new AttrSpec();
-  $o_1071->name = 'alignment-baseline';
-  $o_1070->attrs[] = $o_1071;
+  $o_1069->name = 'xmlns';
+  $o_1065->attrs[] = $o_1069;
+  $o_1070 = new AttrSpec();
+  $o_1070->name = 'xmlns:xlink';
+  $o_1065->attrs[] = $o_1070;
+  $o_0->attr_lists[] = $o_1065;
+  $o_1071 = new AttrList();
+  $o_1071->name = 'svg-filter-primitive-attributes';
   $o_1072 = new AttrSpec();
-  $o_1072->name = 'baseline-shift';
-  $o_1070->attrs[] = $o_1072;
+  $o_1072->name = 'height';
+  $o_1071->attrs[] = $o_1072;
   $o_1073 = new AttrSpec();
-  $o_1073->name = 'clip';
-  $o_1070->attrs[] = $o_1073;
+  $o_1073->name = 'result';
+  $o_1071->attrs[] = $o_1073;
   $o_1074 = new AttrSpec();
-  $o_1074->name = 'clip-path';
-  $o_1070->attrs[] = $o_1074;
+  $o_1074->name = 'width';
+  $o_1071->attrs[] = $o_1074;
   $o_1075 = new AttrSpec();
-  $o_1075->name = 'clip-rule';
-  $o_1070->attrs[] = $o_1075;
+  $o_1075->name = 'x';
+  $o_1071->attrs[] = $o_1075;
   $o_1076 = new AttrSpec();
-  $o_1076->name = 'color';
-  $o_1070->attrs[] = $o_1076;
-  $o_1077 = new AttrSpec();
-  $o_1077->name = 'color-interpolation';
-  $o_1070->attrs[] = $o_1077;
+  $o_1076->name = 'y';
+  $o_1071->attrs[] = $o_1076;
+  $o_0->attr_lists[] = $o_1071;
+  $o_1077 = new AttrList();
+  $o_1077->name = 'svg-presentation-attributes';
   $o_1078 = new AttrSpec();
-  $o_1078->name = 'color-interpolation-filters';
-  $o_1070->attrs[] = $o_1078;
+  $o_1078->name = 'alignment-baseline';
+  $o_1077->attrs[] = $o_1078;
   $o_1079 = new AttrSpec();
-  $o_1079->name = 'color-profile';
-  $o_1070->attrs[] = $o_1079;
+  $o_1079->name = 'baseline-shift';
+  $o_1077->attrs[] = $o_1079;
   $o_1080 = new AttrSpec();
-  $o_1080->name = 'color-rendering';
-  $o_1070->attrs[] = $o_1080;
+  $o_1080->name = 'clip';
+  $o_1077->attrs[] = $o_1080;
   $o_1081 = new AttrSpec();
-  $o_1081->name = 'cursor';
-  $o_1070->attrs[] = $o_1081;
+  $o_1081->name = 'clip-path';
+  $o_1077->attrs[] = $o_1081;
   $o_1082 = new AttrSpec();
-  $o_1082->name = 'direction';
-  $o_1070->attrs[] = $o_1082;
+  $o_1082->name = 'clip-rule';
+  $o_1077->attrs[] = $o_1082;
   $o_1083 = new AttrSpec();
-  $o_1083->name = 'display';
-  $o_1070->attrs[] = $o_1083;
+  $o_1083->name = 'color';
+  $o_1077->attrs[] = $o_1083;
   $o_1084 = new AttrSpec();
-  $o_1084->name = 'dominant-baseline';
-  $o_1070->attrs[] = $o_1084;
+  $o_1084->name = 'color-interpolation';
+  $o_1077->attrs[] = $o_1084;
   $o_1085 = new AttrSpec();
-  $o_1085->name = 'enable-background';
-  $o_1070->attrs[] = $o_1085;
+  $o_1085->name = 'color-interpolation-filters';
+  $o_1077->attrs[] = $o_1085;
   $o_1086 = new AttrSpec();
-  $o_1086->name = 'fill';
-  $o_1070->attrs[] = $o_1086;
+  $o_1086->name = 'color-profile';
+  $o_1077->attrs[] = $o_1086;
   $o_1087 = new AttrSpec();
-  $o_1087->name = 'fill-opacity';
-  $o_1070->attrs[] = $o_1087;
+  $o_1087->name = 'color-rendering';
+  $o_1077->attrs[] = $o_1087;
   $o_1088 = new AttrSpec();
-  $o_1088->name = 'fill-rule';
-  $o_1070->attrs[] = $o_1088;
+  $o_1088->name = 'cursor';
+  $o_1077->attrs[] = $o_1088;
   $o_1089 = new AttrSpec();
-  $o_1089->name = 'filter';
-  $o_1070->attrs[] = $o_1089;
+  $o_1089->name = 'direction';
+  $o_1077->attrs[] = $o_1089;
   $o_1090 = new AttrSpec();
-  $o_1090->name = 'flood-color';
-  $o_1070->attrs[] = $o_1090;
+  $o_1090->name = 'display';
+  $o_1077->attrs[] = $o_1090;
   $o_1091 = new AttrSpec();
-  $o_1091->name = 'flood-opacity';
-  $o_1070->attrs[] = $o_1091;
+  $o_1091->name = 'dominant-baseline';
+  $o_1077->attrs[] = $o_1091;
   $o_1092 = new AttrSpec();
-  $o_1092->name = 'font-family';
-  $o_1070->attrs[] = $o_1092;
+  $o_1092->name = 'enable-background';
+  $o_1077->attrs[] = $o_1092;
   $o_1093 = new AttrSpec();
-  $o_1093->name = 'font-size';
-  $o_1070->attrs[] = $o_1093;
+  $o_1093->name = 'fill';
+  $o_1077->attrs[] = $o_1093;
   $o_1094 = new AttrSpec();
-  $o_1094->name = 'font-size-adjust';
-  $o_1070->attrs[] = $o_1094;
+  $o_1094->name = 'fill-opacity';
+  $o_1077->attrs[] = $o_1094;
   $o_1095 = new AttrSpec();
-  $o_1095->name = 'font-stretch';
-  $o_1070->attrs[] = $o_1095;
+  $o_1095->name = 'fill-rule';
+  $o_1077->attrs[] = $o_1095;
   $o_1096 = new AttrSpec();
-  $o_1096->name = 'font-style';
-  $o_1070->attrs[] = $o_1096;
+  $o_1096->name = 'filter';
+  $o_1077->attrs[] = $o_1096;
   $o_1097 = new AttrSpec();
-  $o_1097->name = 'font-variant';
-  $o_1070->attrs[] = $o_1097;
+  $o_1097->name = 'flood-color';
+  $o_1077->attrs[] = $o_1097;
   $o_1098 = new AttrSpec();
-  $o_1098->name = 'font-weight';
-  $o_1070->attrs[] = $o_1098;
+  $o_1098->name = 'flood-opacity';
+  $o_1077->attrs[] = $o_1098;
   $o_1099 = new AttrSpec();
-  $o_1099->name = 'glyph-orientation-horizontal';
-  $o_1070->attrs[] = $o_1099;
+  $o_1099->name = 'font-family';
+  $o_1077->attrs[] = $o_1099;
   $o_1100 = new AttrSpec();
-  $o_1100->name = 'glyph-orientation-vertical';
-  $o_1070->attrs[] = $o_1100;
+  $o_1100->name = 'font-size';
+  $o_1077->attrs[] = $o_1100;
   $o_1101 = new AttrSpec();
-  $o_1101->name = 'image-rendering';
-  $o_1070->attrs[] = $o_1101;
+  $o_1101->name = 'font-size-adjust';
+  $o_1077->attrs[] = $o_1101;
   $o_1102 = new AttrSpec();
-  $o_1102->name = 'kerning';
-  $o_1070->attrs[] = $o_1102;
+  $o_1102->name = 'font-stretch';
+  $o_1077->attrs[] = $o_1102;
   $o_1103 = new AttrSpec();
-  $o_1103->name = 'letter-spacing';
-  $o_1070->attrs[] = $o_1103;
+  $o_1103->name = 'font-style';
+  $o_1077->attrs[] = $o_1103;
   $o_1104 = new AttrSpec();
-  $o_1104->name = 'lighting-color';
-  $o_1070->attrs[] = $o_1104;
+  $o_1104->name = 'font-variant';
+  $o_1077->attrs[] = $o_1104;
   $o_1105 = new AttrSpec();
-  $o_1105->name = 'marker-end';
-  $o_1070->attrs[] = $o_1105;
+  $o_1105->name = 'font-weight';
+  $o_1077->attrs[] = $o_1105;
   $o_1106 = new AttrSpec();
-  $o_1106->name = 'marker-mid';
-  $o_1070->attrs[] = $o_1106;
+  $o_1106->name = 'glyph-orientation-horizontal';
+  $o_1077->attrs[] = $o_1106;
   $o_1107 = new AttrSpec();
-  $o_1107->name = 'marker-start';
-  $o_1070->attrs[] = $o_1107;
+  $o_1107->name = 'glyph-orientation-vertical';
+  $o_1077->attrs[] = $o_1107;
   $o_1108 = new AttrSpec();
-  $o_1108->name = 'mask';
-  $o_1070->attrs[] = $o_1108;
+  $o_1108->name = 'image-rendering';
+  $o_1077->attrs[] = $o_1108;
   $o_1109 = new AttrSpec();
-  $o_1109->name = 'opacity';
-  $o_1070->attrs[] = $o_1109;
+  $o_1109->name = 'kerning';
+  $o_1077->attrs[] = $o_1109;
   $o_1110 = new AttrSpec();
-  $o_1110->name = 'overflow';
-  $o_1070->attrs[] = $o_1110;
+  $o_1110->name = 'letter-spacing';
+  $o_1077->attrs[] = $o_1110;
   $o_1111 = new AttrSpec();
-  $o_1111->name = 'pointer-events';
-  $o_1070->attrs[] = $o_1111;
+  $o_1111->name = 'lighting-color';
+  $o_1077->attrs[] = $o_1111;
   $o_1112 = new AttrSpec();
-  $o_1112->name = 'shape-rendering';
-  $o_1070->attrs[] = $o_1112;
+  $o_1112->name = 'marker-end';
+  $o_1077->attrs[] = $o_1112;
   $o_1113 = new AttrSpec();
-  $o_1113->name = 'stop-color';
-  $o_1070->attrs[] = $o_1113;
+  $o_1113->name = 'marker-mid';
+  $o_1077->attrs[] = $o_1113;
   $o_1114 = new AttrSpec();
-  $o_1114->name = 'stop-opacity';
-  $o_1070->attrs[] = $o_1114;
+  $o_1114->name = 'marker-start';
+  $o_1077->attrs[] = $o_1114;
   $o_1115 = new AttrSpec();
-  $o_1115->name = 'stroke';
-  $o_1070->attrs[] = $o_1115;
+  $o_1115->name = 'mask';
+  $o_1077->attrs[] = $o_1115;
   $o_1116 = new AttrSpec();
-  $o_1116->name = 'stroke-dasharray';
-  $o_1070->attrs[] = $o_1116;
+  $o_1116->name = 'opacity';
+  $o_1077->attrs[] = $o_1116;
   $o_1117 = new AttrSpec();
-  $o_1117->name = 'stroke-dashoffset';
-  $o_1070->attrs[] = $o_1117;
+  $o_1117->name = 'overflow';
+  $o_1077->attrs[] = $o_1117;
   $o_1118 = new AttrSpec();
-  $o_1118->name = 'stroke-linecap';
-  $o_1070->attrs[] = $o_1118;
+  $o_1118->name = 'pointer-events';
+  $o_1077->attrs[] = $o_1118;
   $o_1119 = new AttrSpec();
-  $o_1119->name = 'stroke-linejoin';
-  $o_1070->attrs[] = $o_1119;
+  $o_1119->name = 'shape-rendering';
+  $o_1077->attrs[] = $o_1119;
   $o_1120 = new AttrSpec();
-  $o_1120->name = 'stroke-miterlimit';
-  $o_1070->attrs[] = $o_1120;
+  $o_1120->name = 'stop-color';
+  $o_1077->attrs[] = $o_1120;
   $o_1121 = new AttrSpec();
-  $o_1121->name = 'stroke-opacity';
-  $o_1070->attrs[] = $o_1121;
+  $o_1121->name = 'stop-opacity';
+  $o_1077->attrs[] = $o_1121;
   $o_1122 = new AttrSpec();
-  $o_1122->name = 'stroke-width';
-  $o_1070->attrs[] = $o_1122;
+  $o_1122->name = 'stroke';
+  $o_1077->attrs[] = $o_1122;
   $o_1123 = new AttrSpec();
-  $o_1123->name = 'text-anchor';
-  $o_1070->attrs[] = $o_1123;
+  $o_1123->name = 'stroke-dasharray';
+  $o_1077->attrs[] = $o_1123;
   $o_1124 = new AttrSpec();
-  $o_1124->name = 'text-decoration';
-  $o_1070->attrs[] = $o_1124;
+  $o_1124->name = 'stroke-dashoffset';
+  $o_1077->attrs[] = $o_1124;
   $o_1125 = new AttrSpec();
-  $o_1125->name = 'text-rendering';
-  $o_1070->attrs[] = $o_1125;
+  $o_1125->name = 'stroke-linecap';
+  $o_1077->attrs[] = $o_1125;
   $o_1126 = new AttrSpec();
-  $o_1126->name = 'unicode-bidi';
-  $o_1070->attrs[] = $o_1126;
+  $o_1126->name = 'stroke-linejoin';
+  $o_1077->attrs[] = $o_1126;
   $o_1127 = new AttrSpec();
-  $o_1127->name = 'visibility';
-  $o_1070->attrs[] = $o_1127;
+  $o_1127->name = 'stroke-miterlimit';
+  $o_1077->attrs[] = $o_1127;
   $o_1128 = new AttrSpec();
-  $o_1128->name = 'word-spacing';
-  $o_1070->attrs[] = $o_1128;
+  $o_1128->name = 'stroke-opacity';
+  $o_1077->attrs[] = $o_1128;
   $o_1129 = new AttrSpec();
-  $o_1129->name = 'writing-mode';
-  $o_1070->attrs[] = $o_1129;
-  $o_0->attr_lists[] = $o_1070;
-  $o_1130 = new AttrList();
-  $o_1130->name = 'svg-transfer-function-attributes';
+  $o_1129->name = 'stroke-width';
+  $o_1077->attrs[] = $o_1129;
+  $o_1130 = new AttrSpec();
+  $o_1130->name = 'text-anchor';
+  $o_1077->attrs[] = $o_1130;
   $o_1131 = new AttrSpec();
-  $o_1131->name = 'amplitude';
-  $o_1130->attrs[] = $o_1131;
+  $o_1131->name = 'text-decoration';
+  $o_1077->attrs[] = $o_1131;
   $o_1132 = new AttrSpec();
-  $o_1132->name = 'exponent';
-  $o_1130->attrs[] = $o_1132;
+  $o_1132->name = 'text-rendering';
+  $o_1077->attrs[] = $o_1132;
   $o_1133 = new AttrSpec();
-  $o_1133->name = 'intercept';
-  $o_1130->attrs[] = $o_1133;
+  $o_1133->name = 'unicode-bidi';
+  $o_1077->attrs[] = $o_1133;
   $o_1134 = new AttrSpec();
-  $o_1134->name = 'offset';
-  $o_1130->attrs[] = $o_1134;
+  $o_1134->name = 'visibility';
+  $o_1077->attrs[] = $o_1134;
   $o_1135 = new AttrSpec();
-  $o_1135->name = 'slope';
-  $o_1130->attrs[] = $o_1135;
+  $o_1135->name = 'word-spacing';
+  $o_1077->attrs[] = $o_1135;
   $o_1136 = new AttrSpec();
-  $o_1136->name = 'table';
-  $o_1130->attrs[] = $o_1136;
-  $o_1137 = new AttrSpec();
-  $o_1137->name = 'tablevalues';
-  $o_1130->attrs[] = $o_1137;
-  $o_0->attr_lists[] = $o_1130;
-  $o_1138 = new AttrList();
-  $o_1138->name = 'svg-xlink-attributes';
+  $o_1136->name = 'writing-mode';
+  $o_1077->attrs[] = $o_1136;
+  $o_0->attr_lists[] = $o_1077;
+  $o_1137 = new AttrList();
+  $o_1137->name = 'svg-transfer-function-attributes';
+  $o_1138 = new AttrSpec();
+  $o_1138->name = 'amplitude';
+  $o_1137->attrs[] = $o_1138;
   $o_1139 = new AttrSpec();
-  $o_1139->name = 'xlink:actuate';
-  $o_1138->attrs[] = $o_1139;
+  $o_1139->name = 'exponent';
+  $o_1137->attrs[] = $o_1139;
   $o_1140 = new AttrSpec();
-  $o_1140->name = 'xlink:arcrole';
-  $o_1138->attrs[] = $o_1140;
+  $o_1140->name = 'intercept';
+  $o_1137->attrs[] = $o_1140;
   $o_1141 = new AttrSpec();
-  $o_1141->name = 'xlink:href';
-  $o_1141->value_regex = '#.*';
-  $o_1138->attrs[] = $o_1141;
+  $o_1141->name = 'offset';
+  $o_1137->attrs[] = $o_1141;
   $o_1142 = new AttrSpec();
-  $o_1142->name = 'xlink:role';
-  $o_1138->attrs[] = $o_1142;
+  $o_1142->name = 'slope';
+  $o_1137->attrs[] = $o_1142;
   $o_1143 = new AttrSpec();
-  $o_1143->name = 'xlink:show';
-  $o_1138->attrs[] = $o_1143;
+  $o_1143->name = 'table';
+  $o_1137->attrs[] = $o_1143;
   $o_1144 = new AttrSpec();
-  $o_1144->name = 'xlink:title';
-  $o_1138->attrs[] = $o_1144;
-  $o_1145 = new AttrSpec();
-  $o_1145->name = 'xlink:type';
-  $o_1138->attrs[] = $o_1145;
-  $o_0->attr_lists[] = $o_1138;
-  $o_1146 = new AttrList();
-  $o_1146->name = 'mandatory-src-or-srcset';
+  $o_1144->name = 'tablevalues';
+  $o_1137->attrs[] = $o_1144;
+  $o_0->attr_lists[] = $o_1137;
+  $o_1145 = new AttrList();
+  $o_1145->name = 'svg-xlink-attributes';
+  $o_1146 = new AttrSpec();
+  $o_1146->name = 'xlink:actuate';
+  $o_1145->attrs[] = $o_1146;
   $o_1147 = new AttrSpec();
-  $o_1147->name = 'src';
-  $o_1147->alternative_names = ['srcset'];
-  $o_1147->mandatory = true;
-  $o_1148 = new UrlSpec();
-  $o_1148->allowed_protocol = ['data', 'http', 'https'];
-  $o_1148->allow_relative = true;
-  $o_1147->value_url = $o_1148;
-  $o_1146->attrs[] = $o_1147;
-  $o_0->attr_lists[] = $o_1146;
-  $o_1149 = new AttrList();
-  $o_1149->name = 'extended-amp-global';
+  $o_1147->name = 'xlink:arcrole';
+  $o_1145->attrs[] = $o_1147;
+  $o_1148 = new AttrSpec();
+  $o_1148->name = 'xlink:href';
+  $o_1148->value_regex = '#.*';
+  $o_1145->attrs[] = $o_1148;
+  $o_1149 = new AttrSpec();
+  $o_1149->name = 'xlink:role';
+  $o_1145->attrs[] = $o_1149;
   $o_1150 = new AttrSpec();
-  $o_1150->name = 'media';
-  $o_1149->attrs[] = $o_1150;
+  $o_1150->name = 'xlink:show';
+  $o_1145->attrs[] = $o_1150;
   $o_1151 = new AttrSpec();
-  $o_1151->name = 'noloading';
-  $o_1151->value = '';
-  $o_1149->attrs[] = $o_1151;
-  $o_0->attr_lists[] = $o_1149;
-  $o_1152 = new AttrList();
-  $o_1152->name = '$AMP_LAYOUT_ATTRS';
-  $o_1153 = new AttrSpec();
-  $o_1153->name = 'height';
-  $o_1152->attrs[] = $o_1153;
+  $o_1151->name = 'xlink:title';
+  $o_1145->attrs[] = $o_1151;
+  $o_1152 = new AttrSpec();
+  $o_1152->name = 'xlink:type';
+  $o_1145->attrs[] = $o_1152;
+  $o_0->attr_lists[] = $o_1145;
+  $o_1153 = new AttrList();
+  $o_1153->name = 'mandatory-src-or-srcset';
   $o_1154 = new AttrSpec();
-  $o_1154->name = 'heights';
-  $o_1152->attrs[] = $o_1154;
-  $o_1155 = new AttrSpec();
-  $o_1155->name = 'layout';
-  $o_1152->attrs[] = $o_1155;
-  $o_1156 = new AttrSpec();
-  $o_1156->name = 'sizes';
-  $o_1152->attrs[] = $o_1156;
+  $o_1154->name = 'src';
+  $o_1154->alternative_names = ['srcset'];
+  $o_1154->mandatory = true;
+  $o_1155 = new UrlSpec();
+  $o_1155->allowed_protocol = ['data', 'http', 'https'];
+  $o_1155->allow_relative = true;
+  $o_1154->value_url = $o_1155;
+  $o_1153->attrs[] = $o_1154;
+  $o_0->attr_lists[] = $o_1153;
+  $o_1156 = new AttrList();
+  $o_1156->name = 'extended-amp-global';
   $o_1157 = new AttrSpec();
-  $o_1157->name = 'width';
-  $o_1152->attrs[] = $o_1157;
-  $o_0->attr_lists[] = $o_1152;
-  $o_1158 = new AttrList();
-  $o_1158->name = '$GLOBAL_ATTRS';
-  $o_1159 = new AttrSpec();
-  $o_1159->name = 'itemid';
-  $o_1158->attrs[] = $o_1159;
+  $o_1157->name = 'media';
+  $o_1156->attrs[] = $o_1157;
+  $o_1158 = new AttrSpec();
+  $o_1158->name = 'noloading';
+  $o_1158->value = '';
+  $o_1156->attrs[] = $o_1158;
+  $o_0->attr_lists[] = $o_1156;
+  $o_1159 = new AttrList();
+  $o_1159->name = '$AMP_LAYOUT_ATTRS';
   $o_1160 = new AttrSpec();
-  $o_1160->name = 'itemprop';
-  $o_1158->attrs[] = $o_1160;
+  $o_1160->name = 'height';
+  $o_1159->attrs[] = $o_1160;
   $o_1161 = new AttrSpec();
-  $o_1161->name = 'itemref';
-  $o_1158->attrs[] = $o_1161;
+  $o_1161->name = 'heights';
+  $o_1159->attrs[] = $o_1161;
   $o_1162 = new AttrSpec();
-  $o_1162->name = 'itemscope';
-  $o_1158->attrs[] = $o_1162;
+  $o_1162->name = 'layout';
+  $o_1159->attrs[] = $o_1162;
   $o_1163 = new AttrSpec();
-  $o_1163->name = 'itemtype';
-  $o_1158->attrs[] = $o_1163;
+  $o_1163->name = 'sizes';
+  $o_1159->attrs[] = $o_1163;
   $o_1164 = new AttrSpec();
-  $o_1164->name = 'accesskey';
-  $o_1158->attrs[] = $o_1164;
-  $o_1165 = new AttrSpec();
-  $o_1165->name = 'class';
-  $o_1158->attrs[] = $o_1165;
+  $o_1164->name = 'width';
+  $o_1159->attrs[] = $o_1164;
+  $o_0->attr_lists[] = $o_1159;
+  $o_1165 = new AttrList();
+  $o_1165->name = '$GLOBAL_ATTRS';
   $o_1166 = new AttrSpec();
-  $o_1166->name = 'dir';
-  $o_1158->attrs[] = $o_1166;
+  $o_1166->name = 'itemid';
+  $o_1165->attrs[] = $o_1166;
   $o_1167 = new AttrSpec();
-  $o_1167->name = 'draggable';
-  $o_1158->attrs[] = $o_1167;
+  $o_1167->name = 'itemprop';
+  $o_1165->attrs[] = $o_1167;
   $o_1168 = new AttrSpec();
-  $o_1168->name = 'id';
-  $o_1158->attrs[] = $o_1168;
+  $o_1168->name = 'itemref';
+  $o_1165->attrs[] = $o_1168;
   $o_1169 = new AttrSpec();
-  $o_1169->name = 'lang';
-  $o_1158->attrs[] = $o_1169;
+  $o_1169->name = 'itemscope';
+  $o_1165->attrs[] = $o_1169;
   $o_1170 = new AttrSpec();
-  $o_1170->name = 'tabindex';
-  $o_1158->attrs[] = $o_1170;
+  $o_1170->name = 'itemtype';
+  $o_1165->attrs[] = $o_1170;
   $o_1171 = new AttrSpec();
-  $o_1171->name = 'title';
-  $o_1158->attrs[] = $o_1171;
+  $o_1171->name = 'accesskey';
+  $o_1165->attrs[] = $o_1171;
   $o_1172 = new AttrSpec();
-  $o_1172->name = 'translate';
-  $o_1158->attrs[] = $o_1172;
+  $o_1172->name = 'class';
+  $o_1165->attrs[] = $o_1172;
   $o_1173 = new AttrSpec();
-  $o_1173->name = 'aria-activedescendant';
-  $o_1158->attrs[] = $o_1173;
+  $o_1173->name = 'dir';
+  $o_1165->attrs[] = $o_1173;
   $o_1174 = new AttrSpec();
-  $o_1174->name = 'aria-atomic';
-  $o_1158->attrs[] = $o_1174;
+  $o_1174->name = 'draggable';
+  $o_1165->attrs[] = $o_1174;
   $o_1175 = new AttrSpec();
-  $o_1175->name = 'aria-autocomplete';
-  $o_1158->attrs[] = $o_1175;
+  $o_1175->name = 'id';
+  $o_1165->attrs[] = $o_1175;
   $o_1176 = new AttrSpec();
-  $o_1176->name = 'aria-busy';
-  $o_1158->attrs[] = $o_1176;
+  $o_1176->name = 'lang';
+  $o_1165->attrs[] = $o_1176;
   $o_1177 = new AttrSpec();
-  $o_1177->name = 'aria-checked';
-  $o_1158->attrs[] = $o_1177;
+  $o_1177->name = 'tabindex';
+  $o_1165->attrs[] = $o_1177;
   $o_1178 = new AttrSpec();
-  $o_1178->name = 'aria-controls';
-  $o_1158->attrs[] = $o_1178;
+  $o_1178->name = 'title';
+  $o_1165->attrs[] = $o_1178;
   $o_1179 = new AttrSpec();
-  $o_1179->name = 'aria-describedby';
-  $o_1158->attrs[] = $o_1179;
+  $o_1179->name = 'translate';
+  $o_1165->attrs[] = $o_1179;
   $o_1180 = new AttrSpec();
-  $o_1180->name = 'aria-disabled';
-  $o_1158->attrs[] = $o_1180;
+  $o_1180->name = 'aria-activedescendant';
+  $o_1165->attrs[] = $o_1180;
   $o_1181 = new AttrSpec();
-  $o_1181->name = 'aria-dropeffect';
-  $o_1158->attrs[] = $o_1181;
+  $o_1181->name = 'aria-atomic';
+  $o_1165->attrs[] = $o_1181;
   $o_1182 = new AttrSpec();
-  $o_1182->name = 'aria-expanded';
-  $o_1158->attrs[] = $o_1182;
+  $o_1182->name = 'aria-autocomplete';
+  $o_1165->attrs[] = $o_1182;
   $o_1183 = new AttrSpec();
-  $o_1183->name = 'aria-flowto';
-  $o_1158->attrs[] = $o_1183;
+  $o_1183->name = 'aria-busy';
+  $o_1165->attrs[] = $o_1183;
   $o_1184 = new AttrSpec();
-  $o_1184->name = 'aria-grabbed';
-  $o_1158->attrs[] = $o_1184;
+  $o_1184->name = 'aria-checked';
+  $o_1165->attrs[] = $o_1184;
   $o_1185 = new AttrSpec();
-  $o_1185->name = 'aria-haspopup';
-  $o_1158->attrs[] = $o_1185;
+  $o_1185->name = 'aria-controls';
+  $o_1165->attrs[] = $o_1185;
   $o_1186 = new AttrSpec();
-  $o_1186->name = 'aria-hidden';
-  $o_1158->attrs[] = $o_1186;
+  $o_1186->name = 'aria-describedby';
+  $o_1165->attrs[] = $o_1186;
   $o_1187 = new AttrSpec();
-  $o_1187->name = 'aria-invalid';
-  $o_1158->attrs[] = $o_1187;
+  $o_1187->name = 'aria-disabled';
+  $o_1165->attrs[] = $o_1187;
   $o_1188 = new AttrSpec();
-  $o_1188->name = 'aria-label';
-  $o_1158->attrs[] = $o_1188;
+  $o_1188->name = 'aria-dropeffect';
+  $o_1165->attrs[] = $o_1188;
   $o_1189 = new AttrSpec();
-  $o_1189->name = 'aria-labelledby';
-  $o_1158->attrs[] = $o_1189;
+  $o_1189->name = 'aria-expanded';
+  $o_1165->attrs[] = $o_1189;
   $o_1190 = new AttrSpec();
-  $o_1190->name = 'aria-level';
-  $o_1158->attrs[] = $o_1190;
+  $o_1190->name = 'aria-flowto';
+  $o_1165->attrs[] = $o_1190;
   $o_1191 = new AttrSpec();
-  $o_1191->name = 'aria-live';
-  $o_1158->attrs[] = $o_1191;
+  $o_1191->name = 'aria-grabbed';
+  $o_1165->attrs[] = $o_1191;
   $o_1192 = new AttrSpec();
-  $o_1192->name = 'aria-multiline';
-  $o_1158->attrs[] = $o_1192;
+  $o_1192->name = 'aria-haspopup';
+  $o_1165->attrs[] = $o_1192;
   $o_1193 = new AttrSpec();
-  $o_1193->name = 'aria-multiselectable';
-  $o_1158->attrs[] = $o_1193;
+  $o_1193->name = 'aria-hidden';
+  $o_1165->attrs[] = $o_1193;
   $o_1194 = new AttrSpec();
-  $o_1194->name = 'aria-orientation';
-  $o_1158->attrs[] = $o_1194;
+  $o_1194->name = 'aria-invalid';
+  $o_1165->attrs[] = $o_1194;
   $o_1195 = new AttrSpec();
-  $o_1195->name = 'aria-owns';
-  $o_1158->attrs[] = $o_1195;
+  $o_1195->name = 'aria-label';
+  $o_1165->attrs[] = $o_1195;
   $o_1196 = new AttrSpec();
-  $o_1196->name = 'aria-posinset';
-  $o_1158->attrs[] = $o_1196;
+  $o_1196->name = 'aria-labelledby';
+  $o_1165->attrs[] = $o_1196;
   $o_1197 = new AttrSpec();
-  $o_1197->name = 'aria-pressed';
-  $o_1158->attrs[] = $o_1197;
+  $o_1197->name = 'aria-level';
+  $o_1165->attrs[] = $o_1197;
   $o_1198 = new AttrSpec();
-  $o_1198->name = 'aria-readonly';
-  $o_1158->attrs[] = $o_1198;
+  $o_1198->name = 'aria-live';
+  $o_1165->attrs[] = $o_1198;
   $o_1199 = new AttrSpec();
-  $o_1199->name = 'aria-relevant';
-  $o_1158->attrs[] = $o_1199;
+  $o_1199->name = 'aria-multiline';
+  $o_1165->attrs[] = $o_1199;
   $o_1200 = new AttrSpec();
-  $o_1200->name = 'aria-required';
-  $o_1158->attrs[] = $o_1200;
+  $o_1200->name = 'aria-multiselectable';
+  $o_1165->attrs[] = $o_1200;
   $o_1201 = new AttrSpec();
-  $o_1201->name = 'aria-selected';
-  $o_1158->attrs[] = $o_1201;
+  $o_1201->name = 'aria-orientation';
+  $o_1165->attrs[] = $o_1201;
   $o_1202 = new AttrSpec();
-  $o_1202->name = 'aria-setsize';
-  $o_1158->attrs[] = $o_1202;
+  $o_1202->name = 'aria-owns';
+  $o_1165->attrs[] = $o_1202;
   $o_1203 = new AttrSpec();
-  $o_1203->name = 'aria-sort';
-  $o_1158->attrs[] = $o_1203;
+  $o_1203->name = 'aria-posinset';
+  $o_1165->attrs[] = $o_1203;
   $o_1204 = new AttrSpec();
-  $o_1204->name = 'aria-valuemax';
-  $o_1158->attrs[] = $o_1204;
+  $o_1204->name = 'aria-pressed';
+  $o_1165->attrs[] = $o_1204;
   $o_1205 = new AttrSpec();
-  $o_1205->name = 'aria-valuemin';
-  $o_1158->attrs[] = $o_1205;
+  $o_1205->name = 'aria-readonly';
+  $o_1165->attrs[] = $o_1205;
   $o_1206 = new AttrSpec();
-  $o_1206->name = 'aria-valuenow';
-  $o_1158->attrs[] = $o_1206;
+  $o_1206->name = 'aria-relevant';
+  $o_1165->attrs[] = $o_1206;
   $o_1207 = new AttrSpec();
-  $o_1207->name = 'aria-valuetext';
-  $o_1158->attrs[] = $o_1207;
+  $o_1207->name = 'aria-required';
+  $o_1165->attrs[] = $o_1207;
   $o_1208 = new AttrSpec();
-  $o_1208->name = 'on';
-  $o_1209 = new AttrTriggerSpec();
-  $o_1209->if_value_regex = 'tap:.*';
-  $o_1209->also_requires_attr = ['role', 'tabindex'];
-  $o_1208->trigger = $o_1209;
-  $o_1158->attrs[] = $o_1208;
+  $o_1208->name = 'aria-selected';
+  $o_1165->attrs[] = $o_1208;
+  $o_1209 = new AttrSpec();
+  $o_1209->name = 'aria-setsize';
+  $o_1165->attrs[] = $o_1209;
   $o_1210 = new AttrSpec();
-  $o_1210->name = 'role';
-  $o_1158->attrs[] = $o_1210;
+  $o_1210->name = 'aria-sort';
+  $o_1165->attrs[] = $o_1210;
   $o_1211 = new AttrSpec();
-  $o_1211->name = 'placeholder';
-  $o_1211->value = '';
-  $o_1158->attrs[] = $o_1211;
+  $o_1211->name = 'aria-valuemax';
+  $o_1165->attrs[] = $o_1211;
   $o_1212 = new AttrSpec();
-  $o_1212->name = 'fallback';
-  $o_1212->value = '';
-  $o_1158->attrs[] = $o_1212;
+  $o_1212->name = 'aria-valuemin';
+  $o_1165->attrs[] = $o_1212;
   $o_1213 = new AttrSpec();
-  $o_1213->name = 'lightbox';
-  $o_1158->attrs[] = $o_1213;
+  $o_1213->name = 'aria-valuenow';
+  $o_1165->attrs[] = $o_1213;
   $o_1214 = new AttrSpec();
-  $o_1214->name = 'overflow';
-  $o_1158->attrs[] = $o_1214;
+  $o_1214->name = 'aria-valuetext';
+  $o_1165->attrs[] = $o_1214;
   $o_1215 = new AttrSpec();
-  $o_1215->name = 'amp-access';
-  $o_1158->attrs[] = $o_1215;
-  $o_1216 = new AttrSpec();
-  $o_1216->name = 'amp-access-behavior';
-  $o_1158->attrs[] = $o_1216;
+  $o_1215->name = 'on';
+  $o_1216 = new AttrTriggerSpec();
+  $o_1216->if_value_regex = 'tap:.*';
+  $o_1216->also_requires_attr = ['role', 'tabindex'];
+  $o_1215->trigger = $o_1216;
+  $o_1165->attrs[] = $o_1215;
   $o_1217 = new AttrSpec();
-  $o_1217->name = 'amp-access-hide';
-  $o_1158->attrs[] = $o_1217;
+  $o_1217->name = 'role';
+  $o_1165->attrs[] = $o_1217;
   $o_1218 = new AttrSpec();
-  $o_1218->name = 'amp-access-id';
-  $o_1158->attrs[] = $o_1218;
+  $o_1218->name = 'placeholder';
+  $o_1218->value = '';
+  $o_1165->attrs[] = $o_1218;
   $o_1219 = new AttrSpec();
-  $o_1219->name = 'amp-access-loader';
-  $o_1158->attrs[] = $o_1219;
+  $o_1219->name = 'fallback';
+  $o_1219->value = '';
+  $o_1165->attrs[] = $o_1219;
   $o_1220 = new AttrSpec();
-  $o_1220->name = 'amp-access-loading';
-  $o_1158->attrs[] = $o_1220;
+  $o_1220->name = 'lightbox';
+  $o_1165->attrs[] = $o_1220;
   $o_1221 = new AttrSpec();
-  $o_1221->name = 'amp-access-off';
-  $o_1158->attrs[] = $o_1221;
+  $o_1221->name = 'overflow';
+  $o_1165->attrs[] = $o_1221;
   $o_1222 = new AttrSpec();
-  $o_1222->name = 'amp-access-on';
-  $o_1158->attrs[] = $o_1222;
+  $o_1222->name = 'amp-access';
+  $o_1165->attrs[] = $o_1222;
   $o_1223 = new AttrSpec();
-  $o_1223->name = 'amp-access-show';
-  $o_1158->attrs[] = $o_1223;
+  $o_1223->name = 'amp-access-behavior';
+  $o_1165->attrs[] = $o_1223;
   $o_1224 = new AttrSpec();
-  $o_1224->name = 'amp-access-style';
-  $o_1158->attrs[] = $o_1224;
+  $o_1224->name = 'amp-access-hide';
+  $o_1165->attrs[] = $o_1224;
   $o_1225 = new AttrSpec();
-  $o_1225->name = 'amp-access-template';
-  $o_1158->attrs[] = $o_1225;
+  $o_1225->name = 'amp-access-id';
+  $o_1165->attrs[] = $o_1225;
   $o_1226 = new AttrSpec();
-  $o_1226->name = 'i-amp-access-id';
-  $o_1158->attrs[] = $o_1226;
-  $o_0->attr_lists[] = $o_1158;
+  $o_1226->name = 'amp-access-loader';
+  $o_1165->attrs[] = $o_1226;
+  $o_1227 = new AttrSpec();
+  $o_1227->name = 'amp-access-loading';
+  $o_1165->attrs[] = $o_1227;
+  $o_1228 = new AttrSpec();
+  $o_1228->name = 'amp-access-off';
+  $o_1165->attrs[] = $o_1228;
+  $o_1229 = new AttrSpec();
+  $o_1229->name = 'amp-access-on';
+  $o_1165->attrs[] = $o_1229;
+  $o_1230 = new AttrSpec();
+  $o_1230->name = 'amp-access-show';
+  $o_1165->attrs[] = $o_1230;
+  $o_1231 = new AttrSpec();
+  $o_1231->name = 'amp-access-style';
+  $o_1165->attrs[] = $o_1231;
+  $o_1232 = new AttrSpec();
+  $o_1232->name = 'amp-access-template';
+  $o_1165->attrs[] = $o_1232;
+  $o_1233 = new AttrSpec();
+  $o_1233->name = 'i-amp-access-id';
+  $o_1165->attrs[] = $o_1233;
+  $o_0->attr_lists[] = $o_1165;
   $o_0->template_spec_url = 'https://www.ampproject.org/docs/reference/extended/amp-mustache.html';
-  $o_1227 = new ErrorFormat();
-  $o_1227->code = ValidationErrorCode::UNKNOWN_CODE;
-  $o_1227->format = 'Unknown error.';
-  $o_0->error_formats[] = $o_1227;
-  $o_1228 = new ErrorFormat();
-  $o_1228->code = ValidationErrorCode::MANDATORY_TAG_MISSING;
-  $o_1228->format = 'The mandatory tag \'%1\' is missing or incorrect.';
-  $o_0->error_formats[] = $o_1228;
-  $o_1229 = new ErrorFormat();
-  $o_1229->code = ValidationErrorCode::TAG_REQUIRED_BY_MISSING;
-  $o_1229->format = 'The tag \'%1\' is missing or incorrect, but required by \'%2\'.';
-  $o_0->error_formats[] = $o_1229;
-  $o_1230 = new ErrorFormat();
-  $o_1230->code = ValidationErrorCode::ATTR_REQUIRED_BUT_MISSING;
-  $o_1230->format = 'The attribute \'%1\' in tag \'%2\' is missing or incorrect, but required by attribute \'%3\'.';
-  $o_0->error_formats[] = $o_1230;
-  $o_1231 = new ErrorFormat();
-  $o_1231->code = ValidationErrorCode::DISALLOWED_TAG;
-  $o_1231->format = 'The tag \'%1\' is disallowed.';
-  $o_0->error_formats[] = $o_1231;
-  $o_1232 = new ErrorFormat();
-  $o_1232->code = ValidationErrorCode::GENERAL_DISALLOWED_TAG;
-  $o_1232->format = 'The tag \'%1\' is disallowed except in specific forms.';
-  $o_0->error_formats[] = $o_1232;
-  $o_1233 = new ErrorFormat();
-  $o_1233->code = ValidationErrorCode::DISALLOWED_ATTR;
-  $o_1233->format = 'The attribute \'%1\' may not appear in tag \'%2\'.';
-  $o_0->error_formats[] = $o_1233;
   $o_1234 = new ErrorFormat();
-  $o_1234->code = ValidationErrorCode::INVALID_ATTR_VALUE;
-  $o_1234->format = 'The attribute \'%1\' in tag \'%2\' is set to the invalid value \'%3\'.';
+  $o_1234->code = ValidationErrorCode::UNKNOWN_CODE;
+  $o_1234->format = 'Unknown error.';
   $o_0->error_formats[] = $o_1234;
   $o_1235 = new ErrorFormat();
-  $o_1235->code = ValidationErrorCode::ATTR_VALUE_REQUIRED_BY_LAYOUT;
-  $o_1235->format = 'Invalid value \'%1\' for attribute \'%2\' in tag \'%3\' - for layout \'%4\', set the attribute \'%2\' to value \'%5\'.';
+  $o_1235->code = ValidationErrorCode::MANDATORY_TAG_MISSING;
+  $o_1235->format = 'The mandatory tag \'%1\' is missing or incorrect.';
   $o_0->error_formats[] = $o_1235;
   $o_1236 = new ErrorFormat();
-  $o_1236->code = ValidationErrorCode::IMPLIED_LAYOUT_INVALID;
-  $o_1236->format = 'The implied layout \'%1\' is not supported by tag \'%2\'.';
+  $o_1236->code = ValidationErrorCode::TAG_REQUIRED_BY_MISSING;
+  $o_1236->format = 'The tag \'%1\' is missing or incorrect, but required by \'%2\'.';
   $o_0->error_formats[] = $o_1236;
   $o_1237 = new ErrorFormat();
-  $o_1237->code = ValidationErrorCode::SPECIFIED_LAYOUT_INVALID;
-  $o_1237->format = 'The specified layout \'%1\' is not supported by tag \'%2\'.';
+  $o_1237->code = ValidationErrorCode::ATTR_REQUIRED_BUT_MISSING;
+  $o_1237->format = 'The attribute \'%1\' in tag \'%2\' is missing or incorrect, but required by attribute \'%3\'.';
   $o_0->error_formats[] = $o_1237;
   $o_1238 = new ErrorFormat();
-  $o_1238->code = ValidationErrorCode::MANDATORY_ATTR_MISSING;
-  $o_1238->format = 'The mandatory attribute \'%1\' is missing in tag \'%2\'.';
+  $o_1238->code = ValidationErrorCode::DISALLOWED_TAG;
+  $o_1238->format = 'The tag \'%1\' is disallowed.';
   $o_0->error_formats[] = $o_1238;
   $o_1239 = new ErrorFormat();
-  $o_1239->code = ValidationErrorCode::INCONSISTENT_UNITS_FOR_WIDTH_AND_HEIGHT;
-  $o_1239->format = 'Inconsistent units for width and height in tag \'%1\' - width is specified in \'%2\' whereas height is specified in \'%3\'.';
+  $o_1239->code = ValidationErrorCode::GENERAL_DISALLOWED_TAG;
+  $o_1239->format = 'The tag \'%1\' is disallowed except in specific forms.';
   $o_0->error_formats[] = $o_1239;
   $o_1240 = new ErrorFormat();
-  $o_1240->code = ValidationErrorCode::STYLESHEET_TOO_LONG_OLD_VARIANT;
-  $o_1240->format = 'The author stylesheet specified in tag \'style amp-custom\' is too long - we saw %1 bytes whereas the limit is %2 bytes.';
+  $o_1240->code = ValidationErrorCode::DISALLOWED_ATTR;
+  $o_1240->format = 'The attribute \'%1\' may not appear in tag \'%2\'.';
   $o_0->error_formats[] = $o_1240;
   $o_1241 = new ErrorFormat();
-  $o_1241->code = ValidationErrorCode::STYLESHEET_TOO_LONG;
-  $o_1241->format = 'The author stylesheet specified in tag \'%1\' is too long - we saw %2 bytes whereas the limit is %3 bytes.';
+  $o_1241->code = ValidationErrorCode::INVALID_ATTR_VALUE;
+  $o_1241->format = 'The attribute \'%1\' in tag \'%2\' is set to the invalid value \'%3\'.';
   $o_0->error_formats[] = $o_1241;
   $o_1242 = new ErrorFormat();
-  $o_1242->code = ValidationErrorCode::MANDATORY_CDATA_MISSING_OR_INCORRECT;
-  $o_1242->format = 'The mandatory text (CDATA) inside tag \'%1\' is missing or incorrect.';
+  $o_1242->code = ValidationErrorCode::ATTR_VALUE_REQUIRED_BY_LAYOUT;
+  $o_1242->format = 'Invalid value \'%1\' for attribute \'%2\' in tag \'%3\' - for layout \'%4\', set the attribute \'%2\' to value \'%5\'.';
   $o_0->error_formats[] = $o_1242;
   $o_1243 = new ErrorFormat();
-  $o_1243->code = ValidationErrorCode::CDATA_VIOLATES_BLACKLIST;
-  $o_1243->format = 'The text (CDATA) inside tag \'%1\' contains \'%2\', which is disallowed.';
+  $o_1243->code = ValidationErrorCode::IMPLIED_LAYOUT_INVALID;
+  $o_1243->format = 'The implied layout \'%1\' is not supported by tag \'%2\'.';
   $o_0->error_formats[] = $o_1243;
   $o_1244 = new ErrorFormat();
-  $o_1244->code = ValidationErrorCode::DISALLOWED_PROPERTY_IN_ATTR_VALUE;
-  $o_1244->format = 'The property \'%1\' in attribute \'%2\' in tag \'%3\' is disallowed.';
+  $o_1244->code = ValidationErrorCode::SPECIFIED_LAYOUT_INVALID;
+  $o_1244->format = 'The specified layout \'%1\' is not supported by tag \'%2\'.';
   $o_0->error_formats[] = $o_1244;
   $o_1245 = new ErrorFormat();
-  $o_1245->code = ValidationErrorCode::INVALID_PROPERTY_VALUE_IN_ATTR_VALUE;
-  $o_1245->format = 'The property \'%1\' in attribute \'%2\' in tag \'%3\' is set to \'%4\', which is invalid.';
+  $o_1245->code = ValidationErrorCode::MANDATORY_ATTR_MISSING;
+  $o_1245->format = 'The mandatory attribute \'%1\' is missing in tag \'%2\'.';
   $o_0->error_formats[] = $o_1245;
   $o_1246 = new ErrorFormat();
-  $o_1246->code = ValidationErrorCode::DUPLICATE_DIMENSION;
-  $o_1246->format = 'Multiple image candidates with the same width or pixel density found in attribute \'%1\' in tag \'%2\'.';
+  $o_1246->code = ValidationErrorCode::INCONSISTENT_UNITS_FOR_WIDTH_AND_HEIGHT;
+  $o_1246->format = 'Inconsistent units for width and height in tag \'%1\' - width is specified in \'%2\' whereas height is specified in \'%3\'.';
   $o_0->error_formats[] = $o_1246;
   $o_1247 = new ErrorFormat();
-  $o_1247->code = ValidationErrorCode::MISSING_URL;
-  $o_1247->format = 'Missing URL for attribute \'%1\' in tag \'%2\'.';
+  $o_1247->code = ValidationErrorCode::STYLESHEET_TOO_LONG_OLD_VARIANT;
+  $o_1247->format = 'The author stylesheet specified in tag \'style amp-custom\' is too long - we saw %1 bytes whereas the limit is %2 bytes.';
   $o_0->error_formats[] = $o_1247;
   $o_1248 = new ErrorFormat();
-  $o_1248->code = ValidationErrorCode::INVALID_URL;
-  $o_1248->format = 'Malformed URL \'%3\' for attribute \'%1\' in tag \'%2\'.';
+  $o_1248->code = ValidationErrorCode::STYLESHEET_TOO_LONG;
+  $o_1248->format = 'The author stylesheet specified in tag \'%1\' is too long - we saw %2 bytes whereas the limit is %3 bytes.';
   $o_0->error_formats[] = $o_1248;
   $o_1249 = new ErrorFormat();
-  $o_1249->code = ValidationErrorCode::INVALID_URL_PROTOCOL;
-  $o_1249->format = 'Invalid URL protocol \'%3:\' for attribute \'%1\' in tag \'%2\'.';
+  $o_1249->code = ValidationErrorCode::MANDATORY_CDATA_MISSING_OR_INCORRECT;
+  $o_1249->format = 'The mandatory text (CDATA) inside tag \'%1\' is missing or incorrect.';
   $o_0->error_formats[] = $o_1249;
   $o_1250 = new ErrorFormat();
-  $o_1250->code = ValidationErrorCode::DISALLOWED_RELATIVE_URL;
-  $o_1250->format = 'The relative URL \'%3\' for attribute \'%1\' in tag \'%2\' is disallowed.';
+  $o_1250->code = ValidationErrorCode::CDATA_VIOLATES_BLACKLIST;
+  $o_1250->format = 'The text (CDATA) inside tag \'%1\' contains \'%2\', which is disallowed.';
   $o_0->error_formats[] = $o_1250;
   $o_1251 = new ErrorFormat();
-  $o_1251->code = ValidationErrorCode::MANDATORY_PROPERTY_MISSING_FROM_ATTR_VALUE;
-  $o_1251->format = 'The property \'%1\' is missing from attribute \'%2\' in tag \'%3\'.';
+  $o_1251->code = ValidationErrorCode::DISALLOWED_PROPERTY_IN_ATTR_VALUE;
+  $o_1251->format = 'The property \'%1\' in attribute \'%2\' in tag \'%3\' is disallowed.';
   $o_0->error_formats[] = $o_1251;
   $o_1252 = new ErrorFormat();
-  $o_1252->code = ValidationErrorCode::UNESCAPED_TEMPLATE_IN_ATTR_VALUE;
-  $o_1252->format = 'The attribute \'%1\' in tag \'%2\' is set to \'%3\', which contains unescaped Mustache template syntax.';
+  $o_1252->code = ValidationErrorCode::INVALID_PROPERTY_VALUE_IN_ATTR_VALUE;
+  $o_1252->format = 'The property \'%1\' in attribute \'%2\' in tag \'%3\' is set to \'%4\', which is invalid.';
   $o_0->error_formats[] = $o_1252;
   $o_1253 = new ErrorFormat();
-  $o_1253->code = ValidationErrorCode::TEMPLATE_PARTIAL_IN_ATTR_VALUE;
-  $o_1253->format = 'The attribute \'%1\' in tag \'%2\' is set to \'%3\', which contains a Mustache template partial.';
+  $o_1253->code = ValidationErrorCode::DUPLICATE_DIMENSION;
+  $o_1253->format = 'Multiple image candidates with the same width or pixel density found in attribute \'%1\' in tag \'%2\'.';
   $o_0->error_formats[] = $o_1253;
   $o_1254 = new ErrorFormat();
-  $o_1254->code = ValidationErrorCode::DEPRECATED_TAG;
-  $o_1254->format = 'The tag \'%1\' is deprecated - use \'%2\' instead.';
+  $o_1254->code = ValidationErrorCode::MISSING_URL;
+  $o_1254->format = 'Missing URL for attribute \'%1\' in tag \'%2\'.';
   $o_0->error_formats[] = $o_1254;
   $o_1255 = new ErrorFormat();
-  $o_1255->code = ValidationErrorCode::DEPRECATED_ATTR;
-  $o_1255->format = 'The attribute \'%1\' in tag \'%2\' is deprecated - use \'%3\' instead.';
+  $o_1255->code = ValidationErrorCode::INVALID_URL;
+  $o_1255->format = 'Malformed URL \'%3\' for attribute \'%1\' in tag \'%2\'.';
   $o_0->error_formats[] = $o_1255;
   $o_1256 = new ErrorFormat();
-  $o_1256->code = ValidationErrorCode::DEV_MODE_ENABLED;
-  $o_1256->format = 'The attribute \'%1\' in tag \'%2\' enables the development mode. Please remove, this feature is obsolete.';
+  $o_1256->code = ValidationErrorCode::INVALID_URL_PROTOCOL;
+  $o_1256->format = 'Invalid URL protocol \'%3:\' for attribute \'%1\' in tag \'%2\'.';
   $o_0->error_formats[] = $o_1256;
   $o_1257 = new ErrorFormat();
-  $o_1257->code = ValidationErrorCode::MUTUALLY_EXCLUSIVE_ATTRS;
-  $o_1257->format = 'Mutually exclusive attributes encountered in tag \'%1\' - pick one of %2.';
+  $o_1257->code = ValidationErrorCode::DISALLOWED_RELATIVE_URL;
+  $o_1257->format = 'The relative URL \'%3\' for attribute \'%1\' in tag \'%2\' is disallowed.';
   $o_0->error_formats[] = $o_1257;
   $o_1258 = new ErrorFormat();
-  $o_1258->code = ValidationErrorCode::MANDATORY_ONEOF_ATTR_MISSING;
-  $o_1258->format = 'The tag \'%1\' is missing a mandatory attribute - pick one of %2.';
+  $o_1258->code = ValidationErrorCode::MANDATORY_PROPERTY_MISSING_FROM_ATTR_VALUE;
+  $o_1258->format = 'The property \'%1\' is missing from attribute \'%2\' in tag \'%3\'.';
   $o_0->error_formats[] = $o_1258;
   $o_1259 = new ErrorFormat();
-  $o_1259->code = ValidationErrorCode::WRONG_PARENT_TAG;
-  $o_1259->format = 'The parent tag of tag \'%1\' is \'%2\', but it can only be \'%3\'.';
+  $o_1259->code = ValidationErrorCode::UNESCAPED_TEMPLATE_IN_ATTR_VALUE;
+  $o_1259->format = 'The attribute \'%1\' in tag \'%2\' is set to \'%3\', which contains unescaped Mustache template syntax.';
   $o_0->error_formats[] = $o_1259;
   $o_1260 = new ErrorFormat();
-  $o_1260->code = ValidationErrorCode::DISALLOWED_TAG_ANCESTOR;
-  $o_1260->format = 'The tag \'%1\' may not appear as a descendant of tag \'%2\'.';
+  $o_1260->code = ValidationErrorCode::TEMPLATE_PARTIAL_IN_ATTR_VALUE;
+  $o_1260->format = 'The attribute \'%1\' in tag \'%2\' is set to \'%3\', which contains a Mustache template partial.';
   $o_0->error_formats[] = $o_1260;
   $o_1261 = new ErrorFormat();
-  $o_1261->code = ValidationErrorCode::MANDATORY_TAG_ANCESTOR;
-  $o_1261->format = 'The tag \'%1\' may only appear as a descendant of tag \'%2\'.';
+  $o_1261->code = ValidationErrorCode::DEPRECATED_TAG;
+  $o_1261->format = 'The tag \'%1\' is deprecated - use \'%2\' instead.';
   $o_0->error_formats[] = $o_1261;
   $o_1262 = new ErrorFormat();
-  $o_1262->code = ValidationErrorCode::MANDATORY_TAG_ANCESTOR_WITH_HINT;
-  $o_1262->format = 'The tag \'%1\' may only appear as a descendant of tag \'%2\'. Did you mean \'%3\'?';
+  $o_1262->code = ValidationErrorCode::DEPRECATED_ATTR;
+  $o_1262->format = 'The attribute \'%1\' in tag \'%2\' is deprecated - use \'%3\' instead.';
   $o_0->error_formats[] = $o_1262;
   $o_1263 = new ErrorFormat();
-  $o_1263->code = ValidationErrorCode::DUPLICATE_UNIQUE_TAG;
-  $o_1263->format = 'The tag \'%1\' appears more than once in the document.';
+  $o_1263->code = ValidationErrorCode::DEV_MODE_ENABLED;
+  $o_1263->format = 'The attribute \'%1\' in tag \'%2\' enables the development mode. Please remove, this feature is obsolete.';
   $o_0->error_formats[] = $o_1263;
   $o_1264 = new ErrorFormat();
-  $o_1264->code = ValidationErrorCode::TEMPLATE_IN_ATTR_NAME;
-  $o_1264->format = 'Mustache template syntax in attribute name \'%1\' in tag \'%2\'.';
+  $o_1264->code = ValidationErrorCode::MUTUALLY_EXCLUSIVE_ATTRS;
+  $o_1264->format = 'Mutually exclusive attributes encountered in tag \'%1\' - pick one of %2.';
   $o_0->error_formats[] = $o_1264;
   $o_1265 = new ErrorFormat();
-  $o_1265->code = ValidationErrorCode::ATTR_DISALLOWED_BY_IMPLIED_LAYOUT;
-  $o_1265->format = 'The attribute \'%1\' in tag \'%2\' is disallowed by implied layout \'%3\'.';
+  $o_1265->code = ValidationErrorCode::MANDATORY_ONEOF_ATTR_MISSING;
+  $o_1265->format = 'The tag \'%1\' is missing a mandatory attribute - pick one of %2.';
   $o_0->error_formats[] = $o_1265;
   $o_1266 = new ErrorFormat();
-  $o_1266->code = ValidationErrorCode::ATTR_DISALLOWED_BY_SPECIFIED_LAYOUT;
-  $o_1266->format = 'The attribute \'%1\' in tag \'%2\' is disallowed by specified layout \'%3\'.';
+  $o_1266->code = ValidationErrorCode::WRONG_PARENT_TAG;
+  $o_1266->format = 'The parent tag of tag \'%1\' is \'%2\', but it can only be \'%3\'.';
   $o_0->error_formats[] = $o_1266;
   $o_1267 = new ErrorFormat();
-  $o_1267->code = ValidationErrorCode::INCORRECT_NUM_CHILD_TAGS;
-  $o_1267->format = 'Tag \'%1\' must have %2 child tags - saw %3 child tags.';
+  $o_1267->code = ValidationErrorCode::DISALLOWED_TAG_ANCESTOR;
+  $o_1267->format = 'The tag \'%1\' may not appear as a descendant of tag \'%2\'.';
   $o_0->error_formats[] = $o_1267;
   $o_1268 = new ErrorFormat();
-  $o_1268->code = ValidationErrorCode::DISALLOWED_CHILD_TAG_NAME;
-  $o_1268->format = 'Tag \'%1\' is disallowed as child of tag \'%2\'. Child tag must be one of %3.';
+  $o_1268->code = ValidationErrorCode::MANDATORY_TAG_ANCESTOR;
+  $o_1268->format = 'The tag \'%1\' may only appear as a descendant of tag \'%2\'.';
   $o_0->error_formats[] = $o_1268;
   $o_1269 = new ErrorFormat();
-  $o_1269->code = ValidationErrorCode::DISALLOWED_FIRST_CHILD_TAG_NAME;
-  $o_1269->format = 'Tag \'%1\' is disallowed as first child of tag \'%2\'. First child tag must be one of %3.';
+  $o_1269->code = ValidationErrorCode::MANDATORY_TAG_ANCESTOR_WITH_HINT;
+  $o_1269->format = 'The tag \'%1\' may only appear as a descendant of tag \'%2\'. Did you mean \'%3\'?';
   $o_0->error_formats[] = $o_1269;
   $o_1270 = new ErrorFormat();
-  $o_1270->code = ValidationErrorCode::CSS_SYNTAX;
-  $o_1270->format = 'CSS syntax error in tag \'%1\' - %2.';
+  $o_1270->code = ValidationErrorCode::DUPLICATE_UNIQUE_TAG;
+  $o_1270->format = 'The tag \'%1\' appears more than once in the document.';
   $o_0->error_formats[] = $o_1270;
   $o_1271 = new ErrorFormat();
-  $o_1271->code = ValidationErrorCode::CSS_SYNTAX_INVALID_AT_RULE;
-  $o_1271->format = 'CSS syntax error in tag \'%1\' - saw invalid at rule \'@%2\'.';
+  $o_1271->code = ValidationErrorCode::TEMPLATE_IN_ATTR_NAME;
+  $o_1271->format = 'Mustache template syntax in attribute name \'%1\' in tag \'%2\'.';
   $o_0->error_formats[] = $o_1271;
   $o_1272 = new ErrorFormat();
-  $o_1272->code = ValidationErrorCode::CSS_SYNTAX_STRAY_TRAILING_BACKSLASH;
-  $o_1272->format = 'CSS syntax error in tag \'%1\' - stray trailing backslash.';
+  $o_1272->code = ValidationErrorCode::ATTR_DISALLOWED_BY_IMPLIED_LAYOUT;
+  $o_1272->format = 'The attribute \'%1\' in tag \'%2\' is disallowed by implied layout \'%3\'.';
   $o_0->error_formats[] = $o_1272;
   $o_1273 = new ErrorFormat();
-  $o_1273->code = ValidationErrorCode::CSS_SYNTAX_UNTERMINATED_COMMENT;
-  $o_1273->format = 'CSS syntax error in tag \'%1\' - unterminated comment.';
+  $o_1273->code = ValidationErrorCode::ATTR_DISALLOWED_BY_SPECIFIED_LAYOUT;
+  $o_1273->format = 'The attribute \'%1\' in tag \'%2\' is disallowed by specified layout \'%3\'.';
   $o_0->error_formats[] = $o_1273;
   $o_1274 = new ErrorFormat();
-  $o_1274->code = ValidationErrorCode::CSS_SYNTAX_UNTERMINATED_STRING;
-  $o_1274->format = 'CSS syntax error in tag \'%1\' - unterminated string.';
+  $o_1274->code = ValidationErrorCode::INCORRECT_NUM_CHILD_TAGS;
+  $o_1274->format = 'Tag \'%1\' must have %2 child tags - saw %3 child tags.';
   $o_0->error_formats[] = $o_1274;
   $o_1275 = new ErrorFormat();
-  $o_1275->code = ValidationErrorCode::CSS_SYNTAX_BAD_URL;
-  $o_1275->format = 'CSS syntax error in tag \'%1\' - bad url.';
+  $o_1275->code = ValidationErrorCode::DISALLOWED_CHILD_TAG_NAME;
+  $o_1275->format = 'Tag \'%1\' is disallowed as child of tag \'%2\'. Child tag must be one of %3.';
   $o_0->error_formats[] = $o_1275;
   $o_1276 = new ErrorFormat();
-  $o_1276->code = ValidationErrorCode::CSS_SYNTAX_EOF_IN_PRELUDE_OF_QUALIFIED_RULE;
-  $o_1276->format = 'CSS syntax error in tag \'%1\' - end of stylesheet encountered in prelude of a qualified rule.';
+  $o_1276->code = ValidationErrorCode::DISALLOWED_FIRST_CHILD_TAG_NAME;
+  $o_1276->format = 'Tag \'%1\' is disallowed as first child of tag \'%2\'. First child tag must be one of %3.';
   $o_0->error_formats[] = $o_1276;
   $o_1277 = new ErrorFormat();
-  $o_1277->code = ValidationErrorCode::CSS_SYNTAX_INVALID_DECLARATION;
-  $o_1277->format = 'CSS syntax error in tag \'%1\' - invalid declaration.';
+  $o_1277->code = ValidationErrorCode::CSS_SYNTAX;
+  $o_1277->format = 'CSS syntax error in tag \'%1\' - %2.';
   $o_0->error_formats[] = $o_1277;
   $o_1278 = new ErrorFormat();
-  $o_1278->code = ValidationErrorCode::CSS_SYNTAX_INCOMPLETE_DECLARATION;
-  $o_1278->format = 'CSS syntax error in tag \'%1\' - incomplete declaration.';
+  $o_1278->code = ValidationErrorCode::CSS_SYNTAX_INVALID_AT_RULE;
+  $o_1278->format = 'CSS syntax error in tag \'%1\' - saw invalid at rule \'@%2\'.';
   $o_0->error_formats[] = $o_1278;
   $o_1279 = new ErrorFormat();
-  $o_1279->code = ValidationErrorCode::CSS_SYNTAX_ERROR_IN_PSEUDO_SELECTOR;
-  $o_1279->format = 'CSS syntax error in tag \'%1\' - invalid pseudo selector.';
+  $o_1279->code = ValidationErrorCode::CSS_SYNTAX_STRAY_TRAILING_BACKSLASH;
+  $o_1279->format = 'CSS syntax error in tag \'%1\' - stray trailing backslash.';
   $o_0->error_formats[] = $o_1279;
   $o_1280 = new ErrorFormat();
-  $o_1280->code = ValidationErrorCode::CSS_SYNTAX_MISSING_SELECTOR;
-  $o_1280->format = 'CSS syntax error in tag \'%1\' - missing selector.';
+  $o_1280->code = ValidationErrorCode::CSS_SYNTAX_UNTERMINATED_COMMENT;
+  $o_1280->format = 'CSS syntax error in tag \'%1\' - unterminated comment.';
   $o_0->error_formats[] = $o_1280;
   $o_1281 = new ErrorFormat();
-  $o_1281->code = ValidationErrorCode::CSS_SYNTAX_NOT_A_SELECTOR_START;
-  $o_1281->format = 'CSS syntax error in tag \'%1\' - not a selector start.';
+  $o_1281->code = ValidationErrorCode::CSS_SYNTAX_UNTERMINATED_STRING;
+  $o_1281->format = 'CSS syntax error in tag \'%1\' - unterminated string.';
   $o_0->error_formats[] = $o_1281;
   $o_1282 = new ErrorFormat();
-  $o_1282->code = ValidationErrorCode::CSS_SYNTAX_UNPARSED_INPUT_REMAINS_IN_SELECTOR;
-  $o_1282->format = 'CSS syntax error in tag \'%1\' - unparsed input remains in selector.';
+  $o_1282->code = ValidationErrorCode::CSS_SYNTAX_BAD_URL;
+  $o_1282->format = 'CSS syntax error in tag \'%1\' - bad url.';
   $o_0->error_formats[] = $o_1282;
   $o_1283 = new ErrorFormat();
-  $o_1283->code = ValidationErrorCode::CSS_SYNTAX_MISSING_URL;
-  $o_1283->format = 'CSS syntax error in tag \'%1\' - missing url.';
+  $o_1283->code = ValidationErrorCode::CSS_SYNTAX_EOF_IN_PRELUDE_OF_QUALIFIED_RULE;
+  $o_1283->format = 'CSS syntax error in tag \'%1\' - end of stylesheet encountered in prelude of a qualified rule.';
   $o_0->error_formats[] = $o_1283;
   $o_1284 = new ErrorFormat();
-  $o_1284->code = ValidationErrorCode::CSS_SYNTAX_INVALID_URL;
-  $o_1284->format = 'CSS syntax error in tag \'%1\' - invalid url \'%2\'.';
+  $o_1284->code = ValidationErrorCode::CSS_SYNTAX_INVALID_DECLARATION;
+  $o_1284->format = 'CSS syntax error in tag \'%1\' - invalid declaration.';
   $o_0->error_formats[] = $o_1284;
   $o_1285 = new ErrorFormat();
-  $o_1285->code = ValidationErrorCode::CSS_SYNTAX_INVALID_URL_PROTOCOL;
-  $o_1285->format = 'CSS syntax error in tag \'%1\' - invalid url protocol \'%2:\'.';
+  $o_1285->code = ValidationErrorCode::CSS_SYNTAX_INCOMPLETE_DECLARATION;
+  $o_1285->format = 'CSS syntax error in tag \'%1\' - incomplete declaration.';
   $o_0->error_formats[] = $o_1285;
   $o_1286 = new ErrorFormat();
-  $o_1286->code = ValidationErrorCode::CSS_SYNTAX_DISALLOWED_RELATIVE_URL;
-  $o_1286->format = 'CSS syntax error in tag \'%1\' - disallowed relative url \'%2\'.';
+  $o_1286->code = ValidationErrorCode::CSS_SYNTAX_ERROR_IN_PSEUDO_SELECTOR;
+  $o_1286->format = 'CSS syntax error in tag \'%1\' - invalid pseudo selector.';
   $o_0->error_formats[] = $o_1286;
   $o_1287 = new ErrorFormat();
-  $o_1287->code = ValidationErrorCode::CSS_SYNTAX_INVALID_ATTR_SELECTOR;
-  $o_1287->format = 'CSS syntax error in tag \'%1\' - invalid attribute selector.';
+  $o_1287->code = ValidationErrorCode::CSS_SYNTAX_MISSING_SELECTOR;
+  $o_1287->format = 'CSS syntax error in tag \'%1\' - missing selector.';
   $o_0->error_formats[] = $o_1287;
+  $o_1288 = new ErrorFormat();
+  $o_1288->code = ValidationErrorCode::CSS_SYNTAX_NOT_A_SELECTOR_START;
+  $o_1288->format = 'CSS syntax error in tag \'%1\' - not a selector start.';
+  $o_0->error_formats[] = $o_1288;
+  $o_1289 = new ErrorFormat();
+  $o_1289->code = ValidationErrorCode::CSS_SYNTAX_UNPARSED_INPUT_REMAINS_IN_SELECTOR;
+  $o_1289->format = 'CSS syntax error in tag \'%1\' - unparsed input remains in selector.';
+  $o_0->error_formats[] = $o_1289;
+  $o_1290 = new ErrorFormat();
+  $o_1290->code = ValidationErrorCode::CSS_SYNTAX_MISSING_URL;
+  $o_1290->format = 'CSS syntax error in tag \'%1\' - missing url.';
+  $o_0->error_formats[] = $o_1290;
+  $o_1291 = new ErrorFormat();
+  $o_1291->code = ValidationErrorCode::CSS_SYNTAX_INVALID_URL;
+  $o_1291->format = 'CSS syntax error in tag \'%1\' - invalid url \'%2\'.';
+  $o_0->error_formats[] = $o_1291;
+  $o_1292 = new ErrorFormat();
+  $o_1292->code = ValidationErrorCode::CSS_SYNTAX_INVALID_URL_PROTOCOL;
+  $o_1292->format = 'CSS syntax error in tag \'%1\' - invalid url protocol \'%2:\'.';
+  $o_0->error_formats[] = $o_1292;
+  $o_1293 = new ErrorFormat();
+  $o_1293->code = ValidationErrorCode::CSS_SYNTAX_DISALLOWED_RELATIVE_URL;
+  $o_1293->format = 'CSS syntax error in tag \'%1\' - disallowed relative url \'%2\'.';
+  $o_0->error_formats[] = $o_1293;
+  $o_1294 = new ErrorFormat();
+  $o_1294->code = ValidationErrorCode::CSS_SYNTAX_INVALID_ATTR_SELECTOR;
+  $o_1294->format = 'CSS syntax error in tag \'%1\' - invalid attribute selector.';
+  $o_0->error_formats[] = $o_1294;
   return $o_0;
   }
 }
diff --git a/src/Validate/Context.php b/src/Validate/Context.php
index 52da46dc..082d2073 100644
--- a/src/Validate/Context.php
+++ b/src/Validate/Context.php
@@ -74,6 +74,7 @@ class Context
     protected $component_js = [];
 
     public static $component_mappings = [
+        'amp-ad' => 'https://cdn.ampproject.org/v0/amp-ad-0.1.js',
         'amp-analytics' => 'https://cdn.ampproject.org/v0/amp-analytics-0.1.js',
         'amp-anim' => 'https://cdn.ampproject.org/v0/amp-anim-0.1.js',
         'amp-audio' => 'https://cdn.ampproject.org/v0/amp-audio-0.1.js',
diff --git a/tests/test-data/full-html/mandatory_dimensions.html.out b/tests/test-data/full-html/mandatory_dimensions.html.out
index bb51c186..c3f5a3be 100644
--- a/tests/test-data/full-html/mandatory_dimensions.html.out
+++ b/tests/test-data/full-html/mandatory_dimensions.html.out
@@ -24,6 +24,7 @@
   <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no,minimal-ui">
   <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>
   <script async src="https://cdn.ampproject.org/v0.js"></script>
+  <script async custom-element="amp-ad" src="https://cdn.ampproject.org/v0/amp-ad-0.1.js"></script>
   <script async custom-element="amp-audio" src="https://cdn.ampproject.org/v0/amp-audio-0.1.js"></script>
   <script async custom-element="amp-lightbox" src="https://cdn.ampproject.org/v0/amp-lightbox-0.1.js"></script>
   <script async custom-element="amp-anim" src="https://cdn.ampproject.org/v0/amp-anim-0.1.js"></script>
diff --git a/tests/test-data/full-html/several_errors.html.out b/tests/test-data/full-html/several_errors.html.out
index c2eb7209..6dd54518 100644
--- a/tests/test-data/full-html/several_errors.html.out
+++ b/tests/test-data/full-html/several_errors.html.out
@@ -21,6 +21,7 @@
   <link rel="canonical" href="./regular-html-version.html">
   <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>
   
+  <script async custom-element="amp-ad" src="https://cdn.ampproject.org/v0/amp-ad-0.1.js"></script>
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width,minimum-scale=1">
 <script async src="https://cdn.ampproject.org/v0.js"></script>
diff --git a/tests/test-data/full-html/spec_example.html.out b/tests/test-data/full-html/spec_example.html.out
index cb92dd30..6abf0042 100644
--- a/tests/test-data/full-html/spec_example.html.out
+++ b/tests/test-data/full-html/spec_example.html.out
@@ -39,7 +39,8 @@
     <script async custom-element="amp-carousel" src="https://cdn.ampproject.org/v0/amp-carousel-0.1.js"></script>
     <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>
     <script async src="https://cdn.ampproject.org/v0.js"></script>
-  </head>
+    <script async custom-element="amp-ad" src="https://cdn.ampproject.org/v0/amp-ad-0.1.js"></script>
+</head>
   <body>
     <h1>Sample document</h1>
     <p>
diff --git a/tests/test-data/full-html/urls.html.out b/tests/test-data/full-html/urls.html.out
index 9406edb6..10897999 100644
--- a/tests/test-data/full-html/urls.html.out
+++ b/tests/test-data/full-html/urls.html.out
@@ -23,6 +23,7 @@
   <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no,minimal-ui">
   <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>
   <script src="https://cdn.ampproject.org/v0.js" async></script>
+  <script async custom-element="amp-ad" src="https://cdn.ampproject.org/v0/amp-ad-0.1.js"></script>
 </head>
 <body>
   <a href="https://google.com/">Valid URL</a>
diff --git a/tests/test-data/full-html/validator-amp-sidebar.html.out b/tests/test-data/full-html/validator-amp-sidebar.html.out
index fe1b62d8..369c0d47 100644
--- a/tests/test-data/full-html/validator-amp-sidebar.html.out
+++ b/tests/test-data/full-html/validator-amp-sidebar.html.out
@@ -26,6 +26,7 @@
   <script async custom-element="amp-accordion" src="https://cdn.ampproject.org/v0/amp-accordion-0.1.js"></script>
   <script async custom-element="amp-fit-text" src="https://cdn.ampproject.org/v0/amp-fit-text-0.1.js"></script>
   <script async custom-element="amp-sidebar" src="https://cdn.ampproject.org/v0/amp-sidebar-0.1.js"></script>
+  <script async custom-element="amp-ad" src="https://cdn.ampproject.org/v0/amp-ad-0.1.js"></script>
 </head>
 <body>
   <!-- Example of a valid amp-sidebar. -->

From ab6eea9ef4e0dbd506d942c97cb8549167e95514 Mon Sep 17 00:00:00 2001
From: FuzzyTree <amirw29@gmail.com>
Date: Sun, 25 Sep 2016 01:27:35 -0700
Subject: [PATCH 03/16] Add support for additional Facebook embed url schemas

---
 src/Pass/BaseFacebookPass.php                 | 49 +++++++++++++++++++
 src/Pass/FacebookNonIframeTransformPass.php   |  9 ++--
 src/Pass/IframeFacebookTagTransformPass.php   |  9 ++--
 .../facebook-iframe-fragment.html             |  4 ++
 .../facebook-iframe-fragment.html.out         | 11 ++++-
 .../facebook-non-iframe-fragment.html         | 18 +++++++
 .../facebook-non-iframe-fragment.html.out     | 42 +++++++++++++---
 7 files changed, 124 insertions(+), 18 deletions(-)
 create mode 100644 src/Pass/BaseFacebookPass.php

diff --git a/src/Pass/BaseFacebookPass.php b/src/Pass/BaseFacebookPass.php
new file mode 100644
index 00000000..0947d95f
--- /dev/null
+++ b/src/Pass/BaseFacebookPass.php
@@ -0,0 +1,49 @@
+<?php
+/*
+ * Copyright 2016 Google
+ *
+ * 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.
+ */
+
+namespace Lullabot\AMP\Pass;
+
+abstract class BaseFacebookPass extends BasePass
+{
+    /**
+     * Checks whether the given url is a valid facebook post url
+     *
+     * @param string $url
+     * @return bool
+     */
+    protected function isValidPostUrl($url)
+    {
+        return
+            // e.g. https://www.facebook.com/20531316728/posts/10154009990506729/
+            preg_match('&(*UTF8)facebook\.com/.*/posts/\d+/?&i', $url)
+            // e.g. https://www.facebook.com/photos/{photo-id}
+            // or https://www.facebook.com/SanAntonioVAMC/photos/a.411451129506.185409.351086129506/10154231221264507/?type=3&amp;theater
+            || preg_match('&(*UTF8)facebook\.com/.*photos.*&i', $url)
+            // e.g. https://www.facebook.com/photo.php?fbid={photo-id}
+            // or https://www.facebook.com/photo.php?v=10153655829445601
+            || preg_match('&(*UTF8)facebook\.com/photo\.php.*&i', $url);
+    }
+
+    protected function isValidVideoUrl($url)
+    {
+        return
+            // e.g https://www.facebook.com/facebook/videos/10153231379946729/
+            preg_match('&(*UTF8)facebook\.com/.*/videos/\d+/?&i', $url)
+            // e.g https://www.facebook.com/video.php?v=10153231379946729
+            || preg_match('&(*UTF8)facebook\.com/video\.php.*&i', $url);
+    }
+}
\ No newline at end of file
diff --git a/src/Pass/FacebookNonIframeTransformPass.php b/src/Pass/FacebookNonIframeTransformPass.php
index 392694b8..49778e16 100644
--- a/src/Pass/FacebookNonIframeTransformPass.php
+++ b/src/Pass/FacebookNonIframeTransformPass.php
@@ -38,7 +38,7 @@
  * @see https://github.com/ampproject/amphtml/blob/master/extensions/amp-facebook/amp-facebook.md
  * @see https://github.com/ampproject/amphtml/blob/master/extensions/amp-facebook/0.1/validator-amp-facebook.protoascii
  */
-class FacebookNonIframeTransformPass extends BasePass
+class FacebookNonIframeTransformPass extends BaseFacebookPass
 {
     const DEFAULT_WIDTH = 500;
     const DEFAULT_HEIGHT = 281;
@@ -109,8 +109,7 @@ protected function getFacebookEmbedAttrs(DOMQuery $el)
         }
 
         $card = true;
-        // e.g https://www.facebook.com/facebook/videos/10153231379946729/
-        if (preg_match('&(*UTF8)facebook\.com/.*/videos/\d+/?&i', $src)) {
+        if ($this->isValidVideoUrl($src)) {
             // A facebook video can be embedded as a post. Doing that enables the video "card" to display
             if ($el->attr('data-show-text') !== "false") {
                 $embed_as = 'post';
@@ -118,8 +117,8 @@ protected function getFacebookEmbedAttrs(DOMQuery $el)
             } else {
                 $embed_as = 'video';
             }
-        } // e.g. https://www.facebook.com/20531316728/posts/10154009990506729/
-        else if (preg_match('&(*UTF8)facebook\.com/.*/posts/\d+/?&i', $src)) {
+        }
+        elseif ($this->isValidPostUrl($src)) {
             $embed_as = 'post';
         } else {
             return false;
diff --git a/src/Pass/IframeFacebookTagTransformPass.php b/src/Pass/IframeFacebookTagTransformPass.php
index 281aa377..f3883247 100644
--- a/src/Pass/IframeFacebookTagTransformPass.php
+++ b/src/Pass/IframeFacebookTagTransformPass.php
@@ -54,7 +54,7 @@
  * @see https://github.com/ampproject/amphtml/blob/master/extensions/amp-facebook/amp-facebook.md
  * @see https://github.com/ampproject/amphtml/blob/master/extensions/amp-facebook/0.1/validator-amp-facebook.protoascii
  */
-class IframeFacebookTagTransformPass extends BasePass
+class IframeFacebookTagTransformPass extends BaseFacebookPass
 {
     const DEFAULT_ASPECT_RATIO = 1.7778;
     const DEFAULT_WIDTH = 500;
@@ -108,16 +108,15 @@ protected function setStandardFacebookParameters(DOMQuery $el)
             return false;
         }
 
-        // e.g https://www.facebook.com/facebook/videos/10153231379946729/
-        if (preg_match('&(*UTF8)facebook\.com/facebook/videos/\d+/?&i', $query_arr['href'])) {
+        if ($this->isValidVideoUrl($query_arr['href'])) {
             // A facebook video can be embedded as a post. Doing that enables the video "card" to display
             if (isset($query_arr['show_text']) && $query_arr['show_text'] !== "false") {
                 $embed_as = 'post';
             } else {
                 $embed_as = 'video';
             }
-        } // e.g. https://www.facebook.com/20531316728/posts/10154009990506729/
-        else if (preg_match('&(*UTF8)facebook\.com/.*/posts/\d+/?&i', $query_arr['href'])) {
+        }
+        elseif ($this->isValidPostUrl($query_arr['href'])) {
             $embed_as = 'post';
         } else {
             return false;
diff --git a/tests/test-data/fragment-html/facebook-iframe-fragment.html b/tests/test-data/fragment-html/facebook-iframe-fragment.html
index b791dd49..0278e42b 100644
--- a/tests/test-data/fragment-html/facebook-iframe-fragment.html
+++ b/tests/test-data/fragment-html/facebook-iframe-fragment.html
@@ -13,3 +13,7 @@
         width="500" height="290" style="border:none;overflow:hidden" scrolling="no" frameborder="0"
         allowTransparency="true"></iframe>
 
+<!-- post -->
+<iframe src="https://www.facebook.com/plugins/post.php?href=https%3A%2F%2Fwww.facebook.com%2Fphoto.php%3Ffbid%3D986393557241%26set%3Da.941146602501.2418915.4%26type%3D3&width=500&show_text=true&appId=1355737204455009&height=439"
+        width="500" height="439" style="border:none;overflow:hidden" scrolling="no" frameborder="0"
+        allowTransparency="true"></iframe>
diff --git a/tests/test-data/fragment-html/facebook-iframe-fragment.html.out b/tests/test-data/fragment-html/facebook-iframe-fragment.html.out
index 0806b80e..c896abd2 100644
--- a/tests/test-data/fragment-html/facebook-iframe-fragment.html.out
+++ b/tests/test-data/fragment-html/facebook-iframe-fragment.html.out
@@ -7,6 +7,8 @@
 <!-- post -->
 <amp-facebook layout="responsive" data-href="https://www.facebook.com/20531316728/posts/10154009990506729/" data-embed-as="post" height="290" width="500"></amp-facebook>
 
+<!-- post -->
+<amp-facebook layout="responsive" data-href="https://www.facebook.com/photo.php?fbid=986393557241&amp;set=a.941146602501.2418915.4&amp;type=3" data-embed-as="post" height="439" width="500"></amp-facebook>
 
 
 ORIGINAL HTML
@@ -26,7 +28,11 @@ Line 12: <iframe src="https://www.facebook.com/plugins/post.php?href=https%3A%2F
 Line 13:         width="500" height="290" style="border:none;overflow:hidden" scrolling="no" frameborder="0"
 Line 14:         allowTransparency="true"></iframe>
 Line 15: 
-Line 16: 
+Line 16: <!-- post -->
+Line 17: <iframe src="https://www.facebook.com/plugins/post.php?href=https%3A%2F%2Fwww.facebook.com%2Fphoto.php%3Ffbid%3D986393557241%26set%3Da.941146602501.2418915.4%26type%3D3&width=500&show_text=true&appId=1355737204455009&height=439"
+Line 18:         width="500" height="439" style="border:none;overflow:hidden" scrolling="no" frameborder="0"
+Line 19:         allowTransparency="true"></iframe>
+Line 20: 
 
 
 Transformations made from HTML tags to AMP custom tags
@@ -41,6 +47,9 @@ Transformations made from HTML tags to AMP custom tags
 <iframe src="https://www.facebook.com/plugins/post.php?href=https%3A%2F%2Fwww.facebook.com%2F20531316728%2Fposts%2F10154009990506729%2F&width=500&show_text=false&height=290&appId" width="500" height="... at line 14
  ACTION TAKEN: iframe facebook embed code was converted to the amp-facebook tag.
 
+<iframe src="https://www.facebook.com/plugins/post.php?href=https%3A%2F%2Fwww.facebook.com%2Fphoto.php%3Ffbid%3D986393557241%26set%3Da.941146602501.2418915.4%26type%3D3&width=500&show_text=true&appId=... at line 19
+ ACTION TAKEN: iframe facebook embed code was converted to the amp-facebook tag.
+
 
 AMP-HTML Validation Issues and Fixes
 -------------------------------------
diff --git a/tests/test-data/fragment-html/facebook-non-iframe-fragment.html b/tests/test-data/fragment-html/facebook-non-iframe-fragment.html
index 87955db7..519996e8 100644
--- a/tests/test-data/fragment-html/facebook-non-iframe-fragment.html
+++ b/tests/test-data/fragment-html/facebook-non-iframe-fragment.html
@@ -25,9 +25,27 @@
     </blockquote>
 </div>
 
+<div class="fb-video" data-href="https://www.facebook.com/video.php?v=10153231379946729" data-width="500"
+     data-show-text="true">
+    <blockquote cite="https://www.facebook.com/video.php?v=10153231379946729" class="fb-xfbml-parse-ignore"><a
+            href="https://www.facebook.com/video.php?v=10153231379946729">How to Share With Just Friends</a>
+        <p>How to share with just friends.</p>Posted by <a href="https://www.facebook.com/facebook/">Facebook</a> on
+        Friday, 5 December 2014
+    </blockquote>
+</div>
+
 <div class="fb-video" data-href="https://www.facebook.com/zuck/videos/10103066366848051/" data-width="500" data-show-text="false">
     <blockquote cite="https://www.facebook.com/zuck/videos/10103066366848051/" class="fb-xfbml-parse-ignore">
     <a href="https://www.facebook.com/zuck/videos/10103066366848051/">Live from our Townhall Q&amp;A in Rome. Comment to ask a question!</a>
     <p>Live from our Townhall Q&amp;A in Rome. Comment to ask a question!</p>Posted by <a href="https://www.facebook.com/zuck">Mark Zuckerberg</a> on Monday, August 29, 2016
     </blockquote>
+</div>
+
+<div class="fb-post"
+     data-href="https://www.facebook.com/photo.php?fbid=986393557241&amp;set=a.941146602501.2418915.4&amp;type=3"
+     data-width="500" data-show-text="true">
+    <blockquote cite="https://www.facebook.com/photo.php?fbid=986393557241&amp;set=a.941146602501.2418915.4&amp;type=3"
+                class="fb-xfbml-parse-ignore">Posted by <a href="https://www.facebook.com/zuck">Mark Zuckerberg</a> on&nbsp;<a
+            href="https://www.facebook.com/photo.php?fbid=986393557241&amp;set=a.941146602501.2418915.4&amp;type=3">Wednesday,
+        September 14, 2011</a></blockquote>
 </div>
\ No newline at end of file
diff --git a/tests/test-data/fragment-html/facebook-non-iframe-fragment.html.out b/tests/test-data/fragment-html/facebook-non-iframe-fragment.html.out
index 498795df..05e0c793 100644
--- a/tests/test-data/fragment-html/facebook-non-iframe-fragment.html.out
+++ b/tests/test-data/fragment-html/facebook-non-iframe-fragment.html.out
@@ -5,8 +5,12 @@
 
 <amp-facebook layout="responsive" data-href="https://www.facebook.com/facebook/videos/10153231379946729/" data-embed-as="post" height="366" width="500"></amp-facebook>
 
+<amp-facebook layout="responsive" data-href="https://www.facebook.com/video.php?v=10153231379946729" data-embed-as="post" height="366" width="500"></amp-facebook>
+
 <amp-facebook layout="responsive" data-href="https://www.facebook.com/zuck/videos/10103066366848051/" data-embed-as="video" height="366" width="500"></amp-facebook>
 
+<amp-facebook layout="responsive" data-href="https://www.facebook.com/photo.php?fbid=986393557241&amp;set=a.941146602501.2418915.4&amp;type=3" data-embed-as="post" height="366" width="500"></amp-facebook>
+
 ORIGINAL HTML
 ---------------
 Line  1: <div id="fb-root"></div>
@@ -36,12 +40,30 @@ Line 24:         Friday, 5 December 2014
 Line 25:     </blockquote>
 Line 26: </div>
 Line 27: 
-Line 28: <div class="fb-video" data-href="https://www.facebook.com/zuck/videos/10103066366848051/" data-width="500" data-show-text="false">
-Line 29:     <blockquote cite="https://www.facebook.com/zuck/videos/10103066366848051/" class="fb-xfbml-parse-ignore">
-Line 30:     <a href="https://www.facebook.com/zuck/videos/10103066366848051/">Live from our Townhall Q&amp;A in Rome. Comment to ask a question!</a>
-Line 31:     <p>Live from our Townhall Q&amp;A in Rome. Comment to ask a question!</p>Posted by <a href="https://www.facebook.com/zuck">Mark Zuckerberg</a> on Monday, August 29, 2016
-Line 32:     </blockquote>
-Line 33: </div>
+Line 28: <div class="fb-video" data-href="https://www.facebook.com/video.php?v=10153231379946729" data-width="500"
+Line 29:      data-show-text="true">
+Line 30:     <blockquote cite="https://www.facebook.com/video.php?v=10153231379946729" class="fb-xfbml-parse-ignore"><a
+Line 31:             href="https://www.facebook.com/video.php?v=10153231379946729">How to Share With Just Friends</a>
+Line 32:         <p>How to share with just friends.</p>Posted by <a href="https://www.facebook.com/facebook/">Facebook</a> on
+Line 33:         Friday, 5 December 2014
+Line 34:     </blockquote>
+Line 35: </div>
+Line 36: 
+Line 37: <div class="fb-video" data-href="https://www.facebook.com/zuck/videos/10103066366848051/" data-width="500" data-show-text="false">
+Line 38:     <blockquote cite="https://www.facebook.com/zuck/videos/10103066366848051/" class="fb-xfbml-parse-ignore">
+Line 39:     <a href="https://www.facebook.com/zuck/videos/10103066366848051/">Live from our Townhall Q&amp;A in Rome. Comment to ask a question!</a>
+Line 40:     <p>Live from our Townhall Q&amp;A in Rome. Comment to ask a question!</p>Posted by <a href="https://www.facebook.com/zuck">Mark Zuckerberg</a> on Monday, August 29, 2016
+Line 41:     </blockquote>
+Line 42: </div>
+Line 43: 
+Line 44: <div class="fb-post"
+Line 45:      data-href="https://www.facebook.com/photo.php?fbid=986393557241&amp;set=a.941146602501.2418915.4&amp;type=3"
+Line 46:      data-width="500" data-show-text="true">
+Line 47:     <blockquote cite="https://www.facebook.com/photo.php?fbid=986393557241&amp;set=a.941146602501.2418915.4&amp;type=3"
+Line 48:                 class="fb-xfbml-parse-ignore">Posted by <a href="https://www.facebook.com/zuck">Mark Zuckerberg</a> on&nbsp;<a
+Line 49:             href="https://www.facebook.com/photo.php?fbid=986393557241&amp;set=a.941146602501.2418915.4&amp;type=3">Wednesday,
+Line 50:         September 14, 2011</a></blockquote>
+Line 51: </div>
 
 
 Transformations made from HTML tags to AMP custom tags
@@ -56,9 +78,15 @@ Transformations made from HTML tags to AMP custom tags
 <div class="fb-video" data-href="https://www.facebook.com/facebook/videos/10153231379946729/" data-width="500" data-show-text="true"> at line 20
  ACTION TAKEN: div.fb-video facebook javascript sdk embed code was converted to the amp-facebook tag.
 
-<div class="fb-video" data-href="https://www.facebook.com/zuck/videos/10103066366848051/" data-width="500" data-show-text="false"> at line 28
+<div class="fb-video" data-href="https://www.facebook.com/video.php?v=10153231379946729" data-width="500" data-show-text="true"> at line 29
+ ACTION TAKEN: div.fb-video facebook javascript sdk embed code was converted to the amp-facebook tag.
+
+<div class="fb-video" data-href="https://www.facebook.com/zuck/videos/10103066366848051/" data-width="500" data-show-text="false"> at line 37
  ACTION TAKEN: div.fb-video facebook javascript sdk embed code was converted to the amp-facebook tag.
 
+<div class="fb-post" data-href="https://www.facebook.com/photo.php?fbid=986393557241&set=a.941146602501.2418915.4&type=3" data-width="500" data-show-text="true"> at line 46
+ ACTION TAKEN: div.fb-post facebook javascript sdk embed code was converted to the amp-facebook tag.
+
 
 AMP-HTML Validation Issues and Fixes
 -------------------------------------

From 2f9a7eddedcd1a5adf04d2d310fa6173e2832c83 Mon Sep 17 00:00:00 2001
From: FuzzyTree <amirw29@gmail.com>
Date: Wed, 5 Oct 2016 08:07:53 -0700
Subject: [PATCH 04/16] Fix height check on setResponsiveImgHeightAndWidth

---
 src/Pass/ImgTagTransformPass.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Pass/ImgTagTransformPass.php b/src/Pass/ImgTagTransformPass.php
index 89757773..3f6a8a83 100644
--- a/src/Pass/ImgTagTransformPass.php
+++ b/src/Pass/ImgTagTransformPass.php
@@ -217,7 +217,7 @@ protected function setResponsiveImgHeightAndWidth(DOMQuery $el)
         $wcss = new CssLengthAndUnit($el->attr('width'), false);
         $hcss = new CssLengthAndUnit($el->attr('height'), false);
 
-        if ($wcss->is_set && $wcss->is_valid && $wcss->is_set && $wcss->is_valid && $wcss->unit == $hcss->unit) {
+        if ($wcss->is_set && $wcss->is_valid && $hcss->is_set && $hcss->is_valid && $wcss->unit == $hcss->unit) {
             return true;
         }
 

From c58b20526153e178714c7410458564371ebd74d6 Mon Sep 17 00:00:00 2001
From: FuzzyTree <amirw29@gmail.com>
Date: Wed, 5 Oct 2016 11:30:39 -0700
Subject: [PATCH 05/16] Fix unit tests

---
 tests/test-data/fragment-html/img-test-fragment.html.out | 4 ++--
 tests/test-data/full-html/mandatory_dimensions.html.out  | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/tests/test-data/fragment-html/img-test-fragment.html.out b/tests/test-data/fragment-html/img-test-fragment.html.out
index 6309a45c..5dd3d837 100644
--- a/tests/test-data/fragment-html/img-test-fragment.html.out
+++ b/tests/test-data/fragment-html/img-test-fragment.html.out
@@ -13,10 +13,10 @@
 <amp-img src="https://upload.wikimedia.org/wikipedia/commons/e/ee/%22Birdcatcher%22_with_jockey_up.jpg" layout="responsive" width="625" height="480"></amp-img>
 
 <!-- since only width exists, overwrite with height and width from original image -->
-<amp-img layout="responsive" src="https://upload.wikimedia.org/wikipedia/commons/e/ee/%22Birdcatcher%22_with_jockey_up.jpg" width="500"></amp-img>
+<amp-img layout="responsive" src="https://upload.wikimedia.org/wikipedia/commons/e/ee/%22Birdcatcher%22_with_jockey_up.jpg" width="625" height="480"></amp-img>
 
 <!-- since height is illegal, overwrite with height and width from original image -->
-<amp-img layout="responsive" src="https://upload.wikimedia.org/wikipedia/commons/e/ee/%22Birdcatcher%22_with_jockey_up.jpg" width="625"></amp-img>
+<amp-img layout="responsive" src="https://upload.wikimedia.org/wikipedia/commons/e/ee/%22Birdcatcher%22_with_jockey_up.jpg" width="625" height="480"></amp-img>
 
 <!-- since units are inconsistent, overwrite with height+width from original image -->
 <amp-img layout="responsive" src="https://upload.wikimedia.org/wikipedia/commons/e/ee/%22Birdcatcher%22_with_jockey_up.jpg" width="625" height="480"></amp-img>
diff --git a/tests/test-data/full-html/mandatory_dimensions.html.out b/tests/test-data/full-html/mandatory_dimensions.html.out
index bb51c186..20c5be2e 100644
--- a/tests/test-data/full-html/mandatory_dimensions.html.out
+++ b/tests/test-data/full-html/mandatory_dimensions.html.out
@@ -343,7 +343,6 @@ FAIL
 <amp-img src="img" layout="responsive" width="42"> on line 117
 - The mandatory attribute 'height' is missing in tag 'amp-img'.
    [code: MANDATORY_ATTR_MISSING  category: AMP_LAYOUT_PROBLEM see: https://www.ampproject.org/docs/reference/amp-img.html]
-   ACTION TAKEN: amp-img tried to fix problems with amp-img by trying to fetch height, width from image directly and/or setting layout to responsive
 
 <amp-img src="img" layout="fixed" height="42"> on line 118
 - The mandatory attribute 'width' is missing in tag 'amp-img'.

From 3339a46a842e936184fdcc2871daca6537b7d840 Mon Sep 17 00:00:00 2001
From: Mayra Valdes <mayra.valdes@justia.com>
Date: Tue, 13 Dec 2016 14:06:37 -0600
Subject: [PATCH 06/16] Fix for the Youtube code getter

---
 src/Pass/IframeYouTubeTagTransformPass.php    |  2 +-
 .../fragment-html/youtube-02-fragment.html    |  4 +++
 .../youtube-02-fragment.html.out              | 25 +++++++++++++++++++
 3 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 tests/test-data/fragment-html/youtube-02-fragment.html
 create mode 100644 tests/test-data/fragment-html/youtube-02-fragment.html.out

diff --git a/src/Pass/IframeYouTubeTagTransformPass.php b/src/Pass/IframeYouTubeTagTransformPass.php
index a607d93e..4cef87e2 100644
--- a/src/Pass/IframeYouTubeTagTransformPass.php
+++ b/src/Pass/IframeYouTubeTagTransformPass.php
@@ -122,7 +122,7 @@ protected function getYouTubeCode(DOMQuery $el)
 
         // @todo there seem to be a lot of ways to embed a youtube video. We probably need to capture all patterns here
         // The next one is the embed code that youtube gives you
-        if (preg_match('&(*UTF8)/embed/([^/?]+)&i', $href, $matches)) {
+        if (preg_match('&(*UTF8)/embed/([^/?\&]+)&i', $href, $matches)) {
             if (!empty($matches[1])) {
                 $youtube_code = $matches[1];
                 return $youtube_code;
diff --git a/tests/test-data/fragment-html/youtube-02-fragment.html b/tests/test-data/fragment-html/youtube-02-fragment.html
new file mode 100644
index 00000000..5231a1f5
--- /dev/null
+++ b/tests/test-data/fragment-html/youtube-02-fragment.html
@@ -0,0 +1,4 @@
+<iframe data-priority="high" width="560" height="315"
+        src="https://www.youtube.com/embed/MnR9AVs6Q_c&rel=0"
+        frameborder="0" allowfullscreen>
+</iframe>
\ No newline at end of file
diff --git a/tests/test-data/fragment-html/youtube-02-fragment.html.out b/tests/test-data/fragment-html/youtube-02-fragment.html.out
new file mode 100644
index 00000000..3a7c33ac
--- /dev/null
+++ b/tests/test-data/fragment-html/youtube-02-fragment.html.out
@@ -0,0 +1,25 @@
+<amp-youtube data-videoid="MnR9AVs6Q_c" layout="responsive" data-priority="high" height="315" width="560"></amp-youtube>
+
+ORIGINAL HTML
+---------------
+Line 1: <iframe data-priority="high" width="560" height="315"
+Line 2:         src="https://www.youtube.com/embed/MnR9AVs6Q_c&rel=0"
+Line 3:         frameborder="0" allowfullscreen>
+Line 4: </iframe>
+
+
+Transformations made from HTML tags to AMP custom tags
+-------------------------------------------------------
+
+<iframe data-priority="high" width="560" height="315" src="https://www.youtube.com/embed/MnR9AVs6Q_c&rel=0" frameborder allowfullscreen> at line 3
+ ACTION TAKEN: iframe tag was converted to the amp-youtube tag.
+
+
+AMP-HTML Validation Issues and Fixes
+-------------------------------------
+PASS
+
+COMPONENT NAMES WITH JS PATH
+------------------------------
+'amp-youtube', include path 'https://cdn.ampproject.org/v0/amp-youtube-0.1.js'
+

From 262b83404a2d1593308a6ffb7462cdfae45c582e Mon Sep 17 00:00:00 2001
From: Mayra Valdes <mayra.valdes@justia.com>
Date: Tue, 13 Dec 2016 14:09:15 -0600
Subject: [PATCH 07/16] Adding regexp to second youtube getter

---
 src/Pass/IframeYouTubeTagTransformPass.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Pass/IframeYouTubeTagTransformPass.php b/src/Pass/IframeYouTubeTagTransformPass.php
index 4cef87e2..67017b38 100644
--- a/src/Pass/IframeYouTubeTagTransformPass.php
+++ b/src/Pass/IframeYouTubeTagTransformPass.php
@@ -129,7 +129,7 @@ protected function getYouTubeCode(DOMQuery $el)
             }
         }
 
-        if (preg_match('&(*UTF8)youtu\.be/([^/?]+)&i', $href, $matches)) {
+        if (preg_match('&(*UTF8)youtu\.be/([^/?\&]+)&i', $href, $matches)) {
             if (!empty($matches[1])) {
                 $youtube_code = $matches[1];
                 return $youtube_code;

From 1dac8382907f95ec4431c530fde5d8539853e99b Mon Sep 17 00:00:00 2001
From: Lukas Lehdorfer <lehdorfer@gmail.com>
Date: Fri, 13 Jan 2017 12:09:10 +0100
Subject: [PATCH 08/16] Update README.md

removed duplicate word "output"
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 405390dc..3ffbb9dd 100644
--- a/README.md
+++ b/README.md
@@ -114,7 +114,7 @@ $ ./amp-console amp:convert sample-html/several_errors.html --full-document
 ```
 Note that you need to provide `--full-document` if you're providing a full html document file for conversion.
 
-Lets see the output output of the first example command above. The first few lines is the AMPized HTML provided by our library. The rest of the headings are self explanatory.
+Lets see the output of the first example command above. The first few lines is the AMPized HTML provided by our library. The rest of the headings are self explanatory.
 
 ```html
 $ cd <amp-php-library-repo-cloned-location>

From ad852d3e81af660b0889814d8f4fe34f181c8fd5 Mon Sep 17 00:00:00 2001
From: Sigurdur Gudbrandsson <sigurdur@sigginet.info>
Date: Tue, 24 Jan 2017 12:38:07 +0000
Subject: [PATCH 09/16] Badly formatted youtube URLs cause a parse error

The DOM parser throws away invalid HTML.

When you have http://youtube.com/embed/_FlV6pgwlrk&list=123 then
the `IframeYouTubeTagTransformPass::getYouTubeCode()` will match the
ID as `_FlV6pgwlrk&list=123` but since the ampersand isn't in a
proper HTML format (`&amp;`), then DOM will throw this whole
element away.

I wrote a test to make sure noone breaks this in the future.
---
 src/Pass/IframeYouTubeTagTransformPass.php    |  8 +++---
 .../fragment-html/youtube-bad-fragment.html   |  4 +++
 .../youtube-bad-fragment.html.out             | 27 +++++++++++++++++++
 3 files changed, 35 insertions(+), 4 deletions(-)
 create mode 100644 tests/test-data/fragment-html/youtube-bad-fragment.html
 create mode 100644 tests/test-data/fragment-html/youtube-bad-fragment.html.out

diff --git a/src/Pass/IframeYouTubeTagTransformPass.php b/src/Pass/IframeYouTubeTagTransformPass.php
index 67017b38..e55b0ffa 100644
--- a/src/Pass/IframeYouTubeTagTransformPass.php
+++ b/src/Pass/IframeYouTubeTagTransformPass.php
@@ -125,25 +125,25 @@ protected function getYouTubeCode(DOMQuery $el)
         if (preg_match('&(*UTF8)/embed/([^/?\&]+)&i', $href, $matches)) {
             if (!empty($matches[1])) {
                 $youtube_code = $matches[1];
-                return $youtube_code;
+                return htmlspecialchars($youtube_code);
             }
         }
 
         if (preg_match('&(*UTF8)youtu\.be/([^/?\&]+)&i', $href, $matches)) {
             if (!empty($matches[1])) {
                 $youtube_code = $matches[1];
-                return $youtube_code;
+                return htmlspecialchars($youtube_code);
             }
         }
 
         if (preg_match('!(*UTF8)watch\?v=([^&]+)!i', $href, $matches)) {
             if (!empty($matches[1])) {
                 $youtube_code = $matches[1];
-                return $youtube_code;
+                return htmlspecialchars($youtube_code);
             }
         }
 
-        return $youtube_code;
+        return htmlspecialchars($youtube_code);
     }
 
     /**
diff --git a/tests/test-data/fragment-html/youtube-bad-fragment.html b/tests/test-data/fragment-html/youtube-bad-fragment.html
new file mode 100644
index 00000000..ff4f5921
--- /dev/null
+++ b/tests/test-data/fragment-html/youtube-bad-fragment.html
@@ -0,0 +1,4 @@
+<iframe data-priority="high" width="560" height="315"
+        src="https://www.youtube.com/embed/MnR9AVs6Q_c&amp;list=PLiGedaJzwg4zAaznvmnz66U6K1-LFpBYk"
+        frameborder="0" allowfullscreen>
+</iframe>
diff --git a/tests/test-data/fragment-html/youtube-bad-fragment.html.out b/tests/test-data/fragment-html/youtube-bad-fragment.html.out
new file mode 100644
index 00000000..4bd97cc4
--- /dev/null
+++ b/tests/test-data/fragment-html/youtube-bad-fragment.html.out
@@ -0,0 +1,27 @@
+<amp-youtube data-videoid="MnR9AVs6Q_c&amp;list=PLiGedaJzwg4zAaznvmnz66U6K1-LFpBYk" layout="responsive" data-priority="high" height="315" width="560"></amp-youtube>
+
+
+ORIGINAL HTML
+---------------
+Line 1: <iframe data-priority="high" width="560" height="315"
+Line 2:         src="https://www.youtube.com/embed/MnR9AVs6Q_c&amp;list=PLiGedaJzwg4zAaznvmnz66U6K1-LFpBYk"
+Line 3:         frameborder="0" allowfullscreen>
+Line 4: </iframe>
+Line 5: 
+
+
+Transformations made from HTML tags to AMP custom tags
+-------------------------------------------------------
+
+<iframe data-priority="high" width="560" height="315" src="https://www.youtube.com/embed/MnR9AVs6Q_c&list=PLiGedaJzwg4zAaznvmnz66U6K1-LFpBYk" frameborder allowfullscreen> at line 3
+ ACTION TAKEN: iframe tag was converted to the amp-youtube tag.
+
+
+AMP-HTML Validation Issues and Fixes
+-------------------------------------
+PASS
+
+COMPONENT NAMES WITH JS PATH
+------------------------------
+'amp-youtube', include path 'https://cdn.ampproject.org/v0/amp-youtube-0.1.js'
+

From 9bfcb27a339d68444b4b5dc786326e48b8418daf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Gerbore?= <a.gerbore@gmail.com>
Date: Thu, 26 Jan 2017 14:23:24 +0000
Subject: [PATCH 10/16] fix-image-height-missing

---
 composer.json                                          | 10 +++++++---
 tests/test-data/full-html/mandatory_dimensions.html    |  2 +-
 .../test-data/full-html/mandatory_dimensions.html.out  |  4 ++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/composer.json b/composer.json
index b6135efc..046933d1 100644
--- a/composer.json
+++ b/composer.json
@@ -1,15 +1,19 @@
 {
-    "name": "lullabot/amp",
+    "name": "GuideToIceland/amp",
     "description": "A set of useful classes and utilities to convert html to AMP html (See https://www.ampproject.org/)",
     "authors": [
         {
             "name": "Sidharth Kshatriya",
             "email": "sid.kshatriya@gmail.com"
+        },
+        {
+            "name": "Aurelien Gerbore",
+            "email": "agerbore@gmail.com"
         }
     ],
     "license": "Apache-2.0",
-    "keywords": ["Drupal", "AMP", "mobile"],
-    "homepage": "https://github.com/Lullabot/amp-library",
+    "keywords": ["AMP", "mobile"],
+    "homepage": "https://github.com/GuideToIceland/amp-library",
     "require" : {
         "php" : ">=5.5.0",
         "querypath/QueryPath": ">=3.0.4",
diff --git a/tests/test-data/full-html/mandatory_dimensions.html b/tests/test-data/full-html/mandatory_dimensions.html
index 7558b425..ae0ffbe1 100644
--- a/tests/test-data/full-html/mandatory_dimensions.html
+++ b/tests/test-data/full-html/mandatory_dimensions.html
@@ -111,7 +111,7 @@
     <amp-img src="img" layout="container" width="42" height="42"></amp-img>
     <amp-img src="img"></amp-img>
 
-    <!-- Layout of responsive/fixed without width/height -->
+    <!-- Layout of responsive/fixed without width/height - This should all fail -->
     <amp-img src="img" layout="responsive"></amp-img>
     <amp-img src="img" layout="fixed"></amp-img>
     <amp-img src="img" layout="responsive" width="42"></amp-img>
diff --git a/tests/test-data/full-html/mandatory_dimensions.html.out b/tests/test-data/full-html/mandatory_dimensions.html.out
index 206b6895..b90b2ecc 100644
--- a/tests/test-data/full-html/mandatory_dimensions.html.out
+++ b/tests/test-data/full-html/mandatory_dimensions.html.out
@@ -118,7 +118,7 @@
     <amp-img src="img" width="42" height="42" layout="responsive"></amp-img>
     <amp-img src="img" layout="responsive"></amp-img>
 
-    <!-- Layout of responsive/fixed without width/height -->
+    <!-- Layout of responsive/fixed without width/height - This should all fail -->
     <amp-img src="img" layout="responsive"></amp-img>
     <amp-img src="img" layout="fixed"></amp-img>
     <amp-img src="img" layout="responsive" width="42"></amp-img>
@@ -273,7 +273,7 @@ Line 110:     <amp-img src="img" layout="container"></amp-img>
 Line 111:     <amp-img src="img" layout="container" width="42" height="42"></amp-img>
 Line 112:     <amp-img src="img"></amp-img>
 Line 113: 
-Line 114:     <!-- Layout of responsive/fixed without width/height -->
+Line 114:     <!-- Layout of responsive/fixed without width/height - This should all fail -->
 Line 115:     <amp-img src="img" layout="responsive"></amp-img>
 Line 116:     <amp-img src="img" layout="fixed"></amp-img>
 Line 117:     <amp-img src="img" layout="responsive" width="42"></amp-img>

From 514a7433fbbbf6a06ae10ddc444dbddd8f242fdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Gerbore?= <a.gerbore@gmail.com>
Date: Fri, 27 Jan 2017 13:22:32 +0000
Subject: [PATCH 11/16] youtube-start-time : Fix
 IframeYotubeTransformPass::getYouTubeCode()

---
 src/Pass/IframeYouTubeTagTransformPass.php    | 24 ++-----
 .../youtube-bad-fragment.html.out             |  2 +-
 .../fragment-html/youtube-fragment.html       | 32 ++++++++-
 .../fragment-html/youtube-fragment.html.out   | 70 +++++++++++++++++--
 4 files changed, 104 insertions(+), 24 deletions(-)

diff --git a/src/Pass/IframeYouTubeTagTransformPass.php b/src/Pass/IframeYouTubeTagTransformPass.php
index e55b0ffa..46b8bcf5 100644
--- a/src/Pass/IframeYouTubeTagTransformPass.php
+++ b/src/Pass/IframeYouTubeTagTransformPass.php
@@ -113,6 +113,7 @@ protected function isYouTubeIframe(DOMQuery $el)
      *
      * @param DOMQuery $el
      * @return string
+     *
      */
     protected function getYouTubeCode(DOMQuery $el)
     {
@@ -120,24 +121,11 @@ protected function getYouTubeCode(DOMQuery $el)
         $youtube_code = '';
         $href = $el->attr('src');
 
-        // @todo there seem to be a lot of ways to embed a youtube video. We probably need to capture all patterns here
-        // The next one is the embed code that youtube gives you
-        if (preg_match('&(*UTF8)/embed/([^/?\&]+)&i', $href, $matches)) {
-            if (!empty($matches[1])) {
-                $youtube_code = $matches[1];
-                return htmlspecialchars($youtube_code);
-            }
-        }
-
-        if (preg_match('&(*UTF8)youtu\.be/([^/?\&]+)&i', $href, $matches)) {
-            if (!empty($matches[1])) {
-                $youtube_code = $matches[1];
-                return htmlspecialchars($youtube_code);
-            }
-        }
-
-        if (preg_match('!(*UTF8)watch\?v=([^&]+)!i', $href, $matches)) {
-            if (!empty($matches[1])) {
+        // This regex is supposed to catch all possible way to embed youtube video
+        if (preg_match('%(?:youtube(?:-nocookie)?\.com/(?:[^/]+/.+/|(?:v|e(?:mbed)?)/|.*[?&]v=)|youtu\.be/)([^"&?/ ]{11})%i', $href, $matches))
+        {
+            if (!empty($matches[1]))
+            {
                 $youtube_code = $matches[1];
                 return htmlspecialchars($youtube_code);
             }
diff --git a/tests/test-data/fragment-html/youtube-bad-fragment.html.out b/tests/test-data/fragment-html/youtube-bad-fragment.html.out
index 4bd97cc4..259906ea 100644
--- a/tests/test-data/fragment-html/youtube-bad-fragment.html.out
+++ b/tests/test-data/fragment-html/youtube-bad-fragment.html.out
@@ -1,4 +1,4 @@
-<amp-youtube data-videoid="MnR9AVs6Q_c&amp;list=PLiGedaJzwg4zAaznvmnz66U6K1-LFpBYk" layout="responsive" data-priority="high" height="315" width="560"></amp-youtube>
+<amp-youtube data-videoid="MnR9AVs6Q_c" layout="responsive" data-priority="high" height="315" width="560"></amp-youtube>
 
 
 ORIGINAL HTML
diff --git a/tests/test-data/fragment-html/youtube-fragment.html b/tests/test-data/fragment-html/youtube-fragment.html
index eab435e2..f1207f1e 100644
--- a/tests/test-data/fragment-html/youtube-fragment.html
+++ b/tests/test-data/fragment-html/youtube-fragment.html
@@ -1,4 +1,34 @@
 <iframe data-priority="high" width="560" height="315"
         src="https://www.youtube.com/embed/MnR9AVs6Q_c?autoplay=1&controls=0"
         frameborder="0" allowfullscreen>
-</iframe>
\ No newline at end of file
+</iframe>
+
+<iframe data-priority="high" width="560" height="315"
+        src="https://www.youtube.com/embed/MnR9AVs6Q_c#t=15"
+        frameborder="0" allowfullscreen>
+</iframe>
+
+<iframe data-priority="high" width="560" height="315"
+        src="https://www.youtube.com/embed/MnR9AVs6Q_c?&t=15"
+        frameborder="0" allowfullscreen>
+</iframe>
+
+<iframe data-priority="high" width="560" height="315"
+        src="http://youtu.be/dQw4w9WgXcQ"
+        frameborder="0" allowfullscreen>
+</iframe>
+
+<iframe data-priority="high" width="560" height="315"
+        src="http://www.youtube.com/watch?v=dQw4w9WgXcQ#t=15"
+        frameborder="0" allowfullscreen>
+</iframe>
+
+<iframe data-priority="high" width="560" height="315"
+        src="http://www.youtube.com/user/username#p/u/11/dQw4w9WgXcQ"
+        frameborder="0" allowfullscreen>
+</iframe>
+
+<iframe data-priority="high" width="560" height="315"
+        src="https://www.youtube.com/embed/MnR9AVs6Q_c&amp;t=15"
+        frameborder="0" allowfullscreen>
+</iframe>
diff --git a/tests/test-data/fragment-html/youtube-fragment.html.out b/tests/test-data/fragment-html/youtube-fragment.html.out
index d711b65a..21365f43 100644
--- a/tests/test-data/fragment-html/youtube-fragment.html.out
+++ b/tests/test-data/fragment-html/youtube-fragment.html.out
@@ -1,11 +1,55 @@
 <amp-youtube data-videoid="MnR9AVs6Q_c" layout="responsive" data-priority="high" height="315" width="560" data-param-autoplay="1" data-param-controls="0"></amp-youtube>
 
+<amp-youtube data-videoid="MnR9AVs6Q_c" layout="responsive" data-priority="high" height="315" width="560"></amp-youtube>
+
+<amp-youtube data-videoid="MnR9AVs6Q_c" layout="responsive" data-priority="high" height="315" width="560" data-param-t="15"></amp-youtube>
+
+<amp-youtube data-videoid="dQw4w9WgXcQ" layout="responsive" data-priority="high" height="315" width="560"></amp-youtube>
+
+<amp-youtube data-videoid="dQw4w9WgXcQ" layout="responsive" data-priority="high" height="315" width="560" data-param-v="dQw4w9WgXcQ"></amp-youtube>
+
+<amp-youtube data-videoid="dQw4w9WgXcQ" layout="responsive" data-priority="high" height="315" width="560"></amp-youtube>
+
+<amp-youtube data-videoid="MnR9AVs6Q_c" layout="responsive" data-priority="high" height="315" width="560"></amp-youtube>
+
+
 ORIGINAL HTML
 ---------------
-Line 1: <iframe data-priority="high" width="560" height="315"
-Line 2:         src="https://www.youtube.com/embed/MnR9AVs6Q_c?autoplay=1&controls=0"
-Line 3:         frameborder="0" allowfullscreen>
-Line 4: </iframe>
+Line  1: <iframe data-priority="high" width="560" height="315"
+Line  2:         src="https://www.youtube.com/embed/MnR9AVs6Q_c?autoplay=1&controls=0"
+Line  3:         frameborder="0" allowfullscreen>
+Line  4: </iframe>
+Line  5: 
+Line  6: <iframe data-priority="high" width="560" height="315"
+Line  7:         src="https://www.youtube.com/embed/MnR9AVs6Q_c#t=15"
+Line  8:         frameborder="0" allowfullscreen>
+Line  9: </iframe>
+Line 10: 
+Line 11: <iframe data-priority="high" width="560" height="315"
+Line 12:         src="https://www.youtube.com/embed/MnR9AVs6Q_c?&t=15"
+Line 13:         frameborder="0" allowfullscreen>
+Line 14: </iframe>
+Line 15: 
+Line 16: <iframe data-priority="high" width="560" height="315"
+Line 17:         src="http://youtu.be/dQw4w9WgXcQ"
+Line 18:         frameborder="0" allowfullscreen>
+Line 19: </iframe>
+Line 20: 
+Line 21: <iframe data-priority="high" width="560" height="315"
+Line 22:         src="http://www.youtube.com/watch?v=dQw4w9WgXcQ#t=15"
+Line 23:         frameborder="0" allowfullscreen>
+Line 24: </iframe>
+Line 25: 
+Line 26: <iframe data-priority="high" width="560" height="315"
+Line 27:         src="http://www.youtube.com/user/username#p/u/11/dQw4w9WgXcQ"
+Line 28:         frameborder="0" allowfullscreen>
+Line 29: </iframe>
+Line 30: 
+Line 31: <iframe data-priority="high" width="560" height="315"
+Line 32:         src="https://www.youtube.com/embed/MnR9AVs6Q_c&amp;t=15"
+Line 33:         frameborder="0" allowfullscreen>
+Line 34: </iframe>
+Line 35: 
 
 
 Transformations made from HTML tags to AMP custom tags
@@ -14,6 +58,24 @@ Transformations made from HTML tags to AMP custom tags
 <iframe data-priority="high" width="560" height="315" src="https://www.youtube.com/embed/MnR9AVs6Q_c?autoplay=1&controls=0" frameborder allowfullscreen> at line 3
  ACTION TAKEN: iframe tag was converted to the amp-youtube tag.
 
+<iframe data-priority="high" width="560" height="315" src="https://www.youtube.com/embed/MnR9AVs6Q_c#t=15" frameborder allowfullscreen> at line 8
+ ACTION TAKEN: iframe tag was converted to the amp-youtube tag.
+
+<iframe data-priority="high" width="560" height="315" src="https://www.youtube.com/embed/MnR9AVs6Q_c?&t=15" frameborder allowfullscreen> at line 13
+ ACTION TAKEN: iframe tag was converted to the amp-youtube tag.
+
+<iframe data-priority="high" width="560" height="315" src="http://youtu.be/dQw4w9WgXcQ" frameborder allowfullscreen> at line 18
+ ACTION TAKEN: iframe tag was converted to the amp-youtube tag.
+
+<iframe data-priority="high" width="560" height="315" src="http://www.youtube.com/watch?v=dQw4w9WgXcQ#t=15" frameborder allowfullscreen> at line 23
+ ACTION TAKEN: iframe tag was converted to the amp-youtube tag.
+
+<iframe data-priority="high" width="560" height="315" src="http://www.youtube.com/user/username#p/u/11/dQw4w9WgXcQ" frameborder allowfullscreen> at line 28
+ ACTION TAKEN: iframe tag was converted to the amp-youtube tag.
+
+<iframe data-priority="high" width="560" height="315" src="https://www.youtube.com/embed/MnR9AVs6Q_c&t=15" frameborder allowfullscreen> at line 33
+ ACTION TAKEN: iframe tag was converted to the amp-youtube tag.
+
 
 AMP-HTML Validation Issues and Fixes
 -------------------------------------

From 30fbd970477ecd7e6c8d9a761930034c57fc9948 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Gerbore?= <a.gerbore@gmail.com>
Date: Wed, 1 Feb 2017 16:58:49 +0000
Subject: [PATCH 12/16] Add amp-anim for animated image + remove non-converted
 img tag in AmpImgFixPass

---
 composer.json                                 |  10 +-
 src/AMP.php                                   |  11 ++
 src/Pass/AmpImgFixPass.php                    |  11 ++
 src/Pass/ImgTagTransformPass.php              | 104 +++++++++++++++++-
 src/Utility/ActionTakenType.php               |   1 +
 .../fragment-html/img-anim-test-fragment.html |  14 +++
 .../img-anim-test-fragment.html.options.json  |   4 +
 .../img-anim-test-fragment.html.out           |  67 +++++++++++
 .../fragment-html/img-test-fragment.html      |   7 +-
 .../fragment-html/img-test-fragment.html.out  |  15 ++-
 10 files changed, 231 insertions(+), 13 deletions(-)
 create mode 100644 tests/test-data/fragment-html/img-anim-test-fragment.html
 create mode 100644 tests/test-data/fragment-html/img-anim-test-fragment.html.options.json
 create mode 100644 tests/test-data/fragment-html/img-anim-test-fragment.html.out

diff --git a/composer.json b/composer.json
index 046933d1..b6135efc 100644
--- a/composer.json
+++ b/composer.json
@@ -1,19 +1,15 @@
 {
-    "name": "GuideToIceland/amp",
+    "name": "lullabot/amp",
     "description": "A set of useful classes and utilities to convert html to AMP html (See https://www.ampproject.org/)",
     "authors": [
         {
             "name": "Sidharth Kshatriya",
             "email": "sid.kshatriya@gmail.com"
-        },
-        {
-            "name": "Aurelien Gerbore",
-            "email": "agerbore@gmail.com"
         }
     ],
     "license": "Apache-2.0",
-    "keywords": ["AMP", "mobile"],
-    "homepage": "https://github.com/GuideToIceland/amp-library",
+    "keywords": ["Drupal", "AMP", "mobile"],
+    "homepage": "https://github.com/Lullabot/amp-library",
     "require" : {
         "php" : ">=5.5.0",
         "querypath/QueryPath": ">=3.0.4",
diff --git a/src/AMP.php b/src/AMP.php
index 9836e62a..b1eb5f6c 100644
--- a/src/AMP.php
+++ b/src/AMP.php
@@ -174,6 +174,17 @@ public function loadHtml($html, $options = [])
             $options['use_html5_parser'] = true;
         }
 
+        // By default the convertion of img into amp-anim is disabled (because of ressource cost)
+        //  => they will be converted into amp-img instead
+        if (!isset($options['use_img_anim_tag'])) {
+            $options['use_img_anim_tag'] = false;
+        }
+
+        // By default img that can't be converted are kept as it is and not removed
+        if (!isset($options['remove_non_converted_img_tag'])) {
+            $options['remove_non_converted_img_tag'] = false;
+        }
+
         $this->options = $options;
         $this->scope = !empty($options['scope']) ? $options['scope'] : Scope::BODY_SCOPE;
 
diff --git a/src/Pass/AmpImgFixPass.php b/src/Pass/AmpImgFixPass.php
index ec9d6b55..ea4c68f4 100644
--- a/src/Pass/AmpImgFixPass.php
+++ b/src/Pass/AmpImgFixPass.php
@@ -75,6 +75,17 @@ function pass()
                     $error->resolved = false;
                 }
             }
+            elseif (in_array($error->code, [ValidationErrorCode::MANDATORY_TAG_ANCESTOR_WITH_HINT]) &&
+                !$error->resolved &&
+                !empty($error->dom_tag) &&
+                strtolower($error->dom_tag->tagName) == 'img' &&
+                !empty($this->options['remove_non_converted_img_tag'])
+            ) {
+                 // Remove the offending tag
+                $error->dom_tag->parentNode->removeChild($error->dom_tag);
+                $error->addActionTaken(new ActionTakenLine('img', ActionTakenType::TAG_REMOVED));
+                $error->resolved = TRUE;
+            }
         }
     }
 }
diff --git a/src/Pass/ImgTagTransformPass.php b/src/Pass/ImgTagTransformPass.php
index d8ed2488..8e28efeb 100644
--- a/src/Pass/ImgTagTransformPass.php
+++ b/src/Pass/ImgTagTransformPass.php
@@ -79,8 +79,9 @@ function pass()
             }
             if ($this->isPixel($el)) {
                 $new_dom_el = $this->convertAmpPixel($el, $lineno, $context_string);
-            }
-            else {
+            } else if (!empty($this->options['use_amp_anim_tag']) && $this->isAnimatedImg($dom_el)) {
+                $new_dom_el = $this->convertAmpAnim($el, $lineno, $context_string);
+            } else {
                 $new_dom_el = $this->convertAmpImg($el, $lineno, $context_string);
             }
             $this->context->addLineAssociation($new_dom_el, $lineno);
@@ -139,6 +140,24 @@ protected function getLayout($el) {
             ? 'fixed' : 'responsive';
     }
 
+    /**
+     * Given an animated image element returns an amp-anim element with the same attributes and children
+     *
+     * @param DOMQuery $el
+     * @param int $lineno
+     * @param string $context_string
+     * @return DOMElement
+     */
+    protected function convertAmpAnim($el, $lineno, $context_string)
+    {
+        $dom_el = $el->get(0);
+        $new_dom_el = $this->cloneAndRenameDomElement($dom_el, 'amp-anim');
+        $new_el = $el->prev();
+        $this->setLayoutIfNoLayout($new_el, 'responsive');
+        $this->addActionTaken(new ActionTakenLine('img', ActionTakenType::IMG_ANIM_CONVERTED, $lineno, $context_string));
+        return $new_dom_el;
+    }
+
     /**
      * Given an image src attribute, try to get its dimensions
      * Returns false on failure
@@ -188,6 +207,87 @@ protected function isPixel(DOMQuery $el)
         return $el->attr('width') === '1' && $el->attr('height') === '1';
     }
 
+    /**
+     * Detects if the img is animated. In that case we convert to <amp-anim> instead of <amp-img>
+     * @param \DOMElement $el
+     * @return bool
+     */
+    protected function isAnimatedImg(\DOMElement $el)
+    {
+        $animated_type = ['gif', 'png'];
+        if (!$el->hasAttribute('src')) {
+            return true;
+        }
+
+        $src = trim($el->getAttribute('src'));
+        if (preg_match('/\.([a-z0-9]+)$/i', parse_url($src,PHP_URL_PATH), $match)) {
+            if (!empty($match[1]) && in_array(strtolower($match[1]), $animated_type)) {
+                if ($match[1] === "gif") {
+                    if ($this->isAnimatedGif($src)) {
+                        return true;
+                    } else {
+                        return false;
+                    }
+                }
+                if ($this->isApng($src)) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Identifies APNGs
+     * Written by Coda, functionified by Foone/Popcorn Mariachi#!9i78bPeIxI
+     * This code is in the public domain
+     *
+     * @see http://stackoverflow.com/a/4525194
+     * @see http://foone.org/apng/identify_apng.php
+     *
+     * @param  string  $src    The filename
+     * @return bool    true if the file is an APMG
+     */
+    function isApng($src)
+    {
+        $img_bytes = @file_get_contents($src);
+        if ($img_bytes) {
+            if (strpos(substr($img_bytes, 0, strpos($img_bytes, 'IDAT')), 'acTL') !== false) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Detects if the gif image is animated or not
+     * source: http://php.net/manual/en/function.imagecreatefromgif.php#104473
+     *
+     * @param  string  $filename
+     * @return bool
+     */
+    function isAnimatedGif($filename) {
+        if (!($fh = @fopen($filename, 'rb')))
+            return FALSE;
+        $count = 0;
+        //an animated gif contains multiple "frames", with each frame having a
+        //header made up of:
+        // * a static 4-byte sequence (\x00\x21\xF9\x04)
+        // * 4 variable bytes
+        // * a static 2-byte sequence (\x00\x2C) (some variants may use \x00\x21 ?)
+
+        // We read through the file til we reach the end of the file, or we've found
+        // at least 2 frame headers
+        while (!feof($fh) && $count < 2) {
+            $chunk = fread($fh, 1024 * 100); //read 100kb at a time
+            $count += preg_match_all('#\x00\x21\xF9\x04.{4}\x00(\x2C|\x21)#s', $chunk, $matches);
+       }
+
+        fclose($fh);
+        return $count > 1;
+    }
+
     /**
      * @param string $src
      * @return boolean|string
diff --git a/src/Utility/ActionTakenType.php b/src/Utility/ActionTakenType.php
index 0a9a8817..52462b5c 100644
--- a/src/Utility/ActionTakenType.php
+++ b/src/Utility/ActionTakenType.php
@@ -25,6 +25,7 @@ class ActionTakenType
     const PROPERTY_REMOVED_ATTRIBUTE_REMOVED = 'property value pair was removed from attribute due to validation issues. The resulting attribute was empty and was also removed.';
     const IMG_CONVERTED = 'tag was converted to the amp-img tag.';
     const IMG_PIXEL_CONVERTED = 'tag was converted to the amp-pixel tag.';
+    const IMG_ANIM_CONVERTED = 'tag was converted to the amp-anim tag.';
     const IMG_COULD_NOT_BE_CONVERTED = 'tag could NOT be converted to the amp-img tag as the image is not accessible.';
     const INSTAGRAM_CONVERTED = 'instagram embed code was converted to the amp-instagram tag.';
     const PINTEREST_CONVERTED = 'pinterest embed code was converted to the amp-pinterest tag.';
diff --git a/tests/test-data/fragment-html/img-anim-test-fragment.html b/tests/test-data/fragment-html/img-anim-test-fragment.html
new file mode 100644
index 00000000..26cbce10
--- /dev/null
+++ b/tests/test-data/fragment-html/img-anim-test-fragment.html
@@ -0,0 +1,14 @@
+<!-- should transform to amp-anim-->
+<img src="https://upload.wikimedia.org/wikipedia/commons/thumb/2/2c/Rotating_earth_%28large%29.gif/200px-Rotating_earth_%28large%29.gif">
+
+<!-- should transform to amp-img because this gif is not animated -->
+<img src="https://upload.wikimedia.org/wikipedia/commons/b/bb/Quilt_design_as_46x46_uncompressed_GIF.gif">
+
+<!-- should transform to amp-anim-->
+<img src="https://upload.wikimedia.org/wikipedia/commons/1/14/Animated_PNG_example_bouncing_beach_ball.png">
+
+<!-- should transform to amp-img because this png is not animated -->
+<img src="https://upload.wikimedia.org/wikipedia/commons/thumb/5/53/Wikimedia-logo.png/240px-Wikimedia-logo.png">
+
+<!-- nonexistent image, should refuse to convert to amp-img and delete it -->
+<img src="https://upload.wikimedia.org/wikipedia/commons/e/ee/non-existent-image1234.jpg">
diff --git a/tests/test-data/fragment-html/img-anim-test-fragment.html.options.json b/tests/test-data/fragment-html/img-anim-test-fragment.html.options.json
new file mode 100644
index 00000000..e4ef92a8
--- /dev/null
+++ b/tests/test-data/fragment-html/img-anim-test-fragment.html.options.json
@@ -0,0 +1,4 @@
+{
+  "use_amp_anim_tag" : true,
+  "remove_non_converted_img_tag" : true
+}
diff --git a/tests/test-data/fragment-html/img-anim-test-fragment.html.out b/tests/test-data/fragment-html/img-anim-test-fragment.html.out
new file mode 100644
index 00000000..772f89d5
--- /dev/null
+++ b/tests/test-data/fragment-html/img-anim-test-fragment.html.out
@@ -0,0 +1,67 @@
+<!-- should transform to amp-anim-->
+<amp-anim src="https://upload.wikimedia.org/wikipedia/commons/thumb/2/2c/Rotating_earth_%28large%29.gif/200px-Rotating_earth_%28large%29.gif" width="200" height="200" layout="responsive"></amp-anim>
+
+<!-- should transform to amp-img because this gif is not animated -->
+<amp-img src="https://upload.wikimedia.org/wikipedia/commons/b/bb/Quilt_design_as_46x46_uncompressed_GIF.gif" width="46" height="46" layout="responsive"></amp-img>
+
+<!-- should transform to amp-anim-->
+<amp-anim src="https://upload.wikimedia.org/wikipedia/commons/1/14/Animated_PNG_example_bouncing_beach_ball.png" width="100" height="100" layout="responsive"></amp-anim>
+
+<!-- should transform to amp-img because this png is not animated -->
+<amp-img src="https://upload.wikimedia.org/wikipedia/commons/thumb/5/53/Wikimedia-logo.png/240px-Wikimedia-logo.png" width="240" height="240" layout="responsive"></amp-img>
+
+<!-- nonexistent image, should refuse to convert to amp-img and delete it -->
+
+
+
+ORIGINAL HTML
+---------------
+Line  1: <!-- should transform to amp-anim-->
+Line  2: <img src="https://upload.wikimedia.org/wikipedia/commons/thumb/2/2c/Rotating_earth_%28large%29.gif/200px-Rotating_earth_%28large%29.gif">
+Line  3: 
+Line  4: <!-- should transform to amp-img because this gif is not animated -->
+Line  5: <img src="https://upload.wikimedia.org/wikipedia/commons/b/bb/Quilt_design_as_46x46_uncompressed_GIF.gif">
+Line  6: 
+Line  7: <!-- should transform to amp-anim-->
+Line  8: <img src="https://upload.wikimedia.org/wikipedia/commons/1/14/Animated_PNG_example_bouncing_beach_ball.png">
+Line  9: 
+Line 10: <!-- should transform to amp-img because this png is not animated -->
+Line 11: <img src="https://upload.wikimedia.org/wikipedia/commons/thumb/5/53/Wikimedia-logo.png/240px-Wikimedia-logo.png">
+Line 12: 
+Line 13: <!-- nonexistent image, should refuse to convert to amp-img and delete it -->
+Line 14: <img src="https://upload.wikimedia.org/wikipedia/commons/e/ee/non-existent-image1234.jpg">
+Line 15: 
+
+
+Transformations made from HTML tags to AMP custom tags
+-------------------------------------------------------
+
+<img src="https://upload.wikimedia.org/wikipedia/commons/thumb/2/2c/Rotating_earth_%28large%29.gif/200px-Rotating_earth_%28large%29.gif"> at line 2
+ ACTION TAKEN: img tag was converted to the amp-anim tag.
+
+<img src="https://upload.wikimedia.org/wikipedia/commons/b/bb/Quilt_design_as_46x46_uncompressed_GIF.gif"> at line 5
+ ACTION TAKEN: img tag was converted to the amp-img tag.
+
+<img src="https://upload.wikimedia.org/wikipedia/commons/1/14/Animated_PNG_example_bouncing_beach_ball.png"> at line 8
+ ACTION TAKEN: img tag was converted to the amp-anim tag.
+
+<img src="https://upload.wikimedia.org/wikipedia/commons/thumb/5/53/Wikimedia-logo.png/240px-Wikimedia-logo.png"> at line 11
+ ACTION TAKEN: img tag was converted to the amp-img tag.
+
+<img src="https://upload.wikimedia.org/wikipedia/commons/e/ee/non-existent-image1234.jpg"> at line 14
+ ACTION TAKEN: img tag could NOT be converted to the amp-img tag as the image is not accessible.
+
+
+AMP-HTML Validation Issues and Fixes
+-------------------------------------
+FAIL
+
+<img src="https://upload.wikimedia.org/wikipedia/commons/e/ee/non-existent-image1234.jpg"> on line 14
+- The tag 'img' may only appear as a descendant of tag 'noscript'. Did you mean 'amp-img'?
+   [code: MANDATORY_TAG_ANCESTOR_WITH_HINT  category: DISALLOWED_HTML_WITH_AMP_EQUIVALENT see: https://www.ampproject.org/docs/reference/amp-img.html]
+   ACTION TAKEN: img tag was removed due to validation issues.
+
+COMPONENT NAMES WITH JS PATH
+------------------------------
+'amp-anim', include path 'https://cdn.ampproject.org/v0/amp-anim-0.1.js'
+
diff --git a/tests/test-data/fragment-html/img-test-fragment.html b/tests/test-data/fragment-html/img-test-fragment.html
index 348842c8..69554435 100644
--- a/tests/test-data/fragment-html/img-test-fragment.html
+++ b/tests/test-data/fragment-html/img-test-fragment.html
@@ -6,7 +6,7 @@
 <!-- should transform to amp-img with fixed layout, preserving the width and height -->
 <img src="https://upload.wikimedia.org/wikipedia/commons/e/ee/%22Birdcatcher%22_with_jockey_up.jpg" width="125" height="96">
 
-<!-- nonexistent image, should refuse to convert to amp-img -->
+<!-- nonexistent image, should refuse to convert to amp-img and keep it as it is -->
 <img src="https://upload.wikimedia.org/wikipedia/commons/e/ee/non-existent-image1234.jpg">
 
 <!-- should provide layout and height width and make layout responsive -->
@@ -22,4 +22,7 @@
 <amp-img layout="responsive" src="https://upload.wikimedia.org/wikipedia/commons/e/ee/%22Birdcatcher%22_with_jockey_up.jpg" width="625rem" height="480"></amp-img>
 
 <!-- should transform to amp-pixel -->
-<img src="https://upload.wikimedia.org/wikipedia/commons/c/ce/Transparent.gif">
\ No newline at end of file
+<img src="https://upload.wikimedia.org/wikipedia/commons/c/ce/Transparent.gif">
+
+<!-- should transform to amp-img instead of amp-anim because of default option['use_amp_anim_tag'] = false -->
+<img src="https://upload.wikimedia.org/wikipedia/commons/b/bb/Quilt_design_as_46x46_uncompressed_GIF.gif">
diff --git a/tests/test-data/fragment-html/img-test-fragment.html.out b/tests/test-data/fragment-html/img-test-fragment.html.out
index 62092be5..1b602430 100644
--- a/tests/test-data/fragment-html/img-test-fragment.html.out
+++ b/tests/test-data/fragment-html/img-test-fragment.html.out
@@ -6,7 +6,7 @@
 <!-- should transform to amp-img with fixed layout, preserving the width and height -->
 <amp-img src="https://upload.wikimedia.org/wikipedia/commons/e/ee/%22Birdcatcher%22_with_jockey_up.jpg" width="125" height="96" layout="fixed"></amp-img>
 
-<!-- nonexistent image, should refuse to convert to amp-img -->
+<!-- nonexistent image, should refuse to convert to amp-img and keep it as it is -->
 <img src="https://upload.wikimedia.org/wikipedia/commons/e/ee/non-existent-image1234.jpg">
 
 <!-- should provide layout and height width and make layout responsive -->
@@ -24,6 +24,10 @@
 <!-- should transform to amp-pixel -->
 <amp-pixel src="https://upload.wikimedia.org/wikipedia/commons/c/ce/Transparent.gif"></amp-pixel>
 
+<!-- should transform to amp-img instead of amp-anim because of default option['use_amp_anim_tag'] = false -->
+<amp-img src="https://upload.wikimedia.org/wikipedia/commons/b/bb/Quilt_design_as_46x46_uncompressed_GIF.gif" width="46" height="46" layout="responsive"></amp-img>
+
+
 ORIGINAL HTML
 ---------------
 Line  1: <!-- Note: this image is in the public domain. https://commons.wikimedia.org/wiki/File:"Birdcatcher"_with_jockey_up.jpg -->
@@ -34,7 +38,7 @@ Line  5:
 Line  6: <!-- should transform to amp-img with fixed layout, preserving the width and height -->
 Line  7: <img src="https://upload.wikimedia.org/wikipedia/commons/e/ee/%22Birdcatcher%22_with_jockey_up.jpg" width="125" height="96">
 Line  8: 
-Line  9: <!-- nonexistent image, should refuse to convert to amp-img -->
+Line  9: <!-- nonexistent image, should refuse to convert to amp-img and keep it as it is -->
 Line 10: <img src="https://upload.wikimedia.org/wikipedia/commons/e/ee/non-existent-image1234.jpg">
 Line 11: 
 Line 12: <!-- should provide layout and height width and make layout responsive -->
@@ -51,6 +55,10 @@ Line 22: <amp-img layout="responsive" src="https://upload.wikimedia.org/wikipedi
 Line 23: 
 Line 24: <!-- should transform to amp-pixel -->
 Line 25: <img src="https://upload.wikimedia.org/wikipedia/commons/c/ce/Transparent.gif">
+Line 26: 
+Line 27: <!-- should transform to amp-img instead of amp-anim because of default option['use_amp_anim_tag'] = false -->
+Line 28: <img src="https://upload.wikimedia.org/wikipedia/commons/b/bb/Quilt_design_as_46x46_uncompressed_GIF.gif">
+Line 29: 
 
 
 Transformations made from HTML tags to AMP custom tags
@@ -68,6 +76,9 @@ Transformations made from HTML tags to AMP custom tags
 <img src="https://upload.wikimedia.org/wikipedia/commons/c/ce/Transparent.gif"> at line 25
  ACTION TAKEN: img tag was converted to the amp-pixel tag.
 
+<img src="https://upload.wikimedia.org/wikipedia/commons/b/bb/Quilt_design_as_46x46_uncompressed_GIF.gif"> at line 28
+ ACTION TAKEN: img tag was converted to the amp-img tag.
+
 
 AMP-HTML Validation Issues and Fixes
 -------------------------------------

From 211b8f4ceedd637868a3b5c954bc127e56fb6065 Mon Sep 17 00:00:00 2001
From: Sigurdur Gudbrandsson <sigurdur@sigginet.info>
Date: Thu, 9 Feb 2017 13:15:17 +0000
Subject: [PATCH 13/16] Fixing builds to pass testing

---
 tests/test-data/fragment-html/img-test-fragment.html.out | 2 +-
 tests/test-data/full-html/validator-amp-sidebar.html.out | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/test-data/fragment-html/img-test-fragment.html.out b/tests/test-data/fragment-html/img-test-fragment.html.out
index 1b602430..20a30bb1 100644
--- a/tests/test-data/fragment-html/img-test-fragment.html.out
+++ b/tests/test-data/fragment-html/img-test-fragment.html.out
@@ -25,7 +25,7 @@
 <amp-pixel src="https://upload.wikimedia.org/wikipedia/commons/c/ce/Transparent.gif"></amp-pixel>
 
 <!-- should transform to amp-img instead of amp-anim because of default option['use_amp_anim_tag'] = false -->
-<amp-img src="https://upload.wikimedia.org/wikipedia/commons/b/bb/Quilt_design_as_46x46_uncompressed_GIF.gif" width="46" height="46" layout="responsive"></amp-img>
+<amp-img src="https://upload.wikimedia.org/wikipedia/commons/b/bb/Quilt_design_as_46x46_uncompressed_GIF.gif" width="46" height="46" layout="fixed"></amp-img>
 
 
 ORIGINAL HTML
diff --git a/tests/test-data/full-html/validator-amp-sidebar.html.out b/tests/test-data/full-html/validator-amp-sidebar.html.out
index 369c0d47..a103d11a 100644
--- a/tests/test-data/full-html/validator-amp-sidebar.html.out
+++ b/tests/test-data/full-html/validator-amp-sidebar.html.out
@@ -136,5 +136,6 @@ FAIL
 
 COMPONENT NAMES WITH JS PATH
 ------------------------------
+'amp-sidebar', include path 'https://cdn.ampproject.org/v0/amp-sidebar-0.1.js'
 'amp-fit-text', include path 'https://cdn.ampproject.org/v0/amp-fit-text-0.1.js'
 

From 0e890468107d4c88bc74cf1413d7ba0c684b99b8 Mon Sep 17 00:00:00 2001
From: Sigurdur Gudbrandsson <sigurdur@sigginet.info>
Date: Thu, 9 Feb 2017 14:02:20 +0000
Subject: [PATCH 14/16] Allow Travis builds to fail on PHP nightly

---
 .travis.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index db4454d8..ed294142 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,3 +12,7 @@ before_script:
 
 script:
   - vendor/bin/phpunit tests
+
+matrix:
+  allow_failures:
+    - php: nightly

From 37482c87b0f7eb1c341c8d5b827e72ba6bde37b4 Mon Sep 17 00:00:00 2001
From: Adonis Figueroa <adonisfigueroa@gmail.com>
Date: Sun, 26 Feb 2017 20:24:07 +0100
Subject: [PATCH 15/16] Transform youtube, vimeo embed code object tags to
 amp-youtube, amp-vimeo. Tranform other embed code object tags to a#href.

---
 src/AMP.php                                   |   4 +
 src/Pass/ObjectVideoTagTransformPass.php      | 112 ++++++++++++
 src/Pass/ObjectVimeoTagTransformPass.php      | 127 ++++++++++++++
 src/Pass/ObjectYouTubeTagTransformPass.php    | 163 ++++++++++++++++++
 src/Utility/ActionTakenType.php               |   3 +
 .../fragment-html/object-video-fragment.html  |   6 +
 .../object-video-fragment.html.out            |  26 +++
 .../fragment-html/object-vimeo-fragment.html  |   6 +
 .../object-vimeo-fragment.html.out            |  27 +++
 .../object-youtube-fragment.html              |   6 +
 .../object-youtube-fragment.html.out          |  27 +++
 11 files changed, 507 insertions(+)
 create mode 100644 src/Pass/ObjectVideoTagTransformPass.php
 create mode 100644 src/Pass/ObjectVimeoTagTransformPass.php
 create mode 100644 src/Pass/ObjectYouTubeTagTransformPass.php
 create mode 100644 tests/test-data/fragment-html/object-video-fragment.html
 create mode 100644 tests/test-data/fragment-html/object-video-fragment.html.out
 create mode 100644 tests/test-data/fragment-html/object-vimeo-fragment.html
 create mode 100644 tests/test-data/fragment-html/object-vimeo-fragment.html.out
 create mode 100644 tests/test-data/fragment-html/object-youtube-fragment.html
 create mode 100644 tests/test-data/fragment-html/object-youtube-fragment.html.out

diff --git a/src/AMP.php b/src/AMP.php
index b1eb5f6c..3bf2417e 100644
--- a/src/AMP.php
+++ b/src/AMP.php
@@ -47,6 +47,7 @@ class AMP
 
     // The StandardScanPass should be first after all transform passes
     // The StandardFixPass should be after StandardScanPass
+    // The ObjectVideoTagTransformPass should be after all Object transform passes
     public $passes = [
         'Lullabot\AMP\Pass\PreliminaryPass', // Removes user blacklisted tags
         'Lullabot\AMP\Pass\ImgTagTransformPass',
@@ -63,6 +64,9 @@ class AMP
         'Lullabot\AMP\Pass\PinterestTagTransformPass',
         'Lullabot\AMP\Pass\FacebookNonIframeTransformPass',
         'Lullabot\AMP\Pass\TwitterTransformPass',
+        'Lullabot\AMP\Pass\ObjectYouTubeTagTransformPass',
+        'Lullabot\AMP\Pass\ObjectVimeoTagTransformPass',
+        'Lullabot\AMP\Pass\ObjectVideoTagTransformPass',
         'Lullabot\AMP\Pass\StandardScanPass',
         'Lullabot\AMP\Pass\StandardFixPass',
         'Lullabot\AMP\Pass\AmpImgFixPass',
diff --git a/src/Pass/ObjectVideoTagTransformPass.php b/src/Pass/ObjectVideoTagTransformPass.php
new file mode 100644
index 00000000..fde2f6eb
--- /dev/null
+++ b/src/Pass/ObjectVideoTagTransformPass.php
@@ -0,0 +1,112 @@
+<?php
+/*
+ * Copyright 2016 Google
+ *
+ * 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.
+ */
+
+
+namespace Lullabot\AMP\Pass;
+
+use QueryPath\DOMQuery;
+
+use Lullabot\AMP\Utility\ActionTakenLine;
+use Lullabot\AMP\Utility\ActionTakenType;
+
+/**
+ * Class ObjectVideoTagTransformPass
+ * @package Lullabot\AMP\Pass
+ *
+ * Transform all Video embed code <object> tags
+ *
+ * This is what a video embed looks like:
+ *   <object width="480" height="270">
+ *     <param name="movie" value="http://video.golem.de/player/videoplayer.swf?id=2883&autoPl=false">
+ *     <param name="allowFullScreen" value="true">
+ *     <param name="AllowScriptAccess" value="always">
+ *     <embed src="http://video.golem.de/player/videoplayer.swf?id=2883&autoPl=false" type="application/x-shockwave-flash" allowfullscreen="true" AllowScriptAccess="always" width="480" height="270"></embed>
+ *   </object>
+ */
+class ObjectVideoTagTransformPass extends BasePass
+{
+    function pass()
+    {
+        $all_objects = $this->q->find('object:not(noscript object)');
+        /** @var DOMQuery $el */
+        foreach ($all_objects as $el) {
+            /** @var \DOMElement $dom_el */
+            $dom_el = $el->get(0);
+            $lineno = $this->getLineNo($dom_el);
+            $context_string = $this->getContextString($dom_el);
+
+            $actionTakenType = '';
+            
+            if ($this->isVideoObject($el)) {
+                $video_url = $this->getVideoUrl($el);
+
+                if (empty($video_url)) {
+                    continue;
+                }
+
+                $video_url = htmlspecialchars($video_url, ENT_QUOTES);
+                $el->after("<a target=\"_blank\" href=\"{$video_url}\">{$video_url}</a>");
+                $new_dom_el = $el->next()->get(0);
+
+                $actionTakenType = ActionTakenType::OBJECT_CONVERTED_TO_A;
+            } else {
+                continue;
+            }
+
+            // Remove the object and its children
+            $el->removeChildren()->remove();
+            $this->addActionTaken(new ActionTakenLine('object', $actionTakenType, $lineno, $context_string));
+            $this->context->addLineAssociation($new_dom_el, $lineno);
+            
+        }
+
+        return $this->transformations;
+    }
+
+    protected function isVideoObject(DOMQuery $el)
+    {
+        $params = $el->find('param');
+        foreach ($params as $param) {
+            if ($param->attr('name') == 'movie') {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     *
+     * Get the Video Url
+     *
+     * @param DOMQuery $el
+     * @return string
+     */
+    protected function getVideoUrl(DOMQuery $el)
+    {
+        $matches = [];
+        $video_url = '';
+        $params = $el->find('param');
+
+        foreach ($params as $param) {
+            if ($param->attr('name') == 'movie') {
+                return $param->attr('value');
+            }
+        }
+
+        return $video_url;
+    }
+}
diff --git a/src/Pass/ObjectVimeoTagTransformPass.php b/src/Pass/ObjectVimeoTagTransformPass.php
new file mode 100644
index 00000000..260ac463
--- /dev/null
+++ b/src/Pass/ObjectVimeoTagTransformPass.php
@@ -0,0 +1,127 @@
+<?php
+/*
+ * Copyright 2016 Google
+ *
+ * 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.
+ */
+
+
+namespace Lullabot\AMP\Pass;
+
+use QueryPath\DOMQuery;
+
+use Lullabot\AMP\Utility\ActionTakenLine;
+use Lullabot\AMP\Utility\ActionTakenType;
+
+/**
+ * Class ObjectVimeoTagTransformPass
+ * @package Lullabot\AMP\Pass
+ *
+ * Transform all Vimeo embed code <object> tags which don't have noscript as an ancestor to <amp-vimeo> tags
+ *
+ * This is what a vimeo embed looks like:
+ *   <object width="550" height="309">
+ *     <param name="movie" value="http://vimeo.com/moogaloop.swf?clip_id=12223465&amp;server=vimeo.com&amp;show_title=1&amp;show_byline=1&amp;show_portrait=0&amp;color=00ADEF&amp;fullscreen=1" />
+ *     <param name="allowfullscreen" value="true" />
+ *     <param name="allowscriptaccess" value="always" />
+ *     <embed src="http://vimeo.com/moogaloop.swf?clip_id=12223465&amp;server=vimeo.com&amp;show_title=1&amp;show_byline=1&amp;show_portrait=0&amp;color=00ADEF&amp;fullscreen=1" type="application/x-shockwave-flash" allowfullscreen="true" allowscriptaccess="always" width="550" height="309"></embed>
+ *   </object>
+ *
+ * @see https://github.com/ampproject/amphtml/blob/master/extensions/amp-vimeo/amp-vimeo.md
+ *
+ */
+class ObjectVimeoTagTransformPass extends BasePass
+{
+    function pass()
+    {
+        $all_objects = $this->q->find('object:not(noscript object)');
+        /** @var DOMQuery $el */
+        foreach ($all_objects as $el) {
+            /** @var \DOMElement $dom_el */
+            $dom_el = $el->get(0);
+            $lineno = $this->getLineNo($dom_el);
+            $context_string = $this->getContextString($dom_el);
+
+            $actionTakenType = '';
+            
+            if ($this->isVimeoObject($el)) {
+                $vimeo_code = $this->getVimeoCode($el);
+
+                // If we couldnt find a vimeo videoid then we abort
+                if (empty($vimeo_code)) {
+                    continue;
+                }
+
+                $el->after('<amp-vimeo width="16" height="9" layout="responsive" data-videoid="' . $vimeo_code . '"></amp-vimeo>');
+                $new_dom_el = $el->next()->get(0);
+
+                $actionTakenType = ActionTakenType::VIMEO_OBJECT_CONVERTED;
+            
+            } else {
+                continue;
+            }
+
+            // Remove the object and its children
+            $el->removeChildren()->remove();
+            $this->addActionTaken(new ActionTakenLine('object', $actionTakenType, $lineno, $context_string));
+            $this->context->addLineAssociation($new_dom_el, $lineno);
+            
+        }
+
+        return $this->transformations;
+    }
+
+    protected function isVimeoObject(DOMQuery $el)
+    {
+        $params = $el->find('param');
+        foreach ($params as $param) {
+            if ($param->attr('name') == 'movie') {
+                $param_value = $param->attr('value');
+                if (preg_match('&(*UTF8)(vimeo\.com)&i', $param_value)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     *
+     * Get the Vimeo Code
+     *
+     * @param DOMQuery $el
+     * @return string
+     */
+    protected function getVimeoCode(DOMQuery $el)
+    {
+        $matches = [];
+        $vimeo_code = '';
+        $params = $el->find('param');
+
+        foreach ($params as $param) {
+            if ($param->attr('name') == 'movie') {
+                $param_value = $param->attr('value');
+
+                $pattern = '#http://(?:\w+.)?vimeo.com/(?:video/|moogaloop\.swf\?clip_id=)(\w+)#i';
+                if (preg_match($pattern, $param_value, $matches)) {
+                    if (!empty($matches[1])) {
+                        $vimeo_code = $matches[1];
+                        return $vimeo_code;
+                    }
+                }
+            }
+        }
+
+        return $vimeo_code;
+    }
+}
diff --git a/src/Pass/ObjectYouTubeTagTransformPass.php b/src/Pass/ObjectYouTubeTagTransformPass.php
new file mode 100644
index 00000000..b1de2e3f
--- /dev/null
+++ b/src/Pass/ObjectYouTubeTagTransformPass.php
@@ -0,0 +1,163 @@
+<?php
+/*
+ * Copyright 2016 Google
+ *
+ * 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.
+ */
+
+
+namespace Lullabot\AMP\Pass;
+
+use QueryPath\DOMQuery;
+
+use Lullabot\AMP\Utility\ActionTakenLine;
+use Lullabot\AMP\Utility\ActionTakenType;
+
+/**
+ * Class ObjectYouTubeTagTransformPass
+ * @package Lullabot\AMP\Pass
+ *
+ * Transform all Youtube embed code <object> tags which don't have noscript as an ancestor to <amp-youtube> tags
+ *
+ * This is what a youtube embed looks like:
+ *   <object width="512" height="308">
+ *     <param name="movie" value="https://www.youtube.com/embed/MnR9AVs6Q_c">
+ *     <param name="allowFullScreen" value="true">
+ *     <param name="allowscriptaccess" value="always">
+ *     <embed src="https://www.youtube.com/embed/MnR9AVs6Q_c" type="application/x-shockwave-flash" allowscriptaccess="always" allowfullscreen="true" width="512" height="308">
+ *   </object>
+ *
+ * @see https://github.com/ampproject/amphtml/blob/master/extensions/amp-youtube/amp-youtube.md
+ *
+ */
+class ObjectYouTubeTagTransformPass extends BasePass
+{
+    /**
+     * A standard youtube video aspect ratio
+     * @var float
+     */
+    const DEFAULT_ASPECT_RATIO = 1.7778;
+    const DEFAULT_VIDEO_WIDTH = 560;
+    const DEFAULT_VIDEO_HEIGHT = 315;
+
+    function pass()
+    {
+        $all_objects = $this->q->find('object:not(noscript object)');
+        /** @var DOMQuery $el */
+        foreach ($all_objects as $el) {
+            /** @var \DOMElement $dom_el */
+            $dom_el = $el->get(0);
+            $lineno = $this->getLineNo($dom_el);
+            $context_string = $this->getContextString($dom_el);
+
+            $actionTakenType = '';
+            
+            if ($this->isYouTubeObject($el)) {
+                $youtube_code = $this->getYouTubeCode($el);
+
+                // If we couldnt find a youtube videoid then we abort
+                if (empty($youtube_code)) {
+                    continue;
+                }
+
+                $el->after("<amp-youtube data-videoid=\"$youtube_code\" layout=\"responsive\"></amp-youtube>");
+
+                $new_el = $el->next();
+                $new_dom_el = $new_el->get(0);
+
+                $actionTakenType = ActionTakenType::YOUTUBE_OBJECT_CONVERTED;
+
+                $this->setStandardAttributesFrom($el, $new_el, self::DEFAULT_VIDEO_WIDTH, self::DEFAULT_VIDEO_HEIGHT, self::DEFAULT_ASPECT_RATIO);
+            
+            } else {
+                continue;
+            }
+
+            // Remove the object and its children
+            $el->removeChildren()->remove();
+            $this->addActionTaken(new ActionTakenLine('object', $actionTakenType, $lineno, $context_string));
+            $this->context->addLineAssociation($new_dom_el, $lineno);
+            
+        }
+
+        return $this->transformations;
+    }
+
+    protected function isYouTubeObject(DOMQuery $el)
+    {
+        $params = $el->find('param');
+        foreach ($params as $param) {
+            if ($param->attr('name') == 'movie') {
+                $param_value = $param->attr('value');
+                if (preg_match('&(*UTF8)(youtube\.com|youtu\.be)&i', $param_value)) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     *
+     * Get the youtube videoid
+     *
+     * @param DOMQuery $el
+     * @return string
+     */
+    protected function getYouTubeCode(DOMQuery $el)
+    {
+        $matches = [];
+        $youtube_code = '';
+        $params = $el->find('param');
+
+        foreach ($params as $param) {
+            if ($param->attr('name') == 'movie') {
+                $param_value = $param->attr('value');
+
+                $pattern = 
+                    '~(?#!js YouTubeId Rev:20160125_1800)
+                    # Match non-linked youtube URL in the wild. (Rev:20130823)
+                    https?://          # Required scheme. Either http or https.
+                    (?:[0-9A-Z-]+\.)?  # Optional subdomain.
+                    (?:                # Group host alternatives.
+                      youtu\.be/       # Either youtu.be,
+                    | youtube          # or youtube.com or
+                      (?:-nocookie)?   # youtube-nocookie.com
+                      \.com            # followed by
+                      \S*?             # Allow anything up to VIDEO_ID,
+                      [^\w\s-]         # but char before ID is non-ID char.
+                    )                  # End host alternatives.
+                    ([\w-]{11})        # $1: VIDEO_ID is exactly 11 chars.
+                    (?=[^\w-]|$)       # Assert next char is non-ID or EOS.
+                    (?!                # Assert URL is not pre-linked.
+                      [?=&+%\w.-]*     # Allow URL (query) remainder.
+                      (?:              # Group pre-linked alternatives.
+                        [\'"][^<>]*>   # Either inside a start tag,
+                      | </a>           # or inside <a> element text contents.
+                      )                # End recognized pre-linked alts.
+                    )                  # End negative lookahead assertion.
+                    [?=&+%\w.-]*       # Consume any URL (query) remainder.
+                    ~ix';
+                if (preg_match($pattern, $param_value, $matches)) {
+                    if (!empty($matches[1])) {
+                        $youtube_code = $matches[1];
+                        return $youtube_code;
+                    }
+                }
+            }
+        }
+
+        return $youtube_code;
+    }
+}
diff --git a/src/Utility/ActionTakenType.php b/src/Utility/ActionTakenType.php
index 52462b5c..60b88025 100644
--- a/src/Utility/ActionTakenType.php
+++ b/src/Utility/ActionTakenType.php
@@ -52,4 +52,7 @@ class ActionTakenType
     const ISSUE_RESOLVED = 'no further action required as this issue was resolved due to an earlier fix';
     const AMP_IMG_FIX = 'tried to fix problems with amp-img by trying to fetch height, width from image directly and/or setting layout to responsive';
     const AMP_IMG_FIX_RESPONSIVE = 'tried to fix problems with amp-img by setting layout to responsive';
+    const YOUTUBE_OBJECT_CONVERTED = 'youtube object code was converted to the amp-youtube tag.';
+    const VIMEO_OBJECT_CONVERTED = 'vimeo object code was converted to the amp-vimeo tag.';
+    const OBJECT_CONVERTED_TO_A = 'video object code was converted to a#href tag.';
 }
diff --git a/tests/test-data/fragment-html/object-video-fragment.html b/tests/test-data/fragment-html/object-video-fragment.html
new file mode 100644
index 00000000..18faf3a9
--- /dev/null
+++ b/tests/test-data/fragment-html/object-video-fragment.html
@@ -0,0 +1,6 @@
+<object width="480" height="270">
+	<param name="movie" value="http://video.golem.de/player/videoplayer.swf?id=2883&autoPl=false">
+	<param name="allowFullScreen" value="true">
+	<param name="AllowScriptAccess" value="always">
+	<embed src="http://video.golem.de/player/videoplayer.swf?id=2883&autoPl=false" type="application/x-shockwave-flash" allowfullscreen="true" AllowScriptAccess="always" width="480" height="270"></embed>
+</object>
\ No newline at end of file
diff --git a/tests/test-data/fragment-html/object-video-fragment.html.out b/tests/test-data/fragment-html/object-video-fragment.html.out
new file mode 100644
index 00000000..a00438d3
--- /dev/null
+++ b/tests/test-data/fragment-html/object-video-fragment.html.out
@@ -0,0 +1,26 @@
+<a target="_blank" href="http://video.golem.de/player/videoplayer.swf?id=2883&amp;autoPl=false">http://video.golem.de/player/videoplayer.swf?id=2883&amp;autoPl=false</a>
+
+ORIGINAL HTML
+---------------
+Line 1: <object width="480" height="270">
+Line 2: 	<param name="movie" value="http://video.golem.de/player/videoplayer.swf?id=2883&autoPl=false">
+Line 3: 	<param name="allowFullScreen" value="true">
+Line 4: 	<param name="AllowScriptAccess" value="always">
+Line 5: 	<embed src="http://video.golem.de/player/videoplayer.swf?id=2883&autoPl=false" type="application/x-shockwave-flash" allowfullscreen="true" AllowScriptAccess="always" width="480" height="270"></embed>
+Line 6: </object>
+
+
+Transformations made from HTML tags to AMP custom tags
+-------------------------------------------------------
+
+<object width="480" height="270"> at line 1
+ ACTION TAKEN: object video object code was converted to a#href tag.
+
+
+AMP-HTML Validation Issues and Fixes
+-------------------------------------
+PASS
+
+COMPONENT NAMES WITH JS PATH
+------------------------------
+No custom amp script includes required
diff --git a/tests/test-data/fragment-html/object-vimeo-fragment.html b/tests/test-data/fragment-html/object-vimeo-fragment.html
new file mode 100644
index 00000000..b758d71f
--- /dev/null
+++ b/tests/test-data/fragment-html/object-vimeo-fragment.html
@@ -0,0 +1,6 @@
+<object width="550" height="309">
+	<param name="movie" value="http://vimeo.com/moogaloop.swf?clip_id=12223465&amp;server=vimeo.com&amp;show_title=1&amp;show_byline=1&amp;show_portrait=0&amp;color=00ADEF&amp;fullscreen=1" />
+	<param name="allowfullscreen" value="true" />
+	<param name="allowscriptaccess" value="always" />
+	<embed src="http://vimeo.com/moogaloop.swf?clip_id=12223465&amp;server=vimeo.com&amp;show_title=1&amp;show_byline=1&amp;show_portrait=0&amp;color=00ADEF&amp;fullscreen=1" type="application/x-shockwave-flash" allowfullscreen="true" allowscriptaccess="always" width="550" height="309"></embed>
+</object>
\ No newline at end of file
diff --git a/tests/test-data/fragment-html/object-vimeo-fragment.html.out b/tests/test-data/fragment-html/object-vimeo-fragment.html.out
new file mode 100644
index 00000000..d68c46db
--- /dev/null
+++ b/tests/test-data/fragment-html/object-vimeo-fragment.html.out
@@ -0,0 +1,27 @@
+<amp-vimeo width="16" height="9" layout="responsive" data-videoid="12223465"></amp-vimeo>
+
+ORIGINAL HTML
+---------------
+Line 1: <object width="550" height="309">
+Line 2: 	<param name="movie" value="http://vimeo.com/moogaloop.swf?clip_id=12223465&amp;server=vimeo.com&amp;show_title=1&amp;show_byline=1&amp;show_portrait=0&amp;color=00ADEF&amp;fullscreen=1" />
+Line 3: 	<param name="allowfullscreen" value="true" />
+Line 4: 	<param name="allowscriptaccess" value="always" />
+Line 5: 	<embed src="http://vimeo.com/moogaloop.swf?clip_id=12223465&amp;server=vimeo.com&amp;show_title=1&amp;show_byline=1&amp;show_portrait=0&amp;color=00ADEF&amp;fullscreen=1" type="application/x-shockwave-flash" allowfullscreen="true" allowscriptaccess="always" width="550" height="309"></embed>
+Line 6: </object>
+
+
+Transformations made from HTML tags to AMP custom tags
+-------------------------------------------------------
+
+<object width="550" height="309"> at line 1
+ ACTION TAKEN: object vimeo object code was converted to the amp-vimeo tag.
+
+
+AMP-HTML Validation Issues and Fixes
+-------------------------------------
+PASS
+
+COMPONENT NAMES WITH JS PATH
+------------------------------
+'amp-vimeo', include path 'https://cdn.ampproject.org/v0/amp-vimeo-0.1.js'
+
diff --git a/tests/test-data/fragment-html/object-youtube-fragment.html b/tests/test-data/fragment-html/object-youtube-fragment.html
new file mode 100644
index 00000000..db7fa775
--- /dev/null
+++ b/tests/test-data/fragment-html/object-youtube-fragment.html
@@ -0,0 +1,6 @@
+<object width="512" height="308">
+	<param name="movie" value="https://www.youtube.com/embed/MnR9AVs6Q_c">
+	<param name="allowFullScreen" value="true">
+	<param name="allowscriptaccess" value="always">
+	<embed src="https://www.youtube.com/embed/MnR9AVs6Q_c" type="application/x-shockwave-flash" allowscriptaccess="always" allowfullscreen="true" width="512" height="308">
+</object>
\ No newline at end of file
diff --git a/tests/test-data/fragment-html/object-youtube-fragment.html.out b/tests/test-data/fragment-html/object-youtube-fragment.html.out
new file mode 100644
index 00000000..f61c359a
--- /dev/null
+++ b/tests/test-data/fragment-html/object-youtube-fragment.html.out
@@ -0,0 +1,27 @@
+<amp-youtube data-videoid="MnR9AVs6Q_c" layout="responsive" height="308" width="512"></amp-youtube>
+
+ORIGINAL HTML
+---------------
+Line 1: <object width="512" height="308">
+Line 2: 	<param name="movie" value="https://www.youtube.com/embed/MnR9AVs6Q_c">
+Line 3: 	<param name="allowFullScreen" value="true">
+Line 4: 	<param name="allowscriptaccess" value="always">
+Line 5: 	<embed src="https://www.youtube.com/embed/MnR9AVs6Q_c" type="application/x-shockwave-flash" allowscriptaccess="always" allowfullscreen="true" width="512" height="308">
+Line 6: </object>
+
+
+Transformations made from HTML tags to AMP custom tags
+-------------------------------------------------------
+
+<object width="512" height="308"> at line 1
+ ACTION TAKEN: object youtube object code was converted to the amp-youtube tag.
+
+
+AMP-HTML Validation Issues and Fixes
+-------------------------------------
+PASS
+
+COMPONENT NAMES WITH JS PATH
+------------------------------
+'amp-youtube', include path 'https://cdn.ampproject.org/v0/amp-youtube-0.1.js'
+

From 0a8f7906d661a2f986fc123ee3acd1df4999e929 Mon Sep 17 00:00:00 2001
From: Les Lim <lesmanalim@gmail.com>
Date: Tue, 28 Feb 2017 13:03:37 -0600
Subject: [PATCH 16/16] AMP.php: ensure that $this->options['scope'] is always
 set

This commit fixes #171.
---
 src/AMP.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/AMP.php b/src/AMP.php
index b1eb5f6c..b51d5f6e 100644
--- a/src/AMP.php
+++ b/src/AMP.php
@@ -185,8 +185,13 @@ public function loadHtml($html, $options = [])
             $options['remove_non_converted_img_tag'] = false;
         }
 
+        // By default the scope is 'body'
+        if (!isset($options['scope'])) {
+          $options['scope'] = Scope::BODY_SCOPE;
+        }
+
         $this->options = $options;
-        $this->scope = !empty($options['scope']) ? $options['scope'] : Scope::BODY_SCOPE;
+        $this->scope = $options['scope'];
 
         // Currently we only support these two scopes
         if (!in_array($this->scope, [Scope::HTML_SCOPE, Scope::BODY_SCOPE])) {