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

mike: added figure and figcaption

From: poot <cvsmail@w3.org>
Date: Tue, 2 Feb 2010 14:22:57 +0900 (JST)
To: public-html-diffs@w3.org
Message-Id: <20100202052258.2468B2BC2C@toro.w3.mag.keio.ac.jp>
mike: added figure and figcaption

http://dev.w3.org/cvsweb/html5/markup/spec.html?r1=1.145&r2=1.146&f=h

===================================================================
RCS file: /sources/public/html5/markup/Overview.html,v
retrieving revision 1.373
retrieving revision 1.374
diff -u -d -r1.373 -r1.374
--- Overview.html	1 Feb 2010 05:24:59 -0000	1.373
+++ Overview.html	2 Feb 2010 05:22:33 -0000	1.374
@@ -12,7 +12,7 @@
 <h1>HTML: The Markup Language</h1>
 <h2>
         W3C
-        Editor&#8217;s Draft <em>1 February 2010</em>
+        Editor&#8217;s Draft <em>2 February 2010</em>
 </h2>
 <dl>
 <dt>Latest Editor&#8217;s Draft:</dt>
@@ -52,7 +52,7 @@
           reports index</a> at http://www.w3.org/TR/.
       </em></p>
     <p>
-        This document is the 1 February 2010 Editor&#8217;s Draft of 
+        This document is the 2 February 2010 Editor&#8217;s Draft of 
         <cite>HTML: The Markup Language</cite>.
       
       If you&#8217;d like to comment on this document, the preferred
@@ -330,6 +330,12 @@
 <li id="fieldset-toc">
 <span class="toc-section-number"></span><a href="fieldset.html#fieldset"><span class="toc-section-number"></span> <span class="element">fieldset</span> &#8211; <span class="shortdesc">set of related form controls</span></a>
 </li>
+<li id="figcaption-toc">
+<span class="toc-section-number"></span><a href="figcaption.html#figcaption"><span class="toc-section-number"></span> <span class="element">figcaption</span> &#8211; <span class="shortdesc">figure caption</span></a> <span class="new-element" title="This element is newly added in HTML5.">NEW</span>
+</li>
+<li id="figure-toc">
+<span class="toc-section-number"></span><a href="figure.html#figure"><span class="toc-section-number"></span> <span class="element">figure</span> &#8211; <span class="shortdesc">figure with optional caption</span></a> <span class="new-element" title="This element is newly added in HTML5.">NEW</span>
+</li>
 <li id="footer-toc">
 <span class="toc-section-number"></span><a href="footer.html#footer"><span class="toc-section-number"></span> <span class="element">footer</span> &#8211; <span class="shortdesc">footer</span></a>
 </li>

Index: footer.html
===================================================================
RCS file: /sources/public/html5/markup/footer.html,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- footer.html	1 Feb 2010 05:25:01 -0000	1.33
+++ footer.html	2 Feb 2010 05:22:34 -0000	1.34
@@ -8,7 +8,7 @@
 <body>
 <h2 class="chunkpagetitle"><a href="Overview.html">HTML: The Markup Language</a></h2>
 <div class="nav">
-<span class="nav-prev"><a href="fieldset.html">&#171; fieldset</a></span>
+<span class="nav-prev"><a href="figure.html">&#171; figure</a></span>
 <span class="nav-next"><a href="form.html">form &#187;</a></span>
 </div>
 <div id="footer" class="section">
@@ -67,7 +67,7 @@
   </div></div></div>
 <hr class="footerbreak"></hr>
 <div class="nav">
-<span class="nav-prev"><a href="fieldset.html">&#171; fieldset</a></span>
+<span class="nav-prev"><a href="figure.html">&#171; figure</a></span>
 <span class="nav-next"><a href="form.html">form &#187;</a></span>
 </div>
 </body>

Index: schema.html
===================================================================
RCS file: /sources/public/html5/markup/schema.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- schema.html	30 Jan 2010 04:44:25 -0000	1.6
+++ schema.html	2 Feb 2010 05:22:34 -0000	1.7
@@ -197,6 +197,7 @@
    <span class='postfix or'>or</span> <a class='ref' href='#footer'>footer</a>
    <span class='postfix or'>or</span> <a class='ref' href='#video.elem.flow'>video.elem.flow</a>
    <span class='postfix or'>or</span> <a class='ref' href='#audio.elem.flow'>audio.elem.flow</a>
