Author: sjur
Date: Wed Sep 3 05:42:30 2008
New Revision: 691590
URL: http://svn.apache.org/viewvc?rev=691590&view=rev
Log:
Basic font-family selection according to the new properties do now work for
simple documents, which means that at least some pdf files are generated using
dispatcher.
More contracts must be checked and updated before we can conclude that PDF
generation in dispatcher is working properly again.
Modified:
forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-main.ft
Modified:
forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-main.ft
URL:
http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-main.ft?rev=691590&r1=691589&r2=691590&view=diff
==============================================================================
---
forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-main.ft
(original)
+++
forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-main.ft
Wed Sep 3 05:42:30 2008
@@ -81,12 +81,60 @@
select="$config/show-external-urls"/>
<!-- Section depth at which we stop numbering and just indent -->
<xsl:param name="numbering-max-depth" select="'3'"/>
- <!-- Font-family variables defined here: -->
- <xsl:variable name="sans-serif" select="'sans-serif'" />
- <xsl:variable name="serif" select="'serif'" />
- <xsl:variable name="monospace" select="'monospace'" />
- <xsl:param name="imagesdir" select="$defaultVariables/*/[EMAIL
PROTECTED]'resources.images']/@value"/>
+ <!-- Font-family parameters defined here: -->
+ <xsl:param name="serif" select="$defaultVariables/*/[EMAIL
PROTECTED]'output.pdf.fontFamily.serif']/@value" />
+ <xsl:param name="sans-serif" select="$defaultVariables/*/[EMAIL
PROTECTED]'output.pdf.fontFamily.sansSerif']/@value" />
+ <xsl:param name="monospace" select="$defaultVariables/*/[EMAIL
PROTECTED]'output.pdf.fontFamily.monospace']/@value" />
+ <xsl:param name="imagesdir" select="$defaultVariables/*/[EMAIL
PROTECTED]'resources.images']/@value"/>
<xsl:param name="xmlbasedir" select="$defaultVariables/*/[EMAIL
PROTECTED]'content.xdocs']/@value"/>
+ <xsl:param name="sectionTitleFontFamily">
+ <xsl:choose>
+ <xsl:when test="$defaultVariables/*/[EMAIL
PROTECTED]'output.pdf.fontFamily.sectionTitleFontFamily']">
+ <xsl:value-of select="$defaultVariables/*/[EMAIL
PROTECTED]'output.pdf.fontFamily.sectionTitleFontFamily']/@value"/>
+ </xsl:when>
+ <xsl:otherwise><xsl:value-of select="$sans-serif"/></xsl:otherwise>
+ </xsl:choose>
+ </xsl:param>
+ <xsl:param name="sourceFontFamily">
+ <xsl:choose>
+ <xsl:when test="$defaultVariables/*/[EMAIL
PROTECTED]'output.pdf.fontFamily.sourceFontFamily']">
+ <xsl:value-of select="$defaultVariables/*/[EMAIL
PROTECTED]'output.pdf.fontFamily.sourceFontFamily']/@value"/>
+ </xsl:when>
+ <xsl:otherwise><xsl:value-of select="$monospace"/></xsl:otherwise>
+ </xsl:choose>
+ </xsl:param>
+ <xsl:param name="codeFontFamily">
+ <xsl:choose>
+ <xsl:when test="$defaultVariables/*/[EMAIL
PROTECTED]'output.pdf.fontFamily.codeFontFamily']">
+ <xsl:value-of select="$defaultVariables/*/[EMAIL
PROTECTED]'output.pdf.fontFamily.codeFontFamily']/@value"/>
+ </xsl:when>
+ <xsl:otherwise><xsl:value-of select="$monospace"/></xsl:otherwise>
+ </xsl:choose>
+ </xsl:param>
+ <xsl:param name="warningTitleFontFamily">
+ <xsl:choose>
+ <xsl:when test="$defaultVariables/*/[EMAIL
PROTECTED]'output.pdf.fontFamily.warningTitleFontFamily']">
+ <xsl:value-of select="$defaultVariables/*/[EMAIL
PROTECTED]'output.pdf.fontFamily.warningTitleFontFamily']/@value"/>
+ </xsl:when>
+ <xsl:otherwise><xsl:value-of select="$sans-serif"/></xsl:otherwise>
+ </xsl:choose>
+ </xsl:param>
+ <xsl:param name="noteTitleFontFamily">
+ <xsl:choose>
+ <xsl:when test="$defaultVariables/*/[EMAIL
PROTECTED]'output.pdf.fontFamily.noteTitleFontFamily']">
+ <xsl:value-of select="$defaultVariables/*/[EMAIL
PROTECTED]'output.pdf.fontFamily.noteTitleFontFamily']/@value"/>
+ </xsl:when>
+ <xsl:otherwise><xsl:value-of select="$sans-serif"/></xsl:otherwise>
+ </xsl:choose>
+ </xsl:param>
+ <xsl:param name="fixmeTitleFontFamily">
+ <xsl:choose>
+ <xsl:when test="$defaultVariables/*/[EMAIL
PROTECTED]'output.pdf.fontFamily.fixmeTitleFontFamily']">
+ <xsl:value-of select="$defaultVariables/*/[EMAIL
PROTECTED]'output.pdf.fontFamily.fixmeTitleFontFamily']/@value"/>
+ </xsl:when>
+ <xsl:otherwise><xsl:value-of select="$sans-serif"/></xsl:otherwise>
+ </xsl:choose>
+ </xsl:param>
<xsl:variable name="background-color"
select="$config/page/@background-color"/>
<xsl:variable name="heading-color" select="$config/headings/@color"/>
