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

html5/markup/src datatypes.html,1.32,1.33

From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
Date: Sun, 09 Aug 2009 15:15:22 +0000
To: public-html-commits@w3.org
Message-Id: <E1MaA7G-0007mK-57@lionel-hutz.w3.org>
Update of /sources/public/html5/markup/src
In directory hutz:/tmp/cvs-serv29736/src

Modified Files:
	datatypes.html 
Log Message:
made remaining refinements to all datatype descriptions


Index: datatypes.html
===================================================================
RCS file: /sources/public/html5/markup/src/datatypes.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- datatypes.html	5 Aug 2009 13:23:17 -0000	1.32
+++ datatypes.html	9 Aug 2009 15:15:20 -0000	1.33
@@ -249,10 +249,14 @@
   <dl><dt>datetime</dt>
     <dd></dd>
     <dd>
-      <div class="datatype-desc">A valid <b class="defined-elsewhere"
-          >date-time</b>, as defined in RFC 3339 <a
-          href="#refsRFC3339">[RFC3339]</a>, with these additional
-        qualifications:</div>
+      <div class="datatype-desc">A valid
+        <dfn
+          id="date-time"
+          title="date-time"
+          >date-time</dfn>,
+        as defined in RFC 3339
+        <a href="#refsRFC3339">[RFC3339]</a>,
+        with these additional qualifications:</div>
       <ul>
         <li>the literal letters <code>T</code> and
         <code>Z</code> in the date/time syntax must always be
@@ -361,12 +365,18 @@
     <dd>
       <div class="datatype-desc">
         <p>For documents in the <a href="#html-syntax">HTML
-          syntax</a>: Any <b class="defined-elsewhere">character
-          set name</b> listed in the IANA <cite>Character Sets</cite>
-        list <a href="#refsIANACHARSET">[IANACHARSET]</a>.</p>
+          syntax</a>: Any
+        <dfn
+          id="character-set-name"
+          title="character-set-name"
+          >character set name</dfn>
+        listed in the IANA <cite>Character Sets</cite>
+        list
+        <a href="#refsIANACHARSET">[IANACHARSET]</a>.</p>
         <p>For documents in the <a href="#xml-syntax">XML
-          syntax</a>, any <a href="#ascii-case-insensitive">ASCII
-          case-insensitive</a> match for the string
+          syntax</a>, any
+        <a href="#ascii-case-insensitive">ASCII case-insensitive</a>
+        match for the string
         "<code>UTF-8</code>".</p>
       </div>
     </dd>
@@ -374,12 +384,19 @@
   <dl><dt>meta-charset</dt>
     <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">text/html;\s*charset=</code>,
-        followed by a <a
-          href="#common.data.charset">charset</a>.</div>
+      <div class="datatype-desc">The following parts, in exactly
+        the following order:
+        <ol>
+          <li>The literal string
+          "<code>text/html;</code>".</li>
+          <li>Optionally, one or more
+          <a href="#space">space characters</a>.</li>
+          <li>The literal string
+          "<code>charset=</code>".</li>
+          <li>A
+          <a href="#common.data.charset">charset</a>.</li>
+        </ol>
+      </div>
     </dd>
   </dl>
   <dl><dt>refresh</dt>
@@ -387,36 +404,58 @@
     <dd>
       <div class="datatype-desc">Any 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>
+          <li>A
+          <a href="#common.data.integer.non-negative" >non-negative integer</a>.</li>
+          <li>The string consisting of the following parts, in
+          exactly the following order:
+            <ol>
+              <li>A <a href="#common.data.integer.non-negative" >non-negative integer</a>.</li>
+              <li>A
+              "<code title="U+003B SEMICOLON">;</code>"
+              character.</li>
+              <li>One or more
+              <a href="#space">space characters</a>.</li>
+              <li>A
+              <a href="#ascii-case-insensitive">ASCII case-insensitive</a>
+              match for the string
+              "<code>url=</code>".</li>
+              <li>A
+              <a href="#common.data.uri">URI</a>.</li>
+            </ol>
+          </li>
         </ul>
       </div>
     </dd>
   </dl>
   <dl><dt>default-style</dt>
