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

html5/markup datatypes.html,1.18,1.19 patch-schema,1.63,1.64 schema.html,1.107,1.108 schema.rnc,1.94,1.95 script.html,1.11,1.12 spec.html,1.57,1.58

From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
Date: Tue, 21 Jul 2009 05:46:31 +0000
To: public-html-commits@w3.org
Message-Id: <E1MT8BL-00026a-9g@lionel-hutz.w3.org>
Update of /sources/public/html5/markup
In directory hutz:/tmp/cvs-serv7991

Modified Files:
	datatypes.html patch-schema schema.html schema.rnc script.html 
	spec.html 
Log Message:
added the "language" attribute on <script> (with requirement that its value must be "javascript" (case insensitively))


Index: script.html
===================================================================
RCS file: /sources/public/html5/markup/script.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- script.html	20 Jul 2009 23:15:32 -0000	1.11
+++ script.html	21 Jul 2009 05:46:29 -0000	1.12
@@ -57,8 +57,10 @@
     </span> </dt>
             <dd>The language of the script or format of the data.</dd>
           
-            <dt><a class="attribute-name" id="script.attrs.language" title="script.attrs.language" href="script.html#script.attrs.language">language</a><span class="attr-values"> =   "javascript" </span> </dt>
-            <dd><i class="TK">(detailed attribute description to come)</i></dd>
+            <dt><a class="attribute-name" id="script.attrs.language" title="script.attrs.language" href="script.html#script.attrs.language">language</a><span class="attr-values"> = 
+      <a class="ref" href="datatypes.html#common.data.javascript" title="common.data.javascript">javascript</a>
+    </span> </dt>
+            <dd>Specifies that the language of the script is JavaScript.</dd>
           
             <dt><a class="attribute-name" id="script.attrs.src" title="script.attrs.src" href="script.html#script.attrs.src">src</a><span class="attr-values"> = 
       <a class="ref" href="datatypes.html#common.data.uri" title="common.data.uri">uri</a>

Index: schema.html
===================================================================
RCS file: /sources/public/html5/markup/schema.html,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -d -r1.107 -r1.108
--- schema.html	15 Jul 2009 07:02:11 -0000	1.107
+++ schema.html	21 Jul 2009 05:46:28 -0000	1.108
@@ -2912,9 +2912,15 @@
   <div class='patternname' id='the-script.attrs.language'><a href='#the-script.attrs.language'>script.attrs.language</a> =</div>
   <span class='pattern' id='script.attrs.language'><span class='type'>attribute </span>
   <span class='name'>language</span>
-   {<span class='model'> d:string "javascript" </span>}
+   {<span class='model'>
+      <a class='ref' href='#common.data.javascript'>common.data.javascript</a>
+    </span>}
   </span>
 </div>
+<div class='define' id='common.data.javascript-define'>
+  <div class='patternname' id='the-common.data.javascript'><a href='#the-common.data.javascript'>common.data.javascript</a> =</div>
+  <span class='pattern' id='common.data.javascript'>d:string "javascript"</span>
+</div>
 <div class='define' id='script.inner.embedded-define'>
   <div class='patternname' id='the-script.inner.embedded'><a href='#the-script.inner.embedded'>script.inner.embedded</a> =</div>
   <span class='pattern' id='script.inner.embedded'><a class='ref' href='#common.inner.anything'>common.inner.anything</a></span>

Index: datatypes.html
===================================================================
RCS file: /sources/public/html5/markup/datatypes.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- datatypes.html	21 Jul 2009 01:45:09 -0000	1.18
+++ datatypes.html	21 Jul 2009 05:46:28 -0000	1.19
@@ -295,8 +295,17 @@
         <code title="U+0030 DIGIT ZERO">0</code>.</div>
     </div>
       </div>
