Use monospace.properties for inline monospaced items

diff --git a/xsl/fo/inline.xsl b/xsl/fo/inline.xsl
index 4434bf0cbd88c606971f04fadc4d27383d0381a3..96392307519e63f5da2bc024e0f5883021cf11a1 100644 (file)
--- a/xsl/fo/inline.xsl
+++ b/xsl/fo/inline.xsl
@@ -88,7 +88,7 @@
   <xsl:param name="content">
     <xsl:apply-templates/>
   </xsl:param>
-  <fo:inline font-family="{$monospace.font.family}">
+  <fo:inline xsl:use-attribute-sets="monospace.properties">
     <xsl:copy-of select="$content"/>
   </fo:inline>
 </xsl:template>
@@ -115,7 +115,7 @@
   <xsl:param name="content">
     <xsl:apply-templates/>
   </xsl:param>
-  <fo:inline font-weight="bold" font-family="{$monospace.font.family}">
+  <fo:inline font-weight="bold" xsl:use-attribute-sets="monospace.properties">
     <xsl:copy-of select="$content"/>
   </fo:inline>
 </xsl:template>
@@ -124,7 +124,7 @@
   <xsl:param name="content">
     <xsl:apply-templates/>
   </xsl:param>
-  <fo:inline font-style="italic" font-family="{$monospace.font.family}">
+  <fo:inline font-style="italic" xsl:use-attribute-sets="monospace.properties">
     <xsl:copy-of select="$content"/>
   </fo:inline>
 </xsl:template>

diff --git a/xsl/fo/param.ent b/xsl/fo/param.ent
index f57850b6640f86231791fcd743eb84668cb0d016..1b0c34ad4737c2fef4b3aa80dd658be7155a3d77 100644 (file)
--- a/xsl/fo/param.ent
+++ b/xsl/fo/param.ent
@@ -168,3 +168,4 @@
 <!ENTITY section.title.level4.properties SYSTEM "../params/section.title.level4.properties.xml">
 <!ENTITY section.title.level5.properties SYSTEM "../params/section.title.level5.properties.xml">
 <!ENTITY section.title.level6.properties SYSTEM "../params/section.title.level6.properties.xml">
+<!ENTITY monospace.properties SYSTEM "../params/monospace.properties.xml">

diff --git a/xsl/fo/param.xweb b/xsl/fo/param.xweb
index 3250891773c1704ad50ba7e94b9682249445e8cd..255615f0da005aa4fc5dfbafb2a56f185ba69994 100644 (file)
--- a/xsl/fo/param.xweb
+++ b/xsl/fo/param.xweb
@@ -341,8 +341,9 @@ zero by default, so this is simply the page-master region-left.
 &formal.object.properties;
 &formal.title.properties;
 &informal.object.properties;
-&monospace.verbatim.properties;
+&monospace.properties;
 &verbatim.properties;
+&monospace.verbatim.properties;
 &sidebar.properties;
 &section.title.properties;
 &section.title.level1.properties;
@@ -487,6 +488,7 @@ around all these parameters.</para>
 <src:fragref linkend="menuchoice.menu.separator.frag"/>
 <src:fragref linkend="menuchoice.separator.frag"/>
 <src:fragref linkend="monospace.font.family.frag"/>
+<src:fragref linkend="monospace.properties.frag"/>
 <src:fragref linkend="monospace.verbatim.properties.frag"/>
 <src:fragref linkend="nominal.table.width.frag"/>
 <src:fragref linkend="normal.para.spacing.frag"/>