- From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
- Date: Sat, 30 May 2009 12:05:48 +0000
- To: public-html-commits@w3.org
Update of /sources/public/html5/markup
In directory hutz:/tmp/cvs-serv8795
Modified Files:
common-models.html del.html ins.html schema.html schema.rnc
spec.html
Log Message:
h:tml; pull from upstream: make <ins> and <del> content model transparent
Index: ins.html
===================================================================
RCS file: /sources/public/html5/markup/ins.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ins.html 3 May 2009 15:59:42 -0000 1.4
+++ ins.html 30 May 2009 12:05:45 -0000 1.5
@@ -20,13 +20,20 @@
</div>
<div class="no-number no-toc" id="ins-content">
<h2 class="element-subhead">Content model <a class="hash" href="#ins-content">#</a></h2>
- <div class="content-models" id="ins-mdls">
- <p class="elem-mdl"><span class="element-pattern-name"><a id="ins-mdl" href="ins.html#ins-mdl" class="element">ins</a> = </span><span>
+ <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>
+ (text
+ & <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>
(text
& <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></p>
- </div>
+ </span></dd>
+ </dl>
</div><div class="no-number no-toc" id="ins-attr-mdl">
<h2 class="element-subhead">Attribute model <a class="hash" href="#ins-attr-mdl">#</a></h2>
<div class="attr-content-models">
@@ -61,7 +68,8 @@
<div class="no-number no-toc" id="ins-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#ins-context">#</a></h2>
<ul>
- <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul>
+ <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li>
+ <li class="context-mdl"><a href="common-models.html#common.elem.flow">common.elem.flow</a></li></ul>
</div>
<div class="no-number no-toc" id="ins-display">
<h2 class="element-subhead">Typical default display properties <a class="hash" href="#ins-display">#</a></h2><p class="non-norm">This section is non-normative.</p>
Index: schema.html
===================================================================
RCS file: /sources/public/html5/markup/schema.html,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -d -r1.97 -r1.98
--- schema.html 30 May 2009 11:38:55 -0000 1.97
+++ schema.html 30 May 2009 12:05:45 -0000 1.98
@@ -167,8 +167,8 @@
| <a class='ref' href='#span.elem'>span.elem</a>
| <a class='ref' href='#bdo.elem'>bdo.elem</a>
| <a class='ref' href='#br.elem'>br.elem</a>
- | <a class='ref' href='#ins.elem'>ins.elem</a>
- | <a class='ref' href='#del.elem'>del.elem</a>
+ | <a class='ref' href='#ins.elem.phrasing'>ins.elem.phrasing</a>
+ | <a class='ref' href='#del.elem.phrasing'>del.elem.phrasing</a>
| <a class='ref' href='#img.elem'>img.elem</a>
| <a class='ref' href='#embed.elem'>embed.elem</a>
| <a class='ref' href='#object.elem.phrasing'>object.elem.phrasing</a>
@@ -217,6 +217,8 @@
| <a class='ref' href='#hgroup.elem'>hgroup.elem</a>
| <a class='ref' href='#address.elem'>address.elem</a>
| <a class='ref' href='#blockquote.elem'>blockquote.elem</a>
+ | <a class='ref' href='#ins.elem.flow'>ins.elem.flow</a>
+ | <a class='ref' href='#del.elem.flow'>del.elem.flow</a>
| <a class='ref' href='#object.elem.flow'>object.elem.flow</a>
| <a class='ref' href='#map.elem.flow'>map.elem.flow</a>
| <a class='ref' href='#noscript.elem.flow'>noscript.elem.flow</a>
@@ -2052,14 +2054,24 @@
</span>}
</span>
</div>
-<div class='define' id='ins.elem-define'>
+<div class='define' id='ins.elem.flow-define'>
<span class='comment'>## Inserts: <ins></span>
- <div class='patternname' id='the-ins.elem'><a href='#the-ins.elem'>ins.elem</a> =</div>
- <span class='pattern' id='ins.elem'><span class='type'>element </span>
+ <div class='patternname' id='the-ins.elem.flow'><a href='#the-ins.elem.flow'>ins.elem.flow</a> =</div>
+ <span class='pattern' id='ins.elem.flow'><span class='type'>element </span>
<span class='name'>ins</span>
{<span class='model'>
- <a class='ref' href='#ins.inner'>ins.inner</a>
+ <a class='ref' href='#ins.inner.flow'>ins.inner.flow</a>
+ & <a class='ref' href='#ins.attrs'>ins.attrs</a>
+ </span>}
+ </span>
+</div>
+<div class='define' id='ins.elem.phrasing-define'>
+ <div class='patternname' id='the-ins.elem.phrasing'><a href='#the-ins.elem.phrasing'>ins.elem.phrasing</a> =</div>
+ <span class='pattern' id='ins.elem.phrasing'><span class='type'>element </span>
+ <span class='name'>ins</span>
+ {<span class='model'>
+ <a class='ref' href='#ins.inner.phrasing'>ins.inner.phrasing</a>
& <a class='ref' href='#ins.attrs'>ins.attrs</a>
</span>}
</span>
@@ -2070,18 +2082,32 @@
& <a class='ref' href='#edit.attrs.cite'>edit.attrs.cite</a>?
& <a class='ref' href='#edit.attrs.datetime'>edit.attrs.datetime</a>?</span>
</div>
-<div class='define' id='ins.inner-define'>
- <div class='patternname' id='the-ins.inner'><a href='#the-ins.inner'>ins.inner</a> =</div>
- <span class='pattern' id='ins.inner'><a class='ref' href='#common.inner.phrasing'>common.inner.phrasing</a></span>
+<div class='define' id='ins.inner.flow-define'>
+ <div class='patternname' id='the-ins.inner.flow'><a href='#the-ins.inner.flow'>ins.inner.flow</a> =</div>
+ <span class='pattern' id='ins.inner.flow'><a class='ref' href='#common.inner.flow'>common.inner.flow</a></span>
</div>
-<div class='define' id='del.elem-define'>
+<div class='define' id='ins.inner.phrasing-define'>
+ <div class='patternname' id='the-ins.inner.phrasing'><a href='#the-ins.inner.phrasing'>ins.inner.phrasing</a> =</div>
+ <span class='pattern' id='ins.inner.phrasing'><a class='ref' href='#common.inner.phrasing'>common.inner.phrasing</a></span>
+</div>
+<div class='define' id='del.elem.flow-define'>
<span class='comment'>## Deletions: <del></span>
- <div class='patternname' id='the-del.elem'><a href='#the-del.elem'>del.elem</a> =</div>
- <span class='pattern' id='del.elem'><span class='type'>element </span>
+ <div class='patternname' id='the-del.elem.flow'><a href='#the-del.elem.flow'>del.elem.flow</a> =</div>
+ <span class='pattern' id='del.elem.flow'><span class='type'>element </span>
<span class='name'>del</span>
{<span class='model'>
- <a class='ref' href='#del.inner'>del.inner</a>
+ <a class='ref' href='#del.inner.flow'>del.inner.flow</a>
+ & <a class='ref' href='#del.attrs'>del.attrs</a>
+ </span>}
+ </span>
+</div>
+<div class='define' id='del.elem.phrasing-define'>
+ <div class='patternname' id='the-del.elem.phrasing'><a href='#the-del.elem.phrasing'>del.elem.phrasing</a> =</div>
+ <span class='pattern' id='del.elem.phrasing'><span class='type'>element </span>
+ <span class='name'>del</span>
+ {<span class='model'>
+ <a class='ref' href='#del.inner.phrasing'>del.inner.phrasing</a>
& <a class='ref' href='#del.attrs'>del.attrs</a>
</span>}
</span>
@@ -2092,9 +2118,13 @@
& <a class='ref' href='#edit.attrs.cite'>edit.attrs.cite</a>?
& <a class='ref' href='#edit.attrs.datetime'>edit.attrs.datetime</a>?</span>
</div>
-<div class='define' id='del.inner-define'>
- <div class='patternname' id='the-del.inner'><a href='#the-del.inner'>del.inner</a> =</div>
- <span class='pattern' id='del.inner'><a class='ref' href='#common.inner.phrasing'>common.inner.phrasing</a></span>
+<div class='define' id='del.inner.flow-define'>
+ <div class='patternname' id='the-del.inner.flow'><a href='#the-del.inner.flow'>del.inner.flow</a> =</div>
+ <span class='pattern' id='del.inner.flow'><a class='ref' href='#common.inner.flow'>common.inner.flow</a></span>
+</div>
+<div class='define' id='del.inner.phrasing-define'>
+ <div class='patternname' id='the-del.inner.phrasing'><a href='#the-del.inner.phrasing'>del.inner.phrasing</a> =</div>
+ <span class='pattern' id='del.inner.phrasing'><a class='ref' href='#common.inner.phrasing'>common.inner.phrasing</a></span>
</div>
</div>
</div>
Index: common-models.html
===================================================================
RCS file: /sources/public/html5/markup/common-models.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- common-models.html 30 May 2009 11:38:55 -0000 1.7
+++ common-models.html 30 May 2009 12:05:45 -0000 1.8
@@ -53,6 +53,8 @@
| <a class="ref" href="hgroup.html#hgroup">hgroup</a>
| <a class="ref" href="address.html#address">address</a>
| <a class="ref" href="blockquote.html#blockquote">blockquote</a>
+ | <a class="ref" href="ins.html#ins.elem.flow">ins.elem.flow</a>
+ | <a class="ref" href="del.html#del.elem.flow">del.elem.flow</a>
| <a class="ref" href="object.html#object.elem.flow">object.elem.flow</a>
| <a class="ref" href="map.html#map.elem.flow">map.elem.flow</a>
| <a class="ref" href="noscript.html#noscript.elem.flow">noscript.elem.flow</a>
@@ -117,8 +119,8 @@
| <a class="ref" href="span.html#span">span</a>
| <a class="ref" href="bdo.html#bdo">bdo</a>
| <a class="ref" href="br.html#br">br</a>
- | <a class="ref" href="ins.html#ins">ins</a>
- | <a class="ref" href="del.html#del">del</a>
+ | <a class="ref" href="ins.html#ins.elem.phrasing">ins.elem.phrasing</a>
+ | <a class="ref" href="del.html#del.elem.phrasing">del.elem.phrasing</a>
| <a class="ref" href="img.html#img">img</a>
| <a class="ref" href="embed.html#embed">embed</a>
| <a class="ref" href="object.html#object.elem.phrasing">object.elem.phrasing</a>
Index: del.html
===================================================================
RCS file: /sources/public/html5/markup/del.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- del.html 3 May 2009 15:59:40 -0000 1.4
+++ del.html 30 May 2009 12:05:45 -0000 1.5
@@ -20,13 +20,20 @@
</div>
<div class="no-number no-toc" id="del-content">
<h2 class="element-subhead">Content model <a class="hash" href="#del-content">#</a></h2>
- <div class="content-models" id="del-mdls">
- <p class="elem-mdl"><span class="element-pattern-name"><a id="del-mdl" href="del.html#del-mdl" class="element">del</a> = </span><span>
+ <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>
+ (text
+ & <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>
(text
& <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></p>
- </div>
+ </span></dd>
+ </dl>
</div><div class="no-number no-toc" id="del-attr-mdl">
<h2 class="element-subhead">Attribute model <a class="hash" href="#del-attr-mdl">#</a></h2>
<div class="attr-content-models">
@@ -61,7 +68,8 @@
<div class="no-number no-toc" id="del-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#del-context">#</a></h2>
<ul>
- <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul>
+ <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li>
+ <li class="context-mdl"><a href="common-models.html#common.elem.flow">common.elem.flow</a></li></ul>
</div>
<div class="no-number no-toc" id="del-display">
<h2 class="element-subhead">Typical default display properties <a class="hash" href="#del-display">#</a></h2><p class="non-norm">This section is non-normative.</p>
Index: schema.rnc
===================================================================
RCS file: /sources/public/html5/markup/schema.rnc,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -d -r1.84 -r1.85
--- schema.rnc 30 May 2009 11:38:55 -0000 1.84
+++ schema.rnc 30 May 2009 12:05:45 -0000 1.85
@@ -61,8 +61,8 @@
| span.elem
| bdo.elem
| br.elem
- | ins.elem
- | del.elem
+ | ins.elem.phrasing
+ | del.elem.phrasing
| img.elem
| embed.elem
| object.elem.phrasing
@@ -109,6 +109,8 @@
| hgroup.elem
| address.elem
| blockquote.elem
+ | ins.elem.flow
+ | del.elem.flow
| object.elem.flow
| map.elem.flow
| noscript.elem.flow
@@ -725,14 +727,18 @@
edit.attrs.datetime = attribute datetime { common.data.datetime }
## Inserts: <ins>
- ins.elem = element ins { ins.inner & ins.attrs }
+ ins.elem.flow = element ins { ins.inner.flow & ins.attrs }
+ ins.elem.phrasing = element ins { ins.inner.phrasing & ins.attrs }
ins.attrs = common.attrs & edit.attrs.cite? & edit.attrs.datetime?
- ins.inner = common.inner.phrasing
+ ins.inner.flow = common.inner.flow
+ ins.inner.phrasing = common.inner.phrasing
## Deletions: <del>
- del.elem = element del { del.inner & del.attrs }
+ del.elem.flow = element del { del.inner.flow & del.attrs }
+ del.elem.phrasing = element del { del.inner.phrasing & del.attrs }
del.attrs = common.attrs & edit.attrs.cite? & edit.attrs.datetime?
- del.inner = common.inner.phrasing
+ del.inner.flow = common.inner.flow
+ del.inner.phrasing = common.inner.phrasing
}
}
div {
Index: spec.html
===================================================================
RCS file: /sources/public/html5/markup/spec.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- spec.html 30 May 2009 11:38:55 -0000 1.16
+++ spec.html 30 May 2009 12:05:46 -0000 1.17
@@ -4319,14 +4319,21 @@
<div class="no-number no-toc" id="del-content">
<h2 class="element-subhead">Content model <a class="hash" href="#del-content">#</a>
</h2>
- <div class="content-models" id="del-mdls">
- <p class="elem-mdl"><span class="element-pattern-name"><a id="del-mdl" href="#del-mdl" class="element">del</a> = </span><span>
+ <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.elem.flow"><span class="element">del</span>.elem.flow</a> = </span></dt>
+ <dd class="elem-mdl"><span>
+ (text
+ & <a class="ref" href="#common.elem.flow">common.elem.flow</a>*)
+ & <a class="ref" href="#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.elem.phrasing"><span class="element">del</span>.elem.phrasing</a> = </span></dt>
+ <dd class="elem-mdl"><span>
(text
& <a class="ref" href="#common.elem.phrasing">common.elem.phrasing</a>*)
& <a class="ref" href="#del.attrs">del.attrs</a>
- </span></p>
- </div>
- </div>
+ </span></dd>
+ </dl>
+</div>
<div class="no-number no-toc" id="del-attr-mdl">
<h2 class="element-subhead">Attribute model <a class="hash" href="#del-attr-mdl">#</a>
</h2>
@@ -4369,7 +4376,10 @@
<div class="no-number no-toc" id="del-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#del-context">#</a>
</h2>
- <ul><li class="context-mdl"><a href="#common.elem.phrasing">common.elem.phrasing</a></li></ul>
+ <ul>
+<li class="context-mdl"><a href="#common.elem.phrasing">common.elem.phrasing</a></li>
+ <li class="context-mdl"><a href="#common.elem.flow">common.elem.flow</a></li>
+</ul>
</div>
<div class="no-number no-toc" id="del-display">
<h2 class="element-subhead">Typical default display properties <a class="hash" href="#del-display">#</a>
@@ -8990,14 +9000,21 @@
<div class="no-number no-toc" id="ins-content">
<h2 class="element-subhead">Content model <a class="hash" href="#ins-content">#</a>
</h2>
- <div class="content-models" id="ins-mdls">
- <p class="elem-mdl"><span class="element-pattern-name"><a id="ins-mdl" href="#ins-mdl" class="element">ins</a> = </span><span>
+ <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.elem.flow"><span class="element">ins</span>.elem.flow</a> = </span></dt>
+ <dd class="elem-mdl"><span>
+ (text
+ & <a class="ref" href="#common.elem.flow">common.elem.flow</a>*)
+ & <a class="ref" href="#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.elem.phrasing"><span class="element">ins</span>.elem.phrasing</a> = </span></dt>
+ <dd class="elem-mdl"><span>
(text
& <a class="ref" href="#common.elem.phrasing">common.elem.phrasing</a>*)
& <a class="ref" href="#ins.attrs">ins.attrs</a>
- </span></p>
- </div>
- </div>
+ </span></dd>
+ </dl>
+</div>
<div class="no-number no-toc" id="ins-attr-mdl">
<h2 class="element-subhead">Attribute model <a class="hash" href="#ins-attr-mdl">#</a>
</h2>
@@ -9040,7 +9057,10 @@
<div class="no-number no-toc" id="ins-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#ins-context">#</a>
</h2>
- <ul><li class="context-mdl"><a href="#common.elem.phrasing">common.elem.phrasing</a></li></ul>
+ <ul>
+<li class="context-mdl"><a href="#common.elem.phrasing">common.elem.phrasing</a></li>
+ <li class="context-mdl"><a href="#common.elem.flow">common.elem.flow</a></li>
+</ul>
</div>
<div class="no-number no-toc" id="ins-display">
<h2 class="element-subhead">Typical default display properties <a class="hash" href="#ins-display">#</a>
@@ -13658,6 +13678,8 @@
| <a class="ref" href="#hgroup">hgroup</a>
| <a class="ref" href="#address">address</a>
| <a class="ref" href="#blockquote">blockquote</a>
+ | <a class="ref" href="#ins.elem.flow">ins.elem.flow</a>
+ | <a class="ref" href="#del.elem.flow">del.elem.flow</a>
| <a class="ref" href="#object.elem.flow">object.elem.flow</a>
| <a class="ref" href="#map.elem.flow">map.elem.flow</a>
| <a class="ref" href="#noscript.elem.flow">noscript.elem.flow</a>
@@ -13730,8 +13752,8 @@
| <a class="ref" href="#span">span</a>
| <a class="ref" href="#bdo">bdo</a>
| <a class="ref" href="#br">br</a>
- | <a class="ref" href="#ins">ins</a>
- | <a class="ref" href="#del">del</a>
+ | <a class="ref" href="#ins.elem.phrasing">ins.elem.phrasing</a>
+ | <a class="ref" href="#del.elem.phrasing">del.elem.phrasing</a>
| <a class="ref" href="#img">img</a>
| <a class="ref" href="#embed">embed</a>
| <a class="ref" href="#object.elem.phrasing">object.elem.phrasing</a>
Received on Saturday, 30 May 2009 12:05:55 UTC