[html5] r8550 - [ac] (1) Adjust how <figure> gives captions to <img>s to exclude cases where <im [...]

[whatwg at whatwg.org]

Author: ianh
Date: 2014-03-17 13:14:39 -0700 (Mon, 17 Mar 2014)
New Revision: 8550

Modified:
   complete.html
   index
   source
Log:
[ac] (1) Adjust how <figure> gives captions to <img>s to exclude cases where <img>s are not alone
Fixing https://www.w3.org/Bugs/Public/show_bug.cgi?id=25055
Affected topics: HTML

Modified: complete.html
===================================================================
--- complete.html	2014-03-17 20:10:10 UTC (rev 8549)
+++ complete.html	2014-03-17 20:14:39 UTC (rev 8550)
@@ -21547,11 +21547,11 @@
      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>
@@ -22460,8 +22460,8 @@
      <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>
 

Modified: index
===================================================================
--- index	2014-03-17 20:10:10 UTC (rev 8549)
+++ index	2014-03-17 20:14:39 UTC (rev 8550)
@@ -21547,11 +21547,11 @@
      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>
@@ -22460,8 +22460,8 @@
      <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>
 

Modified: source
===================================================================
--- source	2014-03-17 20:10:10 UTC (rev 8549)
+++ source	2014-03-17 20:14:39 UTC (rev 8550)
@@ -22628,11 +22628,11 @@
      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>
@@ -23592,8 +23592,8 @@
      <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>