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

mike: added figcaption and summary; made tweaks to build files so that we can generate a WHATWG copy

From: poot <cvsmail@w3.org>
Date: Wed, 3 Feb 2010 02:05:25 +0900 (JST)
To: public-html-diffs@w3.org
Message-Id: <20100202170525.73F6F2BC2D@toro.w3.mag.keio.ac.jp>
mike: added figcaption and summary; made tweaks to build files so that
we can generate a WHATWG copy

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

===================================================================
RCS file: /sources/public/html5/markup/Overview.html,v
retrieving revision 1.374
retrieving revision 1.375
diff -u -d -r1.374 -r1.375
--- Overview.html	2 Feb 2010 05:22:33 -0000	1.374
+++ Overview.html	2 Feb 2010 17:04:52 -0000	1.375
@@ -12,7 +12,7 @@
 <h1>HTML: The Markup Language</h1>
 <h2>
         W3C
-        Editor&#8217;s Draft <em>2 February 2010</em>
+        Editor&#8217;s Draft <em>3 February 2010</em>
 </h2>
 <dl>
 <dt>Latest Editor&#8217;s Draft:</dt>
@@ -33,7 +33,7 @@
 <div id="abstract">
       <h2>Abstract <a class="hash" href="#abstract">#</a>
 </h2>
-      <p>This specification describes 
+      <p>This document describes 
       the HTML language and provides details necessary for
       producers of HTML content to create documents that conform
       to the language. By design, it does not define related APIs
@@ -52,7 +52,7 @@
           reports index</a> at http://www.w3.org/TR/.
       </em></p>
     <p>
-        This document is the 2 February 2010 Editor&#8217;s Draft of 
+        This document is the 3 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
@@ -309,6 +309,9 @@
 <li id="del-toc">
 <span class="toc-section-number"></span><a href="del.html#del"><span class="toc-section-number"></span> <span class="element">del</span> &#8211; <span class="shortdesc">deleted text</span></a>
 </li>
+<li id="details-toc">
+<span class="toc-section-number"></span><a href="details.html#details"><span class="toc-section-number"></span> <span class="element">details</span> &#8211; <span class="shortdesc">control for additional on-demand information</span></a> <span class="new-element" title="This element is newly added in HTML5.">NEW</span>
+</li>
 <li id="dfn-toc">
 <span class="toc-section-number"></span><a href="dfn.html#dfn"><span class="toc-section-number"></span> <span class="element">dfn</span> &#8211; <span class="shortdesc">defining instance</span></a>
 </li>
@@ -585,6 +588,9 @@
 <li id="sub-toc">
 <span class="toc-section-number"></span><a href="sub.html#sub"><span class="toc-section-number"></span> <span class="element">sub</span> &#8211; <span class="shortdesc">subscript</span></a>
 </li>
+<li id="summary-toc">
+<span class="toc-section-number"></span><a href="summary.html#summary"><span class="toc-section-number"></span> <span class="element">summary</span> &#8211; <span class="shortdesc">summary, caption, or legend for a details control</span></a> <span class="new-element" title="This element is newly added in HTML5.">NEW</span>
+</li>
 <li id="sup-toc">
 <span class="toc-section-number"></span><a href="sup.html#sup"><span class="toc-section-number"></span> <span class="element">sup</span> &#8211; <span class="shortdesc">superscript</span></a>
 </li>

Index: dfn.html
===================================================================
RCS file: /sources/public/html5/markup/dfn.html,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- dfn.html	1 Feb 2010 05:25:00 -0000	1.30
+++ dfn.html	2 Feb 2010 17:04:53 -0000	1.31
@@ -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="del.html">&#171; del</a></span>
+<span class="nav-prev"><a href="details.html">&#171; details</a></span>
 <span class="nav-next"><a href="div.html">div &#187;</a></span>
 </div>
 <div id="dfn" class="section">
@@ -51,7 +51,7 @@
       </div>
 <hr class="footerbreak"></hr>
 <div class="nav">
-<span class="nav-prev"><a href="del.html">&#171; del</a></span>
+<span class="nav-prev"><a href="details.html">&#171; details</a></span>
 <span class="nav-next"><a href="div.html">div &#187;</a></span>
 </div>
 </body>

Index: schema.html
===================================================================
RCS file: /sources/public/html5/markup/schema.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- schema.html	2 Feb 2010 05:22:34 -0000	1.7
+++ schema.html	2 Feb 2010 17:04:53 -0000	1.8
@@ -202,7 +202,8 @@
    <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>
    <span class='postfix or'>or</span> <a class='ref' href='#menu'>menu</a>
