Author: gmcdonald Date: Mon Feb 12 12:14:36 2018 New Revision: 1823953 URL: http://svn.apache.org/viewvc?rev=1823953&view=rev Log: Fix up preserve so it works for pdf output. Document fix in status.xml. Fix part of FOR-329
Modified: forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/helper-commonElements.xsl forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/status.xml Modified: forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/helper-commonElements.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/helper-commonElements.xsl?rev=1823953&r1=1823952&r2=1823953&view=diff ============================================================================== --- forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/helper-commonElements.xsl (original) +++ forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/helper-commonElements.xsl Mon Feb 12 12:14:36 2018 @@ -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/> Modified: forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/status.xml URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/status.xml?rev=1823953&r1=1823952&r2=1823953&view=diff ============================================================================== --- forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/status.xml (original) +++ forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/status.xml Mon Feb 12 12:14:36 2018 @@ -24,6 +24,7 @@ <person name="Ferdinand Soethe" email="ferdin...@apache.org" id="FSO"/> <person name="David Crossley" email="cross...@apache.org" id="DC" /> <person name="Jeremias Märki" email="jerem...@apache.org" id="JM"/> + <person name="Gavin McDonald" email="gmcdon...@apache.org" id="GM"/> <person name="Volunteer needed" email="d...@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">