[html5] r6850 - [e] (0) Disambiguate what to do in conflicting cases. Also, change the spacing i [...]

[whatwg at whatwg.org]

Author: ianh
Date: 2011-12-06 16:23:15 -0800 (Tue, 06 Dec 2011)
New Revision: 6850

Modified:
   complete.html
   index
   source
Log:
[e] (0) Disambiguate what to do in conflicting cases. Also, change the spacing in th emarkup so I can add paragraphs here easily later.
Affected topics: Microdata

Modified: complete.html
===================================================================
--- complete.html	2011-12-07 00:18:00 UTC (rev 6849)
+++ complete.html	2011-12-07 00:23:15 UTC (rev 6850)
@@ -57245,71 +57245,101 @@
   <h4 id=values><span class=secno>5.2.4 </span>Values</h4>
 
   <p>The <dfn id=concept-property-value title=concept-property-value>property value</dfn> of a
-  name-value pair added by an element with an <code title=attr-itemprop><a href=#names:-the-itemprop-attribute>itemprop</a></code> attribute depends on the
-  element, as follows:</p>
+  name-value pair added by an element with an <code title=attr-itemprop><a href=#names:-the-itemprop-attribute>itemprop</a></code> attribute is as given for the
+  first matching case in the following list:</p>
 
-  <dl><dt>If the element also has an <code title=attr-itemscope><a href=#attr-itemscope>itemscope</a></code> attribute</dt>
+  <dl class=switch><dt>If the element also has an <code title=attr-itemscope><a href=#attr-itemscope>itemscope</a></code> attribute</dt>
 
-   <dd><p>The value is the <a href=#concept-item title=concept-item>item</a>
-   created by the element.</dd>
+   <dd>
 
+    <p>The value is the <a href=#concept-item title=concept-item>item</a> created
+    by the element.</p>
 
+   </dd>
+
+
    <dt>If the element is a <code><a href=#the-meta-element>meta</a></code> element</dt>
 
-   <dd><p>The value is the value of the element's <code title=attr-content>content</code> attribute, if any, or the empty
-   string if there is no such attribute.</dd>
+   <dd>
 
+    <p>The value is the value of the element's <code title=attr-content>content</code> attribute, if any, or the
+    empty string if there is no such attribute.</p>
 
+   </dd>
+
+
    <dt>If the element is an <code><a href=#the-audio-element>audio</a></code>, <code><a href=#the-embed-element>embed</a></code>,
    <code><a href=#the-iframe-element>iframe</a></code>, <code><a href=#the-img-element>img</a></code>, <code><a href=#the-source-element>source</a></code>,
    <code><a href=#the-track-element>track</a></code>, or <code><a href=#the-video-element>video</a></code> element</dt>
 
-   <dd><p>The value is the <a href=#absolute-url>absolute URL</a> that results from
-   <a href=#resolve-a-url title="resolve a url">resolving</a> the value of the
-   element's <code title="">src</code> attribute relative to the
-   element at the time the attribute is set, or the empty string if
-   there is no such attribute or if <a href=#resolve-a-url title="resolve a
-   url">resolving</a> it results in an error.</dd>
+   <dd>
 
+    <p>The value is the <a href=#absolute-url>absolute URL</a> that results from
+    <a href=#resolve-a-url title="resolve a url">resolving</a> the value of the
+    element's <code title="">src</code> attribute relative to the
+    element at the time the attribute is set, or the empty string if
+    there is no such attribute or if <a href=#resolve-a-url title="resolve a
+    url">resolving</a> it results in an error.</p>
 
+   </dd>
+
+
    <dt>If the element is an <code><a href=#the-a-element>a</a></code>, <code><a href=#the-area-element>area</a></code>, or
    <code><a href=#the-link-element>link</a></code> element</dt>
 
-   <dd><p>The value is the <a href=#absolute-url>absolute URL</a> that results from
-   <a href=#resolve-a-url title="resolve a url">resolving</a> the value of the
-   element's <code title="">href</code> attribute relative to the
-   element at the time the attribute is set, or the empty string if
-   there is no such attribute or if <a href=#resolve-a-url title="resolve a
-   url">resolving</a> it results in an error.</dd>
+   <dd>
 
+    <p>The value is the <a href=#absolute-url>absolute URL</a> that results from
+    <a href=#resolve-a-url title="resolve a url">resolving</a> the value of the
+    element's <code title="">href</code> attribute relative to the
+    element at the time the attribute is set, or the empty string if
+    there is no such attribute or if <a href=#resolve-a-url title="resolve a
+    url">resolving</a> it results in an error.</p>
 
+   </dd>
+
+
    <dt>If the element is an <code><a href=#the-object-element>object</a></code> element</dt>
 
