From 12dc705ee6b2e85f93e784b2c0a8b49f3ed67147 Mon Sep 17 00:00:00 2001
From: uid48421 <uid48421>
Date: Wed, 4 Jul 2001 19:34:58 +0000
Subject: [PATCH] Added dingbat.font.family

---
 xsl/fo/fo.xsl    | 39 ++++++++++++++++++++++++++-------------
 xsl/fo/param.xsl | 12 ++++++++++++
 2 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/xsl/fo/fo.xsl b/xsl/fo/fo.xsl
index 9caa42958..76078b537 100644
--- a/xsl/fo/fo.xsl
+++ b/xsl/fo/fo.xsl
@@ -15,20 +15,33 @@
 
 <xsl:template name="dingbat">
   <xsl:param name="dingbat">bullet</xsl:param>
+  <xsl:variable name="symbol">
+    <xsl:choose>
+      <xsl:when test="$dingbat='bullet'">o</xsl:when>
+      <xsl:when test="$dingbat='copyright'">&#x00A9;</xsl:when>
+      <xsl:when test="$dingbat='trademark'">&#x2122;</xsl:when>
+      <xsl:when test="$dingbat='trade'">&#x2122;</xsl:when>
+      <xsl:when test="$dingbat='registered'">&#x00AE;</xsl:when>
+      <xsl:when test="$dingbat='service'">(SM)</xsl:when>
+      <xsl:when test="$dingbat='ldquo'">"</xsl:when>
+      <xsl:when test="$dingbat='rdquo'">"</xsl:when>
+      <xsl:when test="$dingbat='lsquo'">'</xsl:when>
+      <xsl:when test="$dingbat='rsquo'">'</xsl:when>
+      <xsl:when test="$dingbat='em-dash'">--</xsl:when>
+      <xsl:when test="$dingbat='en-dash'">-</xsl:when>
+      <xsl:otherwise>o</xsl:otherwise>
+    </xsl:choose>
+  </xsl:variable>
+
   <xsl:choose>
-    <xsl:when test="$dingbat='bullet'">o</xsl:when>
-    <xsl:when test="$dingbat='copyright'">&#x00A9;</xsl:when>
-    <xsl:when test="$dingbat='trademark'">&#x2122;</xsl:when>
-    <xsl:when test="$dingbat='trade'">&#x2122;</xsl:when>
-    <xsl:when test="$dingbat='registered'">&#x00AE;</xsl:when>
-    <xsl:when test="$dingbat='service'">(SM)</xsl:when>
-    <xsl:when test="$dingbat='ldquo'">"</xsl:when>
-    <xsl:when test="$dingbat='rdquo'">"</xsl:when>
-    <xsl:when test="$dingbat='lsquo'">'</xsl:when>
-    <xsl:when test="$dingbat='rsquo'">'</xsl:when>
-    <xsl:when test="$dingbat='em-dash'">--</xsl:when>
-    <xsl:when test="$dingbat='en-dash'">-</xsl:when>
-    <xsl:otherwise>o</xsl:otherwise>
+    <xsl:when test="$dingbat.font.family = ''">
+      <xsl:copy-of select="$symbol"/>
+    </xsl:when>
+    <xsl:otherwise>
+      <fo:inline font-family="{$dingbat.font.family}">
+        <xsl:copy-of select="$symbol"/>
+      </fo:inline>
+    </xsl:otherwise>
   </xsl:choose>
 </xsl:template>
 
diff --git a/xsl/fo/param.xsl b/xsl/fo/param.xsl
index ffb1521bc..38d0f2944 100644
--- a/xsl/fo/param.xsl
+++ b/xsl/fo/param.xsl
@@ -948,6 +948,18 @@ actually used by the stylesheets.
 </refdescription>
 </doc:param>
 
+<!-- ==================================================================== -->
+<xsl:param name="dingbat.font.family">Times Roman</xsl:param>
+
+<doc:param name="dingbat.font.family" xmlns="">
+<refpurpose>The font family for copyright, quotes, and other symbols</refpurpose>
+<refdescription>
+<para>The dingbat font family is used for dingbats. If it is defined
+as the empty string, no font change is effected around dingbats.
+</para>
+</refdescription>
+</doc:param>
+
 <!-- ==================================================================== -->
 <xsl:param name="body.font.master">10</xsl:param>
 
-- 
2.40.0