From: Norman W. <nw...@us...> - 2005-07-23 20:06:42
|
Update of /cvsroot/docbook/docbook/relaxng/tools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6141 Modified Files: include.xsl Log Message: Make sure the choice doesn't get lost when doing the includes Index: include.xsl =================================================================== RCS file: /cvsroot/docbook/docbook/relaxng/tools/include.xsl,v retrieving revision 1.5 retrieving revision 1.6 diff -u -U2 -r1.5 -r1.6 --- include.xsl 6 Jul 2005 20:18:26 -0000 1.5 +++ include.xsl 23 Jul 2005 20:06:31 -0000 1.6 @@ -153,5 +153,17 @@ <rng:choice> <xsl:apply-templates mode="combine"/> - <xsl:apply-templates select="$choices/*" mode="combine"/> + <xsl:for-each select="$choices"> + <xsl:choose> + <xsl:when test="count(*) > 1"> + <!-- implicit group --> + <rng:group> + <xsl:apply-templates select="*" mode="combine"/> + </rng:group> + </xsl:when> + <xsl:otherwise> + <xsl:apply-templates select="*" mode="combine"/> + </xsl:otherwise> + </xsl:choose> + </xsl:for-each> </rng:choice> </xsl:copy> |