Changed body.font.family to body.fontset and

title.font.family to title.fontset in font-family property
attributes, in order to append symbol.font.family parameter value.

diff --git a/xsl/fo/callout.xsl b/xsl/fo/callout.xsl
index fa1cb61827179dacddedd495ec5e4a49385d3125..17627120fd1c5ce6ee0f57535ad6a85145e15506 100644 (file)
--- a/xsl/fo/callout.xsl
+++ b/xsl/fo/callout.xsl
@@ -191,7 +191,7 @@
                        padding-start="0.2em"
                        padding-end="0.2em"
                        baseline-shift="0.1em"
-                       font-family="{$body.font.family}"
+                       font-family="{$body.fontset}"
                        font-weight="bold"
                        font-size="75%">
               <xsl:value-of select="$conum"/>
@@ -221,7 +221,7 @@
                  padding-start="0.2em"
                  padding-end="0.2em"
                  baseline-shift="0.1em"
-                 font-family="{$body.font.family}"
+                 font-family="{$body.fontset}"
                  font-weight="bold"
                  font-size="75%">
         <xsl:value-of select="$conum"/>

diff --git a/xsl/fo/footnote.xsl b/xsl/fo/footnote.xsl
index 79acef46d03b5ec98fba720a874d439cba5315fd..1e8e4f55b385876fa21096ba07e5ad570ab7c376 100644 (file)
--- a/xsl/fo/footnote.xsl
+++ b/xsl/fo/footnote.xsl
@@ -48,7 +48,7 @@
             </xsl:with-param>
           </xsl:call-template>
         </fo:inline>
-        <fo:footnote-body font-family="{$body.font.family}"
+        <fo:footnote-body font-family="{$body.fontset}"
                           font-size="{$footnote.font.size}"
                           font-weight="normal"
                           font-style="normal"

diff --git a/xsl/fo/formal.xsl b/xsl/fo/formal.xsl
index 112bee7b2f2f977c4b266c36d81514bb5728ae28..cc53e0a5198982110759e4cabefc448cda2f4c1e 100644 (file)
--- a/xsl/fo/formal.xsl
+++ b/xsl/fo/formal.xsl
@@ -529,7 +529,7 @@
 
   <xsl:variable name="footnotes">
     <xsl:if test="tgroup//footnote">
-      <fo:block font-family="{$body.font.family}"
+      <fo:block font-family="{$body.fontset}"
                 font-size="{$footnote.font.size}"
                 keep-with-previous="always">
         <xsl:apply-templates select="tgroup//footnote" mode="table.footnote.mode"/>
@@ -661,7 +661,7 @@
 
   <xsl:variable name="footnotes">
     <xsl:if test="tgroup//footnote">
-      <fo:block font-family="{$body.font.family}"
+      <fo:block font-family="{$body.fontset}"
                 font-size="{$footnote.font.size}"
                 keep-with-previous="always">
         <xsl:apply-templates select="tgroup//footnote" mode="table.footnote.mode"/>

diff --git a/xsl/fo/index.xsl b/xsl/fo/index.xsl
index 3bd5865ae64e5f96c90288827b832633d046056b..d57e674104014cade82e684d6e121e68806a7d4d 100644 (file)
--- a/xsl/fo/index.xsl
+++ b/xsl/fo/index.xsl
@@ -224,7 +224,7 @@
 
   <fo:block margin-left="{$title.margin.left}"
            font-size="14.4pt"
-            font-family="{$title.font.family}"
+            font-family="{$title.fontset}"
             font-weight="bold"
             keep-with-next.within-column="always"
             space-before.optimum="{$body.font.master}pt"

diff --git a/xsl/fo/pagesetup.xsl b/xsl/fo/pagesetup.xsl
index d63f9f6c21740a16ca4878eab48acdec6d10ce23..0992ba46c2aa6db53fdd3236095690862ba40ccf 100644 (file)
--- a/xsl/fo/pagesetup.xsl
+++ b/xsl/fo/pagesetup.xsl
@@ -15,6 +15,20 @@
 
 <!-- ==================================================================== -->
 
