Author: sjur
Date: Fri Sep 5 05:58:14 2008
New Revision: 692431
URL: http://svn.apache.org/viewvc?rev=692431&view=rev
Log:
Bringing this contract in line with the skins-based pdf generation by adding
the font-family attribute, and at the same time adding support for
user-specification of the font family.
Modified:
forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/page-footer-numbering.ft
Modified:
forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/page-footer-numbering.ft
URL:
http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/page-footer-numbering.ft?rev=692431&r1=692430&r2=692431&view=diff
==============================================================================
---
forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/page-footer-numbering.ft
(original)
+++
forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/page-footer-numbering.ft
Fri Sep 5 05:58:14 2008
@@ -50,6 +50,42 @@
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:fo="http://www.w3.org/1999/XSL/Format"
version="1.0">
+ <xsl:param name="defaultVariables" select="'test.html'"/>
+ <xsl:param name="sans-serif" select="$defaultVariables/*/[EMAIL
PROTECTED]'output.pdf.fontFamily.sansSerif']/@value" />
+ <xsl:param name="headerFooterFontFamily">
+ <xsl:choose>
+ <xsl:when test="$defaultVariables/*/[EMAIL
PROTECTED]'output.pdf.fontFamily.headerFooterFontFamily']">
+ <xsl:value-of select="$defaultVariables/*/[EMAIL
PROTECTED]'output.pdf.fontFamily.headerFooterFontFamily']/@value"/>
+ </xsl:when>
+ <xsl:otherwise><xsl:value-of select="$sans-serif"/></xsl:otherwise>
+ </xsl:choose>
+ </xsl:param>
+ <xsl:param name="firstFooterFontFamily">
+ <xsl:choose>
+ <xsl:when test="$defaultVariables/*/[EMAIL
PROTECTED]'output.pdf.fontFamily.firstFooterFontFamily']">
+ <xsl:value-of select="$defaultVariables/*/[EMAIL
PROTECTED]'output.pdf.fontFamily.firstFooterFontFamily']/@value"/>
+ </xsl:when>
+ <xsl:otherwise><xsl:value-of
select="$headerFooterFontFamily"/></xsl:otherwise>
+ </xsl:choose>
+ </xsl:param>
+ <xsl:param name="evenFooterFontFamily">
+ <xsl:choose>
+ <xsl:when test="$defaultVariables/*/[EMAIL
PROTECTED]'output.pdf.fontFamily.evenFooterFontFamily']">
+ <xsl:value-of select="$defaultVariables/*/[EMAIL
PROTECTED]'output.pdf.fontFamily.evenFooterFontFamily']/@value"/>
+ </xsl:when>
+ <xsl:otherwise><xsl:value-of
select="$headerFooterFontFamily"/></xsl:otherwise>
+ </xsl:choose>
+ </xsl:param>
+ <xsl:param name="oddFooterFontFamily">
+ <xsl:choose>
+ <xsl:when test="$defaultVariables/*/[EMAIL
PROTECTED]'output.pdf.fontFamily.oddFooterFontFamily']">
+ <xsl:value-of select="$defaultVariables/*/[EMAIL
PROTECTED]'output.pdf.fontFamily.oddFooterFontFamily']/@value"/>
+ </xsl:when>
+ <xsl:otherwise><xsl:value-of
select="$headerFooterFontFamily"/></xsl:otherwise>
+ </xsl:choose>
+ </xsl:param>
+<!-- Double-sided printing toggle -->
+ <xsl:param name="doublesided" select="'true'" />
<xsl:param name="skip-first-page-numbering" select="'true'"/>
<xsl:param name="page-numbering-format" select="'Page 1'"/>
<xsl:include href="lm://pdf.transform.helper.pageNumber" />
@@ -57,7 +93,8 @@
<forrest:content>
<forrest:part xpath="/fo/static-content">
<fo:static-content
- flow-name="first-footer">
+ flow-name="first-footer"
+ font-family="{$firstFooterFontFamily}">
<fo:block
border-top="0.25pt solid"
padding-before="6pt"
@@ -73,7 +110,8 @@
</xsl:if>
</fo:static-content>
<fo:static-content
- flow-name="even-footer">
+ flow-name="even-footer"
+ font-family="{$evenFooterFontFamily}">
<fo:block
border-top="0.25pt solid"
padding-before="6pt"
@@ -85,7 +123,8 @@
</xsl:call-template>
</fo:static-content>
<fo:static-content
- flow-name="odd-footer">
+ flow-name="odd-footer"
+ font-family="{$oddFooterFontFamily}">
<fo:block
border-top="0.25pt solid"
padding-before="6pt"