- From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
- Date: Mon, 15 Jun 2009 13:20:27 +0000
- To: public-html-commits@w3.org
Update of /sources/public/html5/markup
In directory hutz:/tmp/cvs-serv23251
Modified Files:
del.html ins.html patch-schema schema.html schema.rnc
spec.html
Log Message:
h:tml; fixed problem that was preventing attribute descriptions for ins and del elements from getting picked up correctly
Index: ins.html
===================================================================
RCS file: /sources/public/html5/markup/ins.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ins.html 3 Jun 2009 10:12:58 -0000 1.6
+++ ins.html 15 Jun 2009 13:20:24 -0000 1.7
@@ -38,20 +38,21 @@
<h2 class="element-subhead">Attribute model <a class="hash" href="#ins-attr-mdl">#</a></h2>
<div class="attr-content-models">
<p><a href="ins.html#ins.attrs">ins.attrs</a> = <span class="pattern" id="ins.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
- & <a class="ref" href="ins.html#ins-edit.attrs.cite">cite</a>?
- & <a class="ref" href="ins.html#ins-edit.attrs.datetime">datetime</a>?</span></p></div></div>
+ & <a class="ref" href="ins.html#ins.attrs.cite" title="ins.attrs.cite">cite</a>?
+ & <a class="ref" href="ins.html#ins.attrs.datetime" title="ins.attrs.datetime">datetime</a>?</span></p></div></div>
<div class="no-number no-toc" id="ins-attributes">
<h2 class="element-subhead">Element-specific attributes <a class="hash" href="#ins-attributes">#</a></h2>
<dl class="attr-defs">
- <dt><a class="attribute-name" id="ins-edit.attrs.cite" title="ins-edit.attrs.cite" href="ins.html#ins-edit.attrs.cite">cite</a><span class="attr-values"> =
+ <dt><a class="attribute-name" id="ins.attrs.cite" title="ins.attrs.cite" href="ins.html#ins.attrs.cite">cite</a><span class="attr-values"> =
<a class="ref" href="datatypes.html#common.data.uri" title="common.data.uri">uri</a>
</span> </dt>
- <dd><i class="TK">(detailed attribute description to come)</i></dd>
+ <dd>The address of a document that explains why the text was
+ added.</dd>
- <dt><a class="attribute-name" id="ins-edit.attrs.datetime" title="ins-edit.attrs.datetime" href="ins.html#ins-edit.attrs.datetime">datetime</a><span class="attr-values"> =
+ <dt><a class="attribute-name" id="ins.attrs.datetime" title="ins.attrs.datetime" href="ins.html#ins.attrs.datetime">datetime</a><span class="attr-values"> =
<a class="ref" href="datatypes.html#common.data.datetime" title="common.data.datetime">datetime</a>
</span> </dt>
- <dd><i class="TK">(detailed attribute description to come)</i></dd>
+ <dd>The time and date when the text was added.</dd>
</dl></div>
Index: schema.html
===================================================================
RCS file: /sources/public/html5/markup/schema.html,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -d -r1.101 -r1.102
--- schema.html 15 Jun 2009 05:57:15 -0000 1.101
+++ schema.html 15 Jun 2009 13:20:24 -0000 1.102
@@ -2033,31 +2033,11 @@
</div>
<div class='chunk'>
<div class='chunk'>
-<div class='define' id='edit.attrs.cite-define'>
+<div class='define' id='ins.elem.flow-define'>
<span class='comment'># #####################################################################</span>
<span class='comment'>## RELAX NG Schema for HTML 5: Revision Annotations #</span>
<span class='comment'># #####################################################################</span>
-<span class='comment'>## Common Attributes</span>
- <div class='patternname' id='the-edit.attrs.cite'><a href='#the-edit.attrs.cite'>edit.attrs.cite</a> =</div>
- <span class='pattern' id='edit.attrs.cite'><span class='type'>attribute </span>
- <span class='name'>cite</span>
- {<span class='model'>
- <a class='ref' href='#common.data.uri'>common.data.uri</a>
- </span>}
- </span>
-</div>
-<div class='define' id='edit.attrs.datetime-define'>
- <div class='patternname' id='the-edit.attrs.datetime'><a href='#the-edit.attrs.datetime'>edit.attrs.datetime</a> =</div>
- <span class='pattern' id='edit.attrs.datetime'><span class='type'>attribute </span>
- <span class='name'>datetime</span>
- {<span class='model'>
- <a class='ref' href='#common.data.datetime'>common.data.datetime</a>
- </span>}
- </span>
-</div>
-<div class='define' id='ins.elem.flow-define'>
-
<span class='comment'>## Inserts: <ins></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>
@@ -2081,8 +2061,26 @@
<div class='define' id='ins.attrs-define'>
<div class='patternname' id='the-ins.attrs'><a href='#the-ins.attrs'>ins.attrs</a> =</div>
<span class='pattern' id='ins.attrs'><a class='ref' href='#common.attrs'>common.attrs</a>
- & <a class='ref' href='#edit.attrs.cite'>edit.attrs.cite</a>?
- & <a class='ref' href='#edit.attrs.datetime'>edit.attrs.datetime</a>?</span>
+ & <a class='ref' href='#ins.attrs.cite'>ins.attrs.cite</a>?
+ & <a class='ref' href='#ins.attrs.datetime'>ins.attrs.datetime</a>?</span>
+</div>
+<div class='define' id='ins.attrs.cite-define'>
+ <div class='patternname' id='the-ins.attrs.cite'><a href='#the-ins.attrs.cite'>ins.attrs.cite</a> =</div>
+ <span class='pattern' id='ins.attrs.cite'><span class='type'>attribute </span>
+ <span class='name'>cite</span>
+ {<span class='model'>
+ <a class='ref' href='#common.data.uri'>common.data.uri</a>
+ </span>}
+ </span>
+</div>
+<div class='define' id='ins.attrs.datetime-define'>
+ <div class='patternname' id='the-ins.attrs.datetime'><a href='#the-ins.attrs.datetime'>ins.attrs.datetime</a> =</div>
+ <span class='pattern' id='ins.attrs.datetime'><span class='type'>attribute </span>
+ <span class='name'>datetime</span>
+ {<span class='model'>
+ <a class='ref' href='#common.data.datetime'>common.data.datetime</a>
+ </span>}
+ </span>
</div>
<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>
@@ -2117,8 +2115,26 @@
<div class='define' id='del.attrs-define'>
<div class='patternname' id='the-del.attrs'><a href='#the-del.attrs'>del.attrs</a> =</div>
<span class='pattern' id='del.attrs'><a class='ref' href='#common.attrs'>common.attrs</a>
- & <a class='ref' href='#edit.attrs.cite'>edit.attrs.cite</a>?
- & <a class='ref' href='#edit.attrs.datetime'>edit.attrs.datetime</a>?</span>
+ & <a class='ref' href='#del.attrs.cite'>del.attrs.cite</a>?
+ & <a class='ref' href='#del.attrs.datetime'>del.attrs.datetime</a>?</span>
+</div>
+<div class='define' id='del.attrs.cite-define'>
+ <div class='patternname' id='the-del.attrs.cite'><a href='#the-del.attrs.cite'>del.attrs.cite</a> =</div>
+ <span class='pattern' id='del.attrs.cite'><span class='type'>attribute </span>
+ <span class='name'>cite</span>
+ {<span class='model'>
+ <a class='ref' href='#common.data.uri'>common.data.uri</a>
+ </span>}
+ </span>
+</div>
+<div class='define' id='del.attrs.datetime-define'>
+ <div class='patternname' id='the-del.attrs.datetime'><a href='#the-del.attrs.datetime'>del.attrs.datetime</a> =</div>
+ <span class='pattern' id='del.attrs.datetime'><span class='type'>attribute </span>
+ <span class='name'>datetime</span>
+ {<span class='model'>
+ <a class='ref' href='#common.data.datetime'>common.data.datetime</a>
+ </span>}
+ </span>
</div>
<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>
Index: del.html
===================================================================
RCS file: /sources/public/html5/markup/del.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- del.html 3 Jun 2009 10:12:58 -0000 1.6
+++ del.html 15 Jun 2009 13:20:24 -0000 1.7
@@ -38,20 +38,21 @@
<h2 class="element-subhead">Attribute model <a class="hash" href="#del-attr-mdl">#</a></h2>
<div class="attr-content-models">
<p><a href="del.html#del.attrs">del.attrs</a> = <span class="pattern" id="del.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
- & <a class="ref" href="del.html#del-edit.attrs.cite">cite</a>?
- & <a class="ref" href="del.html#del-edit.attrs.datetime">datetime</a>?</span></p></div></div>
+ & <a class="ref" href="del.html#del.attrs.cite" title="del.attrs.cite">cite</a>?
+ & <a class="ref" href="del.html#del.attrs.datetime" title="del.attrs.datetime">datetime</a>?</span></p></div></div>
<div class="no-number no-toc" id="del-attributes">
<h2 class="element-subhead">Element-specific attributes <a class="hash" href="#del-attributes">#</a></h2>
<dl class="attr-defs">
- <dt><a class="attribute-name" id="del-edit.attrs.cite" title="del-edit.attrs.cite" href="del.html#del-edit.attrs.cite">cite</a><span class="attr-values"> =
+ <dt><a class="attribute-name" id="del.attrs.cite" title="del.attrs.cite" href="del.html#del.attrs.cite">cite</a><span class="attr-values"> =
<a class="ref" href="datatypes.html#common.data.uri" title="common.data.uri">uri</a>
</span> </dt>
- <dd><i class="TK">(detailed attribute description to come)</i></dd>
+ <dd>The address of a document that explains why the text was
+ deleted.</dd>
- <dt><a class="attribute-name" id="del-edit.attrs.datetime" title="del-edit.attrs.datetime" href="del.html#del-edit.attrs.datetime">datetime</a><span class="attr-values"> =
+ <dt><a class="attribute-name" id="del.attrs.datetime" title="del.attrs.datetime" href="del.html#del.attrs.datetime">datetime</a><span class="attr-values"> =
<a class="ref" href="datatypes.html#common.data.datetime" title="common.data.datetime">datetime</a>
</span> </dt>
- <dd><i class="TK">(detailed attribute description to come)</i></dd>
+ <dd>The time and date when the text was deleted.</dd>
</dl></div>
Index: schema.rnc
===================================================================
RCS file: /sources/public/html5/markup/schema.rnc,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -d -r1.88 -r1.89
--- schema.rnc 15 Jun 2009 05:57:15 -0000 1.88
+++ schema.rnc 15 Jun 2009 13:20:24 -0000 1.89
@@ -724,21 +724,21 @@
# #####################################################################
## RELAX NG Schema for HTML 5: Revision Annotations #
# #####################################################################
- ## Common Attributes
- edit.attrs.cite = attribute cite { common.data.uri }
- edit.attrs.datetime = attribute datetime { common.data.datetime }
-
## Inserts: <ins>
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.attrs = common.attrs & ins.attrs.cite? & ins.attrs.datetime?
+ ins.attrs.cite = attribute cite { common.data.uri }
+ ins.attrs.datetime = attribute datetime { common.data.datetime }
ins.inner.flow = common.inner.flow
ins.inner.phrasing = common.inner.phrasing
## Deletions: <del>
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.attrs = common.attrs & del.attrs.cite? & del.attrs.datetime?
+ del.attrs.cite = attribute cite { common.data.uri }
+ del.attrs.datetime = attribute datetime { common.data.datetime }
del.inner.flow = common.inner.flow
del.inner.phrasing = common.inner.phrasing
}
Index: patch-schema
===================================================================
RCS file: /sources/public/html5/markup/patch-schema,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- patch-schema 26 May 2009 23:37:16 -0000 1.58
+++ patch-schema 15 Jun 2009 13:20:24 -0000 1.59
@@ -1,3 +1,65 @@
+Index: schema/revision.rnc
+===================================================================
+--- schema/revision.rnc (revision 436)
++++ schema/revision.rnc (working copy)
+@@ -2,17 +2,6 @@
+ ## RELAX NG Schema for HTML 5: Revision Annotations #
+ # #####################################################################
+
+-## Common Attributes
+-
+- edit.attrs.cite =
+- attribute cite {
+- common.data.uri
+- }
+- edit.attrs.datetime =
+- attribute datetime {
+- common.data.datetime
+- }
+-
+ ## Inserts: <ins>
+
+ ins.elem.flow =
+@@ -21,9 +10,17 @@
+ element ins { ins.inner.phrasing & ins.attrs }
+ ins.attrs =
+ ( common.attrs
+- & edit.attrs.cite?
+- & edit.attrs.datetime?
++ & ins.attrs.cite?
++ & ins.attrs.datetime?
+ )
++ ins.attrs.cite =
++ attribute cite {
++ common.data.uri
++ }
++ ins.attrs.datetime =
++ attribute datetime {
++ common.data.datetime
++ }
+ ins.inner.flow =
+ ( common.inner.flow )
+ ins.inner.phrasing =
+@@ -40,9 +37,17 @@
+ element del { del.inner.phrasing & del.attrs }
+ del.attrs =
+ ( common.attrs
+- & edit.attrs.cite?
+- & edit.attrs.datetime?
++ & del.attrs.cite?
++ & del.attrs.datetime?
+ )
++ del.attrs.cite =
++ attribute cite {
++ common.data.uri
++ }
++ del.attrs.datetime =
++ attribute datetime {
++ common.data.datetime
++ }
+ del.inner.flow =
+ ( common.inner.flow )
+ del.inner.phrasing =
Index: schema/web-forms.rnc
===================================================================
--- schema/web-forms.rnc (revision 431)
Index: spec.html
===================================================================
RCS file: /sources/public/html5/markup/spec.html,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- spec.html 15 Jun 2009 05:57:15 -0000 1.33
+++ spec.html 15 Jun 2009 13:20:24 -0000 1.34
@@ -4339,8 +4339,8 @@
</h2>
<div class="attr-content-models">
<p><a href="#del.attrs">del.attrs</a> = <span class="pattern" id="del.attrs"><a class="ref" href="#common.attrs">common.attrs</a>
- & <a class="ref" href="#del-edit.attrs.cite">cite</a>?
- & <a class="ref" href="#del-edit.attrs.datetime">datetime</a>?</span></p>
+ & <a class="ref" href="#del.attrs.cite" title="del.attrs.cite">cite</a>?
+ & <a class="ref" href="#del.attrs.datetime" title="del.attrs.datetime">datetime</a>?</span></p>
</div>
</div>
<div class="no-number no-toc" id="del-attributes">
@@ -4348,16 +4348,17 @@
</h2>
<dl class="attr-defs">
<dt>
-<a class="attribute-name" id="del-edit.attrs.cite" title="del-edit.attrs.cite" href="#del-edit.attrs.cite">cite</a><span class="attr-values"> =
+<a class="attribute-name" id="del.attrs.cite" title="del.attrs.cite" href="#del.attrs.cite">cite</a><span class="attr-values"> =
<a class="ref" href="#common.data.uri" title="common.data.uri">uri</a>
</span> </dt>
- <dd><i class="TK">(detailed attribute description to come)</i></dd>
+ <dd>The address of a document that explains why the text was
+ deleted.</dd>
<dt>
-<a class="attribute-name" id="del-edit.attrs.datetime" title="del-edit.attrs.datetime" href="#del-edit.attrs.datetime">datetime</a><span class="attr-values"> =
+<a class="attribute-name" id="del.attrs.datetime" title="del.attrs.datetime" href="#del.attrs.datetime">datetime</a><span class="attr-values"> =
<a class="ref" href="#common.data.datetime" title="common.data.datetime">datetime</a>
</span> </dt>
- <dd><i class="TK">(detailed attribute description to come)</i></dd>
+ <dd>The time and date when the text was deleted.</dd>
</dl>
</div>
@@ -8908,8 +8909,8 @@
</h2>
<div class="attr-content-models">
<p><a href="#ins.attrs">ins.attrs</a> = <span class="pattern" id="ins.attrs"><a class="ref" href="#common.attrs">common.attrs</a>
- & <a class="ref" href="#ins-edit.attrs.cite">cite</a>?
- & <a class="ref" href="#ins-edit.attrs.datetime">datetime</a>?</span></p>
+ & <a class="ref" href="#ins.attrs.cite" title="ins.attrs.cite">cite</a>?
+ & <a class="ref" href="#ins.attrs.datetime" title="ins.attrs.datetime">datetime</a>?</span></p>
</div>
</div>
<div class="no-number no-toc" id="ins-attributes">
@@ -8917,16 +8918,17 @@
</h2>
<dl class="attr-defs">
<dt>
-<a class="attribute-name" id="ins-edit.attrs.cite" title="ins-edit.attrs.cite" href="#ins-edit.attrs.cite">cite</a><span class="attr-values"> =
+<a class="attribute-name" id="ins.attrs.cite" title="ins.attrs.cite" href="#ins.attrs.cite">cite</a><span class="attr-values"> =
<a class="ref" href="#common.data.uri" title="common.data.uri">uri</a>
</span> </dt>
- <dd><i class="TK">(detailed attribute description to come)</i></dd>
+ <dd>The address of a document that explains why the text was
+ added.</dd>
<dt>
-<a class="attribute-name" id="ins-edit.attrs.datetime" title="ins-edit.attrs.datetime" href="#ins-edit.attrs.datetime">datetime</a><span class="attr-values"> =
+<a class="attribute-name" id="ins.attrs.datetime" title="ins.attrs.datetime" href="#ins.attrs.datetime">datetime</a><span class="attr-values"> =
<a class="ref" href="#common.data.datetime" title="common.data.datetime">datetime</a>
</span> </dt>
- <dd><i class="TK">(detailed attribute description to come)</i></dd>
+ <dd>The time and date when the text was added.</dd>
</dl>
</div>
Received on Monday, 15 June 2009 13:20:33 UTC