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

mike: made remaining refinements to all datatype descriptions

From: poot <cvsmail@w3.org>
Date: Mon, 10 Aug 2009 00:15:47 +0900 (JST)
To: public-html-diffs@w3.org
Message-Id: <20090809151547.ADBA72BC8A@toro.w3.mag.keio.ac.jp>
mike: made remaining refinements to all datatype descriptions

http://dev.w3.org/cvsweb/html5/markup/Overview.html?r1=1.347&r2=1.348&f=h

===================================================================
RCS file: /sources/public/html5/markup/Overview.html,v
retrieving revision 1.347
retrieving revision 1.348
diff -u -d -r1.347 -r1.348
--- Overview.html	8 Aug 2009 14:02:57 -0000	1.347
+++ Overview.html	9 Aug 2009 15:15:19 -0000	1.348
@@ -9,7 +9,7 @@
 <body>
 <div class="head">
 <h1>HTML 5: The Markup Language</h1>
-<h2>Editor&#8217;s Draft <em>8 August 2009</em>
+<h2>Editor&#8217;s Draft <em>9 August 2009</em>
 </h2>
 <dl>
 <dt>Latest Editor&#8217;s Draft:</dt>
@@ -42,7 +42,7 @@
     
     
     <p>
-        This document is the 8 August 2009 Editor&#8217;s Draft of 
+        This document is the 9 August 2009 Editor&#8217;s Draft of 
         <cite>HTML 5: The Markup Language</cite>.
       </p>
     <p>

Index: datatypes.html
===================================================================
RCS file: /sources/public/html5/markup/datatypes.html,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- datatypes.html	5 Aug 2009 13:23:16 -0000	1.25
+++ datatypes.html	9 Aug 2009 15:15:19 -0000	1.26
@@ -265,8 +265,11 @@
         <h2 class="common-subhead">11.17. Datetime <a class="hash" href="#common.data.datetime-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.datetime">datetime</dfn></span><code class="punc"> = </code> <a href="datatypes.html#common.data.datetime" class="hash">#</a></div>
-      <div class="datatype-desc">A valid <b class="defined-elsewhere">date-time</b>, as defined in RFC 3339 <a href="references.html#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="references.html#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
@@ -373,12 +376,15 @@
           <div><span class="common-pattern-name"><dfn id="common.data.charset">charset</dfn></span><code class="punc"> = </code> <a href="datatypes.html#common.data.charset" class="hash">#</a></div>
       <div class="datatype-desc">
         <p>For documents in the <a href="documents.html#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="references.html#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="references.html#refsIANACHARSET">[IANACHARSET]</a>.</p>
         <p>For documents in the <a href="documents.html#xml-syntax">XML
-          syntax</a>, any <a href="terminology.html#ascii-case-insensitive">ASCII
-          case-insensitive</a> match for the string
+          syntax</a>, any
+        <a href="terminology.html#ascii-case-insensitive">ASCII case-insensitive</a>
+        match for the string
         "<code>UTF-8</code>".</p>
       </div>
     </div>
@@ -387,10 +393,19 @@
         <h2 class="common-subhead">11.25. 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 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 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="terminology.html#space">space characters</a>.</li>
+          <li>The literal string
+          "<code>charset=</code>".</li>
+          <li>A
+          <a href="datatypes.html#common.data.charset">charset</a>.</li>
+        </ol>
+      </div>
     </div>
       </div>
       <div id="common.data.refresh-mdl" class="section">
@@ -399,13 +414,25 @@
           <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">Any 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>
+          <li>A
+          <a href="datatypes.html#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="datatypes.html#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="terminology.html#space">space characters</a>.</li>
+              <li>A
+              <a href="terminology.html#ascii-case-insensitive">ASCII case-insensitive</a>
+              match for the string
+              "<code>url=</code>".</li>
+              <li>A
+              <a href="datatypes.html#common.data.uri">URI</a>.</li>
+            </ol>
+          </li>
         </ul>
       </div>
     </div>
@@ -413,22 +440,29 @@
       <div id="common.data.default-style-mdl" class="section">
         <h2 class="common-subhead">11.27. Default-style <a class="hash" href="#common.data.default-style-mdl">#</a></h2>
         <div class="content-models">
