W3C home > Mailing lists > Public > public-html-commits@w3.org > February 2010

html5/markup/elements figcaption.html,NONE,1.1 figure.html,1.4,1.5

From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
Date: Tue, 02 Feb 2010 05:22:36 +0000
To: public-html-commits@w3.org
Message-Id: <E1NcBDg-00009q-TC@lionel-hutz.w3.org>
Update of /sources/public/html5/markup/elements
In directory hutz:/tmp/cvs-serv301/elements

Modified Files:
	figure.html 
Added Files:
	figcaption.html 
Log Message:
added figure and figcaption

--- NEW FILE: figcaption.html ---
<div xmlns="http://www.w3.org/1999/xhtml">
  <h4>The figcaption element</h4>
  <div id="shortdesc">figure caption</div>
  <div id="longdesc">
    <p>The
    <a href="#figcaption" class="element">figcaption</a>
    element represents a caption or legend for a
    <a href="#figure" class="element">figure</a>.</p>
  </div>
  <div id="prose-model">Phrasing content</div>
</div>

Index: figure.html
===================================================================
RCS file: /sources/public/html5/markup/elements/figure.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- figure.html	4 Mar 2009 08:13:58 -0000	1.4
+++ figure.html	2 Feb 2010 05:22:34 -0000	1.5
@@ -3,8 +3,29 @@
   <div id="shortdesc">figure with optional caption</div>
   <div id="longdesc">
     <p>The <a href="#figure" class="element">figure</a> element
-    represents some flow content, optionally with a caption, which
+    represents a unit of content, optionally with a caption,
+    that is self-contained, that is typically referenced as a
+    single unit from the main flow of the document, and that
     can be moved away from the main flow of the document without
     affecting the document’s meaning.</p>
   </div>
+  <div id="prose-model">
+  <p>Exactly one of the following two choices:</p>
+  <ul>
+    <li>A single
+    <a href="#figcaption" class="element">figcaption</a>
+    element, followed by
+    <a href="#common.elem.flow">flow elements</a>
+    and
+    <a href="#normal-character-data">normal character data</a>
+    </li>
+    <li>Or,
+    <a href="#common.elem.flow">flow elements</a>
+    and
+    <a href="#normal-character-data">normal character data</a>,
+    optionally followed by a single
+    <a href="#figcaption" class="element">figcaption</a>
+    element</li>
+  </ul>
+  </div>
 </div>
Received on Tuesday, 2 February 2010 05:22:38 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Tuesday, 2 February 2010 05:22:39 GMT