+<xsl:param name="body.fontset">
+  <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: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:param>
+
 <xsl:template name="setup.pagemasters">
   <fo:layout-master-set>
     <!-- blank pages -->

diff --git a/xsl/fo/param.ent b/xsl/fo/param.ent
index 10dd83b12b7ff6e9c6e0a52b6409969cd22db0e4..df452a4b51d54465c520346898ff9bd909d9f5d1 100644 (file)
--- a/xsl/fo/param.ent
+++ b/xsl/fo/param.ent
@@ -134,6 +134,7 @@
 <!ENTITY shade.verbatim SYSTEM "../params/shade.verbatim.xml">
 <!ENTITY shade.verbatim.style SYSTEM "../params/shade.verbatim.style.xml">
 <!ENTITY show.comments SYSTEM "../params/show.comments.xml">
+<!ENTITY symbol.font.family SYSTEM "../params/symbol.font.family.xml">
 <!ENTITY table.cell.padding SYSTEM "../params/table.cell.padding.xml">
 <!ENTITY tablecolumns.extension SYSTEM "../params/tablecolumns.extension.xml">
 <!ENTITY target.database.document SYSTEM "../params/target.database.document.xml">

diff --git a/xsl/fo/param.xweb b/xsl/fo/param.xweb
index 2b0c3d94a48d297942a5b9dd9768c1106de202e5..a96edb62ecd21ac39206173aad2adf21d3681ec5 100644 (file)
--- a/xsl/fo/param.xweb
+++ b/xsl/fo/param.xweb
@@ -355,6 +355,7 @@ zero by default, so this is simply the page-master region-left.
 &monospace.font.family;
 &sans.font.family;
 &title.font.family;
+&symbol.font.family;
 </reference>
 
 <reference><title>Lists</title>
@@ -645,6 +646,7 @@ around all these parameters.</para>
 <src:fragref linkend="shade.verbatim.style.frag"/>
 <src:fragref linkend="show.comments.frag"/>
 <src:fragref linkend="sidebar.properties.frag"/>
+<src:fragref linkend="symbol.font.family.frag"/>
 <src:fragref linkend="table.cell.border.color.frag"/>
 <src:fragref linkend="table.cell.border.style.frag"/>
 <src:fragref linkend="table.cell.border.thickness.frag"/>

diff --git a/xsl/fo/titlepage.templates.xml b/xsl/fo/titlepage.templates.xml
index 3523f6dcc02f2238cfafbb41349b469367cbc809..195a55bd3e3216f66cf9cddcdb5b192e2767bf2f 100644 (file)
--- a/xsl/fo/titlepage.templates.xml
+++ b/xsl/fo/titlepage.templates.xml
@@ -30,7 +30,7 @@
 <!-- ==================================================================== -->
 
 <t:titlepage t:element="article" t:wrapper="fo:block"
-             font-family="{$title.font.family}">
+             font-family="{$title.fontset}">
 
   <t:titlepage-content t:side="recto"
              text-align="center">
@@ -56,7 +56,7 @@
     <legalnotice text-align="start"
                  margin-left="0.5in"
                  margin-right="0.5in"
-                 font-family="{$body.font.family}"/>
+                 font-family="{$body.fontset}"/>
     <pubdate space-before="0.5em"/>
     <revision space-before="0.5em"/>
     <revhistory space-before="0.5em"/>
@@ -64,7 +64,7 @@
              text-align="start"
              margin-left="0.5in"
               margin-right="0.5in"
-              font-family="{$body.font.family}"/>
+              font-family="{$body.fontset}"/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -91,9 +91,9 @@
             font-size="&hsize5;"
             space-before="&hsize5space;"
             font-weight="bold"
-            font-family="{$title.font.family}"/>
+            font-family="{$title.fontset}"/>
     <subtitle
-             font-family="{$title.font.family}"
+             font-family="{$title.fontset}"
              text-align="center"/>
     <corpauthor/>
     <authorgroup/>