-          <div><span class="common-pattern-name"><dfn id="common.data.default-style">default-style</dfn></span><code class="punc"> = </code><a href="datatypes.html#data-string">string</a> <a href="datatypes.html#common.data.default-style" class="hash">#</a></div></div>
+          <div><span class="common-pattern-name"><dfn id="common.data.default-style">default-style</dfn></span><code class="punc"> = </code> <a href="datatypes.html#common.data.default-style" class="hash">#</a></div>
+      <div class="datatype-desc">A
+        <a href="datatypes.html#data-string">string</a>.</div>
+    </div>
       </div>
       <div id="common.data.mediaquery-mdl" class="section">
         <h2 class="common-subhead">11.28. Mediaquery <a class="hash" href="#common.data.mediaquery-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.mediaquery">mediaquery</dfn></span><code class="punc"> = </code> <a href="datatypes.html#common.data.mediaquery" class="hash">#</a></div>
-      <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="references.html#refsMQ">[MQ]</a>.</div>
     </div>
       </div>
       <div id="common.data.langcode-mdl" class="section">
         <h2 class="common-subhead">11.29. Langcode <a class="hash" href="#common.data.langcode-mdl">#</a></h2>
         <div class="content-models">
-          <div><span class="common-pattern-name"><dfn id="common.data.langcode">langcode</dfn></span><code class="punc"> = </code>"" | <a href="datatypes.html#data.language">language-tag</a> <a href="datatypes.html#common.data.langcode" class="hash">#</a></div>
-      <div class="datatype-desc">&#8230;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="references.html#refsRFC4646">[RFC4646]</a>.</div>
+          <div><span class="common-pattern-name"><dfn id="common.data.langcode">langcode</dfn></span><code class="punc"> = </code> <a href="datatypes.html#common.data.langcode" class="hash">#</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="references.html#refsRFC4646">[RFC4646]</a>.</div>
     </div>
       </div>
       <div id="common.data.keylabellist-mdl" class="section">
@@ -504,7 +538,16 @@
       <div id="form.data.datetime-local-mdl" class="section">
         <h2 class="common-subhead">11.37. Datetime-local <a class="hash" href="#form.data.datetime-local-mdl">#</a></h2>
         <div class="content-models">
-          <div><span class="common-pattern-name"><dfn id="form.data.datetime-local">datetime-local</dfn></span><code class="punc"> = </code><a href="datatypes.html#form.data.date">date</a> "<code class="literal">T</code>" <a href="datatypes.html#form.data.time">time</a> <a href="datatypes.html#form.data.datetime-local" class="hash">#</a></div>
+          <div><span class="common-pattern-name"><dfn id="form.data.datetime-local">datetime-local</dfn></span><code class="punc"> = </code> <a href="datatypes.html#form.data.datetime-local" class="hash">#</a></div>
+      <div class="datatype-desc">The following parts, in exactly
+        the following order:
+        <ol>
+          <li>A <a href="datatypes.html#form.data.date">date</a>.</li>
+          <li>The literal string
+          "<code class="literal">T</code>".</li>
+          <li>A <a href="datatypes.html#form.data.time">time</a>.</li>
+        </ol>
+      </div>
       <div class="example">
         <p>Example:</p>
         <pre><code>1985-04-12T23:20:50.52</code>
@@ -516,12 +559,14 @@
         <h2 class="common-subhead">11.38. Date <a class="hash" href="#form.data.date-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="form.data.date">date</dfn></span><code class="punc"> = </code> <a href="datatypes.html#form.data.date" class="hash">#</a></div>
-      <div class="datatype-desc">A valid <b class="defined-elsewhere">full-date</b>, as defined in
-        RFC 3339 <a href="references.html#refsRFC3339">[RFC3339]</a>, with the
-        additional qualification that the year component is a
-        <a href="datatypes.html#data-date-fullyear">date-fullyear</a> as
-        defined in this document.</div>
-    
+      <div class="datatype-desc">A valid
+        <dfn id="full-date" title="full-date">full-date</dfn>,
+        as defined in RFC 3339
+        <a href="references.html#refsRFC3339">[RFC3339]</a>,
+        with the additional qualification that the year component
+        is a
+        <a href="datatypes.html#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>
@@ -531,9 +576,18 @@
       <div id="form.data.month-mdl" class="section">
         <h2 class="common-subhead">11.39. Month <a class="hash" href="#form.data.month-mdl">#</a></h2>
         <div class="content-models">
