summaryrefslogtreecommitdiff
path: root/xhtml/inline.xsl
diff options
context:
space:
mode:
Diffstat (limited to 'xhtml/inline.xsl')
-rw-r--r--xhtml/inline.xsl22
1 files changed, 18 insertions, 4 deletions
diff --git a/xhtml/inline.xsl b/xhtml/inline.xsl
index bc53ba4..df97997 100644
--- a/xhtml/inline.xsl
+++ b/xhtml/inline.xsl
@@ -4,7 +4,7 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:suwl="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.UnwrapLinks" xmlns="http://www.w3.org/1999/xhtml" exclude-result-prefixes="xlink suwl" version="1.0">
<!-- ********************************************************************
- $Id: inline.xsl 9297 2012-04-22 03:56:16Z bobstayton $
+ $Id: inline.xsl 9663 2012-11-06 19:09:16Z bobstayton $
********************************************************************
This file is part of the XSL DocBook Stylesheet distribution.
@@ -537,14 +537,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>
@@ -586,7 +586,21 @@
</xsl:template>
<xsl:template match="keycap">
- <xsl:call-template name="inline.boldseq"/>
+ <xsl:choose>
+ <xsl:when test="@function and normalize-space(.) = ''">
+ <xsl:call-template name="inline.boldseq">
+ <xsl:with-param name="content">
+ <xsl:call-template name="gentext.template">
+ <xsl:with-param name="context" select="'keycap'"/>
+ <xsl:with-param name="name" select="@function"/>
+ </xsl:call-template>
+ </xsl:with-param>
+ </xsl:call-template>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:call-template name="inline.boldseq"/>
+ </xsl:otherwise>
+ </xsl:choose>
</xsl:template>
<xsl:template match="keycode">