From: Norman Walsh <ndw@nwalsh.com>
Date: Tue, 30 Mar 2010 03:22:54 +0000 (+0000)
Subject: Handle dtx:empty correctly
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cc8082e3e10c54e631bd51bb30332947ea82446e;p=docbook-dsssl

Handle dtx:empty correctly
---

diff --git a/docbook/relaxng/tools/rng2dtd/style/dtx2dtd.xsl b/docbook/relaxng/tools/rng2dtd/style/dtx2dtd.xsl
index c55fcd18a..8b6726bb4 100644
--- a/docbook/relaxng/tools/rng2dtd/style/dtx2dtd.xsl
+++ b/docbook/relaxng/tools/rng2dtd/style/dtx2dtd.xsl
@@ -153,6 +153,9 @@
       </xsl:for-each>
       <xsl:text>)</xsl:text>
     </xsl:when>
+    <xsl:when test="$cm/self::dtx:empty">
+      <xsl:apply-templates select="$cm"/>
+    </xsl:when>
     <xsl:otherwise>
       <xsl:text>(</xsl:text>
       <xsl:apply-templates select="$cm"/>
@@ -317,7 +320,7 @@
 
 <xsl:template name="implicit-group">
   <xsl:choose>
-    <xsl:when test="count(*) &gt; 1">
+    <xsl:when test="count(*) &gt; 1 and not(dtx:empty)">
       <xsl:text>(</xsl:text>
       <xsl:for-each select="*">
         <xsl:if test="position() &gt; 1">, </xsl:if>