From: Bob Stayton <bobs@sagehill.net>
Date: Tue, 6 Nov 2012 19:09:16 +0000 (+0000)
Subject: Make comma inserted after function/parameter or function/replaceable
X-Git-Tag: release/1.79.1~6^2~287
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a52e62022214758ce00ea33453d297fcf4369418;p=docbook-dsssl

Make comma inserted after function/parameter or function/replaceable
conditional on $function.parens to be consistent with the function template.
---

diff --git a/xsl/fo/inline.xsl b/xsl/fo/inline.xsl
index 8fe1759d9..69ea0b955 100644
--- a/xsl/fo/inline.xsl
+++ b/xsl/fo/inline.xsl
@@ -510,14 +510,14 @@
 
 <xsl:template match="function/parameter" priority="2">
   <xsl:call-template name="inline.italicmonoseq"/>
-  <xsl:if test="following-sibling::*">
+  <xsl:if test="$function.parens != 0 and following-sibling::*">
     <xsl:text>, </xsl:text>
   </xsl:if>
 </xsl:template>
 
 <xsl:template match="function/replaceable" priority="2">
   <xsl:call-template name="inline.italicmonoseq"/>
-  <xsl:if test="following-sibling::*">
+  <xsl:if test="$function.parens != 0 and following-sibling::*">
     <xsl:text>, </xsl:text>
   </xsl:if>
 </xsl:template>
diff --git a/xsl/html/inline.xsl b/xsl/html/inline.xsl
index 312dc83e4..ff4fdcb67 100644
--- a/xsl/html/inline.xsl
+++ b/xsl/html/inline.xsl
@@ -558,14 +558,14 @@
 
 <xsl:template match="function/parameter" priority="2">
   <xsl:call-template name="inline.italicmonoseq"/>
-  <xsl:if test="following-sibling::*">
+  <xsl:if test="$function.parens != 0 and following-sibling::*">
     <xsl:text>, </xsl:text>
   </xsl:if>
 </xsl:template>
 
 <xsl:template match="function/replaceable" priority="2">
   <xsl:call-template name="inline.italicmonoseq"/>
-  <xsl:if test="following-sibling::*">
+  <xsl:if test="$function.parens != 0 and following-sibling::*">
     <xsl:text>, </xsl:text>
   </xsl:if>
 </xsl:template>