+      <div id="common.data.javascript-mdl" class="section">
+        <h2 class="common-subhead">11.32. Javascript <a class="hash" href="#common.data.javascript-mdl">#</a></h2>
+        <div class="content-models">
+          <div><span class="common-pattern-name"><dfn id="common.data.javascript">javascript</dfn></span><code class="punc"> = </code> <a href="datatypes.html#common.data.javascript" class="hash">#</a></div>
+      <div class="datatype-desc">Any
+        <a href="terminology.html#ascii-case-insensitive">ASCII case-insensitive</a>
+        match for the literal string "<code>javascript</code>".</div>
+    </div>
+      </div>
       <div id="form.data.mimetypelist-mdl" class="section">
-        <h2 class="common-subhead">11.32. Mimetypelist <a class="hash" href="#form.data.mimetypelist-mdl">#</a></h2>
+        <h2 class="common-subhead">11.33. Mimetypelist <a class="hash" href="#form.data.mimetypelist-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="form.data.mimetypelist">mimetypelist</dfn></span><code class="punc"> = </code> <a href="datatypes.html#form.data.mimetypelist" class="hash">#</a></div>
       <div class="datatype-desc">A set of comma-separated <a href="datatypes.html#data-token">tokens</a>,
@@ -305,7 +314,7 @@
     </div>
       </div>
       <div id="form.data.charsetlist-mdl" class="section">
-        <h2 class="common-subhead">11.33. Charsetlist <a class="hash" href="#form.data.charsetlist-mdl">#</a></h2>
+        <h2 class="common-subhead">11.34. Charsetlist <a class="hash" href="#form.data.charsetlist-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="form.data.charsetlist">charsetlist</dfn></span><code class="punc"> = </code> <a href="datatypes.html#form.data.charsetlist" class="hash">#</a></div>
       <div class="datatype-desc">A set of comma-separated <a href="datatypes.html#data-token">tokens</a>,
@@ -315,7 +324,7 @@
     </div>
       </div>
       <div id="form.data.pattern-mdl" class="section">
-        <h2 class="common-subhead">11.34. Pattern <a class="hash" href="#form.data.pattern-mdl">#</a></h2>
+        <h2 class="common-subhead">11.35. Pattern <a class="hash" href="#form.data.pattern-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="form.data.pattern">pattern</dfn></span><code class="punc"> = </code> <a href="datatypes.html#form.data.pattern" class="hash">#</a></div>
       <div class="datatype-desc">A regular expression that must
@@ -323,7 +332,7 @@
     </div>
       </div>
       <div id="form.data.datetime-local-mdl" class="section">
-        <h2 class="common-subhead">11.35. Datetime-local <a class="hash" href="#form.data.datetime-local-mdl">#</a></h2>
+        <h2 class="common-subhead">11.36. 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 class="example">
@@ -334,7 +343,7 @@
     </div>
       </div>
       <div id="form.data.date-mdl" class="section">
-        <h2 class="common-subhead">11.36. Date <a class="hash" href="#form.data.date-mdl">#</a></h2>
+        <h2 class="common-subhead">11.37. 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
@@ -350,7 +359,7 @@
     </div>
       </div>
       <div id="form.data.month-mdl" class="section">
-        <h2 class="common-subhead">11.37. Month <a class="hash" href="#form.data.month-mdl">#</a></h2>
+        <h2 class="common-subhead">11.38. 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
@@ -362,7 +371,7 @@
     </div>
       </div>
       <div id="form.data.week-mdl" class="section">
-        <h2 class="common-subhead">11.38. Week <a class="hash" href="#form.data.week-mdl">#</a></h2>
+        <h2 class="common-subhead">11.39. 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
@@ -375,7 +384,7 @@
     </div>
       </div>
       <div id="form.data.time-mdl" class="section">
-        <h2 class="common-subhead">11.39. Time <a class="hash" href="#form.data.time-mdl">#</a></h2>
+        <h2 class="common-subhead">11.40. 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
@@ -389,7 +398,7 @@
     </div>
       </div>
       <div id="form.data.emailaddress-mdl" class="section">
