stevenn 2003/10/11 15:55:27
Modified: src/blocks/slop/samples/yapt/stylesheets
filter-slop-output.xsl
Log:
Fixed condition where preference was given to the sourcecode-handling
templates.
Revision Changes Path
1.4 +9 -7
cocoon-2.1/src/blocks/slop/samples/yapt/stylesheets/filter-slop-output.xsl
Index: filter-slop-output.xsl
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/slop/samples/yapt/stylesheets/filter-slop-output.xsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- filter-slop-output.xsl 11 Oct 2003 22:37:11 -0000 1.3
+++ filter-slop-output.xsl 11 Oct 2003 22:55:27 -0000 1.4
@@ -107,17 +107,19 @@
<!-- extract paragraph and code blocks -->
<xsl:template mode="paragraph" match="slop:empty-line">
<xsl:choose>
- <xsl:when test="following-sibling::*[1][not(self::slop:code)]">
+ <xsl:when test="following-sibling::*[1][self::slop:code]">
+ <pre>
+ <xsl:for-each
select="following-sibling::*[1][not(self::slop:empty-line) and
not(self::slop:slide)]">
+ <xsl:call-template name="code-grouper"/>
+ </xsl:for-each>
+ </pre>
+ </xsl:when>
+ <xsl:otherwise>
<p>
<xsl:for-each
select="following-sibling::*[1][not(self::slop:empty-line) and
not(self::slop:slide)]">
<xsl:call-template name="para-grouper"/>
</xsl:for-each>
</p>
- </xsl:when>
- <xsl:otherwise>
- <pre><xsl:for-each
select="following-sibling::*[1][not(self::slop:empty-line) and
not(self::slop:slide)]">
- <xsl:call-template name="code-grouper"/>
- </xsl:for-each></pre>
</xsl:otherwise>
</xsl:choose>
</xsl:template>