-   <span class='postfix or'>or</span> <a class='ref' href='#canvas.elem.flow'>canvas.elem.flow</a></span>
+   <span class='postfix or'>or</span> <a class='ref' href='#canvas.elem.flow'>canvas.elem.flow</a>
+   <span class='postfix or'>or</span> <a class='ref' href='#details'>details</a></span>
 </div>
 <div class='define' id='common.inner.metadata-define'>
   <div class='patternname' id='the-common.inner.metadata'><a href='#the-common.inner.metadata'>common.inner.metadata</a> =</div>
@@ -6280,6 +6281,53 @@
   <div class='patternname' id='the-canvas.inner.phrasing'><a href='#the-canvas.inner.phrasing'>canvas.inner.phrasing</a> =</div>
   <span class='pattern' id='canvas.inner.phrasing'><a class='ref' href='#common.inner.phrasing'>common.inner.phrasing</a></span>
 </div>
+<div class='define' id='details-define'>
+  <div class='patternname' id='the-details'><a href='#the-details'>details</a> =</div>
+  <span class='pattern' id='details'><span class='type'>element </span>
+  <span class='name'>details</span>
+   {<span class='model'>
+      <a class='ref' href='#details.inner'>details.inner</a>
+       <span class='postfix &amp;'>&amp;</span> <a class='ref' href='#details.attrs'>details.attrs</a>
+    </span>}
+  </span>
+</div>
+<div class='define' id='details.attrs-define'>
+  <div class='patternname' id='the-details.attrs'><a href='#the-details.attrs'>details.attrs</a> =</div>
+  <span class='pattern' id='details.attrs'><a class='ref' href='#common.attrs'>common.attrs</a>
+   <span class='postfix &amp;'>&amp;</span> <a class='ref' href='#details.attrs.open' title='details.attrs.open'>open</a><span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> </span>
+</div>
+<div class='define' id='details.attrs.open-define'>
+  <div class='patternname' id='the-details.attrs.open'><a href='#the-details.attrs.open'>open</a> =</div>
+  <span class='pattern' id='details.attrs.open'><span class='type'>attribute </span>
+  <span class='name'>open</span>
+   {<span class='model'>
+      d:string "open"  <span class='postfix or'>or</span> d:string ""
+    </span>}
+  </span>
+</div>
+<div class='define' id='details.inner-define'>
+  <div class='patternname' id='the-details.inner'><a href='#the-details.inner'>details.inner</a> =</div>
+  <span class='pattern' id='details.inner'><a class='ref' href='#summary'>summary</a><span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span>  <span class='postfix followedby'>followed by</span> 
+  <a class='ref' href='#common.inner.flow'>common.inner.flow</a></span>
+</div>
+<div class='define' id='summary-define'>
+  <div class='patternname' id='the-summary'><a href='#the-summary'>summary</a> =</div>
+  <span class='pattern' id='summary'><span class='type'>element </span>
+  <span class='name'>summary</span>
+   {<span class='model'>
+      <a class='ref' href='#summary.inner'>summary.inner</a>
+       <span class='postfix &amp;'>&amp;</span> <a class='ref' href='#summary.attrs'>summary.attrs</a>
+    </span>}
+  </span>
+</div>
+<div class='define' id='summary.attrs-define'>
+  <div class='patternname' id='the-summary.attrs'><a href='#the-summary.attrs'>summary.attrs</a> =</div>
+  <span class='pattern' id='summary.attrs'><a class='ref' href='#common.attrs'>common.attrs</a></span>
+</div>
+<div class='define' id='summary.inner-define'>
+  <div class='patternname' id='the-summary.inner'><a href='#the-summary.inner'>summary.inner</a> =</div>
+  <span class='pattern' id='summary.inner'><a class='ref' href='#common.inner.phrasing'>common.inner.phrasing</a></span>
+</div>
 </div>
 </div>
 <div class='chunk'>

Index: Makefile
===================================================================
RCS file: /sources/public/html5/markup/Makefile,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- Makefile	1 Feb 2010 02:34:49 -0000	1.83
+++ Makefile	2 Feb 2010 17:04:52 -0000	1.84
@@ -22,6 +22,8 @@
 PATCHFLAGS=-N -p0
 JAVA=java
 JAVAFLAGS=
+SCP=scp
+SCPFLAGS=
 
 INCELIM_DIR=tools/rng-incelim-1.2
 WHATTF_BASE_URL=http://svn.versiondude.net/whattf/syntax/trunk/relaxng/
