From 3557159351317655a11f4109c80e0e955e627b4c Mon Sep 17 00:00:00 2001
From: Norman Walsh <ndw@nwalsh.com>
Date: Thu, 27 Sep 2007 13:36:45 +0000
Subject: [PATCH] Leave optional groups around even single elements so that the
 optional doesn't get lost

---
 docbook/relaxng/tools/doc2dtd.xsl | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/docbook/relaxng/tools/doc2dtd.xsl b/docbook/relaxng/tools/doc2dtd.xsl
index c7188a694..c2cb0f368 100644
--- a/docbook/relaxng/tools/doc2dtd.xsl
+++ b/docbook/relaxng/tools/doc2dtd.xsl
@@ -543,11 +543,14 @@
 
 <xsl:template match="rng:optional" mode="trim">
   <!-- optional with multiple children needs a group? -->
+  <!-- ndw: 27 Sep 2007; even if optional has only a single child, it -->
+  <!--      needs a group because if you strip off the group, the optional -->
+  <!--      part sometimes gets lost (refsect2 inside refsect1, for example) -->
   <xsl:copy>
     <xsl:copy-of select="@*"/>
 
     <xsl:choose>
-      <xsl:when test="count(*) &gt; 1">
+      <xsl:when test="count(*) &gt;= 1">
 	<rng:group>
 	  <xsl:apply-templates mode="trim"/>
 	</rng:group>
-- 
2.40.0