Fixed some unparameterized references to specific font families

diff --git a/xsl/fo/callout.xsl b/xsl/fo/callout.xsl
index 05678bb8dd372d2aff00a05262b44f7cf3cf3f7b..ef456ff68e800a3dcbd8ff6ae45480059fc24dc5 100644 (file)
--- a/xsl/fo/callout.xsl
+++ b/xsl/fo/callout.xsl
@@ -138,7 +138,7 @@
                      padding-start="0.2em"
                      padding-end="0.2em"
                      baseline-shift="0.1em"
-                     font-family="Times"
+                     font-family="{$body.font.family}"
                      font-weight="bold"
                      font-size="75%">
             <xsl:value-of select="$conum"/>
@@ -182,7 +182,7 @@
                  padding-start="0.2em"
                  padding-end="0.2em"
                  baseline-shift="0.1em"
-                 font-family="Times"
+                 font-family="{$body.font.family}"
                  font-weight="bold"
                  font-size="75%"><xsl:value-of select="$conum"/></fo:inline>
     </xsl:otherwise>

diff --git a/xsl/fo/inline.xsl b/xsl/fo/inline.xsl
index f37d614aad5e90d0673225a9a6ebbb65df6c9156..3986458d68c2234a24a619fbe401de6011ba878d 100644 (file)
--- a/xsl/fo/inline.xsl
+++ b/xsl/fo/inline.xsl
@@ -24,7 +24,7 @@
   <xsl:param name="content">
     <xsl:apply-templates/>
   </xsl:param>
-  <fo:inline font-family="monospace">
+  <fo:inline font-family="{$monospace.font.family}">
     <xsl:copy-of select="$content"/>
   </fo:inline>
 </xsl:template>
@@ -51,7 +51,7 @@
   <xsl:param name="content">
     <xsl:apply-templates/>
   </xsl:param>
-  <fo:inline font-weight="bold" font-family="monospace">
+  <fo:inline font-weight="bold" font-family="{$monospace.font.family}">
     <xsl:copy-of select="$content"/>
   </fo:inline>
 </xsl:template>
@@ -60,7 +60,7 @@
   <xsl:param name="content">
     <xsl:apply-templates/>
   </xsl:param>
-  <fo:inline font-style="italic" font-family="monospace">
+  <fo:inline font-style="italic" font-family="{$monospace.font.family}">
     <xsl:copy-of select="$content"/>
   </fo:inline>
 </xsl:template>

diff --git a/xsl/fo/synop.xsl b/xsl/fo/synop.xsl
index 4eb9a04bcd0c1edde71d304d68910746151d1c0a..3a0d0310755c9754ed8086df31823646b8a3a742 100644 (file)
--- a/xsl/fo/synop.xsl
+++ b/xsl/fo/synop.xsl
@@ -145,7 +145,7 @@
 </xsl:template>
 
 <xsl:template match="funcprototype">
-  <fo:block font-family="monospace">
+  <fo:block font-family="{$monospace.font.family}">
     <xsl:apply-templates/>
     <xsl:if test="$funcsynopsis.style='kr'">
       <xsl:apply-templates select="./paramdef" mode="kr-funcsynopsis-mode"/>
@@ -154,7 +154,7 @@
 </xsl:template>
 
 <xsl:template match="funcdef">
-  <fo:inline font-family="monospace">
+  <fo:inline font-family="{$monospace.font.family}">
     <xsl:apply-templates/>
   </fo:inline>
 </xsl:template>