@@ -132,12 +132,12 @@
             font-size="&hsize5;"
             space-before="&hsize5space;"
             font-weight="bold"
-            font-family="{$title.font.family}"/>
+            font-family="{$title.fontset}"/>
       <subtitle
                text-align="center"
                font-size="&hsize4;"
                space-before="&hsize4space;"
-               font-family="{$title.font.family}"/>
+               font-family="{$title.fontset}"/>
       <corpauthor font-size="&hsize3;"
                  keep-with-next="always"
                  space-before="2in"/>
@@ -152,7 +152,7 @@
             t:named-template="book.verso.title"
             font-size="&hsize2;"
             font-weight="bold"
-            font-family="{$title.font.family}"/>
+            font-family="{$title.fontset}"/>
       <corpauthor/>
       <authorgroup t:named-template="verso.authorgroup"/>
       <author/>
@@ -186,14 +186,14 @@
             font-size="&hsize5;"
             space-before="&hsize5space;"
             font-weight="bold"
-            font-family="{$title.font.family}"/>
+            font-family="{$title.fontset}"/>
     <subtitle
              text-align="center"
              font-size="&hsize4;"
              space-before="&hsize4space;"
              font-weight='bold'
              font-style='italic'
-             font-family="{$title.font.family}"/>
+             font-family="{$title.fontset}"/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -216,13 +216,13 @@
           font-size="&hsize5;"
           font-weight="bold"
           space-before="1em"
-          font-family="{$title.font.family}"/>
+          font-family="{$title.fontset}"/>
     <subtitle
              text-align="center"
              font-size="&hsize2;"
              font-weight="bold"
              font-style="italic"
-             font-family="{$title.font.family}"/>
+             font-family="{$title.fontset}"/>
     <corpauthor/>
     <authorgroup/>
     <author/>
@@ -260,9 +260,9 @@
             font-size="&hsize5;"
             space-before="&hsize5space;"
             font-weight="bold"
-            font-family="{$title.font.family}"/>
+            font-family="{$title.fontset}"/>
     <subtitle
-             font-family="{$title.font.family}"
+             font-family="{$title.fontset}"
              text-align="center"/>
     <corpauthor/>
     <authorgroup/>
@@ -295,7 +295,7 @@
 <t:titlepage t:element="refsynopsisdiv" t:wrapper="fo:block">
   <t:titlepage-content t:side="recto">
     <title
-          font-family="{$title.font.family}"/>
+          font-family="{$title.fontset}"/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -316,7 +316,7 @@
 <t:titlepage t:element="refsection" t:wrapper="fo:block">
   <t:titlepage-content t:side="recto">
     <title
-          font-family="{$title.font.family}"/>
+          font-family="{$title.fontset}"/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -337,7 +337,7 @@
 <t:titlepage t:element="refsect1" t:wrapper="fo:block">
   <t:titlepage-content t:side="recto">
     <title
-          font-family="{$title.font.family}"/>
+          font-family="{$title.fontset}"/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -358,7 +358,7 @@
 <t:titlepage t:element="refsect2" t:wrapper="fo:block">
   <t:titlepage-content t:side="recto">
     <title
-          font-family="{$title.font.family}"/>
+          font-family="{$title.fontset}"/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -379,7 +379,7 @@
 <t:titlepage t:element="refsect3" t:wrapper="fo:block">
   <t:titlepage-content t:side="recto">
     <title
-          font-family="{$title.font.family}"/>
+          font-family="{$title.fontset}"/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -405,10 +405,10 @@
             param:node="ancestor-or-self::dedication[1]"
             margin-left="{$title.margin.left}"
             font-size="&hsize5;"
-            font-family="{$title.font.family}"
+            font-family="{$title.fontset}"
             font-weight="bold"/>
       <subtitle
-               font-family="{$title.font.family}"/>
+               font-family="{$title.fontset}"/>
     </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -434,10 +434,10 @@
             param:node="ancestor-or-self::preface[1]"
             margin-left="{$title.margin.left}"
             font-size="&hsize5;"