-        <h2 class="common-subhead">11.40. Emailaddress <a class="hash" href="#form.data.emailaddress-mdl">#</a></h2>
+        <h2 class="common-subhead">11.41. 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
@@ -404,7 +413,7 @@
     </div>
       </div>
       <div id="form.data.emailaddresslist-mdl" class="section">
-        <h2 class="common-subhead">11.41. Emailaddresslist <a class="hash" href="#form.data.emailaddresslist-mdl">#</a></h2>
+        <h2 class="common-subhead">11.42. Emailaddresslist <a class="hash" href="#form.data.emailaddresslist-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="form.data.emailaddresslist">emailaddresslist</dfn></span><code class="punc"> = </code> <a href="datatypes.html#form.data.emailaddresslist" class="hash">#</a></div>
       <div class="datatype-desc">A set of comma-separated <a href="datatypes.html#data-token">tokens</a>, each of which is a valid
@@ -412,7 +421,7 @@
     </div>
       </div>
       <div id="form.data.color-mdl" class="section">
-        <h2 class="common-subhead">11.42. Color <a class="hash" href="#form.data.color-mdl">#</a></h2>
+        <h2 class="common-subhead">11.43. 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>

Index: schema.rnc
===================================================================
RCS file: /sources/public/html5/markup/schema.rnc,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -d -r1.94 -r1.95
--- schema.rnc	15 Jul 2009 07:02:12 -0000	1.94
+++ schema.rnc	21 Jul 2009 05:46:29 -0000	1.95
@@ -1068,7 +1068,9 @@
         
       }
     script.attrs.charset = attribute charset { common.data.charset }
-    script.attrs.language = attribute language { d:string "javascript" }
+    script.attrs.language =
+      attribute language { common.data.javascript }
+    common.data.javascript = d:string "javascript"
     script.inner.embedded = common.inner.anything
     script.elem = script.elem.embedded | script.elem.imported
     

Index: patch-schema
===================================================================
RCS file: /sources/public/html5/markup/patch-schema,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- patch-schema	26 Jun 2009 10:05:47 -0000	1.63
+++ patch-schema	21 Jul 2009 05:46:28 -0000	1.64
@@ -1,6 +1,6 @@
 Index: schema/revision.rnc
 ===================================================================
---- schema/revision.rnc	(revision 436)
+--- schema/revision.rnc	(revision 453)
 +++ schema/revision.rnc	(working copy)
 @@ -2,17 +2,6 @@
  ##  RELAX NG Schema for HTML 5: Revision Annotations                  #
@@ -62,7 +62,7 @@
  	del.inner.phrasing =
 Index: schema/web-forms.rnc
 ===================================================================
---- schema/web-forms.rnc	(revision 431)
+--- schema/web-forms.rnc	(revision 453)
 +++ schema/web-forms.rnc	(working copy)
 @@ -295,17 +295,9 @@
  		(	common.attrs
@@ -153,7 +153,7 @@
  
 Index: schema/media.rnc
 ===================================================================
---- schema/media.rnc	(revision 442)
+--- schema/media.rnc	(revision 453)
 +++ schema/media.rnc	(working copy)
 @@ -4,32 +4,6 @@
  ##  RELAX NG Schema for HTML 5: Advanced Embedded Content             #
@@ -273,7 +273,7 @@
  
 Index: schema/web-forms2.rnc
 ===================================================================
---- schema/web-forms2.rnc	(revision 430)
+--- schema/web-forms2.rnc	(revision 453)
 +++ schema/web-forms2.rnc	(working copy)
 @@ -668,10 +668,6 @@
  
@@ -288,9 +288,9 @@
  		&	shared-form.attrs.autofocus? 
 Index: schema/meta.rnc
 ===================================================================
---- schema/meta.rnc	(revision 437)
+--- schema/meta.rnc	(revision 453)
 +++ schema/meta.rnc	(working copy)
-@@ -219,11 +219,8 @@
+@@ -241,11 +241,8 @@
  		)
  		meta.charset.attrs.charset =
  			attribute charset {
@@ -306,7 +306,7 @@
  
 Index: schema/applications.rnc
 ===================================================================
---- schema/applications.rnc	(revision 441)
+--- schema/applications.rnc	(revision 453)
 +++ schema/applications.rnc	(working copy)
 @@ -111,12 +111,26 @@
  	command.command.attrs =
@@ -408,13 +408,30 @@
  	command.inner =
  		( empty )
  	
+Index: schema/core-scripting.rnc
+===================================================================
+--- schema/core-scripting.rnc	(revision 453)
++++ schema/core-scripting.rnc	(working copy)
+@@ -49,8 +49,11 @@
+ 			}
+ 		script.attrs.language =
+ 			attribute language {
++				common.data.javascript
++			}
++			common.data.javascript =
+ 				w:string "javascript"
+-			}
++		
+ 	script.inner.embedded =
+ 		( common.inner.anything )
+ 	script.inner.imported =
 Index: schema/common.rnc
 ===================================================================