+   <span class='postfix or'>or</span> <a class='ref' href='#figure'>figure</a>
    <span class='postfix or'>or</span> <a class='ref' href='#table'>table</a>
    <span class='postfix or'>or</span> <a class='ref' href='#form'>form</a>
    <span class='postfix or'>or</span> <a class='ref' href='#fieldset'>fieldset</a>
@@ -3679,6 +3680,45 @@
     <span class='postfix or'>or</span> <a class='ref' href='#source'>source</a><span class='postfix zeroormore' title='ZERO OR MORE'>*</span> ) <span class='postfix followedby'>followed by</span> 
   <a class='ref' href='#common.inner.phrasing'>common.inner.phrasing</a></span>
 </div>
+<div class='define' id='figure-define'>
+  <div class='patternname' id='the-figure'><a href='#the-figure'>figure</a> =</div>
+  <span class='pattern' id='figure'><span class='type'>element </span>
+  <span class='name'>figure</span>
+   {<span class='model'>
+      <a class='ref' href='#figure.inner'>figure.inner</a>
+       <span class='postfix &amp;'>&amp;</span> <a class='ref' href='#figure.attrs'>figure.attrs</a>
+    </span>}
+  </span>
+</div>
+<div class='define' id='figure.attrs-define'>
+  <div class='patternname' id='the-figure.attrs'><a href='#the-figure.attrs'>figure.attrs</a> =</div>
+  <span class='pattern' id='figure.attrs'><a class='ref' href='#common.attrs'>common.attrs</a></span>
+</div>
+<div class='define' id='figure.inner-define'>
+  <div class='patternname' id='the-figure.inner'><a href='#the-figure.inner'>figure.inner</a> =</div>
+  <span class='pattern' id='figure.inner'>(<a class='ref' href='#figcaption'>figcaption</a> <span class='postfix followedby'>followed by</span> 
+   <a class='ref' href='#common.inner.flow'>common.inner.flow</a>)
+   <span class='postfix or'>or</span> (<a class='ref' href='#common.inner.flow'>common.inner.flow</a> <span class='postfix followedby'>followed by</span> 
+                                       <a class='ref' href='#figcaption'>figcaption</a><span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> )</span>
+</div>
+<div class='define' id='figcaption-define'>
+  <div class='patternname' id='the-figcaption'><a href='#the-figcaption'>figcaption</a> =</div>
+  <span class='pattern' id='figcaption'><span class='type'>element </span>
+  <span class='name'>figcaption</span>
+   {<span class='model'>
+      <a class='ref' href='#figcaption.inner'>figcaption.inner</a>
+       <span class='postfix &amp;'>&amp;</span> <a class='ref' href='#figcaption.attrs'>figcaption.attrs</a>
+    </span>}
+  </span>
+</div>
+<div class='define' id='figcaption.attrs-define'>
+  <div class='patternname' id='the-figcaption.attrs'><a href='#the-figcaption.attrs'>figcaption.attrs</a> =</div>
+  <span class='pattern' id='figcaption.attrs'><a class='ref' href='#common.attrs'>common.attrs</a></span>
+</div>
+<div class='define' id='figcaption.inner-define'>
+  <div class='patternname' id='the-figcaption.inner'><a href='#the-figcaption.inner'>figcaption.inner</a> =</div>
+  <span class='pattern' id='figcaption.inner'><a class='ref' href='#common.inner.phrasing'>common.inner.phrasing</a></span>
+</div>
 </div>
 </div>
 <div class='chunk'>

Index: common-models.html
===================================================================
RCS file: /sources/public/html5/markup/common-models.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- common-models.html	1 Feb 2010 02:34:50 -0000	1.23
+++ common-models.html	2 Feb 2010 05:22:34 -0000	1.24
@@ -53,6 +53,7 @@
    <span class="postfix or">or</span> <a class="ref" href="footer.html#footer">footer</a>
    <span class="postfix or">or</span> <a class="ref" href="video.html#video">video</a>
    <span class="postfix or">or</span> <a class="ref" href="audio.html#audio">audio</a>
+   <span class="postfix or">or</span> <a class="ref" href="figure.html#figure">figure</a>
    <span class="postfix or">or</span> <a class="ref" href="table.html#table">table</a>
    <span class="postfix or">or</span> <a class="ref" href="form.html#form">form</a>
    <span class="postfix or">or</span> <a class="ref" href="fieldset.html#fieldset">fieldset</a>

