- From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
- Date: Thu, 12 Aug 2010 19:55:40 +0000
- To: public-html-commits@w3.org
Update of /sources/public/html5/markup/tools In directory hutz:/tmp/cvs-serv18720/tools Modified Files: generate-spec-source.xsl specgen.xsl Log Message: 色々 Index: generate-spec-source.xsl =================================================================== RCS file: /sources/public/html5/markup/tools/generate-spec-source.xsl,v retrieving revision 1.291 retrieving revision 1.292 diff -u -d -r1.291 -r1.292 --- generate-spec-source.xsl 5 Aug 2010 07:42:17 -0000 1.291 +++ generate-spec-source.xsl 12 Aug 2010 19:55:38 -0000 1.292 @@ -970,7 +970,7 @@ <div id="button-longdesc" class="longdesc"> <xsl:text> </xsl:text> <p>The - <a href="#button" class="element">button</a> + <span class="element">button</span> element is a multipurpose element for representing buttons.</p> </div> <xsl:text> </xsl:text> @@ -987,7 +987,7 @@ <xsl:text> </xsl:text> </div> <p>A - <a href="#button" class="element">button</a> + <span class="element">button</span> element with no <span class="attribute">type</span> attribute specified represents the same thing as a @@ -1025,7 +1025,7 @@ <div id="command-longdesc" class="longdesc"> <xsl:text> </xsl:text> <p>The - <a href="#command" class="element">command</a> + <span class="element">command</span> element is a multipurpose element for representing commands.</p> </div> <xsl:text> </xsl:text> @@ -1042,7 +1042,7 @@ </div> <xsl:text> </xsl:text> <p>A - <a href="#command" class="element">command</a> + <span class="element">command</span> element with no <span class="attribute">type</span> attribute specified represents the same thing as a @@ -1079,7 +1079,7 @@ <div id="input-longdesc" class="longdesc"> <xsl:text> </xsl:text> <p>The - <a href="#input" class="element">input</a> + <span class="element">input</span> element is a multipurpose element for representing input controls.</p> </div> <xsl:text> </xsl:text> @@ -1096,7 +1096,7 @@ <xsl:text> </xsl:text> </div> <p>An - <a href="#input" class="element">input</a> + <span class="element">input</span> element with no <span class="attribute">type</span> attribute specified represents the same thing as an @@ -1108,7 +1108,7 @@ <h2 class="element-subhead">Changes in HTML5</h2> <div class="changes"> <p>Several new - <a href="#input" class="element">input</a> + <span class="element">input</span> element types have been added, and several new attributes are now allowed on the element.</p> </div> @@ -1144,14 +1144,14 @@ <div id="meta-longdesc" class="longdesc"> <xsl:text> </xsl:text> <p>The - <a href="#meta" class="element">meta</a> + <span class="element">meta</span> element is a multipurpose element for representing metadata.</p> <xsl:text> </xsl:text> </div> <xsl:text> </xsl:text> <p>The details of the - <a href="#meta" class="element">meta</a> + <span class="element">meta</span> element are described in the following sections:</p> <xsl:text> </xsl:text> <div class="toc"> @@ -1251,6 +1251,40 @@ <xsl:text> </xsl:text> </ul> </div> + <xsl:if test="exsl:node-set($assertions)/s:rule[child::s:context = 'meta']"> + <xsl:text> </xsl:text> + <div class="no-number no-toc" id="meta-constraints"> + <xsl:text> </xsl:text> + <h2 class="element-subhead">Additional constraints and admonitions</h2> + <xsl:text> </xsl:text> + <ul class="assertions"> + <xsl:for-each + select="exsl:node-set($assertions)/s:rule[child::s:context = 'meta']"> + <xsl:text> </xsl:text> + <xsl:for-each select="s:report|s:assert"> + <li> + <span> + <!-- * <xsl:if test="contains(.,'obsolete')"> --> + <!-- * <xsl:attribute --> + <!-- * name="class">obsolete</xsl:attribute> --> + <!-- * </xsl:if> --> + <xsl:for-each select="node()"> + <xsl:choose> + <xsl:when test="local-name() = 'name'">meta</xsl:when> + <xsl:otherwise> + <xsl:value-of select="."/> + </xsl:otherwise> + </xsl:choose> + </xsl:for-each> + </span> + </li> + </xsl:for-each> + </xsl:for-each> + <xsl:text> </xsl:text> + </ul> + <xsl:text> </xsl:text> + </div> + </xsl:if> <xsl:text> </xsl:text> <div class="no-number no-toc" id="meta-changes"> <xsl:text> </xsl:text> @@ -1259,12 +1293,12 @@ <p>Although previous versions of HTML allowed the <span class="attribute">http-equiv</span> attribute on the - <a href="#meta" class="element">meta</a> + <span class="element">meta</span> element to have any number of possible values, the <span class="attribute">http-equiv</span> attribute is now restricted to only the specific values described in this reference. Also, the new - <a href="#meta.charset" class="attribute">charset</a> + <span class="attribute">charset</span> attribute is now allowed.</p> </div> </div> @@ -1713,7 +1747,7 @@ or $name='wbr' "> <p>The - <a href="#{$name}" class="element"><xsl:value-of select="$name"/></a> + <span class="element"><xsl:value-of select="$name"/></span> element is a <a href="#void-element" >void element</a>. A<xsl:if test=" $name='area' @@ -1723,7 +1757,7 @@ "><xsl:text>n</xsl:text> </xsl:if> <xsl:text> </xsl:text> - <a href="#{$name}" class="element"><xsl:value-of select="$name"/></a> + <span class="element"><xsl:value-of select="$name"/></span> element must have a <span title="syntax-start-tag" >start tag</span> but must not have an @@ -1751,7 +1785,7 @@ "><xsl:text>n</xsl:text> </xsl:if> <xsl:text> </xsl:text> - <a href="#{$name}" class="element"><xsl:value-of select="$name"/></a> + <span class="element"><xsl:value-of select="$name"/></span> element must have both a <span title="syntax-start-tag">start tag</span> and an @@ -2026,11 +2060,11 @@ <xsl:template name="make.special.context"> <xsl:param name="element-name"/> - <p>The details of the - <a href="#{$element-name}" class="element"> + The details of the + <span class="element"> <xsl:value-of select="$element-name"/> - </a> - element are described in the following sections:</p> + </span> + element are described in the following sections: <ul> <xsl:for-each select="node()"> <xsl:if test="@href"> @@ -2364,6 +2398,9 @@ <xsl:param name="attribute-name" select="."/> <xsl:param name="href"> <xsl:choose> + <xsl:when test="@href='#global-attributes'"> + <xsl:value-of select="@href"/> + </xsl:when> <xsl:when test="not(@class = 'ref')"> <xsl:value-of select="@class"/> </xsl:when> @@ -2445,7 +2482,7 @@ </xsl:if> <xsl:choose> <xsl:when test="$ref = 'common.attrs' - or $ref = 'global-attributes'"> + or @href = '#global-attributes'"> <a class="attribute-name" title="global-attributes" href="#global-attributes"> @@ -2542,7 +2579,7 @@ </xsl:variable> <xsl:choose> <xsl:when test="$ref = 'common.attrs' - or $ref='global-attributes' + or @href='#global-attributes' or starts-with($ref,'area.attrs.shape.') "/> <xsl:otherwise> @@ -2631,7 +2668,7 @@ <xsl:copy-of select="$definition"/> <xsl:text> </xsl:text> <xsl:choose> - <xsl:when test="$ref = 'common.attrs' or $ref = 'global-attributes'"> + <xsl:when test="$ref = 'common.attrs' or @href = '#global-attributes'"> <dd>Any attributes permitted globally.</dd> </xsl:when> <xsl:when @@ -2685,6 +2722,7 @@ <xsl:if test="not( $datatype = 'tokens' or $datatype = 'idref' + or $datatype = 'hash-name' or $datatype = 'default-style' or $datatype = 'sandbox-allow-list' or starts-with($datatype,'uri') @@ -2783,11 +2821,9 @@ <xsl:template name="make.assertions.section"> <xsl:param name="name"/> <xsl:param name="short-name"/> - <!-- * FIXME: ugly hack-special-casing... --> <xsl:if test=" - not($name='meta.name') - and not($name='meta.http-equiv.refresh') - and not($name='meta.http-equiv.default-style') + not(starts-with($name,'meta.http-equiv.')) + and not($name='meta.charset') "> <xsl:choose> <xsl:when @@ -2801,6 +2837,9 @@ <xsl:text> </xsl:text> <ul class="assertions"> <xsl:copy-of select="document(concat('../elements/',$name,'.html'))//h:*[@id='constraints']/node()"/> + <xsl:if test=" + not($name='meta.name') + "> <!-- * FIXME: the below doesn't handle expressions that --> <!-- * contain more than one element name --> <xsl:for-each @@ -2827,12 +2866,13 @@ </li> </xsl:for-each> </xsl:for-each> + </xsl:if> <xsl:text> </xsl:text> </ul> <xsl:text> </xsl:text> </div> - </xsl:when> - </xsl:choose> + </xsl:when> + </xsl:choose> </xsl:if> </xsl:template> Index: specgen.xsl =================================================================== RCS file: /sources/public/html5/markup/tools/specgen.xsl,v retrieving revision 1.87 retrieving revision 1.88 diff -u -d -r1.87 -r1.88 --- specgen.xsl 10 Aug 2010 13:51:11 -0000 1.87 +++ specgen.xsl 12 Aug 2010 19:55:38 -0000 1.88 @@ -807,6 +807,13 @@ <!-- * <xsl:apply-templates select='node()'/> --> <!-- * </div> --> <!-- * </xsl:template> --> + <!-- * <xsl:template match="h:dfn"> --> + <!-- * <dfn> --> + <!-- * <xsl:copy-of select="@*"/> --> + <!-- * <xsl:attribute name="onclick">dfnShow()</xsl:attribute> --> + <!-- * <xsl:copy-of select="node()"/> --> + <!-- * </dfn> --> + <!-- * </xsl:template> --> <xsl:template match='h:section'> <xsl:variable name="content"> <div>
Received on Thursday, 12 August 2010 19:55:42 UTC