-          <div><span class="common-pattern-name"><dfn id="form.data.month">month</dfn></span><code class="punc"> = </code><a href="datatypes.html#data-date-fullyear">date-fullyear</a> "-" <a href="datatypes.html#data-date-month">date-month</a> <a href="datatypes.html#form.data.month" class="hash">#</a></div>
-      <div class="datatype-desc">&#8230;where <dfn id="data-date-month">date-month</dfn> is as defined
-        in RFC 3339 <a href="references.html#refsRFC3339">[RFC3339]</a>.</div>
+          <div><span class="common-pattern-name"><dfn id="form.data.month">month</dfn></span><code class="punc"> = </code> <a href="datatypes.html#form.data.month" class="hash">#</a></div>
+      <div class="datatype-desc">The following parts, in exactly the
+        following order:
+        <ol>
+          <li>A <a href="datatypes.html#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="references.html#refsRFC3339">[RFC3339]</a>.</li>
+        </ol>
+      </div>
       <div class="example">
         <p>Example:</p>
         <pre><code>1996-12</code></pre>
@@ -543,9 +597,20 @@
       <div id="form.data.week-mdl" class="section">
         <h2 class="common-subhead">11.40. Week <a class="hash" href="#form.data.week-mdl">#</a></h2>
         <div class="content-models">
-          <div><span class="common-pattern-name"><dfn id="form.data.week">week</dfn></span><code class="punc"> = </code><a href="datatypes.html#data-date-fullyear">date-fullyear</a> "-W" <a href="datatypes.html#data-date-week">date-week</a> <a href="datatypes.html#form.data.week" class="hash">#</a></div>
-      <div class="datatype-desc">&#8230;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="references.html#refsRFC3339">[RFC3339]</a>.</div>
+          <div><span class="common-pattern-name"><dfn id="form.data.week">week</dfn></span><code class="punc"> = </code> <a href="datatypes.html#form.data.week" class="hash">#</a></div>
+      <div class="datatype-desc">The following parts, in exactly
+        the following order:
+        <ol>
+          <li>A
+          <a href="datatypes.html#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="references.html#refsRFC3339">[RFC3339]</a>.</li>
+        </ol>
+      </div>
     
       <div class="example">
         <p>Example:</p>
@@ -557,8 +622,10 @@
         <h2 class="common-subhead">11.41. Time <a class="hash" href="#form.data.time-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="form.data.time">time</dfn></span><code class="punc"> = </code> <a href="datatypes.html#form.data.time" class="hash">#</a></div>
-      <div class="datatype-desc">A valid <b class="defined-elsewhere">partial-time</b>, as defined
-        in RFC 3339 <a href="references.html#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="references.html#refsRFC3339">[RFC3339]</a>.</div>
     
       <div class="example">
         <p>Examples:</p>
@@ -570,12 +637,25 @@
       <div id="form.data.emailaddress-mdl" class="section">
         <h2 class="common-subhead">11.42. Emailaddress <a class="hash" href="#form.data.emailaddress-mdl">#</a></h2>
         <div class="content-models">
-          <div><span class="common-pattern-name"><dfn id="form.data.emailaddress">emailaddress</dfn></span><code class="punc"> = </code><a href="datatypes.html#data-dot-atom">dot-atom</a> "@" <a href="datatypes.html#data-dot-atom">dot-atom</a> <a href="datatypes.html#form.data.emailaddress" class="hash">#</a></div>
-      <div class="datatype-desc">&#8230;where <dfn id="data-dot-atom">dot-atom</dfn> is as defined in RFC
-        5322 <a href="references.html#refsRFC5322">[RFC5322]</a>, with the
-        additional constraint that the <b class="defined-elsewhere">CFWS</b> production is excluded
-      everywhere.</div>
-    
+          <div><span class="common-pattern-name"><dfn id="form.data.emailaddress">emailaddress</dfn></span><code class="punc"> = </code> <a href="datatypes.html#form.data.emailaddress" class="hash">#</a></div>
+      <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="references.html#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="datatypes.html#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>
@@ -593,7 +673,22 @@
       <div id="form.data.color-mdl" class="section">
         <h2 class="common-subhead">11.44. Color <a class="hash" href="#form.data.color-mdl">#</a></h2>
         <div class="content-models">
-          <div><span class="common-pattern-name"><dfn id="form.data.color">color</dfn></span><code class="punc"> = </code><code class="regexp">#[a-fA-F0-9]{6}</code> <a href="datatypes.html#form.data.color" class="hash">#</a></div></div>
+          <div><span class="common-pattern-name"><dfn id="form.data.color">color</dfn></span><code class="punc"> = </code> <a href="datatypes.html#form.data.color" class="hash">#</a></div>
+      <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&#8211;U+0039 DIGIT NINE">0&#8211;9</code>,
+          <code title="U+0061 LATIN SMALL LETTER A&#8211;U+0066 LATIN SMALL LETTER F">a&#8211;f</code>,
+          and
+          <code title="U+0041 LATIN CAPITAL LETTER A&#8211;U+0046 LATIN CAPITAL LETTER F">A&#8211;F</code>.</li>
+        </ol>
+      </div>
+    </div>
       </div>
     </div>
 <hr class="footerbreak"></hr>

