Fixed handling of punctuation for methodparam in methodsynopsis.

Closes bug 1530558. Thanks to Evan Goer and Michael Fuchs.

diff --git a/xsl/fo/synop.xsl b/xsl/fo/synop.xsl
index 2d6b80dbd7e282f66b517a58932cff8954b4932c..98472371fb43723f79c5a50b288b174a35ced5ec 100644 (file)
--- a/xsl/fo/synop.xsl
+++ b/xsl/fo/synop.xsl
@@ -441,7 +441,7 @@
 
 <xsl:template match="methodparam" mode="java">
   <xsl:param name="indent">0</xsl:param>
-  <xsl:if test="preceding-sibling::*">
+  <xsl:if test="preceding-sibling::methodparam">
     <xsl:text>,&RE;</xsl:text>
     <xsl:if test="$indent &gt; 0">
       <xsl:call-template name="copy-string">
@@ -608,7 +608,7 @@
 </xsl:template>
 
 <xsl:template match="methodparam" mode="cpp">
-  <xsl:if test="preceding-sibling::*">
+  <xsl:if test="preceding-sibling::methodparam">
     <xsl:text>, </xsl:text>
   </xsl:if>
   <xsl:apply-templates mode="cpp"/>
@@ -765,7 +765,7 @@
 </xsl:template>
 
 <xsl:template match="methodparam" mode="idl">
-  <xsl:if test="preceding-sibling::*">
+  <xsl:if test="preceding-sibling::methodparam">
     <xsl:text>, </xsl:text>
   </xsl:if>
   <xsl:apply-templates mode="idl"/>
@@ -911,7 +911,7 @@
 </xsl:template>
 
 <xsl:template match="methodparam" mode="perl">
-  <xsl:if test="preceding-sibling::*">
+  <xsl:if test="preceding-sibling::methodparam">
     <xsl:text>, </xsl:text>
   </xsl:if>
   <xsl:apply-templates mode="perl"/>

diff --git a/xsl/html/synop.xsl b/xsl/html/synop.xsl
index 8ffdff6404b1e6f34b05d8bd333897d0576929f1..62e2e90a0520f371b6b6f351288c3e0ac87fc371 100644 (file)
--- a/xsl/html/synop.xsl
+++ b/xsl/html/synop.xsl
@@ -911,7 +911,7 @@ paramdef      ::= (#PCDATA|type|replaceable|parameter|funcparams)*
 
 <xsl:template match="methodparam" mode="java">
   <xsl:param name="indent">0</xsl:param>
-  <xsl:if test="preceding-sibling::*">
+  <xsl:if test="preceding-sibling::methodparam">
     <xsl:text>,</xsl:text>
     <br/>
     <xsl:if test="$indent &gt; 0">
@@ -1102,7 +1102,7 @@ paramdef      ::= (#PCDATA|type|replaceable|parameter|funcparams)*
 </xsl:template>
 
 <xsl:template match="methodparam" mode="cpp">
-  <xsl:if test="preceding-sibling::*">
+  <xsl:if test="preceding-sibling::methodparam">
     <xsl:text>, </xsl:text>
   </xsl:if>
   <span class="{name(.)}">
@@ -1282,7 +1282,7 @@ paramdef      ::= (#PCDATA|type|replaceable|parameter|funcparams)*
 </xsl:template>
 
 <xsl:template match="methodparam" mode="idl">
-  <xsl:if test="preceding-sibling::*">
+  <xsl:if test="preceding-sibling::methodparam">
     <xsl:text>, </xsl:text>
   </xsl:if>
   <span class="{name(.)}">
@@ -1449,7 +1449,7 @@ paramdef      ::= (#PCDATA|type|replaceable|parameter|funcparams)*
 </xsl:template>
 
 <xsl:template match="methodparam" mode="perl">
-  <xsl:if test="preceding-sibling::*">
+  <xsl:if test="preceding-sibling::methodparam">
     <xsl:text>, </xsl:text>
   </xsl:if>
   <span class="{name(.)}">