Bug #605150: process arg correctly even when it's in a group

diff --git a/xsl/fo/synop.xsl b/xsl/fo/synop.xsl
index f9c163bf9ee2c04a698d8daa22f3315817064854..2d5542ed751d24e948e16742aed274be4705fc6e 100644 (file)
--- a/xsl/fo/synop.xsl
+++ b/xsl/fo/synop.xsl
@@ -39,7 +39,7 @@
   <xsl:text> </xsl:text>
 </xsl:template>
 
-<xsl:template match="group|arg">
+<xsl:template match="group|arg" name="group-or-arg">
   <xsl:variable name="choice" select="@choice"/>
   <xsl:variable name="rep" select="@rep"/>
   <xsl:variable name="sepchar">
@@ -99,7 +99,7 @@
   <xsl:variable name="choice" select="@choice"/>
   <xsl:variable name="rep" select="@rep"/>
   <xsl:if test="position()>1"><xsl:value-of select="$arg.or.sep"/></xsl:if>
-  <xsl:apply-templates/>
+  <xsl:call-template name="group-or-arg"/>
 </xsl:template>
 
 <xsl:template match="sbr">

diff --git a/xsl/html/synop.xsl b/xsl/html/synop.xsl
index 432771eb3352e0f9b6dfe97d3ccb57fc560f9d67..57f9fea477aa3d7d408dc79407fcfcf2b02da291 100644 (file)
--- a/xsl/html/synop.xsl
+++ b/xsl/html/synop.xsl
@@ -41,7 +41,7 @@
   <xsl:text> </xsl:text>
 </xsl:template>
 
-<xsl:template match="group|arg">
+<xsl:template match="group|arg" name="group-or-arg">
   <xsl:variable name="choice" select="@choice"/>
   <xsl:variable name="rep" select="@rep"/>
   <xsl:variable name="sepchar">
@@ -101,7 +101,7 @@
   <xsl:variable name="choice" select="@choice"/>
   <xsl:variable name="rep" select="@rep"/>
   <xsl:if test="position()>1"><xsl:value-of select="$arg.or.sep"/></xsl:if>
-  <xsl:apply-templates/>
+  <xsl:call-template name="group-or-arg"/>
 </xsl:template>
 
 <xsl:template match="sbr">