---- schema/common.rnc	(revision 430)
+--- schema/common.rnc	(revision 453)
 +++ schema/common.rnc	(working copy)
-@@ -351,16 +351,8 @@
- 	common.data.keylabellist =
- 		w:keylabellist
+@@ -359,16 +359,8 @@
+   common.data.zero =
+     w:zero
  
 -# #####################################################################
 -##  WF2 Module Hook                                                   #

Index: spec.html
===================================================================
RCS file: /sources/public/html5/markup/spec.html,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- spec.html	21 Jul 2009 01:45:09 -0000	1.57
+++ spec.html	21 Jul 2009 05:46:29 -0000	1.58
@@ -12132,8 +12132,10 @@
             <dd>The language of the script or format of the data.</dd>
           
             <dt>
-<a class="attribute-name" id="script.attrs.language" title="script.attrs.language" href="#script.attrs.language">language</a><span class="attr-values"> =   "javascript" </span> </dt>
-            <dd><i class="TK">(detailed attribute description to come)</i></dd>
+<a class="attribute-name" id="script.attrs.language" title="script.attrs.language" href="#script.attrs.language">language</a><span class="attr-values"> = 
+      <a class="ref" href="#common.data.javascript" title="common.data.javascript">javascript</a>
+    </span> </dt>
+            <dd>Specifies that the language of the script is JavaScript.</dd>
           
             <dt>
 <a class="attribute-name" id="script.attrs.src" title="script.attrs.src" href="#script.attrs.src">src</a><span class="attr-values"> = 
@@ -15051,8 +15053,20 @@
         <code title="U+0030 DIGIT ZERO">0</code>.</div>
     </div>
       </div>
+      <div id="common.data.javascript-mdl" class="section">
+        <h2 class="common-subhead">11.32. Javascript <a class="hash" href="#common.data.javascript-mdl">#</a>
+</h2>
+        <div class="content-models">
+          <div>
+<span class="common-pattern-name"><dfn id="common.data.javascript">javascript</dfn></span><code class="punc"> = </code> <a href="#common.data.javascript" class="hash">#</a>
+</div>
+      <div class="datatype-desc">Any
+        <a href="#ascii-case-insensitive">ASCII case-insensitive</a>
+        match for the literal string "<code>javascript</code>".</div>
+    </div>
+      </div>
       <div id="form.data.mimetypelist-mdl" class="section">
-        <h2 class="common-subhead">11.32. Mimetypelist <a class="hash" href="#form.data.mimetypelist-mdl">#</a>
+        <h2 class="common-subhead">11.33. Mimetypelist <a class="hash" href="#form.data.mimetypelist-mdl">#</a>
 </h2>
         <div class="content-models">
           <div>
@@ -15064,7 +15078,7 @@
     </div>
       </div>
       <div id="form.data.charsetlist-mdl" class="section">
-        <h2 class="common-subhead">11.33. Charsetlist <a class="hash" href="#form.data.charsetlist-mdl">#</a>
+        <h2 class="common-subhead">11.34. Charsetlist <a class="hash" href="#form.data.charsetlist-mdl">#</a>
 </h2>
         <div class="content-models">
           <div>
