- From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
- Date: Tue, 02 Mar 2010 05:12:43 +0000
- To: public-html-commits@w3.org
Update of /sources/public/html5/markup/tools
In directory hutz:/tmp/cvs-serv14329/tools
Modified Files:
chunker.xsl generate-spec-source.xsl specgen.xsl toc.xsl
Log Message:
fix some problems in h:tml draft that pubrules checker caught
Index: generate-spec-source.xsl
===================================================================
RCS file: /sources/public/html5/markup/tools/generate-spec-source.xsl,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -d -r1.244 -r1.245
--- generate-spec-source.xsl 20 Feb 2010 03:37:07 -0000 1.244
+++ generate-spec-source.xsl 2 Mar 2010 05:12:41 -0000 1.245
@@ -482,7 +482,7 @@
select="substring($first,2)"/>
</xsl:variable>
<xsl:text> </xsl:text>
- <section id="{@id}" class="no-toc">
+ <section id="{@id}-def" class="no-toc">
<xsl:text> </xsl:text>
<xsl:choose>
<xsl:when test="$pattern='browsing-context-name'">
@@ -2784,7 +2784,7 @@
<xsl:choose>
<xsl:when test="$ref = 'normal-character-data'">
<a href="#normal-character-data">normal character data</a>
- <script class="postfix optional">?</script>
+ <span class="postfix optional">?</span>
</xsl:when>
<xsl:when test="$ref = 'colgroup.inner'">
<!-- * special-case constraint of col element vs. span -->
@@ -2843,11 +2843,11 @@
</xsl:when>
<xsl:when test="@href = '#non-replaceable-character-data'">
<a href="#non-replaceable-character-data">non-replaceable character data</a>
- <script class="postfix optional">?</script>
+ <span class="postfix optional">?</span>
</xsl:when>
<xsl:when test="@href = '#replaceable-character-data'">
<a href="#replaceable-character-data">replaceable character data</a>
- <script class="postfix optional">?</script>
+ <span class="postfix optional">?</span>
</xsl:when>
<xsl:when test="@href = '#mli'">
<a href="#li">li</a>
Index: specgen.xsl
===================================================================
RCS file: /sources/public/html5/markup/tools/specgen.xsl,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- specgen.xsl 2 Mar 2010 03:17:50 -0000 1.59
+++ specgen.xsl 2 Mar 2010 05:12:41 -0000 1.60
@@ -42,14 +42,14 @@
<xsl:apply-templates select='/*'/>
</xsl:template>
<xsl:template match='h:*'>
- <xsl:element name="{name()}" namespace="{namespace-uri()}">
- <xsl:copy-of select='@*[namespace-uri()="" or namespace-uri="http://www.w3.org/XML/1998/namespace"]'/>
+ <xsl:element name="{name()}">
+ <xsl:copy-of select='@*[namespace-uri()=""]'/>
<xsl:apply-templates select='node()'/>
</xsl:element>
</xsl:template>
<xsl:template match='h:head'>
<head>
- <xsl:copy-of select='@*[namespace-uri()="" or namespace-uri="http://www.w3.org/XML/1998/namespace"]'/>
+ <xsl:copy-of select='@*[namespace-uri()=""]'/>
<xsl:apply-templates select='node()'/>
<xsl:text> </xsl:text>
<xsl:choose>
@@ -119,7 +119,7 @@
<div class='head'>
<xsl:choose>
<xsl:when test="$site = 'W3C'">
- <div><a href="http://www.w3.org/"><img src="http://www.w3.org/Icons/w3c_home" width="72" height="48" alt="W3C"></img></a></div>
+ <div><a href="http://www.w3.org/"><img height="48" width="72" alt="W3C" src="http://www.w3.org/Icons/w3c_home"/></a></div>
</xsl:when>
<xsl:when test="$site = 'whatwg'">
<div><a href="http://www.whatwg.org/"><img src="http://www.whatwg.org/images/logo"></img></a></div>
@@ -429,8 +429,8 @@
functionality and interoperability of the Web.
</xsl:when>
<xsl:otherwise>
- <!-- * Publication as -->
- The existence of this document as
+ Publication as
+ <!-- * The existence of this document as -->
<xsl:choose>
<xsl:when test='$maturity = "ED"'>
<xsl:text>an</xsl:text>
@@ -441,7 +441,7 @@
</xsl:choose>
<xsl:text> </xsl:text>
<xsl:call-template name='maturity-short'/> does not imply endorsement by the
- W3C Membership. This is a draft document and may be updated, replaced
+ W3C Membership. This is a draft document and may be updated, replaced
or obsoleted by other documents at any time. It is inappropriate to cite
this document as other than work in progress.
</xsl:otherwise>
@@ -559,7 +559,9 @@
<span class="obsolete">(obsolete)</span>
</xsl:if>
<xsl:text> </xsl:text>
- <a class="hash" href="#{$myid}">#</a>
+ <xsl:if test='not(../@id = "abstract")'>
+ <a class="hash" href="#{$myid}">#</a>
+ </xsl:if>
<xsl:if test='not(../@id = "abstract")
and not(../@id="status")
and not(../@id="unexpanded-toc")
@@ -927,7 +929,9 @@
</xsl:when>
<xsl:otherwise>
<xsl:for-each select="..">
- <xsl:call-template name="toc1"/>
+ <xsl:call-template name="toc1">
+ <xsl:with-param name="main-toc">0</xsl:with-param>
+ </xsl:call-template>
</xsl:for-each>
</xsl:otherwise>
</xsl:choose>
Index: toc.xsl
===================================================================
RCS file: /sources/public/html5/markup/tools/toc.xsl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- toc.xsl 16 Feb 2010 10:28:27 -0000 1.13
+++ toc.xsl 2 Mar 2010 05:12:41 -0000 1.14
@@ -20,6 +20,7 @@
<xsl:param name='prefix'/>
<xsl:param name='alpha'/>
<xsl:param name="unexpanded" select="0"/>
+ <xsl:param name='main-toc'>1</xsl:param>
<xsl:variable name='subsections' select='h:section[not(contains(@class,"no-toc"))]'/>
<xsl:if test='$subsections'>
<ul>
@@ -64,7 +65,7 @@
</xsl:choose>
</xsl:variable>
<li>
- <xsl:if test="$unexpanded=0">
+ <xsl:if test="$unexpanded=0 and $main-toc=1">
<xsl:attribute name="id">
<xsl:value-of select="concat($frag,'-toc')"/>
</xsl:attribute>
Index: chunker.xsl
===================================================================
RCS file: /sources/public/html5/markup/tools/chunker.xsl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- chunker.xsl 12 Feb 2010 07:56:04 -0000 1.8
+++ chunker.xsl 2 Mar 2010 05:12:41 -0000 1.9
@@ -60,7 +60,7 @@
<xsl:param name="content">
<xsl:apply-imports/>
</xsl:param>
- <html xmlns="http://www.w3.org/1999/xhtml">
+ <html>
<xsl:text> </xsl:text>
<head>
<xsl:text> </xsl:text>
Received on Tuesday, 2 March 2010 05:12:45 UTC