- From: poot <cvsmail@w3.org>
- Date: Wed, 3 Jun 2009 19:13:19 +0900 (JST)
- To: public-html-diffs@w3.org
h:tml; pull upstream schema change that rationalizes <datagrid> content
model
Diffs for this change per section:
http://people.w3.org/mike/diffs/html5/markup/Overview.1.308.html#command.radio-toc
http://people.w3.org/mike/diffs/html5/markup/Overview.1.308.html#latestED
http://people.w3.org/mike/diffs/html5/markup/Overview.1.308.html#abstract
http://people.w3.org/mike/diffs/html5/markup/Overview.1.308.html#sub-toc
http://people.w3.org/mike/diffs/html5/markup/Overview.1.308.html#unexpanded-toc
http://people.w3.org/mike/diffs/html5/markup/Overview.1.308.html#input.week-toc
http://people.w3.org/mike/diffs/html5/markup/Overview.1.308.html#appendices
http://people.w3.org/mike/diffs/html5/markup/Overview.diff.html
http://dev.w3.org/cvsweb/html5/markup/Overview.html?r1=1.307&r2=1.308&f=h
===================================================================
RCS file: /sources/public/html5/markup/Overview.html,v
retrieving revision 1.307
retrieving revision 1.308
diff -u -d -r1.307 -r1.308
--- Overview.html 30 May 2009 11:38:55 -0000 1.307
+++ Overview.html 3 Jun 2009 10:12:57 -0000 1.308
@@ -9,7 +9,7 @@
<body>
<div class="head">
<h1>HTML 5: The Markup Language</h1>
-<h2>Editor’s Draft <em>30 May 2009</em>
+<h2>Editor’s Draft <em>3 June 2009</em>
</h2>
<dl>
<dt>Latest Editor’s Draft:</dt>
@@ -42,7 +42,7 @@
<p>
- This document is the 30 May 2009 Editor’s Draft of
+ This document is the 3 June 2009 Editor’s Draft of
<cite>HTML 5: The Markup Language</cite>.
</p>
<p>
Index: datagrid.html
===================================================================
RCS file: /sources/public/html5/markup/datagrid.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- datagrid.html 3 May 2009 15:59:40 -0000 1.4
+++ datagrid.html 3 Jun 2009 10:12:57 -0000 1.5
@@ -24,8 +24,6 @@
<p class="elem-mdl"><span class="element-pattern-name"><a id="datagrid-mdl" href="datagrid.html#datagrid-mdl" class="element">datagrid</a> = </span><span>
(text
& <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
- | <a class="ref" href="select.html#select">select</a>
- | <a class="ref" href="datalist.html#datalist">datalist</a>
& <a class="ref" href="datagrid.html#datagrid.attrs">datagrid.attrs</a>
</span></p>
</div>
Index: ins.html
===================================================================
RCS file: /sources/public/html5/markup/ins.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ins.html 30 May 2009 12:05:45 -0000 1.5
+++ ins.html 3 Jun 2009 10:12:58 -0000 1.6
@@ -15,7 +15,7 @@
<h2 class="element-head"><span class="element">ins</span> – <span class="shortdesc">inserted text</span> <a class="hash" href="#ins">#</a> <a class="toc-bak" href="Overview.html#ins-toc">T</a></h2>
<div id="ins-longdesc" class="longdesc">
<p>The <a href="ins.html#ins" class="element">ins</a> element
- represents a span of text that has been inserted (added) to
+ represents a range of text that has been inserted (added) to
a document.</p>
</div>
<div class="no-number no-toc" id="ins-content">
Index: table.html
===================================================================
RCS file: /sources/public/html5/markup/table.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- table.html 3 May 2009 15:59:43 -0000 1.4
+++ table.html 3 Jun 2009 10:12:58 -0000 1.5
@@ -40,15 +40,6 @@
<p><a href="table.html#table.attrs">table.attrs</a> = <span class="pattern" id="table.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div>
- <div class="no-number no-toc" id="table-assertions">
- <h2 class="element-subhead">Assertions <a class="hash" href="#table-assertions">#</a></h2>
- <ul class="assertions">
- <li><span>
- When a “table” is the first child of “datagrid”, it
- must not have following siblings.
- </span></li>
- </ul>
- </div>
<div class="no-number no-toc" id="table-tags">
<h2 class="element-subhead">Tag omission <a class="hash" href="#table-tags">#</a></h2>
<p>A <a href="table.html#table">table</a>
Index: schema.html
===================================================================
RCS file: /sources/public/html5/markup/schema.html,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -d -r1.98 -r1.99
--- schema.html 30 May 2009 12:05:45 -0000 1.98
+++ schema.html 3 Jun 2009 10:12:58 -0000 1.99
@@ -562,7 +562,7 @@
<div class='patternname' id='the-common.data.sizes'><a href='#the-common.data.sizes'>common.data.sizes</a> =</div>
<span class='pattern' id='common.data.sizes'><span class='comment'># list { w:sizes }</span>
list{
- xsd:string { pattern = "[1-9][0-9]*x[1-9][0-9]*" }*
+ xsd:string { pattern = "[1-9][0-9]*x[1-9][0-9]*" }+
}</span>
</div>
<div class='define' id='common.data.mimetype-define'>
@@ -970,8 +970,7 @@
empty
& <a class='ref' href='#meta.charset.attrs'>meta.charset.attrs</a>
</span>}
-
- & empty</span>
+ </span>
</div>
<div class='define' id='meta.charset.attrs-define'>
<div class='patternname' id='the-meta.charset.attrs'><a href='#the-meta.charset.attrs'>meta.charset.attrs</a> =</div>
@@ -983,7 +982,10 @@
<span class='pattern' id='meta.charset.attrs.charset'><span class='type'>attribute </span>
<span class='name'>charset</span>
{<span class='model'>
- <a class='ref' href='#common.data.charset'>common.data.charset</a>
+ (<a class='ref' href='#common.data.charset'>common.data.charset</a>
+ & empty)
+ | (xsd:string { pattern = "[uU][tT][fF]-8" }
+ & notAllowed)
</span>}
</span>
</div>
@@ -6078,10 +6080,7 @@
</div>
<div class='define' id='datagrid.inner-define'>
<div class='patternname' id='the-datagrid.inner'><a href='#the-datagrid.inner'>datagrid.inner</a> =</div>
- <span class='pattern' id='datagrid.inner'><a class='ref' href='#common.inner.flow'>common.inner.flow</a>
- | <span class='comment'># table case left to schematron</span>
- <a class='ref' href='#select.elem'>select.elem</a>
- | <a class='ref' href='#datalist.elem'>datalist.elem</a></span>
+ <span class='pattern' id='datagrid.inner'><a class='ref' href='#common.inner.flow'>common.inner.flow</a></span>
</div>
<div class='define' id='command.command.elem-define'>
Index: del.html
===================================================================
RCS file: /sources/public/html5/markup/del.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- del.html 30 May 2009 12:05:45 -0000 1.5
+++ del.html 3 Jun 2009 10:12:58 -0000 1.6
@@ -15,7 +15,7 @@
<h2 class="element-head"><span class="element">del</span> – <span class="shortdesc">deleted text</span> <a class="hash" href="#del">#</a> <a class="toc-bak" href="Overview.html#del-toc">T</a></h2>
<div id="del-longdesc" class="longdesc">
<p>The <a href="del.html#del" class="element">del</a> element
- represents a span of text that has been deleted from a
+ represents a range of text that has been deleted from a
document.</p>
</div>
<div class="no-number no-toc" id="del-content">
Index: schema.rnc
===================================================================
RCS file: /sources/public/html5/markup/schema.rnc,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -d -r1.85 -r1.86
--- schema.rnc 30 May 2009 12:05:45 -0000 1.85
+++ schema.rnc 3 Jun 2009 10:12:58 -0000 1.86
@@ -273,7 +273,7 @@
common.data.sizes =
# list { w:sizes }
list {
- xsd:string { pattern = "[1-9][0-9]*x[1-9][0-9]*" }*
+ xsd:string { pattern = "[1-9][0-9]*x[1-9][0-9]*" }+
}
## MIME types
@@ -416,12 +416,14 @@
# reused in another language
## Inline Character Encoding Statement for HTML: <meta charset>
- meta.charset.elem =
- element meta { empty & meta.charset.attrs }
- & empty
+ meta.charset.elem = element meta { empty & meta.charset.attrs }
meta.charset.attrs = common.attrs & meta.charset.attrs.charset
meta.charset.attrs.charset =
- attribute charset { common.data.charset }
+ attribute charset {
+ (common.data.charset & empty)
+ | (xsd:string { pattern = "[uU][tT][fF]-8" }
+ & notAllowed)
+ }
## Inline Character Encoding Statement for HTML: <meta http-equiv='content-type'>
meta.http-equiv.content-type.elem =
@@ -2187,11 +2189,7 @@
attribute multiple { d:string "multiple" | d:string "" }
datagrid.attrs.disabled =
attribute disabled { d:string "disabled" | d:string "" }
- datagrid.inner =
- common.inner.flow
- | # table case left to schematron
- select.elem
- | datalist.elem
+ datagrid.inner = common.inner.flow
## Command with an associated action: <command type='command'>
command.command.elem =
Index: select.html
===================================================================
RCS file: /sources/public/html5/markup/select.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- select.html 3 May 2009 15:59:43 -0000 1.4
+++ select.html 3 Jun 2009 10:12:58 -0000 1.5
@@ -69,10 +69,6 @@
ID value that matches that “for” attribute.
</span></li>
<li><span>
- When a “select” element is the first child of a
- “datagrid” element, it must not have following siblings.
- </span></li>
- <li><span>
The “select” element cannot have more than one
selected “option” descendant unless the
“multiple” attribute is specified.
@@ -92,11 +88,7 @@
<div class="no-number no-toc" id="select-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#select-context">#</a></h2>
<ul>
- <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li>
- <li class="context-mdl"><a href="datagrid.html#datagrid-mdl">datagrid</a> = (text
- & <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
- | <a class="ref" href="select.html#select">select</a>
- | <a class="ref" href="datalist.html#datalist">datalist</a></li></ul>
+ <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul>
</div></div>
<hr class="footerbreak"></hr>
<div class="nav">
Index: spec.html
===================================================================
RCS file: /sources/public/html5/markup/spec.html,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- spec.html 30 May 2009 12:05:46 -0000 1.17
+++ spec.html 3 Jun 2009 10:12:58 -0000 1.18
@@ -9,7 +9,7 @@
<body>
<div class="head">
<h1>HTML 5: The Markup Language</h1>
-<h2>Editor’s Draft <em>30 May 2009</em>
+<h2>Editor’s Draft <em>3 June 2009</em>
</h2>
<dl>
<dt>Latest Editor’s Draft:</dt>
@@ -41,7 +41,7 @@
<p>
- This document is the 30 May 2009 Editor’s Draft of
+ This document is the 3 June 2009 Editor’s Draft of
<cite>HTML 5: The Markup Language</cite>.
</p>
<p>
@@ -4091,8 +4091,6 @@
<p class="elem-mdl"><span class="element-pattern-name"><a id="datagrid-mdl" href="#datagrid-mdl" class="element">datagrid</a> = </span><span>
(text
& <a class="ref" href="#common.elem.flow">common.elem.flow</a>*)
- | <a class="ref" href="#select">select</a>
- | <a class="ref" href="#datalist">datalist</a>
& <a class="ref" href="#datagrid.attrs">datagrid.attrs</a>
</span></p>
</div>
@@ -4192,16 +4190,6 @@
</div>
- <div class="no-number no-toc" id="datalist-assertions">
- <h2 class="element-subhead">Assertions <a class="hash" href="#datalist-assertions">#</a>
-</h2>
- <ul class="assertions">
-<li><span>
- When a “datalist” element is the first child of a
- “datagrid” element, it must not have following siblings.
- </span></li>
- </ul>
-</div>
<div class="no-number no-toc" id="datalist-tags">
<h2 class="element-subhead">Tag omission <a class="hash" href="#datalist-tags">#</a>
</h2>
@@ -4216,15 +4204,7 @@
<div class="no-number no-toc" id="datalist-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#datalist-context">#</a>
</h2>
- <ul>
-<li class="context-mdl"><a href="#common.elem.phrasing">common.elem.phrasing</a></li>
- <li class="context-mdl">
-<a href="#datagrid-mdl">datagrid</a> = (text
- & <a class="ref" href="#common.elem.flow">common.elem.flow</a>*)
- | <a class="ref" href="#select">select</a>
- | <a class="ref" href="#datalist">datalist</a>
-</li>
-</ul>
+ <ul><li class="context-mdl"><a href="#common.elem.phrasing">common.elem.phrasing</a></li></ul>
</div>
</div>
<div id="dd" class="section">
@@ -4313,7 +4293,7 @@
</h2>
<div id="del-longdesc" class="longdesc">
<p>The <a href="#del" class="element">del</a> element
- represents a span of text that has been deleted from a
+ represents a range of text that has been deleted from a
document.</p>
</div>
<div class="no-number no-toc" id="del-content">
@@ -8994,7 +8974,7 @@
</h2>
<div id="ins-longdesc" class="longdesc">
<p>The <a href="#ins" class="element">ins</a> element
- represents a span of text that has been inserted (added) to
+ represents a range of text that has been inserted (added) to
a document.</p>
</div>
<div class="no-number no-toc" id="ins-content">
@@ -10177,7 +10157,9 @@
<dl class="attr-defs">
<dt>
<a class="attribute-name" id="meta.charset.attrs.charset" title="meta.charset.attrs.charset" href="#meta.charset.attrs.charset">charset</a><span class="attr-values"> =
- <a class="ref" href="#common.data.charset" title="common.data.charset">charset</a>
+ (<a class="ref" href="#common.data.charset" title="common.data.charset">charset</a>
+ & empty)
+ | (xs { pattern = "[uU][tT][fF]-8" })
</span> </dt>
<dd>Specifies a character encoding name.</dd>
@@ -12006,10 +11988,6 @@
ID value that matches that “for” attribute.
</span></li>
<li><span>
- When a “select” element is the first child of a
- “datagrid” element, it must not have following siblings.
- </span></li>
- <li><span>
The “select” element cannot have more than one
selected “option” descendant unless the
“multiple” attribute is specified.
@@ -12030,15 +12008,7 @@
<div class="no-number no-toc" id="select-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#select-context">#</a>
</h2>
- <ul>
-<li class="context-mdl"><a href="#common.elem.phrasing">common.elem.phrasing</a></li>
- <li class="context-mdl">
-<a href="#datagrid-mdl">datagrid</a> = (text
- & <a class="ref" href="#common.elem.flow">common.elem.flow</a>*)
- | <a class="ref" href="#select">select</a>
- | <a class="ref" href="#datalist">datalist</a>
-</li>
-</ul>
+ <ul><li class="context-mdl"><a href="#common.elem.phrasing">common.elem.phrasing</a></li></ul>
</div>
</div>
<div id="small" class="section">
@@ -12607,16 +12577,6 @@
</div>
- <div class="no-number no-toc" id="table-assertions">
- <h2 class="element-subhead">Assertions <a class="hash" href="#table-assertions">#</a>
-</h2>
- <ul class="assertions">
-<li><span>
- When a “table” is the first child of “datagrid”, it
- must not have following siblings.
- </span></li>
- </ul>
-</div>
<div class="no-number no-toc" id="table-tags">
<h2 class="element-subhead">Tag omission <a class="hash" href="#table-tags">#</a>
</h2>
Index: datalist.html
===================================================================
RCS file: /sources/public/html5/markup/datalist.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- datalist.html 3 May 2009 15:59:40 -0000 1.4
+++ datalist.html 3 Jun 2009 10:12:57 -0000 1.5
@@ -38,15 +38,6 @@
<p><a href="datalist.html#datalist.attrs">datalist.attrs</a> = <span class="pattern" id="datalist.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div>
- <div class="no-number no-toc" id="datalist-assertions">
- <h2 class="element-subhead">Assertions <a class="hash" href="#datalist-assertions">#</a></h2>
- <ul class="assertions">
- <li><span>
- When a “datalist” element is the first child of a
- “datagrid” element, it must not have following siblings.
- </span></li>
- </ul>
- </div>
<div class="no-number no-toc" id="datalist-tags">
<h2 class="element-subhead">Tag omission <a class="hash" href="#datalist-tags">#</a></h2>
<p>A <a href="datalist.html#datalist">datalist</a>
@@ -60,11 +51,7 @@
<div class="no-number no-toc" id="datalist-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#datalist-context">#</a></h2>
<ul>
- <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li>
- <li class="context-mdl"><a href="datagrid.html#datagrid-mdl">datagrid</a> = (text
- & <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
- | <a class="ref" href="select.html#select">select</a>
- | <a class="ref" href="datalist.html#datalist">datalist</a></li></ul>
+ <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul>
</div></div>
<hr class="footerbreak"></hr>
<div class="nav">
Index: meta.charset.html
===================================================================
RCS file: /sources/public/html5/markup/meta.charset.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- meta.charset.html 3 May 2009 15:59:42 -0000 1.4
+++ meta.charset.html 3 Jun 2009 10:12:58 -0000 1.5
@@ -36,7 +36,9 @@
<h2 class="element-subhead">Element-specific attributes <a class="hash" href="#meta.charset-attributes">#</a></h2>
<dl class="attr-defs">
<dt><a class="attribute-name" id="meta.charset.attrs.charset" title="meta.charset.attrs.charset" href="meta.charset.html#meta.charset.attrs.charset">charset</a><span class="attr-values"> =
- <a class="ref" href="datatypes.html#common.data.charset" title="common.data.charset">charset</a>
+ (<a class="ref" href="datatypes.html#common.data.charset" title="common.data.charset">charset</a>
+ & empty)
+ | (xs { pattern = "[uU][tT][fF]-8" })
</span> </dt>
<dd>Specifies a character encoding name.</dd>
Received on Wednesday, 3 June 2009 10:13:54 UTC