From: Bob Stayton <bobs@sagehill.net>
Date: Thu, 31 Jan 2013 18:24:47 +0000 (+0000)
Subject: Use dingbat.fontset rather than dingbat.font.family so it falls
X-Git-Tag: release/1.79.1~6^2~235
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f3e078352c26e7d7f3fe45a81895bfba1592f296;p=docbook-dsssl

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 3c5052972..63b152286 100644
--- 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 e32929b5f..36a7abb91 100644
--- 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 -->