- From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
- Date: Fri, 12 Feb 2010 04:52:30 +0000
- To: public-html-commits@w3.org
Update of /sources/public/html5/markup/tools
In directory hutz:/tmp/cvs-serv22468/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.240
retrieving revision 1.241
diff -u -d -r1.240 -r1.241
--- generate-spec-source.xsl 11 Feb 2010 14:23:39 -0000 1.240
+++ generate-spec-source.xsl 12 Feb 2010 04:52:28 -0000 1.241
@@ -1926,19 +1926,19 @@
</xsl:template>
<xsl:template name="make.special.context">
- <dl>
- <dt class="content-model">
- <span class="element-pattern-name" id="{@id}">
- <a href="#{@id}" >
- <span class="element">
- <xsl:value-of select="@id"/>
- </span>
- </a>
- <xsl:text> = </xsl:text>
- </span>
- </dt>
- <dd class="elem-mdl"><xsl:copy-of select="node()"/></dd>
- </dl>
+ <p>See the following sections:</p>
+ <ul>
+ <xsl:for-each select="node()">
+ <xsl:if test="@href">
+ <li>
+ <a>
+ <xsl:copy-of select="@*"/>
+ <xsl:value-of select="concat(substring-before(.,'.'),' type=',substring-after(.,'.'))"/>
+ </a>
+ </li>
+ </xsl:if>
+ </xsl:for-each>
+ </ul>
</xsl:template>
<!-- * ***************************************************************** -->
Index: specgen.xsl
===================================================================
RCS file: /sources/public/html5/markup/tools/specgen.xsl,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- specgen.xsl 11 Feb 2010 14:23:39 -0000 1.54
+++ specgen.xsl 12 Feb 2010 04:52:28 -0000 1.55
@@ -603,6 +603,7 @@
<xsl:choose>
<xsl:when test="not($chunk=0) and (count(ancestor::h:section)=0 or child::h:h2[@class='element-head'])">
<xsl:call-template name="write.chunk">
+ <xsl:with-param name="maturity" select="$maturity"/>
<xsl:with-param name="quiet" select="$quiet"/>
<xsl:with-param name="content" select="$content"/>
<xsl:with-param name="title">
Index: chunker.xsl
===================================================================
RCS file: /sources/public/html5/markup/tools/chunker.xsl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- chunker.xsl 2 Feb 2010 17:04:54 -0000 1.6
+++ chunker.xsl 12 Feb 2010 04:52:28 -0000 1.7
@@ -11,6 +11,7 @@
<!-- * "Acknowledgements" comment at the end of this file. -->
<xsl:template name="write.chunk">
+ <xsl:param name="maturity">ED</xsl:param>
<xsl:param name="filename" select="''"/>
<xsl:param name="quiet" select="0"/>
<xsl:param name="method">html</xsl:param>
@@ -63,6 +64,22 @@
<xsl:text> </xsl:text>
<head>
<xsl:text> </xsl:text>
+ <xsl:choose>
+ <xsl:when test="$maturity = 'ED'">
+ <link rel='stylesheet' href='W3C-ED.css' type='text/css'/>
+ </xsl:when>
+ <xsl:when test='
+ $maturity="WD"
+ or $maturity="FPWD"
+ or $maturity="LCWD"
+ or $maturity="FPWDLC"
+ '>
+ <link rel='stylesheet' href='http://www.w3.org/StyleSheets/TR/W3C-WD' type='text/css'/>
+ </xsl:when>
+ <xsl:otherwise>
+ <link rel='stylesheet' href='http://www.w3.org/StyleSheets/TR/W3C-{$maturity}' type='text/css'/>
+ </xsl:otherwise>
+ </xsl:choose>
<title>
<xsl:value-of select="$title"/>
</title>
@@ -107,6 +124,32 @@
<xsl:template name="header.navigation">
<xsl:param name="prev" select="preceding-sibling::*"/>
<xsl:param name="next" select="following-sibling::*"/>
+ <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:when>
+ <xsl:when test="contains($prev/@id,'-')">
+ <xsl:value-of select="concat(substring-before($prev/@id,'-'),' ',substring-after($prev/@id,'-'))"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="$prev/@id"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <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:when>
+ <xsl:when test="contains($next/@id,'-')">
+ <xsl:value-of select="concat(substring-before($next/@id,'-'),' ',substring-after($next/@id,'-'))"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="$next/@id"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
<xsl:text> </xsl:text>
<h2 class="chunkpagetitle"><a
href="{$TOC-file}"><xsl:value-of select="/*/h:head/h:title"/></a></h2>
@@ -115,13 +158,13 @@
<xsl:text> </xsl:text>
<xsl:if test="$prev">
<span class="nav-prev">
- <a href="{$prev/@id}.html">« <xsl:value-of select="$prev/@id"/></a>
+ <a href="{$prev/@id}.html">« <xsl:value-of select="$prev-text"/></a>
</span>
</xsl:if>
<xsl:if test="$next">
<xsl:text> </xsl:text>
<span class="nav-next">
- <a href="{$next/@id}.html"><xsl:value-of select="$next/@id"/> »</a>
+ <a href="{$next/@id}.html"><xsl:value-of select="$next-text"/> »</a>
</span>
</xsl:if>
<xsl:text> </xsl:text>
@@ -131,6 +174,32 @@
<xsl:template name="footer.navigation">
<xsl:param name="prev" select="preceding-sibling::*"/>
<xsl:param name="next" select="following-sibling::*"/>
+ <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:when>
+ <xsl:when test="contains($prev/@id,'-')">
+ <xsl:value-of select="concat(substring-before($prev/@id,'-'),' ',substring-after($prev/@id,'-'))"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="$prev/@id"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <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:when>
+ <xsl:when test="contains($next/@id,'-')">
+ <xsl:value-of select="concat(substring-before($next/@id,'-'),' ',substring-after($next/@id,'-'))"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="$next/@id"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
<xsl:text> </xsl:text>
<hr class="footerbreak"/>
<xsl:text> </xsl:text>
@@ -138,13 +207,13 @@
<xsl:text> </xsl:text>
<xsl:if test="$prev">
<span class="nav-prev">
- <a href="{$prev/@id}.html">« <xsl:value-of select="$prev/@id"/></a>
+ <a href="{$prev/@id}.html">« <xsl:value-of select="$prev-text"/></a>
</span>
</xsl:if>
<xsl:if test="$next">
<xsl:text> </xsl:text>
<span class="nav-next">
- <a href="{$next/@id}.html"><xsl:value-of select="$next/@id"/> »</a>
+ <a href="{$next/@id}.html"><xsl:value-of select="$next-text"/> »</a>
</span>
</xsl:if>
<xsl:text> </xsl:text>
Received on Friday, 12 February 2010 04:52:32 UTC