Use dingbat.fontset rather than dingbat.font.family so it falls

back to symbol font if glyph not found, like other font properties.

diff --git a/xsl/fo/fo.xsl b/xsl/fo/fo.xsl
index 3c50529721ac127587074469e24cd8b763d752d2..63b1522861c3d2f8573bd8ea8d7e2c4ab3d6e40f 100644 (file)
--- a/xsl/fo/fo.xsl
+++ b/xsl/fo/fo.xsl
@@ -93,11 +93,11 @@
   </xsl:variable>
 
   <xsl:choose>
-    <xsl:when test="$dingbat.font.family = ''">
+    <xsl:when test="$dingbat.fontset = ''">
       <xsl:copy-of select="$symbol"/>
     </xsl:when>
     <xsl:otherwise>
-      <fo:inline font-family="{$dingbat.font.family}">
+      <fo:inline font-family="{$dingbat.fontset}">
         <xsl:copy-of select="$symbol"/>
       </fo:inline>
     </xsl:otherwise>

diff --git a/xsl/fo/pagesetup.xsl b/xsl/fo/pagesetup.xsl
index e32929b5fe226248ed4bbeb5f0f8c329e8fef058..36a7abb91998101a3badd642524aefc4d7a1b502 100644 (file)
--- a/xsl/fo/pagesetup.xsl
+++ b/xsl/fo/pagesetup.xsl
@@ -19,14 +19,21 @@
   <xsl:value-of select="$body.font.family"/>
   <xsl:if test="$body.font.family != ''
                 and $symbol.font.family  != ''">,</xsl:if>
-    <xsl:value-of select="$symbol.font.family"/>
+  <xsl:value-of select="$symbol.font.family"/>
 </xsl:param>
 
 <xsl:param name="title.fontset">
   <xsl:value-of select="$title.font.family"/>
   <xsl:if test="$title.font.family != ''
                 and $symbol.font.family  != ''">,</xsl:if>
-    <xsl:value-of select="$symbol.font.family"/>
+  <xsl:value-of select="$symbol.font.family"/>
+</xsl:param>
+
+<xsl:param name="dingbat.fontset">
+  <xsl:value-of select="$dingbat.font.family"/>
+  <xsl:if test="$dingbat.font.family != ''
+                and $symbol.font.family  != ''">,</xsl:if>
+  <xsl:value-of select="$symbol.font.family"/>
 </xsl:param>
 
 <!-- These are internal parameters are for the individual precedence attributes -->