You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by vh...@apache.org on 2008/03/18 16:01:53 UTC
svn commit: r638396 - in /xmlgraphics/fop/trunk: ./ lib/
src/documentation/content/xdocs/0.95/ src/documentation/content/xdocs/dev/
src/documentation/content/xdocs/trunk/ src/java-1.3/ src/java-1.4/
src/java/org/apache/fop/apps/ src/java/org/apache/fop...
Author: vhennebert
Date: Tue Mar 18 08:01:43 2008
New Revision: 638396
URL: http://svn.apache.org/viewvc?rev=638396&view=rev
Log:
Merged revisions 636400-636405,636407-638388 via svnmerge from
https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/fop-0_95
........
r636403 | vhennebert | 2008-03-12 16:24:48 +0000 (Wed, 12 Mar 2008) | 2 lines
Updated copyright years
........
r637075 | vhennebert | 2008-03-14 12:19:45 +0000 (Fri, 14 Mar 2008) | 4 lines
Bugzilla #44412:
Bugfix: When there was a forced break after a block with (conditional) borders the border-after wasn't painted.
Changes made by Jeremias
........
r637119 | jeremias | 2008-03-14 14:41:03 +0000 (Fri, 14 Mar 2008) | 2 lines
Bugzilla #44412:
Bugfix: The before border of a block is no longer swallowed if its first child issues a break-before.
........
r637791 | jeremias | 2008-03-17 08:59:51 +0000 (Mon, 17 Mar 2008) | 3 lines
Removed old image adapters.
Removed support for Java 1.3 building as it didn't work anymore anyway.
Added a check to require Java 1.4 for building.
........
r637857 | jeremias | 2008-03-17 12:24:33 +0000 (Mon, 17 Mar 2008) | 3 lines
Partially reverted revision 637791:
Restored JAI as a required dependency for distribution builds (used for error diffusion dithering in the PCL Renderer). It is optional otherwise.
Updated the licensing info and release notes to make the changes clear.
........
r637993 | vhennebert | 2008-03-17 17:48:44 +0000 (Mon, 17 Mar 2008) | 3 lines
Bugzilla #44621: when the after border of a cell, in the trailing case, is bigger than in the normal case, the generated sequence of Knuth elements was wrong, leading to content being swallowed
This is a partial fix only: the content is no longer swallowed, but the penalty is wrong (shorter than it should be). This will lead to the table overflowing the region-body without warning.
........
r638048 | vhennebert | 2008-03-17 20:00:36 +0000 (Mon, 17 Mar 2008) | 2 lines
Changed the documentation to reflect the move to Java 1.4 as a minimum requirement
........
r638308 | vhennebert | 2008-03-18 10:26:32 +0000 (Tue, 18 Mar 2008) | 2 lines
Simplified the getNextKnuthElements method a little bit
........
r638316 | vhennebert | 2008-03-18 11:06:59 +0000 (Tue, 18 Mar 2008) | 2 lines
Removed the 'jdk1.4' suffix appended to the binary artifacts. There's no point in making the distinction anymore since there is only one binary now
........
r638317 | vhennebert | 2008-03-18 11:08:29 +0000 (Tue, 18 Mar 2008) | 2 lines
Updated the probable date of the release
........
Added:
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/GraphicsConfiguration.java
- copied unchanged from r638317, xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/svg/GraphicsConfiguration.java
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block-level_break-after_bug44412.xml
- copied unchanged from r638317, xmlgraphics/fop/branches/fop-0_95/test/layoutengine/standard-testcases/block-level_break-after_bug44412.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_break-before_bug44412.xml
- copied unchanged from r638317, xmlgraphics/fop/branches/fop-0_95/test/layoutengine/standard-testcases/block_break-before_bug44412.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table_bug44621.xml
- copied unchanged from r638317, xmlgraphics/fop/branches/fop-0_95/test/layoutengine/standard-testcases/table_bug44621.xml
Removed:
xmlgraphics/fop/trunk/src/java-1.3/
xmlgraphics/fop/trunk/src/java-1.4/
xmlgraphics/fop/trunk/src/java/org/apache/fop/image/AbstractFopImage.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/image/BmpImage.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/image/EPSImage.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/image/EmfImage.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/image/FopImage.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/image/FopImageConsumer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/image/GifImage.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/image/ImageCache.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/image/ImageFactory.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/image/ImageLoader.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/image/JAIImage.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/image/JimiImage.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/image/JpegImage.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/image/PNGImage.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/image/RegisterableImageProvider.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/image/TIFFImage.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/image/XMLImage.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/image/XmlGraphicsCommonsImage.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/image/analyser/
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSImageUtils.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/SVGConverter.java
Modified:
xmlgraphics/fop/trunk/ (props changed)
xmlgraphics/fop/trunk/build.properties
xmlgraphics/fop/trunk/build.xml
xmlgraphics/fop/trunk/lib/README.txt
xmlgraphics/fop/trunk/src/documentation/content/xdocs/0.95/compiling.xml
xmlgraphics/fop/trunk/src/documentation/content/xdocs/0.95/fonts.xml
xmlgraphics/fop/trunk/src/documentation/content/xdocs/0.95/pdfencryption.xml
xmlgraphics/fop/trunk/src/documentation/content/xdocs/0.95/running.xml
xmlgraphics/fop/trunk/src/documentation/content/xdocs/dev/release.xml
xmlgraphics/fop/trunk/src/documentation/content/xdocs/trunk/compiling.xml
xmlgraphics/fop/trunk/src/documentation/content/xdocs/trunk/fonts.xml
xmlgraphics/fop/trunk/src/documentation/content/xdocs/trunk/pdfencryption.xml
xmlgraphics/fop/trunk/src/documentation/content/xdocs/trunk/running.xml
xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactory.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOPropertyMapping.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOTreeBuilder.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/image/package.html
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/LayoutContext.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/ActiveCell.java
xmlgraphics/fop/trunk/status.xml
xmlgraphics/fop/trunk/test/java/org/apache/fop/URIResolutionTestCase.java
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table_row-delay_fixed-row-height.xml
Propchange: xmlgraphics/fop/trunk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Mar 18 08:01:43 2008
@@ -1 +1 @@
-/xmlgraphics/fop/branches/fop-0_95:1-636399 /xmlgraphics/fop/trunk:1-611115
+/xmlgraphics/fop/branches/fop-0_95:1-636405,636407-638388 /xmlgraphics/fop/trunk:1-611115
Modified: xmlgraphics/fop/trunk/build.properties
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/build.properties?rev=638396&r1=638395&r2=638396&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/build.properties (original)
+++ xmlgraphics/fop/trunk/build.properties Tue Mar 18 08:01:43 2008
@@ -24,8 +24,8 @@
# javac.debug = on
# javac.optimize = off
# javac.deprecation = on
-# javac.source = 1.3
-# javac.target = 1.3
+# javac.source = 1.4
+# javac.target = 1.4
# javac.fork = on
## JUnit task switches
Modified: xmlgraphics/fop/trunk/build.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/build.xml?rev=638396&r1=638395&r2=638396&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/build.xml (original)
+++ xmlgraphics/fop/trunk/build.xml Tue Mar 18 08:01:43 2008
@@ -131,10 +131,6 @@
</fileset>
</path>
- <patternset id="exclude-jimi">
- <exclude name="org/apache/fop/image/JimiImage.java" unless="jimi.present"/>
- </patternset>
-
<patternset id="exclude-jai">
<exclude name="org/apache/fop/image/JAIImage.java" unless="jai.present"/>
<exclude name="org/apache/fop/render/pcl/JAIMonochromeBitmapConverter.java" unless="jai.present"/>
@@ -148,7 +144,7 @@
<property name="name" value="fop"/>
<property name="NAME" value="FOP"/>
<property name="version" value="svn-trunk"/>
- <property name="year" value="1999-2007"/>
+ <property name="year" value="1999-2008"/>
<property name="javac.debug" value="on"/>
<property name="javac.optimize" value="off"/>
@@ -214,7 +210,7 @@
<!-- =================================================================== -->
<!-- Initialization target -->
<!-- =================================================================== -->
- <target name="init" depends="init-avail, init-filters-jdk14, init-filters-jdk13">
+ <target name="init" depends="init-avail">
</target>
<target name="init-avail">
@@ -224,18 +220,6 @@
<echo message="VM: ${java.vm.version}, ${java.vm.vendor}"/>
<echo message="JAVA_HOME: ${env.JAVA_HOME}"/>
- <available property="jimi.present" classname="com.sun.jimi.core.Jimi"
- classpathref="libs-build-classpath"/>
- <condition property="jimi.message" value="Jimi Support PRESENT">
- <equals arg1="${jimi.present}" arg2="true"/>
- </condition>
- <condition property="jimi.message" value="Jimi Support NOT Present">
- <not>
- <equals arg1="${jimi.present}" arg2="true"/>
- </not>
- </condition>
- <echo message="${jimi.message}"/>
-
<available property="jai.present" classname="javax.media.jai.JAI"
classpathref="libs-build-classpath"/>
<condition property="jai.message" value="JAI Support PRESENT">
@@ -261,7 +245,8 @@
<echo message="${jce.message}"/>
<available property="jdk14.present" classname="java.lang.CharSequence"/>
-
+ <fail message="${Name} requires at least Java 1.4!" unless="jdk14.present"/>
+
<available property="junit.present" classname="junit.framework.TestCase"
classpathref="libs-build-classpath"/>
<condition property="junit.message" value="JUnit Support PRESENT">
@@ -292,22 +277,6 @@
</target>
- <target name="init-filters-jdk13" depends="init-avail" unless="jdk14.present">
- <echo message="Use GraphicsConfiguration adapter for JDK 1.3 or earlier."/>
- <path id="graphics-configuration-adapter">
- <pathelement location="src/java-1.3"/>
- </path>
- <property name="src.java.version.dir" value="${basedir}/src/java-1.3"/>
- </target>
-
- <target name="init-filters-jdk14" depends="init-avail" if="jdk14.present">
- <echo message="Use GraphicsConfiguration adapter for JDK 1.4."/>
- <path id="graphics-configuration-adapter">
- <pathelement location="src/java-1.4"/>
- </path>
- <property name="src.java.version.dir" value="${basedir}/src/java-1.4"/>
- </target>
-
<!-- =================================================================== -->
<!-- Help on usage -->
<!-- =================================================================== -->
@@ -401,12 +370,9 @@
source="${javac.source}" target="${javac.target}">
<src path="${build.gensrc.dir}"/>
<src path="${src.java.dir}"/>
- <src refid="graphics-configuration-adapter"/>
<patternset includes="**/*.java"/>
- <!--patternset includes="org/apache/fop/svg/GraphicsConfiguration.java"/-->
<patternset refid="exclude-jce-dependencies"/>
<patternset refid="exclude-jai"/>
- <patternset refid="exclude-jimi"/>
<classpath refid="libs-build-classpath"/>
</javac>
<copy todir="${build.classes.dir}">
@@ -543,7 +509,6 @@
<uptodate property="jar.sources.uptodate" targetfile="${build.dir}/fop-sources.jar">
<srcfiles dir="${build.gensrc.dir}"/>
<srcfiles dir="${src.java.dir}"/>
- <srcfiles refid="graphics-configuration-adapter"/>
</uptodate>
</target>
@@ -1032,7 +997,6 @@
<pathelement path="${src.java.dir}"/>
<pathelement path="${src.sandbox.dir}"/>
<pathelement path="${build.gensrc.dir}"/>
- <path refid="graphics-configuration-adapter"/>
</sourcepath>
<tag name="todo" scope="all" description="To do:"/>
<group title="Control and Startup">
@@ -1206,37 +1170,24 @@
-->
<echo message="Make sure you have a proper Forrest installation (see http://forrest.apache.org/)"/>
- <!--<antcall target="site"/>-->
-
- <!-- You can provide a JDK 1.4 for a JDK 1.3 build by adding "javahome.jdk14" to build-local.properties -->
- <condition property="javahome.jdk14.override" value="${javahome.jdk14}">
- <isset property="javahome.jdk14"/>
- </condition>
- <echo message="java home: ${javahome.jdk14.override}"/>
- <condition property="javahome.jdk14.override" value="${env.JAVA_HOME}">
- <not>
- <isset property="javahome.jdk14.override"/>
- </not>
- </condition>
- <echo message="java home: ${javahome.jdk14.override}"/>
<condition property="forrest.call" value="forrest.bat" else="forrest">
<os family="windows"/>
</condition>
- <exec executable="${forrest.call}">
- <env key="JAVA_HOME" value="${javahome.jdk14.override}"/>
- </exec>
+ <exec executable="${forrest.call}"/>
</target>
<!-- =================================================================== -->
<!-- Creates the distribution -->
<!-- =================================================================== -->
- <target name="dist" depends="dist-src,dist-bin" description="Generates the distribution package"/>
+ <target name="dist" depends="dist-prereq,dist-src,dist-bin" description="Generates the distribution package"/>
- <target name="dist-bin" depends="all,javadocs,docs">
- <echo message="Building the binary distribution files (zip,tar)"/>
- <fail message="A complete binary build requires Jimi" unless="jimi.present"/>
+ <target name="dist-prereq" depends="init">
<fail message="A complete binary build requires JAI" unless="jai.present"/>
<fail message="A complete binary build requires JCE" unless="jce.present"/>
+ </target>
+
+ <target name="dist-bin" depends="all,javadocs,docs">
+ <echo message="Building the binary distribution files (zip,tar)"/>
<mkdir dir="${dist.bin.result.dir}"/>
<copy todir="${dist.bin.result.dir}">
<fileset refid="dist.bin"/>
@@ -1252,10 +1203,9 @@
<copy todir="${dist.bin.result.dir}/build" file="build/fop.jar"/>
<chmod file="${dist.bin.result.dir}/fop" perm="ugo+rx"/>
- <property name="bin.suffix" value="bin-jdk${java.specification.version}"/>
- <zip zipfile="${name}-${version}-${bin.suffix}.zip" basedir="${dist.bin.dir}" includes="**"/>
+ <zip zipfile="${name}-${version}-bin.zip" basedir="${dist.bin.dir}" includes="**"/>
<tar longfile="gnu"
- destfile="${name}-${version}-${bin.suffix}.tar">
+ destfile="${name}-${version}-bin.tar">
<tarfileset dir="${dist.bin.dir}" mode="755">
<include name="${name}-${version}/fop"/>
</tarfileset>
@@ -1264,8 +1214,8 @@
<exclude name="${name}-${version}/fop"/>
</tarfileset>
</tar>
- <gzip zipfile="${name}-${version}-${bin.suffix}.tar.gz" src="${name}-${version}-${bin.suffix}.tar"/>
- <delete file="${name}-${version}-${bin.suffix}.tar"/>
+ <gzip zipfile="${name}-${version}-bin.tar.gz" src="${name}-${version}-bin.tar"/>
+ <delete file="${name}-${version}-bin.tar"/>
</target>
<target name="dist-src" depends="all">
Modified: xmlgraphics/fop/trunk/lib/README.txt
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/lib/README.txt?rev=638396&r1=638395&r2=638396&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/lib/README.txt (original)
+++ xmlgraphics/fop/trunk/lib/README.txt Tue Mar 18 08:01:43 2008
@@ -142,8 +142,16 @@
https://jai-imageio.dev.java.net/
BSD license
- Note: Not the whole JAI is needed, only the ImageIO-compatible codecs
- packaged as "Image I/O Tools". The name may be misleading.
+ Note: This is not the same as JAI! Only the ImageIO-compatible codecs
+ are packaged as "Image I/O Tools". The name may be misleading.
+
+ - JAI (Java Advanced Imaging API)
+
+ http://java.sun.com/products/java-media/jai
+ Java Research License and Java Distribution License (Check which one applies to you!)
+
+ Currently used for:
+ - Grayscale error diffusion dithering in the PCL Renderer
- JEuclid (MathML implementation, for the MathML extension)
Modified: xmlgraphics/fop/trunk/src/documentation/content/xdocs/0.95/compiling.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/documentation/content/xdocs/0.95/compiling.xml?rev=638396&r1=638395&r2=638396&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/documentation/content/xdocs/0.95/compiling.xml (original)
+++ xmlgraphics/fop/trunk/src/documentation/content/xdocs/0.95/compiling.xml Tue Mar 18 08:01:43 2008
@@ -41,7 +41,7 @@
<section id="env-jdk">
<title>JDK</title>
<p>
- Building FOP requires a minimum Java Development Kit (JDK/SDK) of 1.3
+ Building FOP requires a minimum Java Development Kit (JDK/SDK) of 1.4
(A Java Runtime Environment is not sufficient).
</p>
</section>
@@ -59,7 +59,7 @@
<p>
The build script uses <a href="ext:ant">Apache Ant</a>, a popular
Java-based build tool, which usually requires that the environment variable JAVA_HOME point to
- your local JDK root directory. This is true even if you use JDK 1.3 or above, which normally
+ your local JDK root directory. This is true even if you use JDK 1.4 or above, which normally
does not need this setting.
</p>
</section>
Modified: xmlgraphics/fop/trunk/src/documentation/content/xdocs/0.95/fonts.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/documentation/content/xdocs/0.95/fonts.xml?rev=638396&r1=638395&r2=638396&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/documentation/content/xdocs/0.95/fonts.xml (original)
+++ xmlgraphics/fop/trunk/src/documentation/content/xdocs/0.95/fonts.xml Tue Mar 18 08:01:43 2008
@@ -231,19 +231,11 @@
<title>Type 1 Font Metrics</title>
<p>FOP includes PFMReader, which reads the PFM file that normally comes with a Type 1 font, and generates an appropriate font metrics file for it.
To use it, run the class org.apache.fop.fonts.apps.PFMReader:</p>
- <p>Windows (on JDK 1.4 and later):</p>
+ <p>Windows:</p>
<source>java -cp build\fop.jar;lib\avalon-framework.jar;lib\commons-logging.jar;lib\commons-io.jar
org.apache.fop.fonts.apps.PFMReader [options] pfm-file xml-file</source>
- <p>Windows (on JDK 1.3.x):</p>
- <source>java -cp build\fop.jar;lib\avalon-framework.jar;lib\commons-logging.jar;lib\commons-io.jar;lib\xml-apis.jar;
- lib\xercesImpl.jar;lib\xalan.jar;lib\serializer.jar
- org.apache.fop.fonts.apps.PFMReader [options] pfm-file xml-file</source>
- <p>Unix (on JDK 1.4 and later):</p>
+ <p>Unix:</p>
<source>java -cp build/fop.jar:lib/avalon-framework.jar:lib/commons-logging.jar:lib/commons-io.jar
- org.apache.fop.fonts.apps.PFMReader [options] pfm-file xml-file</source>
- <p>Unix (on JDK 1.3.1):</p>
- <source>java -cp build/fop.jar:lib/avalon-framework.jar:lib/commons-logging.jar:lib/commons-io.jar:lib/xml-apis.jar:
- lib/xercesImpl.jar:lib/xalan.jar:lib/serializer.jar
org.apache.fop.fonts.apps.PFMReader [options] pfm-file xml-file</source>
<p>PFMReader [options]:</p>
<ul>
Modified: xmlgraphics/fop/trunk/src/documentation/content/xdocs/0.95/pdfencryption.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/documentation/content/xdocs/0.95/pdfencryption.xml?rev=638396&r1=638395&r2=638396&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/documentation/content/xdocs/0.95/pdfencryption.xml (original)
+++ xmlgraphics/fop/trunk/src/documentation/content/xdocs/0.95/pdfencryption.xml Tue Mar 18 08:01:43 2008
@@ -204,15 +204,10 @@
</p>
<ol>
<li>
- Download the binary distribution for your JDK version. If you have JDK
- 1.3 or earlier you must also download a JCE from the same page.
- </li>
- <li>
Unpack the distribution. Add the jar file to your classpath. A
convenient way to use the jar on Linux is to simply drop it into the
FOP lib directory, it will be automatically picked up by
- <code>fop.sh</code>. If you have JDK 1.3 or earlier don't forget to
- install the JCE as well.
+ <code>fop.sh</code>.
</li>
<li>
Open the <code>java.security</code> file and add<br/>
Modified: xmlgraphics/fop/trunk/src/documentation/content/xdocs/0.95/running.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/documentation/content/xdocs/0.95/running.xml?rev=638396&r1=638395&r2=638396&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/documentation/content/xdocs/0.95/running.xml (original)
+++ xmlgraphics/fop/trunk/src/documentation/content/xdocs/0.95/running.xml Tue Mar 18 08:01:43 2008
@@ -305,7 +305,7 @@
<ul>
<li>
Increase memory available to the JVM. See
- <a href="http://java.sun.com/j2se/1.3/docs/tooldocs/solaris/java.html">the -Xmx option</a>
+ <a href="http://java.sun.com/j2se/1.4/docs/tooldocs/solaris/java.html">the -Xmx option</a>
for more information.
<warning>
It is usually unwise to increase the memory allocated to the JVM beyond the amount of
Modified: xmlgraphics/fop/trunk/src/documentation/content/xdocs/dev/release.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/documentation/content/xdocs/dev/release.xml?rev=638396&r1=638395&r2=638396&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/documentation/content/xdocs/dev/release.xml (original)
+++ xmlgraphics/fop/trunk/src/documentation/content/xdocs/dev/release.xml Tue Mar 18 08:01:43 2008
@@ -73,7 +73,7 @@
<code>fop-hyph.jar</code> to lib/ (e.g. from
<code>http://sourceforge.net/projects/offo</code></li>
<li>Alternatively, create a build-local.properties file that points to the above libs.</li>
- <li>Run build[.sh] dist. Do this once using Sun JDK 1.3.1_15 or later and once with Sun JDK 1.4.2_08 or later. A Forrest installation is needed.</li>
+ <li>Run build[.sh] dist. Do this using Sun JDK 1.4.2_08 or later. A Forrest installation is needed.</li>
<li>Create signatures. Don't forget to upload your KEY:
<code>gpg -a -b --force-v3-sigs fop-0.94-src.tar.gz</code> etc.</li>
<li>Upload the dist and signature files to your web directory
Modified: xmlgraphics/fop/trunk/src/documentation/content/xdocs/trunk/compiling.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/documentation/content/xdocs/trunk/compiling.xml?rev=638396&r1=638395&r2=638396&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/documentation/content/xdocs/trunk/compiling.xml (original)
+++ xmlgraphics/fop/trunk/src/documentation/content/xdocs/trunk/compiling.xml Tue Mar 18 08:01:43 2008
@@ -41,7 +41,7 @@
<section id="env-jdk">
<title>JDK</title>
<p>
- Building FOP requires a minimum Java Development Kit (JDK/SDK) of 1.3
+ Building FOP requires a minimum Java Development Kit (JDK/SDK) of 1.4
(A Java Runtime Environment is not sufficient).
</p>
</section>
@@ -59,7 +59,7 @@
<p>
The build script uses <a href="ext:ant">Apache Ant</a>, a popular
Java-based build tool, which usually requires that the environment variable JAVA_HOME point to
- your local JDK root directory. This is true even if you use JDK 1.3 or above, which normally
+ your local JDK root directory. This is true even if you use JDK 1.4 or above, which normally
does not need this setting.
</p>
</section>
Modified: xmlgraphics/fop/trunk/src/documentation/content/xdocs/trunk/fonts.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/documentation/content/xdocs/trunk/fonts.xml?rev=638396&r1=638395&r2=638396&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/documentation/content/xdocs/trunk/fonts.xml (original)
+++ xmlgraphics/fop/trunk/src/documentation/content/xdocs/trunk/fonts.xml Tue Mar 18 08:01:43 2008
@@ -231,19 +231,11 @@
<title>Type 1 Font Metrics</title>
<p>FOP includes PFMReader, which reads the PFM file that normally comes with a Type 1 font, and generates an appropriate font metrics file for it.
To use it, run the class org.apache.fop.fonts.apps.PFMReader:</p>
- <p>Windows (on JDK 1.4 and later):</p>
+ <p>Windows:</p>
<source>java -cp build\fop.jar;lib\avalon-framework.jar;lib\commons-logging.jar;lib\commons-io.jar
org.apache.fop.fonts.apps.PFMReader [options] pfm-file xml-file</source>
- <p>Windows (on JDK 1.3.x):</p>
- <source>java -cp build\fop.jar;lib\avalon-framework.jar;lib\commons-logging.jar;lib\commons-io.jar;lib\xml-apis.jar;
- lib\xercesImpl.jar;lib\xalan.jar;lib\serializer.jar
- org.apache.fop.fonts.apps.PFMReader [options] pfm-file xml-file</source>
- <p>Unix (on JDK 1.4 and later):</p>
+ <p>Unix:</p>
<source>java -cp build/fop.jar:lib/avalon-framework.jar:lib/commons-logging.jar:lib/commons-io.jar
- org.apache.fop.fonts.apps.PFMReader [options] pfm-file xml-file</source>
- <p>Unix (on JDK 1.3.1):</p>
- <source>java -cp build/fop.jar:lib/avalon-framework.jar:lib/commons-logging.jar:lib/commons-io.jar:lib/xml-apis.jar:
- lib/xercesImpl.jar:lib/xalan.jar:lib/serializer.jar
org.apache.fop.fonts.apps.PFMReader [options] pfm-file xml-file</source>
<p>PFMReader [options]:</p>
<ul>
Modified: xmlgraphics/fop/trunk/src/documentation/content/xdocs/trunk/pdfencryption.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/documentation/content/xdocs/trunk/pdfencryption.xml?rev=638396&r1=638395&r2=638396&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/documentation/content/xdocs/trunk/pdfencryption.xml (original)
+++ xmlgraphics/fop/trunk/src/documentation/content/xdocs/trunk/pdfencryption.xml Tue Mar 18 08:01:43 2008
@@ -204,15 +204,13 @@
</p>
<ol>
<li>
- Download the binary distribution for your JDK version. If you have JDK
- 1.3 or earlier you must also download a JCE from the same page.
+ Download the binary distribution for your JDK version.
</li>
<li>
Unpack the distribution. Add the jar file to your classpath. A
convenient way to use the jar on Linux is to simply drop it into the
FOP lib directory, it will be automatically picked up by
- <code>fop.sh</code>. If you have JDK 1.3 or earlier don't forget to
- install the JCE as well.
+ <code>fop.sh</code>.
</li>
<li>
Open the <code>java.security</code> file and add<br/>
Modified: xmlgraphics/fop/trunk/src/documentation/content/xdocs/trunk/running.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/documentation/content/xdocs/trunk/running.xml?rev=638396&r1=638395&r2=638396&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/documentation/content/xdocs/trunk/running.xml (original)
+++ xmlgraphics/fop/trunk/src/documentation/content/xdocs/trunk/running.xml Tue Mar 18 08:01:43 2008
@@ -305,7 +305,7 @@
<ul>
<li>
Increase memory available to the JVM. See
- <a href="http://java.sun.com/j2se/1.3/docs/tooldocs/solaris/java.html">the -Xmx option</a>
+ <a href="http://java.sun.com/j2se/1.4/docs/tooldocs/solaris/java.html">the -Xmx option</a>
for more information.
<warning>
It is usually unwise to increase the memory allocated to the JVM beyond the amount of
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactory.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactory.java?rev=638396&r1=638395&r2=638396&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactory.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactory.java Tue Mar 18 08:01:43 2008
@@ -46,7 +46,6 @@
import org.apache.fop.fo.ElementMappingRegistry;
import org.apache.fop.fonts.FontCache;
import org.apache.fop.hyphenation.HyphenationTreeResolver;
-import org.apache.fop.image.ImageFactory;
import org.apache.fop.layoutmgr.LayoutManagerMaker;
import org.apache.fop.render.RendererFactory;
import org.apache.fop.render.XMLHandlerRegistry;
@@ -82,9 +81,6 @@
private ColorSpaceCache colorSpaceCache = null;
- /** Image factory for creating fop image objects */
- private ImageFactory imageFactory;
-
/** Image manager for loading and caching image objects */
private ImageManager imageManager;
@@ -155,7 +151,6 @@
this.elementMappingRegistry = new ElementMappingRegistry(this);
this.foURIResolver = new FOURIResolver(validateUserConfigStrictly());
this.colorSpaceCache = new ColorSpaceCache(foURIResolver);
- this.imageFactory = new ImageFactory();
this.imageManager = new ImageManager(this);
this.rendererFactory = new RendererFactory();
this.xmlHandlers = new XMLHandlerRegistry();
@@ -288,11 +283,6 @@
/** @return the content handler factory registry */
public ContentHandlerFactoryRegistry getContentHandlerFactoryRegistry() {
return this.contentHandlerFactoryRegistry;
- }
-
- /** @return the image factory */
- public ImageFactory getImageFactory() {
- return this.imageFactory;
}
/**
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOPropertyMapping.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOPropertyMapping.java?rev=638396&r1=638395&r2=638396&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOPropertyMapping.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOPropertyMapping.java Tue Mar 18 08:01:43 2008
@@ -412,6 +412,7 @@
l.setInherited(false);
l.addEnum("auto", getEnumProperty(EN_AUTO, "AUTO"));
l.setDefault("auto");
+ l.setPercentBase(LengthBase.CONTAINING_BLOCK_HEIGHT);
addPropertyMaker("top", l);
// right
@@ -419,6 +420,7 @@
l.setInherited(false);
l.addEnum("auto", getEnumProperty(EN_AUTO, "AUTO"));
l.setDefault("auto");
+ l.setPercentBase(LengthBase.CONTAINING_BLOCK_WIDTH);
addPropertyMaker("right", l);
// bottom
@@ -426,6 +428,7 @@
l.setInherited(false);
l.addEnum("auto", getEnumProperty(EN_AUTO, "AUTO"));
l.setDefault("auto");
+ l.setPercentBase(LengthBase.CONTAINING_BLOCK_HEIGHT);
addPropertyMaker("bottom", l);
// left
@@ -433,6 +436,7 @@
l.setInherited(false);
l.addEnum("auto", getEnumProperty(EN_AUTO, "AUTO"));
l.setDefault("auto");
+ l.setPercentBase(LengthBase.CONTAINING_BLOCK_WIDTH);
addPropertyMaker("left", l);
}
@@ -1161,6 +1165,7 @@
m = new LengthProperty.Maker(PR_START_INDENT);
m.setInherited(true);
m.setDefault("0pt");
+ m.setPercentBase(LengthBase.CONTAINING_REFAREA_WIDTH);
IndentPropertyMaker sCorr = new IndentPropertyMaker(m);
sCorr.setCorresponding(PR_MARGIN_LEFT, PR_MARGIN_RIGHT, PR_MARGIN_TOP);
sCorr.setUseParent(false);
@@ -1177,6 +1182,7 @@
m = new LengthProperty.Maker(PR_END_INDENT);
m.setInherited(true);
m.setDefault("0pt");
+ m.setPercentBase(LengthBase.CONTAINING_REFAREA_WIDTH);
IndentPropertyMaker eCorr = new IndentPropertyMaker(m);
eCorr.setCorresponding(PR_MARGIN_RIGHT, PR_MARGIN_LEFT, PR_MARGIN_BOTTOM);
eCorr.setUseParent(false);
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOTreeBuilder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOTreeBuilder.java?rev=638396&r1=638395&r2=638396&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOTreeBuilder.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOTreeBuilder.java Tue Mar 18 08:01:43 2008
@@ -38,7 +38,6 @@
import org.apache.fop.fo.ElementMapping.Maker;
import org.apache.fop.fo.extensions.ExtensionElementMapping;
import org.apache.fop.fo.pagination.Root;
-import org.apache.fop.image.ImageFactory;
import org.apache.fop.util.ContentHandlerFactory;
import org.apache.fop.util.ContentHandlerFactory.ObjectBuiltListener;
import org.apache.fop.util.ContentHandlerFactory.ObjectSource;
@@ -155,10 +154,6 @@
log.debug("Parsing of document complete");
}
foEventHandler.endDocument();
-
- //Notify the image factory that this user agent has expired.
- ImageFactory imageFactory = userAgent.getFactory().getImageFactory();
- imageFactory.removeContext(this.userAgent);
}
/** {@inheritDoc} */
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/image/package.html
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/image/package.html?rev=638396&r1=638395&r2=638396&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/image/package.html (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/image/package.html Tue Mar 18 08:01:43 2008
@@ -18,6 +18,6 @@
<HTML>
<TITLE>org.apache.fop.image Package</TITLE>
<BODY>
-<P>Contains image loading adapters for various image sources and the image cache.</P>
+<P>Contains image loading adapters for various image sources.</P>
</BODY>
</HTML>
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java?rev=638396&r1=638395&r2=638396&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java Tue Mar 18 08:01:43 2008
@@ -386,6 +386,9 @@
}
addKnuthElementsForBorderPaddingAfter(returnList, true);
addKnuthElementsForSpaceAfter(returnList, alignment);
+
+ //All child content is processed. Only break-after can occur now, so...
+ context.clearPendingMarks();
addKnuthElementsForBreakAfter(returnList, context);
setFinished(true);
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java?rev=638396&r1=638395&r2=638396&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java Tue Mar 18 08:01:43 2008
@@ -294,15 +294,22 @@
if (returnedList != null
&& returnedList.size() == 1
&& ((ListElement) returnedList.getFirst()).isForcedBreak()) {
- // a descendant of this block has break-before
- contentList.addAll(returnedList);
if (curLM.isFinished() && !hasNextChildLM()) {
- forcedBreakAfterLast = (BreakElement)contentList.removeLast();
+ // a descendant of this block has break-before
+ forcedBreakAfterLast = (BreakElement) returnedList.getFirst();
context.clearPendingMarks();
break;
}
+ if (contentList.size() == 0) {
+ // Empty fo:block, zero-length box makes sure the IDs and/or markers
+ // are registered and borders/padding are painted.
+ returnList.add(new KnuthBox(0, notifyPos(new Position(this)), false));
+ }
+ // a descendant of this block has break-before
+ contentList.addAll(returnedList);
+
/* extension: conversione di tutta la sequenza fin'ora ottenuta */
if (bpUnit > 0) {
storedList = contentList;
@@ -393,6 +400,9 @@
addKnuthElementsForBorderPaddingAfter(returnList, true);
addKnuthElementsForSpaceAfter(returnList, alignment);
+
+ //All child content is processed. Only break-after can occur now, so...
+ context.clearPendingMarks();
if (forcedBreakAfterLast == null) {
addKnuthElementsForBreakAfter(returnList, context);
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/LayoutContext.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/LayoutContext.java?rev=638396&r1=638395&r2=638396&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/LayoutContext.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/LayoutContext.java Tue Mar 18 08:01:43 2008
@@ -285,12 +285,8 @@
* Clears all pending marks on the LayoutContext.
*/
public void clearPendingMarks() {
- if (this.pendingBeforeMarks != null) {
- this.pendingBeforeMarks.clear();
- }
- if (this.pendingAfterMarks != null) {
- this.pendingAfterMarks.clear();
- }
+ this.pendingBeforeMarks = null;
+ this.pendingAfterMarks = null;
}
/**
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/ActiveCell.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/ActiveCell.java?rev=638396&r1=638395&r2=638396&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/ActiveCell.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/ActiveCell.java Tue Mar 18 08:01:43 2008
@@ -337,14 +337,22 @@
}
/**
- * Returns the last step for this cell.
+ * Returns the last step for this cell. This includes the normal border- and
+ * padding-before, the whole content, the normal padding-after, and the
+ * <em>trailing</em> after border. Indeed, if the normal border is taken instead,
+ * and appears to be smaller than the trailing one, the last step may be smaller than
+ * the current step (see TableStepper#considerRowLastStep). This will produce a wrong
+ * infinite penalty, plus the cell's content won't be taken into account since the
+ * final step will be smaller than the current one (see {@link #signalNextStep(int)}).
+ * This actually means that the content will be swallowed.
*
- * @return the step including all of the cell's content plus the normal borders and paddings
+ * @return the length of last step
*/
int getLastStep() {
assert nextStep.end == elementList.size() - 1;
assert nextStep.contentLength == totalLength && nextStep.penaltyLength == 0;
- int lastStep = bpBeforeNormal + totalLength + bpAfterNormal;
+ int lastStep = bpBeforeNormal + totalLength + paddingAfterNormal
+ + pgu.getAfterBorderWidth(ConditionalBorder.LEADING_TRAILING);
log.debug(this + ": last step = " + lastStep);
return lastStep;
}
@@ -466,8 +474,12 @@
*/
void endRow(int rowIndex) {
if (endsOnRow(rowIndex)) {
+ // Subtract the old value of bpAfterTrailing...
+ nextStep.totalLength -= bpAfterTrailing;
bpAfterTrailing = paddingAfterNormal
+ pgu.getAfterBorderWidth(ConditionalBorder.LEADING_TRAILING);
+ // ... and add the new one
+ nextStep.totalLength += bpAfterTrailing;
lastCellPart = true;
} else {
bpBeforeLeading = paddingBeforeLeading
Modified: xmlgraphics/fop/trunk/status.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/status.xml?rev=638396&r1=638395&r2=638396&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/status.xml (original)
+++ xmlgraphics/fop/trunk/status.xml Tue Mar 18 08:01:43 2008
@@ -59,7 +59,7 @@
</action>
-->
<!--/release-->
- <release version="0.95beta" date="17 March 2008">
+ <release version="0.95beta" date="22 March 2008">
<notes>
<section>
<title>Notes</title>
@@ -108,14 +108,24 @@
</ul>
</p>
<p>
- The image libraries Jimi and JAI are no longer needed (and used). Instead we rely
- completely on the Image I/O API that has been introduced with Java 1.4. If you still
- need support for bitmap image formats that do not work out-of-the-box, we recommend
- adding <link href="http://jai-imageio.dev.java.net/">JAI Image I/O Tools</link>
- (an Image I/O compatible image codec package) to the classpath.
+ The image libraries Jimi and JAI are no longer needed (and used) for image loading.
+ Instead we rely completely on the Image I/O API that has been introduced with
+ Java 1.4. If you still need support for bitmap image formats that do not work
+ out-of-the-box, we recommend adding
+ <link href="http://jai-imageio.dev.java.net/">JAI Image I/O Tools</link>
+ (an Image I/O compatible image codec package) to the classpath. JAI is still required
+ for building the FOP distribution but it is optional for normal builds and at run-time.
</p>
</section>
</notes>
+ <action context="Layout" dev="JM" type="fix" fixes-bug="44412">
+ Bugfix: The before border of a block is no longer swallowed if its first child issues
+ a break-before.
+ </action>
+ <action context="Layout" dev="JM" type="fix" fixes-bug="44412">
+ Bugfix: When there was a forced break after a block with (conditional) borders the
+ border-after wasn't painted.
+ </action>
<action context="Layout" dev="VH" type="fix">
Bugfix: a forced break inside a cell was ignored when occurring before the minimum height
set on the enclosing row was set.
Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/URIResolutionTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/URIResolutionTestCase.java?rev=638396&r1=638395&r2=638396&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/URIResolutionTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/URIResolutionTestCase.java Tue Mar 18 08:01:43 2008
@@ -36,17 +36,19 @@
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
+import org.w3c.dom.Document;
+
import org.apache.commons.io.IOUtils;
import org.apache.commons.io.output.ByteArrayOutputStream;
+import org.apache.xpath.XPathAPI;
+import org.apache.xpath.objects.XObject;
+
import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.apps.Fop;
import org.apache.fop.apps.FopFactory;
import org.apache.fop.apps.MimeConstants;
import org.apache.fop.render.xml.XMLRenderer;
-import org.apache.xpath.XPathAPI;
-import org.apache.xpath.objects.XObject;
-import org.w3c.dom.Document;
/**
* Tests URI resolution facilities.
@@ -85,9 +87,6 @@
private void innerTestFO1(boolean withStream) throws Exception {
FOUserAgent ua = fopFactory.newFOUserAgent();
- //Reset the image caches to force URI resolution!
- ua.getFactory().getImageFactory().clearCaches();
-
File foFile = new File(getBaseDir(), "test/xml/uri-resolution1.fo");
MyURIResolver resolver = new MyURIResolver(withStream);
Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table_row-delay_fixed-row-height.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table_row-delay_fixed-row-height.xml?rev=638396&r1=638395&r2=638396&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table_row-delay_fixed-row-height.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table_row-delay_fixed-row-height.xml Tue Mar 18 08:01:43 2008
@@ -145,7 +145,7 @@
<element-list category="breaker">
<skip>3</skip>
<box w="17000"/>
- <penalty w="18000" p="0"/>
+ <penalty w="15000" p="0"/>
<box w="16800"/>
<penalty w="1800" p="0"/>
<box w="31200"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org