From bdefd9034927564f9aefdab5732873ab05d92695 Mon Sep 17 00:00:00 2001
From: Bob Stayton <bobs@sagehill.net>
Date: Thu, 3 Feb 2005 07:51:16 +0000
Subject: [PATCH] Moved footnote properties to attribute-sets.
---
xsl/fo/footnote.xsl | 9 ++-------
xsl/fo/param.ent | 2 ++
xsl/fo/param.xweb | 4 ++++
xsl/fo/xref.xsl | 8 ++------
4 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/xsl/fo/footnote.xsl b/xsl/fo/footnote.xsl
index eff7ccea7..3b6aa7b37 100644
--- a/xsl/fo/footnote.xsl
+++ b/xsl/fo/footnote.xsl
@@ -17,7 +17,7 @@
<xsl:template name="format.footnote.mark">
<xsl:param name="mark" select="'?'"/>
- <fo:inline xsl:use-attribute-sets="superscript.properties">
+ <fo:inline xsl:use-attribute-sets="footnote.mark.properties">
<xsl:choose>
<xsl:when test="$fop.extensions != 0">
<xsl:attribute name="vertical-align">super</xsl:attribute>
@@ -48,12 +48,7 @@
</xsl:with-param>
</xsl:call-template>
</fo:inline>
- <fo:footnote-body font-family="{$body.fontset}"
- font-size="{$footnote.font.size}"
- font-weight="normal"
- font-style="normal"
- text-align="{$alignment}"
- start-indent="0pt">
+ <fo:footnote-body xsl:use-attribute-sets="footnote.properties">
<xsl:apply-templates/>
</fo:footnote-body>
</fo:footnote>
diff --git a/xsl/fo/param.ent b/xsl/fo/param.ent
index 06e7d4acc..0e68b5f27 100644
--- a/xsl/fo/param.ent
+++ b/xsl/fo/param.ent
@@ -51,6 +51,8 @@
<!ENTITY footer.column.widths SYSTEM "../params/footer.column.widths.xml">
<!ENTITY footers.on.blank.pages SYSTEM "../params/footers.on.blank.pages.xml">
<!ENTITY footnote.font.size SYSTEM "../params/footnote.font.size.xml">
+<!ENTITY footnote.properties SYSTEM "../params/footnote.properties.xml">
+<!ENTITY footnote.mark.properties SYSTEM "../params/footnote.mark.properties.xml">
<!ENTITY footnote.sep.leader.properties SYSTEM "../params/footnote.sep.leader.properties.xml">
<!ENTITY fop.extensions SYSTEM "../params/fop.extensions.xml">
<!ENTITY formal.object.properties SYSTEM "../params/formal.object.properties.xml">
diff --git a/xsl/fo/param.xweb b/xsl/fo/param.xweb
index 827b505d5..e619c9ba9 100644
--- a/xsl/fo/param.xweb
+++ b/xsl/fo/param.xweb
@@ -245,6 +245,8 @@ generate.section.toc.level;
&table.footnote.number.format;
&footnote.number.symbols;
&table.footnote.number.symbols;
+&footnote.properties;
+&footnote.mark.properties;
&footnote.sep.leader.properties;
&xref.with.number.and.title;
&superscript.properties;
@@ -591,6 +593,8 @@ around all these parameters.</para>
<src:fragref linkend="footnote.font.size.frag"/>
<src:fragref linkend="footnote.number.format.frag"/>
<src:fragref linkend="footnote.number.symbols.frag"/>
+<src:fragref linkend="footnote.mark.properties.frag"/>
+<src:fragref linkend="footnote.properties.frag"/>
<src:fragref linkend="footnote.sep.leader.properties.frag"/>
<src:fragref linkend="fop.extensions.frag"/>
<src:fragref linkend="formal.object.properties.frag"/>
diff --git a/xsl/fo/xref.xsl b/xsl/fo/xref.xsl
index 538788b61..8f29f9cd1 100644
--- a/xsl/fo/xref.xsl
+++ b/xsl/fo/xref.xsl
@@ -708,11 +708,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.fontset}"
- start-indent="0pt"
- font-size="{$footnote.font.size}"
- font-weight="normal"
- font-style="normal">
+ <fo:footnote-body xsl:use-attribute-sets="footnote.properties">
<fo:block>
<xsl:call-template name="ulink.footnote.number"/>
<xsl:text> </xsl:text>
@@ -737,7 +733,7 @@
</xsl:template>
<xsl:template name="ulink.footnote.number">
- <fo:inline xsl:use-attribute-sets="superscript.properties">
+ <fo:inline xsl:use-attribute-sets="footnote.mark.properties">
<xsl:choose>
<xsl:when test="$fop.extensions != 0">
<xsl:attribute name="vertical-align">super</xsl:attribute>
--
2.40.0