[a] (0) Update conformance criteria to match what's conforming.

Fixing https://www.w3.org/Bugs/Public/show_bug.cgi?id=22999 Affected topics: HTML Syntax and Parsing git-svn-id: http://svn.whatwg.org/webapps@8248 340c8d12-0b0e-0410-8428-c7bf67bfef74
whatwg · Oct 30, 2013 · 981714d · 981714d
1 parent d934782
commit 981714d
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/complete.html b/complete.html
@@ -13907,7 +13907,7 @@ <h4 id=the-body-element><span class=secno>4.3.1 </span>The <dfn><code>body</code
    <dd>A <code><a href=#the-body-element>body</a></code> element's <a href=#syntax-start-tag title=syntax-start-tag>start tag</a> can be omitted if
    the element is empty, or if the first thing inside the <code><a href=#the-body-element>body</a></code> element is not a
    <a href=#space-character>space character</a> or a <a href=#syntax-comments title=syntax-comments>comment</a>, except if the
-   first thing inside the <code><a href=#the-body-element>body</a></code> element is a <code><a href=#the-script-element>script</a></code> or <code><a href=#the-style-element>style</a></code>
+   first thing inside the <code><a href=#the-body-element>body</a></code> element is a <code><a href=#the-meta-element>meta</a></code>, <code><a href=#the-link-element>link</a></code>, <code><a href=#the-script-element>script</a></code>, <code><a href=#the-style-element>style</a></code>, or <code><a href=#the-template-element>template</a></code>
    element. <!-- Note that even if the </head> end tag is present, the parser makes <style> and
    <script> elements between </head> and <body> end up in the <head> instead of implying the <body>
    --></dd>
@@ -15968,7 +15968,7 @@ <h4 id=the-p-element><span class=secno>4.4.1 </span>The <dfn><code>p</code></dfn
    <dt><a href=#element-dfn-tag-omission title=element-dfn-tag-omission>Tag omission in text/html</a>:</dt>
    <dd>A <code><a href=#the-p-element>p</a></code> element's <a href=#syntax-end-tag title=syntax-end-tag>end tag</a> can be omitted if the
    <code><a href=#the-p-element>p</a></code> element is immediately followed by an <code><a href=#the-address-element>address</a></code>, <code><a href=#the-article-element>article</a></code>,
-   <code><a href=#the-aside-element>aside</a></code>, <code><a href=#the-blockquote-element>blockquote</a></code>, <code><a href=#dir>dir</a></code>, <code><a href=#the-div-element>div</a></code>, <code><a href=#the-dl-element>dl</a></code>,
+   <code><a href=#the-aside-element>aside</a></code>, <code><a href=#the-blockquote-element>blockquote</a></code>, <code><a href=#the-div-element>div</a></code>, <code><a href=#the-dl-element>dl</a></code>,
    <code><a href=#the-fieldset-element>fieldset</a></code>, <code><a href=#the-footer-element>footer</a></code>, <code><a href=#the-form-element>form</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h1</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h2</a></code>,
    <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h3</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h4</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h5</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h6</a></code>, <code><a href=#the-header-element>header</a></code>,
    <code><a href=#the-hgroup-element>hgroup</a></code>, <code><a href=#the-hr-element>hr</a></code>, <code><a href=#the-main-element>main</a></code>, <code><a href=#the-menu-element>menu</a></code>, <code><a href=#the-nav-element>nav</a></code>,
@@ -83734,11 +83734,12 @@ <h5 id=optional-tags><span class=secno>12.1.2.4 </span>Optional tags</h5>
   <p>A <code><a href=#the-head-element>head</a></code> element's <a href=#syntax-end-tag title=syntax-end-tag>end tag</a> may be omitted if the
   <code><a href=#the-head-element>head</a></code> element is not immediately followed by a <a href=#space-character>space character</a> or a <a href=#syntax-comments title=syntax-comments>comment</a>.</p>
 
+<!--CLEANUP-->
   <!-- <body> -->
   <p>A <code><a href=#the-body-element>body</a></code> element's <a href=#syntax-start-tag title=syntax-start-tag>start tag</a> may be omitted if
   the element is empty, or if the first thing inside the <code><a href=#the-body-element>body</a></code> element is not a
   <a href=#space-character>space character</a> or a <a href=#syntax-comments title=syntax-comments>comment</a>, except if the
-  first thing inside the <code><a href=#the-body-element>body</a></code> element is a <code><a href=#the-script-element>script</a></code> or <code><a href=#the-style-element>style</a></code>
+  first thing inside the <code><a href=#the-body-element>body</a></code> element is a <code><a href=#the-meta-element>meta</a></code>, <code><a href=#the-link-element>link</a></code>, <code><a href=#the-script-element>script</a></code>, <code><a href=#the-style-element>style</a></code>, or <code><a href=#the-template-element>template</a></code>
   element. <!-- Note that even if the </head> end tag is present, the parser makes <style> and
   <script> elements between </head> and <body> end up in the <head> instead of implying the <body>
   --></p>
