- From: poot <cvsmail@w3.org>
- Date: Wed, 29 Jul 2009 10:57:53 +0900 (JST)
- To: public-html-diffs@w3.org
mike: make content models for <script>, <style>, <textarea>, and <title>
correct
http://dev.w3.org/cvsweb/html5/markup/Overview.html?r1=1.329&r2=1.330&f=h
===================================================================
RCS file: /sources/public/html5/markup/body.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- body.html 20 Jul 2009 23:15:30 -0000 1.9
+++ body.html 29 Jul 2009 01:57:04 -0000 1.10
@@ -22,7 +22,7 @@
<h2 class="element-subhead">Content model <a class="hash" href="#body-content">#</a></h2>
<div class="content-models" id="body-mdls">
<p class="elem-mdl"><span class="element-pattern-name"><a id="body-mdl" href="body.html#body-mdl" class="element">body</a> = </span><span>
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
& <a class="ref" href="body.html#body.attrs">body.attrs</a>
</span></p>
Index: legend.html
===================================================================
RCS file: /sources/public/html5/markup/legend.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- legend.html 20 Jul 2009 23:15:31 -0000 1.9
+++ legend.html 29 Jul 2009 01:57:05 -0000 1.10
@@ -23,7 +23,7 @@
<h2 class="element-subhead">Content model <a class="hash" href="#legend-content">#</a></h2>
<div class="content-models" id="legend-mdls">
<p class="elem-mdl"><span class="element-pattern-name"><a id="legend-mdl" href="legend.html#legend-mdl" class="element">legend</a> = </span><span>
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
& <a class="ref" href="legend.html#legend.attrs">legend.attrs</a>
</span></p>
@@ -48,16 +48,16 @@
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#legend-context">#</a></h2>
<ul>
<li class="context-mdl"><a href="figure.html#figure-mdl">figure</a> = (<a class="ref" href="legend.html#legend">legend</a>,
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*))
- | ((<a href="syntax.html#normal-character-data">normal character data</a>
+ | ((<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*),
<a class="ref" href="legend.html#legend">legend</a>?)</li>
<li class="context-mdl"><a href="fieldset.html#fieldset-mdl">fieldset</a> = <a class="ref" href="legend.html#legend">legend</a>?,
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)</li>
<li class="context-mdl"><a href="details.html#details-mdl">details</a> = <a class="ref" href="legend.html#legend">legend</a>,
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)</li></ul>
</div>
<div class="no-number no-toc" id="legend-display">
Index: address.html
===================================================================
RCS file: /sources/public/html5/markup/address.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- address.html 20 Jul 2009 23:15:30 -0000 1.9
+++ address.html 29 Jul 2009 01:57:04 -0000 1.10
@@ -25,7 +25,7 @@
<h2 class="element-subhead">Content model <a class="hash" href="#address-content">#</a></h2>
<div class="content-models" id="address-mdls">
<p class="elem-mdl"><span class="element-pattern-name"><a id="address-mdl" href="address.html#address-mdl" class="element">address</a> = </span><span>
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
& <a class="ref" href="address.html#address.attrs">address.attrs</a>
</span></p>
Index: th.html
===================================================================
RCS file: /sources/public/html5/markup/th.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- th.html 20 Jul 2009 23:15:32 -0000 1.9
+++ th.html 29 Jul 2009 01:57:06 -0000 1.10
@@ -21,7 +21,7 @@
<h2 class="element-subhead">Content model <a class="hash" href="#th-content">#</a></h2>
<div class="content-models" id="th-mdls">
<p class="elem-mdl"><span class="element-pattern-name"><a id="th-mdl" href="th.html#th-mdl" class="element">th</a> = </span><span>
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
& <a class="ref" href="th.html#th.attrs">th.attrs</a>
</span></p>
Index: bb.html
===================================================================
RCS file: /sources/public/html5/markup/bb.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- bb.html 20 Jul 2009 14:56:50 -0000 1.8
+++ bb.html 29 Jul 2009 01:57:04 -0000 1.9
@@ -21,7 +21,7 @@
<h2 class="element-subhead">Content model <a class="hash" href="#bb-content">#</a></h2>
<div class="content-models" id="bb-mdls">
<p class="elem-mdl"><span class="element-pattern-name"><a id="bb-mdl" href="bb.html#bb-mdl" class="element">bb</a> = </span><span>
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
& <a class="ref" href="bb.html#bb.attrs">bb.attrs</a>
</span></p>
Index: mark.html
===================================================================
RCS file: /sources/public/html5/markup/mark.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- mark.html 20 Jul 2009 14:56:52 -0000 1.8
+++ mark.html 29 Jul 2009 01:57:05 -0000 1.9
@@ -23,7 +23,7 @@
<h2 class="element-subhead">Content model <a class="hash" href="#mark-content">#</a></h2>
<div class="content-models" id="mark-mdls">
<p class="elem-mdl"><span class="element-pattern-name"><a id="mark-mdl" href="mark.html#mark-mdl" class="element">mark</a> = </span><span>
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
& <a class="ref" href="mark.html#mark.attrs">mark.attrs</a>
</span></p>
Index: Overview.html
===================================================================
RCS file: /sources/public/html5/markup/Overview.html,v
retrieving revision 1.329
retrieving revision 1.330
diff -u -d -r1.329 -r1.330
--- Overview.html 21 Jul 2009 08:27:44 -0000 1.329
+++ Overview.html 29 Jul 2009 01:57:02 -0000 1.330
@@ -9,7 +9,7 @@
<body>
<div class="head">
<h1>HTML 5: The Markup Language</h1>
-<h2>Editor’s Draft <em>21 July 2009</em>
+<h2>Editor’s Draft <em>29 July 2009</em>
</h2>
<dl>
<dt>Latest Editor’s Draft:</dt>
@@ -42,7 +42,7 @@
<p>
- This document is the 21 July 2009 Editor’s Draft of
+ This document is the 29 July 2009 Editor’s Draft of
<cite>HTML 5: The Markup Language</cite>.
</p>
<p>
@@ -626,17 +626,14 @@
<li id="common-models-toc">
<a href="common-models.html#common-models">8. Common content models</a>
<ul>
-<li id="common-anything-toc">
-<a href="common-models.html#common-anything">8.1. Any element from any namespace</a>
-</li>
<li id="common-flow-toc">
-<a href="common-models.html#common-flow">8.2. Flow elements</a>
+<a href="common-models.html#common-flow">8.1. Flow elements</a>
</li>
<li id="common-metadata-toc">
-<a href="common-models.html#common-metadata">8.3. Metadata elements</a>
+<a href="common-models.html#common-metadata">8.2. Metadata elements</a>
</li>
<li id="common-phrasing-toc">
-<a href="common-models.html#common-phrasing">8.4. Phrasing elements</a>
+<a href="common-models.html#common-phrasing">8.3. Phrasing elements</a>
</li>
</ul>
</li>
Index: iframe.html
===================================================================
RCS file: /sources/public/html5/markup/iframe.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- iframe.html 21 Jul 2009 07:45:08 -0000 1.12
+++ iframe.html 29 Jul 2009 01:57:05 -0000 1.13
@@ -21,7 +21,7 @@
<h2 class="element-subhead">Content model <a class="hash" href="#iframe-content">#</a></h2>
<div class="content-models" id="iframe-mdls">
<p class="elem-mdl"><span class="element-pattern-name"><a id="iframe-mdl" href="iframe.html#iframe-mdl" class="element">iframe</a> = </span><span>
- normal character data
+ normal-character-data
& <a class="ref" href="iframe.html#iframe.attrs">iframe.attrs</a>
</span></p>
</div>
Index: datagrid.html
===================================================================
RCS file: /sources/public/html5/markup/datagrid.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- datagrid.html 20 Jul 2009 23:15:31 -0000 1.12
+++ datagrid.html 29 Jul 2009 01:57:04 -0000 1.13
@@ -22,7 +22,7 @@
<h2 class="element-subhead">Content model <a class="hash" href="#datagrid-content">#</a></h2>
<div class="content-models" id="datagrid-mdls">
<p class="elem-mdl"><span class="element-pattern-name"><a id="datagrid-mdl" href="datagrid.html#datagrid-mdl" class="element">datagrid</a> = </span><span>
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
& <a class="ref" href="datagrid.html#datagrid.attrs">datagrid.attrs</a>
</span></p>
Index: ins.html
===================================================================
RCS file: /sources/public/html5/markup/ins.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- ins.html 20 Jul 2009 23:15:31 -0000 1.12
+++ ins.html 29 Jul 2009 01:57:05 -0000 1.13
@@ -23,13 +23,13 @@
<dl class="content-models" id="ins-mdls">
<dt class="content-model"><span class="element-pattern-name" id="ins.elem.flow"><a class="hash" href="ins.html#ins.elem.flow"><span class="element">ins</span>.elem.flow</a> = </span></dt>
<dd class="elem-mdl"><span>
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
& <a class="ref" href="ins.html#ins.attrs">ins.attrs</a>
</span></dd>
<dt class="content-model"><span class="element-pattern-name" id="ins.elem.phrasing"><a class="hash" href="ins.html#ins.elem.phrasing"><span class="element">ins</span>.elem.phrasing</a> = </span></dt>
<dd class="elem-mdl"><span>
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
& <a class="ref" href="ins.html#ins.attrs">ins.attrs</a>
</span></dd>
Index: abbr.html
===================================================================
RCS file: /sources/public/html5/markup/abbr.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- abbr.html 20 Jul 2009 14:56:49 -0000 1.8
+++ abbr.html 29 Jul 2009 01:57:04 -0000 1.9
@@ -25,7 +25,7 @@
<h2 class="element-subhead">Content model <a class="hash" href="#abbr-content">#</a></h2>
<div class="content-models" id="abbr-mdls">
<p class="elem-mdl"><span class="element-pattern-name"><a id="abbr-mdl" href="abbr.html#abbr-mdl" class="element">abbr</a> = </span><span>
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
& <a class="ref" href="abbr.html#abbr.attrs">abbr.attrs</a>
</span></p>
Index: div.html
===================================================================
RCS file: /sources/public/html5/markup/div.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- div.html 20 Jul 2009 23:15:31 -0000 1.9
+++ div.html 29 Jul 2009 01:57:04 -0000 1.10
@@ -29,7 +29,7 @@
<div class="content-models" id="div-mdls">
<p class="elem-mdl"><span class="element-pattern-name"><a id="div-mdl" href="div.html#div-mdl" class="element">div</a> = </span><span>
<a class="ref" href="style.html#style.elem.scoped">style.elem.scoped</a>*,
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
& <a class="ref" href="div.html#div.attrs">div.attrs</a>
</span></p>
Index: dt.html
===================================================================
RCS file: /sources/public/html5/markup/dt.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- dt.html 20 Jul 2009 23:15:31 -0000 1.9
+++ dt.html 29 Jul 2009 01:57:04 -0000 1.10
@@ -29,7 +29,7 @@
<h2 class="element-subhead">Content model <a class="hash" href="#dt-content">#</a></h2>
<div class="content-models" id="dt-mdls">
<p class="elem-mdl"><span class="element-pattern-name"><a id="dt-mdl" href="dt.html#dt-mdl" class="element">dt</a> = </span><span>
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
& <a class="ref" href="dt.html#dt.attrs">dt.attrs</a>
</span></p>
Index: nav.html
===================================================================
RCS file: /sources/public/html5/markup/nav.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- nav.html 20 Jul 2009 14:56:53 -0000 1.10
+++ nav.html 29 Jul 2009 01:57:05 -0000 1.11
@@ -23,7 +23,7 @@
<h2 class="element-subhead">Content model <a class="hash" href="#nav-content">#</a></h2>
<div class="content-models" id="nav-mdls">
<p class="elem-mdl"><span class="element-pattern-name"><a id="nav-mdl" href="nav.html#nav-mdl" class="element">nav</a> = </span><span>
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
& <a class="ref" href="nav.html#nav.attrs">nav.attrs</a>
</span></p>
Index: canvas.html
===================================================================
RCS file: /sources/public/html5/markup/canvas.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- canvas.html 20 Jul 2009 14:56:50 -0000 1.8
+++ canvas.html 29 Jul 2009 01:57:04 -0000 1.9
@@ -24,13 +24,13 @@
<dl class="content-models" id="canvas-mdls">
<dt class="content-model"><span class="element-pattern-name" id="canvas.elem.flow"><a class="hash" href="canvas.html#canvas.elem.flow"><span class="element">canvas</span>.elem.flow</a> = </span></dt>
<dd class="elem-mdl"><span>
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
& <a class="ref" href="canvas.html#canvas.attrs">canvas.attrs</a>
</span></dd>
<dt class="content-model"><span class="element-pattern-name" id="canvas.elem.phrasing"><a class="hash" href="canvas.html#canvas.elem.phrasing"><span class="element">canvas</span>.elem.phrasing</a> = </span></dt>
<dd class="elem-mdl"><span>
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
& <a class="ref" href="canvas.html#canvas.attrs">canvas.attrs</a>
</span></dd>
Index: footer.html
===================================================================
RCS file: /sources/public/html5/markup/footer.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- footer.html 20 Jul 2009 14:56:51 -0000 1.10
+++ footer.html 29 Jul 2009 01:57:05 -0000 1.11
@@ -21,7 +21,7 @@
<h2 class="element-subhead">Content model <a class="hash" href="#footer-content">#</a></h2>
<div class="content-models" id="footer-mdls">
<p class="elem-mdl"><span class="element-pattern-name"><a id="footer-mdl" href="footer.html#footer-mdl" class="element">footer</a> = </span><span>
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
& <a class="ref" href="footer.html#footer.attrs">footer.attrs</a>
</span></p>
Index: script.html
===================================================================
RCS file: /sources/public/html5/markup/script.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- script.html 21 Jul 2009 05:46:29 -0000 1.12
+++ script.html 29 Jul 2009 01:57:06 -0000 1.13
@@ -23,8 +23,7 @@
<dl class="content-models" id="script-mdls">
<dt class="content-model"><span class="element-pattern-name" id="script.elem.embedded"><a class="hash" href="script.html#script.elem.embedded"><span class="element">script</span>.elem.embedded</a> = </span></dt>
<dd class="elem-mdl"><span>
- (<a href="syntax.html#normal-character-data">normal character data</a>
- & <a class="ref" href="common-models.html#common.elem.anything">common.elem.anything</a>*)
+ <a class="ref" href="syntax.html#non-replaceable-character-data">non-replaceable-character-data</a>
& <a class="ref" href="script.html#script.attrs.embedded" title="script.attrs.embedded">script.attrs.embedded</a>
</span></dd>
<dt class="content-model"><span class="element-pattern-name" id="script.elem.imported"><a class="hash" href="script.html#script.elem.imported"><span class="element">script</span>.elem.imported</a> = </span></dt>
Index: audio.html
===================================================================
RCS file: /sources/public/html5/markup/audio.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- audio.html 20 Jul 2009 14:56:49 -0000 1.10
+++ audio.html 29 Jul 2009 01:57:04 -0000 1.11
@@ -24,7 +24,7 @@
<dd class="elem-mdl"><span>
(<a class="ref" href="audio.html#audio.attrs.src">audio.attrs.src</a>
| <a class="ref" href=".html#source-pattern">source</a>*),
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
& <a class="ref" href="audio.html#audio.attrs">audio.attrs</a>
</span></dd>
@@ -32,7 +32,7 @@
<dd class="elem-mdl"><span>
(<a class="ref" href="audio.html#audio.attrs.src">audio.attrs.src</a>
| <a class="ref" href=".html#source-pattern">source</a>*),
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
& <a class="ref" href="audio.html#audio.attrs">audio.attrs</a>
</span></dd>
Index: time.html
===================================================================
RCS file: /sources/public/html5/markup/time.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- time.html 20 Jul 2009 14:56:54 -0000 1.8
+++ time.html 29 Jul 2009 01:57:06 -0000 1.9
@@ -21,7 +21,7 @@
<h2 class="element-subhead">Content model <a class="hash" href="#time-content">#</a></h2>
<div class="content-models" id="time-mdls">
<p class="elem-mdl"><span class="element-pattern-name"><a id="time-mdl" href="time.html#time-mdl" class="element">time</a> = </span><span>
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
& <a class="ref" href="time.html#time.attrs">time.attrs</a>
</span></p>
Index: progress.html
===================================================================
RCS file: /sources/public/html5/markup/progress.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- progress.html 20 Jul 2009 14:56:53 -0000 1.8
+++ progress.html 29 Jul 2009 01:57:06 -0000 1.9
@@ -21,7 +21,7 @@
<h2 class="element-subhead">Content model <a class="hash" href="#progress-content">#</a></h2>
<div class="content-models" id="progress-mdls">
<p class="elem-mdl"><span class="element-pattern-name"><a id="progress-mdl" href="progress.html#progress-mdl" class="element">progress</a> = </span><span>
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
& <a class="ref" href="progress.html#progress.attrs">progress.attrs</a>
</span></p>
Index: dfn.html
===================================================================
RCS file: /sources/public/html5/markup/dfn.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- dfn.html 20 Jul 2009 14:56:50 -0000 1.8
+++ dfn.html 29 Jul 2009 01:57:04 -0000 1.9
@@ -21,7 +21,7 @@
<h2 class="element-subhead">Content model <a class="hash" href="#dfn-content">#</a></h2>
<div class="content-models" id="dfn-mdls">
<p class="elem-mdl"><span class="element-pattern-name"><a id="dfn-mdl" href="dfn.html#dfn-mdl" class="element">dfn</a> = </span><span>
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
& <a class="ref" href="dfn.html#dfn.attrs">dfn.attrs</a>
</span></p>
Index: schema.html
===================================================================
RCS file: /sources/public/html5/markup/schema.html,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -d -r1.109 -r1.110
--- schema.html 21 Jul 2009 07:07:23 -0000 1.109
+++ schema.html 29 Jul 2009 01:57:06 -0000 1.110
@@ -86,7 +86,7 @@
"http://whattf.org/datatype-draft"</div> -->
<div class='chunk'>
<div class='chunk'>
-<div class='define' id='common.attr.anything-define'>
+<div class='define' id='replaceable-character-data-define'>
<span class='comment'># #####################################################################</span>
<span class='comment'># (This only affects mixed-version modules; wholly HTML5</span>
@@ -95,34 +95,16 @@
<span class='comment'># (xml:base on elements other than <html>)</span>
<span class='comment'># #####################################################################</span>
-
-<span class='comment'>## Wildcards #</span>
-<span class='comment'># #####################################################################</span>
-<span class='comment'>## Any attribute from any namespace</span>
- <div class='patternname' id='the-common.attr.anything'><a href='#the-common.attr.anything'>common.attr.anything</a> =</div>
- <span class='pattern' id='common.attr.anything'><span class='type'>attribute </span>
- <span class='name'>*</span>
- {<span class='model'> text </span>}
- *</span>
-</div>
-<div class='define' id='common.elem.anything-define'>
-
-<span class='comment'>## Any element from any namespace</span>
- <div class='patternname' id='the-common.elem.anything'><a href='#the-common.elem.anything'>common.elem.anything</a> =</div>
- <span class='pattern' id='common.elem.anything'><span class='type'>element </span>
- <span class='name'>*</span>
- {<span class='model'>
- <a class='ref' href='#common.inner.anything'>common.inner.anything</a>
- & <a class='ref' href='#common.attr.anything'>common.attr.anything</a>
- </span>}
- </span>
+ <div class='patternname' id='the-replaceable-character-data'><a href='#the-replaceable-character-data'>replaceable-character-data</a> =</div>
+ <span class='pattern' id='replaceable-character-data'>xsd:string {
+ pattern = ".*"
+ }</span>
</div>
-<div class='define' id='common.inner.anything-define'>
-
-<span class='comment'>## Any content from any namespace</span>
- <div class='patternname' id='the-common.inner.anything'><a href='#the-common.inner.anything'>common.inner.anything</a> =</div>
- <span class='pattern' id='common.inner.anything'>text
- & <a class='ref' href='#common.elem.anything'>common.elem.anything</a>*</span>
+<div class='define' id='non-replaceable-character-data-define'>
+ <div class='patternname' id='the-non-replaceable-character-data'><a href='#the-non-replaceable-character-data'>non-replaceable-character-data</a> =</div>
+ <span class='pattern' id='non-replaceable-character-data'>xsd:string {
+ pattern = ".*"
+ }</span>
</div>
<div class='define' id='common.elem.metadata-define'>
<span class='comment'># #####################################################################</span>
@@ -715,7 +697,8 @@
<span class='pattern' id='title.elem'><span class='type'>element </span>
<span class='name'>title</span>
{<span class='model'>
- text & <a class='ref' href='#title.attrs'>title.attrs</a>
+ <a class='ref' href='#title.inner'>title.inner</a>
+ & <a class='ref' href='#title.attrs'>title.attrs</a>
</span>}
</span>
</div>
@@ -723,6 +706,10 @@
<div class='patternname' id='the-title.attrs'><a href='#the-title.attrs'>title.attrs</a> =</div>
<span class='pattern' id='title.attrs'><a class='ref' href='#common.attrs'>common.attrs</a></span>
</div>
+<div class='define' id='title.inner-define'>
+ <div class='patternname' id='the-title.inner'><a href='#the-title.inner'>title.inner</a> =</div>
+ <span class='pattern' id='title.inner'><a class='ref' href='#replaceable-character-data'>replaceable-character-data</a></span>
+</div>
<div class='define' id='base.elem-define'>
<span class='comment'>## Base URI: <base></span>
@@ -831,7 +818,7 @@
</div>
<div class='define' id='style.inner-define'>
<div class='patternname' id='the-style.inner'><a href='#the-style.inner'>style.inner</a> =</div>
- <span class='pattern' id='style.inner'><a class='ref' href='#common.inner.anything'>common.inner.anything</a></span>
+ <span class='pattern' id='style.inner'><a class='ref' href='#non-replaceable-character-data'>non-replaceable-character-data</a></span>
</div>
<div class='define' id='style.elem.scoped-define'>
@@ -2927,7 +2914,7 @@
</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>
+ <span class='pattern' id='script.inner.embedded'><a class='ref' href='#non-replaceable-character-data'>non-replaceable-character-data</a></span>
</div>
<div class='define' id='script.elem-define'>
<div class='patternname' id='the-script.elem'><a href='#the-script.elem'>script.elem</a> =</div>
@@ -4598,7 +4585,7 @@
<span class='pattern' id='textarea.elem'><span class='type'>element </span>
<span class='name'>textarea</span>
{<span class='model'>
- text
+ <a class='ref' href='#textarea.inner'>textarea.inner</a>
& <a class='ref' href='#textarea.attrs'>textarea.attrs</a>
</span>}
</span>
@@ -4638,6 +4625,10 @@
</span>}
</span>
</div>
+<div class='define' id='textarea.inner-define'>
+ <div class='patternname' id='the-textarea.inner'><a href='#the-textarea.inner'>textarea.inner</a> =</div>
+ <span class='pattern' id='textarea.inner'><a class='ref' href='#replaceable-character-data'>replaceable-character-data</a></span>
+</div>
<div class='define' id='option.elem-define'>
<span class='comment'># Due to limitations with interleave, handling single/multiple selection</span>
<span class='comment'># enforcement in RELAX NG seems to be possible but really awkward.</span>
Index: textarea.html
===================================================================
RCS file: /sources/public/html5/markup/textarea.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- textarea.html 20 Jul 2009 14:56:54 -0000 1.8
+++ textarea.html 29 Jul 2009 01:57:06 -0000 1.9
@@ -23,7 +23,7 @@
<h2 class="element-subhead">Content model <a class="hash" href="#textarea-content">#</a></h2>
<div class="content-models" id="textarea-mdls">
<p class="elem-mdl"><span class="element-pattern-name"><a id="textarea-mdl" href="textarea.html#textarea-mdl" class="element">textarea</a> = </span><span>
- normal character data
+ <a class="ref" href="syntax.html#replaceable-character-data">replaceable-character-data</a>
& <a class="ref" href="textarea.html#textarea.attrs">textarea.attrs</a>
</span></p>
</div>
Index: cite.html
===================================================================
RCS file: /sources/public/html5/markup/cite.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- cite.html 20 Jul 2009 23:15:30 -0000 1.9
+++ cite.html 29 Jul 2009 01:57:04 -0000 1.10
@@ -23,7 +23,7 @@
<h2 class="element-subhead">Content model <a class="hash" href="#cite-content">#</a></h2>
<div class="content-models" id="cite-mdls">
<p class="elem-mdl"><span class="element-pattern-name"><a id="cite-mdl" href="cite.html#cite-mdl" class="element">cite</a> = </span><span>
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
& <a class="ref" href="cite.html#cite.attrs">cite.attrs</a>
</span></p>
Index: meter.html
===================================================================
RCS file: /sources/public/html5/markup/meter.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- meter.html 20 Jul 2009 14:56:53 -0000 1.8
+++ meter.html 29 Jul 2009 01:57:05 -0000 1.9
@@ -22,7 +22,7 @@
<h2 class="element-subhead">Content model <a class="hash" href="#meter-content">#</a></h2>
<div class="content-models" id="meter-mdls">
<p class="elem-mdl"><span class="element-pattern-name"><a id="meter-mdl" href="meter.html#meter-mdl" class="element">meter</a> = </span><span>
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
& <a class="ref" href="meter.html#meter.attrs">meter.attrs</a>
</span></p>
Index: aside.html
===================================================================
RCS file: /sources/public/html5/markup/aside.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- aside.html 20 Jul 2009 14:56:49 -0000 1.10
+++ aside.html 29 Jul 2009 01:57:04 -0000 1.11
@@ -25,7 +25,7 @@
<div class="content-models" id="aside-mdls">
<p class="elem-mdl"><span class="element-pattern-name"><a id="aside-mdl" href="aside.html#aside-mdl" class="element">aside</a> = </span><span>
<a class="ref" href="style.html#style-pattern">style</a>*,
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
& <a class="ref" href="aside.html#aside.attrs">aside.attrs</a>
</span></p>
Index: section.html
===================================================================
RCS file: /sources/public/html5/markup/section.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- section.html 20 Jul 2009 14:56:53 -0000 1.12
+++ section.html 29 Jul 2009 01:57:06 -0000 1.13
@@ -23,7 +23,7 @@
<div class="content-models" id="section-mdls">
<p class="elem-mdl"><span class="element-pattern-name"><a id="section-mdl" href="section.html#section-mdl" class="element">section</a> = </span><span>
<a class="ref" href="style.html#style.elem.scoped">style.elem.scoped</a>*,
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
& <a class="ref" href="section.html#section.attrs">section.attrs</a>
</span></p>
Index: area.html
===================================================================
RCS file: /sources/public/html5/markup/area.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- area.html 20 Jul 2009 23:15:30 -0000 1.9
+++ area.html 29 Jul 2009 01:57:04 -0000 1.10
@@ -51,7 +51,7 @@
<h2 class="element-subhead">Element-specific attributes <a class="hash" href="#area-attributes">#</a></h2>
<dl class="attr-defs">
<dt><a class="attribute-name" id="area.attrs.alt" title="area.attrs.alt" href="area.html#area.attrs.alt">alt</a><span class="attr-values"> =
- <a href="syntax.html#normal-character-data">normal character data</a>
+ <a href="syntax.html#normal-character-data">normal-character-data</a>
</span> </dt>
<dd>The text of the hyperlink.</dd>
Index: samp.html
===================================================================
RCS file: /sources/public/html5/markup/samp.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- samp.html 20 Jul 2009 23:15:32 -0000 1.9
+++ samp.html 29 Jul 2009 01:57:06 -0000 1.10
@@ -22,7 +22,7 @@
<h2 class="element-subhead">Content model <a class="hash" href="#samp-content">#</a></h2>
<div class="content-models" id="samp-mdls">
<p class="elem-mdl"><span class="element-pattern-name"><a id="samp-mdl" href="samp.html#samp-mdl" class="element">samp</a> = </span><span>
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
& <a class="ref" href="samp.html#samp.attrs">samp.attrs</a>
</span></p>
Index: h6.html
===================================================================
RCS file: /sources/public/html5/markup/h6.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- h6.html 20 Jul 2009 23:15:31 -0000 1.11
+++ h6.html 29 Jul 2009 01:57:05 -0000 1.12
@@ -21,7 +21,7 @@
<h2 class="element-subhead">Content model <a class="hash" href="#h6-content">#</a></h2>
<div class="content-models" id="h6-mdls">
<p class="elem-mdl"><span class="element-pattern-name"><a id="h6-mdl" href="h6.html#h6-mdl" class="element">h6</a> = </span><span>
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
& <a class="ref" href="h6.html#h6.attrs">h6.attrs</a>
</span></p>
Index: a.html
===================================================================
RCS file: /sources/public/html5/markup/a.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- a.html 21 Jul 2009 00:22:24 -0000 1.11
+++ a.html 29 Jul 2009 01:57:03 -0000 1.12
@@ -29,13 +29,13 @@
<dl class="content-models" id="a-mdls">
<dt class="content-model"><span class="element-pattern-name" id="a.elem.phrasing"><a class="hash" href="a.html#a.elem.phrasing"><span class="element">a</span>.elem.phrasing</a> = </span></dt>
<dd class="elem-mdl"><span>
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
& <a class="ref" href="a.html#a.attrs">a.attrs</a>
</span></dd>
<dt class="content-model"><span class="element-pattern-name" id="a.elem.flow"><a class="hash" href="a.html#a.elem.flow"><span class="element">a</span>.elem.flow</a> = </span></dt>
<dd class="elem-mdl"><span>
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
& <a class="ref" href="a.html#a.attrs">a.attrs</a>
</span></dd>
Index: object.html
===================================================================
RCS file: /sources/public/html5/markup/object.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- object.html 20 Jul 2009 14:56:53 -0000 1.10
+++ object.html 29 Jul 2009 01:57:05 -0000 1.11
@@ -26,14 +26,14 @@
<dt class="content-model"><span class="element-pattern-name" id="object.elem.flow"><a class="hash" href="object.html#object.elem.flow"><span class="element">object</span>.elem.flow</a> = </span></dt>
<dd class="elem-mdl"><span>
<a class="ref" href="param.html#param">param</a>*,
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
& <a class="ref" href="object.html#object.attrs">object.attrs</a>
</span></dd>
<dt class="content-model"><span class="element-pattern-name" id="object.elem.phrasing"><a class="hash" href="object.html#object.elem.phrasing"><span class="element">object</span>.elem.phrasing</a> = </span></dt>
<dd class="elem-mdl"><span>
<a class="ref" href="param.html#param">param</a>*,
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
& <a class="ref" href="object.html#object.attrs">object.attrs</a>
</span></dd>
Index: h4.html
===================================================================
RCS file: /sources/public/html5/markup/h4.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- h4.html 20 Jul 2009 23:15:31 -0000 1.11
+++ h4.html 29 Jul 2009 01:57:05 -0000 1.12
@@ -21,7 +21,7 @@
<h2 class="element-subhead">Content model <a class="hash" href="#h4-content">#</a></h2>
<div class="content-models" id="h4-mdls">
<p class="elem-mdl"><span class="element-pattern-name"><a id="h4-mdl" href="h4.html#h4-mdl" class="element">h4</a> = </span><span>
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
& <a class="ref" href="h4.html#h4.attrs">h4.attrs</a>
</span></p>
Index: header.html
===================================================================
RCS file: /sources/public/html5/markup/header.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- header.html 20 Jul 2009 14:56:51 -0000 1.10
+++ header.html 29 Jul 2009 01:57:05 -0000 1.11
@@ -21,7 +21,7 @@
<h2 class="element-subhead">Content model <a class="hash" href="#header-content">#</a></h2>
<div class="content-models" id="header-mdls">
<p class="elem-mdl"><span class="element-pattern-name"><a id="header-mdl" href="header.html#header-mdl" class="element">header</a> = </span><span>
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
& <a class="ref" href="header.html#header.attrs">header.attrs</a>
</span></p>
Index: b.html
===================================================================
RCS file: /sources/public/html5/markup/b.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- b.html 20 Jul 2009 23:15:30 -0000 1.9
+++ b.html 29 Jul 2009 01:57:04 -0000 1.10
@@ -24,7 +24,7 @@
<h2 class="element-subhead">Content model <a class="hash" href="#b-content">#</a></h2>
<div class="content-models" id="b-mdls">
<p class="elem-mdl"><span class="element-pattern-name"><a id="b-mdl" href="b.html#b-mdl" class="element">b</a> = </span><span>
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
& <a class="ref" href="b.html#b.attrs">b.attrs</a>
</span></p>
Index: img.html
===================================================================
RCS file: /sources/public/html5/markup/img.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- img.html 21 Jul 2009 01:45:09 -0000 1.11
+++ img.html 29 Jul 2009 01:57:05 -0000 1.12
@@ -46,7 +46,7 @@
scripted.</dd>
<dt><a class="attribute-name" id="img.attrs.alt" title="img.attrs.alt" href="img.html#img.attrs.alt">alt</a><span class="attr-values"> =
- <a href="syntax.html#normal-character-data">normal character data</a>
+ <a href="syntax.html#normal-character-data">normal-character-data</a>
</span> </dt>
<dd>The <a href="terminology.html#fallback">fallback content</a> for the
image.</dd>
Index: bdo.html
===================================================================
RCS file: /sources/public/html5/markup/bdo.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- bdo.html 20 Jul 2009 14:56:50 -0000 1.8
+++ bdo.html 29 Jul 2009 01:57:04 -0000 1.9
@@ -22,7 +22,7 @@
<h2 class="element-subhead">Content model <a class="hash" href="#bdo-content">#</a></h2>
<div class="content-models" id="bdo-mdls">
<p class="elem-mdl"><span class="element-pattern-name"><a id="bdo-mdl" href="bdo.html#bdo-mdl" class="element">bdo</a> = </span><span>
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
& <a class="ref" href="bdo.html#bdo.attrs">bdo.attrs</a>
</span></p>
Index: dd.html
===================================================================
RCS file: /sources/public/html5/markup/dd.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- dd.html 20 Jul 2009 23:15:31 -0000 1.9
+++ dd.html 29 Jul 2009 01:57:04 -0000 1.10
@@ -29,7 +29,7 @@
<h2 class="element-subhead">Content model <a class="hash" href="#dd-content">#</a></h2>
<div class="content-models" id="dd-mdls">
<p class="elem-mdl"><span class="element-pattern-name"><a id="dd-mdl" href="dd.html#dd-mdl" class="element">dd</a> = </span><span>
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
& <a class="ref" href="dd.html#dd.attrs">dd.attrs</a>
</span></p>
Index: common-models.html
===================================================================
RCS file: /sources/public/html5/markup/common-models.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- common-models.html 20 Jul 2009 14:56:50 -0000 1.12
+++ common-models.html 29 Jul 2009 01:57:04 -0000 1.13
@@ -13,16 +13,8 @@
</div>
<div id="common-models" class="section">
<h2>8. Common content models <a class="hash" href="#common-models">#</a> <a class="toc-bak" href="Overview.html#common-models-toc">T</a></h2>
- <div id="common-anything" class="section">
- <h2 class="common-subhead">8.1. Any element from any namespace <a class="hash" href="#common-anything">#</a> <a class="toc-bak" href="Overview.html#common-anything-toc">T</a></h2>
- <dl class="content-models">
- <dt class="content-model"><span class="common-pattern-name"><dfn id="common.elem.anything">common.elem.anything</dfn></span> = <a class="hash" href="common-models.html#common.elem.anything">#</a></dt>
- <dd><span class="attr-prose-desc">any element from any namespace</span>
- </dd>
- </dl>
- </div>
<div id="common-flow" class="section">
- <h2 class="common-subhead">8.2. Flow elements <a class="hash" href="#common-flow">#</a> <a class="toc-bak" href="Overview.html#common-flow-toc">T</a></h2>
+ <h2 class="common-subhead">8.1. Flow elements <a class="hash" href="#common-flow">#</a> <a class="toc-bak" href="Overview.html#common-flow-toc">T</a></h2>
<dl class="content-models">
<dt class="content-model"><span class="common-pattern-name"><dfn id="common.elem.flow">common.elem.flow</dfn></span> = <a class="hash" href="common-models.html#common.elem.flow">#</a></dt>
<dd><a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>
@@ -69,7 +61,7 @@
</dl>
</div>
<div id="common-metadata" class="section">
- <h2 class="common-subhead">8.3. Metadata elements <a class="hash" href="#common-metadata">#</a> <a class="toc-bak" href="Overview.html#common-metadata-toc">T</a></h2>
+ <h2 class="common-subhead">8.2. Metadata elements <a class="hash" href="#common-metadata">#</a> <a class="toc-bak" href="Overview.html#common-metadata-toc">T</a></h2>
<dl class="content-models">
<dt class="content-model"><span class="common-pattern-name"><dfn id="common.elem.metadata">common.elem.metadata</dfn></span> = <a class="hash" href="common-models.html#common.elem.metadata">#</a></dt>
<dd><a class="ref" href="link.html#link">link</a>
@@ -87,7 +79,7 @@
</dl>
</div>
<div id="common-phrasing" class="section">
- <h2 class="common-subhead">8.4. Phrasing elements <a class="hash" href="#common-phrasing">#</a> <a class="toc-bak" href="Overview.html#common-phrasing-toc">T</a></h2>
+ <h2 class="common-subhead">8.3. Phrasing elements <a class="hash" href="#common-phrasing">#</a> <a class="toc-bak" href="Overview.html#common-phrasing-toc">T</a></h2>
<dl class="content-models">
<dt class="content-model"><span class="common-pattern-name"><dfn id="common.elem.phrasing">common.elem.phrasing</dfn></span> = <a class="hash" href="common-models.html#common.elem.phrasing">#</a></dt>
<dd><a class="ref" href="a.html#a.elem.phrasing">a.elem.phrasing</a>
Index: strong.html
===================================================================
RCS file: /sources/public/html5/markup/strong.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- strong.html 20 Jul 2009 23:15:32 -0000 1.9
+++ strong.html 29 Jul 2009 01:57:06 -0000 1.10
@@ -21,7 +21,7 @@
<h2 class="element-subhead">Content model <a class="hash" href="#strong-content">#</a></h2>
<div class="content-models" id="strong-mdls">
<p class="elem-mdl"><span class="element-pattern-name"><a id="strong-mdl" href="strong.html#strong-mdl" class="element">strong</a> = </span><span>
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
& <a class="ref" href="strong.html#strong.attrs">strong.attrs</a>
</span></p>
Index: li.html
===================================================================
RCS file: /sources/public/html5/markup/li.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- li.html 20 Jul 2009 23:15:31 -0000 1.10
+++ li.html 29 Jul 2009 01:57:05 -0000 1.11
@@ -22,19 +22,19 @@
<dl class="content-models" id="li-mdls">
<dt class="content-model"><span class="element-pattern-name" id="li-pattern"><a class="hash" href="li.html#li-pattern"><span class="element">li</span></a> = </span></dt>
<dd class="elem-mdl"><span>
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
& <a class="ref" href="li.html#li.attrs">li.attrs</a>
</span></dd>
<dt class="content-model"><span class="element-pattern-name" id="oli"><a class="hash" href="li.html#oli">o<span class="element">li</span></a> = </span></dt>
<dd class="elem-mdl"><span>
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
& <a class="ref" href="li.html#oli.attrs">oli.attrs</a>
</span></dd>
<dt class="content-model"><span class="element-pattern-name" id="mli"><a class="hash" href="li.html#mli">m<span class="element">li</span></a> = </span></dt>
<dd class="elem-mdl"><span>
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
& <a class="ref" href="li.html#mli.attrs">mli.attrs</a>
</span></dd>
@@ -72,7 +72,7 @@
<li class="context-mdl"><a href="ul.html#ul-mdl">ul</a> = <a class="ref" href="li.html#li-pattern">li</a>*</li>
<li class="context-mdl"><a href="ol.html#ol-mdl">ol</a> = <a class="ref" href="li.html#oli">oli</a>*</li>
<li class="context-mdl"><a href="menu.html#menu-mdl">menu</a> = <a class="ref" href="li.html#mli">mli</a>*
- | (<a href="syntax.html#normal-character-data">normal character data</a>
+ | (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)</li></ul>
</div>
<div class="no-number no-toc" id="li-display">
Index: style.html
===================================================================
RCS file: /sources/public/html5/markup/style.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- style.html 20 Jul 2009 23:15:32 -0000 1.10
+++ style.html 29 Jul 2009 01:57:06 -0000 1.11
@@ -23,14 +23,12 @@
<dl class="content-models" id="style-mdls">
<dt class="content-model"><span class="element-pattern-name" id="style-pattern"><a class="hash" href="style.html#style-pattern"><span class="element">style</span></a> = </span></dt>
<dd class="elem-mdl"><span>
- (<a href="syntax.html#normal-character-data">normal character data</a>
- & <a class="ref" href="common-models.html#common.elem.anything">common.elem.anything</a>*)
+ <a class="ref" href="syntax.html#non-replaceable-character-data">non-replaceable-character-data</a>
& <a class="ref" href="style.html#style.attrs">style.attrs</a>
</span></dd>
<dt class="content-model"><span class="element-pattern-name" id="style.elem.scoped"><a class="hash" href="style.html#style.elem.scoped"><span class="element">style</span>.elem.scoped</a> = </span></dt>
<dd class="elem-mdl"><span>
- (<a href="syntax.html#normal-character-data">normal character data</a>
- & <a class="ref" href="common-models.html#common.elem.anything">common.elem.anything</a>*)
+ <a class="ref" href="syntax.html#non-replaceable-character-data">non-replaceable-character-data</a>
& <a class="ref" href="style.html#style.scoped.attrs">style.scoped.attrs</a>
</span></dd>
</dl>
@@ -91,20 +89,20 @@
| <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a>
| (<a class="ref" href="command.html#command">command</a>)</li>
<li class="context-mdl"><a href="div.html#div-mdl">div</a> = <a class="ref" href="style.html#style.elem.scoped">style.elem.scoped</a>*,
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)</li>
<li class="context-mdl"><a href="noscript.html#noscript.elem.head">noscript.elem.head</a> = (<a class="ref" href="link.html#link">link</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.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
| <a class="ref" href="style.html#style-pattern">style</a>)*</li>
<li class="context-mdl"><a href="section.html#section-mdl">section</a> = <a class="ref" href="style.html#style.elem.scoped">style.elem.scoped</a>*,
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)</li>
<li class="context-mdl"><a href="article.html#article-mdl">article</a> = <a class="ref" href="style.html#style-pattern">style</a>*,
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)</li>
<li class="context-mdl"><a href="aside.html#aside-mdl">aside</a> = <a class="ref" href="style.html#style-pattern">style</a>*,
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)</li></ul>
</div>
<div class="no-number no-toc" id="style-display">
Index: del.html
===================================================================
RCS file: /sources/public/html5/markup/del.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- del.html 20 Jul 2009 23:15:31 -0000 1.12
+++ del.html 29 Jul 2009 01:57:04 -0000 1.13
@@ -23,13 +23,13 @@
<dl class="content-models" id="del-mdls">
<dt class="content-model"><span class="element-pattern-name" id="del.elem.flow"><a class="hash" href="del.html#del.elem.flow"><span class="element">del</span>.elem.flow</a> = </span></dt>
<dd class="elem-mdl"><span>
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
& <a class="ref" href="del.html#del.attrs">del.attrs</a>
</span></dd>
<dt class="content-model"><span class="element-pattern-name" id="del.elem.phrasing"><a class="hash" href="del.html#del.elem.phrasing"><span class="element">del</span>.elem.phrasing</a> = </span></dt>
<dd class="elem-mdl"><span>
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
& <a class="ref" href="del.html#del.attrs">del.attrs</a>
</span></dd>
Index: menu.html
===================================================================
RCS file: /sources/public/html5/markup/menu.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- menu.html 21 Jul 2009 07:45:08 -0000 1.11
+++ menu.html 29 Jul 2009 01:57:05 -0000 1.12
@@ -22,7 +22,7 @@
<div class="content-models" id="menu-mdls">
<p class="elem-mdl"><span class="element-pattern-name"><a id="menu-mdl" href="menu.html#menu-mdl" class="element">menu</a> = </span><span>
(<a class="ref" href="li.html#mli">li</a>*
- | (<a href="syntax.html#normal-character-data">normal character data</a>
+ | (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*))
& <a class="ref" href="menu.html#menu.attrs">menu.attrs</a>
</span></p>
Index: code.html
===================================================================
RCS file: /sources/public/html5/markup/code.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- code.html 20 Jul 2009 23:15:31 -0000 1.9
+++ code.html 29 Jul 2009 01:57:04 -0000 1.10
@@ -21,7 +21,7 @@
<h2 class="element-subhead">Content model <a class="hash" href="#code-content">#</a></h2>
<div class="content-models" id="code-mdls">
<p class="elem-mdl"><span class="element-pattern-name"><a id="code-mdl" href="code.html#code-mdl" class="element">code</a> = </span><span>
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
& <a class="ref" href="code.html#code.attrs">code.attrs</a>
</span></p>
Index: h2.html
===================================================================
RCS file: /sources/public/html5/markup/h2.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- h2.html 20 Jul 2009 23:15:31 -0000 1.11
+++ h2.html 29 Jul 2009 01:57:05 -0000 1.12
@@ -21,7 +21,7 @@
<h2 class="element-subhead">Content model <a class="hash" href="#h2-content">#</a></h2>
<div class="content-models" id="h2-mdls">
<p class="elem-mdl"><span class="element-pattern-name"><a id="h2-mdl" href="h2.html#h2-mdl" class="element">h2</a> = </span><span>
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
& <a class="ref" href="h2.html#h2.attrs">h2.attrs</a>
</span></p>
Index: p.html
===================================================================
RCS file: /sources/public/html5/markup/p.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- p.html 20 Jul 2009 23:15:32 -0000 1.10
+++ p.html 29 Jul 2009 01:57:05 -0000 1.11
@@ -21,7 +21,7 @@
<h2 class="element-subhead">Content model <a class="hash" href="#p-content">#</a></h2>
<div class="content-models" id="p-mdls">
<p class="elem-mdl"><span class="element-pattern-name"><a id="p-mdl" href="p.html#p-mdl" class="element">p</a> = </span><span>
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
& <a class="ref" href="p.html#p.attrs">p.attrs</a>
</span></p>
Index: map.html
===================================================================
RCS file: /sources/public/html5/markup/map.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- map.html 20 Jul 2009 23:15:31 -0000 1.10
+++ map.html 29 Jul 2009 01:57:05 -0000 1.11
@@ -23,13 +23,13 @@
<dl class="content-models" id="map-mdls">
<dt class="content-model"><span class="element-pattern-name" id="map.elem.flow"><a class="hash" href="map.html#map.elem.flow"><span class="element">map</span>.elem.flow</a> = </span></dt>
<dd class="elem-mdl"><span>
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
& <a class="ref" href="map.html#map.attrs">map.attrs</a>
</span></dd>
<dt class="content-model"><span class="element-pattern-name" id="map.elem.phrasing"><a class="hash" href="map.html#map.elem.phrasing"><span class="element">map</span>.elem.phrasing</a> = </span></dt>
<dd class="elem-mdl"><span>
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
& <a class="ref" href="map.html#map.attrs">map.attrs</a>
</span></dd>
Index: param.html
===================================================================
RCS file: /sources/public/html5/markup/param.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- param.html 20 Jul 2009 23:15:32 -0000 1.10
+++ param.html 29 Jul 2009 01:57:05 -0000 1.11
@@ -55,10 +55,10 @@
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#param-context">#</a></h2>
<ul>
<li class="context-mdl"><a href="object.html#object.elem.flow">object.elem.flow</a> = <a class="ref" href="param.html#param">param</a>*,
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)</li>
<li class="context-mdl"><a href="object.html#object.elem.phrasing">object.elem.phrasing</a> = <a class="ref" href="param.html#param">param</a>*,
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)</li></ul>
</div>
<div class="no-number no-toc" id="param-display">
Index: span.html
===================================================================
RCS file: /sources/public/html5/markup/span.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- span.html 20 Jul 2009 14:56:53 -0000 1.8
+++ span.html 29 Jul 2009 01:57:06 -0000 1.9
@@ -28,7 +28,7 @@
<h2 class="element-subhead">Content model <a class="hash" href="#span-content">#</a></h2>
<div class="content-models" id="span-mdls">
<p class="elem-mdl"><span class="element-pattern-name"><a id="span-mdl" href="span.html#span-mdl" class="element">span</a> = </span><span>
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
& <a class="ref" href="span.html#span.attrs">span.attrs</a>
</span></p>
Index: schema.rnc
===================================================================
RCS file: /sources/public/html5/markup/schema.rnc,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -d -r1.96 -r1.97
--- schema.rnc 21 Jul 2009 07:07:23 -0000 1.96
+++ schema.rnc 29 Jul 2009 01:57:06 -0000 1.97
@@ -14,17 +14,8 @@
# (xml:base on elements other than <html>)
# #####################################################################
- ## Wildcards #
- # #####################################################################
- ## Any attribute from any namespace
- common.attr.anything = attribute * { text }*
-
- ## Any element from any namespace
- common.elem.anything =
- element * { common.inner.anything & common.attr.anything }
-
- ## Any content from any namespace
- common.inner.anything = text & common.elem.anything*
+ replaceable-character-data = xsd:string { pattern = ".*" }
+ non-replaceable-character-data = xsd:string { pattern = ".*" }
# #####################################################################
## Common Element Classes #
## Metadata Elements
@@ -334,8 +325,9 @@
body.inner = common.inner.flow
## Document Title: <title>
- title.elem = element title { text & title.attrs }
+ title.elem = element title { title.inner & title.attrs }
title.attrs = common.attrs
+ title.inner = replaceable-character-data
## Base URI: <base>
base.elem = element base { empty & base.attrs }
@@ -367,7 +359,7 @@
style.attrs.type = attribute type { common.data.mimetype }
style.attrs.media = attribute media { common.data.mediaquery }
- style.inner = common.inner.anything
+ style.inner = non-replaceable-character-data
## Scoped Style: <style scoped>
style.elem.scoped =
@@ -1071,7 +1063,7 @@
script.attrs.language =
attribute language { common.data.javascript }
common.data.javascript = d:string "javascript"
- script.inner.embedded = common.inner.anything
+ script.inner.embedded = non-replaceable-character-data
script.elem = script.elem.embedded | script.elem.imported
## Fallback Unscripted Content: <noscript>
@@ -1661,7 +1653,7 @@
input.image.attrs.src = attribute src { common.data.uri }
## Text Area: <textarea>
- textarea.elem = element textarea { text & textarea.attrs }
+ textarea.elem = element textarea { textarea.inner & textarea.attrs }
textarea.attrs =
(common.attrs & common-form.attrs & shared-form.attrs.readonly?)
>> a:documentation [ "Text Area: <textarea>, extensions" ]
@@ -1676,6 +1668,7 @@
attribute cols { common.data.integer.positive }
textarea.attrs.rows =
attribute rows { common.data.integer.positive }
+ textarea.inner = replaceable-character-data
# Due to limitations with interleave, handling single/multiple selection
# enforcement in RELAX NG seems to be possible but really awkward.
# Tried it. Leaving it to Schematron.
Index: q.html
===================================================================
RCS file: /sources/public/html5/markup/q.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- q.html 20 Jul 2009 23:15:32 -0000 1.9
+++ q.html 29 Jul 2009 01:57:06 -0000 1.10
@@ -21,7 +21,7 @@
<h2 class="element-subhead">Content model <a class="hash" href="#q-content">#</a></h2>
<div class="content-models" id="q-mdls">
<p class="elem-mdl"><span class="element-pattern-name"><a id="q-mdl" href="q.html#q-mdl" class="element">q</a> = </span><span>
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
& <a class="ref" href="q.html#q.attrs">q.attrs</a>
</span></p>
Index: common-attributes.html
===================================================================
RCS file: /sources/public/html5/markup/common-attributes.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- common-attributes.html 20 Jul 2009 14:56:50 -0000 1.9
+++ common-attributes.html 29 Jul 2009 01:57:04 -0000 1.10
@@ -51,7 +51,7 @@
<dd><i class="TK">(detailed attribute description to come)</i></dd>
<dt><a class="attribute-name" id="common.attrs.title" title="common.attrs.title" href="common-attributes.html#common.attrs.title">title</a><span class="attr-values"> =
- <a href="syntax.html#normal-character-data">normal character data</a>
+ <a href="syntax.html#normal-character-data">normal-character-data</a>
</span> </dt>
<dd><i class="TK">(detailed attribute description to come)</i></dd>
Index: option.html
===================================================================
RCS file: /sources/public/html5/markup/option.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- option.html 20 Jul 2009 14:56:53 -0000 1.9
+++ option.html 29 Jul 2009 01:57:05 -0000 1.10
@@ -23,7 +23,7 @@
<h2 class="element-subhead">Content model <a class="hash" href="#option-content">#</a></h2>
<div class="content-models" id="option-mdls">
<p class="elem-mdl"><span class="element-pattern-name"><a id="option-mdl" href="option.html#option-mdl" class="element">option</a> = </span><span>
- normal character data
+ normal-character-data
& <a class="ref" href="option.html#option.attrs">option.attrs</a>
</span></p>
</div>
@@ -70,7 +70,7 @@
<li class="context-mdl"><a href="select.html#select-mdl">select</a> = <a class="ref" href="optgroup.html#optgroup">optgroup</a>*
& <a class="ref" href="option.html#option">option</a>*</li>
<li class="context-mdl"><a href="datalist.html#datalist-mdl">datalist</a> = <a class="ref" href="option.html#option">option</a>*
- & (<a href="syntax.html#normal-character-data">normal character data</a>
+ & (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)</li></ul>
</div></div>
<hr class="footerbreak"></hr>
Index: label.html
===================================================================
RCS file: /sources/public/html5/markup/label.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- label.html 20 Jul 2009 23:15:31 -0000 1.9
+++ label.html 29 Jul 2009 01:57:05 -0000 1.10
@@ -21,7 +21,7 @@
<h2 class="element-subhead">Content model <a class="hash" href="#label-content">#</a></h2>
<div class="content-models" id="label-mdls">
<p class="elem-mdl"><span class="element-pattern-name"><a id="label-mdl" href="label.html#label-mdl" class="element">label</a> = </span><span>
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
& <a class="ref" href="label.html#label.attrs">label.attrs</a>
</span></p>
Index: noscript.html
===================================================================
RCS file: /sources/public/html5/markup/noscript.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- noscript.html 20 Jul 2009 14:56:53 -0000 1.10
+++ noscript.html 29 Jul 2009 01:57:05 -0000 1.11
@@ -32,13 +32,13 @@
</span></dd>
<dt class="content-model"><span class="element-pattern-name" id="noscript.elem.phrasing"><a class="hash" href="noscript.html#noscript.elem.phrasing"><span class="element">noscript</span>.elem.phrasing</a> = </span></dt>
<dd class="elem-mdl"><span>
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
& <a class="ref" href="noscript.html#noscript.attrs">noscript.attrs</a>
</span></dd>
<dt class="content-model"><span class="element-pattern-name" id="noscript.elem.flow"><a class="hash" href="noscript.html#noscript.elem.flow"><span class="element">noscript</span>.elem.flow</a> = </span></dt>
<dd class="elem-mdl"><span>
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
& <a class="ref" href="noscript.html#noscript.attrs">noscript.attrs</a>
</span></dd>
Index: blockquote.html
===================================================================
RCS file: /sources/public/html5/markup/blockquote.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- blockquote.html 21 Jul 2009 07:07:22 -0000 1.10
+++ blockquote.html 29 Jul 2009 01:57:04 -0000 1.11
@@ -22,7 +22,7 @@
<h2 class="element-subhead">Content model <a class="hash" href="#blockquote-content">#</a></h2>
<div class="content-models" id="blockquote-mdls">
<p class="elem-mdl"><span class="element-pattern-name"><a id="blockquote-mdl" href="blockquote.html#blockquote-mdl" class="element">blockquote</a> = </span><span>
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
& <a class="ref" href="blockquote.html#blockquote.attrs">blockquote.attrs</a>
</span></p>
Index: td.html
===================================================================
RCS file: /sources/public/html5/markup/td.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- td.html 20 Jul 2009 23:15:32 -0000 1.9
+++ td.html 29 Jul 2009 01:57:06 -0000 1.10
@@ -21,7 +21,7 @@
<h2 class="element-subhead">Content model <a class="hash" href="#td-content">#</a></h2>
<div class="content-models" id="td-mdls">
<p class="elem-mdl"><span class="element-pattern-name"><a id="td-mdl" href="td.html#td-mdl" class="element">td</a> = </span><span>
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
& <a class="ref" href="td.html#td.attrs">td.attrs</a>
</span></p>
Index: em.html
===================================================================
RCS file: /sources/public/html5/markup/em.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- em.html 20 Jul 2009 23:15:31 -0000 1.9
+++ em.html 29 Jul 2009 01:57:04 -0000 1.10
@@ -21,7 +21,7 @@
<h2 class="element-subhead">Content model <a class="hash" href="#em-content">#</a></h2>
<div class="content-models" id="em-mdls">
<p class="elem-mdl"><span class="element-pattern-name"><a id="em-mdl" href="em.html#em-mdl" class="element">em</a> = </span><span>
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
& <a class="ref" href="em.html#em.attrs">em.attrs</a>
</span></p>
Index: figure.html
===================================================================
RCS file: /sources/public/html5/markup/figure.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- figure.html 20 Jul 2009 14:56:51 -0000 1.8
+++ figure.html 29 Jul 2009 01:57:05 -0000 1.9
@@ -24,9 +24,9 @@
<div class="content-models" id="figure-mdls">
<p class="elem-mdl"><span class="element-pattern-name"><a id="figure-mdl" href="figure.html#figure-mdl" class="element">figure</a> = </span><span>
(<a class="ref" href="legend.html#legend">legend</a>,
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*))
- | ((<a href="syntax.html#normal-character-data">normal character data</a>
+ | ((<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*),
<a class="ref" href="legend.html#legend">legend</a>?)
& <a class="ref" href="figure.html#figure.attrs">figure.attrs</a>
Index: caption.html
===================================================================
RCS file: /sources/public/html5/markup/caption.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- caption.html 20 Jul 2009 23:15:30 -0000 1.9
+++ caption.html 29 Jul 2009 01:57:04 -0000 1.10
@@ -21,7 +21,7 @@
<h2 class="element-subhead">Content model <a class="hash" href="#caption-content">#</a></h2>
<div class="content-models" id="caption-mdls">
<p class="elem-mdl"><span class="element-pattern-name"><a id="caption-mdl" href="caption.html#caption-mdl" class="element">caption</a> = </span><span>
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
& <a class="ref" href="caption.html#caption.attrs">caption.attrs</a>
</span></p>
Index: kbd.html
===================================================================
RCS file: /sources/public/html5/markup/kbd.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- kbd.html 20 Jul 2009 23:15:31 -0000 1.9
+++ kbd.html 29 Jul 2009 01:57:05 -0000 1.10
@@ -23,7 +23,7 @@
<h2 class="element-subhead">Content model <a class="hash" href="#kbd-content">#</a></h2>
<div class="content-models" id="kbd-mdls">
<p class="elem-mdl"><span class="element-pattern-name"><a id="kbd-mdl" href="kbd.html#kbd-mdl" class="element">kbd</a> = </span><span>
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
& <a class="ref" href="kbd.html#kbd.attrs">kbd.attrs</a>
</span></p>
Index: patch-schema
===================================================================
RCS file: /sources/public/html5/markup/patch-schema,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- patch-schema 21 Jul 2009 07:53:21 -0000 1.65
+++ patch-schema 29 Jul 2009 01:57:05 -0000 1.66
@@ -82,6 +82,15 @@
textarea.attrs.cols =
attribute cols {
common.data.integer.positive
+@@ -315,7 +307,7 @@
+ common.data.integer.positive
+ }
+ textarea.inner =
+- ( text )
++ ( replaceable-character-data )
+
+ common.elem.phrasing |= textarea.elem
+
@@ -394,10 +386,6 @@
## Shared Definitions for Complex Button
@@ -317,6 +326,24 @@
===================================================================
--- schema/meta.rnc (revision 453)
+++ schema/meta.rnc (working copy)
+@@ -60,7 +60,7 @@
+ title.attrs =
+ ( common.attrs )
+ title.inner =
+- ( text )
++ ( replaceable-character-data )
+
+ ## Base URI: <base>
+
+@@ -124,7 +124,7 @@
+ common.data.mediaquery
+ }
+ style.inner =
+- ( common.inner.anything )
++ ( non-replaceable-character-data )
+
+ common.elem.metadata |= style.elem
+
@@ -241,11 +241,8 @@
)
meta.charset.attrs.charset =
@@ -439,7 +466,7 @@
===================================================================
--- schema/core-scripting.rnc (revision 453)
+++ schema/core-scripting.rnc (working copy)
-@@ -49,8 +49,11 @@
+@@ -49,10 +49,13 @@
}
script.attrs.language =
attribute language {
@@ -450,12 +477,41 @@
- }
+
script.inner.embedded =
- ( common.inner.anything )
+- ( common.inner.anything )
++ ( non-replaceable-character-data )
script.inner.imported =
+ ( empty )
+
Index: schema/common.rnc
===================================================================
--- schema/common.rnc (revision 453)
+++ schema/common.rnc (working copy)
+@@ -38,16 +38,16 @@
+ common.attr.anything =
+ attribute * { text }*
+
+-## Any element from any namespace
++ replaceable-character-data =
++ ( xsd:string {
++ pattern = ".*"
++ }
++ )
+
+- common.elem.anything =
+- element * { common.inner.anything & common.attr.anything }
+-
+-## Any content from any namespace
+-
+- common.inner.anything =
+- ( text
+- & common.elem.anything*
++ non-replaceable-character-data =
++ ( xsd:string {
++ pattern = ".*"
++ }
+ )
+
+ # #####################################################################
@@ -359,16 +359,8 @@
common.data.zero =
w:zero
Index: rt.html
===================================================================
RCS file: /sources/public/html5/markup/rt.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- rt.html 20 Jul 2009 14:56:53 -0000 1.9
+++ rt.html 29 Jul 2009 01:57:06 -0000 1.10
@@ -21,7 +21,7 @@
<h2 class="element-subhead">Content model <a class="hash" href="#rt-content">#</a></h2>
<div class="content-models" id="rt-mdls">
<p class="elem-mdl"><span class="element-pattern-name"><a id="rt-mdl" href="rt.html#rt-mdl" class="element">rt</a> = </span><span>
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
& <a class="ref" href="rt.html#rt.attrs">rt.attrs</a>
</span></p>
@@ -48,7 +48,7 @@
<div class="no-number no-toc" id="rt-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#rt-context">#</a></h2>
<ul>
- <li class="context-mdl"><a href="ruby.html#ruby-mdl">ruby</a> = ((<a href="syntax.html#normal-character-data">normal character data</a>
+ <li class="context-mdl"><a href="ruby.html#ruby-mdl">ruby</a> = ((<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*),
(<a class="ref" href="rt.html#rt">rt</a>
| (<a class="ref" href="rp.html#rp">rp</a>,
Index: fieldset.html
===================================================================
RCS file: /sources/public/html5/markup/fieldset.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- fieldset.html 20 Jul 2009 23:15:31 -0000 1.9
+++ fieldset.html 29 Jul 2009 01:57:05 -0000 1.10
@@ -22,7 +22,7 @@
<div class="content-models" id="fieldset-mdls">
<p class="elem-mdl"><span class="element-pattern-name"><a id="fieldset-mdl" href="fieldset.html#fieldset-mdl" class="element">fieldset</a> = </span><span>
<a class="ref" href="legend.html#legend">legend</a>?,
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
& <a class="ref" href="fieldset.html#fieldset.attrs">fieldset.attrs</a>
</span></p>
Index: spec.html
===================================================================
RCS file: /sources/public/html5/markup/spec.html,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- spec.html 21 Jul 2009 08:27:45 -0000 1.61
+++ spec.html 29 Jul 2009 01:57:06 -0000 1.62
@@ -9,7 +9,7 @@
<body>
<div class="head">
<h1>HTML 5: The Markup Language</h1>
-<h2>Editor’s Draft <em>21 July 2009</em>
+<h2>Editor’s Draft <em>29 July 2009</em>
</h2>
<dl>
<dt>Latest Editor’s Draft:</dt>
@@ -41,7 +41,7 @@
[...989 lines suppressed...]
<dl class="content-models">
<dt class="content-model">
@@ -14042,7 +14024,7 @@
</dl>
</div>
<div id="common-phrasing" class="section">
- <h2 class="common-subhead">8.4. Phrasing elements <a class="hash" href="#common-phrasing">#</a> <a class="toc-bak" href="#common-phrasing-toc">T</a>
+ <h2 class="common-subhead">8.3. Phrasing elements <a class="hash" href="#common-phrasing">#</a> <a class="toc-bak" href="#common-phrasing-toc">T</a>
</h2>
<dl class="content-models">
<dt class="content-model">
@@ -14150,7 +14132,7 @@
<dt>
<a class="attribute-name" id="common.attrs.title" title="common.attrs.title" href="#common.attrs.title">title</a><span class="attr-values"> =
- <a href="#normal-character-data">normal character data</a>
+ <a href="#normal-character-data">normal-character-data</a>
</span> </dt>
<dd><i class="TK">(detailed attribute description to come)</i></dd>
Index: datalist.html
===================================================================
RCS file: /sources/public/html5/markup/datalist.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- datalist.html 20 Jul 2009 14:56:50 -0000 1.9
+++ datalist.html 29 Jul 2009 01:57:04 -0000 1.10
@@ -27,7 +27,7 @@
<div class="content-models" id="datalist-mdls">
<p class="elem-mdl"><span class="element-pattern-name"><a id="datalist-mdl" href="datalist.html#datalist-mdl" class="element">datalist</a> = </span><span>
<a class="ref" href="option.html#option">option</a>*
- & (<a href="syntax.html#normal-character-data">normal character data</a>
+ & (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
& <a class="ref" href="datalist.html#datalist.attrs">datalist.attrs</a>
</span></p>
Index: h1.html
===================================================================
RCS file: /sources/public/html5/markup/h1.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- h1.html 20 Jul 2009 23:15:31 -0000 1.11
+++ h1.html 29 Jul 2009 01:57:05 -0000 1.12
@@ -21,7 +21,7 @@
<h2 class="element-subhead">Content model <a class="hash" href="#h1-content">#</a></h2>
<div class="content-models" id="h1-mdls">
<p class="elem-mdl"><span class="element-pattern-name"><a id="h1-mdl" href="h1.html#h1-mdl" class="element">h1</a> = </span><span>
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
& <a class="ref" href="h1.html#h1.attrs">h1.attrs</a>
</span></p>
Index: h3.html
===================================================================
RCS file: /sources/public/html5/markup/h3.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- h3.html 20 Jul 2009 23:15:31 -0000 1.11
+++ h3.html 29 Jul 2009 01:57:05 -0000 1.12
@@ -21,7 +21,7 @@
<h2 class="element-subhead">Content model <a class="hash" href="#h3-content">#</a></h2>
<div class="content-models" id="h3-mdls">
<p class="elem-mdl"><span class="element-pattern-name"><a id="h3-mdl" href="h3.html#h3-mdl" class="element">h3</a> = </span><span>
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
& <a class="ref" href="h3.html#h3.attrs">h3.attrs</a>
</span></p>
Index: button.button.html
===================================================================
RCS file: /sources/public/html5/markup/button.button.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- button.button.html 20 Jul 2009 14:56:50 -0000 1.11
+++ button.button.html 29 Jul 2009 01:57:04 -0000 1.12
@@ -23,7 +23,7 @@
<h2 class="element-subhead">Content model <a class="hash" href="#button.button-content">#</a></h2>
<div class="content-models" id="button.button-mdls">
<p class="elem-mdl"><span class="element-pattern-name"><a id="button.button-mdl" href="button.button.html#button.button-mdl"><span class="element">button</span>.button</a> = </span><span>
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
& <a class="ref" href="button.button.html#button.button.attrs">button.button.attrs</a>
</span></p>
Index: form.html
===================================================================
RCS file: /sources/public/html5/markup/form.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- form.html 20 Jul 2009 23:15:31 -0000 1.9
+++ form.html 29 Jul 2009 01:57:05 -0000 1.10
@@ -21,7 +21,7 @@
<h2 class="element-subhead">Content model <a class="hash" href="#form-content">#</a></h2>
<div class="content-models" id="form-mdls">
<p class="elem-mdl"><span class="element-pattern-name"><a id="form-mdl" href="form.html#form-mdl" class="element">form</a> = </span><span>
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
& <a class="ref" href="form.html#form.attrs">form.attrs</a>
</span></p>
Index: small.html
===================================================================
RCS file: /sources/public/html5/markup/small.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- small.html 20 Jul 2009 23:15:32 -0000 1.9
+++ small.html 29 Jul 2009 01:57:06 -0000 1.10
@@ -22,7 +22,7 @@
<h2 class="element-subhead">Content model <a class="hash" href="#small-content">#</a></h2>
<div class="content-models" id="small-mdls">
<p class="elem-mdl"><span class="element-pattern-name"><a id="small-mdl" href="small.html#small-mdl" class="element">small</a> = </span><span>
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
& <a class="ref" href="small.html#small.attrs">small.attrs</a>
</span></p>
Index: ruby.html
===================================================================
RCS file: /sources/public/html5/markup/ruby.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- ruby.html 20 Jul 2009 14:56:53 -0000 1.9
+++ ruby.html 29 Jul 2009 01:57:06 -0000 1.10
@@ -22,7 +22,7 @@
<h2 class="element-subhead">Content model <a class="hash" href="#ruby-content">#</a></h2>
<div class="content-models" id="ruby-mdls">
<p class="elem-mdl"><span class="element-pattern-name"><a id="ruby-mdl" href="ruby.html#ruby-mdl" class="element">ruby</a> = </span><span>
- ((<a href="syntax.html#normal-character-data">normal character data</a>
+ ((<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*),
(<a class="ref" href="rt.html#rt">rt</a>
| (<a class="ref" href="rp.html#rp">rp</a>,
Index: article.html
===================================================================
RCS file: /sources/public/html5/markup/article.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- article.html 20 Jul 2009 14:56:49 -0000 1.12
+++ article.html 29 Jul 2009 01:57:04 -0000 1.13
@@ -24,7 +24,7 @@
<div class="content-models" id="article-mdls">
<p class="elem-mdl"><span class="element-pattern-name"><a id="article-mdl" href="article.html#article-mdl" class="element">article</a> = </span><span>
<a class="ref" href="style.html#style-pattern">style</a>*,
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
& <a class="ref" href="article.html#article.attrs">article.attrs</a>
</span></p>
Index: video.html
===================================================================
RCS file: /sources/public/html5/markup/video.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- video.html 20 Jul 2009 14:56:54 -0000 1.10
+++ video.html 29 Jul 2009 01:57:06 -0000 1.11
@@ -24,7 +24,7 @@
<dd class="elem-mdl"><span>
(<a class="ref" href="video.html#video.attrs.src">video.attrs.src</a>
| <a class="ref" href=".html#source-pattern">source</a>*),
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
& <a class="ref" href="video.html#video.attrs">video.attrs</a>
</span></dd>
@@ -32,7 +32,7 @@
<dd class="elem-mdl"><span>
(<a class="ref" href="video.html#video.attrs.src">video.attrs.src</a>
| <a class="ref" href=".html#source-pattern">source</a>*),
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
& <a class="ref" href="video.html#video.attrs">video.attrs</a>
</span></dd>
Index: source.html
===================================================================
RCS file: /sources/public/html5/markup/source.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- source.html 20 Jul 2009 14:56:53 -0000 1.11
+++ source.html 29 Jul 2009 01:57:06 -0000 1.12
@@ -75,19 +75,19 @@
<ul>
<li class="context-mdl"><a href="video.html#video.elem.flow">video.elem.flow</a> = (<a class="ref" href="video.html#video.attrs.src">video.attrs.src</a>
| <a class="ref" href=".html#source-pattern">source</a>*),
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)</li>
<li class="context-mdl"><a href="video.html#video.elem.phrasing">video.elem.phrasing</a> = (<a class="ref" href="video.html#video.attrs.src">video.attrs.src</a>
| <a class="ref" href=".html#source-pattern">source</a>*),
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)</li>
<li class="context-mdl"><a href="audio.html#audio.elem.flow">audio.elem.flow</a> = (<a class="ref" href="audio.html#audio.attrs.src">audio.attrs.src</a>
| <a class="ref" href=".html#source-pattern">source</a>*),
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)</li>
<li class="context-mdl"><a href="audio.html#audio.elem.phrasing">audio.elem.phrasing</a> = (<a class="ref" href="audio.html#audio.attrs.src">audio.attrs.src</a>
| <a class="ref" href=".html#source-pattern">source</a>*),
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)</li></ul>
</div></div>
<hr class="footerbreak"></hr>
Index: button.reset.html
===================================================================
RCS file: /sources/public/html5/markup/button.reset.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- button.reset.html 20 Jul 2009 14:56:50 -0000 1.11
+++ button.reset.html 29 Jul 2009 01:57:04 -0000 1.12
@@ -23,7 +23,7 @@
<h2 class="element-subhead">Content model <a class="hash" href="#button.reset-content">#</a></h2>
<div class="content-models" id="button.reset-mdls">
<p class="elem-mdl"><span class="element-pattern-name"><a id="button.reset-mdl" href="button.reset.html#button.reset-mdl"><span class="element">button</span>.reset</a> = </span><span>
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
& <a class="ref" href="button.reset.html#button.reset.attrs">button.reset.attrs</a>
</span></p>
Index: output.html
===================================================================
RCS file: /sources/public/html5/markup/output.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- output.html 20 Jul 2009 14:56:53 -0000 1.8
+++ output.html 29 Jul 2009 01:57:05 -0000 1.9
@@ -21,7 +21,7 @@
<h2 class="element-subhead">Content model <a class="hash" href="#output-content">#</a></h2>
<div class="content-models" id="output-mdls">
<p class="elem-mdl"><span class="element-pattern-name"><a id="output-mdl" href="output.html#output-mdl" class="element">output</a> = </span><span>
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
& <a class="ref" href="output.html#output.attrs">output.attrs</a>
</span></p>
Index: i.html
===================================================================
RCS file: /sources/public/html5/markup/i.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- i.html 20 Jul 2009 23:15:31 -0000 1.9
+++ i.html 29 Jul 2009 01:57:05 -0000 1.10
@@ -23,7 +23,7 @@
<h2 class="element-subhead">Content model <a class="hash" href="#i-content">#</a></h2>
<div class="content-models" id="i-mdls">
<p class="elem-mdl"><span class="element-pattern-name"><a id="i-mdl" href="i.html#i-mdl" class="element">i</a> = </span><span>
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
& <a class="ref" href="i.html#i.attrs">i.attrs</a>
</span></p>
Index: var.html
===================================================================
RCS file: /sources/public/html5/markup/var.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- var.html 20 Jul 2009 23:15:32 -0000 1.9
+++ var.html 29 Jul 2009 01:57:06 -0000 1.10
@@ -23,7 +23,7 @@
<h2 class="element-subhead">Content model <a class="hash" href="#var-content">#</a></h2>
<div class="content-models" id="var-mdls">
<p class="elem-mdl"><span class="element-pattern-name"><a id="var-mdl" href="var.html#var-mdl" class="element">var</a> = </span><span>
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
& <a class="ref" href="var.html#var.attrs">var.attrs</a>
</span></p>
Index: sub.html
===================================================================
RCS file: /sources/public/html5/markup/sub.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- sub.html 20 Jul 2009 23:15:32 -0000 1.9
+++ sub.html 29 Jul 2009 01:57:06 -0000 1.10
@@ -21,7 +21,7 @@
<h2 class="element-subhead">Content model <a class="hash" href="#sub-content">#</a></h2>
<div class="content-models" id="sub-mdls">
<p class="elem-mdl"><span class="element-pattern-name"><a id="sub-mdl" href="sub.html#sub-mdl" class="element">sub</a> = </span><span>
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
& <a class="ref" href="sub.html#sub.attrs">sub.attrs</a>
</span></p>
Index: title.html
===================================================================
RCS file: /sources/public/html5/markup/title.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- title.html 20 Jul 2009 23:15:32 -0000 1.9
+++ title.html 29 Jul 2009 01:57:06 -0000 1.10
@@ -21,7 +21,7 @@
<h2 class="element-subhead">Content model <a class="hash" href="#title-content">#</a></h2>
<div class="content-models" id="title-mdls">
<p class="elem-mdl"><span class="element-pattern-name"><a id="title-mdl" href="title.html#title-mdl" class="element">title</a> = </span><span>
- normal character data
+ <a class="ref" href="syntax.html#replaceable-character-data">replaceable-character-data</a>
& <a class="ref" href="title.html#title.attrs">title.attrs</a>
</span></p>
</div>
Index: pre.html
===================================================================
RCS file: /sources/public/html5/markup/pre.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- pre.html 20 Jul 2009 23:15:32 -0000 1.9
+++ pre.html 29 Jul 2009 01:57:06 -0000 1.10
@@ -23,7 +23,7 @@
<h2 class="element-subhead">Content model <a class="hash" href="#pre-content">#</a></h2>
<div class="content-models" id="pre-mdls">
<p class="elem-mdl"><span class="element-pattern-name"><a id="pre-mdl" href="pre.html#pre-mdl" class="element">pre</a> = </span><span>
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
& <a class="ref" href="pre.html#pre.attrs">pre.attrs</a>
</span></p>
Index: button.submit.html
===================================================================
RCS file: /sources/public/html5/markup/button.submit.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- button.submit.html 20 Jul 2009 14:56:50 -0000 1.11
+++ button.submit.html 29 Jul 2009 01:57:04 -0000 1.12
@@ -23,7 +23,7 @@
<h2 class="element-subhead">Content model <a class="hash" href="#button.submit-content">#</a></h2>
<div class="content-models" id="button.submit-mdls">
<p class="elem-mdl"><span class="element-pattern-name"><a id="button.submit-mdl" href="button.submit.html#button.submit-mdl"><span class="element">button</span>.submit</a> = </span><span>
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
& <a class="ref" href="button.submit.html#button.submit.attrs">button.submit.attrs</a>
</span></p>
Index: rp.html
===================================================================
RCS file: /sources/public/html5/markup/rp.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- rp.html 20 Jul 2009 14:56:53 -0000 1.9
+++ rp.html 29 Jul 2009 01:57:06 -0000 1.10
@@ -23,7 +23,7 @@
<h2 class="element-subhead">Content model <a class="hash" href="#rp-content">#</a></h2>
<div class="content-models" id="rp-mdls">
<p class="elem-mdl"><span class="element-pattern-name"><a id="rp-mdl" href="rp.html#rp-mdl" class="element">rp</a> = </span><span>
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
& <a class="ref" href="rp.html#rp.attrs">rp.attrs</a>
</span></p>
@@ -50,7 +50,7 @@
<div class="no-number no-toc" id="rp-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#rp-context">#</a></h2>
<ul>
- <li class="context-mdl"><a href="ruby.html#ruby-mdl">ruby</a> = ((<a href="syntax.html#normal-character-data">normal character data</a>
+ <li class="context-mdl"><a href="ruby.html#ruby-mdl">ruby</a> = ((<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*),
(<a class="ref" href="rt.html#rt">rt</a>
| (<a class="ref" href="rp.html#rp">rp</a>,
Index: sup.html
===================================================================
RCS file: /sources/public/html5/markup/sup.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- sup.html 20 Jul 2009 23:15:32 -0000 1.9
+++ sup.html 29 Jul 2009 01:57:06 -0000 1.10
@@ -21,7 +21,7 @@
<h2 class="element-subhead">Content model <a class="hash" href="#sup-content">#</a></h2>
<div class="content-models" id="sup-mdls">
<p class="elem-mdl"><span class="element-pattern-name"><a id="sup-mdl" href="sup.html#sup-mdl" class="element">sup</a> = </span><span>
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
& <a class="ref" href="sup.html#sup.attrs">sup.attrs</a>
</span></p>
Index: details.html
===================================================================
RCS file: /sources/public/html5/markup/details.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- details.html 20 Jul 2009 14:56:50 -0000 1.8
+++ details.html 29 Jul 2009 01:57:04 -0000 1.9
@@ -23,7 +23,7 @@
<div class="content-models" id="details-mdls">
<p class="elem-mdl"><span class="element-pattern-name"><a id="details-mdl" href="details.html#details-mdl" class="element">details</a> = </span><span>
<a class="ref" href="legend.html#legend">legend</a>,
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
& <a class="ref" href="details.html#details.attrs">details.attrs</a>
</span></p>
Index: h5.html
===================================================================
RCS file: /sources/public/html5/markup/h5.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- h5.html 20 Jul 2009 23:15:31 -0000 1.11
+++ h5.html 29 Jul 2009 01:57:05 -0000 1.12
@@ -21,7 +21,7 @@
<h2 class="element-subhead">Content model <a class="hash" href="#h5-content">#</a></h2>
<div class="content-models" id="h5-mdls">
<p class="elem-mdl"><span class="element-pattern-name"><a id="h5-mdl" href="h5.html#h5-mdl" class="element">h5</a> = </span><span>
- (<a href="syntax.html#normal-character-data">normal character data</a>
+ (<a href="syntax.html#normal-character-data">normal-character-data</a>
& <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
& <a class="ref" href="h5.html#h5.attrs">h5.attrs</a>
</span></p>
Received on Wednesday, 29 July 2009 01:58:35 UTC