-   <dd><p>The value is the <a href=#absolute-url>absolute URL</a> that results from
-   <a href=#resolve-a-url title="resolve a url">resolving</a> the value of the
-   element's <code title="">data</code> attribute relative to the
-   element at the time the attribute is set, or the empty string if
-   there is no such attribute or if <a href=#resolve-a-url title="resolve a
-   url">resolving</a> it results in an error.</dd>
+   <dd>
 
+    <p>The value is the <a href=#absolute-url>absolute URL</a> that results from
+    <a href=#resolve-a-url title="resolve a url">resolving</a> the value of the
+    element's <code title="">data</code> attribute relative to the
+    element at the time the attribute is set, or the empty string if
+    there is no such attribute or if <a href=#resolve-a-url title="resolve a
+    url">resolving</a> it results in an error.</p>
 
+   </dd>
+
+
    <dt>If the element is a <code><a href=#the-data-element>data</a></code> element</dt>
 
-   <dd><p>The value is the value of the element's <code title=attr-data-value><a href=#attr-data-value>value</a></code> attribute, if it has one, or
-   the empty string otherwise.</dd>
+   <dd>
 
+    <p>The value is the value of the element's <code title=attr-data-value><a href=#attr-data-value>value</a></code> attribute, if it has one, or
+    the empty string otherwise.</p>
 
+   </dd>
+
+
    <dt>If the element is a <code><a href=#the-time-element>time</a></code> element</dt>
 
-   <dd><p>The value is the element's <a href=#datetime-value>datetime
-   value</a>.</dd>
+   <dd>
 
+    <p>The value is the element's <a href=#datetime-value>datetime value</a>.</p>
 
+   </dd>
+
+
    <dt>Otherwise</dt>
 
-   <dd><p>The value is the element's
-   <code><a href=#textcontent>textContent</a></code>.</dd>
+   <dd>
 
+    <p>The value is the element's <code><a href=#textcontent>textContent</a></code>.</p>
+
+   </dd>
+
   </dl><p>The <dfn id=url-property-elements>URL property elements</dfn> are the <code><a href=#the-a-element>a</a></code>,
   <code><a href=#the-area-element>area</a></code>, <code><a href=#the-audio-element>audio</a></code>, <code><a href=#the-embed-element>embed</a></code>,
   <code><a href=#the-iframe-element>iframe</a></code>, <code><a href=#the-img-element>img</a></code>, <code><a href=#the-link-element>link</a></code>,

Modified: index
===================================================================
--- index	2011-12-07 00:18:00 UTC (rev 6849)
+++ index	2011-12-07 00:23:15 UTC (rev 6850)
@@ -57245,71 +57245,101 @@
   <h4 id=values><span class=secno>5.2.4 </span>Values</h4>
 
   <p>The <dfn id=concept-property-value title=concept-property-value>property value</dfn> of a
-  name-value pair added by an element with an <code title=attr-itemprop><a href=#names:-the-itemprop-attribute>itemprop</a></code> attribute depends on the
-  element, as follows:</p>
+  name-value pair added by an element with an <code title=attr-itemprop><a href=#names:-the-itemprop-attribute>itemprop</a></code> attribute is as given for the
+  first matching case in the following list:</p>
 
-  <dl><dt>If the element also has an <code title=attr-itemscope><a href=#attr-itemscope>itemscope</a></code> attribute</dt>
+  <dl class=switch><dt>If the element also has an <code title=attr-itemscope><a href=#attr-itemscope>itemscope</a></code> attribute</dt>
 
-   <dd><p>The value is the <a href=#concept-item title=concept-item>item</a>
-   created by the element.</dd>
+   <dd>
 
+    <p>The value is the <a href=#concept-item title=concept-item>item</a> created
+    by the element.</p>
 
+   </dd>
+
+
    <dt>If the element is a <code><a href=#the-meta-element>meta</a></code> element</dt>
 
-   <dd><p>The value is the value of the element's <code title=attr-content>content</code> attribute, if any, or the empty
-   string if there is no such attribute.</dd>
+   <dd>
 
+    <p>The value is the value of the element's <code title=attr-content>content</code> attribute, if any, or the
+    empty string if there is no such attribute.</p>
 
+   </dd>
+
+
    <dt>If the element is an <code><a href=#the-audio-element>audio</a></code>, <code><a href=#the-embed-element>embed</a></code>,
    <code><a href=#the-iframe-element>iframe</a></code>, <code><a href=#the-img-element>img</a></code>, <code><a href=#the-source-element>source</a></code>,
    <code><a href=#the-track-element>track</a></code>, or <code><a href=#the-video-element>video</a></code> element</dt>
 
