Added dingbat.font.family

diff --git a/xsl/fo/fo.xsl b/xsl/fo/fo.xsl
index 9caa42958a1905eb316f9bb5b99b60b2a8227f08..76078b53794950ef8c6414b0a93720f48bd3be59 100644 (file)
--- 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 ffb1521bc47730ab5a7e0b896a0ef376de8d2935..38d0f2944ef0f48fe2ae1fd49704fc4b26cf0fb9 100644 (file)
--- 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>