-            font-family="{$title.font.family}"
+            font-family="{$title.fontset}"
             font-weight="bold"/>
       <subtitle
-               font-family="{$title.font.family}"/>
+               font-family="{$title.fontset}"/>
       <corpauthor/>
       <authorgroup/>
       <author/>
@@ -467,7 +467,7 @@
 <!-- ==================================================================== -->
 
   <t:titlepage t:element="chapter" t:wrapper="fo:block"
-               font-family="{$title.font.family}">
+               font-family="{$title.fontset}">
     <t:titlepage-content t:side="recto" margin-left="{$title.margin.left}">
       <title t:named-template="component.title"
             param:node="ancestor-or-self::chapter[1]"
@@ -524,9 +524,9 @@
             margin-left="{$title.margin.left}"
             font-size="&hsize5;"
             font-weight="bold"
-            font-family="{$title.font.family}"/>
+            font-family="{$title.fontset}"/>
       <subtitle
-               font-family="{$title.font.family}"/>
+               font-family="{$title.fontset}"/>
       <corpauthor/>
       <authorgroup/>
       <author/>
@@ -559,9 +559,9 @@
   <t:titlepage-content t:side="recto">
     <title
           margin-left="{$title.margin.left}"
-          font-family="{$title.font.family}"/>
+          font-family="{$title.fontset}"/>
     <subtitle
-             font-family="{$title.font.family}"/>
+             font-family="{$title.fontset}"/>
     <corpauthor/>
     <authorgroup/>
     <author/>
@@ -592,9 +592,9 @@
   <t:titlepage-content t:side="recto">
     <title
           margin-left="{$title.margin.left}"
-          font-family="{$title.font.family}"/>
+          font-family="{$title.fontset}"/>
     <subtitle
-             font-family="{$title.font.family}"/>
+             font-family="{$title.fontset}"/>
     <corpauthor/>
     <authorgroup/>
     <author/>
@@ -625,9 +625,9 @@
   <t:titlepage-content t:side="recto">
     <title
           margin-left="{$title.margin.left}"
-          font-family="{$title.font.family}"/>
+          font-family="{$title.fontset}"/>
     <subtitle
-             font-family="{$title.font.family}"/>
+             font-family="{$title.fontset}"/>
     <corpauthor/>
     <authorgroup/>
     <author/>
@@ -658,9 +658,9 @@
   <t:titlepage-content t:side="recto">
     <title
           margin-left="{$title.margin.left}"
-          font-family="{$title.font.family}"/>
+          font-family="{$title.fontset}"/>
     <subtitle
-             font-family="{$title.font.family}"/>
+             font-family="{$title.fontset}"/>
     <corpauthor/>
     <authorgroup/>
     <author/>
@@ -691,9 +691,9 @@
   <t:titlepage-content t:side="recto">
     <title
           margin-left="{$title.margin.left}"
-          font-family="{$title.font.family}"/>
+          font-family="{$title.fontset}"/>
     <subtitle
-             font-family="{$title.font.family}"/>
+             font-family="{$title.fontset}"/>
     <corpauthor/>
     <authorgroup/>
     <author/>
@@ -724,9 +724,9 @@
   <t:titlepage-content t:side="recto">
     <title
           margin-left="{$title.margin.left}"
-          font-family="{$title.font.family}"/>
+          font-family="{$title.fontset}"/>
     <subtitle
-             font-family="{$title.font.family}"/>
+             font-family="{$title.fontset}"/>
     <corpauthor/>
     <authorgroup/>
     <author/>
@@ -757,9 +757,9 @@
   <t:titlepage-content t:side="recto">
     <title
           margin-left="{$title.margin.left}"
-          font-family="{$title.font.family}"/>
+          font-family="{$title.fontset}"/>
     <subtitle
-             font-family="{$title.font.family}"/>
+             font-family="{$title.fontset}"/>
     <corpauthor/>
     <authorgroup/>
     <author/>