Index: figure.html
===================================================================
RCS file: /sources/public/html5/markup/figure.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- figure.html	28 Jan 2010 17:11:49 -0000	1.15
+++ figure.html	2 Feb 2010 05:22:34 -0000	1.16
@@ -8,37 +8,44 @@
 <body>
 <h2 class="chunkpagetitle"><a href="Overview.html">HTML: The Markup Language</a></h2>
 <div class="nav">
-<span class="nav-prev"><a href="fieldset.html">&#171; fieldset</a></span>
+<span class="nav-prev"><a href="figcaption.html">&#171; figcaption</a></span>
 <span class="nav-next"><a href="footer.html">footer &#187;</a></span>
 </div>
 <div id="figure" class="section">
       <h2 class="element-head"><span class="element">figure</span> &#8211; <span class="shortdesc">figure with optional caption</span> <a class="hash" href="#figure">#</a> <a class="toc-bak" href="Overview.html#figure-toc">T</a></h2>
       <div id="figure-longdesc" class="longdesc">
     <p>The <a href="figure.html#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&#8217;s meaning.</p>
   </div>
-      <div class="no-number no-toc" id="figure-content">
-        <h2 class="element-subhead">Content model <a class="hash" href="#figure-content">#</a></h2>
-        <div class="content-models" id="figure-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="figure-mdl" href="figure.html#figure-mdl" class="element">figure</a> = </span><span>
-      (<a class="ref" href="legend.html#legend">legend</a><a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
-   (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>))
-  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> ((<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)<a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
-                                                                       <a class="ref" href="legend.html#legend">legend</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>)
-      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="figure.html#figure.attrs">figure.attrs</a>
-    </span></p>
-        </div>
-      </div><div class="no-number no-toc" id="figure-attr-mdl">
-        <h2 class="element-subhead">Attribute model <a class="hash" href="#figure-attr-mdl">#</a></h2>
+      <div class="no-number no-toc" id="figure-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#figure-contents">#</a></h2><div class="prose-model">
+  <p>Exactly one of the following two choices:</p>
+  <ul>
+    <li>A single
+    <a href="figcaption.html#figcaption" class="element">figcaption</a>
+    element, followed by
+    <a href="common-models.html#common.elem.flow">flow elements</a>
+    and
+    <a href="syntax.html#normal-character-data">normal character data</a>
+    </li>
+    <li>Or,
+    <a href="common-models.html#common.elem.flow">flow elements</a>
+    and
+    <a href="syntax.html#normal-character-data">normal character data</a>,
+    optionally followed by a single
+    <a href="figcaption.html#figcaption" class="element">figcaption</a>
+    element</li>
+  </ul>
+  </div></div><div class="no-number no-toc" id="figure-attr-mdl">
+        <h2 class="element-subhead">Permitted attributes <a class="hash" href="#figure-attr-mdl">#</a></h2>
         <div class="attr-content-models">
-          <p><a href="figure.html#figure.attrs">figure.attrs</a> = <span class="pattern" id="figure.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div>
+          <p><span class="pattern" id="figure.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div>
       
       
-      <div class="no-number no-toc" id="figure-tags">
+      <div class="no-number no-toc tag-omission" id="figure-tags">
         <h2 class="element-subhead">Tag omission <a class="hash" href="#figure-tags">#</a></h2>
         <p>A <a href="figure.html#figure">figure</a>
             element must have both a
@@ -46,16 +53,16 @@
             and an
             <span title="syntax-end-tag">end tag</span>.</p>
       </div>
-      
       <div class="no-number no-toc" id="figure-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#figure-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.flow">common.elem.flow</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#figure-context">#</a></h2>
+        <p class="permitted-parents">
+        <span class="context-mdl"><span>Any element that can contain
+            <a href="common-models.html#common.elem.flow">flow elements</a></span></span></p>
       </div>
       </div>
 <hr class="footerbreak"></hr>
 <div class="nav">
-<span class="nav-prev"><a href="fieldset.html">&#171; fieldset</a></span>
+<span class="nav-prev"><a href="figcaption.html">&#171; figcaption</a></span>
 <span class="nav-next"><a href="footer.html">footer &#187;</a></span>
 </div>
 </body>

Index: base.html
===================================================================
RCS file: /sources/public/html5/markup/base.html,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- base.html	1 Feb 2010 05:25:00 -0000	1.31
+++ base.html	2 Feb 2010 05:22:34 -0000	1.32
@@ -16,7 +16,7 @@
       <div id="base-longdesc" class="longdesc">
     <p>The <a href="base.html#base" class="element">base</a> element
     specifies a document-wide base URL for the purposes of
