Fix up preserve so it works for pdf output. Document fix in status.xml. Fix part of FOR-329
git-svn-id: https://svn.apache.org/repos/asf/forrest/trunk@1823953 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/helper-commonElements.xsl b/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/helper-commonElements.xsl
index be2d73d..42c6469 100644
--- a/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/helper-commonElements.xsl
+++ b/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/helper-commonElements.xsl
@@ -104,14 +104,24 @@
<xsl:template match="p">
<xsl:choose>
<xsl:when test="ancestor::li and not(preceding-sibling::*)">
- <fo:block space-after="4pt">
+ <fo:block space-after="4pt"
+ white-space-collapse="false"
+ linefeed-treatment="preserve"
+ white-space-treatment="preserve"
+ wrap-option="wrap"
+ text-align="start">
<xsl:copy-of select="@id"/>
<xsl:call-template name="insertPageBreaks"/>
<xsl:apply-templates/>
</fo:block>
</xsl:when>
<xsl:otherwise>
- <fo:block space-before="4pt" space-after="4pt">
+ <fo:block space-before="4pt" space-after="4pt"
+ white-space-collapse="false"
+ linefeed-treatment="preserve"
+ white-space-treatment="preserve"
+ wrap-option="wrap"
+ text-align="start">
<xsl:copy-of select="@id"/>
<xsl:call-template name="insertPageBreaks"/>
<xsl:apply-templates/>
diff --git a/plugins/org.apache.forrest.plugin.output.pdf/status.xml b/plugins/org.apache.forrest.plugin.output.pdf/status.xml
index e25590f..1388e3d 100644
--- a/plugins/org.apache.forrest.plugin.output.pdf/status.xml
+++ b/plugins/org.apache.forrest.plugin.output.pdf/status.xml
@@ -24,6 +24,7 @@
<person name="Ferdinand Soethe" email="ferdinand@apache.org" id="FSO"/>
<person name="David Crossley" email="crossley@apache.org" id="DC" />
<person name="Jeremias Märki" email="jeremias@apache.org" id="JM"/>
+ <person name="Gavin McDonald" email="gmcdonald@apache.org" id="GM"/>
<person name="Volunteer needed" email="dev@forrest.apache.org" id="open"/>
</developers>
<!-- Define here the Title of the Context you want to display in the Changes pages.
@@ -57,6 +58,9 @@
<action type="update" context="code" dev="DC" importance="high">
Upgraded Apache FOP to version 1.0 and XML Graphics Commons to 1.5
</action>
+ <action type="fix" context="code" dev="GM" fixes-bug="FOR-329" importance="low">
+ Added code to correct xml:space=preserve not working at all in pdf documents.
+ </action>
</release>
<release version="0.3" date="2011-02-07">
<action type="update" context="code" dev="JM" importance="high">
