- From: poot <cvsmail@w3.org>
- Date: Wed, 15 Jul 2009 16:02:40 +0900 (JST)
- To: public-html-diffs@w3.org
mike: pull latest upstream schema changes; <table summary>, <img
border>, <a name>, <script language> now conformant (with datatype-
checking on border value and assertions-checking on language value);
also, define the terms "document" and "HTML language".
http://dev.w3.org/cvsweb/html5/markup/Overview.html?r1=1.325&r2=1.326&f=h
===================================================================
RCS file: /sources/public/html5/markup/Overview.html,v
retrieving revision 1.325
retrieving revision 1.326
diff -u -d -r1.325 -r1.326
--- Overview.html 14 Jul 2009 16:30:15 -0000 1.325
+++ Overview.html 15 Jul 2009 07:02:10 -0000 1.326
@@ -492,6 +492,9 @@
<li id="meta.http-equiv.default-style-toc">
<a href="meta.http-equiv.default-style.html#meta.http-equiv.default-style"><span class="element">meta</span> <span class="elem-qualifier"><span class="attribute-name">http-equiv</span>=<span class="equals-value">default-style</span></span> – <span class="shortdesc">“preferred stylesheet” pragma directive</span></a>
</li>
+<li id="meta.http-equiv.content-language-toc">
+<a href="meta.http-equiv.content-language.html#meta.http-equiv.content-language"><span class="element">meta</span> <span class="elem-qualifier"><span class="attribute-name">http-equiv</span>=<span class="equals-value">content-language</span></span> – <span class="shortdesc">"content-language" pragma directive</span></a>
+</li>
<li id="meta.charset-toc">
<a href="meta.charset.html#meta.charset"><span class="element">meta</span> <span class="elem-qualifier"><span class="attribute-name">charset</span></span> – <span class="shortdesc">document character-encoding declaration</span></a>
</li>
Index: meta.name.html
===================================================================
RCS file: /sources/public/html5/markup/meta.name.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- meta.name.html 29 Jun 2009 09:18:48 -0000 1.6
+++ meta.name.html 15 Jul 2009 07:02:11 -0000 1.7
@@ -99,6 +99,7 @@
| <a class="ref" href="meta.name.html#meta.name">meta.name</a>
| <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
| <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
+ | <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
| (<a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
| <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
| <a class="ref" href="script.html#script">script</a>
Index: table.html
===================================================================
RCS file: /sources/public/html5/markup/table.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- table.html 29 Jun 2009 09:18:49 -0000 1.6
+++ table.html 15 Jul 2009 07:02:12 -0000 1.7
@@ -37,8 +37,15 @@
</div><div class="no-number no-toc" id="table-attr-mdl">
<h2 class="element-subhead">Attribute model <a class="hash" href="#table-attr-mdl">#</a></h2>
<div class="attr-content-models">
- <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>
-
+ <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>
+ & <a class="ref" href="table.html#table.attrs.summary" title="table.attrs.summary">summary</a>?</span></p></div></div>
+ <div class="no-number no-toc" id="table-attributes">
+ <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#table-attributes">#</a></h2>
+ <dl class="attr-defs">
+ <dt><a class="attribute-name" id="table.attrs.summary" title="table.attrs.summary" href="table.html#table.attrs.summary">summary</a><span class="attr-values"> = <a href="datatypes.html#data-string">string</a></span> </dt>
+ <dd><i class="TK">(detailed attribute description to come)</i></dd>
+
+ </dl></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: meta.http-equiv.content-type.html
===================================================================
RCS file: /sources/public/html5/markup/meta.http-equiv.content-type.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- meta.http-equiv.content-type.html 14 Jul 2009 16:30:15 -0000 1.7
+++ meta.http-equiv.content-type.html 15 Jul 2009 07:02:11 -0000 1.8
@@ -81,6 +81,7 @@
| <a class="ref" href="meta.name.html#meta.name">meta.name</a>
| <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
| <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
+ | <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
| (<a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
| <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
| <a class="ref" href="script.html#script">script</a>
Index: script.html
===================================================================
RCS file: /sources/public/html5/markup/script.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- script.html 8 Jul 2009 10:31:02 -0000 1.8
+++ script.html 15 Jul 2009 07:02:12 -0000 1.9
@@ -38,14 +38,16 @@
<dl class="attr-content-models">
<dt class="attr-content-model"><span class="attribute-pattern-name" id="script.attrs.embedded">script.attrs.embedded =
</span></dt><dd><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
- & <a class="ref" href="script.html#script.attrs.type" title="script.attrs.type">type</a>?</dd>
+ & <a class="ref" href="script.html#script.attrs.type" title="script.attrs.type">type</a>?
+ & <a class="ref" href="script.html#script.attrs.language" title="script.attrs.language">language</a>?</dd>
<dt class="attr-content-model"><span class="attribute-pattern-name" id="script.attrs.imported">script.attrs.imported =
</span></dt><dd><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
& <a class="ref" href="script.html#script.attrs.src" title="script.attrs.src">src</a>
& <a class="ref" href="script.html#script.attrs.defer" title="script.attrs.defer">defer</a>?
& <a class="ref" href="script.html#script.attrs.async" title="script.attrs.async">async</a>?
& <a class="ref" href="script.html#script.attrs.type" title="script.attrs.type">type</a>?
- & <a class="ref" href="script.html#script.attrs.charset" title="script.attrs.charset">charset</a>?</dd>
+ & <a class="ref" href="script.html#script.attrs.charset" title="script.attrs.charset">charset</a>?
+ & <a class="ref" href="script.html#script.attrs.language" title="script.attrs.language">language</a>?</dd>
</dl></div>
<div class="no-number no-toc" id="script-attributes">
<h2 class="element-subhead">Element-specific attributes <a class="hash" href="#script-attributes">#</a></h2>
@@ -55,6 +57,9 @@
</span> </dt>
<dd>The language of the script or format of the data.</dd>
+ <dt><a class="attribute-name" id="script.attrs.language" title="script.attrs.language" href="script.html#script.attrs.language">language</a><span class="attr-values"> = "javascript" </span> </dt>
+ <dd><i class="TK">(detailed attribute description to come)</i></dd>
+
<dt><a class="attribute-name" id="script.attrs.src" title="script.attrs.src" href="script.html#script.attrs.src">src</a><span class="attr-values"> =
<a class="ref" href="datatypes.html#common.data.uri" title="common.data.uri">uri</a>
</span> </dt>
@@ -75,6 +80,17 @@
</dl></div>
+ <div class="no-number no-toc" id="script-assertions">
+ <h2 class="element-subhead">Assertions <a class="hash" href="#script-assertions">#</a></h2>
+ <ul class="assertions">
+ <li><span>
+ A “script” element with the
+ “language="JavaScript"” attribute set must not have a
+ “type” attribute whose value is not
+ “text/javascript”.
+ </span></li>
+ </ul>
+ </div>
<div class="no-number no-toc" id="script-tags">
<h2 class="element-subhead">Tag omission <a class="hash" href="#script-tags">#</a></h2>
<p>A <a href="script.html#script">script</a>
@@ -93,6 +109,7 @@
| <a class="ref" href="meta.name.html#meta.name">meta.name</a>
| <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
| <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
+ | <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
| (<a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
| <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
| <a class="ref" href="script.html#script">script</a>
Index: meta.http-equiv.default-style.html
===================================================================
RCS file: /sources/public/html5/markup/meta.http-equiv.default-style.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- meta.http-equiv.default-style.html 29 Jun 2009 09:18:48 -0000 1.6
+++ meta.http-equiv.default-style.html 15 Jul 2009 07:02:11 -0000 1.7
@@ -9,7 +9,7 @@
<h2 class="chunkpagetitle"><a href="Overview.html">HTML5: The Markup Language</a></h2>
<div class="nav">
<span class="nav-prev"><a href="meta.http-equiv.refresh.html">« meta.http-equiv.refresh</a></span>
-<span class="nav-next"><a href="meta.charset.html">meta.charset »</a></span>
+<span class="nav-next"><a href="meta.http-equiv.content-language.html">meta.http-equiv.content-language »</a></span>
</div>
<div id="meta.http-equiv.default-style" class="section">
<h2 class="element-head"><span class="element">meta</span> <span class="elem-qualifier"><span class="attribute-name">http-equiv</span>=<span class="equals-value">default-style</span></span> – <span class="shortdesc">“preferred stylesheet” pragma directive</span> <a class="hash" href="#meta.http-equiv.default-style">#</a> <a class="toc-bak" href="Overview.html#meta.http-equiv.default-style-toc">T</a></h2>
@@ -77,6 +77,7 @@
| <a class="ref" href="meta.name.html#meta.name">meta.name</a>
| <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
| <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
+ | <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
| (<a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
| <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
| <a class="ref" href="script.html#script">script</a>
@@ -90,7 +91,7 @@
<hr class="footerbreak"></hr>
<div class="nav">
<span class="nav-prev"><a href="meta.http-equiv.refresh.html">« meta.http-equiv.refresh</a></span>
-<span class="nav-next"><a href="meta.charset.html">meta.charset »</a></span>
+<span class="nav-next"><a href="meta.http-equiv.content-language.html">meta.http-equiv.content-language »</a></span>
</div>
</body>
</html>
Index: command.command.html
===================================================================
RCS file: /sources/public/html5/markup/command.command.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- command.command.html 29 Jun 2009 09:18:45 -0000 1.7
+++ command.command.html 15 Jul 2009 07:02:10 -0000 1.8
@@ -74,6 +74,7 @@
| <a class="ref" href="meta.name.html#meta.name">meta.name</a>
| <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
| <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
+ | <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
| (<a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
| <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
| <a class="ref" href="script.html#script">script</a>
Index: schema.html
===================================================================
RCS file: /sources/public/html5/markup/schema.html,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -d -r1.106 -r1.107
--- schema.html 26 Jun 2009 09:05:26 -0000 1.106
+++ schema.html 15 Jul 2009 07:02:11 -0000 1.107
@@ -136,6 +136,7 @@
| <a class='ref' href='#meta.name.elem'>meta.name.elem</a>
| <a class='ref' href='#meta.http-equiv.refresh.elem'>meta.http-equiv.refresh.elem</a>
| <a class='ref' href='#meta.http-equiv.default-style.elem'>meta.http-equiv.default-style.elem</a>
+ | <a class='ref' href='#meta.http-equiv.content-language.elem'>meta.http-equiv.content-language.elem</a>
| (<a class='ref' href='#meta.charset.elem'>meta.charset.elem</a>
| <a class='ref' href='#meta.http-equiv.content-type.elem'>meta.http-equiv.content-type.elem</a>)
| <a class='ref' href='#script.elem'>script.elem</a>
@@ -613,6 +614,12 @@
<div class='patternname' id='the-common.data.keylabellist'><a href='#the-common.data.keylabellist'>common.data.keylabellist</a> =</div>
<span class='pattern' id='common.data.keylabellist'>d:keylabellist</span>
</div>
+<div class='define' id='common.data.zero-define'>
+
+<span class='comment'>## Zero</span>
+ <div class='patternname' id='the-common.data.zero'><a href='#the-common.data.zero'>common.data.zero</a> =</div>
+ <span class='pattern' id='common.data.zero'>d:zero</span>
+</div>
<div class='define' id='common-form.attrs.form-define'>
<div class='patternname' id='the-common-form.attrs.form'><a href='#the-common-form.attrs.form'>common-form.attrs.form</a> =</div>
<span class='pattern' id='common-form.attrs.form'><span class='type'>attribute </span>
@@ -957,6 +964,43 @@
</span>}
</span>
</div>
+<div class='define' id='meta.http-equiv.content-language.elem-define'>
+<span class='comment'># not quite right per spec</span>
+<span class='comment'># if the definition is </span>
+<span class='comment'># reused in another language</span>
+
+<span class='comment'>## "content-language" pragma directive: <meta http-equiv='content-language'> (obsolete)</span>
+ <div class='patternname' id='the-meta.http-equiv.content-language.elem'><a href='#the-meta.http-equiv.content-language.elem'>meta.http-equiv.content-language.elem</a> =</div>
+ <span class='pattern' id='meta.http-equiv.content-language.elem'><span class='type'>element </span>
+ <span class='name'>meta</span>
+ {<span class='model'>
+ empty
+ & <a class='ref' href='#meta.http-equiv.content-language.attrs'>meta.http-equiv.content-language.attrs</a>
+ </span>}
+ </span>
+</div>
+<div class='define' id='meta.http-equiv.content-language.attrs-define'>
+ <div class='patternname' id='the-meta.http-equiv.content-language.attrs'><a href='#the-meta.http-equiv.content-language.attrs'>meta.http-equiv.content-language.attrs</a> =</div>
+ <span class='pattern' id='meta.http-equiv.content-language.attrs'><a class='ref' href='#common.attrs'>common.attrs</a>
+ & <a class='ref' href='#meta.http-equiv.attrs.http-equiv.content-language'>meta.http-equiv.attrs.http-equiv.content-language</a>
+ & <a class='ref' href='#meta.http-equiv.attrs.content.content-language'>meta.http-equiv.attrs.content.content-language</a></span>
+</div>
+<div class='define' id='meta.http-equiv.attrs.http-equiv.content-language-define'>
+ <div class='patternname' id='the-meta.http-equiv.attrs.http-equiv.content-language'><a href='#the-meta.http-equiv.attrs.http-equiv.content-language'>meta.http-equiv.attrs.http-equiv.content-language</a> =</div>
+ <span class='pattern' id='meta.http-equiv.attrs.http-equiv.content-language'><span class='type'>attribute </span>
+ <span class='name'>http-equiv</span>
+ {<span class='model'> d:string "content-language" </span>}
+ </span>
+</div>
+<div class='define' id='meta.http-equiv.attrs.content.content-language-define'>
+ <div class='patternname' id='the-meta.http-equiv.attrs.content.content-language'><a href='#the-meta.http-equiv.attrs.content.content-language'>meta.http-equiv.attrs.content.content-language</a> =</div>
+ <span class='pattern' id='meta.http-equiv.attrs.content.content-language'><span class='type'>attribute </span>
+ <span class='name'>content</span>
+ {<span class='model'>
+ <a class='ref' href='#common.data.langcode'>common.data.langcode</a>
+ </span>}
+ </span>
+</div>
<div class='define' id='meta.charset.elem-define'>
<span class='comment'># not quite right per spec</span>
<span class='comment'># if the definition is </span>
@@ -1053,6 +1097,7 @@
<div class='define' id='a.attrs-define'>
<div class='patternname' id='the-a.attrs'><a href='#the-a.attrs'>a.attrs</a> =</div>
<span class='pattern' id='a.attrs'><a class='ref' href='#common.attrs'>common.attrs</a>
+ & <a class='ref' href='#a.attrs.name'>a.attrs.name</a>?
& <a class='ref' href='#shared-hyperlink.attrs.href'>shared-hyperlink.attrs.href</a>?
& <a class='ref' href='#shared-hyperlink.attrs.target'>shared-hyperlink.attrs.target</a>?
& <a class='ref' href='#shared-hyperlink.attrs.rel'>shared-hyperlink.attrs.rel</a>?
@@ -1061,6 +1106,17 @@
& <a class='ref' href='#shared-hyperlink.attrs.type'>shared-hyperlink.attrs.type</a>?
& <a class='ref' href='#shared-hyperlink.attrs.ping'>shared-hyperlink.attrs.ping</a>?</span>
</div>
+<div class='define' id='a.attrs.name-define'>
+ <div class='patternname' id='the-a.attrs.name'><a href='#the-a.attrs.name'>a.attrs.name</a> =</div>
+ <span class='pattern' id='a.attrs.name'><span class='type'>attribute </span>
+ <span class='name'>name</span>
+ {<span class='model'>
+ <a class='ref' href='#common.data.id'>common.data.id</a>
+ <span class='comment'># XXX not what the spec says</span>
+
+ </span>}
+ </span>
+</div>
<div class='define' id='a.inner.phrasing-define'>
<div class='patternname' id='the-a.inner.phrasing'><a href='#the-a.inner.phrasing'>a.inner.phrasing</a> =</div>
<span class='pattern' id='a.inner.phrasing'><a class='ref' href='#common.inner.phrasing'>common.inner.phrasing</a></span>
@@ -2170,7 +2226,8 @@
& <a class='ref' href='#img.attrs.height'>img.attrs.height</a>?
& <a class='ref' href='#img.attrs.width'>img.attrs.width</a>?
& <a class='ref' href='#img.attrs.usemap'>img.attrs.usemap</a>?
- & <a class='ref' href='#img.attrs.ismap'>img.attrs.ismap</a>?</span>
+ & <a class='ref' href='#img.attrs.ismap'>img.attrs.ismap</a>?
+ & <a class='ref' href='#img.attrs.border'>img.attrs.border</a>?</span>
</div>
<div class='define' id='img.attrs.src-define'>
<div class='patternname' id='the-img.attrs.src'><a href='#the-img.attrs.src'>img.attrs.src</a> =</div>
@@ -2222,6 +2279,15 @@
{<span class='model'> d:string "ismap" | d:string "" </span>}
</span>
</div>
+<div class='define' id='img.attrs.border-define'>
+ <div class='patternname' id='the-img.attrs.border'><a href='#the-img.attrs.border'>img.attrs.border</a> =</div>
+ <span class='pattern' id='img.attrs.border'><span class='type'>attribute </span>
+ <span class='name'>border</span>
+ {<span class='model'>
+ <a class='ref' href='#common.data.zero'>common.data.zero</a>
+ </span>}
+ </span>
+</div>
<div class='define' id='embed.elem-define'>
<span class='comment'>## Plug-ins: <embed></span>
@@ -2346,13 +2412,11 @@
| aria-owns
| aria-relevant
| aria-required
- | about
- | property
- | resource
- | datatype
- | typeof
| spellcheck
- | accesskey)</span>
+ | accesskey
+ | item
+ | itemprop
+ | subject)</span>
{<span class='model'> string </span>}
</span>
</div>
@@ -2772,8 +2836,11 @@
</div>
<div class='define' id='script.attrs.embedded-define'>
<div class='patternname' id='the-script.attrs.embedded'><a href='#the-script.attrs.embedded'>script.attrs.embedded</a> =</div>
- <span class='pattern' id='script.attrs.embedded'><a class='ref' href='#common.attrs'>common.attrs</a>
- & <a class='ref' href='#script.attrs.type'>script.attrs.type</a>?</span>
+ <span class='pattern' id='script.attrs.embedded'>(<a class='ref' href='#common.attrs'>common.attrs</a>
+ & <a class='ref' href='#script.attrs.type'>script.attrs.type</a>?
+ & <a class='ref' href='#script.attrs.language'>script.attrs.language</a>?)
+ <span class='comment'># restricted in Schematron</span>
+ </span>
</div>
<div class='define' id='script.elem.imported-define'>
<div class='patternname' id='the-script.elem.imported'><a href='#the-script.elem.imported'>script.elem.imported</a> =</div>
@@ -2787,12 +2854,15 @@
</div>
<div class='define' id='script.attrs.imported-define'>
<div class='patternname' id='the-script.attrs.imported'><a href='#the-script.attrs.imported'>script.attrs.imported</a> =</div>
- <span class='pattern' id='script.attrs.imported'><a class='ref' href='#common.attrs'>common.attrs</a>
- & <a class='ref' href='#script.attrs.src'>script.attrs.src</a>
- & <a class='ref' href='#script.attrs.defer'>script.attrs.defer</a>?
- & <a class='ref' href='#script.attrs.async'>script.attrs.async</a>?
- & <a class='ref' href='#script.attrs.type'>script.attrs.type</a>?
- & <a class='ref' href='#script.attrs.charset'>script.attrs.charset</a>?</span>
+ <span class='pattern' id='script.attrs.imported'>(<a class='ref' href='#common.attrs'>common.attrs</a>
+ & <a class='ref' href='#script.attrs.src'>script.attrs.src</a>
+ & <a class='ref' href='#script.attrs.defer'>script.attrs.defer</a>?
+ & <a class='ref' href='#script.attrs.async'>script.attrs.async</a>?
+ & <a class='ref' href='#script.attrs.type'>script.attrs.type</a>?
+ & <a class='ref' href='#script.attrs.charset'>script.attrs.charset</a>?
+ & <a class='ref' href='#script.attrs.language'>script.attrs.language</a>?)
+ <span class='comment'># restricted in Schematron</span>
+ </span>
</div>
<div class='define' id='script.attrs.src-define'>
<div class='patternname' id='the-script.attrs.src'><a href='#the-script.attrs.src'>script.attrs.src</a> =</div>
@@ -2838,6 +2908,13 @@
</span>}
</span>
</div>
+<div class='define' id='script.attrs.language-define'>
+ <div class='patternname' id='the-script.attrs.language'><a href='#the-script.attrs.language'>script.attrs.language</a> =</div>
+ <span class='pattern' id='script.attrs.language'><span class='type'>attribute </span>
+ <span class='name'>language</span>
+ {<span class='model'> d:string "javascript" </span>}
+ </span>
+</div>
<div class='define' id='script.inner.embedded-define'>
<div class='patternname' id='the-script.inner.embedded'><a href='#the-script.inner.embedded'>script.inner.embedded</a> =</div>
<span class='pattern' id='script.inner.embedded'><a class='ref' href='#common.inner.anything'>common.inner.anything</a></span>
@@ -3677,7 +3754,15 @@
</div>
<div class='define' id='table.attrs-define'>
<div class='patternname' id='the-table.attrs'><a href='#the-table.attrs'>table.attrs</a> =</div>
- <span class='pattern' id='table.attrs'><a class='ref' href='#common.attrs'>common.attrs</a></span>
+ <span class='pattern' id='table.attrs'><a class='ref' href='#common.attrs'>common.attrs</a>
+ & <a class='ref' href='#table.attrs.summary'>table.attrs.summary</a>?</span>
+</div>
+<div class='define' id='table.attrs.summary-define'>
+ <div class='patternname' id='the-table.attrs.summary'><a href='#the-table.attrs.summary'>table.attrs.summary</a> =</div>
+ <span class='pattern' id='table.attrs.summary'><span class='type'>attribute </span>
+ <span class='name'>summary</span>
+ {<span class='model'> string </span>}
+ </span>
</div>
<div class='define' id='table.inner-define'>
<div class='patternname' id='the-table.inner'><a href='#the-table.inner'>table.inner</a> =</div>
Index: link.html
===================================================================
RCS file: /sources/public/html5/markup/link.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- link.html 29 Jun 2009 09:18:48 -0000 1.5
+++ link.html 15 Jul 2009 07:02:11 -0000 1.6
@@ -63,6 +63,7 @@
| <a class="ref" href="meta.name.html#meta.name">meta.name</a>
| <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
| <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
+ | <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
| (<a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
| <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
| <a class="ref" href="script.html#script">script</a>
Index: meta.http-equiv.refresh.html
===================================================================
RCS file: /sources/public/html5/markup/meta.http-equiv.refresh.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- meta.http-equiv.refresh.html 29 Jun 2009 09:18:48 -0000 1.5
+++ meta.http-equiv.refresh.html 15 Jul 2009 07:02:11 -0000 1.6
@@ -81,6 +81,7 @@
| <a class="ref" href="meta.name.html#meta.name">meta.name</a>
| <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
| <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
+ | <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
| (<a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
| <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
| <a class="ref" href="script.html#script">script</a>
Index: a.html
===================================================================
RCS file: /sources/public/html5/markup/a.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- a.html 8 Jul 2009 10:31:00 -0000 1.7
+++ a.html 15 Jul 2009 07:02:10 -0000 1.8
@@ -36,6 +36,7 @@
<h2 class="element-subhead">Attribute model <a class="hash" href="#a-attr-mdl">#</a></h2>
<div class="attr-content-models">
<p><a href="a.html#a.attrs">a.attrs</a> = <span class="pattern" id="a.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
+ & <a class="ref" href="a.html#a.attrs.name" title="a.attrs.name">name</a>?
& <a class="ref" href="shared-attributes.html#shared-hyperlink.attrs.href" title="shared-hyperlink.attrs.href">href</a>?
& <a class="ref" href="shared-attributes.html#shared-hyperlink.attrs.target" title="shared-hyperlink.attrs.target">target</a>?
& <a class="ref" href="shared-attributes.html#shared-hyperlink.attrs.rel" title="shared-hyperlink.attrs.rel">rel</a>?
@@ -43,7 +44,15 @@
& <a class="ref" href="shared-attributes.html#shared-hyperlink.attrs.media" title="shared-hyperlink.attrs.media">media</a>?
& <a class="ref" href="shared-attributes.html#shared-hyperlink.attrs.type" title="shared-hyperlink.attrs.type">type</a>?
& <a class="ref" href="shared-attributes.html#shared-hyperlink.attrs.ping" title="shared-hyperlink.attrs.ping">ping</a>?</span></p></div></div>
-
+ <div class="no-number no-toc" id="a-attributes">
+ <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#a-attributes">#</a></h2>
+ <dl class="attr-defs">
+ <dt><a class="attribute-name" id="a.attrs.name" title="a.attrs.name" href="a.html#a.attrs.name">name</a><span class="attr-values"> =
+ <a class="ref" href="datatypes.html#common.data.id" title="common.data.id">id</a>
+ </span> </dt>
+ <dd><i class="TK">(detailed attribute description to come)</i></dd>
+
+ </dl></div>
<div class="no-number no-toc" id="a-assertions">
<h2 class="element-subhead">Assertions <a class="hash" href="#a-assertions">#</a></h2>
Index: img.html
===================================================================
RCS file: /sources/public/html5/markup/img.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- img.html 8 Jul 2009 10:31:01 -0000 1.8
+++ img.html 15 Jul 2009 07:02:11 -0000 1.9
@@ -33,7 +33,8 @@
& <a class="ref" href="img.html#img.attrs.height" title="img.attrs.height">height</a>?
& <a class="ref" href="img.html#img.attrs.width" title="img.attrs.width">width</a>?
& <a class="ref" href="img.html#img.attrs.usemap" title="img.attrs.usemap">usemap</a>?
- & <a class="ref" href="img.html#img.attrs.ismap" title="img.attrs.ismap">ismap</a>?</span></p></div></div>
+ & <a class="ref" href="img.html#img.attrs.ismap" title="img.attrs.ismap">ismap</a>?
+ & <a class="ref" href="img.html#img.attrs.border" title="img.attrs.border">border</a>?</span></p></div></div>
<div class="no-number no-toc" id="img-attributes">
<h2 class="element-subhead">Element-specific attributes <a class="hash" href="#img-attributes">#</a></h2>
<dl class="attr-defs">
@@ -70,6 +71,11 @@
<dd>Specifies that its <a href="img.html#img">img</a> element
provides access to a server-side image map.</dd>
+ <dt><a class="attribute-name" id="img.attrs.border" title="img.attrs.border" href="img.html#img.attrs.border">border</a><span class="attr-values"> =
+ <a class="ref" href="datatypes.html#common.data.zero" title="common.data.zero">zero</a>
+ </span> </dt>
+ <dd><i class="TK">(detailed attribute description to come)</i></dd>
+
</dl></div>
<div class="no-number no-toc" id="img-assertions">
Index: datatypes.html
===================================================================
RCS file: /sources/public/html5/markup/datatypes.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- datatypes.html 14 Jul 2009 16:30:15 -0000 1.15
+++ datatypes.html 15 Jul 2009 07:02:11 -0000 1.16
@@ -287,8 +287,13 @@
length.</div>
</div>
</div>
+ <div id="common.data.zero-mdl" class="section">
+ <h2 class="common-subhead">11.31. Zero <a class="hash" href="#common.data.zero-mdl">#</a></h2>
+ <div class="content-models">
+ <div><span class="common-pattern-name"><dfn id="common.data.zero">zero</dfn></span><code class="punc"> = </code> <a href="datatypes.html#common.data.zero" class="hash">#</a></div></div>
+ </div>
<div id="form.data.mimetypelist-mdl" class="section">
- <h2 class="common-subhead">11.31. Mimetypelist <a class="hash" href="#form.data.mimetypelist-mdl">#</a></h2>
+ <h2 class="common-subhead">11.32. Mimetypelist <a class="hash" href="#form.data.mimetypelist-mdl">#</a></h2>
<div class="content-models">
<div><span class="common-pattern-name"><dfn id="form.data.mimetypelist">mimetypelist</dfn></span><code class="punc"> = </code> <a href="datatypes.html#form.data.mimetypelist" class="hash">#</a></div>
<div class="datatype-desc">A set of comma-separated <a href="datatypes.html#data-token">tokens</a>,
@@ -297,7 +302,7 @@
</div>
</div>
<div id="form.data.charsetlist-mdl" class="section">
- <h2 class="common-subhead">11.32. Charsetlist <a class="hash" href="#form.data.charsetlist-mdl">#</a></h2>
+ <h2 class="common-subhead">11.33. Charsetlist <a class="hash" href="#form.data.charsetlist-mdl">#</a></h2>
<div class="content-models">
<div><span class="common-pattern-name"><dfn id="form.data.charsetlist">charsetlist</dfn></span><code class="punc"> = </code> <a href="datatypes.html#form.data.charsetlist" class="hash">#</a></div>
<div class="datatype-desc">A set of comma-separated <a href="datatypes.html#data-token">tokens</a>,
@@ -307,7 +312,7 @@
</div>
</div>
<div id="form.data.pattern-mdl" class="section">
- <h2 class="common-subhead">11.33. Pattern <a class="hash" href="#form.data.pattern-mdl">#</a></h2>
+ <h2 class="common-subhead">11.34. Pattern <a class="hash" href="#form.data.pattern-mdl">#</a></h2>
<div class="content-models">
<div><span class="common-pattern-name"><dfn id="form.data.pattern">pattern</dfn></span><code class="punc"> = </code> <a href="datatypes.html#form.data.pattern" class="hash">#</a></div>
<div class="datatype-desc">A regular expression that must
@@ -315,7 +320,7 @@
</div>
</div>
<div id="form.data.datetime-local-mdl" class="section">
- <h2 class="common-subhead">11.34. Datetime-local <a class="hash" href="#form.data.datetime-local-mdl">#</a></h2>
+ <h2 class="common-subhead">11.35. Datetime-local <a class="hash" href="#form.data.datetime-local-mdl">#</a></h2>
<div class="content-models">
<div><span class="common-pattern-name"><dfn id="form.data.datetime-local">datetime-local</dfn></span><code class="punc"> = </code><a href="datatypes.html#form.data.date">date</a> "<code class="literal">T</code>" <a href="datatypes.html#form.data.time">time</a> <a href="datatypes.html#form.data.datetime-local" class="hash">#</a></div>
<div class="example">
@@ -326,7 +331,7 @@
</div>
</div>
<div id="form.data.date-mdl" class="section">
- <h2 class="common-subhead">11.35. Date <a class="hash" href="#form.data.date-mdl">#</a></h2>
+ <h2 class="common-subhead">11.36. Date <a class="hash" href="#form.data.date-mdl">#</a></h2>
<div class="content-models">
<div><span class="common-pattern-name"><dfn id="form.data.date">date</dfn></span><code class="punc"> = </code> <a href="datatypes.html#form.data.date" class="hash">#</a></div>
<div class="datatype-desc">A valid <b class="defined-elsewhere">full-date</b>, as defined in
@@ -342,7 +347,7 @@
</div>
</div>
<div id="form.data.month-mdl" class="section">
- <h2 class="common-subhead">11.36. Month <a class="hash" href="#form.data.month-mdl">#</a></h2>
+ <h2 class="common-subhead">11.37. Month <a class="hash" href="#form.data.month-mdl">#</a></h2>
<div class="content-models">
<div><span class="common-pattern-name"><dfn id="form.data.month">month</dfn></span><code class="punc"> = </code><a href="datatypes.html#data-date-fullyear">date-fullyear</a> "-" <a href="datatypes.html#data-date-month">date-month</a> <a href="datatypes.html#form.data.month" class="hash">#</a></div>
<div class="datatype-desc">…where <dfn id="data-date-month">date-month</dfn> is as defined
@@ -354,7 +359,7 @@
</div>
</div>
<div id="form.data.week-mdl" class="section">
- <h2 class="common-subhead">11.37. Week <a class="hash" href="#form.data.week-mdl">#</a></h2>
+ <h2 class="common-subhead">11.38. Week <a class="hash" href="#form.data.week-mdl">#</a></h2>
<div class="content-models">
<div><span class="common-pattern-name"><dfn id="form.data.week">week</dfn></span><code class="punc"> = </code><a href="datatypes.html#data-date-fullyear">date-fullyear</a> "-W" <a href="datatypes.html#data-date-week">date-week</a> <a href="datatypes.html#form.data.week" class="hash">#</a></div>
<div class="datatype-desc">…where <dfn id="data-date-week">date-week</dfn> is a valid <b class="defined-elsewhere">date-week</b>, as defined
@@ -367,7 +372,7 @@
</div>
</div>
<div id="form.data.time-mdl" class="section">
- <h2 class="common-subhead">11.38. Time <a class="hash" href="#form.data.time-mdl">#</a></h2>
+ <h2 class="common-subhead">11.39. Time <a class="hash" href="#form.data.time-mdl">#</a></h2>
<div class="content-models">
<div><span class="common-pattern-name"><dfn id="form.data.time">time</dfn></span><code class="punc"> = </code> <a href="datatypes.html#form.data.time" class="hash">#</a></div>
<div class="datatype-desc">A valid <b class="defined-elsewhere">partial-time</b>, as defined
@@ -381,7 +386,7 @@
</div>
</div>
<div id="form.data.emailaddress-mdl" class="section">
- <h2 class="common-subhead">11.39. Emailaddress <a class="hash" href="#form.data.emailaddress-mdl">#</a></h2>
+ <h2 class="common-subhead">11.40. Emailaddress <a class="hash" href="#form.data.emailaddress-mdl">#</a></h2>
<div class="content-models">
<div><span class="common-pattern-name"><dfn id="form.data.emailaddress">emailaddress</dfn></span><code class="punc"> = </code><a href="datatypes.html#data-dot-atom">dot-atom</a> "@" <a href="datatypes.html#data-dot-atom">dot-atom</a> <a href="datatypes.html#form.data.emailaddress" class="hash">#</a></div>
<div class="datatype-desc">…where <dfn id="data-dot-atom">dot-atom</dfn> is as defined in RFC
@@ -396,7 +401,7 @@
</div>
</div>
<div id="form.data.emailaddresslist-mdl" class="section">
- <h2 class="common-subhead">11.40. Emailaddresslist <a class="hash" href="#form.data.emailaddresslist-mdl">#</a></h2>
+ <h2 class="common-subhead">11.41. Emailaddresslist <a class="hash" href="#form.data.emailaddresslist-mdl">#</a></h2>
<div class="content-models">
<div><span class="common-pattern-name"><dfn id="form.data.emailaddresslist">emailaddresslist</dfn></span><code class="punc"> = </code> <a href="datatypes.html#form.data.emailaddresslist" class="hash">#</a></div>
<div class="datatype-desc">A set of comma-separated <a href="datatypes.html#data-token">tokens</a>, each of which is a valid
@@ -404,7 +409,7 @@
</div>
</div>
<div id="form.data.color-mdl" class="section">
- <h2 class="common-subhead">11.41. Color <a class="hash" href="#form.data.color-mdl">#</a></h2>
+ <h2 class="common-subhead">11.42. Color <a class="hash" href="#form.data.color-mdl">#</a></h2>
<div class="content-models">
<div><span class="common-pattern-name"><dfn id="form.data.color">color</dfn></span><code class="punc"> = </code><code class="regexp">#[a-fA-F0-9]{6}</code> <a href="datatypes.html#form.data.color" class="hash">#</a></div></div>
</div>
Index: command.radio.html
===================================================================
RCS file: /sources/public/html5/markup/command.radio.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- command.radio.html 29 Jun 2009 09:18:45 -0000 1.7
+++ command.radio.html 15 Jul 2009 07:02:11 -0000 1.8
@@ -83,6 +83,7 @@
| <a class="ref" href="meta.name.html#meta.name">meta.name</a>
| <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
| <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
+ | <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
| (<a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
| <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
| <a class="ref" href="script.html#script">script</a>
Index: common-models.html
===================================================================
RCS file: /sources/public/html5/markup/common-models.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- common-models.html 29 Jun 2009 09:18:45 -0000 1.10
+++ common-models.html 15 Jul 2009 07:02:11 -0000 1.11
@@ -77,6 +77,7 @@
| <a class="ref" href="meta.name.html#meta.name">meta.name</a>
| <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
| <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
+ | <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
| (<a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
| <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
| <a class="ref" href="script.html#script">script</a>
Index: style.html
===================================================================
RCS file: /sources/public/html5/markup/style.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- style.html 8 Jul 2009 10:31:02 -0000 1.7
+++ style.html 15 Jul 2009 07:02:12 -0000 1.8
@@ -84,6 +84,7 @@
| <a class="ref" href="meta.name.html#meta.name">meta.name</a>
| <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
| <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
+ | <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
| (<a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
| <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
| <a class="ref" href="script.html#script">script</a>
Index: documents.html
===================================================================
RCS file: /sources/public/html5/markup/documents.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- documents.html 14 Jul 2009 16:30:15 -0000 1.1
+++ documents.html 15 Jul 2009 07:02:11 -0000 1.2
@@ -21,11 +21,16 @@
</li>
</ul>
</div>
- <p>The HTML vocabulary is an abstract language that applications
- can potentially represent in memory in any number of possible
- ways, and that can be transmitted using any number of possible
- concrete syntaxes. This specification makes reference to
- two particular concrete syntaxes: One syntax which
+ <p>The term
+ <dfn id="document" title="document">document</dfn> is used in this specification
+ to mean an instance of the HTML language. The
+ <dfn id="html-language" title="html-language">HTML language</dfn> is the language
+ described in this specification; it is an abstract language that
+ applications can potentially represent in memory in any number
+ of possible ways, and that can be transmitted using any number
+ of possible concrete syntaxes. This specification makes
+ reference to two particular concrete syntaxes for the
+ <a href="documents.html#html-language">HTML language</a>: One syntax which
is referred to throughout this specification as
<a href="documents.html#html-syntax">the HTML syntax</a>,
and another syntax, which is referred to throughout this
Index: command.checkbox.html
===================================================================
RCS file: /sources/public/html5/markup/command.checkbox.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- command.checkbox.html 29 Jun 2009 09:18:45 -0000 1.7
+++ command.checkbox.html 15 Jul 2009 07:02:10 -0000 1.8
@@ -78,6 +78,7 @@
| <a class="ref" href="meta.name.html#meta.name">meta.name</a>
| <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
| <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
+ | <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
| (<a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
| <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
| <a class="ref" href="script.html#script">script</a>
Index: schema.rnc
===================================================================
RCS file: /sources/public/html5/markup/schema.rnc,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -d -r1.93 -r1.94
--- schema.rnc 26 Jun 2009 09:05:27 -0000 1.93
+++ schema.rnc 15 Jul 2009 07:02:12 -0000 1.94
@@ -34,6 +34,7 @@
| meta.name.elem
| meta.http-equiv.refresh.elem
| meta.http-equiv.default-style.elem
+ | meta.http-equiv.content-language.elem
| (meta.charset.elem | meta.http-equiv.content-type.elem)
| script.elem
| noscript.elem.head
@@ -298,6 +299,9 @@
## List of Key Labels
common.data.keylabellist = d:keylabellist
+
+ ## Zero
+ common.data.zero = d:zero
common-form.attrs.form = attribute form { common.data.idref }
}
}
@@ -415,6 +419,21 @@
# if the definition is
# reused in another language
+ ## "content-language" pragma directive: <meta http-equiv='content-language'> (obsolete)
+ meta.http-equiv.content-language.elem =
+ element meta { empty & meta.http-equiv.content-language.attrs }
+ meta.http-equiv.content-language.attrs =
+ common.attrs
+ & meta.http-equiv.attrs.http-equiv.content-language
+ & meta.http-equiv.attrs.content.content-language
+ meta.http-equiv.attrs.http-equiv.content-language =
+ attribute http-equiv { d:string "content-language" }
+ meta.http-equiv.attrs.content.content-language =
+ attribute content { common.data.langcode }
+ # not quite right per spec
+ # if the definition is
+ # reused in another language
+
## Inline Character Encoding Statement for HTML: <meta charset>
meta.charset.elem = element meta { empty & meta.charset.attrs }
meta.charset.attrs = common.attrs & meta.charset.attrs.charset
@@ -446,6 +465,7 @@
a.elem.flow = element a { a.inner.flow & a.attrs }
a.attrs =
common.attrs
+ & a.attrs.name?
& shared-hyperlink.attrs.href?
& shared-hyperlink.attrs.target?
& shared-hyperlink.attrs.rel?
@@ -453,6 +473,12 @@
& shared-hyperlink.attrs.media?
& shared-hyperlink.attrs.type?
& shared-hyperlink.attrs.ping?
+ a.attrs.name =
+ attribute name {
+ common.data.id
+ # XXX not what the spec says
+
+ }
a.inner.phrasing = common.inner.phrasing
a.inner.flow = common.inner.flow
@@ -758,6 +784,7 @@
& img.attrs.width?
& img.attrs.usemap?
& img.attrs.ismap?
+ & img.attrs.border?
img.attrs.src = attribute src { common.data.uri }
img.attrs.alt = attribute alt { text }
img.attrs.height =
@@ -766,6 +793,7 @@
attribute width { common.data.integer.non-negative }
img.attrs.usemap = attribute usemap { common.data.hash-name }
img.attrs.ismap = attribute ismap { d:string "ismap" | d:string "" }
+ img.attrs.border = attribute border { common.data.zero }
## Plug-ins: <embed>
embed.elem = element embed { empty & embed.attrs }
@@ -847,13 +875,11 @@
| aria-owns
| aria-relevant
| aria-required
- | about
- | property
- | resource
- | datatype
- | typeof
| spellcheck
- | accesskey) { string }
+ | accesskey
+ | item
+ | itemprop
+ | subject) { string }
## Generic Objects: <object>
object.elem.flow =
@@ -1013,16 +1039,22 @@
## Inline Scripts: <script>
script.elem.embedded =
element script { script.inner.embedded & script.attrs.embedded }
- script.attrs.embedded = common.attrs & script.attrs.type?
+ script.attrs.embedded =
+ (common.attrs & script.attrs.type? & script.attrs.language?)
+ # restricted in Schematron
+
script.elem.imported =
element script { empty & script.attrs.imported }
script.attrs.imported =
- common.attrs
- & script.attrs.src
- & script.attrs.defer?
- & script.attrs.async?
- & script.attrs.type?
- & script.attrs.charset?
+ (common.attrs
+ & script.attrs.src
+ & script.attrs.defer?
+ & script.attrs.async?
+ & script.attrs.type?
+ & script.attrs.charset?
+ & script.attrs.language?)
+ # restricted in Schematron
+
script.attrs.src = attribute src { common.data.uri }
script.attrs.defer =
attribute defer { d:string "defer" | d:string "" }
@@ -1036,6 +1068,7 @@
}
script.attrs.charset = attribute charset { common.data.charset }
+ script.attrs.language = attribute language { d:string "javascript" }
script.inner.embedded = common.inner.anything
script.elem = script.elem.embedded | script.elem.imported
@@ -1287,7 +1320,8 @@
## Data Table: <table>
table.elem = element table { table.inner & table.attrs }
- table.attrs = common.attrs
+ table.attrs = common.attrs & table.attrs.summary?
+ table.attrs.summary = attribute summary { string }
table.inner =
caption.elem?,
colgroup.elem*,
Index: noscript.html
===================================================================
RCS file: /sources/public/html5/markup/noscript.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- noscript.html 14 Jul 2009 16:30:15 -0000 1.8
+++ noscript.html 15 Jul 2009 07:02:11 -0000 1.9
@@ -79,6 +79,7 @@
| <a class="ref" href="meta.name.html#meta.name">meta.name</a>
| <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
| <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
+ | <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
| (<a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
| <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
| <a class="ref" href="script.html#script">script</a>
Index: spec.html
===================================================================
RCS file: /sources/public/html5/markup/spec.html,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- spec.html 14 Jul 2009 16:30:15 -0000 1.49
+++ spec.html 15 Jul 2009 07:02:12 -0000 1.50
@@ -491,6 +491,9 @@
<li id="meta.http-equiv.default-style-toc">
<a href="#meta.http-equiv.default-style"><span class="element">meta</span> <span class="elem-qualifier"><span class="attribute-name">http-equiv</span>=<span class="equals-value">default-style</span></span> – <span class="shortdesc">“preferred stylesheet” pragma directive</span></a>
</li>
+<li id="meta.http-equiv.content-language-toc">
+<a href="#meta.http-equiv.content-language"><span class="element">meta</span> <span class="elem-qualifier"><span class="attribute-name">http-equiv</span>=<span class="equals-value">content-language</span></span> – <span class="shortdesc">"content-language" pragma directive</span></a>
+</li>
<li id="meta.charset-toc">
<a href="#meta.charset"><span class="element">meta</span> <span class="elem-qualifier"><span class="attribute-name">charset</span></span> – <span class="shortdesc">document character-encoding declaration</span></a>
</li>
@@ -821,11 +824,16 @@
</li>
</ul>
</div>
- <p>The HTML vocabulary is an abstract language that applications
- can potentially represent in memory in any number of possible
- ways, and that can be transmitted using any number of possible
- concrete syntaxes. This specification makes reference to
- two particular concrete syntaxes: One syntax which
+ <p>The term
+ <dfn id="document" title="document">document</dfn> is used in this specification
+ to mean an instance of the HTML language. The
+ <dfn id="html-language" title="html-language">HTML language</dfn> is the language
+ described in this specification; it is an abstract language that
+ applications can potentially represent in memory in any number
+ of possible ways, and that can be transmitted using any number
+ of possible concrete syntaxes. This specification makes
+ reference to two particular concrete syntaxes for the
+ <a href="#html-language">HTML language</a>: One syntax which
is referred to throughout this specification as
<a href="#html-syntax">the HTML syntax</a>,
and another syntax, which is referred to throughout this
@@ -2079,6 +2087,9 @@
<li id="meta.http-equiv.default-style-toc">
<a href="#meta.http-equiv.default-style"><span class="element">meta</span> <span class="elem-qualifier"><span class="attribute-name">http-equiv</span>=<span class="equals-value">default-style</span></span> – <span class="shortdesc">“preferred stylesheet” pragma directive</span></a>
</li>
+<li id="meta.http-equiv.content-language-toc">
+<a href="#meta.http-equiv.content-language"><span class="element">meta</span> <span class="elem-qualifier"><span class="attribute-name">http-equiv</span>=<span class="equals-value">content-language</span></span> – <span class="shortdesc">"content-language" pragma directive</span></a>
+</li>
<li id="meta.charset-toc">
<a href="#meta.charset"><span class="element">meta</span> <span class="elem-qualifier"><span class="attribute-name">charset</span></span> – <span class="shortdesc">document character-encoding declaration</span></a>
</li>
@@ -2237,6 +2248,7 @@
</h2>
<div class="attr-content-models">
<p><a href="#a.attrs">a.attrs</a> = <span class="pattern" id="a.attrs"><a class="ref" href="#common.attrs">common.attrs</a>
+ & <a class="ref" href="#a.attrs.name" title="a.attrs.name">name</a>?
& <a class="ref" href="#shared-hyperlink.attrs.href" title="shared-hyperlink.attrs.href">href</a>?
& <a class="ref" href="#shared-hyperlink.attrs.target" title="shared-hyperlink.attrs.target">target</a>?
& <a class="ref" href="#shared-hyperlink.attrs.rel" title="shared-hyperlink.attrs.rel">rel</a>?
@@ -2246,7 +2258,18 @@
& <a class="ref" href="#shared-hyperlink.attrs.ping" title="shared-hyperlink.attrs.ping">ping</a>?</span></p>
</div>
</div>
-
+ <div class="no-number no-toc" id="a-attributes">
+ <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#a-attributes">#</a>
+</h2>
+ <dl class="attr-defs">
+<dt>
+<a class="attribute-name" id="a.attrs.name" title="a.attrs.name" href="#a.attrs.name">name</a><span class="attr-values"> =
+ <a class="ref" href="#common.data.id" title="common.data.id">id</a>
+ </span> </dt>
+ <dd><i class="TK">(detailed attribute description to come)</i></dd>
+
+ </dl>
+</div>
<div class="no-number no-toc" id="a-assertions">
<h2 class="element-subhead">Assertions <a class="hash" href="#a-assertions">#</a>
@@ -4085,6 +4108,7 @@
| <a class="ref" href="#meta.name">meta.name</a>
| <a class="ref" href="#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
| <a class="ref" href="#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
+ | <a class="ref" href="#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
| (<a class="ref" href="#meta.charset">meta.charset</a>
| <a class="ref" href="#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
| <a class="ref" href="#script">script</a>
@@ -4184,6 +4208,7 @@
| <a class="ref" href="#meta.name">meta.name</a>
| <a class="ref" href="#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
| <a class="ref" href="#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
+ | <a class="ref" href="#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
| (<a class="ref" href="#meta.charset">meta.charset</a>
| <a class="ref" href="#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
| <a class="ref" href="#script">script</a>
@@ -4277,6 +4302,7 @@
| <a class="ref" href="#meta.name">meta.name</a>
| <a class="ref" href="#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
| <a class="ref" href="#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
+ | <a class="ref" href="#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
| (<a class="ref" href="#meta.charset">meta.charset</a>
| <a class="ref" href="#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
| <a class="ref" href="#script">script</a>
@@ -6545,7 +6571,8 @@
& <a class="ref" href="#img.attrs.height" title="img.attrs.height">height</a>?
& <a class="ref" href="#img.attrs.width" title="img.attrs.width">width</a>?
& <a class="ref" href="#img.attrs.usemap" title="img.attrs.usemap">usemap</a>?
- & <a class="ref" href="#img.attrs.ismap" title="img.attrs.ismap">ismap</a>?</span></p>
+ & <a class="ref" href="#img.attrs.ismap" title="img.attrs.ismap">ismap</a>?
+ & <a class="ref" href="#img.attrs.border" title="img.attrs.border">border</a>?</span></p>
</div>
</div>
<div class="no-number no-toc" id="img-attributes">
@@ -6591,6 +6618,12 @@
<dd>Specifies that its <a href="#img">img</a> element
provides access to a server-side image map.</dd>
+ <dt>
+<a class="attribute-name" id="img.attrs.border" title="img.attrs.border" href="#img.attrs.border">border</a><span class="attr-values"> =
+ <a class="ref" href="#common.data.zero" title="common.data.zero">zero</a>
+ </span> </dt>
+ <dd><i class="TK">(detailed attribute description to come)</i></dd>
+
</dl>
</div>
@@ -9671,6 +9704,7 @@
| <a class="ref" href="#meta.name">meta.name</a>
| <a class="ref" href="#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
| <a class="ref" href="#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
+ | <a class="ref" href="#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
| (<a class="ref" href="#meta.charset">meta.charset</a>
| <a class="ref" href="#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
| <a class="ref" href="#script">script</a>
@@ -10063,6 +10097,7 @@
| <a class="ref" href="#meta.name">meta.name</a>
| <a class="ref" href="#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
| <a class="ref" href="#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
+ | <a class="ref" href="#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
| (<a class="ref" href="#meta.charset">meta.charset</a>
| <a class="ref" href="#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
| <a class="ref" href="#script">script</a>
@@ -10154,6 +10189,7 @@
| <a class="ref" href="#meta.name">meta.name</a>
| <a class="ref" href="#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
| <a class="ref" href="#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
+ | <a class="ref" href="#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
| (<a class="ref" href="#meta.charset">meta.charset</a>
| <a class="ref" href="#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
| <a class="ref" href="#script">script</a>
@@ -10247,6 +10283,7 @@
| <a class="ref" href="#meta.name">meta.name</a>
| <a class="ref" href="#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
| <a class="ref" href="#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
+ | <a class="ref" href="#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
| (<a class="ref" href="#meta.charset">meta.charset</a>
| <a class="ref" href="#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
| <a class="ref" href="#script">script</a>
@@ -10260,6 +10297,75 @@
</ul>
</div>
</div>
+<div id="meta.http-equiv.content-language" class="section">
+ <h2 class="element-head">
+<span class="element">meta</span> <span class="elem-qualifier"><span class="attribute-name">http-equiv</span>=<span class="equals-value">content-language</span></span> – <span class="shortdesc">"content-language" pragma directive</span> <a class="hash" href="#meta.http-equiv.content-language">#</a> <a class="toc-bak" href="#meta.http-equiv.content-language-toc">T</a>
+</h2>
+ <div id="meta.http-equiv.content-language-longdesc" class="longdesc"><p><i class="TK">(element description to come)</i></p></div>
+ <div class="no-number no-toc" id="meta.http-equiv.content-language-content">
+ <h2 class="element-subhead">Content model <a class="hash" href="#meta.http-equiv.content-language-content">#</a>
+</h2>
+ <div class="content-models" id="meta.http-equiv.content-language-mdls">
+ <p class="elem-mdl"><span class="element-pattern-name"><a id="meta.http-equiv.content-language-mdl" href="#meta.http-equiv.content-language-mdl"><span class="element">meta</span>.http-equiv.content-language</a> = </span><span>
+ empty
+ & <a class="ref" href="#meta.http-equiv.content-language.attrs">meta.http-equiv.content-language.attrs</a>
+ </span></p>
+ </div>
+ </div>
+<div class="no-number no-toc" id="meta.http-equiv.content-language-attr-mdl">
+ <h2 class="element-subhead">Attribute model <a class="hash" href="#meta.http-equiv.content-language-attr-mdl">#</a>
+</h2>
+ <div class="attr-content-models">
+ <p><a href="#meta.http-equiv.content-language.attrs">meta.http-equiv.content-language.attrs</a> = <span class="pattern" id="meta.http-equiv.content-language.attrs"><a class="ref" href="#common.attrs">common.attrs</a>
+ & <a class="ref" href="#meta.http-equiv.attrs.http-equiv.content-language" title="meta.http-equiv.attrs.http-equiv.content-language">http-equiv.content-language</a>
+ & <a class="ref" href="#meta.http-equiv.attrs.content.content-language" title="meta.http-equiv.attrs.content.content-language">content.content-language</a></span></p>
+</div>
+</div>
+ <div class="no-number no-toc" id="meta.http-equiv.content-language-attributes">
+ <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#meta.http-equiv.content-language-attributes">#</a>
+</h2>
+ <dl class="attr-defs">
+<dt>
+<a class="attribute-name" id="meta.http-equiv.attrs.http-equiv.content-language" title="meta.http-equiv.attrs.http-equiv.content-language" href="#meta.http-equiv.attrs.http-equiv.content-language">http-equiv</a><span class="attr-values"> = "content-language" </span> </dt>
+ <dd><i class="TK">(detailed attribute description to come)</i></dd>
+
+ <dt>
+<a class="attribute-name" id="meta.http-equiv.attrs.content.content-language" title="meta.http-equiv.attrs.content.content-language" href="#meta.http-equiv.attrs.content.content-language">content</a><span class="attr-values"> =
+ <a class="ref" href="#common.data.langcode" title="common.data.langcode">langcode</a>
+ </span> </dt>
+ <dd><i class="TK">(detailed attribute description to come)</i></dd>
+
+ </dl>
+</div>
+
+ <div class="no-number no-toc" id="meta.http-equiv.content-language-tags">
+ <h2 class="element-subhead">Tag omission <a class="hash" href="#meta.http-equiv.content-language-tags">#</a>
+</h2>
+ <p>The
+ <a href="#meta">meta</a>
+ element is a <a href="#void-element">void element</a>.
+ A <a href="#meta">meta</a>
+ element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
+ </div>
+
+
+ <div class="no-number no-toc" id="meta.http-equiv.content-language-context">
+ <h2 class="element-subhead">Permitted contexts <a class="hash" href="#meta.http-equiv.content-language-context">#</a>
+</h2>
+ <ul><li class="context-mdl">
+<a href="#common.elem.metadata">common.elem.metadata</a> = <a class="ref" href="#link">link</a>
+ | <a class="ref" href="#style-pattern">style</a>
+ | <a class="ref" href="#meta.name">meta.name</a>
+ | <a class="ref" href="#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
+ | <a class="ref" href="#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
+ | <a class="ref" href="#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
+ | (<a class="ref" href="#meta.charset">meta.charset</a>
+ | <a class="ref" href="#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
+ | <a class="ref" href="#script">script</a>
+ | <a class="ref" href="#noscript.elem.head">noscript.elem.head</a>
+ | (<a class="ref" href="#command">command</a>)</li></ul>
+</div>
+</div>
<div id="meta.charset" class="section">
<h2 class="element-head">
<span class="element">meta</span> <span class="elem-qualifier"><span class="attribute-name">charset</span></span> – <span class="shortdesc">document character-encoding declaration</span> <a class="hash" href="#meta.charset">#</a> <a class="toc-bak" href="#meta.charset-toc">T</a>
@@ -10331,6 +10437,7 @@
| <a class="ref" href="#meta.name">meta.name</a>
| <a class="ref" href="#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
| <a class="ref" href="#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
+ | <a class="ref" href="#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
| (<a class="ref" href="#meta.charset">meta.charset</a>
| <a class="ref" href="#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
| <a class="ref" href="#script">script</a>
@@ -10423,6 +10530,7 @@
| <a class="ref" href="#meta.name">meta.name</a>
| <a class="ref" href="#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
| <a class="ref" href="#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
+ | <a class="ref" href="#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
| (<a class="ref" href="#meta.charset">meta.charset</a>
| <a class="ref" href="#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
| <a class="ref" href="#script">script</a>
@@ -10785,6 +10893,7 @@
| <a class="ref" href="#meta.name">meta.name</a>
| <a class="ref" href="#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
| <a class="ref" href="#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
+ | <a class="ref" href="#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
| (<a class="ref" href="#meta.charset">meta.charset</a>
| <a class="ref" href="#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
| <a class="ref" href="#script">script</a>
@@ -11846,7 +11955,8 @@
</span></dt>
<dd>
<a class="ref" href="#common.attrs">common.attrs</a>
- & <a class="ref" href="#script.attrs.type" title="script.attrs.type">type</a>?</dd>
+ & <a class="ref" href="#script.attrs.type" title="script.attrs.type">type</a>?
+ & <a class="ref" href="#script.attrs.language" title="script.attrs.language">language</a>?</dd>
<dt class="attr-content-model"><span class="attribute-pattern-name" id="script.attrs.imported">script.attrs.imported =
</span></dt>
<dd>
@@ -11855,7 +11965,8 @@
& <a class="ref" href="#script.attrs.defer" title="script.attrs.defer">defer</a>?
& <a class="ref" href="#script.attrs.async" title="script.attrs.async">async</a>?
& <a class="ref" href="#script.attrs.type" title="script.attrs.type">type</a>?
- & <a class="ref" href="#script.attrs.charset" title="script.attrs.charset">charset</a>?</dd>
+ & <a class="ref" href="#script.attrs.charset" title="script.attrs.charset">charset</a>?
+ & <a class="ref" href="#script.attrs.language" title="script.attrs.language">language</a>?</dd>
</dl>
</div>
<div class="no-number no-toc" id="script-attributes">
@@ -11869,6 +11980,10 @@
<dd>The language of the script or format of the data.</dd>
<dt>
+<a class="attribute-name" id="script.attrs.language" title="script.attrs.language" href="#script.attrs.language">language</a><span class="attr-values"> = "javascript" </span> </dt>
+ <dd><i class="TK">(detailed attribute description to come)</i></dd>
+
+ <dt>
<a class="attribute-name" id="script.attrs.src" title="script.attrs.src" href="#script.attrs.src">src</a><span class="attr-values"> =
<a class="ref" href="#common.data.uri" title="common.data.uri">uri</a>
</span> </dt>
@@ -11893,6 +12008,18 @@
</dl>
</div>
+ <div class="no-number no-toc" id="script-assertions">
+ <h2 class="element-subhead">Assertions <a class="hash" href="#script-assertions">#</a>
+</h2>
+ <ul class="assertions">
+<li><span>
+ A “script” element with the
+ “language="JavaScript"” attribute set must not have a
+ “type” attribute whose value is not
+ “text/javascript”.
+ </span></li>
+ </ul>
+</div>
<div class="no-number no-toc" id="script-tags">
<h2 class="element-subhead">Tag omission <a class="hash" href="#script-tags">#</a>
</h2>
@@ -11914,6 +12041,7 @@
| <a class="ref" href="#meta.name">meta.name</a>
| <a class="ref" href="#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
| <a class="ref" href="#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
+ | <a class="ref" href="#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
| (<a class="ref" href="#meta.charset">meta.charset</a>
| <a class="ref" href="#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
| <a class="ref" href="#script">script</a>
@@ -12459,6 +12587,7 @@
| <a class="ref" href="#meta.name">meta.name</a>
| <a class="ref" href="#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
| <a class="ref" href="#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
+ | <a class="ref" href="#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
| (<a class="ref" href="#meta.charset">meta.charset</a>
| <a class="ref" href="#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
| <a class="ref" href="#script">script</a>
@@ -12653,10 +12782,20 @@
<h2 class="element-subhead">Attribute model <a class="hash" href="#table-attr-mdl">#</a>
</h2>
<div class="attr-content-models">
- <p><a href="#table.attrs">table.attrs</a> = <span class="pattern" id="table.attrs"><a class="ref" href="#common.attrs">common.attrs</a></span></p>
+ <p><a href="#table.attrs">table.attrs</a> = <span class="pattern" id="table.attrs"><a class="ref" href="#common.attrs">common.attrs</a>
+ & <a class="ref" href="#table.attrs.summary" title="table.attrs.summary">summary</a>?</span></p>
</div>
</div>
-
+ <div class="no-number no-toc" id="table-attributes">
+ <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#table-attributes">#</a>
+</h2>
+ <dl class="attr-defs">
+<dt>
+<a class="attribute-name" id="table.attrs.summary" title="table.attrs.summary" href="#table.attrs.summary">summary</a><span class="attr-values"> = <a href="#data-string">string</a></span> </dt>
+ <dd><i class="TK">(detailed attribute description to come)</i></dd>
+
+ </dl>
+</div>
<div class="no-number no-toc" id="table-tags">
<h2 class="element-subhead">Tag omission <a class="hash" href="#table-tags">#</a>
@@ -13776,6 +13915,7 @@
| <a class="ref" href="#meta.name">meta.name</a>
| <a class="ref" href="#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
| <a class="ref" href="#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
+ | <a class="ref" href="#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
| (<a class="ref" href="#meta.charset">meta.charset</a>
| <a class="ref" href="#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
| <a class="ref" href="#script">script</a>
@@ -14764,8 +14904,17 @@
length.</div>
</div>
</div>
+ <div id="common.data.zero-mdl" class="section">
+ <h2 class="common-subhead">11.31. Zero <a class="hash" href="#common.data.zero-mdl">#</a>
+</h2>
+ <div class="content-models">
+ <div>
+<span class="common-pattern-name"><dfn id="common.data.zero">zero</dfn></span><code class="punc"> = </code> <a href="#common.data.zero" class="hash">#</a>
+</div>
+</div>
+ </div>
<div id="form.data.mimetypelist-mdl" class="section">
- <h2 class="common-subhead">11.31. Mimetypelist <a class="hash" href="#form.data.mimetypelist-mdl">#</a>
+ <h2 class="common-subhead">11.32. Mimetypelist <a class="hash" href="#form.data.mimetypelist-mdl">#</a>
</h2>
<div class="content-models">
<div>
@@ -14777,7 +14926,7 @@
</div>
</div>
<div id="form.data.charsetlist-mdl" class="section">
- <h2 class="common-subhead">11.32. Charsetlist <a class="hash" href="#form.data.charsetlist-mdl">#</a>
+ <h2 class="common-subhead">11.33. Charsetlist <a class="hash" href="#form.data.charsetlist-mdl">#</a>
</h2>
<div class="content-models">
<div>
@@ -14790,7 +14939,7 @@
</div>
</div>
<div id="form.data.pattern-mdl" class="section">
- <h2 class="common-subhead">11.33. Pattern <a class="hash" href="#form.data.pattern-mdl">#</a>
+ <h2 class="common-subhead">11.34. Pattern <a class="hash" href="#form.data.pattern-mdl">#</a>
</h2>
<div class="content-models">
<div>
@@ -14801,7 +14950,7 @@
</div>
</div>
<div id="form.data.datetime-local-mdl" class="section">
- <h2 class="common-subhead">11.34. Datetime-local <a class="hash" href="#form.data.datetime-local-mdl">#</a>
+ <h2 class="common-subhead">11.35. Datetime-local <a class="hash" href="#form.data.datetime-local-mdl">#</a>
</h2>
<div class="content-models">
<div>
@@ -14815,7 +14964,7 @@
</div>
</div>
<div id="form.data.date-mdl" class="section">
- <h2 class="common-subhead">11.35. Date <a class="hash" href="#form.data.date-mdl">#</a>
+ <h2 class="common-subhead">11.36. Date <a class="hash" href="#form.data.date-mdl">#</a>
</h2>
<div class="content-models">
<div>
@@ -14834,7 +14983,7 @@
</div>
</div>
<div id="form.data.month-mdl" class="section">
- <h2 class="common-subhead">11.36. Month <a class="hash" href="#form.data.month-mdl">#</a>
+ <h2 class="common-subhead">11.37. Month <a class="hash" href="#form.data.month-mdl">#</a>
</h2>
<div class="content-models">
<div>
@@ -14849,7 +14998,7 @@
</div>
</div>
<div id="form.data.week-mdl" class="section">
- <h2 class="common-subhead">11.37. Week <a class="hash" href="#form.data.week-mdl">#</a>
+ <h2 class="common-subhead">11.38. Week <a class="hash" href="#form.data.week-mdl">#</a>
</h2>
<div class="content-models">
<div>
@@ -14865,7 +15014,7 @@
</div>
</div>
<div id="form.data.time-mdl" class="section">
- <h2 class="common-subhead">11.38. Time <a class="hash" href="#form.data.time-mdl">#</a>
+ <h2 class="common-subhead">11.39. Time <a class="hash" href="#form.data.time-mdl">#</a>
</h2>
<div class="content-models">
<div>
@@ -14882,7 +15031,7 @@
</div>
</div>
<div id="form.data.emailaddress-mdl" class="section">
- <h2 class="common-subhead">11.39. Emailaddress <a class="hash" href="#form.data.emailaddress-mdl">#</a>
+ <h2 class="common-subhead">11.40. Emailaddress <a class="hash" href="#form.data.emailaddress-mdl">#</a>
</h2>
<div class="content-models">
<div>
@@ -14900,7 +15049,7 @@
</div>
</div>
<div id="form.data.emailaddresslist-mdl" class="section">
- <h2 class="common-subhead">11.40. Emailaddresslist <a class="hash" href="#form.data.emailaddresslist-mdl">#</a>
+ <h2 class="common-subhead">11.41. Emailaddresslist <a class="hash" href="#form.data.emailaddresslist-mdl">#</a>
</h2>
<div class="content-models">
<div>
@@ -14911,7 +15060,7 @@
</div>
</div>
<div id="form.data.color-mdl" class="section">
- <h2 class="common-subhead">11.41. Color <a class="hash" href="#form.data.color-mdl">#</a>
+ <h2 class="common-subhead">11.42. Color <a class="hash" href="#form.data.color-mdl">#</a>
</h2>
<div class="content-models">
<div>
Index: elements.html
===================================================================
RCS file: /sources/public/html5/markup/elements.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- elements.html 29 Jun 2009 09:18:46 -0000 1.10
+++ elements.html 15 Jul 2009 07:02:11 -0000 1.11
@@ -206,6 +206,8 @@
</li>
<li id="meta.http-equiv.default-style-toc"><a href="meta.http-equiv.default-style.html#meta.http-equiv.default-style"><span class="element">meta</span> <span class="elem-qualifier"><span class="attribute-name">http-equiv</span>=<span class="equals-value">default-style</span></span> – <span class="shortdesc">“preferred stylesheet” pragma directive</span></a>
</li>
+<li id="meta.http-equiv.content-language-toc"><a href="meta.http-equiv.content-language.html#meta.http-equiv.content-language"><span class="element">meta</span> <span class="elem-qualifier"><span class="attribute-name">http-equiv</span>=<span class="equals-value">content-language</span></span> – <span class="shortdesc">"content-language" pragma directive</span></a>
+</li>
<li id="meta.charset-toc"><a href="meta.charset.html#meta.charset"><span class="element">meta</span> <span class="elem-qualifier"><span class="attribute-name">charset</span></span> – <span class="shortdesc">document character-encoding declaration</span></a>
</li>
<li id="meta.http-equiv.content-type-toc"><a href="meta.http-equiv.content-type.html#meta.http-equiv.content-type"><span class="element">meta</span> <span class="elem-qualifier"><span class="attribute-name">http-equiv</span>=<span class="equals-value">content-type</span></span> – <span class="shortdesc">document character-encoding declaration</span></a>
Index: meta.charset.html
===================================================================
RCS file: /sources/public/html5/markup/meta.charset.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- meta.charset.html 29 Jun 2009 09:18:48 -0000 1.8
+++ meta.charset.html 15 Jul 2009 07:02:11 -0000 1.9
@@ -8,7 +8,7 @@
<body>
<h2 class="chunkpagetitle"><a href="Overview.html">HTML5: The Markup Language</a></h2>
<div class="nav">
-<span class="nav-prev"><a href="meta.http-equiv.default-style.html">« meta.http-equiv.default-style</a></span>
+<span class="nav-prev"><a href="meta.http-equiv.content-language.html">« meta.http-equiv.content-language</a></span>
<span class="nav-next"><a href="meta.http-equiv.content-type.html">meta.http-equiv.content-type »</a></span>
</div>
<div id="meta.charset" class="section">
@@ -68,6 +68,7 @@
| <a class="ref" href="meta.name.html#meta.name">meta.name</a>
| <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
| <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
+ | <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
| (<a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
| <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
| <a class="ref" href="script.html#script">script</a>
@@ -76,7 +77,7 @@
</div></div>
<hr class="footerbreak"></hr>
<div class="nav">
-<span class="nav-prev"><a href="meta.http-equiv.default-style.html">« meta.http-equiv.default-style</a></span>
+<span class="nav-prev"><a href="meta.http-equiv.content-language.html">« meta.http-equiv.content-language</a></span>
<span class="nav-next"><a href="meta.http-equiv.content-type.html">meta.http-equiv.content-type »</a></span>
</div>
</body>
Received on Wednesday, 15 July 2009 07:03:26 UTC