- From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
- Date: Fri, 12 Feb 2010 07:56:07 +0000
- To: public-html-commits@w3.org
Update of /sources/public/html5/markup/tools In directory hutz:/tmp/cvs-serv20391/tools Modified Files: chunker.xsl 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.241 retrieving revision 1.242 diff -u -d -r1.241 -r1.242 --- generate-spec-source.xsl 12 Feb 2010 04:52:28 -0000 1.241 +++ generate-spec-source.xsl 12 Feb 2010 07:56:05 -0000 1.242 @@ -374,9 +374,6 @@ <xsl:when test="starts-with(@id,'input.attrs.step.')"> <xsl:text>step</xsl:text> - <span - class="attr-qualifier" ><xsl:value-of - select="substring-after(@id,'input.attrs.step')"/></span> </xsl:when> <xsl:otherwise> <xsl:value-of select="h:span[@class='name']"/> @@ -2307,20 +2304,14 @@ <xsl:choose> <xsl:when test="starts-with(node(),'wrap.')"> <xsl:text>wrap</xsl:text> - <span class="attr-qualifier" - >.<xsl:value-of select="substring-after(node(),'.')"/></span> </xsl:when> <xsl:when test="$ref='input.email.attrs.value.single'"> <xsl:text>value</xsl:text> - <span class="attr-qualifier" - >.single</span> </xsl:when> <xsl:when test="$ref='input.email.attrs.value.multiple'"> <xsl:text>value</xsl:text> - <span class="attr-qualifier" - >.multiple</span> </xsl:when> <xsl:when test="starts-with(node(),'type.')"> <xsl:value-of select="substring-before(node(),'.')"/> @@ -2900,6 +2891,96 @@ <xsl:when test="normalize-space(.)='string'"> <a href="#data-string">string</a> </xsl:when> + <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> Index: specgen.xsl =================================================================== RCS file: /sources/public/html5/markup/tools/specgen.xsl,v retrieving revision 1.55 retrieving revision 1.56 diff -u -d -r1.55 -r1.56 --- specgen.xsl 12 Feb 2010 04:52:28 -0000 1.55 +++ specgen.xsl 12 Feb 2010 07:56:05 -0000 1.56 @@ -822,6 +822,8 @@ not(.='embed.attrs.other') and not(starts-with(.,'common.')) and not(.='shape') + and not(.='http-equiv') + and not(.='wrap') and not(following-sibling::*[1][self::h:span[contains(@class,'optional')]]) and ancestor::h:*[@class='attr-content-models'] "> Index: chunker.xsl =================================================================== RCS file: /sources/public/html5/markup/tools/chunker.xsl,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- chunker.xsl 12 Feb 2010 04:52:28 -0000 1.7 +++ chunker.xsl 12 Feb 2010 07:56:04 -0000 1.8 @@ -127,7 +127,20 @@ <xsl:variable name="prev-text"> <xsl:choose> <xsl:when test="contains($prev/@id,'.')"> - <xsl:value-of select="concat(substring-before($prev/@id,'.'),' type=',substring-after($prev/@id,'.'))"/> + <xsl:choose> + <xsl:when test="$prev/@id='meta.name'"> + <xsl:text>meta name</xsl:text> + </xsl:when> + <xsl:when test="$prev/@id='meta.charset'"> + <xsl:text>meta charset</xsl:text> + </xsl:when> + <xsl:when test="contains($prev/@id,'meta.http-equiv.')"> + <xsl:value-of select="concat('meta http-equiv=',substring-after($prev/@id,'meta.http-equiv.'))"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="concat(substring-before($prev/@id,'.'),' type=',substring-after($prev/@id,'.'))"/> + </xsl:otherwise> + </xsl:choose> </xsl:when> <xsl:when test="contains($prev/@id,'-')"> <xsl:value-of select="concat(substring-before($prev/@id,'-'),' ',substring-after($prev/@id,'-'))"/> @@ -140,7 +153,20 @@ <xsl:variable name="next-text"> <xsl:choose> <xsl:when test="contains($next/@id,'.')"> - <xsl:value-of select="concat(substring-before($next/@id,'.'),' type=',substring-after($next/@id,'.'))"/> + <xsl:choose> + <xsl:when test="$next/@id='meta.name'"> + <xsl:text>meta name</xsl:text> + </xsl:when> + <xsl:when test="$next/@id='meta.charset'"> + <xsl:text>meta charset</xsl:text> + </xsl:when> + <xsl:when test="contains($next/@id,'meta.http-equiv.')"> + <xsl:value-of select="concat('meta http-equiv=',substring-after($next/@id,'meta.http-equiv.'))"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="concat(substring-before($next/@id,'.'),' type=',substring-after($next/@id,'.'))"/> + </xsl:otherwise> + </xsl:choose> </xsl:when> <xsl:when test="contains($next/@id,'-')"> <xsl:value-of select="concat(substring-before($next/@id,'-'),' ',substring-after($next/@id,'-'))"/> @@ -148,7 +174,7 @@ <xsl:otherwise> <xsl:value-of select="$next/@id"/> </xsl:otherwise> - </xsl:choose> + </xsl:choose> </xsl:variable> <xsl:text> </xsl:text> <h2 class="chunkpagetitle"><a @@ -177,7 +203,20 @@ <xsl:variable name="prev-text"> <xsl:choose> <xsl:when test="contains($prev/@id,'.')"> - <xsl:value-of select="concat(substring-before($prev/@id,'.'),' type=',substring-after($prev/@id,'.'))"/> + <xsl:choose> + <xsl:when test="$prev/@id='meta.name'"> + <xsl:text>meta name</xsl:text> + </xsl:when> + <xsl:when test="$prev/@id='meta.charset'"> + <xsl:text>meta charset</xsl:text> + </xsl:when> + <xsl:when test="contains($prev/@id,'meta.http-equiv.')"> + <xsl:value-of select="concat('meta http-equiv=',substring-after($prev/@id,'meta.http-equiv.'))"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="concat(substring-before($prev/@id,'.'),' type=',substring-after($prev/@id,'.'))"/> + </xsl:otherwise> + </xsl:choose> </xsl:when> <xsl:when test="contains($prev/@id,'-')"> <xsl:value-of select="concat(substring-before($prev/@id,'-'),' ',substring-after($prev/@id,'-'))"/> @@ -190,7 +229,20 @@ <xsl:variable name="next-text"> <xsl:choose> <xsl:when test="contains($next/@id,'.')"> - <xsl:value-of select="concat(substring-before($next/@id,'.'),' type=',substring-after($next/@id,'.'))"/> + <xsl:choose> + <xsl:when test="$next/@id='meta.name'"> + <xsl:text>meta name</xsl:text> + </xsl:when> + <xsl:when test="$next/@id='meta.charset'"> + <xsl:text>meta charset</xsl:text> + </xsl:when> + <xsl:when test="contains($next/@id,'meta.http-equiv.')"> + <xsl:value-of select="concat('meta http-equiv=',substring-after($next/@id,'meta.http-equiv.'))"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="concat(substring-before($next/@id,'.'),' type=',substring-after($next/@id,'.'))"/> + </xsl:otherwise> + </xsl:choose> </xsl:when> <xsl:when test="contains($next/@id,'-')"> <xsl:value-of select="concat(substring-before($next/@id,'-'),' ',substring-after($next/@id,'-'))"/>
Received on Friday, 12 February 2010 07:56:09 UTC