@@ -796,10 +796,10 @@
             param:node="ancestor-or-self::bibliography[1]"
             margin-left="{$title.margin.left}"
             font-size="&hsize5;"
-            font-family="{$title.font.family}"
+            font-family="{$title.fontset}"
             font-weight="bold"/>
       <subtitle
-               font-family="{$title.font.family}"/>
+               font-family="{$title.fontset}"/>
     </t:titlepage-content>
 
     <t:titlepage-content t:side="verso">
@@ -823,10 +823,10 @@
             param:node="ancestor-or-self::bibliodiv[1]"
             margin-left="{$title.margin.left}"
             font-size="&hsize4;"
-            font-family="{$title.font.family}"
+            font-family="{$title.fontset}"
             font-weight="bold"/>
       <subtitle
-               font-family="{$title.font.family}"/>
+               font-family="{$title.fontset}"/>
     </t:titlepage-content>
 
     <t:titlepage-content t:side="verso">
@@ -852,10 +852,10 @@
             param:node="ancestor-or-self::glossary[1]"
             margin-left="{$title.margin.left}"
             font-size="&hsize5;"
-            font-family="{$title.font.family}"
+            font-family="{$title.fontset}"
             font-weight="bold"/>
       <subtitle
-               font-family="{$title.font.family}"/>
+               font-family="{$title.fontset}"/>
     </t:titlepage-content>
 
     <t:titlepage-content t:side="verso">
@@ -879,10 +879,10 @@
             param:node="ancestor-or-self::glossdiv[1]"
             margin-left="{$title.margin.left}"
             font-size="&hsize4;"
-            font-family="{$title.font.family}"
+            font-family="{$title.fontset}"
             font-weight="bold"/>
       <subtitle
-               font-family="{$title.font.family}"/>
+               font-family="{$title.fontset}"/>
     </t:titlepage-content>
 
     <t:titlepage-content t:side="verso">
@@ -909,10 +909,10 @@
              param:pagewide="1"
             margin-left="{$title.margin.left}"
             font-size="&hsize5;"
-            font-family="{$title.font.family}"
+            font-family="{$title.fontset}"
             font-weight="bold"/>
       <subtitle
-               font-family="{$title.font.family}"/>
+               font-family="{$title.fontset}"/>
     </t:titlepage-content>
 
     <t:titlepage-content t:side="verso">
@@ -940,7 +940,7 @@
             t:named-template="indexdiv.title"
             param:title="title"/>
       <subtitle
-               font-family="{$title.font.family}"/>
+               font-family="{$title.fontset}"/>
     </t:titlepage-content>
 
     <t:titlepage-content t:side="verso">
@@ -967,10 +967,10 @@
              param:pagewide="1"
             margin-left="{$title.margin.left}"
             font-size="&hsize5;"
-            font-family="{$title.font.family}"
+            font-family="{$title.fontset}"
             font-weight="bold"/>
       <subtitle
-               font-family="{$title.font.family}"/>
+               font-family="{$title.fontset}"/>
     </t:titlepage-content>
 
     <t:titlepage-content t:side="verso">
@@ -996,10 +996,10 @@
             param:node="ancestor-or-self::colophon[1]"
             margin-left="{$title.margin.left}"
             font-size="&hsize5;"
-            font-family="{$title.font.family}"
+            font-family="{$title.fontset}"
             font-weight="bold"/>
       <subtitle
-               font-family="{$title.font.family}"/>
+               font-family="{$title.fontset}"/>
     </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -1030,7 +1030,7 @@
             margin-left="{$title.margin.left}"
             font-size="&hsize3;"
             font-weight="bold"
-            font-family="{$title.font.family}"/>
+            font-family="{$title.fontset}"/>
     </t:titlepage-content>
 
     <t:titlepage-content t:side="verso">
@@ -1059,7 +1059,7 @@
             margin-left="{$title.margin.left}"
             font-size="&hsize3;"
             font-weight="bold"
-            font-family="{$title.font.family}"/>
+            font-family="{$title.fontset}"/>
     </t:titlepage-content>
 
     <t:titlepage-content t:side="verso">