-   <dd><p>The value is the <a href=#absolute-url>absolute URL</a> that results from
-   <a href=#resolve-a-url title="resolve a url">resolving</a> the value of the
-   element's <code title="">src</code> attribute relative to the
-   element at the time the attribute is set, or the empty string if
-   there is no such attribute or if <a href=#resolve-a-url title="resolve a
-   url">resolving</a> it results in an error.</dd>
+   <dd>
 
+    <p>The value is the <a href=#absolute-url>absolute URL</a> that results from
+    <a href=#resolve-a-url title="resolve a url">resolving</a> the value of the
+    element's <code title="">src</code> attribute relative to the
+    element at the time the attribute is set, or the empty string if
+    there is no such attribute or if <a href=#resolve-a-url title="resolve a
+    url">resolving</a> it results in an error.</p>
 
+   </dd>
+
+
    <dt>If the element is an <code><a href=#the-a-element>a</a></code>, <code><a href=#the-area-element>area</a></code>, or
    <code><a href=#the-link-element>link</a></code> element</dt>
 
-   <dd><p>The value is the <a href=#absolute-url>absolute URL</a> that results from
-   <a href=#resolve-a-url title="resolve a url">resolving</a> the value of the
-   element's <code title="">href</code> attribute relative to the
-   element at the time the attribute is set, or the empty string if
-   there is no such attribute or if <a href=#resolve-a-url title="resolve a
-   url">resolving</a> it results in an error.</dd>
+   <dd>
 
+    <p>The value is the <a href=#absolute-url>absolute URL</a> that results from
+    <a href=#resolve-a-url title="resolve a url">resolving</a> the value of the
+    element's <code title="">href</code> attribute relative to the
+    element at the time the attribute is set, or the empty string if
+    there is no such attribute or if <a href=#resolve-a-url title="resolve a
+    url">resolving</a> it results in an error.</p>
 
+   </dd>
+
+
    <dt>If the element is an <code><a href=#the-object-element>object</a></code> element</dt>
 
-   <dd><p>The value is the <a href=#absolute-url>absolute URL</a> that results from
-   <a href=#resolve-a-url title="resolve a url">resolving</a> the value of the
-   element's <code title="">data</code> attribute relative to the
-   element at the time the attribute is set, or the empty string if
-   there is no such attribute or if <a href=#resolve-a-url title="resolve a
-   url">resolving</a> it results in an error.</dd>
+   <dd>
 
+    <p>The value is the <a href=#absolute-url>absolute URL</a> that results from
+    <a href=#resolve-a-url title="resolve a url">resolving</a> the value of the
+    element's <code title="">data</code> attribute relative to the
+    element at the time the attribute is set, or the empty string if
+    there is no such attribute or if <a href=#resolve-a-url title="resolve a
+    url">resolving</a> it results in an error.</p>
 
+   </dd>
+
+
    <dt>If the element is a <code><a href=#the-data-element>data</a></code> element</dt>
 
-   <dd><p>The value is the value of the element's <code title=attr-data-value><a href=#attr-data-value>value</a></code> attribute, if it has one, or
-   the empty string otherwise.</dd>
+   <dd>
 
+    <p>The value is the value of the element's <code title=attr-data-value><a href=#attr-data-value>value</a></code> attribute, if it has one, or
+    the empty string otherwise.</p>
 
+   </dd>
+
+
    <dt>If the element is a <code><a href=#the-time-element>time</a></code> element</dt>
 
-   <dd><p>The value is the element's <a href=#datetime-value>datetime
-   value</a>.</dd>
+   <dd>
 
+    <p>The value is the element's <a href=#datetime-value>datetime value</a>.</p>
 
+   </dd>
+
+
    <dt>Otherwise</dt>
 
-   <dd><p>The value is the element's
-   <code><a href=#textcontent>textContent</a></code>.</dd>
+   <dd>
 
+    <p>The value is the element's <code><a href=#textcontent>textContent</a></code>.</p>
+
+   </dd>
+
   </dl><p>The <dfn id=url-property-elements>URL property elements</dfn> are the <code><a href=#the-a-element>a</a></code>,
   <code><a href=#the-area-element>area</a></code>, <code><a href=#the-audio-element>audio</a></code>, <code><a href=#the-embed-element>embed</a></code>,
   <code><a href=#the-iframe-element>iframe</a></code>, <code><a href=#the-img-element>img</a></code>, <code><a href=#the-link-element>link</a></code>,

Modified: source
===================================================================
--- source	2011-12-07 00:18:00 UTC (rev 6849)
+++ source	2011-12-07 00:23:15 UTC (rev 6850)
@@ -66774,76 +66774,106 @@
 
   <p>The <dfn title="concept-property-value">property value</dfn> of a
   name-value pair added by an element with an <code
