- From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
- Date: Tue, 16 Jun 2009 07:58:07 +0000
- To: public-html-commits@w3.org
Update of /sources/public/html5/markup/tools
In directory hutz:/tmp/cvs-serv23631/tools
Modified Files:
generate-spec-source.xsl
Log Message:
h:tml; yanked no-longer-needed cruft for special-case processing of content model for media source
Index: generate-spec-source.xsl
===================================================================
RCS file: /sources/public/html5/markup/tools/generate-spec-source.xsl,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -d -r1.178 -r1.179
--- generate-spec-source.xsl 16 Jun 2009 06:49:02 -0000 1.178
+++ generate-spec-source.xsl 16 Jun 2009 07:58:04 -0000 1.179
@@ -1711,26 +1711,9 @@
</xsl:otherwise>
</xsl:choose>
<xsl:text> = </xsl:text>
- <xsl:choose>
- <xsl:when test="
- @id = 'audio.inner.flow'
- or @id = 'audio.inner.phrasing'
- or @id = 'video.inner.flow'
- or @id = 'video.inner.phrasing'
- ">
- <xsl:variable name="ref" select="@id"/>
- <xsl:for-each select="//*[@id=$ref]/node()">
- <xsl:call-template name="unwind.media.source">
- <xsl:with-param name="ref" select="$ref"/>
- </xsl:call-template>
- </xsl:for-each>
- </xsl:when>
- <xsl:otherwise>
- <xsl:for-each select="node()">
- <xsl:call-template name="garnish.as.needed"/>
- </xsl:for-each>
- </xsl:otherwise>
- </xsl:choose>
+ <xsl:for-each select="node()">
+ <xsl:call-template name="garnish.as.needed"/>
+ </xsl:for-each>
</xsl:otherwise>
</xsl:choose>
</li>
@@ -2561,18 +2544,6 @@
<xsl:param name="ref" select="substring-after(@href,'#')"/>
<xsl:variable name="parent" select="../@id"/>
<xsl:choose>
- <xsl:when test="
- $ref = 'audio.inner.flow'
- or $ref = 'audio.inner.phrasing'
- or $ref = 'video.inner.flow'
- or $ref = 'video.inner.phrasing'
- ">
- <xsl:for-each select="//*[@id=$ref]/node()">
- <xsl:call-template name="unwind.media.source">
- <xsl:with-param name="ref" select="$ref"/>
- </xsl:call-template>
- </xsl:for-each>
- </xsl:when>
<xsl:when test="$ref = 'colgroup.inner'">
<!-- * special-case constraint of col element vs. span -->
<!-- * attribute in colgroup content model requires some -->
@@ -2654,20 +2625,6 @@
<!-- * ***************************************************************** -->
<!-- * * UTILITY TEMPLATES -->
<!-- * ***************************************************************** -->
- <xsl:template name="unwind.media.source">
- <xsl:param name="ref"/>
- <xsl:choose>
- <xsl:when test=".= 'media.source'">
- <xsl:for-each select="//*[@id='media.source']/node()">
- <xsl:call-template name="garnish.as.needed"/>
- </xsl:for-each>
- </xsl:when>
- <xsl:otherwise>
- <xsl:call-template name="garnish.as.needed"/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
- <!-- * ================================================================= -->
<xsl:template name="garnish.as.needed">
<!-- * add back parens where necessary -->
<xsl:choose>
Received on Tuesday, 16 June 2009 07:58:12 UTC