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

html5/markup/tools generate-spec-source.xsl,1.199,1.200 specgen.xsl,1.38,1.39

From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
Date: Sun, 16 Aug 2009 10:53:48 +0000
To: public-html-commits@w3.org
Message-Id: <E1McdMy-0007Ts-KK@lionel-hutz.w3.org>
Update of /sources/public/html5/markup/tools
In directory hutz:/tmp/cvs-serv28279/tools

Modified Files:
	generate-spec-source.xsl specgen.xsl 
Log Message:
added explanations for all RNC symbols, and turned all instances of RNC symbols in element and attribute definitions into hyperlinks; filled out intros for a number of other sections that were missing them


Index: generate-spec-source.xsl
===================================================================
RCS file: /sources/public/html5/markup/tools/generate-spec-source.xsl,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -d -r1.199 -r1.200
--- generate-spec-source.xsl	2 Aug 2009 11:48:36 -0000	1.199
+++ generate-spec-source.xsl	16 Aug 2009 10:53:46 -0000	1.200
@@ -42,10 +42,6 @@
           <xsl:text>&#10;      </xsl:text>
           <xsl:copy-of select="document('../src/intro-scope.html')"/>
           <xsl:text>&#10;      </xsl:text>
-          <xsl:copy-of select="document('../src/conformance.html')"/>
-          <xsl:text>&#10;      </xsl:text>
-          <xsl:copy-of select="document('../src/structure.html')"/>
-          <xsl:text>&#10;      </xsl:text>
           <xsl:copy-of select="document('../src/terms.html')"/>
           <xsl:text>&#10;    </xsl:text>
           <xsl:copy-of select="document('../src/documents.html')"/>
@@ -71,6 +67,13 @@
           <section id="common-models">
             <xsl:text>&#10;        </xsl:text>
             <h2>Common content models</h2>
+            <p>This section defines content models that are
+              referenced by a number of different element
+              definitions in the
+              <i>Content model</i>
+              subsections of the per-element documentation in the
+              <a href="#elements">HTML elements</a>
+              section.</p>
             <xsl:for-each
               select="document('../html.rnc.spec.html')//*[@class='pattern']
               [starts-with(@id,'common.elem.')]">
@@ -140,6 +143,10 @@
             <xsl:text>&#10;        </xsl:text>
             <h2>Common attributes</h2>
             <xsl:text>&#10;        </xsl:text>
+            <p>This section defines attributes that are common to
+              all elements in the
+              <a href="#html-language">HTML language</a>.</p>
+            <xsl:text>&#10;        </xsl:text>
             <div id="common.attrs-mdl">
               <xsl:text>&#10;        </xsl:text>
               <dl class="content-models">
@@ -180,7 +187,7 @@
             </div>
             <xsl:text>&#10;      </xsl:text>
             <xsl:for-each select="document('../html.rnc.spec.html')//h:*
-              [@id='common.attrs']/h:a[not(.='common.attrs.other')]">
+              [@id='common.attrs']/h:a[not(.='common.attrs.other')][not(@class='rnc-symbol')]">
               <xsl:variable name="ref" select="substring-after(@href,'#')"/>
               <xsl:variable name="type">
                 <xsl:call-template name="substring-after-last">
@@ -254,7 +261,7 @@
                 <div class="no-number no-toc">
                   <xsl:text>&#10;        </xsl:text>
                   <dl class="attr-defs">
-                    <xsl:for-each select="document('../html.rnc.spec.html')//h:*[@id=$ref]/h:a">
+                    <xsl:for-each select="document('../html.rnc.spec.html')//h:*[@id=$ref]/h:a[not(@class='rnc-symbol')]">
                       <xsl:call-template name="make.attribute.definition"/>
                     </xsl:for-each>
                     <xsl:text>&#10;        </xsl:text>
@@ -338,6 +345,9 @@
             <xsl:text>&#10;        </xsl:text>
             <h2>Forms attributes</h2>
             <xsl:text>&#10;    </xsl:text>
+            <p>This section defines attributes that are common to
+              a number of forms elements.</p>
+            <xsl:text>&#10;    </xsl:text>
             <dl class="attr-defs">
               <xsl:text>&#10;        </xsl:text>
               <xsl:for-each select="
@@ -412,6 +422,14 @@
             <xsl:text>&#10;        </xsl:text>
             <h2>Datatypes</h2>
             <xsl:text>&#10;        </xsl:text>
+            <p>This section defines datatypes that are referenced
+              by attribute definitions in the 
+              <a href="#elements">HTML elements</a>,
+              <a href="#common-attributes">Common attributes</a>,
+              and
+              <a href="#forms-attributes">Forms attributes</a>
+              sections.</p>
+            <xsl:text>&#10;        </xsl:text>
             <xsl:copy-of
               select="document('../src/datatypes.html')//h:section[ancestor::h:section]"/>
             <xsl:for-each
@@ -2188,7 +2206,8 @@
         </xsl:call-template>
       </span>
       <xsl:if test="not($ref='area.attrs.shape.default')">
-        <span class="punc"> &amp; </span>
+        <span class="punc"><a href='#interleave' title='INTERLEAVED IN ANY ORDER' class='rnc-symbol'>&amp;</a></span>
+        <xsl:text> </xsl:text>
         <a class="attribute-name"
           id="{$coords.pattern}"
           title="{$coords.pattern}"
@@ -2543,4 +2562,8 @@
     <!-- * <xsl:value-of select="."/> -->
     <!-- * <xsl:text>&#160;</xsl:text> -->
     <!-- * </xsl:message> -->
+
+  <xsl:template match="h:a[@class='rnc-symbol']">
+    <xsl:copy-of select="."/>
+  </xsl:template>
 </xsl:stylesheet>

Index: specgen.xsl
===================================================================
RCS file: /sources/public/html5/markup/tools/specgen.xsl,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- specgen.xsl	1 Aug 2009 12:23:47 -0000	1.38
+++ specgen.xsl	16 Aug 2009 10:53:46 -0000	1.39
@@ -605,6 +605,33 @@
               <xsl:apply-templates/>
             </a>
           </xsl:when>
+          <xsl:when test="$href='common-models'">
+            <a>
+              <xsl:copy-of select="@*"/>
+              <xsl:attribute name="href">
+                <xsl:text>common-models.html</xsl:text>
+              </xsl:attribute>
+              <xsl:apply-templates/>
+            </a>
+          </xsl:when>
+          <xsl:when test="$href='common-attributes'">
+            <a>
+              <xsl:copy-of select="@*"/>
+              <xsl:attribute name="href">
+                <xsl:text>common-attributes.html</xsl:text>
+              </xsl:attribute>
+              <xsl:apply-templates/>
+            </a>
+          </xsl:when>
+          <xsl:when test="$href='forms-attributes'">
+            <a>
+              <xsl:copy-of select="@*"/>
+              <xsl:attribute name="href">
+                <xsl:text>forms-attributes.html</xsl:text>
+              </xsl:attribute>
+              <xsl:apply-templates/>
+            </a>
+          </xsl:when>
           <xsl:otherwise>
             <xsl:if test="not($section/@id)">
               <xsl:message>
Received on Sunday, 16 August 2009 10:53:58 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Sunday, 16 August 2009 10:53:58 GMT