- From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
- Date: Tue, 27 Jul 2010 06:09:49 +0000
- To: public-html-commits@w3.org
Update of /sources/public/html5/markup/tools
In directory hutz:/tmp/cvs-serv9067/tools
Modified Files:
generate-spec-source.xsl
Log Message:
checkpointing some further datatype-documentation changes designed for greater user-friendliness and better alignment with the wording in the HTML5 spec
Index: generate-spec-source.xsl
===================================================================
RCS file: /sources/public/html5/markup/tools/generate-spec-source.xsl,v
retrieving revision 1.272
retrieving revision 1.273
diff -u -d -r1.272 -r1.273
--- generate-spec-source.xsl 26 Jul 2010 04:06:26 -0000 1.272
+++ generate-spec-source.xsl 27 Jul 2010 06:09:47 -0000 1.273
@@ -509,6 +509,14 @@
select="substring($first,2)"/>
</xsl:variable>
<xsl:text> </xsl:text>
+ <xsl:if test="$pattern='uri'">
+ <section id="data-url-no-spaces-def" class="no-toc">
+ <h2 class="common-subhead"><dfn id="data-url-no-spaces">URL</dfn></h2>
+ <xsl:copy-of
+ select="document('../src/datatypes.html')//
+ h:dd[preceding-sibling::h:dt='data-url-no-spaces'][not(position()=1)]/node()"/>
+ </section>
+ </xsl:if>
<section id="{@id}-def" class="no-toc">
<xsl:text> </xsl:text>
<xsl:choose>
@@ -540,16 +548,16 @@
<h2 class="common-subhead"><dfn id="{@id}">Date or time</dfn></h2>
</xsl:when>
<xsl:when test="$pattern='sandbox-allow-list'">
- <h2 class="common-subhead"><dfn id="{@id}">Sandbox allow list</dfn></h2>
+ <h2 class="common-subhead"><dfn id="{@id}">Sandbox “allow” keywords list</dfn></h2>
</xsl:when>
<xsl:when test="$pattern='charset'">
<h2 class="common-subhead"><dfn id="{@id}">Character encoding name</dfn></h2>
</xsl:when>
<xsl:when test="$pattern='charsetlist'">
- <h2 class="common-subhead"><dfn id="{@id}">Character-encoding name list</dfn></h2>
+ <h2 class="common-subhead"><dfn id="{@id}">List of character-encoding names</dfn></h2>
</xsl:when>
<xsl:when test="$pattern='keylabellist'">
- <h2 class="common-subhead"><dfn id="{@id}">Key-label list</dfn></h2>
+ <h2 class="common-subhead"><dfn id="{@id}">List of key labels</dfn></h2>
</xsl:when>
<xsl:when test="$pattern='default-style'">
<h2 class="common-subhead"><dfn id="{@id}">Default-style name</dfn></h2>
@@ -567,7 +575,7 @@
<h2 class="common-subhead"><dfn id="{@id}">MIME-type list</dfn></h2>
</xsl:when>
<xsl:when test="$pattern='emailaddresslist'">
- <h2 class="common-subhead"><dfn id="{@id}">E-mail address list</dfn></h2>
+ <h2 class="common-subhead"><dfn id="{@id}">List of e-mail addresses</dfn></h2>
</xsl:when>
<xsl:when test="$pattern='emailaddress'">
<h2 class="common-subhead"><dfn id="{@id}">E-mail address</dfn></h2>
@@ -585,13 +593,10 @@
<h2 class="common-subhead"><dfn id="{@id}">Positive float</dfn></h2>
</xsl:when>
<xsl:when test="$pattern='uri.absolute'">
- <h2 class="common-subhead"><dfn id="{@id}">Absolute URI</dfn></h2>
+ <h2 class="common-subhead"><dfn id="{@id}">Absolute URL</dfn></h2>
</xsl:when>
<xsl:when test="$pattern='uri'">
- <h2 class="common-subhead"><dfn id="{@id}">URI</dfn></h2>
- </xsl:when>
- <xsl:when test="$pattern='uris'">
- <h2 class="common-subhead"><dfn id="{@id}">List of URIs</dfn></h2>
+ <h2 class="common-subhead"><dfn id="{@id}">URL potentially surrounded by spaces</dfn></h2>
</xsl:when>
<xsl:when test="$pattern='uris'">
<h2 class="common-subhead"><dfn id="{@id}">List of URIs</dfn></h2>
@@ -603,7 +608,7 @@
<h2 class="common-subhead"><dfn id="{@id}">ID reference</dfn></h2>
</xsl:when>
<xsl:when test="$pattern='idrefs'">
- <h2 class="common-subhead"><dfn id="{@id}">Set of ID references</dfn></h2>
+ <h2 class="common-subhead"><dfn id="{@id}">List of ID references</dfn></h2>
</xsl:when>
<xsl:otherwise>
<h2 class="common-subhead">
@@ -647,6 +652,12 @@
select="document('../src/datatypes.html')//
h:dd[preceding-sibling::h:dt='unordered-tokens'][not(position()=1)]/node()"/>
</section>
+ <section id="data-ordered-tokens-def" class="no-toc">
+ <h2 class="common-subhead"><dfn id="data-ordered-tokens">Ordered set of unique space-separated tokens</dfn></h2>
+ <xsl:copy-of
+ select="document('../src/datatypes.html')//
+ h:dd[preceding-sibling::h:dt='ordered-tokens'][not(position()=1)]/node()"/>
+ </section>
</xsl:if>
</xsl:for-each>
<xsl:text> </xsl:text>
@@ -2646,16 +2657,16 @@
<a href="{@href}">date or time</a>
</xsl:when>
<xsl:when test=".='sandbox-allow-list'">
- <a href="{@href}">sandbox allow list</a>
+ <a href="{@href}">sandbox “allow” keywords list</a>
</xsl:when>
<xsl:when test=".='charset'">
<a href="{@href}">character encoding name</a>
</xsl:when>
<xsl:when test=".='charsetlist'">
- <a href="{@href}">character-encoding name list</a>
+ <a href="{@href}">list of character-encoding names</a>
</xsl:when>
<xsl:when test=".='keylabellist'">
- <a href="{@href}">key-label list</a>
+ <a href="{@href}">list of key labels</a>
</xsl:when>
<xsl:when test=".='default-style'">
<a href="{@href}">default-style name</a>
@@ -2673,7 +2684,7 @@
<a href="{@href}">mime-type list</a>
</xsl:when>
<xsl:when test=".='emailaddresslist'">
- <a href="{@href}">e-mail address list</a>
+ <a href="{@href}">list of e-mail addresses</a>
</xsl:when>
<xsl:when test=".='emailaddress'">
<a href="{@href}">e-mail address</a>
@@ -2691,10 +2702,10 @@
<a href="{@href}">positive float</a>
</xsl:when>
<xsl:when test=".='uri.absolute'">
- <a href="{@href}">absolute URI</a>
+ <a href="{@href}">absolute URL</a>
</xsl:when>
<xsl:when test=".='uri'">
- <a href="{@href}">URI</a>
+ <a href="{@href}">URL potentially surrounded by spaces</a>
</xsl:when>
<xsl:when test=".='uris'">
<a href="{@href}">list of URIs</a>
@@ -2706,7 +2717,7 @@
<a href="{@href}">ID reference</a>
</xsl:when>
<xsl:when test=".='idrefs'">
- <a href="{@href}">set of ID references</a>
+ <a href="{@href}">list of ID references</a>
</xsl:when>
<xsl:when test=".='normal-character-data'">
<a href="{@href}">normal character data</a>
@@ -3117,16 +3128,16 @@
<a href="{@href}">date or time</a>
</xsl:when>
<xsl:when test=".='sandbox-allow-list'">
- <a href="{@href}">sandbox allow list</a>
+ <a href="{@href}">sandbox “allow” keywords list</a>
</xsl:when>
<xsl:when test=".='charset'">
<a href="{@href}">character encoding name</a>
</xsl:when>
<xsl:when test=".='charsetlist'">
- <a href="{@href}">character-encoding name list</a>
+ <a href="{@href}">list of character-encoding names</a>
</xsl:when>
<xsl:when test=".='keylabellist'">
- <a href="{@href}">key-label list</a>
+ <a href="{@href}">list of key labels</a>
</xsl:when>
<xsl:when test=".='default-style'">
<a href="{@href}">default-style name</a>
@@ -3144,7 +3155,7 @@
<a href="{@href}">mime-type list</a>
</xsl:when>
<xsl:when test=".='emailaddresslist'">
- <a href="{@href}">e-mail address list</a>
+ <a href="{@href}">list of e-mail addresses</a>
</xsl:when>
<xsl:when test=".='emailaddress'">
<a href="{@href}">e-mail address</a>
@@ -3162,10 +3173,10 @@
<a href="{@href}">positive float</a>
</xsl:when>
<xsl:when test=".='uri.absolute'">
- <a href="{@href}">absolute URI</a>
+ <a href="{@href}">absolute URL</a>
</xsl:when>
<xsl:when test=".='uri'">
- <a href="{@href}">URI</a>
+ <a href="{@href}">URL potentially surrounded by spaces</a>
</xsl:when>
<xsl:when test=".='uris'">
<a href="{@href}">list of URIs</a>
@@ -3177,7 +3188,7 @@
<a href="{@href}">ID reference</a>
</xsl:when>
<xsl:when test=".='idrefs'">
- <a href="{@href}">set of ID references</a>
+ <a href="{@href}">list of ID references</a>
</xsl:when>
<xsl:when test=".='normal-character-data'">
<a href="{@href}">normal character data</a>
Received on Tuesday, 27 July 2010 06:09:50 UTC