Index: patch-schema
===================================================================
RCS file: /sources/public/html5/markup/patch-schema,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- patch-schema	6 Aug 2009 10:34:35 -0000	1.76
+++ patch-schema	9 Aug 2009 15:15:19 -0000	1.77
@@ -310,17 +310,14 @@
  					{	( w:string "allow-same-origin" )?
  					,	( w:string "allow-forms" )?
  					,	( w:string "allow-scripts" )?
-@@ -358,9 +361,9 @@
+@@ -358,7 +361,7 @@
  					,	( w:string "allow-forms" )?
  					,	( w:string "allow-same-origin" )?
  					}
 -				} & v5only
 +				)	& v5only
  	iframe.inner =
--		( text )
-+		( non-replaceable-character-data )
- 
- 	common.elem.phrasing |= iframe.elem
+ 		( text )
  
 @@ -396,20 +399,49 @@
  	area.attrs =

Index: spec.html
===================================================================
RCS file: /sources/public/html5/markup/spec.html,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -d -r1.92 -r1.93
--- spec.html	8 Aug 2009 14:02:58 -0000	1.92
+++ spec.html	9 Aug 2009 15:15:19 -0000	1.93
@@ -9,7 +9,7 @@
 <body>
 <div class="head">
 <h1>HTML 5: The Markup Language</h1>
-<h2>Editor&#8217;s Draft <em>8 August 2009</em>
+<h2>Editor&#8217;s Draft <em>9 August 2009</em>
 </h2>
 <dl>
 <dt>Latest Editor&#8217;s Draft:</dt>
@@ -41,7 +41,7 @@
     
     
     <p>
-        This document is the 8 August 2009 Editor&#8217;s Draft of 
+        This document is the 9 August 2009 Editor&#8217;s Draft of 
         <cite>HTML 5: The Markup Language</cite>.
       </p>
     <p>
@@ -15658,8 +15658,11 @@
           <div>
 <span class="common-pattern-name"><dfn id="common.data.datetime">datetime</dfn></span><code class="punc"> = </code> <a href="#common.data.datetime" class="hash">#</a>
 </div>
-      <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
@@ -15786,12 +15789,15 @@
 </div>
       <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>
     </div>
@@ -15803,10 +15809,19 @@
           <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 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>
     </div>
       </div>
       <div id="common.data.refresh-mdl" class="section">
@@ -15818,14 +15833,25 @@
 </div>
       <div class="datatype-desc">Any one of the following:
         <ul>
-<li>a
-          <a href="#common.data.integer.non-negative">non-negative integer</a>
+<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>
-          <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>
@@ -15835,9 +15861,11 @@
 </h2>
         <div class="content-models">
           <div>
-<span class="common-pattern-name"><dfn id="common.data.default-style">default-style</dfn></span><code class="punc"> = </code><a href="#data-string">string</a> <a href="#common.data.default-style" class="hash">#</a>
-</div>
+<span class="common-pattern-name"><dfn id="common.data.default-style">default-style</dfn></span><code class="punc"> = </code> <a href="#common.data.default-style" class="hash">#</a>
 </div>
+      <div class="datatype-desc">A
+        <a href="#data-string">string</a>.</div>
+    </div>
       </div>
       <div id="common.data.mediaquery-mdl" class="section">
         <h2 class="common-subhead">11.28. Mediaquery <a class="hash" href="#common.data.mediaquery-mdl">#</a>
@@ -15846,7 +15874,9 @@
           <div>
 <span class="common-pattern-name"><dfn id="common.data.mediaquery">mediaquery</dfn></span><code class="punc"> = </code> <a href="#common.data.mediaquery" class="hash">#</a>
 </div>
-      <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>
     </div>
       </div>
@@ -15855,10 +15885,12 @@
 </h2>
         <div class="content-models">
           <div>
-<span class="common-pattern-name"><dfn id="common.data.langcode">langcode</dfn></span><code class="punc"> = </code>"" | <a href="#data.language">language-tag</a> <a href="#common.data.langcode" class="hash">#</a>
+<span class="common-pattern-name"><dfn id="common.data.langcode">langcode</dfn></span><code class="punc"> = </code> <a href="#common.data.langcode" class="hash">#</a>
 </div>
-      <div class="datatype-desc">&#8230;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>
     </div>
       </div>
       <div id="common.data.keylabellist-mdl" class="section">