-  title="attr-itemprop">itemprop</code> attribute depends on the
-  element, as follows:</p>
+  title="attr-itemprop">itemprop</code> attribute is as given for the
+  first matching case in the following list:</p>
 
-  <dl>
+  <dl class="switch">
 
    <dt>If the element also has an <code
    title="attr-itemscope">itemscope</code> attribute</dt>
 
-   <dd><p>The value is the <span title="concept-item">item</span>
-   created by the element.</p></dd>
+   <dd>
 
+    <p>The value is the <span title="concept-item">item</span> created
+    by the element.</p>
 
+   </dd>
+
+
    <dt>If the element is a <code>meta</code> element</dt>
 
-   <dd><p>The value is the value of the element's <code
-   title="attr-content">content</code> attribute, if any, or the empty
-   string if there is no such attribute.</p></dd>
+   <dd>
 
+    <p>The value is the value of the element's <code
+    title="attr-content">content</code> attribute, if any, or the
+    empty string if there is no such attribute.</p>
 
+   </dd>
+
+
    <dt>If the element is an <code>audio</code>, <code>embed</code>,
    <code>iframe</code>, <code>img</code>, <code>source</code>,
    <code>track</code>, or <code>video</code> element</dt>
 
-   <dd><p>The value is the <span>absolute URL</span> that results from
-   <span title="resolve a url">resolving</span> the value of the
-   element's <code title="">src</code> attribute relative to the
-   element at the time the attribute is set, or the empty string if
-   there is no such attribute or if <span title="resolve a
-   url">resolving</span> it results in an error.</p></dd>
+   <dd>
 
+    <p>The value is the <span>absolute URL</span> that results from
+    <span title="resolve a url">resolving</span> the value of the
+    element's <code title="">src</code> attribute relative to the
+    element at the time the attribute is set, or the empty string if
+    there is no such attribute or if <span title="resolve a
+    url">resolving</span> it results in an error.</p>
 
+   </dd>
+
+
    <dt>If the element is an <code>a</code>, <code>area</code>, or
    <code>link</code> element</dt>
 
-   <dd><p>The value is the <span>absolute URL</span> that results from
-   <span title="resolve a url">resolving</span> the value of the
-   element's <code title="">href</code> attribute relative to the
-   element at the time the attribute is set, or the empty string if
-   there is no such attribute or if <span title="resolve a
-   url">resolving</span> it results in an error.</p></dd>
+   <dd>
 
+    <p>The value is the <span>absolute URL</span> that results from
+    <span title="resolve a url">resolving</span> the value of the
+    element's <code title="">href</code> attribute relative to the
+    element at the time the attribute is set, or the empty string if
+    there is no such attribute or if <span title="resolve a
+    url">resolving</span> it results in an error.</p>
 
+   </dd>
+
+
    <dt>If the element is an <code>object</code> element</dt>
 
-   <dd><p>The value is the <span>absolute URL</span> that results from
-   <span title="resolve a url">resolving</span> the value of the
-   element's <code title="">data</code> attribute relative to the
-   element at the time the attribute is set, or the empty string if
-   there is no such attribute or if <span title="resolve a
-   url">resolving</span> it results in an error.</p></dd>
+   <dd>
 
+    <p>The value is the <span>absolute URL</span> that results from
+    <span title="resolve a url">resolving</span> the value of the
+    element's <code title="">data</code> attribute relative to the
+    element at the time the attribute is set, or the empty string if
+    there is no such attribute or if <span title="resolve a
+    url">resolving</span> it results in an error.</p>
 
+   </dd>
+
+
    <dt>If the element is a <code>data</code> element</dt>
 
-   <dd><p>The value is the value of the element's <code
-   title="attr-data-value">value</code> attribute, if it has one, or
-   the empty string otherwise.</p></dd>
+   <dd>
 
+    <p>The value is the value of the element's <code
+    title="attr-data-value">value</code> attribute, if it has one, or
+    the empty string otherwise.</p>
 
+   </dd>
+
+
    <dt>If the element is a <code>time</code> element</dt>
 
-   <dd><p>The value is the element's <span>datetime
-   value</span>.</p></dd>
+   <dd>
 
+    <p>The value is the element's <span>datetime value</span>.</p>
 
+   </dd>
+
+
    <dt>Otherwise</dt>
 
-   <dd><p>The value is the element's
-   <code>textContent</code>.</p></dd>
+   <dd>
 
+    <p>The value is the element's <code>textContent</code>.</p>
+
+   </dd>
+
   </dl>
 
   <p>The <dfn>URL property elements</dfn> are the <code>a</code>,