@@ -15077,7 +15091,7 @@
     </div>
       </div>
       <div id="form.data.pattern-mdl" class="section">
-        <h2 class="common-subhead">11.34. Pattern <a class="hash" href="#form.data.pattern-mdl">#</a>
+        <h2 class="common-subhead">11.35. Pattern <a class="hash" href="#form.data.pattern-mdl">#</a>
 </h2>
         <div class="content-models">
           <div>
@@ -15088,7 +15102,7 @@
     </div>
       </div>
       <div id="form.data.datetime-local-mdl" class="section">
-        <h2 class="common-subhead">11.35. Datetime-local <a class="hash" href="#form.data.datetime-local-mdl">#</a>
+        <h2 class="common-subhead">11.36. Datetime-local <a class="hash" href="#form.data.datetime-local-mdl">#</a>
 </h2>
         <div class="content-models">
           <div>
@@ -15102,7 +15116,7 @@
     </div>
       </div>
       <div id="form.data.date-mdl" class="section">
-        <h2 class="common-subhead">11.36. Date <a class="hash" href="#form.data.date-mdl">#</a>
+        <h2 class="common-subhead">11.37. Date <a class="hash" href="#form.data.date-mdl">#</a>
 </h2>
         <div class="content-models">
           <div>
@@ -15121,7 +15135,7 @@
     </div>
       </div>
       <div id="form.data.month-mdl" class="section">
-        <h2 class="common-subhead">11.37. Month <a class="hash" href="#form.data.month-mdl">#</a>
+        <h2 class="common-subhead">11.38. Month <a class="hash" href="#form.data.month-mdl">#</a>
 </h2>
         <div class="content-models">
           <div>
@@ -15136,7 +15150,7 @@
     </div>
       </div>
       <div id="form.data.week-mdl" class="section">
-        <h2 class="common-subhead">11.38. Week <a class="hash" href="#form.data.week-mdl">#</a>
+        <h2 class="common-subhead">11.39. Week <a class="hash" href="#form.data.week-mdl">#</a>
 </h2>
         <div class="content-models">
           <div>
@@ -15152,7 +15166,7 @@
     </div>
       </div>
       <div id="form.data.time-mdl" class="section">
-        <h2 class="common-subhead">11.39. Time <a class="hash" href="#form.data.time-mdl">#</a>
+        <h2 class="common-subhead">11.40. Time <a class="hash" href="#form.data.time-mdl">#</a>
 </h2>
         <div class="content-models">
           <div>
@@ -15169,7 +15183,7 @@
     </div>
       </div>
       <div id="form.data.emailaddress-mdl" class="section">
-        <h2 class="common-subhead">11.40. Emailaddress <a class="hash" href="#form.data.emailaddress-mdl">#</a>
+        <h2 class="common-subhead">11.41. Emailaddress <a class="hash" href="#form.data.emailaddress-mdl">#</a>
 </h2>
         <div class="content-models">
           <div>
@@ -15187,7 +15201,7 @@
     </div>
       </div>
       <div id="form.data.emailaddresslist-mdl" class="section">
-        <h2 class="common-subhead">11.41. Emailaddresslist <a class="hash" href="#form.data.emailaddresslist-mdl">#</a>
+        <h2 class="common-subhead">11.42. Emailaddresslist <a class="hash" href="#form.data.emailaddresslist-mdl">#</a>
 </h2>
         <div class="content-models">
           <div>
@@ -15198,7 +15212,7 @@
     </div>
       </div>
       <div id="form.data.color-mdl" class="section">
-        <h2 class="common-subhead">11.42. Color <a class="hash" href="#form.data.color-mdl">#</a>
+        <h2 class="common-subhead">11.43. Color <a class="hash" href="#form.data.color-mdl">#</a>
 </h2>
         <div class="content-models">
           <div>
Received on Tuesday, 21 July 2009 05:46:47 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Tuesday, 21 July 2009 05:46:55 GMT