@@ -31,12 +33,14 @@
 
 ELEMENTS=$(wildcard elements/*.html)
 
-ifeq ($(SHOW_CONTENT_MODELS),1)
-SHOW_CONTENT_MODELS=1
-else
+ifneq ($(SHOW_CONTENT_MODELS),1)
 SHOW_CONTENT_MODELS=0
 endif
 
+ifeq ($(PUBSITE),)
+PUBSITE=W3C
+endif
+
 all: Overview.html spec.html
 
 patch-schema: $(SCHEMA_FILES)
@@ -86,7 +90,10 @@
 
 Overview.html: html.spec.src.html src/status.html tools/specgen.xsl tools/toc.xsl tools/chunker.xsl
 	$(XSLTPROC) $(XSLTPROCFLAGS) \
-	  --param chunk 1 --stringparam TOC-file "Overview.html" --param quiet 1 \
+	  --param chunk 1 \
+	  --param quiet 1 \
+	  --stringparam TOC-file "Overview.html" \
+	  --stringparam site "$(PUBSITE)" \
 	  tools/specgen.xsl $< \
 	  | $(TOHTML)  2>/dev/null \
 	  > $@
@@ -94,6 +101,7 @@
 spec.html: html.spec.src.html src/status.html tools/specgen.xsl tools/toc.xsl
 	$(XSLTPROC) $(XSLTPROCFLAGS) \
 	  --stringparam TOC-file "spec.html" \
+	  --stringparam site "$(PUBSITE)" \
 	  tools/specgen.xsl $< \
 	  | $(TOHTML)  2>/dev/null \
 	  > $@
@@ -150,6 +158,9 @@
 aria/logo-ED.png: logo-ED.png
 	cp $< $@
 
+upload:
+	$(SCP) $(SCPFLAGS) *.html *.css help.whatwg.org:~/help.whatwg.org/html/markup
+
 webapps.html:
 	$(CURL) $(CURLFLAGS) http://www.whatwg.org/specs/web-apps/current-work/ \
 	  | $(PARSE) $(PARSEFLAGS) - > $@

Index: common-models.html
===================================================================
RCS file: /sources/public/html5/markup/common-models.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- common-models.html	2 Feb 2010 05:22:34 -0000	1.24
+++ common-models.html	2 Feb 2010 17:04:53 -0000	1.25
@@ -59,6 +59,7 @@
    <span class="postfix or">or</span> <a class="ref" href="fieldset.html#fieldset">fieldset</a>
    <span class="postfix or">or</span> <a class="ref" href="menu.html#menu">menu</a>
    <span class="postfix or">or</span> <a class="ref" href="canvas.html#canvas">canvas</a>
+   <span class="postfix or">or</span> <a class="ref" href="details.html#details">details</a>
           </p>
         </div>
       </div>

Index: acknowledgments.html
===================================================================
RCS file: /sources/public/html5/markup/acknowledgments.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- acknowledgments.html	28 Jan 2010 17:11:47 -0000	1.9
+++ acknowledgments.html	2 Feb 2010 17:04:53 -0000	1.10
@@ -12,8 +12,9 @@
 </div>
 <div id="acknowledgments" class="section">
       <h2>B. Acknowledgments <a class="hash" href="#acknowledgments">#</a> <a class="toc-bak" href="Overview.html#acknowledgments-toc">T</a></h2>
-      <p>This document incorporates a modified version of a
-              RELAX NG schema for HTML 5 from the <a href="http://syntax.whattf.org/relaxng/">syntax.whattf.org source repository</a>,
+      <p>Parts of this document were programatically
+              generated from a modified version of a
+              RELAX NG schema for HTML5 from the <a href="http://syntax.whattf.org/relaxng/">syntax.whattf.org source repository</a>,
               distributed with the following copyright notice and
               license statement:</p>
       <pre class="license">

Index: del.html
===================================================================
RCS file: /sources/public/html5/markup/del.html,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- del.html	1 Feb 2010 05:25:00 -0000	1.34
+++ del.html	2 Feb 2010 17:04:53 -0000	1.35
@@ -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="dd.html">&#171; dd</a></span>
-<span class="nav-next"><a href="dfn.html">dfn &#187;</a></span>
+<span class="nav-next"><a href="details.html">details &#187;</a></span>
 </div>
 <div id="del" class="section">
       <h2 class="element-head"><span class="element">del</span> &#8211; <span class="shortdesc">deleted text</span> <a class="hash" href="#del">#</a> <a class="toc-bak" href="Overview.html#del-toc">T</a></h2>
@@ -64,7 +64,7 @@
 <hr class="footerbreak"></hr>
 <div class="nav">
 <span class="nav-prev"><a href="dd.html">&#171; dd</a></span>
-<span class="nav-next"><a href="dfn.html">dfn &#187;</a></span>
+<span class="nav-next"><a href="details.html">details &#187;</a></span>
 </div>
 </body>
 </html>

Index: style.css
===================================================================
RCS file: /sources/public/html5/markup/style.css,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -d -r1.86 -r1.87
--- style.css	1 Feb 2010 05:25:03 -0000	1.86
+++ style.css	2 Feb 2010 17:04:53 -0000	1.87
@@ -382,7 +382,7 @@
 pre strong {
   background-color: yellow;
 }
-pre.license {
+.license {
   background-color: #ccc;
   padding: 6px;
 }
@@ -564,4 +564,8 @@
   margin-bottom: 6px;
   padding-left: 1em;
 }
-
+.main-license p {
+  color: #666;
+  margin-top: 4px;
+  margin-bottom: 4px;
+}

Index: patch-schema
===================================================================
RCS file: /sources/public/html5/markup/patch-schema,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- patch-schema	2 Feb 2010 05:22:34 -0000	1.82
+++ patch-schema	2 Feb 2010 17:04:53 -0000	1.83
@@ -168,19 +168,6 @@
  
  	button.elem |= button.button.elem
  
-Index: schema/data.rnc
-===================================================================
---- schema/data.rnc	(revision 521)
-+++ schema/data.rnc	(working copy)
-@@ -32,7 +32,7 @@
- 		element meter { meter.inner & meter.attrs }
- 	meter.attrs =
- 		(	common.attrs
--		&	meter.attrs.value?
-+		&	meter.attrs.value
- 		&	meter.attrs.min?
- 		&	meter.attrs.low?
- 		&	meter.attrs.high?
 Index: schema/tables.rnc
 ===================================================================
 --- schema/tables.rnc	(revision 521)
@@ -391,7 +378,7 @@
  			|	( area.attrs.shape.circle & area.attrs.coords.circle )
 Index: schema/media.rnc
 ===================================================================
---- schema/media.rnc	(revision 521)
+--- schema/media.rnc	(revision 522)
 +++ schema/media.rnc	(working copy)
 @@ -4,32 +4,6 @@
  ##  RELAX NG Schema for HTML 5: Advanced Embedded Content             #
@@ -509,26 +496,6 @@
  		,	common.inner.phrasing
  		)
  
-@@ -135,8 +119,17 @@
- 		&	common.attrs.aria.implicit.img?
- 		)
- 	figure.inner =
--		(	( legend.elem, common.inner.flow )
--		|	( common.inner.flow, legend.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 521)
@@ -671,121 +638,6 @@
  			}
  		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 521)
@@ -966,7 +818,7 @@
 +	common.elem.metadata |= meta.http-equiv.content-type.elem
 Index: schema/applications.rnc
 ===================================================================
---- schema/applications.rnc	(revision 521)
+--- schema/applications.rnc	(revision 524)
 +++ schema/applications.rnc	(working copy)
 @@ -4,18 +4,6 @@
  ##  RELAX NG Schema for HTML 5: Web Application Features              #
@@ -1093,32 +945,9 @@
  	common.elem.phrasing |= command.elem
  
  ## Menu: <menu>
-@@ -230,22 +243,3 @@
- 	common.elem.flow |= canvas.elem.flow
- 	common.elem.phrasing |= canvas.elem.phrasing
- 
--## Additional On-Demand Information: <details>
--
--	details.elem =
--		element details { details.inner & details.attrs }
--	details.attrs =
--		(	common.attrs
--		&	details.attrs.open?
--		&	common.attrs.aria.implicit.region?
--		)
--		details.attrs.open =
--			attribute open {
--				w:string "open" | w:string ""
--			}
--	details.inner =
--		(	legend.elem
--		,	common.inner.flow 
--		)
--	
--	common.elem.flow |= details.elem
 Index: schema/core-scripting.rnc
 ===================================================================
---- schema/core-scripting.rnc	(revision 521)
+--- schema/core-scripting.rnc	(revision 526)
 +++ schema/core-scripting.rnc	(working copy)
 @@ -52,9 +52,9 @@
  				string
@@ -1127,7 +956,7 @@
 -		( common.inner.anything )
 +		( non-replaceable-character-data )
  	script.inner.imported =
--		( empty )
+-		( common.inner.anything )
 +		( non-replaceable-character-data )
  		
  	script.elem = 

Index: spec.html
===================================================================
RCS file: /sources/public/html5/markup/spec.html,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -d -r1.146 -r1.147
--- spec.html	2 Feb 2010 05:22:34 -0000	1.146
+++ spec.html	2 Feb 2010 17:04:53 -0000	1.147
@@ -12,7 +12,7 @@
 <h1>HTML: The Markup Language</h1>
 <h2>
         W3C
-        Editor&#8217;s Draft <em>2 February 2010</em>
+        Editor&#8217;s Draft <em>3 February 2010</em>
 </h2>
 <dl>
 <dt>Latest Editor&#8217;s Draft:</dt>
@@ -32,7 +32,7 @@
 <div id="abstract">
       <h2>Abstract <a class="hash" href="#abstract">#</a>
 </h2>
-      <p>This specification describes 
+      <p>This document describes 
       the HTML language and provides details necessary for
       producers of HTML content to create documents that conform
       to the language. By design, it does not define related APIs
@@ -51,7 +51,7 @@
           reports index</a> at http://www.w3.org/TR/.
       </em></p>
     <p>
-        This document is the 2 February 2010 Editor&#8217;s Draft of 
+        This document is the 3 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
@@ -308,6 +308,9 @@
 <li id="del-toc">
 <span class="toc-section-number"></span><a href="#del"><span class="toc-section-number"></span> <span class="element">del</span> &#8211; <span class="shortdesc">deleted text</span></a>
 </li>
+<li id="details-toc">
+<span class="toc-section-number"></span><a href="#details"><span class="toc-section-number"></span> <span class="element">details</span> &#8211; <span class="shortdesc">control for additional on-demand information</span></a> <span class="new-element" title="This element is newly added in HTML5.">NEW</span>
+</li>
 <li id="dfn-toc">
 <span class="toc-section-number"></span><a href="#dfn"><span class="toc-section-number"></span> <span class="element">dfn</span> &#8211; <span class="shortdesc">defining instance</span></a>
 </li>
@@ -584,6 +587,9 @@
 <li id="sub-toc">
 <span class="toc-section-number"></span><a href="#sub"><span class="toc-section-number"></span> <span class="element">sub</span> &#8211; <span class="shortdesc">subscript</span></a>
 </li>
+<li id="summary-toc">
+<span class="toc-section-number"></span><a href="#summary"><span class="toc-section-number"></span> <span class="element">summary</span> &#8211; <span class="shortdesc">summary, caption, or legend for a details control</span></a> <span class="new-element" title="This element is newly added in HTML5.">NEW</span>
+</li>
 <li id="sup-toc">
 <span class="toc-section-number"></span><a href="#sup"><span class="toc-section-number"></span> <span class="element">sup</span> &#8211; <span class="shortdesc">superscript</span></a>
 </li>
@@ -2159,6 +2165,9 @@
 <li id="del-toc">
 <span class="toc-section-number"></span><a href="#del"><span class="toc-section-number"></span> <span class="element">del</span> &#8211; <span class="shortdesc">deleted text</span></a>
 </li>
+<li id="details-toc">
+<span class="toc-section-number"></span><a href="#details"><span class="toc-section-number"></span> <span class="element">details</span> &#8211; <span class="shortdesc">control for additional on-demand information</span></a> <span class="new-element" title="This element is newly added in HTML5.">NEW</span>
+</li>
 <li id="dfn-toc">
 <span class="toc-section-number"></span><a href="#dfn"><span class="toc-section-number"></span> <span class="element">dfn</span> &#8211; <span class="shortdesc">defining instance</span></a>
 </li>
@@ -2435,6 +2444,9 @@
 <li id="sub-toc">
 <span class="toc-section-number"></span><a href="#sub"><span class="toc-section-number"></span> <span class="element">sub</span> &#8211; <span class="shortdesc">subscript</span></a>
 </li>
+<li id="summary-toc">
+<span class="toc-section-number"></span><a href="#summary"><span class="toc-section-number"></span> <span class="element">summary</span> &#8211; <span class="shortdesc">summary, caption, or legend for a details control</span></a> <span class="new-element" title="This element is newly added in HTML5.">NEW</span>
+</li>
 <li id="sup-toc">
 <span class="toc-section-number"></span><a href="#sup"><span class="toc-section-number"></span> <span class="element">sup</span> &#8211; <span class="shortdesc">superscript</span></a>
 </li>
@@ -4862,6 +4874,82 @@
 </div>
 </div>
 </div>
+<div id="details" class="section">
+      <h2 class="element-head">
+<span class="element">details</span> &#8211; <span class="shortdesc">control for additional on-demand information</span> <a class="hash" href="#details">#</a> <a class="toc-bak" href="#details-toc">T</a>
+</h2>
+      <div id="details-longdesc" class="longdesc">
+    <p>The <a href="#details" class="element">details</a> element
+    represents a control from which the user can obtain additional
+    information or controls on-demand.</p>
+  </div>
+      <div class="no-number no-toc" id="details-contents">
+<h2 class="element-subhead">Permitted content <a class="hash" href="#details-contents">#</a>
+</h2>
+<div class="prose-model">
+    <p>Optionally, a single
+    <a href="#summary" class="element">summary</a>
+    element, followed by
+    <a href="#common.elem.flow">flow elements</a>
+    and
+    <a href="#normal-character-data">normal character data</a>
+    </p>
+  </div>
+</div>
+<div class="no-number no-toc" id="details-attr-mdl">
+        <h2 class="element-subhead">Permitted attributes <a class="hash" href="#details-attr-mdl">#</a>
+</h2>
+        <div class="attr-content-models">
+          <p><span class="pattern" id="details.attrs"><a href="#common-attributes">common attributes</a>
+   <span class="postfix &amp;">&amp;</span> <a class="ref" href="#details.attrs.open" title="details.attrs.open">open</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p>
+</div>
+</div>
+      <div class="no-number no-toc" id="details-attributes">
+        <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#details-attributes">#</a>
+</h2>
+        <dl class="attr-defs">
+<dt>
+<a class="attribute-name" id="details.attrs.open" title="details.attrs.open" href="#details.attrs.open">open</a> = <span class="attr-values">
+       "open"  or  ""
+    </span> </dt>
+            <dd>Specifies that the contents of the
+        <a href="#details" class="element">details</a> element
+        should be shown to the user.</dd>
+          
+        </dl>
+</div>
+      
+      <div class="no-number no-toc" id="details-constraints">
+        <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#details-constraints">#</a>
+</h2>
+        <ul class="assertions">
+<li><span>
+				The interactive element &#8220;details&#8221; must not 
+				appear as a descendant of the &#8220;a&#8221; element.
+			</span></li>
+<li><span>
+				The interactive element &#8220;details&#8221; must not 
+				appear as a descendant of the &#8220;button&#8221; element.
+			</span></li>
+        </ul>
+</div>
+      <div class="no-number no-toc tag-omission" id="details-tags">
+        <h2 class="element-subhead">Tag omission <a class="hash" href="#details-tags">#</a>
+</h2>
+        <p>A <a href="#details">details</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="details-context">
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#details-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="dfn" class="section">
       <h2 class="element-head">
 <span class="element">dfn</span> &#8211; <span class="shortdesc">defining instance</span> <a class="hash" href="#dfn">#</a> <a class="toc-bak" href="#dfn-toc">T</a>
@@ -12831,6 +12919,49 @@
 </div>
 </div>
 </div>
+<div id="summary" class="section">
+      <h2 class="element-head">
+<span class="element">summary</span> &#8211; <span class="shortdesc">summary, caption, or legend for a details control</span> <a class="hash" href="#summary">#</a> <a class="toc-bak" href="#summary-toc">T</a>
+</h2>
+      <div id="summary-longdesc" class="longdesc">
+    <p>The
+    <a href="#summary" class="element">summary</a>
+    element represents a summary, caption, or legend for a
+    <a href="#details" class="element">details</a>
+    element.</p>
+  </div>
+      <div class="no-number no-toc" id="summary-contents">
+<h2 class="element-subhead">Permitted content <a class="hash" href="#summary-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="summary-attr-mdl">
+        <h2 class="element-subhead">Permitted attributes <a class="hash" href="#summary-attr-mdl">#</a>
+</h2>
+        <div class="attr-content-models">
+          <p><span class="pattern" id="summary.attrs"><a href="#common-attributes">common attributes</a></span></p>
+</div>
+</div>
+      
+      
+      <div class="no-number no-toc tag-omission" id="summary-tags">
+        <h2 class="element-subhead">Tag omission <a class="hash" href="#summary-tags">#</a>
+</h2>
+        <p>A <a href="#summary">summary</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="summary-context">
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#summary-context">#</a>
+</h2>
+        <p class="permitted-parents">
+        <span class="context-mdl"><a href="#details">details</a></span></p>
+      </div>
+      </div>
 <div id="sup" class="section">
       <h2 class="element-head">
 <span class="element">sup</span> &#8211; <span class="shortdesc">superscript</span> <a class="hash" href="#sup">#</a> <a class="toc-bak" href="#sup-toc">T</a>
@@ -14274,6 +14405,7 @@
    <span class="postfix or">or</span> <a class="ref" href="#fieldset">fieldset</a>
    <span class="postfix or">or</span> <a class="ref" href="#menu">menu</a>
    <span class="postfix or">or</span> <a class="ref" href="#canvas">canvas</a>
+   <span class="postfix or">or</span> <a class="ref" href="#details">details</a>
           </p>
         </div>
       </div>
@@ -15912,8 +16044,9 @@
      <div id="acknowledgments" class="section">
       <h2>B. Acknowledgments <a class="hash" href="#acknowledgments">#</a> <a class="toc-bak" href="#acknowledgments-toc">T</a>
 </h2>
-      <p>This document incorporates a modified version of a
-              RELAX NG schema for HTML 5 from the <a href="http://syntax.whattf.org/relaxng/">syntax.whattf.org source repository</a>,
+      <p>Parts of this document were programatically
+              generated from a modified version of a
+              RELAX NG schema for HTML5 from the <a href="http://syntax.whattf.org/relaxng/">syntax.whattf.org source repository</a>,
               distributed with the following copyright notice and
               license statement:</p>
       <pre class="license">

Index: elements.html
===================================================================
RCS file: /sources/public/html5/markup/elements.html,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- elements.html	2 Feb 2010 05:22:34 -0000	1.29
+++ elements.html	2 Feb 2010 17:04:53 -0000	1.30
@@ -77,6 +77,8 @@
 </li>
 <li id="del-toc"><span class="toc-section-number"></span><a href="del.html#del"><span class="toc-section-number"></span> <span class="element">del</span> &#8211; <span class="shortdesc">deleted text</span></a>
 </li>
+<li id="details-toc"><span class="toc-section-number"></span><a href="details.html#details"><span class="toc-section-number"></span> <span class="element">details</span> &#8211; <span class="shortdesc">control for additional on-demand information</span></a> <span class="new-element" title="This element is newly added in HTML5.">NEW</span>
+</li>
 <li id="dfn-toc"><span class="toc-section-number"></span><a href="dfn.html#dfn"><span class="toc-section-number"></span> <span class="element">dfn</span> &#8211; <span class="shortdesc">defining instance</span></a>
 </li>
 <li id="div-toc"><span class="toc-section-number"></span><a href="div.html#div"><span class="toc-section-number"></span> <span class="element">div</span> &#8211; <span class="shortdesc">generic flow container</span></a>
@@ -261,6 +263,8 @@
 </li>
 <li id="sub-toc"><span class="toc-section-number"></span><a href="sub.html#sub"><span class="toc-section-number"></span> <span class="element">sub</span> &#8211; <span class="shortdesc">subscript</span></a>
 </li>
+<li id="summary-toc"><span class="toc-section-number"></span><a href="summary.html#summary"><span class="toc-section-number"></span> <span class="element">summary</span> &#8211; <span class="shortdesc">summary, caption, or legend for a details control</span></a> <span class="new-element" title="This element is newly added in HTML5.">NEW</span>
+</li>
 <li id="sup-toc"><span class="toc-section-number"></span><a href="sup.html#sup"><span class="toc-section-number"></span> <span class="element">sup</span> &#8211; <span class="shortdesc">superscript</span></a>
 </li>
 <li id="table-toc"><span class="toc-section-number"></span><a href="table.html#table"><span class="toc-section-number"></span> <span class="element">table</span> &#8211; <span class="shortdesc">table</span></a>

Index: sub.html
===================================================================
RCS file: /sources/public/html5/markup/sub.html,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- sub.html	1 Feb 2010 05:25:04 -0000	1.30
+++ sub.html	2 Feb 2010 17:04:53 -0000	1.31
@@ -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="style.html">&#171; style</a></span>
-<span class="nav-next"><a href="sup.html">sup &#187;</a></span>
+<span class="nav-next"><a href="summary.html">summary &#187;</a></span>
 </div>
 <div id="sub" class="section">
       <h2 class="element-head"><span class="element">sub</span> &#8211; <span class="shortdesc">subscript</span> <a class="hash" href="#sub">#</a> <a class="toc-bak" href="Overview.html#sub-toc">T</a></h2>
@@ -47,7 +47,7 @@
 <hr class="footerbreak"></hr>
 <div class="nav">
 <span class="nav-prev"><a href="style.html">&#171; style</a></span>
-<span class="nav-next"><a href="sup.html">sup &#187;</a></span>
+<span class="nav-next"><a href="summary.html">summary &#187;</a></span>
 </div>
 </body>
 </html>

Index: sup.html
===================================================================
RCS file: /sources/public/html5/markup/sup.html,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- sup.html	1 Feb 2010 05:25:04 -0000	1.30
+++ sup.html	2 Feb 2010 17:04:53 -0000	1.31
@@ -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="sub.html">&#171; sub</a></span>
+<span class="nav-prev"><a href="summary.html">&#171; summary</a></span>
 <span class="nav-next"><a href="table.html">table &#187;</a></span>
 </div>
 <div id="sup" class="section">
@@ -46,7 +46,7 @@
 </div><div class="properties"><div class="css-property"><span class="prop-name">vertical-align</span>: <span class="prop-value">super</span>;</div><div class="css-property"><span class="prop-name">font-size</span>: <span class="prop-value">smaller</span>; }</div></div></div></div></div>
 <hr class="footerbreak"></hr>
 <div class="nav">
-<span class="nav-prev"><a href="sub.html">&#171; sub</a></span>
+<span class="nav-prev"><a href="summary.html">&#171; summary</a></span>
 <span class="nav-next"><a href="table.html">table &#187;</a></span>
 </div>
 </body>

Index: details.html
===================================================================
RCS file: /sources/public/html5/markup/details.html,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- details.html	28 Jan 2010 17:11:48 -0000	1.17
+++ details.html	2 Feb 2010 17:04:53 -0000	1.18
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>HTML5: details &#8211; additional on-demand information</title>
+<title>HTML5: details &#8211; control for additional on-demand information</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="W3C-ED.css" type="text/css"></link>
 </head>
@@ -12,33 +12,30 @@
 <span class="nav-next"><a href="dfn.html">dfn &#187;</a></span>
 </div>
 <div id="details" class="section">
-      <h2 class="element-head"><span class="element">details</span> &#8211; <span class="shortdesc">additional on-demand information</span> <a class="hash" href="#details">#</a> <a class="toc-bak" href="Overview.html#details-toc">T</a></h2>
+      <h2 class="element-head"><span class="element">details</span> &#8211; <span class="shortdesc">control for additional on-demand information</span> <a class="hash" href="#details">#</a> <a class="toc-bak" href="Overview.html#details-toc">T</a></h2>
       <div id="details-longdesc" class="longdesc">
     <p>The <a href="details.html#details" class="element">details</a> element
-    represents additional information or controls which the user
-    can obtain on demand.</p>
+    represents a control from which the user can obtain additional
+    information or controls on-demand.</p>
   </div>
-      <div class="no-number no-toc" id="details-content">
-        <h2 class="element-subhead">Content model <a class="hash" href="#details-content">#</a></h2>
-        <div class="content-models" id="details-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="details-mdl" href="details.html#details-mdl" class="element">details</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#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="details.html#details.attrs">details.attrs</a>
-    </span></p>
-        </div>
-      </div><div class="no-number no-toc" id="details-attr-mdl">
-        <h2 class="element-subhead">Attribute model <a class="hash" href="#details-attr-mdl">#</a></h2>
+      <div class="no-number no-toc" id="details-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#details-contents">#</a></h2><div class="prose-model">
+    <p>Optionally, a single
+    <a href="summary.html#summary" class="element">summary</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>
+    </p>
+  </div></div><div class="no-number no-toc" id="details-attr-mdl">
+        <h2 class="element-subhead">Permitted attributes <a class="hash" href="#details-attr-mdl">#</a></h2>
         <div class="attr-content-models">
-          <p><a href="details.html#details.attrs">details.attrs</a> = <span class="pattern" id="details.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="details.html#details.attrs.open" title="details.attrs.open">open</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a></span></p></div></div>
+          <p><span class="pattern" id="details.attrs"><a class="ref" href="common-attributes.html">common attributes</a>
+   <span class="postfix &amp;">&amp;</span> <a class="ref" href="details.html#details.attrs.open" title="details.attrs.open">open</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div>
       <div class="no-number no-toc" id="details-attributes">
-        <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#details-attributes">#</a></h2>
+        <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#details-attributes">#</a></h2>
         <dl class="attr-defs">
             <dt><a class="attribute-name" id="details.attrs.open" title="details.attrs.open" href="details.html#details.attrs.open">open</a> = <span class="attr-values">
-       "open"
-      <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a>  ""
+       "open"  or  ""
     </span> </dt>
             <dd>Specifies that the contents of the
         <a href="details.html#details" class="element">details</a> element
@@ -46,8 +43,8 @@
           
         </dl></div>
       
-      <div class="no-number no-toc" id="details-assertions">
-        <h2 class="element-subhead">Assertions <a class="hash" href="#details-assertions">#</a></h2>
+      <div class="no-number no-toc" id="details-constraints">
+        <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#details-constraints">#</a></h2>
         <ul class="assertions">
           <li><span>
 				The interactive element &#8220;details&#8221; must not 
@@ -58,7 +55,7 @@
 			</span></li>
         </ul>
       </div>
-      <div class="no-number no-toc" id="details-tags">
+      <div class="no-number no-toc tag-omission" id="details-tags">
         <h2 class="element-subhead">Tag omission <a class="hash" href="#details-tags">#</a></h2>
         <p>A <a href="details.html#details">details</a>
             element must have both a
@@ -66,11 +63,11 @@
             and an
             <span title="syntax-end-tag">end tag</span>.</p>
       </div>
-      
       <div class="no-number no-toc" id="details-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#details-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="#details-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>
Received on Tuesday, 2 February 2010 17:06:00 GMT

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