- From: Ian Hickson via cvs-syncmail <cvsmail@w3.org>
- Date: Wed, 07 Dec 2011 00:23:20 +0000
- To: public-html-commits@w3.org
Update of /sources/public/html5/md
In directory hutz:/tmp/cvs-serv15555
Modified Files:
Overview.html
Log Message:
Disambiguate what to do in conflicting cases. Also, change the spacing in th emarkup so I can add paragraphs here easily later. (whatwg r6850)
Index: Overview.html
===================================================================
RCS file: /sources/public/html5/md/Overview.html,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -d -r1.180 -r1.181
--- Overview.html 28 Nov 2011 23:04:46 -0000 1.180
+++ Overview.html 7 Dec 2011 00:23:18 -0000 1.181
@@ -320,7 +320,7 @@
<h1>HTML Microdata</h1>
<h2 class="no-num no-toc" id="generatedID"></h2>
- <h2 class="no-num no-toc" id="editor-s-draft-28-november-2011">Editor's Draft 28 November 2011</h2>
+ <h2 class="no-num no-toc" id="editor-s-draft-7-december-2011">Editor's Draft 7 December 2011</h2>
<dl><dt>Latest Published Version:</dt>
<dd><a href="http://www.w3.org/TR/microdata/">http://www.w3.org/TR/microdata/</a></dd>
<dt>Latest Editor's Draft:</dt>
@@ -454,7 +454,7 @@
Group</a> is the W3C working group responsible for this
specification's progress along the W3C Recommendation
track.
- This specification is the 28 November 2011 Editor's Draft.
+ This specification is the 7 December 2011 Editor's Draft.
</p><!-- UNDER NO CIRCUMSTANCES IS THE PRECEDING PARAGRAPH TO BE REMOVED OR EDITED WITHOUT TALKING TO IAN FIRST --><p>Work on this specification is also done at the <a href="http://www.whatwg.org/">WHATWG</a>. The W3C HTML working group
actively pursues convergence with the WHATWG, as required by the <a href="http://www.w3.org/2007/03/HTML-WG-charter">W3C HTML working
group charter</a>.</p><!-- UNDER NO CIRCUMSTANCES IS THE FOLLOWING PARAGRAPH TO BE REMOVED OR EDITED WITHOUT TALKING TO IAN FIRST --><!-- UNDER NO CIRCUMSTANCES IS THE PRECEDING PARAGRAPH TO BE REMOVED OR EDITED WITHOUT TALKING TO IAN FIRST --><p>This specification is an extension to the HTML5 language. All
@@ -1290,68 +1290,98 @@
</pre>
</div><h3 id="values"><span class="secno">2.4 </span>Values</h3><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:<dl><dt>If the element also has an <code title="attr-itemscope"><a href="#attr-itemscope">itemscope</a></code> attribute</dt>
+ 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:<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>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.</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 <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</code>, <code>area</code>, or
<code>link</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>object</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>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.</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>.</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>.</dd>
+ <dd>
+
+ <p>The value is the element's <code>textContent</code>.</p>
+
+ </dd>
</dl><p>The <dfn id="url-property-elements">URL property elements</dfn> are the <code>a</code>,
<code>area</code>, <code>audio</code>, <code>embed</code>,
Received on Wednesday, 7 December 2011 00:23:25 UTC