h:tml; incorporated upstream schema change that adds "cite" attribute to <section> and <article> elements from poot on 2009-05-08 (public-html-diffs@w3.org from May 2009)

From: poot <cvsmail@w3.org>
Date: Fri, 8 May 2009 16:48:35 +0900 (JST)
To: public-html-diffs@w3.org
Message-Id: <20090508074835.B432D2BCB2@toro.w3.mag.keio.ac.jp>
h:tml; incorporated upstream schema change that adds "cite" attribute to
<section> and <article> elements

Diffs for this change per section: 
http://people.w3.org/mike/diffs/html5/markup/Overview.1.305.html#dfn-toc
http://people.w3.org/mike/diffs/html5/markup/Overview.1.305.html#abstract
http://people.w3.org/mike/diffs/html5/markup/Overview.1.305.html#video-toc
http://people.w3.org/mike/diffs/html5/markup/Overview.1.305.html#appendices

http://people.w3.org/mike/diffs/html5/markup/Overview.diff.html
http://dev.w3.org/cvsweb/html5/markup/Overview.html?r1=1.304&r2=1.305&f=h

===================================================================
RCS file: /sources/public/html5/markup/Overview.html,v
retrieving revision 1.304
retrieving revision 1.305
diff -u -d -r1.304 -r1.305
--- Overview.html 6 May 2009 13:34:08 -0000 1.304
+++ Overview.html 8 May 2009 07:48:06 -0000 1.305
@@ -9,7 +9,7 @@
 <body>
 <div class="head">
 <h1>HTML 5: The Markup Language</h1>
-<h2>Editor&#8217;s Draft <em>6 May 2009</em>
+<h2>Editor&#8217;s Draft <em>8 May 2009</em>
 </h2>
 <dl>
 <dt>Latest Editor&#8217;s Draft:</dt>
@@ -42,7 +42,7 @@
     
     
     <p>
-        This document is the 6 May 2009 Editor&#8217;s Draft of 
+        This document is the 8 May 2009 Editor&#8217;s Draft of 
         <cite>HTML 5: The Markup Language</cite>.
       </p>
     <p>

Index: schema.html
===================================================================
RCS file: /sources/public/html5/markup/schema.html,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -d -r1.95 -r1.96
--- schema.html 6 May 2009 13:34:10 -0000 1.95
+++ schema.html 8 May 2009 07:48:07 -0000 1.96
@@ -608,7 +608,7 @@
 
 <span class='comment'>## List of Key Labels</span>
   <div class='patternname' id='the-common.data.keylabellist'><a href='#the-common.data.keylabellist'>common.data.keylabellist</a> =</div>
-  <span class='pattern' id='common.data.keylabellist'>string</span>
+  <span class='pattern' id='common.data.keylabellist'>d:keylabellist</span>
 </div>
 <div class='define' id='common-form.attrs.form-define'>
   <div class='patternname' id='the-common-form.attrs.form'><a href='#the-common-form.attrs.form'>common-form.attrs.form</a> =</div>
@@ -3113,7 +3113,17 @@
 </div>
 <div class='define' id='section.attrs-define'>
   <div class='patternname' id='the-section.attrs'><a href='#the-section.attrs'>section.attrs</a> =</div>
-  <span class='pattern' id='section.attrs'><a class='ref' href='#common.attrs'>common.attrs</a></span>
+  <span class='pattern' id='section.attrs'><a class='ref' href='#common.attrs'>common.attrs</a>
+  &amp; <a class='ref' href='#section.attrs.cite'>section.attrs.cite</a>?</span>
+</div>
+<div class='define' id='section.attrs.cite-define'>
+  <div class='patternname' id='the-section.attrs.cite'><a href='#the-section.attrs.cite'>section.attrs.cite</a> =</div>
+  <span class='pattern' id='section.attrs.cite'><span class='type'>attribute </span>
+  <span class='name'>cite</span>
+   {<span class='model'>
+      <a class='ref' href='#common.data.uri'>common.data.uri</a>
+    </span>}
+  </span>
 </div>
 <div class='define' id='section.inner-define'>
   <div class='patternname' id='the-section.inner'><a href='#the-section.inner'>section.inner</a> =</div>
@@ -3154,7 +3164,17 @@
 </div>
 <div class='define' id='article.attrs-define'>
   <div class='patternname' id='the-article.attrs'><a href='#the-article.attrs'>article.attrs</a> =</div>
