From: Norman Walsh <ndw@nwalsh.com>
Date: Sat, 23 Jul 2005 20:06:31 +0000 (+0000)
Subject: Make sure the choice doesn't get lost when doing the includes
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8b2cb7cd8b5985a6faba06ebde0cfc223244ce56;p=docbook-dsssl

Make sure the choice doesn't get lost when doing the includes
---

diff --git a/docbook/relaxng/tools/include.xsl b/docbook/relaxng/tools/include.xsl
index f4d1d7355..4a916ab12 100644
--- a/docbook/relaxng/tools/include.xsl
+++ b/docbook/relaxng/tools/include.xsl
@@ -152,7 +152,19 @@
 	      <xsl:copy-of select="@*"/>
 	      <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(*) &gt; 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>
 	  </xsl:when>