-    resolving relative URLs, and document-wide default
+    resolving relative URLs, and a document-wide default
     <a href="terminology.html#context">browsing context</a> name
     for the purposes of following hyperlinks.</p>
   </div>

Index: patch-schema
===================================================================
RCS file: /sources/public/html5/markup/patch-schema,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -d -r1.81 -r1.82
--- patch-schema	29 Jan 2010 00:19:19 -0000	1.81
+++ patch-schema	2 Feb 2010 05:22:34 -0000	1.82
@@ -1,6 +1,6 @@
 Index: schema/revision.rnc
 ===================================================================
---- schema/revision.rnc	(revision 516)
+--- schema/revision.rnc	(revision 521)
 +++ schema/revision.rnc	(working copy)
 @@ -2,17 +2,6 @@
  ##  RELAX NG Schema for HTML 5: Revision Annotations                  #
@@ -62,7 +62,7 @@
  	del.inner.phrasing =
 Index: schema/web-forms.rnc
 ===================================================================
---- schema/web-forms.rnc	(revision 516)
+--- schema/web-forms.rnc	(revision 521)
 +++ schema/web-forms.rnc	(working copy)
 @@ -9,6 +9,7 @@
  	common-form.attrs =
@@ -170,7 +170,7 @@
  
 Index: schema/data.rnc
 ===================================================================
---- schema/data.rnc	(revision 516)
+--- schema/data.rnc	(revision 521)
 +++ schema/data.rnc	(working copy)
 @@ -32,7 +32,7 @@
  		element meter { meter.inner & meter.attrs }
@@ -183,7 +183,7 @@
  		&	meter.attrs.high?
 Index: schema/tables.rnc
 ===================================================================
---- schema/tables.rnc	(revision 516)
+--- schema/tables.rnc	(revision 521)
 +++ schema/tables.rnc	(working copy)
 @@ -157,38 +157,6 @@
  	tr.inner =
@@ -289,7 +289,7 @@
  		( common.inner.flow )
 Index: schema/embed.rnc
 ===================================================================
---- schema/embed.rnc	(revision 516)
+--- schema/embed.rnc	(revision 521)
 +++ schema/embed.rnc	(working copy)
 @@ -248,7 +248,7 @@
  			}
@@ -391,7 +391,7 @@
  			|	( area.attrs.shape.circle & area.attrs.coords.circle )
 Index: schema/media.rnc
 ===================================================================
---- schema/media.rnc	(revision 516)
+--- schema/media.rnc	(revision 521)
 +++ schema/media.rnc	(working copy)
 @@ -4,32 +4,6 @@
  ##  RELAX NG Schema for HTML 5: Advanced Embedded Content             #
@@ -480,7 +480,7 @@
  		,	common.inner.phrasing
  		)
  
-@@ -112,31 +85,28 @@
+@@ -112,14 +85,25 @@
  		element audio { audio.inner.phrasing & audio.attrs }
  	audio.attrs =
  		(	common.attrs
@@ -509,26 +509,29 @@
  		,	common.inner.phrasing
  		)
  
- 	common.elem.flow |= audio.elem.flow
- 	common.elem.phrasing |= audio.elem.phrasing
- 
--## Captioned Content: <figure>
--
--	figure.elem =
--		element figure { figure.inner & figure.attrs }
--	figure.attrs =
--		(	common.attrs
--		&	common.attrs.aria.implicit.img?
--		)
--	figure.inner =
+@@ -135,8 +119,17 @@
+ 		&	common.attrs.aria.implicit.img?
+ 		)
+ 	figure.inner =
 -		(	( legend.elem, common.inner.flow )
 -		|	( common.inner.flow, legend.elem? )
--		)
--
--	common.elem.flow |= figure.elem
++		(	( figcaption.elem, common.inner.flow )
++		|	( common.inner.flow, figcaption.elem? )
+ 		)
+ 
+ 	common.elem.flow |= figure.elem
++
++## Figure caption: <figcaption>
++
++	figcaption.elem =
++		element figcaption { figcaption.inner & figcaption.attrs }
++	figcaption.attrs =
++		( common.attrs )
++	figcaption.inner =
++		( common.inner.phrasing )
 Index: schema/phrase.rnc
 ===================================================================
---- schema/phrase.rnc	(revision 516)
+--- schema/phrase.rnc	(revision 521)
 +++ schema/phrase.rnc	(working copy)
 @@ -13,13 +13,13 @@
  	a.attrs =
@@ -627,7 +630,7 @@
  	em.elem =
 Index: schema/web-forms2.rnc
 ===================================================================