-  <span class='pattern' id='article.attrs'><a class='ref' href='#common.attrs'>common.attrs</a></span>
+  <span class='pattern' id='article.attrs'><a class='ref' href='#common.attrs'>common.attrs</a>
+  &amp; <a class='ref' href='#article.attrs.cite'>article.attrs.cite</a>?</span>
+</div>
+<div class='define' id='article.attrs.cite-define'>
+  <div class='patternname' id='the-article.attrs.cite'><a href='#the-article.attrs.cite'>article.attrs.cite</a> =</div>
+  <span class='pattern' id='article.attrs.cite'><span class='type'>attribute </span>
+  <span class='name'>cite</span>
+   {<span class='model'>
+      <a class='ref' href='#common.data.uri'>common.data.uri</a>
+    </span>}
+  </span>
 </div>
 <div class='define' id='article.inner-define'>
   <div class='patternname' id='the-article.inner'><a href='#the-article.inner'>article.inner</a> =</div>

Index: section.html
===================================================================
RCS file: /sources/public/html5/markup/section.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- section.html 3 May 2009 15:59:43 -0000 1.6
+++ section.html 8 May 2009 07:48:09 -0000 1.7
@@ -31,8 +31,17 @@
       </div><div class="no-number no-toc" id="section-attr-mdl">
         <h2 class="element-subhead">Attribute model <a class="hash" href="#section-attr-mdl">#</a></h2>
         <div class="attr-content-models">
-          <p><a href="section.html#section.attrs">section.attrs</a> = <span class="pattern" id="section.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div>
-      
+          <p><a href="section.html#section.attrs">section.attrs</a> = <span class="pattern" id="section.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
+  &amp; <a class="ref" href="section.html#section.attrs.cite" title="section.attrs.cite">cite</a>?</span></p></div></div>
+      <div class="no-number no-toc" id="section-attributes">
+        <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#section-attributes">#</a></h2>
+        <dl class="attr-defs">
+            <dt><a class="attribute-name" id="section.attrs.cite" title="section.attrs.cite" href="section.html#section.attrs.cite">cite</a><span class="attr-values"> = 
+      <a class="ref" href="datatypes.html#common.data.uri" title="common.data.uri">uri</a>
+    </span> </dt>
+            <dd><i class="TK">(detailed attribute description to come)</i></dd>
+          
+        </dl></div>
       
       <div class="no-number no-toc" id="section-assertions">
         <h2 class="element-subhead">Assertions <a class="hash" href="#section-assertions">#</a></h2>

Index: schema.rnc
===================================================================
RCS file: /sources/public/html5/markup/schema.rnc,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- schema.rnc 6 May 2009 13:34:10 -0000 1.82
+++ schema.rnc 8 May 2009 07:48:09 -0000 1.83
@@ -294,7 +294,7 @@
     common.data.langcode = d:string "" | d:language
     
     ## List of Key Labels
-    common.data.keylabellist = string
+    common.data.keylabellist = d:keylabellist
     common-form.attrs.form = attribute form { common.data.idref }
   }
 }
@@ -1116,7 +1116,8 @@
     # #####################################################################
     ## Section: <section>
     section.elem = element section { section.inner & section.attrs }
-    section.attrs = common.attrs
+    section.attrs = common.attrs & section.attrs.cite?
+    section.attrs.cite = attribute cite { common.data.uri }
     section.inner = style.elem.scoped*, common.inner.flow
     
     ## Navigational Links: <nav>
@@ -1126,7 +1127,8 @@
     
     ## Article: <article>
     article.elem = element article { article.inner & article.attrs }
-    article.attrs = common.attrs
+    article.attrs = common.attrs & article.attrs.cite?
+    article.attrs.cite = attribute cite { common.data.uri }
     article.inner = style.elem*, common.inner.flow
     
     ## Tangential Aside: <aside>

Index: spec.html
===================================================================
RCS file: /sources/public/html5/markup/spec.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- spec.html 6 May 2009 13:34:10 -0000 1.12
+++ spec.html 8 May 2009 07:48:09 -0000 1.13
@@ -9,7 +9,7 @@
 <body>
 <div class="head">
 <h1>HTML 5: The Markup Language</h1>
-<h2>Editor&#8217;s Draft <em>6 May 2009</em>
+<h2>Editor&#8217;s Draft <em>8 May 2009</em>
 </h2>
 <dl>
 <dt>Latest Editor&#8217;s Draft:</dt>
@@ -41,7 +41,7 @@
     
     
     <p>
