From: Thomas Schraitle <tom_schr@web.de>
Date: Thu, 5 Jul 2012 14:49:59 +0000 (+0000)
Subject: Added support for @function attribute in keycap (uses keycap context
X-Git-Tag: release/1.79.1~6^2~377
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=00412a30f561dd5b4175ec203037fd3f7b2d0294;p=docbook-dsssl

Added support for @function attribute in keycap (uses keycap context
from language files) => fixes RFE#3540451
If @function is set and keycap is empty, then template will use the
content from the keycap context, otherwise it will use just the given
text
---

diff --git a/xsl/fo/inline.xsl b/xsl/fo/inline.xsl
index db25ebb1e..290226b3b 100644
--- a/xsl/fo/inline.xsl
+++ b/xsl/fo/inline.xsl
@@ -532,7 +532,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">
diff --git a/xsl/html/inline.xsl b/xsl/html/inline.xsl
index 7453fa207..312dc83e4 100644
--- a/xsl/html/inline.xsl
+++ b/xsl/html/inline.xsl
@@ -607,7 +607,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">