Skip to content

Commit

Permalink
[act] (2) A bunch of syntax and parsing fixes mostly to fix omissions…
Browse files Browse the repository at this point in the history 
… relating to the new elements. (bug 5759)

git-svn-id: http://svn.whatwg.org/webapps@1778 340c8d12-0b0e-0410-8428-c7bf67bfef74
  • Loading branch information
@Hixie
Hixie committed Jun 16, 2008
1 parent 1d8058d commit 185c8f9
Show file tree
Hide file tree
Showing 2 changed files with 150 additions and 94 deletions.
137 changes: 85 additions & 52 deletions index
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24120,7 +24120,7 @@ function AddCloud(data, x, y) { ... }</pre>
<dl class=element>
<dt>Categories

<dd><span>Flow element</span>.
<dd><a href="#flow-content0">Flow content</a>.

<dt>Contexts in which this element may be used:

Expand Down Expand Up @@ -24197,7 +24197,7 @@ https://www.google.com/base/settings
<dl class=element>
<dt>Categories

<dd><span>Flow element</span>.
<dd><a href="#flow-content0">Flow content</a>.

<dd><span>Interactive element</span>.

Expand Down Expand Up @@ -41721,13 +41721,15 @@ function receiver(e) {
<dt><dfn id=void-elements>Void elements</dfn>

<dd><code><a href="#base">base</a></code>, <code><a
href="#command0">command</a></code>, <code><a
href="#event-source">event-source</a></code>, <code><a
href="#link">link</a></code>, <code><a href="#meta0">meta</a></code>,
<code><a href="#hr">hr</a></code>, <code><a href="#br">br</a></code>,
<code><a href="#img">img</a></code>, <code><a
href="#embed">embed</a></code>, <code><a href="#param">param</a></code>,
<code><a href="#area">area</a></code>, <code><a
href="#col">col</a></code>, <code>input</code><!-- XXX add: ,
<code>command</code>, <code>event-source</code> -->
href="#col">col</a></code>, <code>input</code>, <code><a
href="#source">source</a></code>

<dt>CDATA elements

Expand Down Expand Up @@ -42090,16 +42092,37 @@ function receiver(e) {
title=syntax-end-tag>end tag</span> may be omitted if the <code><a
href="#p">p</a></code> element is immediately followed by an <code><a
href="#address">address</a></code>, <code><a
href="#article">article</a></code>, <code><a
href="#aside">aside</a></code>, <code><a
href="#blockquote">blockquote</a></code>, <code><a
href="#dl">dl</a></code>, <code>fieldset</code>, <code>form</code>,
<code><a href="#h1">h1</a></code>, <code><a href="#h2">h2</a></code>,
<code><a href="#h3">h3</a></code>, <code><a href="#h4">h4</a></code>,
<code><a href="#h5">h5</a></code>, <code><a href="#h6">h6</a></code>,
href="#datagrid0">datagrid</a></code>, <code><a
href="#dialog">dialog</a></code>, <code>dir</code>, <code><a
href="#div">div</a></code>, <code><a href="#dl">dl</a></code>,
<code>fieldset</code>, <code><a href="#footer">footer</a></code>,
<code>form</code>, <code><a href="#h1">h1</a></code>, <code><a
href="#h2">h2</a></code>, <code><a href="#h3">h3</a></code>, <code><a
href="#h4">h4</a></code>, <code><a href="#h5">h5</a></code>, <code><a
href="#h6">h6</a></code>, <code><a href="#header">header</a></code>,
<code><a href="#hr">hr</a></code>, <code><a href="#menu">menu</a></code>,
<code><a href="#ol">ol</a></code>, <code><a href="#p">p</a></code>,
<code><a href="#pre">pre</a></code>, <code><a
href="#table">table</a></code>, or <code><a href="#ul">ul</a></code>
<code><a href="#nav">nav</a></code>, <code><a href="#ol">ol</a></code>,
<code><a href="#p">p</a></code>, <code><a href="#pre">pre</a></code>,
<code><a href="#section">section</a></code>, <code><a
href="#table">table</a></code>, or <code><a href="#ul">ul</a></code>,
element, or if there is no more content in the parent element.</p>
<!-- </rt> -->

<p>An <code><a href="#rt">rt</a></code> element's <span
title=syntax-end-tag>end tag</span> may be omitted if the <code><a
href="#rt">rt</a></code> element is immediately followed by an <code><a
href="#rt">rt</a></code> or <code><a href="#rp">rp</a></code> element, or
if there is no more content in the parent element.</p>
<!-- </rp> -->

<p>An <code><a href="#rp">rp</a></code> element's <span
title=syntax-end-tag>end tag</span> may be omitted if the <code><a
href="#rp">rp</a></code> element is immediately followed by an <code><a
href="#rt">rt</a></code> or <code><a href="#rp">rp</a></code> element, or
if there is no more content in the parent element.</p>
<!-- </optgroup> -->

<p>An <code>optgroup</code> element's <span title=syntax-end-tag>end
Expand Down Expand Up @@ -43378,33 +43401,43 @@ function receiver(e) {
<dd>
<p>The following HTML elements have varying levels of special parsing
rules: <code><a href="#address">address</a></code>, <code><a
href="#area">area</a></code>, <code><a href="#base">base</a></code>,
href="#area">area</a></code>, <code><a
href="#article">article</a></code>, <code><a
href="#aside">aside</a></code>, <code><a href="#base">base</a></code>,
<code>basefont</code>, <code>bgsound</code>, <code><a
href="#blockquote">blockquote</a></code>, <code><a
href="#body0">body</a></code>, <code><a href="#br">br</a></code>,
<code>center</code>, <code><a href="#col">col</a></code>, <code><a
href="#colgroup">colgroup</a></code>, <code><a href="#dd">dd</a></code>,
<code>dir</code>, <code><a href="#div">div</a></code>, <code><a
href="#dl">dl</a></code>, <code><a href="#dt">dt</a></code>, <code><a
href="#embed">embed</a></code>, <code>fieldset</code>,
<code>form</code>, <code>frame</code>, <code>frameset</code>, <code><a
href="#colgroup">colgroup</a></code>, <code><a
href="#command0">command</a></code>, <code><a
href="#datagrid0">datagrid</a></code>, <code><a
href="#dd">dd</a></code>, <code><a href="#details">details</a></code>,
<code><a href="#dialog">dialog</a></code>, <code>dir</code>, <code><a
href="#div">div</a></code>, <code><a href="#dl">dl</a></code>, <code><a
href="#dt">dt</a></code>, <code><a href="#embed">embed</a></code>,
<code><a href="#event-source">event-source</a></code>
<code>fieldset</code>, <code><a href="#figure">figure</a></code>,
<code><a href="#footer">footer</a></code>, <code>form</code>,
<code>frame</code>, <code>frameset</code>, <code><a
href="#h1">h1</a></code>, <code><a href="#h2">h2</a></code>, <code><a
href="#h3">h3</a></code>, <code><a href="#h4">h4</a></code>, <code><a
href="#h5">h5</a></code>, <code><a href="#h6">h6</a></code>, <code><a
href="#head">head</a></code>, <code><a href="#hr">hr</a></code>,
<code><a href="#iframe">iframe</a></code>, <!--
href="#head">head</a></code>, <code><a href="#header">header</a></code>,
<code><a href="#hr">hr</a></code>, <code><a
href="#iframe">iframe</a></code>, <!--
<code>image</code>, (commented out because this isn't an element
that can end up on the stack, so it doesn't matter) -->
<code><a href="#img">img</a></code>, <code>input</code>,
<code>isindex</code>, <code><a href="#li">li</a></code>, <code><a
href="#link">link</a></code>, <code>listing</code>, <code><a
href="#menu">menu</a></code>, <code><a href="#meta0">meta</a></code>,
<code>noembed</code>, <code>noframes</code>, <code><a
href="#noscript">noscript</a></code>, <code><a href="#ol">ol</a></code>,
<code>optgroup</code>, <code>option</code>, <code><a
href="#p">p</a></code>, <code><a href="#param">param</a></code>,
<code>plaintext</code>, <code><a href="#pre">pre</a></code>, <code><a
href="#script1">script</a></code>, <code>select</code>,
<code><a href="#nav">nav</a></code>, <code>noembed</code>,
<code>noframes</code>, <code><a href="#noscript">noscript</a></code>,
<code><a href="#ol">ol</a></code>, <code>optgroup</code>,
<code>option</code>, <code><a href="#p">p</a></code>, <code><a
href="#param">param</a></code>, <code>plaintext</code>, <code><a
href="#pre">pre</a></code>, <code><a href="#script1">script</a></code>,
<code><a href="#section">section</a></code>, <code>select</code>,
<code>spacer</code>, <code><a href="#style1">style</a></code>, <code><a
href="#tbody">tbody</a></code>, <code>textarea</code>, <code><a
href="#tfoot0">tfoot</a></code>, <code><a
Expand Down Expand Up @@ -46822,9 +46855,9 @@ function receiver(e) {
<!-- the normal ones -->

<dt>A start tag whose tag name is one of: "address", "article", "aside",
"blockquote", "center", "datagrid", "dialog", "dir", "div", "dl",
"fieldset", "footer", "h1", "h2", "h3", "h4", "h5", "h6", "header",
"menu", "nav", "ol", "p", "section", "ul"
"blockquote", "center", "datagrid", "details", "dialog", "dir", "div",
"dl", "fieldset", "figure", "footer", "h1", "h2", "h3", "h4", "h5", "h6",
"header", "menu", "nav", "ol", "p", "section", "ul"

<dd> <!-- As of May 2008 this doesn't match any browser exactly, but is
as close to what IE does as I can get without doing the non-tree
Expand All @@ -46833,8 +46866,8 @@ function receiver(e) {

<p>If the <a href="#stack">stack of open elements</a> <a href="#have-an"
title="has an element in scope">has a <code>p</code> element in
scope</a>, then act as if an end tag with the tag name <code><a
href="#p">p</a></code> had been seen.</p>
scope</a>, then act as if an end tag with the tag name "p" had been
seen.</p>
<!-- (only applies to <h1>-<h6>)
Removed for compatibility with IE7, though all other
browsers do it this way. If you do put this back, make
Expand All @@ -46857,8 +46890,8 @@ function receiver(e) {
<dd>
<p>If the <a href="#stack">stack of open elements</a> <a href="#have-an"
title="has an element in scope">has a <code>p</code> element in
scope</a>, then act as if an end tag with the tag name <code><a
href="#p">p</a></code> had been seen.</p>
scope</a>, then act as if an end tag with the tag name "p" had been
seen.</p>

<p><a href="#insert0">Insert an HTML element</a> for the token.</p>

Expand All @@ -46880,8 +46913,8 @@ function receiver(e) {

<p>If the <a href="#stack">stack of open elements</a> <a href="#have-an"
title="has an element in scope">has a <code>p</code> element in
scope</a>, then act as if an end tag with the tag name <code><a
href="#p">p</a></code> had been seen.</p>
scope</a>, then act as if an end tag with the tag name "p" had been
seen.</p>

<p><a href="#insert0">Insert an HTML element</a> for the token, and set
the <code title=form>form</code> element pointer to point to the element
Expand All @@ -46901,8 +46934,8 @@ function receiver(e) {

<li>
<p>If <var title="">node</var> is an <code><a href="#li">li</a></code>
element, then act as if an end tag with the tag name <code><a
href="#li">li</a></code> had been seen, then jump to the last step.
element, then act as if an end tag with the tag name "li" had been
seen, then jump to the last step.

<li>
<p>If <var title="">node</var> is not in the <a
Expand All @@ -46927,8 +46960,8 @@ function receiver(e) {
<li>
<p>If the <a href="#stack">stack of open elements</a> <a
href="#have-an" title="has an element in scope">has a <code>p</code>
element in scope</a>, then act as if an end tag with the tag name
<code><a href="#p">p</a></code> had been seen.</p>
element in scope</a>, then act as if an end tag with the tag name "p"
had been seen.</p>

<p>Finally, <a href="#insert0">insert an HTML element</a> for the
token.</p>
Expand Down Expand Up @@ -46975,8 +47008,8 @@ function receiver(e) {
<li>
<p>If the <a href="#stack">stack of open elements</a> <a
href="#have-an" title="has an element in scope">has a <code>p</code>
element in scope</a>, then act as if an end tag with the tag name
<code><a href="#p">p</a></code> had been seen.</p>
element in scope</a>, then act as if an end tag with the tag name "p"
had been seen.</p>

<p>Finally, <a href="#insert0">insert an HTML element</a> for the
token.</p>
Expand All @@ -46989,8 +47022,8 @@ function receiver(e) {
<dd>
<p>If the <a href="#stack">stack of open elements</a> <a href="#have-an"
title="has an element in scope">has a <code>p</code> element in
scope</a>, then act as if an end tag with the tag name <code><a
href="#p">p</a></code> had been seen.</p>
scope</a>, then act as if an end tag with the tag name "p" had been
seen.</p>

<p><a href="#insert0">Insert an HTML element</a> for the token.</p>

Expand All @@ -47006,9 +47039,9 @@ function receiver(e) {
<!-- the normal ones -->

<dt>An end tag whose tag name is one of: "address", "article", "aside",
"blockquote", "center", "datagrid", "dialog", "dir", "div", "dl",
"fieldset", "footer", "header", "listing", "menu", "nav", "ol", "pre",
"section", "ul"
"blockquote", "center", "datagrid", "details", "dialog", "dir", "div",
"dl", "fieldset", "figure", "footer", "header", "listing", "menu", "nav",
"ol", "pre", "section", "ul"

<dd>
<p>If the <a href="#stack">stack of open elements</a> does not <a
Expand Down Expand Up @@ -47213,9 +47246,9 @@ function receiver(e) {
<p>If the <a href="#stack">stack of open elements</a> <a href="#have-an"
title="has an element in scope">has a <code>nobr</code> element in
scope</a>, then this is a <a href="#parse1">parse error</a>. Act as if
an end tag with the tag name <code>nobr</code> had been seen, then once
again <a href="#reconstruct">reconstruct the active formatting
elements</a>, if any.</p>
an end tag with the tag name "nobr" had been seen, then once again <a
href="#reconstruct">reconstruct the active formatting elements</a>, if
any.</p>

<p><a href="#insert0">Insert an HTML element</a> for the token. Add that
element to the <a href="#list-of4">list of active formatting
Expand Down Expand Up @@ -47464,8 +47497,8 @@ function receiver(e) {
<dd>
<p>If the <a href="#stack">stack of open elements</a> <a href="#have-an"
title="has an element in scope">has a <code>p</code> element in
scope</a>, then act as if an end tag with the tag name <code><a
href="#p">p</a></code> had been seen.</p>
scope</a>, then act as if an end tag with the tag name "p" had been
seen.</p>
<!-- XXX quirks: don't do this -->
<p><a href="#insert0">Insert an HTML element</a> for the token.</p>

Expand Down Expand Up @@ -47503,8 +47536,8 @@ function receiver(e) {
<dd>
<p>If the <a href="#stack">stack of open elements</a> <a href="#have-an"
title="has an element in scope">has a <code>p</code> element in
scope</a>, then act as if an end tag with the tag name <code><a
href="#p">p</a></code> had been seen.</p>
scope</a>, then act as if an end tag with the tag name "p" had been
seen.</p>
<!-- XXX quirks: don't do this -->
<p><a href="#insert0">Insert an HTML element</a> for the token.
Immediately pop the <a href="#current5">current node</a> off the <a
Expand Down
Loading

0 comments on commit 185c8f9

Please sign in to comment.