- From: Ian Hickson via cvs-syncmail <cvsmail@w3.org>
- Date: Fri, 15 May 2009 00:35:10 +0000
- To: public-html-commits@w3.org
Update of /sources/public/html5/spec
In directory hutz:/tmp/cvs-serv26849
Modified Files:
Overview.html
Log Message:
Add vCard example; remove CR from vEvent example; mention 'article' includes blog entries; remove bogus 'conference' entry type in table; add bibtex examples; add support for citation object in JSON output. (whatwg r3103)
Index: Overview.html
===================================================================
RCS file: /sources/public/html5/spec/Overview.html,v
retrieving revision 1.2260
retrieving revision 1.2261
diff -u -d -r1.2260 -r1.2261
--- Overview.html 14 May 2009 23:49:34 -0000 1.2260
+++ Overview.html 15 May 2009 00:35:07 -0000 1.2261
@@ -152,7 +152,7 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<!--ZZZ:-->
<!--<h2 class="no-num no-toc">W3C Working Draft 23 April 2009</h2>-->
- <h2 class="no-num no-toc" id="editor-s-draft-date-1-january-1970">Editor's Draft 14 May 2009</h2>
+ <h2 class="no-num no-toc" id="editor-s-draft-date-1-january-1970">Editor's Draft 15 May 2009</h2>
<!--:ZZZ-->
<dl><!-- ZZZ: update the month/day (twice), (un)comment out
<dt>This Version:</dt>
@@ -245,7 +245,7 @@
track.
<!--ZZZ:-->
<!--This specification is the 23 April 2009 Working Draft.-->
- This specification is the 14 May 2009 Editor's Draft.
+ This specification is the 15 May 2009 Editor's Draft.
<!--:ZZZ-->
</p><!-- UNDER NO CIRCUMSTANCES IS THE PRECEDING PARAGRAPH TO BE REMOVED OR EDITED WITHOUT TALKING TO IAN FIRST --><!-- relationship to other work (required) --><p>This specification is also being produced by the <a href="http://www.whatwg.org/">WHATWG</a>. The two specifications are
identical from the table of contents onwards.</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 --><!-- context and rationale (required) --><p>This specification is intended to replace (be a new version of)
@@ -745,11 +745,15 @@
<li><a href="#microdata-dom-api"><span class="secno">5.3 </span>Microdata DOM API</a></li>
<li><a href="#predefined-vocabularies"><span class="secno">5.4 </span>Predefined vocabularies</a>
<ol>
- <li><a href="#vcard"><span class="secno">5.4.1 </span>vCard</a></li>
+ <li><a href="#vcard"><span class="secno">5.4.1 </span>vCard</a>
+ <ol>
+ <li><a href="#examples"><span class="secno">5.4.1.1 </span>Examples</a></ol></li>
<li><a href="#vevent"><span class="secno">5.4.2 </span>vEvent</a>
<ol>
- <li><a href="#examples"><span class="secno">5.4.2.1 </span>Examples</a></ol></li>
- <li><a href="#bibtex"><span class="secno">5.4.3 </span>BibTeX</a></li>
+ <li><a href="#examples-0"><span class="secno">5.4.2.1 </span>Examples</a></ol></li>
+ <li><a href="#bibtex"><span class="secno">5.4.3 </span>BibTeX</a>
+ <ol>
+ <li><a href="#examples-1"><span class="secno">5.4.3.1 </span>Examples</a></ol></li>
<li><a href="#rdf"><span class="secno">5.4.4 </span>RDF</a></ol></li>
<li><a href="#converting-html-to-other-formats"><span class="secno">5.5 </span>Converting HTML to other formats</a>
<ol>
@@ -37901,20 +37905,80 @@
<dd>
- </dl><!--XXX
+ </dl><h5 id="examples"><span class="secno">5.4.1.1 </span>Examples</h5><div class="example">
- <h5>Examples</h5>
+ <p>Here is a long example <code title="md-vcard"><a href="#md-vcard">vcard</a></code> for a
+ fictional character called "Jack Bauer":</p>
-<address item=vcard>
- <strong title="fn">Alfred Person</strong> <br>
- <span itemprop="adr" item>
- <span itemprop="street-address">1600 Amphitheatre Parkway</span> <br>
- <span itemprop="street-address">Building 43, Second Floor</span> <br>
- <span itemprop="locality">Mountain View</span>,
- <span itemprop="region">CA</span> <span itemprop="postal-code">94043</span>
- </span>
-</address>
---><h4 id="vevent"><span class="secno">5.4.2 </span>vEvent</h4><p>An item with the <a href="#predefined-type">predefined type</a> <dfn id="md-vevent" title="md-vevent"><code>vevent</code></dfn> represents an event.<p>The following are the type's <a href="#predefined-property-name" title="predefined property
+ <pre><section id="jack" item="vcard">
+ <h1 itemprop="fn">Jack Bauer</h1>
+ <img itemprop="photo" alt="" src="jack-bauer.jpg">
+ <p itemprop="org" item>
+ <span itemprop="organization-name">Counter-Terrorist Unit</span>
+ (<span itemprop="organization-unit">Los Angeles Division</span>)
+ </p>
+ <p>
+ <span class="adr" item>
+ <span itemprop="street-address">10201 W. Pico Blvd.</span><br>
+ <span itemprop="locality">Los Angeles</span>,
+ <span itemprop="region">CA</span>
+ <span itemprop="postal-code">90064</span><br>
+ <span itemprop="country-name">United States</span><br>
+ </span>
+ <span itemprop="geo">34.052339;-118.410623</span>
+ </p>
+ <h2>Assorted Contact Methods</h2>
+ <ul>
+ <li itemprop="tel" item><span itemprop="value">+1 (310) 597
+ 3781</span> <span itemprop="type">work</span></li>
+ <li><a itemprop="url"
+ href="http://en.wikipedia.org/wiki/Jack_Bauer">I'm on
+ Wikipedia</a> so you can leave a message on my user talk
+ page.</li>
+ <li><a itemprop="url"
+ href="http://www.jackbauerfacts.com/">Jack Bauer Facts</a></li>
+ <li itemprop="email"><a
+ href="mailto:j.bauer@la.ctu.gov.invalid">j.bauer@la.ctu.gov.invalid</a></li>
+ <li itemprop="tel" item><span itemprop="value">+1 (310) 555
+ 3781</span> <span><meta itemprop="type" content="cell">mobile
+ phone</span>></li>
+ </ul>
+ <p itemprop="note">If I'm out in the field, you may be better
+ off contacting <span itemprop="agent" item="vcard"><a
+ itemprop="email" href="mailto:c.obrian@la.ctu.gov.invalid"><span
+ itemprop="fn">Chloe O'Brian</span></a></span> if it's about
+ work, or ask <span itemprop="agent">Tony Almeida</span> if
+ you're interested in the CTU five-a-side football team we're
+ trying to get going.</p>
+ <ins datetime="2008-07-20T21:00:00+0100">
+ <span itemprop="rev" item>
+ <meta itemprop="type" content="date-time">
+ <meta itemprop="value" content="2008-07-20T21:00:00+0100">
+ </span>
+ <p itemprop="tel" item><strong>Update!</strong>
+ My new <span itemprop="type">home</span> phone number is
+ <span itemprop="value">01632 960 123</span>.
+ </ins>
+</section></pre>
+
+ </div><div class="example">
+
+ <p>This example shows a site's contact details (using the
+ <code><a href="#the-address-element">address</a></code> element) containing an address with two street
+ components:</p>
+
+ <pre>
+<address item=vcard>
+ <strong title="fn">Alfred Person</strong> <br>
+ <span itemprop="adr" item>
+ <span itemprop="street-address">1600 Amphitheatre Parkway</span> <br>
+ <span itemprop="street-address">Building 43, Second Floor</span> <br>
+ <span itemprop="locality">Mountain View</span>,
+ <span itemprop="region">CA</span> <span itemprop="postal-code">94043</span>
+ </span>
+</address></pre>
+
+ </div><h4 id="vevent"><span class="secno">5.4.2 </span>vEvent</h4><p>An item with the <a href="#predefined-type">predefined type</a> <dfn id="md-vevent" title="md-vevent"><code>vevent</code></dfn> represents an event.<p>The following are the type's <a href="#predefined-property-name" title="predefined property
name">predefined property names</a>. They are based on the
vocabulary defined in the iCalendar specification, where more
information on how to interpret the values can be found. <a href="#references">[RFC2445]</a><p class="note">Only the parts of the iCalendar vocabulary relating
@@ -38426,7 +38490,7 @@
</ul></li>
- </ol><h5 id="examples"><span class="secno">5.4.2.1 </span>Examples</h5><!-- get more from http://www.ietf.org/rfc/rfc2445.txt --><div class="example">
+ </ol><h5 id="examples-0"><span class="secno">5.4.2.1 </span>Examples</h5><!-- get more from http://www.ietf.org/rfc/rfc2445.txt --><div class="example">
<p>Here is an example of a page that uses the <code title="md-vevent"><a href="#md-vevent">vevent</a></code> vocabulary to mark up an event:</p>
@@ -38476,7 +38540,7 @@
value = value.replace(/\\/g, '\\n');
value = value.replace(/;/g, '\\;');
value = value.replace(/,/g, \\,');
- value = value.replace(/[\r\n]/g, '\\n');
+ value = value.replace(/\n/g, '\\n');
}
for (var nameIndex = 0; nameIndex < prop.itemprop.length; nameIndex += 1) {
var name = prop.itemprop[nameIndex];
@@ -38518,7 +38582,7 @@
text with one of the following values:</p>
<dl><dt><dfn id="md-bibtex-entrytype-article" title="md-bibtex-entrytype-article"><code>article</code></dfn></dt>
- <dd><p>A journal or magazine article.</dd>
+ <dd><p>A journal, magazine, or Web site article.</dd>
<dt><dfn id="md-bibtex-entrytype-book" title="md-bibtex-entrytype-book"><code>book</code></dfn></dt>
<dd><p>A published book or booklet.</dd>
@@ -38760,8 +38824,8 @@
<dd>
- <p>Gives the name of the journal or magazine in which the work
- cited by the bibliographic entry was published.</p>
+ <p>Gives the name of the journal, magazine, or Web site in which
+ the work cited by the bibliographic entry was published.</p>
<p>The <a href="#concept-property-value" title="concept-property-value">value</a> must be
text.</p>
@@ -39050,6 +39114,7 @@
<code title="md-bibtex-number"><a href="#md-bibtex-number">number</a></code>,
<code title="md-bibtex-pages"><a href="#md-bibtex-pages">pages</a></code>,
<strong><code title="md-bibtex-title"><a href="#md-bibtex-title">title</a></code></strong>*,
+ <code title="md-bibtex-url"><a href="#md-bibtex-url">url</a></code>, <!-- this is an "innovation"... -->
<code title="md-bibtex-volume"><a href="#md-bibtex-volume">volume</a></code>,
<strong><code title="md-bibtex-year"><a href="#md-bibtex-year">year</a></code></strong>*
<tr><td>
@@ -39080,21 +39145,6 @@
<strong><code title="md-bibtex-title"><a href="#md-bibtex-title">title</a></code></strong>*,
<code title="md-bibtex-year"><a href="#md-bibtex-year">year</a></code>
<tr><td>
- <code title="md-bibtex-entrytype-conference">conference</code>
- <td>
- <code title="md-bibtex-address"><a href="#md-bibtex-address">address</a></code>,
- <strong><code title="md-bibtex-author"><a href="#md-bibtex-author">author</a></code></strong>*,
- <strong><code title="md-bibtex-booktitle"><a href="#md-bibtex-booktitle">booktitle</a></code></strong>*,
- <code title="md-bibtex-editor"><a href="#md-bibtex-editor">editor</a></code>,
- <code title="md-bibtex-key"><a href="#md-bibtex-key">key</a></code>,
- <code title="md-bibtex-month"><a href="#md-bibtex-month">month</a></code>,
- <code title="md-bibtex-note"><a href="#md-bibtex-note">note</a></code>,
- <code title="md-bibtex-organization"><a href="#md-bibtex-organization">organization</a></code>,
- <code title="md-bibtex-pages"><a href="#md-bibtex-pages">pages</a></code>,
- <code title="md-bibtex-publisher"><a href="#md-bibtex-publisher">publisher</a></code>,
- <strong><code title="md-bibtex-title"><a href="#md-bibtex-title">title</a></code></strong>*,
- <strong><code title="md-bibtex-year"><a href="#md-bibtex-year">year</a></code></strong>*
- <tr><td>
<code title="md-bibtex-entrytype-inbook"><a href="#md-bibtex-entrytype-inbook">inbook</a></code>
<td>
<code title="md-bibtex-address"><a href="#md-bibtex-address">address</a></code>,
@@ -39219,13 +39269,28 @@
<strong><code title="md-bibtex-note"><a href="#md-bibtex-note">note</a></code></strong>*,
<strong><code title="md-bibtex-title"><a href="#md-bibtex-title">title</a></code></strong>*,
<code title="md-bibtex-year"><a href="#md-bibtex-year">year</a></code>
- </table><!--
+ </table><h5 id="examples-1"><span class="secno">5.4.3.1 </span>Examples</h5><div class="example">
- <h5>Examples</h5>
+ <p>This example shows how an article's footer can give the citation
+ information for the article:</p>
- <p class="XXX">...</p>
+ <pre><article id="friend">
+ <h1>Friend in the kingdom</h1>
+ <p>I got a friend in the kingdom, ain't that good news?</p>
+ <footer>
+ <p item=bibtex>Cite as:
+ <meta itemprop="entrytype" content="article">
+ <span itemprop="author">Nerissa Nields and Katryna Nields</span>
+ <span itemprop="title">Friend in the Kingdom</span>
+ <span itemprop="journal">Ain't That Good News</span>
+ <span itemprop="year">2009</span>
+ <span itemprop="month">April</span>
+ <link itemprop="url" href="#friend"> <!-- relative url to this page -->
+ </p>
+ </footer>
+</article></pre>
---><h4 id="rdf"><span class="secno">5.4.4 </span>RDF</h4><p>The <dfn id="md-about" title="md-about"><code>about</code></dfn> property can
+ </div><h4 id="rdf"><span class="secno">5.4.4 </span>RDF</h4><p>The <dfn id="md-about" title="md-about"><code>about</code></dfn> property can
be used to name an <a href="#concept-item" title="concept-item">item</a> for the
purposes of refering to the data defined in that item from RDF.<p>A single property with the name <code title="md-about"><a href="#md-about">about</a></code> may be present within each <a href="#concept-item" title="concept-item">item</a>. Its <a href="#concept-property-value" title="concept-property-value">value</a> must be an
<a href="#absolute-url">absolute URL</a>.<h3 id="converting-html-to-other-formats"><span class="secno">5.5 </span>Converting HTML to other formats</h3><h4 id="json"><span class="secno">5.5.1 </span>JSON</h4><p>Given a node <var title="">node</var> in a <code>Document</code>,
@@ -39242,6 +39307,23 @@
<li><p>Add an entry to <var title="">result</var> called "<code title="">items</code>" whose value is the array <var title="">items</var>.</li>
+ <li><p>Let <var title="">current node</var> be <var title="">node</var>.</p>
+
+ <li><p>Let <var title="">citation</var> be null.</p>
+
+ <li><p><i>Citation search:</i> If <var title="">current node</var>
+ has a descendant element that is a <a href="#top-level-microdata-items" title="top-level microdata
+ items">top-level microdata item</a> with the type <code title="md-bibtex"><a href="#md-bibtex">bibtex</a></code>, then <a href="#get-the-object">get the object</a>
+ for that element and let <var title="">citation</var> be that
+ object.</li>
+
+ <li><p>If <var title="">citation</var> is null and <var title="">current node</var> has a parent node, let <var title="">current node</var> be its parent node and jump back to the
+ step labeled <i>citation search</i>.</li>
+
+ <li><p>If <var title="">citation</var> is not null, add an entry to
+ <var title="">result</var> called "<code title="">citation</code>"
+ whose value is the <var title="">citation</var> object.</li>
+
<li><p>Return the result of serializing <var title="">result</var>
to JSON.</li>
@@ -62842,6 +62924,7 @@
Thomas O'Connor,
Tim Altman,
Tim Johansson,
+ Toby Inkster,
Todd Moody,
Tom Pike,
Tommy Thorsen,
Received on Friday, 15 May 2009 00:35:19 UTC