Fake the methodparam content model to avoid the UPA

diff --git a/docbook/relaxng/tools/doc2dtd.xsl b/docbook/relaxng/tools/doc2dtd.xsl
index 280133622a1ceae92ef1a3b9afd06905ea38b792..3f1a359e70cfc8c046563ee4deb6c6c399819b39 100644 (file)
--- a/docbook/relaxng/tools/doc2dtd.xsl
+++ b/docbook/relaxng/tools/doc2dtd.xsl
@@ -224,6 +224,32 @@
       <!-- nop; handled by the db.caption branch -->
     </xsl:when>
 
+    <!-- Handle the UPA problem in modifier... -->
+    <xsl:when test="@name = 'db.methodparam'">
+      <dtd:element name="methodparam">
+       <dtd:group>
+         <dtd:choice repeat="*">
+           <dtd:ref name="modifier"/>
+           <dtd:ref name="type"/>
+         </dtd:choice>
+         <dtd:choice>
+           <dtd:group>
+             <dtd:ref name="parameter"/>
+             <dtd:ref name="initializer" repeat="?"/>
+           </dtd:group>
+           <dtd:ref name="funcparams"/>
+         </dtd:choice>
+         <dtd:choice repeat="*">
+           <dtd:ref name="modifier"/>
+         </dtd:choice>
+       </dtd:group>
+      </dtd:element>
+      <dtd:attlist name="methodparam">
+       <xsl:apply-templates select="rng:element/doc:attributes"
+                            mode="attributes"/>
+      </dtd:attlist>
+    </xsl:when>
+
     <xsl:otherwise>
       <xsl:apply-templates/>
     </xsl:otherwise>