- From: poot <cvsmail@w3.org>
- Date: Fri, 26 Mar 2010 20:31:45 +0900 (JST)
- To: public-html-diffs@w3.org
mike: "allow-top-navigation" added to list of iframe/@sandbox values
http://dev.w3.org/cvsweb/html5/markup/spec.html?r1=1.201&r2=1.202&f=h
===================================================================
RCS file: /sources/public/html5/markup/Overview.html,v
retrieving revision 1.406
retrieving revision 1.407
diff -u -d -r1.406 -r1.407
--- Overview.html 24 Mar 2010 20:46:41 -0000 1.406
+++ Overview.html 26 Mar 2010 11:31:18 -0000 1.407
@@ -10,7 +10,7 @@
<div class="head">
<div><a href="http://www.w3.org/"><img height="48" width="72" alt="W3C" src="http://www.w3.org/Icons/w3c_home"></a></div>
<h1>HTML: The Markup Language</h1>
-<h2>W3C Editor’s Draft <em>25 March 2010</em>
+<h2>W3C Editor’s Draft <em>26 March 2010</em>
</h2>
<dl>
<dt>Latest Editor’s Draft:</dt>
@@ -51,7 +51,7 @@
reports index</a> at http://www.w3.org/TR/.
</em></p>
<p>
- This document is the 25 March 2010 Editor’s Draft of
+ This document is the 26 March 2010 Editor’s Draft of
<cite>HTML: The Markup Language</cite>.
If you’d like to comment on this document, the preferred
Index: schema.html
===================================================================
RCS file: /sources/public/html5/markup/schema.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- schema.html 24 Mar 2010 20:47:05 -0000 1.15
+++ schema.html 26 Mar 2010 11:31:18 -0000 1.16
@@ -2503,34 +2503,148 @@
<div class='define' id='common.data.sandbox-allow-list-define'>
<div class='patternname' id='the-common.data.sandbox-allow-list'><a href='#the-common.data.sandbox-allow-list'>sandbox-allow-list</a> =</div>
<span class='pattern' id='common.data.sandbox-allow-list'> <span class='agroupof'>list{
+ d:string "allow-top-navigation"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> <span class='postfix followedby'>followed by</span>
d:string "allow-same-origin"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> <span class='postfix followedby'>followed by</span>
d:string "allow-forms"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> <span class='postfix followedby'>followed by</span>
d:string "allow-scripts"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span>
}
<span class='postfix or'>or</span> list{
+ d:string "allow-top-navigation"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> <span class='postfix followedby'>followed by</span>
+ d:string "allow-same-origin"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> <span class='postfix followedby'>followed by</span>
+ d:string "allow-scripts"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> <span class='postfix followedby'>followed by</span>
+ d:string "allow-forms"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span>
+ }
+ <span class='postfix or'>or</span> list{
+ d:string "allow-top-navigation"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> <span class='postfix followedby'>followed by</span>
+ d:string "allow-forms"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> <span class='postfix followedby'>followed by</span>
+ d:string "allow-same-origin"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> <span class='postfix followedby'>followed by</span>
+ d:string "allow-scripts"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span>
+ }
+ <span class='postfix or'>or</span> list{
+ d:string "allow-top-navigation"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> <span class='postfix followedby'>followed by</span>
+ d:string "allow-forms"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> <span class='postfix followedby'>followed by</span>
+ d:string "allow-scripts"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> <span class='postfix followedby'>followed by</span>
+ d:string "allow-same-origin"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span>
+ }
+ <span class='postfix or'>or</span> list{
+ d:string "allow-top-navigation"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> <span class='postfix followedby'>followed by</span>
+ d:string "allow-scripts"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> <span class='postfix followedby'>followed by</span>
+ d:string "allow-same-origin"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> <span class='postfix followedby'>followed by</span>
+ d:string "allow-forms"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span>
+ }
+ <span class='postfix or'>or</span> list{
+ d:string "allow-top-navigation"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> <span class='postfix followedby'>followed by</span>
+ d:string "allow-scripts"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> <span class='postfix followedby'>followed by</span>
+ d:string "allow-forms"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> <span class='postfix followedby'>followed by</span>
+ d:string "allow-same-origin"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span>
+ }
+ <span class='postfix or'>or</span> list{
+ d:string "allow-same-origin"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> <span class='postfix followedby'>followed by</span>
+ d:string "allow-top-navigation"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> <span class='postfix followedby'>followed by</span>
+ d:string "allow-forms"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> <span class='postfix followedby'>followed by</span>
+ d:string "allow-scripts"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span>
+ }
+ <span class='postfix or'>or</span> list{
+ d:string "allow-same-origin"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> <span class='postfix followedby'>followed by</span>
+ d:string "allow-top-navigation"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> <span class='postfix followedby'>followed by</span>
+ d:string "allow-scripts"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> <span class='postfix followedby'>followed by</span>
+ d:string "allow-forms"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span>
+ }
+ <span class='postfix or'>or</span> list{
+ d:string "allow-forms"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> <span class='postfix followedby'>followed by</span>
+ d:string "allow-top-navigation"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> <span class='postfix followedby'>followed by</span>
+ d:string "allow-same-origin"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> <span class='postfix followedby'>followed by</span>
+ d:string "allow-scripts"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span>
+ }
+ <span class='postfix or'>or</span> list{
+ d:string "allow-forms"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> <span class='postfix followedby'>followed by</span>
+ d:string "allow-top-navigation"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> <span class='postfix followedby'>followed by</span>
+ d:string "allow-scripts"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> <span class='postfix followedby'>followed by</span>
+ d:string "allow-same-origin"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span>
+ }
+ <span class='postfix or'>or</span> list{
+ d:string "allow-scripts"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> <span class='postfix followedby'>followed by</span>
+ d:string "allow-top-navigation"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> <span class='postfix followedby'>followed by</span>
+ d:string "allow-same-origin"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> <span class='postfix followedby'>followed by</span>
+ d:string "allow-forms"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span>
+ }
+ <span class='postfix or'>or</span> list{
+ d:string "allow-scripts"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> <span class='postfix followedby'>followed by</span>
+ d:string "allow-top-navigation"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> <span class='postfix followedby'>followed by</span>
+ d:string "allow-forms"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> <span class='postfix followedby'>followed by</span>
+ d:string "allow-same-origin"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span>
+ }
+ <span class='postfix or'>or</span> list{
+ d:string "allow-same-origin"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> <span class='postfix followedby'>followed by</span>
+ d:string "allow-forms"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> <span class='postfix followedby'>followed by</span>
+ d:string "allow-top-navigation"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> <span class='postfix followedby'>followed by</span>
+ d:string "allow-scripts"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span>
+ }
+ <span class='postfix or'>or</span> list{
d:string "allow-same-origin"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> <span class='postfix followedby'>followed by</span>
d:string "allow-scripts"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> <span class='postfix followedby'>followed by</span>
+ d:string "allow-top-navigation"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> <span class='postfix followedby'>followed by</span>
d:string "allow-forms"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span>
}
<span class='postfix or'>or</span> list{
d:string "allow-forms"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> <span class='postfix followedby'>followed by</span>
d:string "allow-same-origin"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> <span class='postfix followedby'>followed by</span>
+ d:string "allow-top-navigation"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> <span class='postfix followedby'>followed by</span>
d:string "allow-scripts"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span>
}
<span class='postfix or'>or</span> list{
d:string "allow-forms"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> <span class='postfix followedby'>followed by</span>
d:string "allow-scripts"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> <span class='postfix followedby'>followed by</span>
+ d:string "allow-top-navigation"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> <span class='postfix followedby'>followed by</span>
d:string "allow-same-origin"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span>
}
<span class='postfix or'>or</span> list{
d:string "allow-scripts"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> <span class='postfix followedby'>followed by</span>
d:string "allow-same-origin"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> <span class='postfix followedby'>followed by</span>
+ d:string "allow-top-navigation"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> <span class='postfix followedby'>followed by</span>
d:string "allow-forms"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span>
}
<span class='postfix or'>or</span> list{
d:string "allow-scripts"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> <span class='postfix followedby'>followed by</span>
d:string "allow-forms"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> <span class='postfix followedby'>followed by</span>
+ d:string "allow-top-navigation"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> <span class='postfix followedby'>followed by</span>
d:string "allow-same-origin"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span>
+ }
+ <span class='postfix or'>or</span> list{
+ d:string "allow-same-origin"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> <span class='postfix followedby'>followed by</span>
+ d:string "allow-forms"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> <span class='postfix followedby'>followed by</span>
+ d:string "allow-scripts"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> <span class='postfix followedby'>followed by</span>
+ d:string "allow-top-navigation"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span>
+ }
+ <span class='postfix or'>or</span> list{
+ d:string "allow-same-origin"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> <span class='postfix followedby'>followed by</span>
+ d:string "allow-scripts"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> <span class='postfix followedby'>followed by</span>
+ d:string "allow-forms"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> <span class='postfix followedby'>followed by</span>
+ d:string "allow-top-navigation"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span>
+ }
+ <span class='postfix or'>or</span> list{
+ d:string "allow-forms"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> <span class='postfix followedby'>followed by</span>
+ d:string "allow-same-origin"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> <span class='postfix followedby'>followed by</span>
+ d:string "allow-scripts"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> <span class='postfix followedby'>followed by</span>
+ d:string "allow-top-navigation"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span>
+ }
+ <span class='postfix or'>or</span> list{
+ d:string "allow-forms"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> <span class='postfix followedby'>followed by</span>
+ d:string "allow-scripts"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> <span class='postfix followedby'>followed by</span>
+ d:string "allow-same-origin"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> <span class='postfix followedby'>followed by</span>
+ d:string "allow-top-navigation"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span>
+ }
+ <span class='postfix or'>or</span> list{
+ d:string "allow-scripts"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> <span class='postfix followedby'>followed by</span>
+ d:string "allow-same-origin"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> <span class='postfix followedby'>followed by</span>
+ d:string "allow-forms"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> <span class='postfix followedby'>followed by</span>
+ d:string "allow-top-navigation"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span>
+ }
+ <span class='postfix or'>or</span> list{
+ d:string "allow-scripts"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> <span class='postfix followedby'>followed by</span>
+ d:string "allow-forms"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> <span class='postfix followedby'>followed by</span>
+ d:string "allow-same-origin"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> <span class='postfix followedby'>followed by</span>
+ d:string "allow-top-navigation"<span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span>
}</span>
<span class='postfix intermixed'>intermixed with</span> empty</span>
</div>
Index: datatypes.html
===================================================================
RCS file: /sources/public/html5/markup/datatypes.html,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- datatypes.html 8 Mar 2010 17:28:44 -0000 1.44
+++ datatypes.html 26 Mar 2010 11:31:18 -0000 1.45
@@ -627,6 +627,7 @@
<li>"<code>allow-same-origin</code>"</li>
<li>"<code>allow-forms</code>"</li>
<li>"<code>allow-scripts</code>"</li>
+ <li>"<code>allow-top-navigation</code>"</li>
</ul>
</div>
</div>
Index: patch-schema
===================================================================
RCS file: /sources/public/html5/markup/patch-schema,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -d -r1.88 -r1.89
--- patch-schema 7 Mar 2010 11:57:31 -0000 1.88
+++ patch-schema 26 Mar 2010 11:31:18 -0000 1.89
@@ -1,6 +1,6 @@
Index: schema/revision.rnc
===================================================================
---- schema/revision.rnc (revision 538)
+--- schema/revision.rnc (revision 540)
+++ schema/revision.rnc (working copy)
@@ -2,17 +2,6 @@
## RELAX NG Schema for HTML 5: Revision Annotations #
@@ -62,7 +62,7 @@
del.inner.phrasing =
Index: schema/web-forms.rnc
===================================================================
---- schema/web-forms.rnc (revision 538)
+--- schema/web-forms.rnc (revision 540)
+++ schema/web-forms.rnc (working copy)
@@ -9,6 +9,7 @@
common-form.attrs =
@@ -170,7 +170,7 @@
Index: schema/tables.rnc
===================================================================
---- schema/tables.rnc (revision 538)
+--- schema/tables.rnc (revision 540)
+++ schema/tables.rnc (working copy)
@@ -157,38 +157,6 @@
tr.inner =
@@ -276,7 +276,7 @@
( common.inner.flow )
Index: schema/embed.rnc
===================================================================
---- schema/embed.rnc (revision 538)
+--- schema/embed.rnc (revision 540)
+++ schema/embed.rnc (working copy)
@@ -248,7 +248,7 @@
}
@@ -307,19 +307,19 @@
+ }
+ common.data.sandbox-allow-list =
+ ( list
- { ( w:string "allow-same-origin" )?
- , ( w:string "allow-forms" )?
- , ( w:string "allow-scripts" )?
-@@ -350,7 +353,7 @@
+ { ( w:string "allow-top-navigation" )?
+ , ( w:string "allow-same-origin" )?
, ( w:string "allow-forms" )?
+@@ -464,7 +467,7 @@
, ( w:string "allow-same-origin" )?
+ , ( w:string "allow-top-navigation" )?
}
- } & v5only
+ ) & v5only
iframe.inner =
( text )
-@@ -388,20 +391,44 @@
+@@ -502,20 +505,44 @@
area.attrs =
( common.attrs
& ( area.attrs.alt
@@ -371,7 +371,7 @@
area.attrs.shape =
( ( area.attrs.shape.rect? & area.attrs.coords.rect )
| ( area.attrs.shape.circle & area.attrs.coords.circle )
-@@ -414,7 +441,7 @@
+@@ -528,7 +555,7 @@
}
area.attrs.coords.rect =
attribute coords {
@@ -380,7 +380,7 @@
# xsd:token {
# pattern = "-?[0-9]+,-?[0-9]+,-?[0-9]+,-?[0-9]+"
# }
-@@ -425,7 +452,7 @@
+@@ -539,7 +566,7 @@
}
area.attrs.coords.circle =
attribute coords {
@@ -389,7 +389,7 @@
# xsd:token {
# pattern = "-?[0-9]+,-?[0-9]+,[0-9]+"
# }
-@@ -436,7 +463,7 @@
+@@ -550,7 +577,7 @@
}
area.attrs.coords.poly =
attribute coords {
@@ -400,7 +400,7 @@
# }
Index: schema/media.rnc
===================================================================
---- schema/media.rnc (revision 538)
+--- schema/media.rnc (revision 540)
+++ schema/media.rnc (working copy)
@@ -4,32 +4,6 @@
## RELAX NG Schema for HTML 5: Advanced Embedded Content #
@@ -556,7 +556,7 @@
Index: schema/phrase.rnc
===================================================================
---- schema/phrase.rnc (revision 538)
+--- schema/phrase.rnc (revision 540)
+++ schema/phrase.rnc (working copy)
@@ -13,13 +13,12 @@
a.attrs =
@@ -650,7 +650,7 @@
em.elem =
Index: schema/web-forms2.rnc
===================================================================
---- schema/web-forms2.rnc (revision 538)
+--- schema/web-forms2.rnc (revision 540)
+++ schema/web-forms2.rnc (working copy)
@@ -6,9 +6,6 @@
@@ -702,7 +702,7 @@
attribute autocomplete {
Index: schema/meta.rnc
===================================================================
---- schema/meta.rnc (revision 538)
+--- schema/meta.rnc (revision 540)
+++ schema/meta.rnc (working copy)
@@ -101,7 +101,7 @@
title.attrs =
@@ -713,7 +713,7 @@
## Base URI: <base>
-@@ -118,7 +118,7 @@
+@@ -121,7 +121,7 @@
}
base.attrs.target =
attribute target {
@@ -722,7 +722,7 @@
}
base.inner =
( empty )
-@@ -129,11 +129,11 @@
+@@ -132,11 +132,11 @@
element link { link.inner & link.attrs }
link.attrs =
( common.attrs
@@ -739,7 +739,7 @@
& link.attrs.sizes?
# link.attrs.title included in common.attrs
)
-@@ -141,6 +141,27 @@
+@@ -144,6 +144,27 @@
attribute sizes {
w:string "any" | common.data.sizes
}
@@ -767,7 +767,7 @@
link.inner =
( empty )
-@@ -165,7 +186,7 @@
+@@ -168,7 +189,7 @@
common.data.mediaquery
}
style.inner =
@@ -776,7 +776,7 @@
common.elem.metadata |= style.elem
-@@ -190,10 +211,9 @@
+@@ -193,10 +214,9 @@
meta.name.elem =
element meta { meta.inner & meta.name.attrs }
meta.name.attrs =
@@ -790,7 +790,7 @@
& meta.name.attrs.name
& meta.name.attrs.content
)
-@@ -215,10 +235,9 @@
+@@ -218,10 +238,9 @@
meta.http-equiv.refresh.elem =
element meta { meta.inner & meta.http-equiv.refresh.attrs }
meta.http-equiv.refresh.attrs =
@@ -804,7 +804,7 @@
& meta.http-equiv.attrs.http-equiv.refresh
& meta.http-equiv.attrs.content.refresh
)
-@@ -239,10 +258,9 @@
+@@ -242,10 +261,9 @@
meta.http-equiv.default-style.elem =
element meta { meta.inner & meta.http-equiv.default-style.attrs }
meta.http-equiv.default-style.attrs =
@@ -818,7 +818,7 @@
& meta.http-equiv.attrs.http-equiv.default-style
& meta.http-equiv.attrs.content.default-style
)
-@@ -264,10 +282,9 @@
+@@ -267,10 +285,9 @@
meta.http-equiv.content-language.elem =
element meta { meta.inner & meta.http-equiv.content-language.attrs }
meta.http-equiv.content-language.attrs =
@@ -832,7 +832,7 @@
& meta.http-equiv.attrs.http-equiv.content-language
& meta.http-equiv.attrs.content.content-language
)
-@@ -289,19 +306,15 @@
+@@ -292,19 +309,15 @@
meta.charset.elem =
element meta { meta.inner & meta.charset.attrs }
meta.charset.attrs =
@@ -857,7 +857,7 @@
## Inline Character Encoding Statement for HTML: <meta http-equiv='content-type'>
-@@ -309,10 +322,9 @@
+@@ -312,10 +325,9 @@
element meta { meta.inner & meta.http-equiv.content-type.attrs }
& HTMLonly
meta.http-equiv.content-type.attrs =
@@ -871,7 +871,7 @@
& meta.http-equiv.attrs.http-equiv.content-type
& meta.http-equiv.attrs.content.content-type
)
-@@ -325,4 +337,5 @@
+@@ -328,4 +340,5 @@
common.data.meta-charset
}
@@ -880,7 +880,7 @@
+ common.elem.metadata |= meta.http-equiv.content-type.elem
Index: schema/applications.rnc
===================================================================
---- schema/applications.rnc (revision 538)
+--- schema/applications.rnc (revision 540)
+++ schema/applications.rnc (working copy)
@@ -4,18 +4,6 @@
## RELAX NG Schema for HTML 5: Web Application Features #
@@ -1009,7 +1009,7 @@
## Menu: <menu>
Index: schema/core-scripting.rnc
===================================================================
---- schema/core-scripting.rnc (revision 538)
+--- schema/core-scripting.rnc (revision 540)
+++ schema/core-scripting.rnc (working copy)
@@ -52,9 +52,9 @@
string
@@ -1047,7 +1047,7 @@
attribute onabort { string }
Index: schema/common.rnc
===================================================================
---- schema/common.rnc (revision 538)
+--- schema/common.rnc (revision 540)
+++ schema/common.rnc (working copy)
@@ -38,16 +38,16 @@
common.attr.anything =
Index: spec.html
===================================================================
RCS file: /sources/public/html5/markup/spec.html,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -d -r1.201 -r1.202
--- spec.html 24 Mar 2010 20:47:06 -0000 1.201
+++ spec.html 26 Mar 2010 11:31:19 -0000 1.202
@@ -10,7 +10,7 @@
<div class="head">
<div><a href="http://www.w3.org/"><img height="48" width="72" alt="W3C" src="http://www.w3.org/Icons/w3c_home"></a></div>
<h1>HTML: The Markup Language</h1>
-<h2>W3C Editor’s Draft <em>25 March 2010</em>
+<h2>W3C Editor’s Draft <em>26 March 2010</em>
</h2>
<dl>
<dt>Latest Editor’s Draft:</dt>
@@ -50,7 +50,7 @@
reports index</a> at http://www.w3.org/TR/.
</em></p>
<p>
- This document is the 25 March 2010 Editor’s Draft of
+ This document is the 26 March 2010 Editor’s Draft of
<cite>HTML: The Markup Language</cite>.
If you’d like to comment on this document, the preferred
@@ -19203,6 +19203,7 @@
<li>"<code>allow-same-origin</code>"</li>
<li>"<code>allow-forms</code>"</li>
<li>"<code>allow-scripts</code>"</li>
+ <li>"<code>allow-top-navigation</code>"</li>
</ul>
</div>
</div>
Received on Friday, 26 March 2010 11:32:16 UTC