-    <dd><a href="#data-string">string</a></dd>
+    <dd></dd>
+    <dd>
+      <div class="datatype-desc">A
+        <a href="#data-string">string</a>.</div>
+    </dd>
   </dl>
   <dl><dt>mediaquery</dt>
     <dd></dd>
     <dd>
-      <div class="datatype-desc">A valid <b
-          class="defined-elsewhere">media query</b>, as defined in
+      <div class="datatype-desc">A valid
+        <dfn
+          id="media-query"
+          title="media-query"
+          >media query</dfn>,
+        as defined in
       <cite>Media Queries</cite> <a href="#refsMQ">[MQ]</a>.</div>
     </dd>
   </dl>
   <dl><dt>langcode</dt>
-    <dd>"" | <a href="#data.language">language-tag</a></dd>
+    <dd></dd>
     <dd>
-      <div class="datatype-desc">…where <dfn id="data.language"
-          >language-tag</dfn> is a valid <b
-          class="defined-elsewhere">language tag</b>, as defined
-        in RFC 4646 <a href="#refsRFC4646">[RFC4646]</a>.</div>
+      <div class="datatype-desc">A valid
+        <dfn
+          id="language tag"
+          title="language tag"
+          >language tag</dfn>,
+        as defined in RFC 4646
+        <a href="#refsRFC4646">[RFC4646]</a>.</div>
     </dd>
   </dl>
   <dl><dt>mimetypelist</dt>
@@ -456,9 +495,17 @@
     </dd>
   </dl>
   <dl><dt>datetime-local</dt>
-    <dd id="datetime-local-pattern" ><a href="#form.data.date"
-        >date</a> "<code class="literal">T</code>" <a href="#form.data.time">time</a></dd>
+    <dd></dd>
     <dd>
+      <div class="datatype-desc">The following parts, in exactly
+        the following order:
+        <ol>
+          <li>A <a href="#form.data.date">date</a>.</li>
+          <li>The literal string
+          "<code class="literal">T</code>".</li>
+          <li>A <a href="#form.data.time">time</a>.</li>
+        </ol>
+      </div>
       <div class="example">
         <p>Example:</p>
         <pre><code>1985-04-12T23:20:50.52</code>
@@ -469,14 +516,17 @@
   <dl><dt>date</dt>
     <dd></dd>
     <dd>
-      <div class="datatype-desc">A valid <b
-          class="defined-elsewhere">full-date</b>, as defined in
-        RFC 3339 <a href="#refsRFC3339">[RFC3339]</a>, with the
-        additional qualification that the year component is a
-        <a href="#data-date-fullyear">date-fullyear</a> as
-        defined in this document.</div>
-    </dd>
-    <dd>
+      <div class="datatype-desc">A valid
+        <dfn
+          id="full-date"
+          title="full-date"
+          >full-date</dfn>,
+        as defined in RFC 3339
+        <a href="#refsRFC3339">[RFC3339]</a>,
+        with the additional qualification that the year component
+        is a
+        <a href="#data-date-fullyear">date-fullyear</a>
+        as defined in this document.</div>
       <div class="example">
         <p>Example:</p>
         <pre><code>1996-12-19</code></pre>
@@ -484,12 +534,21 @@
     </dd>
   </dl>
   <dl><dt>month</dt>
-    <dd><a href="#data-date-fullyear">date-fullyear</a> "-" <a
-        href="#data-date-month">date-month</a></dd>
+    <dd></dd>
     <dd>
-      <div class="datatype-desc">…where <dfn id="data-date-month"
-          >date-month</dfn> is as defined
-        in RFC 3339 <a href="#refsRFC3339">[RFC3339]</a>.</div>
+      <div class="datatype-desc">The following parts, in exactly the
+        following order:
+        <ol>
+          <li>A <a href="#data-date-fullyear">date-fullyear</a>.</li>
+          <li>The literal string "<code>-</code>".</li>
+          <li>A
+          <dfn
+            id="data-date-month"
+            title="data-date-month">date-month</dfn>, as defined in
+          RFC 3339
+          <a href="#refsRFC3339">[RFC3339]</a>.</li>
+        </ol>
+      </div>
       <div class="example">
         <p>Example:</p>
         <pre><code>1996-12</code></pre>
@@ -497,13 +556,24 @@
     </dd>
   </dl>
   <dl><dt>week</dt>
