- From: Ian Hickson via cvs-syncmail <cvsmail@w3.org>
- Date: Wed, 18 Apr 2012 06:58:02 +0000
- To: public-html-commits@w3.org
Update of /sources/public/html5/spec
In directory hutz:/tmp/cvs-serv25314
Modified Files:
Overview.html
Log Message:
Apply some WG chair decisions. (whatwg r7056)
Index: Overview.html
===================================================================
RCS file: /sources/public/html5/spec/Overview.html,v
retrieving revision 1.5625
retrieving revision 1.5626
diff -u -d -r1.5625 -r1.5626
--- Overview.html 17 Apr 2012 05:02:33 -0000 1.5625
+++ Overview.html 18 Apr 2012 06:57:57 -0000 1.5626
@@ -10550,8 +10550,9 @@
title or a description of the target resource; on an image, it could
be the image credit or a description of the image; on a paragraph,
it could be a footnote or commentary on the text; on a citation, it
- could be further information about the source; and so forth. The
- value is text.</p>
+ could be further information about the source; on <a href="#interactive-content">interactive
+ content</a>, it could be a label for, or instructions for, use of
+ the element; and so forth. The value is text.</p>
<p>If this attribute is omitted from an element, then it implies
that the <code title="attr-title"><a href="#the-title-attribute">title</a></code> attribute of the
@@ -19485,21 +19486,30 @@
<div class="example">
<p>In this example, which could be part of a much larger work
- discussing a castle, the figure has three images in it.</p>
+ discussing a castle, nested <code><a href="#the-figure-element">figure</a></code> elements are used
+ to provide both a group caption and individual captions for each
+ figure in the group:</p>
<pre><figure>
- <img src="castle1423.jpeg" title="Etching. Anonymous, ca. 1423."
- alt="The castle has one tower, and a tall wall around it.">
- <img src="castle1858.jpeg" title="Oil-based paint on canvas. Maria Towle, 1858."
- alt="The castle now has two towers and two walls.">
- <img src="castle1999.jpeg" title="Film photograph. Peter Jankle, 1999."
- alt="The castle lies in ruins, the original tower all that remains in one piece.">
<figcaption>The castle through the ages: 1423, 1858, and 1999 respectively.</figcaption>
+ <figure>
+ <figcaption>Etching. Anonymous, ca. 1423.</figcaption>
+ <img src="castle1423.jpeg" alt="The castle has one tower, and a tall wall around it.">
+ </figure>
+ <figure>
+ <figcaption>Oil-based paint on canvas. Maria Towle, 1858.</figcaption>
+ <img src="castle1858.jpeg" alt="The castle now has two towers and two walls.">
+ </figure>
+ <figure>
+ <figcaption>Film photograph. Peter Jankle, 1999.</figcaption>
+ <img src="castle1999.jpeg" alt="The castle lies in ruins, the original tower all that remains in one piece.">
+ </figure>
</figure></pre>
</div>
+
<h4 id="the-figcaption-element"><span class="secno">4.5.12 </span>The <dfn><code>figcaption</code></dfn> element</h4>
<dl class="element"><dt><a href="#element-dfn-categories" title="element-dfn-categories">Categories</a>:</dt>
@@ -23573,10 +23583,7 @@
attribute may be omitted, but one of the following conditions must
be met as well:</p>
- <ul><li>The <code title="attr-title"><a href="#the-title-attribute">title</a></code> attribute is
- present and has a non-empty value.</li>
-
- <li id="figcaption-as-alt-condition">The <code><a href="#the-img-element">img</a></code> element
+ <ul><li id="figcaption-as-alt-condition">The <code><a href="#the-img-element">img</a></code> element
is in a <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
@@ -23753,11 +23760,7 @@
<p>A conformance checker must report the lack of an <code title="attr-img-alt"><a href="#attr-img-alt">alt</a></code> attribute as an error unless one of
the conditions listed below applies:</p>
- <ul><li>The <code title="attr-title"><a href="#the-title-attribute">title</a></code> attribute is present
- and has a non-empty value (as <a href="#unknown-images">described
- above</a>).</li>
-
- <li>The <code><a href="#the-img-element">img</a></code> element is in a <code><a href="#the-figure-element">figure</a></code>
+ <ul><li>The <code><a href="#the-img-element">img</a></code> element is in a <code><a href="#the-figure-element">figure</a></code>
element that satisfies <a href="#figcaption-as-alt-condition">the
conditions described above</a>.</li>
@@ -51358,25 +51361,11 @@
<p>HTML does not have a dedicated mechanism for marking up
footnotes. Here are the recommended alternatives.</p>
- <hr><p>For short inline annotations, the <code title="attr-title"><a href="#the-title-attribute">title</a></code> attribute should be used.</p>
-
- <div class="example">
-
- <p>In this example, two parts of a dialogue are annotated with
- footnote-like content using the <code title="attr-title"><a href="#the-title-attribute">title</a></code> attribute.</p>
-
- <pre><p> <b>Customer</b>: Hello! I wish to register a complaint. Hello. Miss?
-<p> <b>Shopkeeper</b>: <strong><span title="Colloquial pronunciation of 'What do you'"</strong>
->Watcha</span> mean, miss?
-<p> <b>Customer</b>: Uh, I'm sorry, I have a cold. I wish to make a complaint.
-<p> <b>Shopkeeper</b>: Sorry, <span <strong>title="This is, of course, a lie."</strong>>we're
-closing for lunch</span>.</pre>
-
- </div>
- <hr><p>For longer annotations, the <code><a href="#the-a-element">a</a></code> element should be
- used, pointing to an element later in the document. The convention
- is that the contents of the link be a number in square brackets.</p>
+ <hr><p>For
+ annotations, the <code><a href="#the-a-element">a</a></code> element should be used, pointing to
+ an element later in the document. The convention is that the
+ contents of the link be a number in square brackets.</p>
<div class="example">
Received on Wednesday, 18 April 2012 06:58:07 UTC