@@ -83762,10 +83763,11 @@ <h5 id=optional-tags><span class=secno>12.1.2.4 </span>Optional tags</h5>
   <code><a href=#the-dd-element>dd</a></code> element is immediately followed by another <code><a href=#the-dd-element>dd</a></code> element or a
   <code><a href=#the-dt-element>dt</a></code> element, or if there is no more content in the parent element.</p>
 
+<!--CLEANUP-->
   <!-- </p> -->
   <p>A <code><a href=#the-p-element>p</a></code> element's <a href=#syntax-end-tag title=syntax-end-tag>end tag</a> may be omitted if the
   <code><a href=#the-p-element>p</a></code> element is immediately followed by an <code><a href=#the-address-element>address</a></code>, <code><a href=#the-article-element>article</a></code>,
-  <code><a href=#the-aside-element>aside</a></code>, <code><a href=#the-blockquote-element>blockquote</a></code>, <code><a href=#dir>dir</a></code>, <code><a href=#the-div-element>div</a></code>, <code><a href=#the-dl-element>dl</a></code>,
+  <code><a href=#the-aside-element>aside</a></code>, <code><a href=#the-blockquote-element>blockquote</a></code>, <code><a href=#the-div-element>div</a></code>, <code><a href=#the-dl-element>dl</a></code>,
   <code><a href=#the-fieldset-element>fieldset</a></code>, <code><a href=#the-footer-element>footer</a></code>, <code><a href=#the-form-element>form</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h1</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h2</a></code>,
   <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h3</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h4</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h5</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h6</a></code>, <code><a href=#the-header-element>header</a></code>,
   <code><a href=#the-hgroup-element>hgroup</a></code>, <code><a href=#the-hr-element>hr</a></code>, <code><a href=#the-main-element>main</a></code>, <code><a href=#the-menu-element>menu</a></code>, <code><a href=#the-nav-element>nav</a></code>,

diff --git a/index b/index
@@ -13907,7 +13907,7 @@ c-end         = "--&gt;"</pre>
    <dd>A <code><a href=#the-body-element>body</a></code> element's <a href=#syntax-start-tag title=syntax-start-tag>start tag</a> can be omitted if
    the element is empty, or if the first thing inside the <code><a href=#the-body-element>body</a></code> element is not a
    <a href=#space-character>space character</a> or a <a href=#syntax-comments title=syntax-comments>comment</a>, except if the
-   first thing inside the <code><a href=#the-body-element>body</a></code> element is a <code><a href=#the-script-element>script</a></code> or <code><a href=#the-style-element>style</a></code>
+   first thing inside the <code><a href=#the-body-element>body</a></code> element is a <code><a href=#the-meta-element>meta</a></code>, <code><a href=#the-link-element>link</a></code>, <code><a href=#the-script-element>script</a></code>, <code><a href=#the-style-element>style</a></code>, or <code><a href=#the-template-element>template</a></code>
    element. <!-- Note that even if the </head> end tag is present, the parser makes <style> and
    <script> elements between </head> and <body> end up in the <head> instead of implying the <body>
    --></dd>
@@ -15968,7 +15968,7 @@ Space is not the only void</pre>
    <dt><a href=#element-dfn-tag-omission title=element-dfn-tag-omission>Tag omission in text/html</a>:</dt>
    <dd>A <code><a href=#the-p-element>p</a></code> element's <a href=#syntax-end-tag title=syntax-end-tag>end tag</a> can be omitted if the
    <code><a href=#the-p-element>p</a></code> element is immediately followed by an <code><a href=#the-address-element>address</a></code>, <code><a href=#the-article-element>article</a></code>,
-   <code><a href=#the-aside-element>aside</a></code>, <code><a href=#the-blockquote-element>blockquote</a></code>, <code><a href=#dir>dir</a></code>, <code><a href=#the-div-element>div</a></code>, <code><a href=#the-dl-element>dl</a></code>,
+   <code><a href=#the-aside-element>aside</a></code>, <code><a href=#the-blockquote-element>blockquote</a></code>, <code><a href=#the-div-element>div</a></code>, <code><a href=#the-dl-element>dl</a></code>,
    <code><a href=#the-fieldset-element>fieldset</a></code>, <code><a href=#the-footer-element>footer</a></code>, <code><a href=#the-form-element>form</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h1</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h2</a></code>,
    <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h3</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h4</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h5</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h6</a></code>, <code><a href=#the-header-element>header</a></code>,
    <code><a href=#the-hgroup-element>hgroup</a></code>, <code><a href=#the-hr-element>hr</a></code>, <code><a href=#the-main-element>main</a></code>, <code><a href=#the-menu-element>menu</a></code>, <code><a href=#the-nav-element>nav</a></code>,
@@ -83734,11 +83734,12 @@ dictionary <dfn id=storageeventinit>StorageEventInit</dfn> : <a href=#eventinit>
   <p>A <code><a href=#the-head-element>head</a></code> element's <a href=#syntax-end-tag title=syntax-end-tag>end tag</a> may be omitted if the
   <code><a href=#the-head-element>head</a></code> element is not immediately followed by a <a href=#space-character>space character</a> or a <a href=#syntax-comments title=syntax-comments>comment</a>.</p>
 
