Author: thorsten
Date: Mon Feb 18 09:47:26 2008
New Revision: 628833
URL: http://svn.apache.org/viewvc?rev=628833&view=rev
Log:
Fixing fo issues with images. Problem was the variable imagesdir, which had the
value of the current node.
Modified:
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/fo/strip-dispatcher-remains.xsl
forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-main.ft
Modified:
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/fo/strip-dispatcher-remains.xsl
URL:
http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/fo/strip-dispatcher-remains.xsl?rev=628833&r1=628832&r2=628833&view=diff
==============================================================================
---
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/fo/strip-dispatcher-remains.xsl
(original)
+++
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/fo/strip-dispatcher-remains.xsl
Mon Feb 18 09:47:26 2008
@@ -38,10 +38,10 @@
<fo:flow flow-name="xsl-region-body">
<xsl:copy-of select="/fo/xsl-region-body/title/*"/>
<!-- FIXME : left was {$text-align} -->
- <fo:block text-align="left" padding-before="18pt"
padding-after="18pt">
+ <!--<fo:block text-align="left" padding-before="18pt"
padding-after="18pt">-->
<xsl:copy-of select="/fo/xsl-region-body/body/*"/>
- </fo:block>
- <fo:block id="term" />
+ <!--</fo:block>
+ <fo:block id="term" />-->
</fo:flow>
</fo:page-sequence>
</fo:root>
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=628833&r1=628832&r2=628833&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
Mon Feb 18 09:47:26 2008
@@ -80,8 +80,8 @@
select="$config/show-external-urls"/>
<!-- Section depth at which we stop numbering and just indent -->
<xsl:param name="numbering-max-depth" select="'3'"/>
- <xsl:param name="imagesdir" select="."/>
- <xsl:param name="xmlbasedir"/>
+ <xsl:param name="imagesdir" select="$defaultVariables/*/[EMAIL
PROTECTED]'resources.images']/@value"/>
+ <xsl:param name="xmlbasedir" select="$defaultVariables/*/[EMAIL
PROTECTED]'content.xdocs']/@value"/>
<xsl:variable name="background-color"
select="$config/page/@background-color"/>
<xsl:variable name="heading-color" select="$config/headings/@color"/>
@@ -93,7 +93,7 @@
<forrest:part xpath="/fo/xsl-region-body/body">
<fo:block text-align="{$text-align}" padding-before="18pt"
padding-after="18pt">
- <xsl:apply-templates select="/document/body"/>
+ <xsl:apply-templates select="//body/*"/>
</fo:block>
</forrest:part>
</forrest:content>
