[html5] r4473 - [giowt] (0) Microdata: Fix the algorithm that removes duplicates to handle itemr [...]

[whatwg at whatwg.org]

Author: ianh
Date: 2010-01-04 22:41:54 -0800 (Mon, 04 Jan 2010)
New Revision: 4473

Modified:
   complete.html
   index
   source
Log:
[giowt] (0) Microdata: Fix the algorithm that removes duplicates to handle itemref=''.
Fixing http://www.w3.org/Bugs/Public/show_bug.cgi?id=8242

Modified: complete.html
===================================================================
--- complete.html	2010-01-05 06:26:05 UTC (rev 4472)
+++ complete.html	2010-01-05 06:41:54 UTC (rev 4473)
@@ -45094,8 +45094,8 @@
 
     <p>For each element <var title="">candidate</var> in <var title="">pending</var>, run the following substeps:</p>
 
-    <ol><li><p>Let <var title="">scope</var> be <var title="">candidate</var>'s nearest ancestor element with an <code title=attr-itemscope><a href=#attr-itemscope>itemscope</a></code> attribute
-     specified.</li>
+    <ol><li><p>Let <var title="">scope</var> be <var title="">candidate</var>'s nearest ancestor element with an <code title=attr-itemscope><a href=#attr-itemscope>itemscope</a></code> attribute specified, if
+     any, or null otherwise.</li>
 
      <li><p>If one of the other elements in <var title="">pending</var>
      is also <var title="">candidate</var>, then remove <var title="">candidate</var> from <var title="">pending</var>
@@ -45104,9 +45104,10 @@
      <li><p>Otherwise, if one of the other elements in <var title="">pending</var> is an ancestor element of <var title="">candidate</var>, and that element is <var title="">scope</var>, then remove <var title="">candidate</var>
      from <var title="">pending</var>.</li>
 
-     <li><p>Otherwise, if one of the other elements in <var title="">pending</var> is an ancestor element of <var title="">candidate</var>, and that element also has <var title="">scope</var> as its nearest ancestor element with an
-     <code title=attr-itemscope><a href=#attr-itemscope>itemscope</a></code> attribute
-     specified, then remove <var title="">candidate</var> from <var title="">pending</var>.</li>
+     <li><p>Otherwise, if one of the other elements in <var title="">pending</var> is an ancestor element of <var title="">candidate</var>, and either <var title="">scope</var> is
+     null or that element also has <var title="">scope</var> as its
+     nearest ancestor element with an <code title=attr-itemscope><a href=#attr-itemscope>itemscope</a></code> attribute specified, then
+     remove <var title="">candidate</var> from <var title="">pending</var>.</li>
 
     </ol></li>
 

Modified: index
===================================================================
--- index	2010-01-05 06:26:05 UTC (rev 4472)
+++ index	2010-01-05 06:41:54 UTC (rev 4473)
@@ -44929,8 +44929,8 @@
 
     <p>For each element <var title="">candidate</var> in <var title="">pending</var>, run the following substeps:</p>
 
-    <ol><li><p>Let <var title="">scope</var> be <var title="">candidate</var>'s nearest ancestor element with an <code title=attr-itemscope><a href=#attr-itemscope>itemscope</a></code> attribute
-     specified.</li>
+    <ol><li><p>Let <var title="">scope</var> be <var title="">candidate</var>'s nearest ancestor element with an <code title=attr-itemscope><a href=#attr-itemscope>itemscope</a></code> attribute specified, if
+     any, or null otherwise.</li>
 
      <li><p>If one of the other elements in <var title="">pending</var>
      is also <var title="">candidate</var>, then remove <var title="">candidate</var> from <var title="">pending</var>
@@ -44939,9 +44939,10 @@
      <li><p>Otherwise, if one of the other elements in <var title="">pending</var> is an ancestor element of <var title="">candidate</var>, and that element is <var title="">scope</var>, then remove <var title="">candidate</var>
      from <var title="">pending</var>.</li>
 
-     <li><p>Otherwise, if one of the other elements in <var title="">pending</var> is an ancestor element of <var title="">candidate</var>, and that element also has <var title="">scope</var> as its nearest ancestor element with an
-     <code title=attr-itemscope><a href=#attr-itemscope>itemscope</a></code> attribute
-     specified, then remove <var title="">candidate</var> from <var title="">pending</var>.</li>
+     <li><p>Otherwise, if one of the other elements in <var title="">pending</var> is an ancestor element of <var title="">candidate</var>, and either <var title="">scope</var> is
+     null or that element also has <var title="">scope</var> as its
+     nearest ancestor element with an <code title=attr-itemscope><a href=#attr-itemscope>itemscope</a></code> attribute specified, then
+     remove <var title="">candidate</var> from <var title="">pending</var>.</li>
 
     </ol></li>
 

Modified: source
===================================================================
--- source	2010-01-05 06:26:05 UTC (rev 4472)
+++ source	2010-01-05 06:41:54 UTC (rev 4473)
@@ -50180,8 +50180,8 @@
 
      <li><p>Let <var title="">scope</var> be <var
      title="">candidate</var>'s nearest ancestor element with an <code
-     title="attr-itemscope">itemscope</code> attribute
-     specified.</p></li>
+     title="attr-itemscope">itemscope</code> attribute specified, if
+     any, or null otherwise.</p></li>
 
      <li><p>If one of the other elements in <var title="">pending</var>
      is also <var title="">candidate</var>, then remove <var
@@ -50196,10 +50196,11 @@
 
      <li><p>Otherwise, if one of the other elements in <var
      title="">pending</var> is an ancestor element of <var
-     title="">candidate</var>, and that element also has <var
-     title="">scope</var> as its nearest ancestor element with an
-     <code title="attr-itemscope">itemscope</code> attribute
-     specified, then remove <var title="">candidate</var> from <var
+     title="">candidate</var>, and either <var title="">scope</var> is
+     null or that element also has <var title="">scope</var> as its
+     nearest ancestor element with an <code
+     title="attr-itemscope">itemscope</code> attribute specified, then
+     remove <var title="">candidate</var> from <var
      title="">pending</var>.</p></li>
 
     </ol>