-        This document is the 6 May 2009 Editor&#8217;s Draft of 
+        This document is the 8 May 2009 Editor&#8217;s Draft of 
         <cite>HTML 5: The Markup Language</cite>.
       </p>
     <p>
@@ -2463,10 +2463,22 @@
         <h2 class="element-subhead">Attribute model <a class="hash" href="#article-attr-mdl">#</a>
 </h2>
         <div class="attr-content-models">
-          <p><a href="#article.attrs">article.attrs</a> = <span class="pattern" id="article.attrs"><a class="ref" href="#common.attrs">common.attrs</a></span></p>
+          <p><a href="#article.attrs">article.attrs</a> = <span class="pattern" id="article.attrs"><a class="ref" href="#common.attrs">common.attrs</a>
+  &amp; <a class="ref" href="#article.attrs.cite" title="article.attrs.cite">cite</a>?</span></p>
 </div>
 </div>
-      
+      <div class="no-number no-toc" id="article-attributes">
+        <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#article-attributes">#</a>
+</h2>
+        <dl class="attr-defs">
+<dt>
+<a class="attribute-name" id="article.attrs.cite" title="article.attrs.cite" href="#article.attrs.cite">cite</a><span class="attr-values"> = 
+      <a class="ref" href="#common.data.uri" title="common.data.uri">uri</a>
+    </span> </dt>
+            <dd><i class="TK">(detailed attribute description to come)</i></dd>
+          
+        </dl>
+</div>
       
       <div class="no-number no-toc" id="article-assertions">
         <h2 class="element-subhead">Assertions <a class="hash" href="#article-assertions">#</a>
@@ -11819,10 +11831,22 @@
         <h2 class="element-subhead">Attribute model <a class="hash" href="#section-attr-mdl">#</a>
 </h2>
         <div class="attr-content-models">
-          <p><a href="#section.attrs">section.attrs</a> = <span class="pattern" id="section.attrs"><a class="ref" href="#common.attrs">common.attrs</a></span></p>
+          <p><a href="#section.attrs">section.attrs</a> = <span class="pattern" id="section.attrs"><a class="ref" href="#common.attrs">common.attrs</a>
+  &amp; <a class="ref" href="#section.attrs.cite" title="section.attrs.cite">cite</a>?</span></p>
 </div>
 </div>
-      
+      <div class="no-number no-toc" id="section-attributes">
+        <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#section-attributes">#</a>
+</h2>
+        <dl class="attr-defs">
+<dt>
+<a class="attribute-name" id="section.attrs.cite" title="section.attrs.cite" href="#section.attrs.cite">cite</a><span class="attr-values"> = 
+      <a class="ref" href="#common.data.uri" title="common.data.uri">uri</a>
+    </span> </dt>
+            <dd><i class="TK">(detailed attribute description to come)</i></dd>
+          
+        </dl>
+</div>
       
       <div class="no-number no-toc" id="section-assertions">
         <h2 class="element-subhead">Assertions <a class="hash" href="#section-assertions">#</a>

Index: article.html
===================================================================
RCS file: /sources/public/html5/markup/article.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- article.html 3 May 2009 15:59:39 -0000 1.6
+++ article.html 8 May 2009 07:48:07 -0000 1.7
@@ -32,8 +32,17 @@
       </div><div class="no-number no-toc" id="article-attr-mdl">
         <h2 class="element-subhead">Attribute model <a class="hash" href="#article-attr-mdl">#</a></h2>
         <div class="attr-content-models">
-          <p><a href="article.html#article.attrs">article.attrs</a> = <span class="pattern" id="article.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div>
-      
+          <p><a href="article.html#article.attrs">article.attrs</a> = <span class="pattern" id="article.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
+  &amp; <a class="ref" href="article.html#article.attrs.cite" title="article.attrs.cite">cite</a>?</span></p></div></div>
+      <div class="no-number no-toc" id="article-attributes">
+        <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#article-attributes">#</a></h2>
+        <dl class="attr-defs">
+            <dt><a class="attribute-name" id="article.attrs.cite" title="article.attrs.cite" href="article.html#article.attrs.cite">cite</a><span class="attr-values"> = 
+      <a class="ref" href="datatypes.html#common.data.uri" title="common.data.uri">uri</a>
+    </span> </dt>
+            <dd><i class="TK">(detailed attribute description to come)</i></dd>
+          
+        </dl></div>
       
       <div class="no-number no-toc" id="article-assertions">
         <h2 class="element-subhead">Assertions <a class="hash" href="#article-assertions">#</a></h2>
Received on Friday, 8 May 2009 07:49:13 UTC