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

html5/markup/src datatypes.html,1.23,1.24

From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
Date: Tue, 16 Jun 2009 10:19:42 +0000
To: public-html-commits@w3.org
Message-Id: <E1MGVlW-0008Nz-1i@lionel-hutz.w3.org>
Update of /sources/public/html5/markup/src
In directory hutz:/tmp/cvs-serv32121/src

Modified Files:
	datatypes.html 
Log Message:
h:tml; did a bit of streamlining in definitions of datatype primitives


Index: datatypes.html
===================================================================
RCS file: /sources/public/html5/markup/src/datatypes.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- datatypes.html	16 Jun 2009 06:49:01 -0000	1.23
+++ datatypes.html	16 Jun 2009 10:19:39 -0000	1.24
@@ -1,30 +1,33 @@
 <section
   xmlns="http://www.w3.org/1999/xhtml">
-  <section id="data-primitives" class="no-toc"
-    xmlns="http://www.w3.org/1999/xhtml">
-    <h2>Datatype primitives</h2>
-    <p>Some patterns defined in this section reference
-    the following two datatype primitives:</p>
-    <ul>
-      <li>A <dfn id="data-string" title="string">string</dfn>
-      is a sequence of zero or more characters of any
-      kind, including
-      <a href="#space">space characters</a>.</li>
-      <li>A <dfn id="data-token" title="token">token</dfn>
-      is a sequence of zero or more characters that
-      does not contain any
-      <a href="#space">space characters</a>.</li>
-    </ul>
-    <p>In addition, some patterns reference the
-    <dfn id="data-list" title="data-list">list</dfn>
-    pattern, which is defined as any number of
-    instances of a particular datatype, separated from
-    each another by one or more
-    <a href="#space">space characters</a>.</p>
+  <section id="data-string-def" class="no-toc">
+    <h2>String</h2>
+    <p>For any pattern in this document that references the <a
+      href="#data-string">string</a> datatype, a
+    <dfn id="data-string" title="string">string</dfn>
+    is defined as any mixture of
+    <a href="#syntax-text">text</a>
+    and
+    <a href="#syntax-charref">character references</a>
+    that does not contain an
+    <a href="#ambiguous">ambiguous ampersand</a>.</p>
+  </section>
+  <section id="data-token-def" class="no-toc">
+    <h2>Token</h2>
+    <p>For any pattern in this document that references the <a
+      href="#data-token">token</a> datatype, a
+    <dfn id="data-token" title="token">token</dfn>
+    is defined
+    as a <a href="#data-string">string</a> that does not contain
+    any <a href="#space">space characters</a>.</p>
   </section>
   <dl><dt>tokens</dt>
-    <dd><a href="#data-list">list</a> {
-      <a href="#data-token">token</a>* }</dd>
+    <dd></dd>
+    <dd>
+      <div class="datatype-desc">A
+        <a href="#space">space</a>-separated list of zero or more
+        <a href="#data-token">token</a> instances.</div>
+    </dd>
   </dl>
   <dl><dt>tokens.comma-separated</dt>
     <dd><code class="regexp">[^,]+(,[^,]+)*</code></dd>
@@ -61,8 +64,12 @@
     <dd><code class="regexp">\S+</code></dd>
   </dl>
   <dl><dt>idrefs</dt>
-    <dd><a href="#data-list">list</a> {
-      <a href="#common.data.idref">idref</a>+ }</dd>
+    <dd></dd>
+    <dd>
+      <div class="datatype-desc">A
+        <a href="#space">space</a>-separated list of one or more
+        <a href="#common.data.idref">idref</a> instances.</div>
+      </dd>
   </dl>
   <dl><dt>name</dt>
     <dd><code class="regexp">\S+</code></dd>
@@ -145,8 +152,12 @@
     </dd>
   </dl>
   <dl><dt>uris</dt>
-    <dd><a href="#data-list">list</a> {
-      <a href="#data.iri-ref">IRI-reference</a>* }</dd>
+    <dd></dd>
+    <dd>
+      <div class="datatype-desc">A
+        <a href="#space">space</a>-separated list of zero or more
+        <a href="#data.iri-ref">IRI-reference</a> instances.</div>
+    </dd>
   </dl>
   <dl><dt>uri.absolute</dt>
     <dd>"" | <a href="#data.iri">IRI</a></dd>
Received on Tuesday, 16 June 2009 10:19:47 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Tuesday, 16 June 2009 10:19:49 GMT