- From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
- Date: Sat, 24 Jul 2010 17:15:32 +0000
- To: public-html-commits@w3.org
Update of /sources/public/html5/markup/tools
In directory hutz:/tmp/cvs-serv21445/tools
Modified Files:
generate-spec-source.xsl toc.xsl
Log Message:
tweaked some formatting
Index: generate-spec-source.xsl
===================================================================
RCS file: /sources/public/html5/markup/tools/generate-spec-source.xsl,v
retrieving revision 1.270
retrieving revision 1.271
diff -u -d -r1.270 -r1.271
--- generate-spec-source.xsl 23 Jul 2010 13:31:06 -0000 1.270
+++ generate-spec-source.xsl 24 Jul 2010 17:15:29 -0000 1.271
@@ -384,6 +384,29 @@
</xsl:otherwise>
</xsl:choose>
</xsl:variable>
+ <xsl:variable name="attrid" select="@id"/>
+ <xsl:variable name="spec-target">
+ <xsl:choose>
+ <xsl:when test="document('../src/map-attributes.html')//*[preceding-sibling::*=$attrid]">
+ <xsl:value-of select="concat('#',document('../src/map-attributes.html')//*[preceding-sibling::*=$attrid])"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="concat('#the-',$shared-attr-name,'-attribute')"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <xsl:variable name="filename">
+ <xsl:call-template name="get-spec-filename">
+ <xsl:with-param name="ref" select="$spec-target"/>
+ </xsl:call-template>
+ </xsl:variable>
+ <xsl:if test="not($filename='')">
+ <span class="spec-link">
+ <a title="Read about this attribute in the HTML5 spec"
+ href="{$filename}.html{$spec-target}">ⓘ</a>
+ </span>
+ <xsl:text> </xsl:text>
+ </xsl:if>
<dfn class="attribute-name" id="{@id}"
title="{@id}">
<xsl:copy-of select="$shared-attr-name"/>
@@ -409,28 +432,6 @@
</span>
<xsl:text> </xsl:text>
<xsl:variable name="ref" select="@id"/>
- <xsl:variable name="spec-target">
- <xsl:choose>
- <xsl:when test="document('../src/map-attributes.html')//*[preceding-sibling::*=$ref]">
- <xsl:value-of select="concat('#',document('../src/map-attributes.html')//*[preceding-sibling::*=$ref])"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="concat('#the-',$shared-attr-name,'-attribute')"/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:variable>
- <xsl:variable name="filename">
- <xsl:call-template name="get-spec-filename">
- <xsl:with-param name="ref" select="$spec-target"/>
- </xsl:call-template>
- </xsl:variable>
- <xsl:if test="not($filename='')">
- <span class="spec-link">
- <a title="Read about this attribute in the HTML5 spec"
- href="{$filename}.html{$spec-target}">ⓘ</a>
- </span>
- <xsl:text> </xsl:text>
- </xsl:if>
<xsl:if test="$attributes//*[@id=$ref][contains(@class,'new')]">
<span class="new-feature"
title="This markup feature is newly added in HTML5."
@@ -914,6 +915,7 @@
<!-- * <xsl:text> </xsl:text> -->
<xsl:text> </xsl:text>
</div>
+ <script src="js/dfn.js" type="text/javascript"></script>
</body>
<xsl:text> </xsl:text>
</html>
@@ -966,12 +968,12 @@
<section id="button" class="no-number">
<xsl:text> </xsl:text>
<h2 class="element-head">
- <span class="element">button</span>
- <xsl:text> </xsl:text>
<span class="spec-link">
<a title="Read about the button element in the HTML5 spec"
href="{$filename}.html#the-button-element">ⓘ</a>
</span>
+ <xsl:text> </xsl:text>
+ <span class="element">button</span>
</h2>
<xsl:text> </xsl:text>
<div>
@@ -1003,13 +1005,13 @@
<section id="command" class="no-number">
<xsl:text> </xsl:text>
<h2 class="element-head">
- <span class="element">command</span>
- <xsl:text> </xsl:text>
<span class="spec-link">
<a title="Read about the command element in the HTML5 spec"
href="{$filename}.html#the-command">ⓘ</a>
</span>
<xsl:text> </xsl:text>
+ <span class="element">command</span>
+ <xsl:text> </xsl:text>
<span class="new-feature" title="This markup feature is newly added in HTML5.">NEW</span>
</h2>
<xsl:text> </xsl:text>
@@ -1040,12 +1042,12 @@
<section id="input" class="no-number">
<xsl:text> </xsl:text>
<h2 class="element-head">
- <span class="element">input</span>
- <xsl:text> </xsl:text>
<span class="spec-link">
<a title="Read about the input element in the HTML5 spec"
href="{$filename}.html#the-input-element">ⓘ</a>
</span>
+ <xsl:text> </xsl:text>
+ <span class="element">input</span>
</h2>
<xsl:text> </xsl:text>
<div>
@@ -1075,12 +1077,12 @@
<section id="meta" class="no-number">
<xsl:text> </xsl:text>
<h2 class="element-head">
- <span class="element">meta</span>
- <xsl:text> </xsl:text>
<span class="spec-link">
<a title="Read about the meta element in the HTML5 spec"
href="{$filename}.html#meta">ⓘ</a>
</span>
+ <xsl:text> </xsl:text>
+ <span class="element">meta</span>
</h2>
<xsl:text> </xsl:text>
<p>The <span class="element">meta</span> element is
@@ -1115,6 +1117,45 @@
</xsl:attribute>
<xsl:text> </xsl:text>
<h2 class="element-head">
+ <xsl:variable name="target">
+ <xsl:choose>
+ <xsl:when test="starts-with($name,'button')">#the-button-element</xsl:when>
+ <xsl:when test="starts-with($name,'command')">#the-command</xsl:when>
+ <xsl:when test="starts-with($name,'input')">#the-input-element</xsl:when>
+ <xsl:when test="starts-with($name,'meta')">#meta</xsl:when>
+ <xsl:when test="$name = 'audio'">#audio</xsl:when>
+ <xsl:when test="$name = 'body'">#the-body-element-0</xsl:when>
+ <xsl:when test="$name = 'command'">#the-command</xsl:when>
+ <xsl:when test="$name = 'h1'">#the-h1-h2-h3-h4-h5-and-h6-elements</xsl:when>
+ <xsl:when test="$name = 'h2'">#the-h1-h2-h3-h4-h5-and-h6-elements</xsl:when>
+ <xsl:when test="$name = 'h3'">#the-h1-h2-h3-h4-h5-and-h6-elements</xsl:when>
+ <xsl:when test="$name = 'h4'">#the-h1-h2-h3-h4-h5-and-h6-elements</xsl:when>
+ <xsl:when test="$name = 'h5'">#the-h1-h2-h3-h4-h5-and-h6-elements</xsl:when>
+ <xsl:when test="$name = 'h6'">#the-h1-h2-h3-h4-h5-and-h6-elements</xsl:when>
+ <xsl:when test="$name = 'head'">#the-head-element-0</xsl:when>
+ <xsl:when test="$name = 'html'">#the-html-element-0</xsl:when>
+ <xsl:when test="$name = 'menu'">#menus</xsl:when>
+ <xsl:when test="$name = 'script'">#script</xsl:when>
+ <xsl:when test="$name = 'sub'">#the-sub-and-sup-elements</xsl:when>
+ <xsl:when test="$name = 'sup'">#the-sub-and-sup-elements</xsl:when>
+ <xsl:when test="$name = 'title'">#the-title-element-0</xsl:when>
+ <xsl:when test="$name = 'video'">#video</xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="concat('#the-',$name,'-element')"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <xsl:text> </xsl:text>
+ <xsl:variable name="filename">
+ <xsl:call-template name="get-spec-filename">
+ <xsl:with-param name="ref" select="$target"/>
+ </xsl:call-template>
+ </xsl:variable>
+ <span class="spec-link">
+ <xsl:text> </xsl:text>
+ <a title="Read about the {$name} element in the HTML5 spec"
+ href="{$filename}.html{$target}">ⓘ</a>
+ </span>
<xsl:choose>
<xsl:when test="contains($name,'.notype')">
<span class="element"><xsl:value-of select="substring-before($name,'.')"/></span>
@@ -1220,49 +1261,6 @@
</xsl:otherwise>
</xsl:choose>
</span>
- <xsl:variable name="target">
- <xsl:choose>
- <xsl:when test="starts-with($name,'button')">#the-button-element</xsl:when>
- <xsl:when test="starts-with($name,'command')">#the-command</xsl:when>
- <xsl:when test="starts-with($name,'input')">#the-input-element</xsl:when>
- <xsl:when test="starts-with($name,'meta')">#meta</xsl:when>
- <xsl:when test="$name = 'audio'">#audio</xsl:when>
- <xsl:when test="$name = 'body'">#the-body-element-0</xsl:when>
- <xsl:when test="$name = 'command'">#the-command</xsl:when>
- <xsl:when test="$name = 'h1'">#the-h1-h2-h3-h4-h5-and-h6-elements</xsl:when>
- <xsl:when test="$name = 'h2'">#the-h1-h2-h3-h4-h5-and-h6-elements</xsl:when>
- <xsl:when test="$name = 'h3'">#the-h1-h2-h3-h4-h5-and-h6-elements</xsl:when>
- <xsl:when test="$name = 'h4'">#the-h1-h2-h3-h4-h5-and-h6-elements</xsl:when>
- <xsl:when test="$name = 'h5'">#the-h1-h2-h3-h4-h5-and-h6-elements</xsl:when>
- <xsl:when test="$name = 'h6'">#the-h1-h2-h3-h4-h5-and-h6-elements</xsl:when>
- <xsl:when test="$name = 'head'">#the-head-element-0</xsl:when>
- <xsl:when test="$name = 'html'">#the-html-element-0</xsl:when>
- <xsl:when test="$name = 'menu'">#menus</xsl:when>
- <xsl:when test="$name = 'script'">#script</xsl:when>
- <xsl:when test="$name = 'sub'">#the-sub-and-sup-elements</xsl:when>
- <xsl:when test="$name = 'sup'">#the-sub-and-sup-elements</xsl:when>
- <xsl:when test="$name = 'title'">#the-title-element-0</xsl:when>
- <xsl:when test="$name = 'video'">#video</xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="concat('#the-',$name,'-element')"/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:variable>
- <xsl:text> </xsl:text>
- <!-- * <xsl:message> -->
- <!-- * <xsl:text> </xsl:text> -->
- <!-- * <xsl:value-of select="$target"/> -->
- <!-- * </xsl:message> -->
- <xsl:variable name="filename">
- <xsl:call-template name="get-spec-filename">
- <xsl:with-param name="ref" select="$target"/>
- </xsl:call-template>
- </xsl:variable>
- <span class="spec-link">
- <xsl:text> </xsl:text>
- <a title="Read about the {$name} element in the HTML5 spec"
- href="{$filename}.html{$target}">ⓘ</a>
- </span>
<xsl:text> </xsl:text>
<xsl:if test='not($obsoleted="")'>
<xsl:text> </xsl:text>
@@ -2438,6 +2436,41 @@
</xsl:variable>
<xsl:text> </xsl:text>
<xsl:element name="{$wrapper}">
+ <xsl:variable name="spec-target">
+ <xsl:choose>
+ <xsl:when test="document('../src/map-attributes.html')//*[preceding-sibling::*=$ref]">
+ <xsl:value-of select="concat('#',document('../src/map-attributes.html')//*[preceding-sibling::*=$ref])"/>
+ </xsl:when>
+ <xsl:when test="starts-with($href,'#scripting.attr.on')">
+ <xsl:value-of select="concat('#ix-handler-',substring-after($href,'#scripting.attr.'))"/>
+ </xsl:when>
+ <xsl:when test="starts-with($href,'#body.attrs.on')">
+ <xsl:value-of select="concat('#ix-handler-window-',substring-after($href,'#body.attrs.'))"/>
+ </xsl:when>
+ <xsl:when test="starts-with($href,'#input.')">
+ <xsl:value-of select="concat('#attr-input-',substring-after($href,'.attrs.'))"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="concat('#attr-',$name,'-',$attribute-name)"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <!-- * <xsl:message> -->
+ <!-- * <xsl:text> </xsl:text> -->
+ <!-- * <xsl:value-of select="$spec-target"/> -->
+ <!-- * </xsl:message> -->
+ <xsl:variable name="filename">
+ <xsl:call-template name="get-spec-filename">
+ <xsl:with-param name="ref" select="$spec-target"/>
+ </xsl:call-template>
+ </xsl:variable>
+ <xsl:if test="not($filename='')">
+ <span class="spec-link">
+ <a title="Read about this attribute in the HTML5 spec"
+ href="{$filename}.html{$spec-target}">ⓘ</a>
+ </span>
+ <xsl:text> </xsl:text>
+ </xsl:if>
<xsl:choose>
<xsl:when test="contains(node(),'.')">
<a class="attribute-name"
@@ -2676,42 +2709,7 @@
</xsl:otherwise>
</xsl:choose>
</span>
- <xsl:variable name="spec-target">
- <xsl:choose>
- <xsl:when test="document('../src/map-attributes.html')//*[preceding-sibling::*=$ref]">
- <xsl:value-of select="concat('#',document('../src/map-attributes.html')//*[preceding-sibling::*=$ref])"/>
- </xsl:when>
- <xsl:when test="starts-with($href,'#scripting.attr.on')">
- <xsl:value-of select="concat('#ix-handler-',substring-after($href,'#scripting.attr.'))"/>
- </xsl:when>
- <xsl:when test="starts-with($href,'#body.attrs.on')">
- <xsl:value-of select="concat('#ix-handler-window-',substring-after($href,'#body.attrs.'))"/>
- </xsl:when>
- <xsl:when test="starts-with($href,'#input.')">
- <xsl:value-of select="concat('#attr-input-',substring-after($href,'.attrs.'))"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="concat('#attr-',$name,'-',$attribute-name)"/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:variable>
- <xsl:text> </xsl:text>
- <!-- * <xsl:message> -->
- <!-- * <xsl:text> </xsl:text> -->
- <!-- * <xsl:value-of select="$spec-target"/> -->
- <!-- * </xsl:message> -->
- <xsl:variable name="filename">
- <xsl:call-template name="get-spec-filename">
- <xsl:with-param name="ref" select="$spec-target"/>
- </xsl:call-template>
- </xsl:variable>
- <xsl:if test="not($filename='')">
- <span class="spec-link">
- <a title="Read about this attribute in the HTML5 spec"
- href="{$filename}.html{$spec-target}">ⓘ</a>
- </span>
<xsl:text> </xsl:text>
- </xsl:if>
<xsl:if test="not($name='') and document(concat('../elements/',$name,'.html'))//*[@id=$ref][contains(@class,'new')]
or $attributes//*[@id=$ref][contains(@class,'new')]
">
Index: toc.xsl
===================================================================
RCS file: /sources/public/html5/markup/tools/toc.xsl,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- toc.xsl 22 Jul 2010 05:48:27 -0000 1.18
+++ toc.xsl 24 Jul 2010 17:15:29 -0000 1.19
@@ -78,6 +78,12 @@
<xsl:text> </xsl:text>
</xsl:if>
</span>
+ <xsl:for-each select='(h:h2|h:h3|h:h4|h:h5|h:h6)/node()
+ [@class="spec-link"]
+ '>
+ <xsl:copy-of select='.'/>
+ </xsl:for-each>
+ <xsl:text> </xsl:text>
<a href='{$filename}#{$frag}'>
<span class="toc-section-number">
<xsl:if test="not(contains(@class,'no-number'))">
@@ -95,12 +101,6 @@
<xsl:copy-of select='.'/>
</xsl:for-each>
</a>
- <xsl:text> </xsl:text>
- <xsl:for-each select='(h:h2|h:h3|h:h4|h:h5|h:h6)/node()
- [@class="spec-link"]
- '>
- <xsl:copy-of select='.'/>
- </xsl:for-each>
<xsl:if test='(h:h2|h:h3|h:h4|h:h5|h:h6)/node()[contains(@class,"obsoleted-feature")]'>
<xsl:text> </xsl:text>
<span class="obsoleted-feature"
Received on Saturday, 24 July 2010 17:15:33 UTC