- From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
- Date: Fri, 01 May 2009 09:39:56 +0000
- To: public-html-commits@w3.org
Update of /sources/public/html5/markup
In directory hutz:/tmp/cvs-serv5851
Modified Files:
.cvsignore Overview.html article.html aside.html
common-models.html elements.html footer.html h1.html h2.html
h3.html h4.html h5.html h6.html header.html nav.html
schema.html schema.rnc section.html
Added Files:
hgroup.html spec.html
Log Message:
incorporated upstream schema changes that add <hgroup> and modify assertions for <header>
Index: h2.html
===================================================================
RCS file: /sources/public/html5/markup/h2.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- h2.html 1 May 2009 07:01:15 -0000 1.1
+++ h2.html 1 May 2009 09:39:54 -0000 1.2
@@ -46,7 +46,13 @@
<div class="no-number no-toc" id="h2-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#h2-context">#</a></h2>
<ul>
- <li class="context-mdl"><a href="common-models.html#common.elem.flow">common.elem.flow</a></li></ul>
+ <li class="context-mdl"><a href="common-models.html#common.elem.flow">common.elem.flow</a></li>
+ <li class="context-mdl"><a href="hgroup.html#hgroup-mdl">hgroup</a> = (<a class="ref" href="h1.html#h1">h1</a>
+ | <a class="ref" href="h2.html#h2">h2</a>
+ | <a class="ref" href="h3.html#h3">h3</a>
+ | <a class="ref" href="h4.html#h4">h4</a>
+ | <a class="ref" href="h5.html#h5">h5</a>
+ | <a class="ref" href="h6.html#h6">h6</a>)+</li></ul>
</div>
<div class="no-number no-toc" id="h2-display">
<h2 class="element-subhead">Typical default display properties <a class="hash" href="#h2-display">#</a></h2><p class="non-norm">This section is non-normative.</p>
Index: .cvsignore
===================================================================
RCS file: /sources/public/html5/markup/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- .cvsignore 30 Nov 2008 16:40:35 -0000 1.14
+++ .cvsignore 1 May 2009 09:39:54 -0000 1.15
@@ -8,7 +8,7 @@
assertions.sch.xml
schema.rnc.tmp
html.rnc.spec.html
-html5full-aria-compiled.rng.combined.spec
+html-compiled.rng.combined.spec
html.spec.src.html
html4.css
html.css.xml
Index: schema.rnc
===================================================================
RCS file: /sources/public/html5/markup/schema.rnc,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- schema.rnc 1 May 2009 07:01:19 -0000 1.75
+++ schema.rnc 1 May 2009 09:39:54 -0000 1.76
@@ -105,6 +105,7 @@
| h4.elem
| h5.elem
| h6.elem
+ | hgroup.elem
| address.elem
| blockquote.elem
| object.elem.flow
@@ -680,6 +681,12 @@
h6.elem = element h6 { h6.inner & h6.attrs }
h6.attrs = common.attrs
h6.inner = common.inner.phrasing
+
+ ## Heading Group: <hgroup>
+ hgroup.elem = element hgroup { hgroup.inner & hgroup.attrs }
+ hgroup.attrs = common.attrs
+ hgroup.inner =
+ (h1.elem | h2.elem | h3.elem | h4.elem | h5.elem | h6.elem)+
# #####################################################################
## Section Meta
Index: nav.html
===================================================================
RCS file: /sources/public/html5/markup/nav.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- nav.html 1 May 2009 07:01:18 -0000 1.1
+++ nav.html 1 May 2009 09:39:54 -0000 1.2
@@ -28,9 +28,6 @@
<ul class="assertions">
<li><span>
The sectioning element “nav” must not
- appear as a descendant of the “header” element.
- </span></li><li><span>
- The sectioning element “nav” must not
appear as a descendant of the “footer” element.
</span></li><li><span>
The sectioning element “nav” must not
Index: h4.html
===================================================================
RCS file: /sources/public/html5/markup/h4.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- h4.html 1 May 2009 07:01:15 -0000 1.1
+++ h4.html 1 May 2009 09:39:54 -0000 1.2
@@ -46,7 +46,13 @@
<div class="no-number no-toc" id="h4-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#h4-context">#</a></h2>
<ul>
- <li class="context-mdl"><a href="common-models.html#common.elem.flow">common.elem.flow</a></li></ul>
+ <li class="context-mdl"><a href="common-models.html#common.elem.flow">common.elem.flow</a></li>
+ <li class="context-mdl"><a href="hgroup.html#hgroup-mdl">hgroup</a> = (<a class="ref" href="h1.html#h1">h1</a>
+ | <a class="ref" href="h2.html#h2">h2</a>
+ | <a class="ref" href="h3.html#h3">h3</a>
+ | <a class="ref" href="h4.html#h4">h4</a>
+ | <a class="ref" href="h5.html#h5">h5</a>
+ | <a class="ref" href="h6.html#h6">h6</a>)+</li></ul>
</div>
<div class="no-number no-toc" id="h4-display">
<h2 class="element-subhead">Typical default display properties <a class="hash" href="#h4-display">#</a></h2><p class="non-norm">This section is non-normative.</p>
Index: header.html
===================================================================
RCS file: /sources/public/html5/markup/header.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- header.html 1 May 2009 07:01:15 -0000 1.1
+++ header.html 1 May 2009 09:39:54 -0000 1.2
@@ -33,9 +33,6 @@
</span></li><li><span>
The “header” element must not appear as a
descendant of the “header” element.
- </span></li><li><span>
- The “header” element must have at least one
- “h1”–“h6” descendant.
</span></li>
</ul>
</div>
Index: elements.html
===================================================================
RCS file: /sources/public/html5/markup/elements.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- elements.html 1 May 2009 07:01:15 -0000 1.1
+++ elements.html 1 May 2009 09:39:54 -0000 1.2
@@ -271,4 +271,6 @@
+
+
</div></body></html>
Index: schema.html
===================================================================
RCS file: /sources/public/html5/markup/schema.html,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -d -r1.88 -r1.89
--- schema.html 1 May 2009 07:01:19 -0000 1.88
+++ schema.html 1 May 2009 09:39:54 -0000 1.89
@@ -213,6 +213,7 @@
| <a class='ref' href='#h4.elem'>h4.elem</a>
| <a class='ref' href='#h5.elem'>h5.elem</a>
| <a class='ref' href='#h6.elem'>h6.elem</a>
+ | <a class='ref' href='#hgroup.elem'>hgroup.elem</a>
| <a class='ref' href='#address.elem'>address.elem</a>
| <a class='ref' href='#blockquote.elem'>blockquote.elem</a>
| <a class='ref' href='#object.elem.flow'>object.elem.flow</a>
@@ -1926,6 +1927,31 @@
<div class='patternname' id='the-h6.inner'><a href='#the-h6.inner'>h6.inner</a> =</div>
<span class='pattern' id='h6.inner'><a class='ref' href='#common.inner.phrasing'>common.inner.phrasing</a></span>
</div>
+<div class='define' id='hgroup.elem-define'>
+
+<span class='comment'>## Heading Group: <hgroup></span>
+ <div class='patternname' id='the-hgroup.elem'><a href='#the-hgroup.elem'>hgroup.elem</a> =</div>
+ <span class='pattern' id='hgroup.elem'><span class='type'>element </span>
+ <span class='name'>hgroup</span>
+ {<span class='model'>
+ <a class='ref' href='#hgroup.inner'>hgroup.inner</a>
+ & <a class='ref' href='#hgroup.attrs'>hgroup.attrs</a>
+ </span>}
+ </span>
+</div>
+<div class='define' id='hgroup.attrs-define'>
+ <div class='patternname' id='the-hgroup.attrs'><a href='#the-hgroup.attrs'>hgroup.attrs</a> =</div>
+ <span class='pattern' id='hgroup.attrs'><a class='ref' href='#common.attrs'>common.attrs</a></span>
+</div>
+<div class='define' id='hgroup.inner-define'>
+ <div class='patternname' id='the-hgroup.inner'><a href='#the-hgroup.inner'>hgroup.inner</a> =</div>
+ <span class='pattern' id='hgroup.inner'>(<a class='ref' href='#h1.elem'>h1.elem</a>
+ | <a class='ref' href='#h2.elem'>h2.elem</a>
+ | <a class='ref' href='#h3.elem'>h3.elem</a>
+ | <a class='ref' href='#h4.elem'>h4.elem</a>
+ | <a class='ref' href='#h5.elem'>h5.elem</a>
+ | <a class='ref' href='#h6.elem'>h6.elem</a>)+</span>
+</div>
<div class='define' id='address.elem-define'>
<span class='comment'># #####################################################################</span>
Index: common-models.html
===================================================================
RCS file: /sources/public/html5/markup/common-models.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- common-models.html 1 May 2009 07:01:14 -0000 1.1
+++ common-models.html 1 May 2009 09:39:54 -0000 1.2
@@ -39,6 +39,7 @@
| <a class="ref" href="h4.html#h4">h4</a>
| <a class="ref" href="h5.html#h5">h5</a>
| <a class="ref" href="h6.html#h6">h6</a>
+ | <a class="ref" href="hgroup.html#hgroup">hgroup</a>
| <a class="ref" href="address.html#address">address</a>
| <a class="ref" href="blockquote.html#blockquote">blockquote</a>
| <a class="ref" href="object.html#object.elem.flow">object.elem.flow</a>
--- NEW FILE: spec.html ---
<!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>HTML 5: The Markup Language</title>
<link rel="stylesheet" href="style.css" type="text/css">
<script src="js/dfn.js"></script><link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css">
</head>
<body>
<div class="head">
<h1>HTML 5: The Markup Language</h1>
<h2>Editor’s Draft <em>1 May 2009</em>
</h2>
<dl>
<dt>Latest Editor’s Draft:</dt>
<dd>
<a id="latestED" href="http://www.w3.org/html/wg/markup-spec/">http://www.w3.org/html/wg/markup-spec/</a> </dd>
<dt>Editor:</dt>
<dd>
[...14413 lines suppressed...]
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
You should have received a copy of the GNU Library General Public License
along with this library; see the file COPYING.LIB. If not, write to
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
</pre>
<p>This document incorporates modified and verbatim
content from the document
<a href="http://www.whatwg.org/specs/web-apps/current-work/">HTML5</a>,
distributed with the following copyright notice and
license statement:</p>
<pre class="license">© Copyright 2004-2008 Apple Computer, Inc., Mozilla Foundation, and Opera Software ASA.
You are granted a license to use, reproduce and create derivative works of this document.</pre>
</div>
</div>
</body>
</html>
Index: h1.html
===================================================================
RCS file: /sources/public/html5/markup/h1.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- h1.html 1 May 2009 07:01:15 -0000 1.1
+++ h1.html 1 May 2009 09:39:54 -0000 1.2
@@ -46,7 +46,13 @@
<div class="no-number no-toc" id="h1-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#h1-context">#</a></h2>
<ul>
- <li class="context-mdl"><a href="common-models.html#common.elem.flow">common.elem.flow</a></li></ul>
+ <li class="context-mdl"><a href="common-models.html#common.elem.flow">common.elem.flow</a></li>
+ <li class="context-mdl"><a href="hgroup.html#hgroup-mdl">hgroup</a> = (<a class="ref" href="h1.html#h1">h1</a>
+ | <a class="ref" href="h2.html#h2">h2</a>
+ | <a class="ref" href="h3.html#h3">h3</a>
+ | <a class="ref" href="h4.html#h4">h4</a>
+ | <a class="ref" href="h5.html#h5">h5</a>
+ | <a class="ref" href="h6.html#h6">h6</a>)+</li></ul>
</div>
<div class="no-number no-toc" id="h1-display">
<h2 class="element-subhead">Typical default display properties <a class="hash" href="#h1-display">#</a></h2><p class="non-norm">This section is non-normative.</p>
Index: Overview.html
===================================================================
RCS file: /sources/public/html5/markup/Overview.html,v
retrieving revision 1.292
retrieving revision 1.293
diff -u -d -r1.292 -r1.293
--- Overview.html 1 May 2009 07:01:12 -0000 1.292
+++ Overview.html 1 May 2009 09:39:54 -0000 1.293
@@ -293,6 +293,9 @@
<li id="header-toc">
<a href="#header"><span class="element">header</span> – <span class="shortdesc">header</span></a>
</li>
+<li id="hgroup-toc">
+<a href="#hgroup"><span class="element">hgroup</span> – <span class="shortdesc">heading group</span></a>
+</li>
<li id="hr-toc">
<a href="#hr"><span class="element">hr</span> – <span class="shortdesc">thematic break</span></a>
</li>
Index: article.html
===================================================================
RCS file: /sources/public/html5/markup/article.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- article.html 1 May 2009 07:01:13 -0000 1.1
+++ article.html 1 May 2009 09:39:54 -0000 1.2
@@ -29,9 +29,6 @@
<ul class="assertions">
<li><span>
The sectioning element “article” must not
- appear as a descendant of the “header” element.
- </span></li><li><span>
- The sectioning element “article” must not
appear as a descendant of the “footer” element.
</span></li><li><span>
The sectioning element “article” must not
Index: h5.html
===================================================================
RCS file: /sources/public/html5/markup/h5.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- h5.html 1 May 2009 07:01:15 -0000 1.1
+++ h5.html 1 May 2009 09:39:54 -0000 1.2
@@ -46,7 +46,13 @@
<div class="no-number no-toc" id="h5-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#h5-context">#</a></h2>
<ul>
- <li class="context-mdl"><a href="common-models.html#common.elem.flow">common.elem.flow</a></li></ul>
+ <li class="context-mdl"><a href="common-models.html#common.elem.flow">common.elem.flow</a></li>
+ <li class="context-mdl"><a href="hgroup.html#hgroup-mdl">hgroup</a> = (<a class="ref" href="h1.html#h1">h1</a>
+ | <a class="ref" href="h2.html#h2">h2</a>
+ | <a class="ref" href="h3.html#h3">h3</a>
+ | <a class="ref" href="h4.html#h4">h4</a>
+ | <a class="ref" href="h5.html#h5">h5</a>
+ | <a class="ref" href="h6.html#h6">h6</a>)+</li></ul>
</div>
<div class="no-number no-toc" id="h5-display">
<h2 class="element-subhead">Typical default display properties <a class="hash" href="#h5-display">#</a></h2><p class="non-norm">This section is non-normative.</p>
Index: h6.html
===================================================================
RCS file: /sources/public/html5/markup/h6.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- h6.html 1 May 2009 07:01:15 -0000 1.1
+++ h6.html 1 May 2009 09:39:54 -0000 1.2
@@ -46,7 +46,13 @@
<div class="no-number no-toc" id="h6-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#h6-context">#</a></h2>
<ul>
- <li class="context-mdl"><a href="common-models.html#common.elem.flow">common.elem.flow</a></li></ul>
+ <li class="context-mdl"><a href="common-models.html#common.elem.flow">common.elem.flow</a></li>
+ <li class="context-mdl"><a href="hgroup.html#hgroup-mdl">hgroup</a> = (<a class="ref" href="h1.html#h1">h1</a>
+ | <a class="ref" href="h2.html#h2">h2</a>
+ | <a class="ref" href="h3.html#h3">h3</a>
+ | <a class="ref" href="h4.html#h4">h4</a>
+ | <a class="ref" href="h5.html#h5">h5</a>
+ | <a class="ref" href="h6.html#h6">h6</a>)+</li></ul>
</div>
<div class="no-number no-toc" id="h6-display">
<h2 class="element-subhead">Typical default display properties <a class="hash" href="#h6-display">#</a></h2><p class="non-norm">This section is non-normative.</p>
Index: aside.html
===================================================================
RCS file: /sources/public/html5/markup/aside.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- aside.html 1 May 2009 07:01:13 -0000 1.1
+++ aside.html 1 May 2009 09:39:54 -0000 1.2
@@ -30,9 +30,6 @@
<ul class="assertions">
<li><span>
The sectioning element “aside” must not
- appear as a descendant of the “header” element.
- </span></li><li><span>
- The sectioning element “aside” must not
appear as a descendant of the “footer” element.
</span></li><li><span>
The sectioning element “aside” must not
Index: footer.html
===================================================================
RCS file: /sources/public/html5/markup/footer.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- footer.html 1 May 2009 07:01:15 -0000 1.1
+++ footer.html 1 May 2009 09:39:54 -0000 1.2
@@ -25,13 +25,13 @@
<h2 class="element-subhead">Assertions <a class="hash" href="#footer-assertions">#</a></h2>
<ul class="assertions">
<li><span>
- The sectioning element “footer” must not
+ The element “footer” must not
appear as a descendant of the “header” element.
</span></li><li><span>
- The sectioning element “footer” must not
+ The element “footer” must not
appear as a descendant of the “footer” element.
</span></li><li><span>
- The sectioning element “footer” must not
+ The element “footer” must not
appear as a descendant of the “address” element.
</span></li>
</ul>
--- NEW FILE: hgroup.html ---
<!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>hgroup – heading group</title><link rel="stylesheet" href="style.css" type="text/css"></link><link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-ED" type="text/css"></link><link rel="stylesheet" href="src.css" type="text/css"></link></head><body><div id="hgroup" class="section">
<h2 class="element-head"><span class="element">hgroup</span> – <span class="shortdesc">heading group</span> <a class="hash" href="#hgroup">#</a> <a class="toc-bak" href="#hgroup-toc">T</a></h2>
<div id="hgroup-longdesc" class="longdesc"><p><i class="TK">(element description to come)</i></p></div>
<div class="no-number no-toc" id="hgroup-content">
<h2 class="element-subhead">Content model <a class="hash" href="#hgroup-content">#</a></h2>
<div class="content-models" id="hgroup-mdls">
<p class="elem-mdl"><span class="element-pattern-name"><a id="hgroup-mdl" href="hgroup.html#hgroup-mdl" class="element">hgroup</a> = </span><span>
(<a class="ref" href="h1.html#h1">h1</a>
| <a class="ref" href="h2.html#h2">h2</a>
| <a class="ref" href="h3.html#h3">h3</a>
| <a class="ref" href="h4.html#h4">h4</a>
| <a class="ref" href="h5.html#h5">h5</a>
| <a class="ref" href="h6.html#h6">h6</a>)+
& <a class="ref" href="hgroup.html#hgroup.attrs">hgroup.attrs</a>
</span></p>
</div>
</div><div class="no-number no-toc" id="hgroup-attr-mdl">
<h2 class="element-subhead">Attribute model <a class="hash" href="#hgroup-attr-mdl">#</a></h2>
<div class="attr-content-models">
<p><a href="hgroup.html#hgroup.attrs">hgroup.attrs</a> = <span class="pattern" id="hgroup.attrs"><a class="ref" href="common-attrs.html#common.attrs">common.attrs</a></span></p></div></div>
<div class="no-number no-toc" id="hgroup-tags">
<h2 class="element-subhead">Tag omission <a class="hash" href="#hgroup-tags">#</a></h2>
<p>A <a href="hgroup.html#hgroup">hgroup</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="hgroup-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#hgroup-context">#</a></h2>
<ul>
<li class="context-mdl"><a href="common-models.html#common.elem.flow">common.elem.flow</a></li></ul>
</div></div></body></html>
Index: section.html
===================================================================
RCS file: /sources/public/html5/markup/section.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- section.html 1 May 2009 07:01:19 -0000 1.1
+++ section.html 1 May 2009 09:39:54 -0000 1.2
@@ -28,9 +28,6 @@
<ul class="assertions">
<li><span>
The sectioning element “section” must not
- appear as a descendant of the “header” element.
- </span></li><li><span>
- The sectioning element “section” must not
appear as a descendant of the “footer” element.
</span></li><li><span>
The sectioning element “section” must not
Index: h3.html
===================================================================
RCS file: /sources/public/html5/markup/h3.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- h3.html 1 May 2009 07:01:15 -0000 1.1
+++ h3.html 1 May 2009 09:39:54 -0000 1.2
@@ -46,7 +46,13 @@
<div class="no-number no-toc" id="h3-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#h3-context">#</a></h2>
<ul>
- <li class="context-mdl"><a href="common-models.html#common.elem.flow">common.elem.flow</a></li></ul>
+ <li class="context-mdl"><a href="common-models.html#common.elem.flow">common.elem.flow</a></li>
+ <li class="context-mdl"><a href="hgroup.html#hgroup-mdl">hgroup</a> = (<a class="ref" href="h1.html#h1">h1</a>
+ | <a class="ref" href="h2.html#h2">h2</a>
+ | <a class="ref" href="h3.html#h3">h3</a>
+ | <a class="ref" href="h4.html#h4">h4</a>
+ | <a class="ref" href="h5.html#h5">h5</a>
+ | <a class="ref" href="h6.html#h6">h6</a>)+</li></ul>
</div>
<div class="no-number no-toc" id="h3-display">
<h2 class="element-subhead">Typical default display properties <a class="hash" href="#h3-display">#</a></h2><p class="non-norm">This section is non-normative.</p>
Received on Friday, 1 May 2009 09:40:07 UTC