W3C home > Mailing lists > Public > public-html-commits@w3.org > June 2009

html5/markup/src datatypes.html,1.21,1.22 syntax.html,1.49,1.50

From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
Date: Sat, 13 Jun 2009 07:31:33 +0000
To: public-html-commits@w3.org
Message-Id: <E1MFNi9-0002Ng-HV@lionel-hutz.w3.org>
Update of /sources/public/html5/markup/src
In directory hutz:/tmp/cvs-serv8771/src

Modified Files:
	datatypes.html syntax.html 
Log Message:
h:tml; in some definitions that use regular expressions, refined for greater clarity


Index: syntax.html
===================================================================
RCS file: /sources/public/html5/markup/src/syntax.html,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- syntax.html	3 May 2009 04:20:35 -0000	1.49
+++ syntax.html	13 Jun 2009 07:31:31 -0000	1.50
@@ -143,7 +143,10 @@
       <dt><a id="doctype.pattern"
         href="#doctype.pattern">doctype</a> =</dt>
       <dd>
-        <pre><code class="regexp">&lt;![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">&lt;!doctype\s+html\s*></code></pre>
       </dd>
     </dl>
 
@@ -162,7 +165,12 @@
       <dt><a id="doctype.legacy"
         href="#doctype.legacy">doctype.legacy</a> =</dt>
       <dd>
-        <pre><code class="regexp">&lt;![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">&lt;!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/src/datatypes.html,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- datatypes.html	7 Jun 2009 23:07:55 -0000	1.21
+++ datatypes.html	13 Jun 2009 07:31:31 -0000	1.22
@@ -36,7 +36,14 @@
     <dd><code class="regexp">()|([^_].*)</code></dd>
   </dl>
   <dl><dt>browsing-context-or-keyword</dt>
-    <dd><code class="regexp">()|([^_].*)|(_[bB][lL][aA][nN][kK])|(_[sS][eE][lL][fF])|(_[pP][aA][rR][eE][nN][tT])|(_[tT][oO][pP])</code></dd>
+    <dd></dd>
+    <dd>
+      <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>
+    </dd>
     <dd>
       <div class="example">
         <p>Examples:</p>
@@ -62,11 +69,14 @@
   </dl>
   <dl><dt>hash-name</dt>
     <dd><code class="regexp">#.+</code></dd>
-    <dd>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>.</dd>
+    <dd>
+      <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>
+    </dd>
   </dl>
   <dl><dt>integer</dt>
     <dd><code class="regexp">-?[0-9]+</code></dd>
@@ -177,22 +187,29 @@
   <dl><dt>meta-charset</dt>
     <dd></dd>
     <dd>
-      <div class="datatype-desc">A value that is an <a
+      <div class="datatype-desc">A string 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
+          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>
     </dd>
   </dl>
   <dl><dt>refresh</dt>
-    <dd><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>
+    <dd></dd>
+    <dd>
+      <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>
     </dd>
   </dl>
   <dl><dt>default-style</dt>
Received on Saturday, 13 June 2009 07:31:39 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Saturday, 13 June 2009 07:31:40 GMT