Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[ac] (1) Adjust how <figure> gives captions to <img>s to exclude case…
…s where <img>s are not alone

Fixing https://www.w3.org/Bugs/Public/show_bug.cgi?id=25055
Affected topics: HTML

git-svn-id: http://svn.whatwg.org/webapps@8550 340c8d12-0b0e-0410-8428-c7bf67bfef74
  • Loading branch information
Hixie committed Mar 17, 2014
1 parent ef2388b commit 1c8fe52
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 15 deletions.
10 changes: 5 additions & 5 deletions complete.html
Expand Up @@ -21547,11 +21547,11 @@ <h4 id=the-img-element><span class=secno>4.7.1 </span>The <dfn><code>img</code><
the empty string, then the value of that attribute is the caption information; abort these
steps.</li>

<!--CLEANUP-->
<li><p>If the image is a descendant of a <code><a href=#the-figure-element>figure</a></code> element that has a child
<code><a href=#the-figcaption-element>figcaption</a></code> element, and, ignoring the <code><a href=#the-figcaption-element>figcaption</a></code> element and its
descendants, the <code><a href=#the-figure-element>figure</a></code> element has no <code><a href=#text>Text</a></code> node descendants other
than <a href=#inter-element-whitespace>inter-element whitespace</a>, and no <a href=#embedded-content-category>embedded content</a> descendant
other than the <code><a href=#the-img-element>img</a></code> element, then the contents of the first such
descendants, the <code><a href=#the-figure-element>figure</a></code> element has no <a href=#flow-content>flow content</a> descendants other
than <a href=#inter-element-whitespace>inter-element whitespace</a> and the <code><a href=#the-img-element>img</a></code> element, then the contents of the first such
<code><a href=#the-figcaption-element>figcaption</a></code> element are the caption information; abort these steps.</li>

<li><p>There is no caption information.</li>
Expand Down Expand Up @@ -22460,8 +22460,8 @@ <h6 id=a-key-part-of-the-content><span class=secno>4.7.1.1.10 </span>A key part
<code><a href=#the-figure-element>figure</a></code> element that contains a <code><a href=#the-figcaption-element>figcaption</a></code> element that contains
content other than <a href=#inter-element-whitespace>inter-element whitespace</a>, and, ignoring the
<code><a href=#the-figcaption-element>figcaption</a></code> element and its descendants, the <code><a href=#the-figure-element>figure</a></code> element has no
<code><a href=#text>Text</a></code> node descendants other than <a href=#inter-element-whitespace>inter-element whitespace</a>, and no
<a href=#embedded-content-category>embedded content</a> descendant other than the <code><a href=#the-img-element>img</a></code> element.</li>
<a href=#flow-content>flow content</a> descendants other than <a href=#inter-element-whitespace>inter-element whitespace</a> and the
<code><a href=#the-img-element>img</a></code> element.</li>

<li>

Expand Down
10 changes: 5 additions & 5 deletions index
Expand Up @@ -21547,11 +21547,11 @@ interface <dfn id=htmlimageelement>HTMLImageElement</dfn> : <a href=#htmlelement
the empty string, then the value of that attribute is the caption information; abort these
steps.</li>

<!--CLEANUP-->
<li><p>If the image is a descendant of a <code><a href=#the-figure-element>figure</a></code> element that has a child
<code><a href=#the-figcaption-element>figcaption</a></code> element, and, ignoring the <code><a href=#the-figcaption-element>figcaption</a></code> element and its
descendants, the <code><a href=#the-figure-element>figure</a></code> element has no <code><a href=#text>Text</a></code> node descendants other
than <a href=#inter-element-whitespace>inter-element whitespace</a>, and no <a href=#embedded-content-category>embedded content</a> descendant
other than the <code><a href=#the-img-element>img</a></code> element, then the contents of the first such
descendants, the <code><a href=#the-figure-element>figure</a></code> element has no <a href=#flow-content>flow content</a> descendants other
than <a href=#inter-element-whitespace>inter-element whitespace</a> and the <code><a href=#the-img-element>img</a></code> element, then the contents of the first such
<code><a href=#the-figcaption-element>figcaption</a></code> element are the caption information; abort these steps.</li>

<li><p>There is no caption information.</li>
Expand Down Expand Up @@ -22460,8 +22460,8 @@ of various sizes."&gt;</strong></pre>
<code><a href=#the-figure-element>figure</a></code> element that contains a <code><a href=#the-figcaption-element>figcaption</a></code> element that contains
content other than <a href=#inter-element-whitespace>inter-element whitespace</a>, and, ignoring the
<code><a href=#the-figcaption-element>figcaption</a></code> element and its descendants, the <code><a href=#the-figure-element>figure</a></code> element has no
<code><a href=#text>Text</a></code> node descendants other than <a href=#inter-element-whitespace>inter-element whitespace</a>, and no
<a href=#embedded-content-category>embedded content</a> descendant other than the <code><a href=#the-img-element>img</a></code> element.</li>
<a href=#flow-content>flow content</a> descendants other than <a href=#inter-element-whitespace>inter-element whitespace</a> and the
<code><a href=#the-img-element>img</a></code> element.</li>

<li>

Expand Down
10 changes: 5 additions & 5 deletions source
Expand Up @@ -22628,11 +22628,11 @@ interface <dfn>HTMLImageElement</dfn> : <span>HTMLElement</span> {
the empty string, then the value of that attribute is the caption information; abort these
steps.</p></li>

<!--CLEANUP-->
<li><p>If the image is a descendant of a <code>figure</code> element that has a child
<code>figcaption</code> element, and, ignoring the <code>figcaption</code> element and its
descendants, the <code>figure</code> element has no <code>Text</code> node descendants other
than <span>inter-element whitespace</span>, and no <span>embedded content</span> descendant
other than the <code>img</code> element, then the contents of the first such
descendants, the <code>figure</code> element has no <span>flow content</span> descendants other
than <span>inter-element whitespace</span> and the <code>img</code> element, then the contents of the first such
<code>figcaption</code> element are the caption information; abort these steps.</p></li>

<li><p>There is no caption information.</p></li>
Expand Down Expand Up @@ -23592,8 +23592,8 @@ of various sizes."></strong></pre>
<code>figure</code> element that contains a <code>figcaption</code> element that contains
content other than <span>inter-element whitespace</span>, and, ignoring the
<code>figcaption</code> element and its descendants, the <code>figure</code> element has no
<code>Text</code> node descendants other than <span>inter-element whitespace</span>, and no
<span>embedded content</span> descendant other than the <code>img</code> element.</p></li>
<span>flow content</span> descendants other than <span>inter-element whitespace</span> and the
<code>img</code> element.</p></li>

<li>

Expand Down

0 comments on commit 1c8fe52

Please sign in to comment.