-    <dd><a href="#data-date-fullyear">date-fullyear</a> "-W" <a
-        href="#data-date-week">date-week</a></dd>
+    <dd></dd>
     <dd>
-      <div class="datatype-desc">…where <dfn id="data-date-week"
-          >date-week</dfn> is a valid <b
-          class="defined-elsewhere">date-week</b>, as defined
-        in RFC 3339 <a href="#refsRFC3339">[RFC3339]</a>.</div>
+      <div class="datatype-desc">The following parts, in exactly
+        the following order:
+        <ol>
+          <li>A
+          <a href="#data-date-fullyear">date-fullyear</a>.</li>
+          <li>The literal string
+          "<code>-W</code>".</li>
+          <li>A
+          <dfn
+            id="data-date-week"
+            title="data-date-week"
+            >date-week</dfn>,
+          as defined in RFC 3339
+          <a href="#refsRFC3339">[RFC3339]</a>.</li>
+        </ol>
+      </div>
     </dd>
     <dd>
       <div class="example">
@@ -515,9 +585,13 @@
   <dl><dt>time</dt>
     <dd></dd>
     <dd>
-      <div class="datatype-desc">A valid <b
-          class="defined-elsewhere">partial-time</b>, as defined
-        in RFC 3339 <a href="#refsRFC3339">[RFC3339]</a>.</div>
+      <div class="datatype-desc">A valid
+        <dfn
+          id="partial-time"
+          title="partial-time"
+          >partial-time</dfn>,
+        as defined in RFC 3339
+        <a href="#refsRFC3339">[RFC3339]</a>.</div>
     </dd>
     <dd>
       <div class="example">
@@ -528,18 +602,29 @@
     </dd>
   </dl>
   <dl><dt>emailaddress</dt>
-    <dd><a href="#data-dot-atom"
-        >dot-atom</a> "@" <a
-        href="#data-dot-atom">dot-atom</a></dd>
-    <dd>
-      <div class="datatype-desc">…where <dfn
-          id="data-dot-atom">dot-atom</dfn> is as defined in RFC
-        5322 <a href="#refsRFC5322">[RFC5322]</a>, with the
-        additional constraint that the <b
-        class="defined-elsewhere">CFWS</b> production is excluded
-      everywhere.</div>
-    </dd>
+    <dd></dd>
     <dd>
+      <div class="datatype-desc">The following parts, in exactly
+        the following order:
+        <ol>
+          <li>A
+          <dfn
+            id="data-dot-atom"
+            title="data-dot-atom"
+            >dot-atom</dfn>,
+          as defined in RFC 5322
+          <a href="#refsRFC5322">[RFC5322]</a>,
+          with the additional constraint that the
+          <i>CFWS</i> production is excluded everywhere.</li>
+          <li>A
+          "<code title="U+0040 COMMERCIAL AT">@</code>"
+          character.</li>
+          <li>A
+          <a href="#data-dot-atom">dot-atom</a>,
+          with the additional constraint that the
+          <i>CFWS</i> production is excluded everywhere.</li>
+        </ol>
+      </div>
       <div class="example">
         <p>Examples:</p>
         <pre><code>foo-bar.baz@example.com</code></pre>
@@ -555,7 +640,23 @@
     </dd>
   </dl>
   <dl><dt>color</dt>
-    <dd><code class="regexp">#[a-fA-F0-9]{6}</code></dd>
+    <dd></dd>
+    <dd>
+      <div class="datatype-desc">A string exactly seven
+        characters long, consisting of the following parts, in
+        exactly the following order:
+        <ol>
+          <li>A
+          "<code title="U+0023 NUMBER SIGN">#</code>"
+          character.</li>
+          <li>Six characters in the range
+          <code title="U+0030 DIGIT ZERO–U+0039 DIGIT NINE">0–9</code>,
+          <code title="U+0061 LATIN SMALL LETTER A–U+0066 LATIN SMALL LETTER F">a–f</code>,
+          and
+          <code title="U+0041 LATIN CAPITAL LETTER A–U+0046 LATIN CAPITAL LETTER F">A–F</code>.</li>
+        </ol>
+      </div>
+    </dd>
   </dl>
   <dl><dt>zero</dt>
     <dd></dd>
Received on Sunday, 9 August 2009 15:15:31 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Sunday, 9 August 2009 15:15:32 GMT