@@ -1088,7 +1088,7 @@
             margin-left="{$title.margin.left}"
             font-size="&hsize3;"
             font-weight="bold"
-            font-family="{$title.font.family}"/>
+            font-family="{$title.fontset}"/>
     </t:titlepage-content>
 
     <t:titlepage-content t:side="verso">
@@ -1117,7 +1117,7 @@
             margin-left="{$title.margin.left}"
             font-size="&hsize3;"
             font-weight="bold"
-            font-family="{$title.font.family}"/>
+            font-family="{$title.fontset}"/>
     </t:titlepage-content>
 
     <t:titlepage-content t:side="verso">
@@ -1146,7 +1146,7 @@
             margin-left="{$title.margin.left}"
             font-size="&hsize3;"
             font-weight="bold"
-            font-family="{$title.font.family}"/>
+            font-family="{$title.fontset}"/>
     </t:titlepage-content>
 
     <t:titlepage-content t:side="verso">
@@ -1175,7 +1175,7 @@
             margin-left="{$title.margin.left}"
             font-size="&hsize3;"
             font-weight="bold"
-            font-family="{$title.font.family}"/>
+            font-family="{$title.fontset}"/>
     </t:titlepage-content>
 
     <t:titlepage-content t:side="verso">
@@ -1204,7 +1204,7 @@
             margin-left="{$title.margin.left}"
             font-size="&hsize3;"
             font-weight="bold"
-            font-family="{$title.font.family}"/>
+            font-family="{$title.fontset}"/>
     </t:titlepage-content>
 
     <t:titlepage-content t:side="verso">

diff --git a/xsl/fo/titlepage.xsl b/xsl/fo/titlepage.xsl
index f0b7cb0806c4a34861be7819140b0885efa18baa..0ab82d5fe29d5d3a62c011d4b34d44d3b3c03e56 100644 (file)
--- a/xsl/fo/titlepage.xsl
+++ b/xsl/fo/titlepage.xsl
@@ -17,7 +17,7 @@
 
 <xsl:attribute-set name="book.titlepage.recto.style">
   <xsl:attribute name="font-family">
-    <xsl:value-of select="$title.font.family"/>
+    <xsl:value-of select="$title.fontset"/>
   </xsl:attribute>
   <xsl:attribute name="font-weight">bold</xsl:attribute>
   <xsl:attribute name="font-size">12pt</xsl:attribute>

diff --git a/xsl/fo/xref.xsl b/xsl/fo/xref.xsl
index fd5d1073491e8a394f5c9018f0f7a422c76e75cb..6fbaf920363c7a75ae403ed6fa11e551c51fccdb 100644 (file)
--- a/xsl/fo/xref.xsl
+++ b/xsl/fo/xref.xsl
@@ -661,7 +661,7 @@
       <xsl:when test="$ulink.footnotes != 0 and not(ancestor::footnote)">
         <fo:footnote>
           <xsl:call-template name="ulink.footnote.number"/>
-          <fo:footnote-body font-family="{$body.font.family}"
+          <fo:footnote-body font-family="{$body.fontset}"
                             font-size="{$footnote.font.size}">
             <fo:block>
               <xsl:call-template name="ulink.footnote.number"/>

diff --git a/xsl/params/root.properties.xml b/xsl/params/root.properties.xml
index 1460df31efff183713f9ff9f5cb98aa54496369c..545cbf5d7836bd0c118bdb4e85923eb3c7671069 100644 (file)
--- a/xsl/params/root.properties.xml
+++ b/xsl/params/root.properties.xml
@@ -12,7 +12,7 @@
 <src:fragment id='root.properties.frag'>
 <xsl:attribute-set name="root.properties">
   <xsl:attribute name="font-family">
-    <xsl:value-of select="$body.font.family"/>
+    <xsl:value-of select="$body.fontset"/>
   </xsl:attribute>
   <xsl:attribute name="font-size">
     <xsl:value-of select="$body.font.size"/>