---- schema/web-forms2.rnc	(revision 516)
+--- schema/web-forms2.rnc	(revision 521)
 +++ schema/web-forms2.rnc	(working copy)
 @@ -6,9 +6,6 @@
  
@@ -668,9 +671,124 @@
  			}
  		form.attrs.autocomplete = 
  			attribute autocomplete {
+Index: schema/assertions.sch
+===================================================================
+--- schema/assertions.sch	(revision 521)
++++ schema/assertions.sch	(working copy)
+@@ -20,58 +20,58 @@
+ 			</assert>
+ 		</rule>
+ 
+-		<rule context='h:img'>
+-			<assert test='@src'>
+-				An &#x201C;img&#x201D; element must have a
+-				&#x201C;src&#x201D; attribute.
+-			</assert>
+-		</rule>
+-
+-		<rule context='h:link'>
+-			<assert test='@href'>
+-				A &#x201C;link&#x201D; element must have an &#x201C;href&#x201D; attribute.
+-			</assert>
+-			<assert test='@rel'>
+-				A &#x201C;link&#x201D; element must have a &#x201C;rel&#x201D; attribute.
+-			</assert>
+-		</rule>
+-
+-		<rule context='h:map'>
+-			<assert test='@name'>
+-				A &#x201C;map&#x201D; element must have a &#x201C;name&#x201D; attribute.
+-			</assert>
+-		</rule>
+-
+-		<rule context='h:meter'>
+-			<assert test='@value'>
+-				An &#x201C;meter&#x201D; element must have a
+-				&#x201C;value&#x201D; attribute.
+-			</assert>
+-		</rule>
+-
+-		<rule context='h:object'>
+-			<assert test='@data or @type'>
+-				An &#x201C;object&#x201D; element must have a
+-				&#x201C;data&#x201D; attribute or a
+-				&#x201C;type&#x201D; attribute.
+-			</assert>
+-		</rule>
+-
+-		<rule context='h:param'>
+-			<assert test='@name'>
+-				A &#x201C;param&#x201D; element must have an &#x201C;name&#x201D; attribute.
+-			</assert>
+-			<assert test='@value'>
+-				A &#x201C;param&#x201D; element must have a &#x201C;value&#x201D; attribute.
+-			</assert>
+-		</rule>
+-
+-		<rule context='h:source'>
+-			<assert test='@src'>
+-				A &#x201C;source&#x201D; element must have a
+-				&#x201C;src&#x201D; attribute.
+-			</assert>
+-		</rule>
++		<!-- * <rule context='h:img'> -->
++			<!-- * <assert test='@src'> -->
++				<!-- * An &#x201C;img&#x201D; element must have a -->
++				<!-- * &#x201C;src&#x201D; attribute. -->
++			<!-- * </assert> -->
++		<!-- * </rule> -->
++<!-- *  -->
++		<!-- * <rule context='h:link'> -->
++			<!-- * <assert test='@href'> -->
++				<!-- * A &#x201C;link&#x201D; element must have an &#x201C;href&#x201D; attribute. -->
++			<!-- * </assert> -->
++			<!-- * <assert test='@rel'> -->
++				<!-- * A &#x201C;link&#x201D; element must have a &#x201C;rel&#x201D; attribute. -->
++			<!-- * </assert> -->
++		<!-- * </rule> -->
++<!-- *  -->
++		<!-- * <rule context='h:map'> -->
++			<!-- * <assert test='@name'> -->
++				<!-- * A &#x201C;map&#x201D; element must have a &#x201C;name&#x201D; attribute. -->
++			<!-- * </assert> -->
++		<!-- * </rule> -->
++<!-- *  -->
++		<!-- * <rule context='h:meter'> -->
++			<!-- * <assert test='@value'> -->
++				<!-- * An &#x201C;meter&#x201D; element must have a -->
++				<!-- * &#x201C;value&#x201D; attribute. -->
++			<!-- * </assert> -->
++		<!-- * </rule> -->
++<!-- *  -->
++		<!-- * <rule context='h:object'> -->
++			<!-- * <assert test='@data or @type'> -->
++				<!-- * An &#x201C;object&#x201D; element must have a -->
++				<!-- * &#x201C;data&#x201D; attribute or a -->
++				<!-- * &#x201C;type&#x201D; attribute. -->
++			<!-- * </assert> -->
++		<!-- * </rule> -->
++<!-- *  -->
++		<!-- * <rule context='h:param'> -->
++			<!-- * <assert test='@name'> -->
++				<!-- * A &#x201C;param&#x201D; element must have an &#x201C;name&#x201D; attribute. -->
++			<!-- * </assert> -->
++			<!-- * <assert test='@value'> -->
++				<!-- * A &#x201C;param&#x201D; element must have a &#x201C;value&#x201D; attribute. -->
++			<!-- * </assert> -->
++		<!-- * </rule> -->
++<!-- *  -->
++		<!-- * <rule context='h:source'> -->
++			<!-- * <assert test='@src'> -->
++				<!-- * A &#x201C;source&#x201D; element must have a -->
++				<!-- * &#x201C;src&#x201D; attribute. -->
++			<!-- * </assert> -->
++		<!-- * </rule> -->
+ 	</pattern>
+ 
+ 	<pattern name='Triggered on mutually exclusive elements and prohibited-descendant cases'>
 Index: schema/meta.rnc
 ===================================================================
---- schema/meta.rnc	(revision 516)
+--- schema/meta.rnc	(revision 521)
 +++ schema/meta.rnc	(working copy)
 @@ -101,7 +101,7 @@
  	title.attrs =
@@ -848,7 +966,7 @@
 +	common.elem.metadata |= meta.http-equiv.content-type.elem
 Index: schema/applications.rnc
 ===================================================================
---- schema/applications.rnc	(revision 516)
+--- schema/applications.rnc	(revision 521)
 +++ schema/applications.rnc	(working copy)
 @@ -4,18 +4,6 @@
  ##  RELAX NG Schema for HTML 5: Web Application Features              #
@@ -1000,7 +1118,7 @@
 -	common.elem.flow |= details.elem
 Index: schema/core-scripting.rnc
 ===================================================================
---- schema/core-scripting.rnc	(revision 516)
+--- schema/core-scripting.rnc	(revision 521)
 +++ schema/core-scripting.rnc	(working copy)
 @@ -52,9 +52,9 @@
  				string
@@ -1038,7 +1156,7 @@
  		attribute onabort { string }
 Index: schema/common.rnc
 ===================================================================
---- schema/common.rnc	(revision 516)
+--- schema/common.rnc	(revision 521)
 +++ schema/common.rnc	(working copy)
 @@ -38,16 +38,16 @@
  	common.attr.anything =

Index: fieldset.html
===================================================================
RCS file: /sources/public/html5/markup/fieldset.html,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- fieldset.html	1 Feb 2010 05:25:00 -0000	1.33
+++ fieldset.html	2 Feb 2010 05:22:34 -0000	1.34
@@ -9,7 +9,7 @@
 <h2 class="chunkpagetitle"><a href="Overview.html">HTML: The Markup Language</a></h2>
 <div class="nav">
 <span class="nav-prev"><a href="embed.html">&#171; embed</a></span>
-<span class="nav-next"><a href="footer.html">footer &#187;</a></span>
+<span class="nav-next"><a href="figcaption.html">figcaption &#187;</a></span>
 </div>
 <div id="fieldset" class="section">
       <h2 class="element-head"><span class="element">fieldset</span> &#8211; <span class="shortdesc">set of related form controls</span> <a class="hash" href="#fieldset">#</a> <a class="toc-bak" href="Overview.html#fieldset-toc">T</a></h2>
@@ -56,7 +56,7 @@
 <hr class="footerbreak"></hr>
 <div class="nav">
 <span class="nav-prev"><a href="embed.html">&#171; embed</a></span>
-<span class="nav-next"><a href="footer.html">footer &#187;</a></span>
+<span class="nav-next"><a href="figcaption.html">figcaption &#187;</a></span>
 </div>
 </body>
 </html>

Index: spec.html
===================================================================
RCS file: /sources/public/html5/markup/spec.html,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -d -r1.145 -r1.146
--- spec.html	1 Feb 2010 11:33:27 -0000	1.145
+++ spec.html	2 Feb 2010 05:22:34 -0000	1.146
@@ -12,7 +12,7 @@
 <h1>HTML: The Markup Language</h1>
 <h2>
         W3C
-        Editor&#8217;s Draft <em>1 February 2010</em>
+        Editor&#8217;s Draft <em>2 February 2010</em>
 </h2>
 <dl>
 <dt>Latest Editor&#8217;s Draft:</dt>
@@ -51,7 +51,7 @@
           reports index</a> at http://www.w3.org/TR/.
       </em></p>
     <p>
-        This document is the 1 February 2010 Editor&#8217;s Draft of 
+        This document is the 2 February 2010 Editor&#8217;s Draft of 
         <cite>HTML: The Markup Language</cite>.
       
       If you&#8217;d like to comment on this document, the preferred
@@ -329,6 +329,12 @@
 <li id="fieldset-toc">
 <span class="toc-section-number"></span><a href="#fieldset"><span class="toc-section-number"></span> <span class="element">fieldset</span> &#8211; <span class="shortdesc">set of related form controls</span></a>
 </li>
+<li id="figcaption-toc">
+<span class="toc-section-number"></span><a href="#figcaption"><span class="toc-section-number"></span> <span class="element">figcaption</span> &#8211; <span class="shortdesc">figure caption</span></a> <span class="new-element" title="This element is newly added in HTML5.">NEW</span>
+</li>
+<li id="figure-toc">
+<span class="toc-section-number"></span><a href="#figure"><span class="toc-section-number"></span> <span class="element">figure</span> &#8211; <span class="shortdesc">figure with optional caption</span></a> <span class="new-element" title="This element is newly added in HTML5.">NEW</span>
+</li>
 <li id="footer-toc">
 <span class="toc-section-number"></span><a href="#footer"><span class="toc-section-number"></span> <span class="element">footer</span> &#8211; <span class="shortdesc">footer</span></a>
 </li>
@@ -2174,6 +2180,12 @@
 <li id="fieldset-toc">
 <span class="toc-section-number"></span><a href="#fieldset"><span class="toc-section-number"></span> <span class="element">fieldset</span> &#8211; <span class="shortdesc">set of related form controls</span></a>
 </li>
+<li id="figcaption-toc">
+<span class="toc-section-number"></span><a href="#figcaption"><span class="toc-section-number"></span> <span class="element">figcaption</span> &#8211; <span class="shortdesc">figure caption</span></a> <span class="new-element" title="This element is newly added in HTML5.">NEW</span>
+</li>
+<li id="figure-toc">
+<span class="toc-section-number"></span><a href="#figure"><span class="toc-section-number"></span> <span class="element">figure</span> &#8211; <span class="shortdesc">figure with optional caption</span></a> <span class="new-element" title="This element is newly added in HTML5.">NEW</span>
+</li>
 <li id="footer-toc">
 <span class="toc-section-number"></span><a href="#footer"><span class="toc-section-number"></span> <span class="element">footer</span> &#8211; <span class="shortdesc">footer</span></a>
 </li>
@@ -3269,7 +3281,7 @@
       <div id="base-longdesc" class="longdesc">
     <p>The <a href="#base" class="element">base</a> element
     specifies a document-wide base URL for the purposes of
-    resolving relative URLs, and document-wide default
+    resolving relative URLs, and a document-wide default
     <a href="#context">browsing context</a> name
     for the purposes of following hyperlinks.</p>
   </div>
@@ -5368,6 +5380,109 @@
 </div>
 </div>
 </div>
+<div id="figcaption" class="section">
+      <h2 class="element-head">
+<span class="element">figcaption</span> &#8211; <span class="shortdesc">figure caption</span> <a class="hash" href="#figcaption">#</a> <a class="toc-bak" href="#figcaption-toc">T</a>
+</h2>
+      <div id="figcaption-longdesc" class="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 class="no-number no-toc" id="figcaption-contents">
+<h2 class="element-subhead">Permitted content <a class="hash" href="#figcaption-contents">#</a>
+</h2>
+<div class="prose-model"><p><a href="#normal-character-data">normal character data</a>
+                and
+                <a href="#common.elem.phrasing">phrasing elements</a></p></div>
+</div>
+<div class="no-number no-toc" id="figcaption-attr-mdl">
+        <h2 class="element-subhead">Permitted attributes <a class="hash" href="#figcaption-attr-mdl">#</a>
+</h2>
+        <div class="attr-content-models">
+          <p><span class="pattern" id="figcaption.attrs"><a href="#common-attributes">common attributes</a></span></p>
+</div>
+</div>
+      
+      
+      <div class="no-number no-toc tag-omission" id="figcaption-tags">
+        <h2 class="element-subhead">Tag omission <a class="hash" href="#figcaption-tags">#</a>
+</h2>
+        <p>A <a href="#figcaption">figcaption</a>
+            element must have both a
+            <span title="syntax-start-tag">start tag</span>
+            and an
+            <span title="syntax-end-tag">end tag</span>.</p>
+      </div>
+      <div class="no-number no-toc" id="figcaption-context">
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#figcaption-context">#</a>
+</h2>
+        <p class="permitted-parents">
+        <span class="context-mdl"><a href="#figure">figure</a></span></p>
+      </div>
+      </div>
+<div id="figure" class="section">
+      <h2 class="element-head">
+<span class="element">figure</span> &#8211; <span class="shortdesc">figure with optional caption</span> <a class="hash" href="#figure">#</a> <a class="toc-bak" href="#figure-toc">T</a>
+</h2>
+      <div id="figure-longdesc" class="longdesc">
+    <p>The <a href="#figure" class="element">figure</a> element
+    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&#8217;s meaning.</p>
+  </div>
+      <div class="no-number no-toc" id="figure-contents">
+<h2 class="element-subhead">Permitted content <a class="hash" href="#figure-contents">#</a>
+</h2>
+<div class="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>
+<div class="no-number no-toc" id="figure-attr-mdl">
+        <h2 class="element-subhead">Permitted attributes <a class="hash" href="#figure-attr-mdl">#</a>
+</h2>
+        <div class="attr-content-models">
+          <p><span class="pattern" id="figure.attrs"><a href="#common-attributes">common attributes</a></span></p>
+</div>
+</div>
+      
+      
+      <div class="no-number no-toc tag-omission" id="figure-tags">
+        <h2 class="element-subhead">Tag omission <a class="hash" href="#figure-tags">#</a>
+</h2>
+        <p>A <a href="#figure">figure</a>
+            element must have both a
+            <span title="syntax-start-tag">start tag</span>
+            and an
+            <span title="syntax-end-tag">end tag</span>.</p>
+      </div>
+      <div class="no-number no-toc" id="figure-context">
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#figure-context">#</a>
+</h2>
+        <p class="permitted-parents">
+        <span class="context-mdl"><span>Any element that can contain
+            <a href="#common.elem.flow">flow elements</a></span></span></p>
+      </div>
+      </div>
 <div id="footer" class="section">
       <h2 class="element-head">
 <span class="element">footer</span> &#8211; <span class="shortdesc">footer</span> <a class="hash" href="#footer">#</a> <a class="toc-bak" href="#footer-toc">T</a>
@@ -14153,6 +14268,7 @@
    <span class="postfix or">or</span> <a class="ref" href="#footer">footer</a>
    <span class="postfix or">or</span> <a class="ref" href="#video">video</a>
    <span class="postfix or">or</span> <a class="ref" href="#audio">audio</a>
+   <span class="postfix or">or</span> <a class="ref" href="#figure">figure</a>
    <span class="postfix or">or</span> <a class="ref" href="#table">table</a>
    <span class="postfix or">or</span> <a class="ref" href="#form">form</a>
    <span class="postfix or">or</span> <a class="ref" href="#fieldset">fieldset</a>

Index: elements.html
===================================================================
RCS file: /sources/public/html5/markup/elements.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- elements.html	29 Jan 2010 04:11:58 -0000	1.28
+++ elements.html	2 Feb 2010 05:22:34 -0000	1.29
@@ -91,6 +91,10 @@
 </li>
 <li id="fieldset-toc"><span class="toc-section-number"></span><a href="fieldset.html#fieldset"><span class="toc-section-number"></span> <span class="element">fieldset</span> &#8211; <span class="shortdesc">set of related form controls</span></a>
 </li>
+<li id="figcaption-toc"><span class="toc-section-number"></span><a href="figcaption.html#figcaption"><span class="toc-section-number"></span> <span class="element">figcaption</span> &#8211; <span class="shortdesc">figure caption</span></a> <span class="new-element" title="This element is newly added in HTML5.">NEW</span>
+</li>
+<li id="figure-toc"><span class="toc-section-number"></span><a href="figure.html#figure"><span class="toc-section-number"></span> <span class="element">figure</span> &#8211; <span class="shortdesc">figure with optional caption</span></a> <span class="new-element" title="This element is newly added in HTML5.">NEW</span>
+</li>
 <li id="footer-toc"><span class="toc-section-number"></span><a href="footer.html#footer"><span class="toc-section-number"></span> <span class="element">footer</span> &#8211; <span class="shortdesc">footer</span></a>
 </li>
 <li id="form-toc"><span class="toc-section-number"></span><a href="form.html#form"><span class="toc-section-number"></span> <span class="element">form</span> &#8211; <span class="shortdesc">user-submittable form</span></a>
Received on Tuesday, 2 February 2010 05:23:29 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Saturday, 18 December 2010 06:14:17 GMT