+<!--CLEANUP-->
   <!-- <body> -->
   <p>A <code><a href=#the-body-element>body</a></code> element's <a href=#syntax-start-tag title=syntax-start-tag>start tag</a> may be omitted if
   the element is empty, or if the first thing inside the <code><a href=#the-body-element>body</a></code> element is not a
   <a href=#space-character>space character</a> or a <a href=#syntax-comments title=syntax-comments>comment</a>, except if the
-  first thing inside the <code><a href=#the-body-element>body</a></code> element is a <code><a href=#the-script-element>script</a></code> or <code><a href=#the-style-element>style</a></code>
+  first thing inside the <code><a href=#the-body-element>body</a></code> element is a <code><a href=#the-meta-element>meta</a></code>, <code><a href=#the-link-element>link</a></code>, <code><a href=#the-script-element>script</a></code>, <code><a href=#the-style-element>style</a></code>, or <code><a href=#the-template-element>template</a></code>
   element. <!-- Note that even if the </head> end tag is present, the parser makes <style> and
   <script> elements between </head> and <body> end up in the <head> instead of implying the <body>
   --></p>
@@ -83762,10 +83763,11 @@ dictionary <dfn id=storageeventinit>StorageEventInit</dfn> : <a href=#eventinit>
   <code><a href=#the-dd-element>dd</a></code> element is immediately followed by another <code><a href=#the-dd-element>dd</a></code> element or a
   <code><a href=#the-dt-element>dt</a></code> element, or if there is no more content in the parent element.</p>
 
+<!--CLEANUP-->
   <!-- </p> -->
   <p>A <code><a href=#the-p-element>p</a></code> element's <a href=#syntax-end-tag title=syntax-end-tag>end tag</a> may be omitted if the
   <code><a href=#the-p-element>p</a></code> element is immediately followed by an <code><a href=#the-address-element>address</a></code>, <code><a href=#the-article-element>article</a></code>,
-  <code><a href=#the-aside-element>aside</a></code>, <code><a href=#the-blockquote-element>blockquote</a></code>, <code><a href=#dir>dir</a></code>, <code><a href=#the-div-element>div</a></code>, <code><a href=#the-dl-element>dl</a></code>,
+  <code><a href=#the-aside-element>aside</a></code>, <code><a href=#the-blockquote-element>blockquote</a></code>, <code><a href=#the-div-element>div</a></code>, <code><a href=#the-dl-element>dl</a></code>,
   <code><a href=#the-fieldset-element>fieldset</a></code>, <code><a href=#the-footer-element>footer</a></code>, <code><a href=#the-form-element>form</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h1</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h2</a></code>,
   <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h3</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h4</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h5</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h6</a></code>, <code><a href=#the-header-element>header</a></code>,
   <code><a href=#the-hgroup-element>hgroup</a></code>, <code><a href=#the-hr-element>hr</a></code>, <code><a href=#the-main-element>main</a></code>, <code><a href=#the-menu-element>menu</a></code>, <code><a href=#the-nav-element>nav</a></code>,

diff --git a/source b/source
@@ -93139,11 +93139,12 @@ dictionary <dfn>StorageEventInit</dfn> : <span>EventInit</span> {
   <code>head</code> element is not immediately followed by a <span>space character</span> or a <span
   data-x="syntax-comments">comment</span>.</p>
 
+<!--CLEANUP-->
   <!-- <body> -->
   <p>A <code>body</code> element's <span data-x="syntax-start-tag">start tag</span> may be omitted if
   the element is empty, or if the first thing inside the <code>body</code> element is not a
   <span>space character</span> or a <span data-x="syntax-comments">comment</span>, except if the
-  first thing inside the <code>body</code> element is a <code>script</code> or <code>style</code>
+  first thing inside the <code>body</code> element is a <code>meta</code>, <code>link</code>, <code>script</code>, <code>style</code>, or <code>template</code>
   element. <!-- Note that even if the </head> end tag is present, the parser makes <style> and
   <script> elements between </head> and <body> end up in the <head> instead of implying the <body>
   --></p>
@@ -93168,10 +93169,11 @@ dictionary <dfn>StorageEventInit</dfn> : <span>EventInit</span> {
   <code>dd</code> element is immediately followed by another <code>dd</code> element or a
   <code>dt</code> element, or if there is no more content in the parent element.</p>
 
+<!--CLEANUP-->
   <!-- </p> -->
   <p>A <code>p</code> element's <span data-x="syntax-end-tag">end tag</span> may be omitted if the
   <code>p</code> element is immediately followed by an <code>address</code>, <code>article</code>,
-  <code>aside</code>, <code>blockquote</code>, <code>dir</code>, <code>div</code>, <code>dl</code>,
+  <code>aside</code>, <code>blockquote</code>, <code>div</code>, <code>dl</code>,
   <code>fieldset</code>, <code>footer</code>, <code>form</code>, <code>h1</code>, <code>h2</code>,
   <code>h3</code>, <code>h4</code>, <code>h5</code>, <code>h6</code>, <code>header</code>,
   <code>hgroup</code>, <code>hr</code>, <code>main</code>, <code>menu</code>, <code>nav</code>,