- From: poot <cvsmail@w3.org>
- Date: Sat, 13 Jun 2009 16:31:55 +0900 (JST)
- To: public-html-diffs@w3.org
h:tml; in some definitions that use regular expressions, refined for
greater clarity
http://dev.w3.org/cvsweb/html5/markup/Overview.html?r1=1.312&r2=1.313&f=h
===================================================================
RCS file: /sources/public/html5/markup/Overview.html,v
retrieving revision 1.312
retrieving revision 1.313
diff -u -d -r1.312 -r1.313
--- Overview.html 10 Jun 2009 10:42:28 -0000 1.312
+++ Overview.html 13 Jun 2009 07:31:29 -0000 1.313
@@ -9,7 +9,7 @@
<body>
<div class="head">
<h1>HTML 5: The Markup Language</h1>
-<h2>Editor’s Draft <em>10 June 2009</em>
+<h2>Editor’s Draft <em>13 June 2009</em>
</h2>
<dl>
<dt>Latest Editor’s Draft:</dt>
@@ -42,7 +42,7 @@
<p>
- This document is the 10 June 2009 Editor’s Draft of
+ This document is the 13 June 2009 Editor’s Draft of
<cite>HTML 5: The Markup Language</cite>.
</p>
<p>
Index: syntax.html
===================================================================
RCS file: /sources/public/html5/markup/syntax.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- syntax.html 3 May 2009 15:59:43 -0000 1.5
+++ syntax.html 13 Jun 2009 07:31:31 -0000 1.6
@@ -170,7 +170,10 @@
<dl class="pattern-def">
<dt><a id="doctype.pattern" href="syntax.html#doctype.pattern">doctype</a> =</dt>
<dd>
- <pre><code class="regexp"><![dD][oO][cC][tT][yY][pP][eE]\s+[hH][tT][mM][lL]\s*></code></pre>
+ A string that is an <a href=".html#ascii">ASCII
+ case-insensitive</a> match for the following regular
+ expression:
+ <pre><code class="regexp"><!doctype\s+html\s*></code></pre>
</dd>
</dl>
@@ -188,7 +191,12 @@
<dl class="pattern-def">
<dt><a id="doctype.legacy" href="syntax.html#doctype.legacy">doctype.legacy</a> =</dt>
<dd>
- <pre><code class="regexp"><![dD][oO][cC][tT][yY][pP][eE]\s+[hH][tT][mM][lL](\s+[pP][uU][bB][lL][iI][cC]\s+("about:legacy-compat"|'about:legacy-compat'))?\s*></code></pre>
+ A string that is an <a href=".html#ascii">ASCII
+ case-insensitive</a> match for the following regular
+ expression:
+ <pre><code class="regexp"><!doctype\s+html\s+system\s+("about:legacy-compat"|'about:legacy-compat')\s*></code></pre>
+ …except for the <code>about:legacy-compat</code> part,
+ which must match exactly (not case-insensitively).
</dd>
</dl>
Index: datatypes.html
===================================================================
RCS file: /sources/public/html5/markup/datatypes.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- datatypes.html 7 Jun 2009 23:07:54 -0000 1.8
+++ datatypes.html 13 Jun 2009 07:31:31 -0000 1.9
@@ -48,7 +48,13 @@
<div id="common.data.browsing-context-or-keyword-mdl" class="section">
<h2 class="common-subhead">10.4. Browsing-context-or-keyword <a class="hash" href="#common.data.browsing-context-or-keyword-mdl">#</a></h2>
<div class="content-models">
- <div><span class="common-pattern-name"><dfn id="common.data.browsing-context-or-keyword">browsing-context-or-keyword</dfn></span><code class="punc"> = </code><code class="regexp">()|([^_].*)|(_[bB][lL][aA][nN][kK])|(_[sS][eE][lL][fF])|(_[pP][aA][rR][eE][nN][tT])|(_[tT][oO][pP])</code> <a href="datatypes.html#common.data.browsing-context-or-keyword" class="hash">#</a></div>
+ <div><span class="common-pattern-name"><dfn id="common.data.browsing-context-or-keyword">browsing-context-or-keyword</dfn></span><code class="punc"> = </code> <a href="datatypes.html#common.data.browsing-context-or-keyword" class="hash">#</a></div>
+ <div class="datatype-desc">A string that is an
+ <a href="terminology.html#ascii-case-insensitive">ASCII case-insensitive</a>
+ match for the regular expression
+ <code class="regexp">()|([^_].*)|(_blank)|(_self)|(_parent)|(_top)</code>
+ </div>
+
<div class="example">
<p>Examples:</p>
<pre><code>_blank</code>
@@ -82,11 +88,13 @@
<div id="common.data.hash-name-mdl" class="section">
<h2 class="common-subhead">10.9. Hash-name <a class="hash" href="#common.data.hash-name-mdl">#</a></h2>
<div class="content-models">
- <div><span class="common-pattern-name"><dfn id="common.data.hash-name">hash-name</dfn></span><code class="punc"> = </code><code class="regexp">#.+</code> <a href="datatypes.html#common.data.hash-name" class="hash">#</a></div>A valid <dfn id="hash-name">hash-name reference</dfn> to an
- element of type <i>type</i> is a string consisting of a U+0023
- NUMBER SIGN (<code>#</code>) character followed by a string
- which exactly matches the value of the name attribute of an
- element in the document with type <i>type</i>.</div>
+ <div><span class="common-pattern-name"><dfn id="common.data.hash-name">hash-name</dfn></span><code class="punc"> = </code><code class="regexp">#.+</code> <a href="datatypes.html#common.data.hash-name" class="hash">#</a></div>
+ <div class="datatype-desc">A valid <dfn id="hash-name">hash-name reference</dfn> to an element of
+ type <i>type</i> is a string consisting of a U+0023 NUMBER
+ SIGN (<code>#</code>) character followed by a string which
+ exactly matches the value of the name attribute of an
+ element in the document with type <i>type</i>.</div>
+ </div>
</div>
<div id="common.data.integer-mdl" class="section">
<h2 class="common-subhead">10.10. Integer <a class="hash" href="#common.data.integer-mdl">#</a></h2>
@@ -206,20 +214,26 @@
<h2 class="common-subhead">10.24. Meta-charset <a class="hash" href="#common.data.meta-charset-mdl">#</a></h2>
<div class="content-models">
<div><span class="common-pattern-name"><dfn id="common.data.meta-charset">meta-charset</dfn></span><code class="punc"> = </code> <a href="datatypes.html#common.data.meta-charset" class="hash">#</a></div>
- <div class="datatype-desc">A value that is an <a href="terminology.html#ascii-case-insensitive">ASCII
- case-insensitive</a> match for a string that consists of:
- the literal string "<code>text/html;</code>",
- optionally followed by any number of <a href="terminology.html#space" title="space character">space
- characters</a>, followed by the literal string
- "<code>charset=</code>", followed by a <a href="datatypes.html#common.data.charset">charset</a>.</div>
+ <div class="datatype-desc">A string that is an <a href="terminology.html#ascii-case-insensitive">ASCII
+ case-insensitive</a> match for the regular expression
+ <code class="regexp">text/html;\s*charset=</code>,
+ followed by a <a href="datatypes.html#common.data.charset">charset</a>.</div>
</div>
</div>
<div id="common.data.refresh-mdl" class="section">
<h2 class="common-subhead">10.25. Refresh <a class="hash" href="#common.data.refresh-mdl">#</a></h2>
<div class="content-models">
- <div><span class="common-pattern-name"><dfn id="common.data.refresh">refresh</dfn></span><code class="punc"> = </code><a href="datatypes.html#common.data.integer.non-negative">integer.non-negative</a>
- | <a href="datatypes.html#common.data.integer.non-negative">integer.non-negative</a><code class="regexp">;\s+[uU][rR][lL]=</code><a href="datatypes.html#common.data.uri">uri</a>
- <a href="datatypes.html#common.data.refresh" class="hash">#</a></div></div>
+ <div><span class="common-pattern-name"><dfn id="common.data.refresh">refresh</dfn></span><code class="punc"> = </code> <a href="datatypes.html#common.data.refresh" class="hash">#</a></div>
+ <div class="datatype-desc">One of the following:
+ <ul>
+ <li>a <a href="datatypes.html#common.data.integer.non-negative">non-negative integer</a></li>
+ <li>a <a href="datatypes.html#common.data.integer.non-negative">non-negative integer</a>, followed by a string that is
+ an <a href="terminology.html#ascii-case-insensitive">ASCII
+ case-insensitive</a> match for the regular expression
+ <code class="regexp">;\s+url=</code>, followed by a <a href="datatypes.html#common.data.uri">URI</a>.</li>
+ </ul>
+ </div>
+ </div>
</div>
<div id="common.data.default-style-mdl" class="section">
<h2 class="common-subhead">10.26. Default-style <a class="hash" href="#common.data.default-style-mdl">#</a></h2>
Index: spec.html
===================================================================
RCS file: /sources/public/html5/markup/spec.html,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- spec.html 10 Jun 2009 14:59:47 -0000 1.29
+++ spec.html 13 Jun 2009 07:31:31 -0000 1.30
@@ -9,7 +9,7 @@
<body>
<div class="head">
<h1>HTML 5: The Markup Language</h1>
-<h2>Editor’s Draft <em>10 June 2009</em>
+<h2>Editor’s Draft <em>13 June 2009</em>
</h2>
<dl>
<dt>Latest Editor’s Draft:</dt>
@@ -41,7 +41,7 @@
<p>
- This document is the 10 June 2009 Editor’s Draft of
+ This document is the 13 June 2009 Editor’s Draft of
<cite>HTML 5: The Markup Language</cite>.
</p>
<p>
@@ -969,7 +969,10 @@
<dt>
<a id="doctype.pattern" href="#doctype.pattern">doctype</a> =</dt>
<dd>
- <pre><code class="regexp"><![dD][oO][cC][tT][yY][pP][eE]\s+[hH][tT][mM][lL]\s*></code></pre>
+ A string that is an <a href="#ascii">ASCII
+ case-insensitive</a> match for the following regular
+ expression:
+ <pre><code class="regexp"><!doctype\s+html\s*></code></pre>
</dd>
</dl>
<div class="example">
@@ -987,7 +990,12 @@
<dt>
<a id="doctype.legacy" href="#doctype.legacy">doctype.legacy</a> =</dt>
<dd>
- <pre><code class="regexp"><![dD][oO][cC][tT][yY][pP][eE]\s+[hH][tT][mM][lL](\s+[pP][uU][bB][lL][iI][cC]\s+("about:legacy-compat"|'about:legacy-compat'))?\s*></code></pre>
+ A string that is an <a href="#ascii">ASCII
+ case-insensitive</a> match for the following regular
+ expression:
+ <pre><code class="regexp"><!doctype\s+html\s+system\s+("about:legacy-compat"|'about:legacy-compat')\s*></code></pre>
+ …except for the <code>about:legacy-compat</code> part,
+ which must match exactly (not case-insensitively).
</dd>
</dl>
<div class="example">
@@ -14291,8 +14299,14 @@
</h2>
<div class="content-models">
<div>
-<span class="common-pattern-name"><dfn id="common.data.browsing-context-or-keyword">browsing-context-or-keyword</dfn></span><code class="punc"> = </code><code class="regexp">()|([^_].*)|(_[bB][lL][aA][nN][kK])|(_[sS][eE][lL][fF])|(_[pP][aA][rR][eE][nN][tT])|(_[tT][oO][pP])</code> <a href="#common.data.browsing-context-or-keyword" class="hash">#</a>
+<span class="common-pattern-name"><dfn id="common.data.browsing-context-or-keyword">browsing-context-or-keyword</dfn></span><code class="punc"> = </code> <a href="#common.data.browsing-context-or-keyword" class="hash">#</a>
</div>
+ <div class="datatype-desc">A string that is an
+ <a href="#ascii-case-insensitive">ASCII case-insensitive</a>
+ match for the regular expression
+ <code class="regexp">()|([^_].*)|(_blank)|(_self)|(_parent)|(_top)</code>
+ </div>
+
<div class="example">
<p>Examples:</p>
<pre><code>_blank</code>
@@ -14345,11 +14359,13 @@
<div class="content-models">
<div>
<span class="common-pattern-name"><dfn id="common.data.hash-name">hash-name</dfn></span><code class="punc"> = </code><code class="regexp">#.+</code> <a href="#common.data.hash-name" class="hash">#</a>
-</div>A valid <dfn id="hash-name">hash-name reference</dfn> to an
- element of type <i>type</i> is a string consisting of a U+0023
- NUMBER SIGN (<code>#</code>) character followed by a string
- which exactly matches the value of the name attribute of an
- element in the document with type <i>type</i>.</div>
+</div>
+ <div class="datatype-desc">A valid <dfn id="hash-name">hash-name reference</dfn> to an element of
+ type <i>type</i> is a string consisting of a U+0023 NUMBER
+ SIGN (<code>#</code>) character followed by a string which
+ exactly matches the value of the name attribute of an
+ element in the document with type <i>type</i>.</div>
+ </div>
</div>
<div id="common.data.integer-mdl" class="section">
<h2 class="common-subhead">10.10. Integer <a class="hash" href="#common.data.integer-mdl">#</a>
@@ -14522,12 +14538,10 @@
<div>
<span class="common-pattern-name"><dfn id="common.data.meta-charset">meta-charset</dfn></span><code class="punc"> = </code> <a href="#common.data.meta-charset" class="hash">#</a>
</div>
- <div class="datatype-desc">A value that is an <a href="#ascii-case-insensitive">ASCII
- case-insensitive</a> match for a string that consists of:
- the literal string "<code>text/html;</code>",
- optionally followed by any number of <a href="#space" title="space character">space
- characters</a>, followed by the literal string
- "<code>charset=</code>", followed by a <a href="#common.data.charset">charset</a>.</div>
+ <div class="datatype-desc">A string that is an <a href="#ascii-case-insensitive">ASCII
+ case-insensitive</a> match for the regular expression
+ <code class="regexp">text/html;\s*charset=</code>,
+ followed by a <a href="#common.data.charset">charset</a>.</div>
</div>
</div>
<div id="common.data.refresh-mdl" class="section">
@@ -14535,11 +14549,19 @@
</h2>
<div class="content-models">
<div>
-<span class="common-pattern-name"><dfn id="common.data.refresh">refresh</dfn></span><code class="punc"> = </code><a href="#common.data.integer.non-negative">integer.non-negative</a>
- | <a href="#common.data.integer.non-negative">integer.non-negative</a><code class="regexp">;\s+[uU][rR][lL]=</code><a href="#common.data.uri">uri</a>
- <a href="#common.data.refresh" class="hash">#</a>
+<span class="common-pattern-name"><dfn id="common.data.refresh">refresh</dfn></span><code class="punc"> = </code> <a href="#common.data.refresh" class="hash">#</a>
</div>
+ <div class="datatype-desc">One of the following:
+ <ul>
+<li>a <a href="#common.data.integer.non-negative">non-negative integer</a>
+</li>
+ <li>a <a href="#common.data.integer.non-negative">non-negative integer</a>, followed by a string that is
+ an <a href="#ascii-case-insensitive">ASCII
+ case-insensitive</a> match for the regular expression
+ <code class="regexp">;\s+url=</code>, followed by a <a href="#common.data.uri">URI</a>.</li>
+ </ul>
</div>
+ </div>
</div>
<div id="common.data.default-style-mdl" class="section">
<h2 class="common-subhead">10.26. Default-style <a class="hash" href="#common.data.default-style-mdl">#</a>
Received on Saturday, 13 June 2009 07:32:28 UTC