- From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
- Date: Mon, 08 Feb 2010 06:49:39 +0000
- To: public-html-commits@w3.org
Update of /sources/public/html5/markup/tools
In directory hutz:/tmp/cvs-serv14188/tools
Modified Files:
generate-spec-source.xsl specgen.xsl
Log Message:
checkpointing
Index: generate-spec-source.xsl
===================================================================
RCS file: /sources/public/html5/markup/tools/generate-spec-source.xsl,v
retrieving revision 1.234
retrieving revision 1.235
diff -u -d -r1.234 -r1.235
--- generate-spec-source.xsl 7 Feb 2010 11:54:03 -0000 1.234
+++ generate-spec-source.xsl 8 Feb 2010 06:49:37 -0000 1.235
@@ -485,56 +485,127 @@
select="substring($first,2)"/>
</xsl:variable>
<xsl:text> </xsl:text>
- <section id="{@id}-mdl" class="no-toc">
+ <section id="{@id}" class="no-toc">
<xsl:text> </xsl:text>
<xsl:choose>
+ <xsl:when test="$pattern='browsing-context-name'">
+ <h2 class="common-subhead"><dfn id="{@id}">Browsing-context name</dfn></h2>
+ </xsl:when>
+ <xsl:when test="$pattern='browsing-context-name-or-keyword'">
+ <h2 class="common-subhead"><dfn id="{@id}">Browsing-context name or keyword</dfn></h2>
+ </xsl:when>
+ <xsl:when test="$pattern='hash-name'">
+ <h2 class="common-subhead"><dfn id="{@id}">Hash-name reference</dfn></h2>
+ </xsl:when>
+ <xsl:when test="$pattern='mediaquery'">
+ <h2 class="common-subhead"><dfn id="{@id}">Media-query list</dfn></h2>
+ </xsl:when>
+ <xsl:when test="$pattern='langcode'">
+ <h2 class="common-subhead"><dfn id="{@id}">Language tag</dfn></h2>
+ </xsl:when>
+ <xsl:when test="$pattern='datetime'">
+ <h2 class="common-subhead"><dfn id="{@id}">Date-time</dfn></h2>
+ </xsl:when>
+ <xsl:when test="$pattern='datetime-local'">
+ <h2 class="common-subhead"><dfn id="{@id}">Local date-time</dfn></h2>
+ </xsl:when>
+ <xsl:when test="$pattern='date-or-time'">
+ <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>
+ </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>
+ </xsl:when>
+ <xsl:when test="$pattern='keylabellist'">
+ <h2 class="common-subhead"><dfn id="{@id}">Key-label list</dfn></h2>
+ </xsl:when>
+ <xsl:when test="$pattern='default-style'">
+ <h2 class="common-subhead"><dfn id="{@id}">Default-style name</dfn></h2>
+ </xsl:when>
+ <xsl:when test="$pattern='meta-charset'">
+ <h2 class="common-subhead"><dfn id="{@id}">Meta-charset string</dfn></h2>
+ </xsl:when>
+ <xsl:when test="$pattern='refresh'">
+ <h2 class="common-subhead"><dfn id="{@id}">Refresh value</dfn></h2>
+ </xsl:when>
+ <xsl:when test="$pattern='mimetype'">
+ <h2 class="common-subhead"><dfn id="{@id}">MIME type</dfn></h2>
+ </xsl:when>
+ <xsl:when test="$pattern='mimetypelist'">
+ <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>
+ </xsl:when>
+ <xsl:when test="$pattern='emailaddress'">
+ <h2 class="common-subhead"><dfn id="{@id}">E-mail address</dfn></h2>
+ </xsl:when>
+ <xsl:when test="$pattern='float.non-negative'">
+ <h2 class="common-subhead"><dfn id="{@id}">Non-negative float</dfn></h2>
+ </xsl:when>
+ <xsl:when test="$pattern='integer.non-negative'">
+ <h2 class="common-subhead"><dfn id="{@id}">Non-negative integer</dfn></h2>
+ </xsl:when>
+ <xsl:when test="$pattern='integer.positive'">
+ <h2 class="common-subhead"><dfn id="{@id}">Positive integer</dfn></h2>
+ </xsl:when>
+ <xsl:when test="$pattern='float.positive'">
+ <h2 class="common-subhead"><dfn id="{@id}">Positive float</dfn></h2>
+ </xsl:when>
<xsl:when test="$pattern='uri.absolute'">
- <h2 class="common-subhead">Absolute URI</h2>
+ <h2 class="common-subhead"><dfn id="{@id}">Absolute URI</dfn></h2>
</xsl:when>
<xsl:when test="$pattern='uri'">
- <h2 class="common-subhead">URI</h2>
+ <h2 class="common-subhead"><dfn id="{@id}">URI</dfn></h2>
</xsl:when>
<xsl:when test="$pattern='uris'">
- <h2 class="common-subhead">URIs</h2>
+ <h2 class="common-subhead"><dfn id="{@id}">URIs</dfn></h2>
</xsl:when>
<xsl:when test="$pattern='id'">
- <h2 class="common-subhead">ID</h2>
+ <h2 class="common-subhead"><dfn id="{@id}">ID</dfn></h2>
</xsl:when>
<xsl:when test="$pattern='idref'">
- <h2 class="common-subhead">IDREF</h2>
+ <h2 class="common-subhead"><dfn id="{@id}">IDREF</dfn></h2>
</xsl:when>
<xsl:when test="$pattern='idrefs'">
- <h2 class="common-subhead">IDREFS</h2>
+ <h2 class="common-subhead"><dfn id="{@id}">IDREFS</dfn></h2>
</xsl:when>
<xsl:otherwise>
<h2 class="common-subhead">
- <xsl:value-of select="$tc-first"/>
- <xsl:if test="$qualified">
- <xsl:text> </xsl:text>
- <xsl:value-of
- select="substring-before($pattern,'.')"/>
- </xsl:if>
+ <dfn id="{@id}">
+ <xsl:value-of select="$tc-first"/>
+ <xsl:if test="$qualified">
+ <xsl:text> </xsl:text>
+ <xsl:value-of
+ select="substring-before($pattern,'.')"/>
+ </xsl:if>
+ </dfn>
</h2>
</xsl:otherwise>
</xsl:choose>
<xsl:text> </xsl:text>
<div class="content-models">
<xsl:text> </xsl:text>
- <div>
- <span
- class="common-pattern-name">
- <dfn id="{@id}"
- >
- <xsl:value-of select="$pattern"/>
- </dfn>
- </span>
- <code class="punc"><xsl:text> = </xsl:text></code>
- <xsl:copy-of
- select="document('../src/datatypes.html')//
- h:dd[preceding-sibling::h:dt=substring-after(current()/@id,'.data.')][position()=1]/node()"/>
- <xsl:text> </xsl:text>
- <a href="#{@id}" class="hash">#</a>
- </div>
+ <!-- * <div> -->
+ <!-- * <span -->
+ <!-- * class="common-pattern-name"> -->
+ <!-- * <dfn id="{@id}" -->
+ <!-- * > -->
+ <!-- * <xsl:value-of select="$pattern"/> -->
+ <!-- * </dfn> -->
+ <!-- * </span> -->
+ <!-- * <code class="punc"><xsl:text> = </xsl:text></code> -->
+ <!-- * <xsl:copy-of -->
+ <!-- * select="document('../src/datatypes.html')// -->
+ <!-- * h:dd[preceding-sibling::h:dt=substring-after(current()/@id,'.data.')][position()=1]/node()"/> -->
+ <!-- * <xsl:text> </xsl:text> -->
+ <!-- * <a href="#{@id}" class="hash">#</a> -->
+ <!-- * </div> -->
<xsl:copy-of
select="document('../src/datatypes.html')//
h:dd[preceding-sibling::h:dt=substring-after(current()/@id,'.data.')][not(position()=1)]/node()"/>
@@ -2319,7 +2390,101 @@
</xsl:call-template>
</xsl:when>
<xsl:otherwise>
- <xsl:copy-of select="."/>
+ <xsl:choose>
+ <xsl:when test=".='browsing-context-name'">
+ <a href="{@href}">browsing-context name</a>
+ </xsl:when>
+ <xsl:when test=".='browsing-context-name-or-keyword'">
+ <a href="{@href}">browsing-context name or keyword</a>
+ </xsl:when>
+ <xsl:when test=".='hash-name'">
+ <a href="{@href}">hash-name reference</a>
+ </xsl:when>
+ <xsl:when test=".='mediaquery'">
+ <a href="{@href}">media-query list</a>
+ </xsl:when>
+ <xsl:when test=".='langcode'">
+ <a href="{@href}">language tag</a>
+ </xsl:when>
+ <xsl:when test=".='datetime'">
+ <a href="{@href}">date-time</a>
+ </xsl:when>
+ <xsl:when test=".='datetime-local'">
+ <a href="{@href}">local date-time</a>
+ </xsl:when>
+ <xsl:when test=".='date-or-time'">
+ <a href="{@href}">date or time</a>
+ </xsl:when>
+ <xsl:when test=".='sandbox-allow-list'">
+ <a href="{@href}">sandbox allow 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>
+ </xsl:when>
+ <xsl:when test=".='keylabellist'">
+ <a href="{@href}">key-label list</a>
+ </xsl:when>
+ <xsl:when test=".='default-style'">
+ <a href="{@href}">default-style name</a>
+ </xsl:when>
+ <xsl:when test=".='meta-charset'">
+ <a href="{@href}">meta-charset string</a>
+ </xsl:when>
+ <xsl:when test=".='refresh'">
+ <a href="{@href}">refresh value</a>
+ </xsl:when>
+ <xsl:when test=".='mimetype'">
+ <a href="{@href}">MIME type</a>
+ </xsl:when>
+ <xsl:when test=".='mimetypelist'">
+ <a href="{@href}">mime-type list</a>
+ </xsl:when>
+ <xsl:when test=".='emailaddresslist'">
+ <a href="{@href}">e-mail address list</a>
+ </xsl:when>
+ <xsl:when test=".='emailaddress'">
+ <a href="{@href}">e-mail address</a>
+ </xsl:when>
+ <xsl:when test=".='float.non-negative'">
+ <a href="{@href}">non-negative float</a>
+ </xsl:when>
+ <xsl:when test=".='integer.non-negative'">
+ <a href="{@href}">non-negative integer</a>
+ </xsl:when>
+ <xsl:when test=".='integer.positive'">
+ <a href="{@href}">positive integer</a>
+ </xsl:when>
+ <xsl:when test=".='float.positive'">
+ <a href="{@href}">positive float</a>
+ </xsl:when>
+ <xsl:when test=".='uri.absolute'">
+ <a href="{@href}">absolute URI</a>
+ </xsl:when>
+ <xsl:when test=".='uri'">
+ <a href="{@href}">URI</a>
+ </xsl:when>
+ <xsl:when test=".='uris'">
+ <a href="{@href}">URIs</a>
+ </xsl:when>
+ <xsl:when test=".='id'">
+ <a href="{@href}">ID</a>
+ </xsl:when>
+ <xsl:when test=".='idref'">
+ <a href="{@href}">IDREF</a>
+ </xsl:when>
+ <xsl:when test=".='idrefs'">
+ <a href="{@href}">IDREFS</a>
+ </xsl:when>
+ <xsl:when test=".='normal-character-data'">
+ <a href="{@href}">normal character data</a>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:copy-of select="."/>
+ </xsl:otherwise>
+ </xsl:choose>
</xsl:otherwise>
</xsl:choose>
</xsl:for-each>
Index: specgen.xsl
===================================================================
RCS file: /sources/public/html5/markup/tools/specgen.xsl,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- specgen.xsl 5 Feb 2010 08:17:25 -0000 1.51
+++ specgen.xsl 8 Feb 2010 06:49:37 -0000 1.52
@@ -654,6 +654,7 @@
<!-- * (filename-less) fragment href ID references -->
<xsl:if test="ancestor::*[@class='content-models']
and not(ancestor::*[@id='common-models'])
+ and not(ancestor::*[@id='datatypes'])
and not(@href='#normal-character-data')
and not(@href='#non-replaceable-character-data')
and not(@href='#replaceable-character-data')
@@ -806,6 +807,7 @@
</xsl:if>
<xsl:if test="ancestor::*[@class='content-models']
and not(ancestor::*[@id='common-models'])
+ and not(ancestor::*[@id='datatypes'])
and not(@href='#normal-character-data')
and not(@href='#non-replaceable-character-data')
and not(@href='#replaceable-character-data')
Received on Monday, 8 February 2010 06:49:41 UTC