@@ -15957,7 +15989,16 @@
 </h2>
         <div class="content-models">
           <div>
-<span class="common-pattern-name"><dfn id="form.data.datetime-local">datetime-local</dfn></span><code class="punc"> = </code><a href="#form.data.date">date</a> "<code class="literal">T</code>" <a href="#form.data.time">time</a> <a href="#form.data.datetime-local" class="hash">#</a>
+<span class="common-pattern-name"><dfn id="form.data.datetime-local">datetime-local</dfn></span><code class="punc"> = </code> <a href="#form.data.datetime-local" class="hash">#</a>
+</div>
+      <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>
@@ -15973,12 +16014,14 @@
           <div>
 <span class="common-pattern-name"><dfn id="form.data.date">date</dfn></span><code class="punc"> = </code> <a href="#form.data.date" class="hash">#</a>
 </div>
-      <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>
-    
+      <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>
@@ -15990,10 +16033,19 @@
 </h2>
         <div class="content-models">
           <div>
-<span class="common-pattern-name"><dfn id="form.data.month">month</dfn></span><code class="punc"> = </code><a href="#data-date-fullyear">date-fullyear</a> "-" <a href="#data-date-month">date-month</a> <a href="#form.data.month" class="hash">#</a>
+<span class="common-pattern-name"><dfn id="form.data.month">month</dfn></span><code class="punc"> = </code> <a href="#form.data.month" class="hash">#</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="datatype-desc">&#8230;where <dfn id="data-date-month">date-month</dfn> is as defined
-        in RFC 3339 <a href="#refsRFC3339">[RFC3339]</a>.</div>
       <div class="example">
         <p>Example:</p>
         <pre><code>1996-12</code></pre>
@@ -16005,10 +16057,21 @@
 </h2>
         <div class="content-models">
           <div>
-<span class="common-pattern-name"><dfn id="form.data.week">week</dfn></span><code class="punc"> = </code><a href="#data-date-fullyear">date-fullyear</a> "-W" <a href="#data-date-week">date-week</a> <a href="#form.data.week" class="hash">#</a>
+<span class="common-pattern-name"><dfn id="form.data.week">week</dfn></span><code class="punc"> = </code> <a href="#form.data.week" class="hash">#</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>
-      <div class="datatype-desc">&#8230;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="example">
         <p>Example:</p>
@@ -16023,8 +16086,10 @@
           <div>
 <span class="common-pattern-name"><dfn id="form.data.time">time</dfn></span><code class="punc"> = </code> <a href="#form.data.time" class="hash">#</a>
 </div>
-      <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>
     
       <div class="example">
         <p>Examples:</p>
@@ -16038,13 +16103,26 @@
 </h2>
         <div class="content-models">
           <div>
-<span class="common-pattern-name"><dfn id="form.data.emailaddress">emailaddress</dfn></span><code class="punc"> = </code><a href="#data-dot-atom">dot-atom</a> "@" <a href="#data-dot-atom">dot-atom</a> <a href="#form.data.emailaddress" class="hash">#</a>
+<span class="common-pattern-name"><dfn id="form.data.emailaddress">emailaddress</dfn></span><code class="punc"> = </code> <a href="#form.data.emailaddress" class="hash">#</a>
+</div>
+      <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="datatype-desc">&#8230;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>
-    
       <div class="example">
         <p>Examples:</p>
         <pre><code>foo-bar.baz@example.com</code></pre>
@@ -16067,9 +16145,23 @@
 </h2>
         <div class="content-models">
           <div>
-<span class="common-pattern-name"><dfn id="form.data.color">color</dfn></span><code class="punc"> = </code><code class="regexp">#[a-fA-F0-9]{6}</code> <a href="#form.data.color" class="hash">#</a>
+<span class="common-pattern-name"><dfn id="form.data.color">color</dfn></span><code class="punc"> = </code> <a href="#form.data.color" class="hash">#</a>
 </div>
+      <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&#8211;U+0039 DIGIT NINE">0&#8211;9</code>,
+          <code title="U+0061 LATIN SMALL LETTER A&#8211;U+0066 LATIN SMALL LETTER F">a&#8211;f</code>,
+          and
+          <code title="U+0041 LATIN CAPITAL LETTER A&#8211;U+0046 LATIN CAPITAL LETTER F">A&#8211;F</code>.</li>
+        </ol>
 </div>
+    </div>
       </div>
     </div>
     </div>
Received on Sunday, 9 August 2009 15:16:25 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Saturday, 18 December 2010 06:14:08 GMT