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 2009/10/13 18:41:18 UTC
svn commit: r824839 [1/3] - in /xmlgraphics/fop/branches/Temp_Accessibility:
./ lib/ lib/build/ src/codegen/unicode/data/
src/documentation/content/xdocs/trunk/ src/java/META-INF/services/
src/java/org/apache/fop/afp/ src/java/org/apache/fop/afp/goca/ ...
Author: vhennebert
Date: Tue Oct 13 16:41:13 2009
New Revision: 824839
URL: http://svn.apache.org/viewvc?rev=824839&view=rev
Log:
Merged changes from Trunk up to revision 824832
Added:
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/afp/extensions/AFPPageOverlay.java
- copied unchanged from r824832, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/extensions/AFPPageOverlay.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/afp/extensions/AFPPageOverlayElement.java
- copied unchanged from r824832, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/extensions/AFPPageOverlayElement.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/bitmap/AbstractBitmapDocumentHandler.java
- copied unchanged from r824832, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/AbstractBitmapDocumentHandler.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/bitmap/BitmapRendererConfigurator.java
- copied unchanged from r824832, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/BitmapRendererConfigurator.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/bitmap/PNGDocumentHandler.java
- copied unchanged from r824832, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/PNGDocumentHandler.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/bitmap/PNGDocumentHandlerMaker.java
- copied unchanged from r824832, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/PNGDocumentHandlerMaker.java
xmlgraphics/fop/branches/Temp_Accessibility/test/java/org/apache/fop/fonts/DejaVuLGCSerifTest.java
- copied unchanged from r824832, xmlgraphics/fop/trunk/test/java/org/apache/fop/fonts/DejaVuLGCSerifTest.java
xmlgraphics/fop/branches/Temp_Accessibility/test/layoutengine/standard-testcases/list_provisional-distance-between-starts_percentage.xml
- copied unchanged from r824832, xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/list_provisional-distance-between-starts_percentage.xml
xmlgraphics/fop/branches/Temp_Accessibility/test/layoutengine/standard-testcases/list_provisional-label-separation_percentage.xml
- copied unchanged from r824832, xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/list_provisional-label-separation_percentage.xml
Removed:
xmlgraphics/fop/branches/Temp_Accessibility/checkstyle-3.5-fop-head.xml
xmlgraphics/fop/branches/Temp_Accessibility/test/layoutmgr/
Modified:
xmlgraphics/fop/branches/Temp_Accessibility/ (props changed)
xmlgraphics/fop/branches/Temp_Accessibility/build.xml
xmlgraphics/fop/branches/Temp_Accessibility/checkstyle-4.0.xml
xmlgraphics/fop/branches/Temp_Accessibility/checkstyle-5.0.xml
xmlgraphics/fop/branches/Temp_Accessibility/lib/build/ (props changed)
xmlgraphics/fop/branches/Temp_Accessibility/lib/xmlgraphics-commons-1.4svn.jar
xmlgraphics/fop/branches/Temp_Accessibility/src/codegen/unicode/data/LineBreakPairTable.txt (props changed)
xmlgraphics/fop/branches/Temp_Accessibility/src/documentation/content/xdocs/trunk/fonts.xml
xmlgraphics/fop/branches/Temp_Accessibility/src/documentation/content/xdocs/trunk/output.xml
xmlgraphics/fop/branches/Temp_Accessibility/src/java/META-INF/services/org.apache.fop.render.intermediate.IFDocumentHandler (contents, props changed)
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/AFPGraphics2D.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/DataStream.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/goca/AbstractGraphicsDrawingOrderContainer.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/svg/AFPGraphicsConfiguration.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/svg/AFPTextPainter.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/cli/CommandLineOptions.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/events/EventExceptionManager.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/fo/FONode.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/fo/FOPropertyMapping.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/fo/PropertyListMaker.java (props changed)
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/fo/StaticPropertyList.java (props changed)
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/fo/ValidationException.java (props changed)
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/fo/expr/NumericOp.java (props changed)
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/fo/expr/RelativeNumericProperty.java (props changed)
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java (props changed)
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/fo/properties/CommonFont.java (props changed)
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/fo/properties/EnumLength.java (props changed)
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/fo/properties/EnumNumber.java (props changed)
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/fo/properties/PositionShorthandParser.java (props changed)
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/fo/properties/SpacingPropertyMaker.java (props changed)
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/fonts/FontInfoConfigurator.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/fonts/FontLoader.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/fonts/FontManager.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/fonts/FontManagerConfigurator.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/layoutmgr/KnuthPenalty.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java (props changed)
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/ImageHandler.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/ImageHandlerRegistry.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/PrintRendererConfigurator.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/RendererFactory.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/afp/AFPDocumentHandler.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/afp/AFPRenderer.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/afp/AFPRendererConfigurator.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/afp/extensions/AFPAttribute.java (props changed)
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/afp/extensions/AFPElementMapping.java (contents, props changed)
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/afp/extensions/AFPPageSetupElement.java (props changed)
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/bitmap/BitmapRenderingSettings.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/bitmap/MultiFileRenderingUtil.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/bitmap/TIFFDocumentHandler.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/bitmap/TIFFRendererConfigurator.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/AbstractBinaryWritingIFDocumentHandler.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/AbstractIFDocumentHandler.java (contents, props changed)
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/AbstractIFDocumentHandlerMaker.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/AbstractXMLWritingIFDocumentHandler.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/AffineTransformArrayParser.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/DelegatingFragmentContentHandler.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/IFContentHandler.java (props changed)
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/IFDocumentHandler.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/IFDocumentHandlerConfigurator.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/IFException.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/IFPainter.java (contents, props changed)
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/IFParser.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/IFRenderer.java (contents, props changed)
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/IFUtil.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/extensions/DocumentNavigationExtensionConstants.java (props changed)
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/java2d/CustomFontMetricsMapper.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/java2d/FontMetricsMapper.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/java2d/Java2DBorderPainter.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/java2d/Java2DImageHandlerGraphics2D.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/java2d/Java2DImageHandlerRenderedImage.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/java2d/Java2DPainter.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/java2d/Java2DUtil.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pcl/PCLDocumentHandler.java (contents, props changed)
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pcl/PCLDocumentHandlerMaker.java (props changed)
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pcl/PCLImageHandlerRenderedImage.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pcl/PCLPainter.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pcl/PCLRenderingContext.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pcl/PCLRenderingUtil.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pdf/PDFBorderPainter.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pdf/PDFContentGenerator.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pdf/PDFDocumentHandler.java (contents, props changed)
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/ps/AbstractPSTranscoder.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/ps/EPSTranscoder.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/ps/PSBorderPainter.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/ps/PSDocumentHandler.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/ps/PSRenderingUtil.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/ps/PSTextPainter.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/ps/PSTranscoder.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/rtf/FOPRtfAttributes.java (props changed)
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/svg/AbstractFOPTextPainter.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/svg/AbstractFOPTranscoder.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/svg/PDFAElementBridge.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/svg/PDFANode.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/svg/PDFDocumentGraphics2D.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/svg/PDFGraphicsConfiguration.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/svg/PDFTextPainter.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/svg/PDFTranscoder.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/traits/TraitEnum.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/util/DecimalFormatCache.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/util/XMLUtil.java
xmlgraphics/fop/branches/Temp_Accessibility/src/sandbox/org/apache/fop/render/svg/AbstractSVGDocumentHandler.java (props changed)
xmlgraphics/fop/branches/Temp_Accessibility/src/sandbox/org/apache/fop/render/svg/SVGDocumentHandler.java (contents, props changed)
xmlgraphics/fop/branches/Temp_Accessibility/src/sandbox/org/apache/fop/render/svg/SVGPrintDocumentHandler.java
xmlgraphics/fop/branches/Temp_Accessibility/status.xml
xmlgraphics/fop/branches/Temp_Accessibility/test/java/org/apache/fop/StandardTestSuite.java
xmlgraphics/fop/branches/Temp_Accessibility/test/layoutengine/disabled-testcase2filename.xsl (props changed)
xmlgraphics/fop/branches/Temp_Accessibility/test/layoutengine/disabled-testcases.dtd (props changed)
xmlgraphics/fop/branches/Temp_Accessibility/test/layoutengine/hyphenation-testcases/block_hyphenation-ladder-count.xml (props changed)
xmlgraphics/fop/branches/Temp_Accessibility/test/layoutengine/hyphenation-testcases/block_shy_linebreaking_hyph.xml (props changed)
xmlgraphics/fop/branches/Temp_Accessibility/test/layoutengine/hyphenation-testcases/block_uax14_linebreaking_hyph.xml (props changed)
xmlgraphics/fop/branches/Temp_Accessibility/test/layoutengine/hyphenation-testcases/inline_border_padding_hyphenate.xml (props changed)
xmlgraphics/fop/branches/Temp_Accessibility/test/layoutengine/hyphenation-testcases/inline_border_padding_hyphenate_de.xml (props changed)
xmlgraphics/fop/branches/Temp_Accessibility/test/layoutengine/standard-testcases/block_bug39414.xml (props changed)
xmlgraphics/fop/branches/Temp_Accessibility/test/layoutengine/standard-testcases/block_line-height-shift-adjustment.xml (props changed)
xmlgraphics/fop/branches/Temp_Accessibility/test/layoutengine/standard-testcases/block_shy_linebreaking.xml (props changed)
xmlgraphics/fop/branches/Temp_Accessibility/test/layoutengine/standard-testcases/block_text-align_3.xml (props changed)
xmlgraphics/fop/branches/Temp_Accessibility/test/layoutengine/standard-testcases/block_uax14_linebreaking.xml (props changed)
xmlgraphics/fop/branches/Temp_Accessibility/test/layoutengine/standard-testcases/block_white-space-treatment_3.xml (props changed)
xmlgraphics/fop/branches/Temp_Accessibility/test/layoutengine/standard-testcases/block_white-space.xml (props changed)
xmlgraphics/fop/branches/Temp_Accessibility/test/layoutengine/standard-testcases/external-graphic_breaking.xml (props changed)
xmlgraphics/fop/branches/Temp_Accessibility/test/resources/fonts/glb12.ttf (props changed)
xmlgraphics/fop/branches/Temp_Accessibility/test/resources/fop/image/logo.eps (props changed)
xmlgraphics/fop/branches/Temp_Accessibility/test/resources/fop/image/logo.tif (props changed)
xmlgraphics/fop/branches/Temp_Accessibility/test/resources/images/arrow_down_large.png (props changed)
xmlgraphics/fop/branches/Temp_Accessibility/test/resources/images/arrow_down_medium.png (props changed)
xmlgraphics/fop/branches/Temp_Accessibility/test/resources/images/arrow_down_small.png (props changed)
xmlgraphics/fop/branches/Temp_Accessibility/test/resources/images/arrow_up_down_small.png (props changed)
xmlgraphics/fop/branches/Temp_Accessibility/test/resources/images/arrow_up_large.png (props changed)
xmlgraphics/fop/branches/Temp_Accessibility/test/resources/images/arrow_up_medium.png (props changed)
xmlgraphics/fop/branches/Temp_Accessibility/test/resources/images/arrow_up_small.png (props changed)
xmlgraphics/fop/branches/Temp_Accessibility/test/resources/images/line_medium.png (props changed)
Propchange: xmlgraphics/fop/branches/Temp_Accessibility/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 13 16:41:13 2009
@@ -1,4 +1,4 @@
/xmlgraphics/fop/branches/Temp_AFPGOCAResources:630874-721418
/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign:745924-746655
/xmlgraphics/fop/branches/fop-0_95:684572,688085,688696
-/xmlgraphics/fop/trunk:603620-816269
+/xmlgraphics/fop/trunk:603620-824832
Modified: xmlgraphics/fop/branches/Temp_Accessibility/build.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/build.xml?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/build.xml (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/build.xml Tue Oct 13 16:41:13 2009
@@ -110,9 +110,10 @@
<include name="*.jar"/>
</fileset>
</path>
+ <property name="lib-build-tools" value="${basedir}/lib/build"/>
<path id="libs-build-tools-classpath">
<path refid="libs-build-classpath"/>
- <fileset dir="${basedir}/lib/build">
+ <fileset dir="${lib-build-tools}">
<include name="*.jar"/>
</fileset>
</path>
@@ -1139,19 +1140,25 @@
<!-- =================================================================== -->
<!-- Checkstyle -->
<!-- =================================================================== -->
- <property name="checkstyle.lib" value="${checkstyle.home.dir}"/>
- <property name="checkstyle.noframes.xslt" value="${checkstyle.home.dir}/contrib/checkstyle-noframes.xsl"/>
- <path id="libs-checkstyle">
- <fileset dir="${checkstyle.lib}">
- <include name="*.jar"/>
- </fileset>
- </path>
- <target name="checkstyle-avail" unless="checkstyle.home.dir">
- <echo message="Checkstyle Support NOT Present. Please download it from http://checkstyle.sf.net/ and set checkstyle.home.dir in build-local.properties"/>
- </target>
- <target name="checkstyle" depends="init, checkstyle-avail" if="checkstyle.home.dir" description="Runs Checkstyle for a code quality report">
- <taskdef name="checkstyle" classname="com.puppycrawl.tools.checkstyle.CheckStyleTask" classpathref="libs-checkstyle"/>
- <checkstyle config="checkstyle-4.0.xml" failonviolation="false">
+ <property name="checkstyle.noframes.xslt" value="${basedir}/checkstyle-noframes.xsl" />
+ <condition property="checkstyle.avail">
+ <and>
+ <available classname="com.puppycrawl.tools.checkstyle.CheckStyleTask">
+ <classpath>
+ <path refid="libs-build-tools-classpath"/>
+ </classpath>
+ </available>
+ <available file="${checkstyle.noframes.xslt}"/>
+ </and>
+ </condition>
+ <target name="checkstyle-avail" unless="checkstyle.avail">
+ <echo message="Checkstyle support NOT present. Please download it from http://checkstyle.sf.net/ and"/>
+ <echo message="..copy or link checkstyle-all-5.0.jar to ${lib-build-tools}"/>
+ <echo message="..copy or link checkstyle-noframes.xsl to ${checkstyle.noframes.xslt}"/>
+ </target>
+ <target name="checkstyle" depends="init, checkstyle-avail" if="checkstyle.avail" description="Runs Checkstyle for a code quality report">
+ <taskdef name="checkstyle" classname="com.puppycrawl.tools.checkstyle.CheckStyleTask" classpathref="libs-build-tools-classpath"/>
+ <checkstyle config="checkstyle-5.0.xml" failonviolation="false">
<fileset dir="${src.java.dir}" includes="**/*.java"/>
<formatter type="xml" toFile="${build.dir}/report_checkstyle.xml"/>
</checkstyle>
@@ -1234,10 +1241,24 @@
<!-- Creates the distribution -->
<!-- =================================================================== -->
<target name="dist" depends="dist-prereq,dist-src,dist-bin" description="Generates the distribution package"/>
- <target name="dist-prereq" depends="init">
+ <target name="dist-prereq" depends="init,dist-get-jai">
<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-get-jai" description="Attempts to download the JAI library dependency" unless="jai.present">
+ <echo message="JAI Support NOT present - attempting to download... "/>
+ <get src="http://download.java.net/media/jai/builds/release/1_1_3/jai-1_1_3-lib.zip" dest="${java.io.tmpdir}/jai-1_1_3-lib.zip" verbose="true" />
+ <unzip src="${java.io.tmpdir}/jai-1_1_3-lib.zip" dest="${java.io.tmpdir}">
+ <patternset>
+ <include name="jai-1_1_3/lib/*"/>
+ </patternset>
+ </unzip>
+ <copy todir="${basedir}/lib" file="${java.io.tmpdir}/jai-1_1_3/lib/jai_core.jar" />
+ <copy todir="${basedir}/lib" file="${java.io.tmpdir}/jai-1_1_3/lib/jai_codec.jar" />
+ <delete dir="${java.io.tmpdir}/jai-1_1_3" />
+ <delete file="${java.io.tmpdir}/jai-1_1_3-lib.zip" />
+ <property name="jai.present" value="true"/>
+ </target>
<target name="dist-bin" depends="all,javadocs,docs">
<echo message="Building the binary distribution files (zip,tar)"/>
<mkdir dir="${dist.bin.result.dir}"/>
Modified: xmlgraphics/fop/branches/Temp_Accessibility/checkstyle-4.0.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/checkstyle-4.0.xml?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/checkstyle-4.0.xml (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/checkstyle-4.0.xml Tue Oct 13 16:41:13 2009
@@ -52,12 +52,6 @@
<module name="EqualsHashCodeCheck">
<property name="severity" value="warning"/>
</module>
- <module name="HiddenFieldCheck">
- <property name="severity" value="warning"/>
- <property name="tokens" value="PARAMETER_DEF, VARIABLE_DEF"/>
- <property name="ignoreConstructorParameter" value="true"/>
- <property name="ignoreSetter" value="true"/>
- </module>
<module name="InnerAssignmentCheck">
<property name="severity" value="warning"/>
<property name="tokens" value="ASSIGN, BAND_ASSIGN, BOR_ASSIGN, BSR_ASSIGN, BXOR_ASSIGN, DIV_ASSIGN, MINUS_ASSIGN, MOD_ASSIGN, PLUS_ASSIGN, SL_ASSIGN, SR_ASSIGN, STAR_ASSIGN"/>
@@ -65,11 +59,6 @@
<module name="MissingSwitchDefaultCheck">
<property name="severity" value="warning"/>
</module>
- <module name="RedundantThrowsCheck">
- <property name="allowSubclasses" value="false"/>
- <property name="allowUnchecked" value="false"/>
- <property name="severity" value="warning"/>
- </module>
<module name="SimplifyBooleanExpressionCheck">
<property name="severity" value="warning"/>
</module>
Modified: xmlgraphics/fop/branches/Temp_Accessibility/checkstyle-5.0.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/checkstyle-5.0.xml?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/checkstyle-5.0.xml (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/checkstyle-5.0.xml Tue Oct 13 16:41:13 2009
@@ -48,12 +48,6 @@
<module name="EqualsHashCodeCheck">
<property name="severity" value="warning"/>
</module>
- <module name="HiddenFieldCheck">
- <property name="severity" value="warning"/>
- <property name="tokens" value="PARAMETER_DEF, VARIABLE_DEF"/>
- <property name="ignoreConstructorParameter" value="true"/>
- <property name="ignoreSetter" value="true"/>
- </module>
<module name="InnerAssignmentCheck">
<property name="severity" value="warning"/>
<property name="tokens" value="ASSIGN, BAND_ASSIGN, BOR_ASSIGN, BSR_ASSIGN, BXOR_ASSIGN, DIV_ASSIGN, MINUS_ASSIGN, MOD_ASSIGN, PLUS_ASSIGN, SL_ASSIGN, SR_ASSIGN, STAR_ASSIGN"/>
@@ -61,11 +55,6 @@
<module name="MissingSwitchDefaultCheck">
<property name="severity" value="warning"/>
</module>
- <module name="RedundantThrowsCheck">
- <property name="allowSubclasses" value="false"/>
- <property name="allowUnchecked" value="false"/>
- <property name="severity" value="warning"/>
- </module>
<module name="SimplifyBooleanExpressionCheck">
<property name="severity" value="warning"/>
</module>
Propchange: xmlgraphics/fop/branches/Temp_Accessibility/lib/build/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Oct 13 16:41:13 2009
@@ -0,0 +1 @@
+checkstyle-*.jar
Modified: xmlgraphics/fop/branches/Temp_Accessibility/lib/xmlgraphics-commons-1.4svn.jar
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/lib/xmlgraphics-commons-1.4svn.jar?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
Binary files - no diff available.
Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/codegen/unicode/data/LineBreakPairTable.txt
('svn:executable' removed)
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/documentation/content/xdocs/trunk/fonts.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/documentation/content/xdocs/trunk/fonts.xml?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/documentation/content/xdocs/trunk/fonts.xml (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/documentation/content/xdocs/trunk/fonts.xml Tue Oct 13 16:41:13 2009
@@ -468,6 +468,13 @@
referenced. If you want to reference all fonts, just specify <code>font-family=".*"</code>.
</p>
<p>
+ The <code>referenced-fonts</code> element can be placed either inside the general
+ <code>fonts</code> element (right under the root) or in the <code>fonts</code> element
+ under the renderer configuration. In the first case, matches apply to all renderers.
+ In the second case, matches only apply to the renderer where the element was specified.
+ Both cases can be used at the same time.
+ </p>
+ <p>
Various notes related to embedded fonts:
</p>
<ul>
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/documentation/content/xdocs/trunk/output.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/documentation/content/xdocs/trunk/output.xml?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/documentation/content/xdocs/trunk/output.xml (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/documentation/content/xdocs/trunk/output.xml Tue Oct 13 16:41:13 2009
@@ -766,13 +766,14 @@
<source><![CDATA[
<fo:layout-master-set>
<fo:simple-page-master master-name="simple">
- <afp:include-page-overlay name="O1SAMP1 " />
+ <afp:include-page-overlay name="O1SAMP1 " x="20mm" y="30mm" />
...
</fo:simple-page-master>
</fo:layout-master-set>
]]></source>
<p>The mandatory name attribute must refer to an 8 character (space padded) resource name that
- must be known in the AFP processing environment.</p>
+ must be known in the AFP processing environment. Optional x and y attributes can be specified
+ to place the Overlay at an offset from the top left of the page.</p>
</section>
<section id="afp-page-segment">
<title>Page Segment (IPS) Extension</title>
@@ -796,6 +797,17 @@
fo:external-graphic elements and if it is identical (string matching is used) in the generated
AFP the external graphic is replaced by a reference to the given resource.
</p>
+ <p>
+ The effect here is that whenever FOP encounters the URI specified in the extension,
+ it will effectively generate code to include the page segment with the given name
+ instead of embedding the image referenced by the URI. The URI is still required as
+ the underlying image serves as a provider for the intrinsic size of the image
+ (At the moment, FOP is unable to extract the intrinsic size of the page segment from
+ an AFP resource file). For the image to appear in an AFP viewer or to be printed, the
+ AFP resource must be available on the target device. FOP does not embed the page
+ segment in the generated file. Please also note that page segments cannot be scaled.
+ They are always rendered in their intrinsic size.
+ </p>
</section>
<section id="afp-tag-logical-element">
<title>Tag Logical Element (TLE) Extension</title>
@@ -1022,8 +1034,13 @@
<p>
Currently, two output formats are supported: PNG and TIFF. TIFF produces
one file with multiple pages, while PNG output produces one file per
- page. The quality of the bitmap depends on the target resolution setting
- on the FOUserAgent.
+ page. Note: FOP can only produce multiple files (with PNG output) if
+ you can set a <code>java.io.File</code> indicating the primary PNG file
+ using the <code>FOUserAgent.setOutputFile(File)</code> method.
+ </p>
+ <p>
+ The quality of the bitmap depends on the target resolution setting
+ on the FOUserAgent and on further settings described below.
</p>
<section id="bitmap-configuration">
<title>Configuration</title>
@@ -1031,15 +1048,52 @@
The TIFF and PNG renderer configuration currently allows the following settings:
</p>
<source><![CDATA[<renderer mime="image/png">
+ <color-mode>rgba</color-mode>
<transparent-page-background>true</transparent-page-background>
+ <background-color>white</background-color>
+ <anti-aliasing>true</anti-aliasing>
+ <rendering>quality</rendering>
<fonts><!-- described elsewhere --></fonts>
</renderer>]]></source>
<p>
- The default value for the "transparent-page-background" setting is "false" which
- paints an opaque, white background for the whole image. If you set this to true,
+ The default value for the <code>"color-mode"</code> setting is <code>"rgba"</code> which
+ is equivalent to a 24bit RGB image with an 8bit alpha channel for transparency.
+ Valid values are:
+ </p>
+ <ul>
+ <li><code>rgba</code>: RGB with alpha channel (24bit + 8bit = 32bit)</li>
+ <li><code>rgb</code>: RGB (24bit)</li>
+ <li><code>gray</code>: gray (8bit)</li>
+ <li><code>bi-level</code> (or <code>binary</code>): bi-level (1bit)</li>
+ </ul>
+ <p>
+ Please note that there is currently no dithering or error diffusion available for bi-level
+ bitmap output.
+ </p>
+ <p>
+ The default value for the <code>"transparent-page-background"</code> setting is
+ <code>"false"</code> which paints an opaque, white background for the whole image.
+ If you set this to <code>"true"</code>,
no such background will be painted and you will get a transparent image if
an alpha channel is available in the output format.
</p>
+ <p>
+ The default value for the <code>"background-color"</code> setting is <code>"white"</code>.
+ The color specifies in which color the page background is painted. It will only be
+ painted if <code>"transparent-page-background"</code> is not set to <code>"true"</code>.
+ All XSL-FO colors (including color functions) can be used.
+ </p>
+ <p>
+ The default value for the <code>"anti-aliasing"</code> setting is <code>"true"</code>.
+ You can set this value to <code>"false"</code> to disable anti-aliasing and
+ thus improve rendering speeds a bit at the loss of some image quality.
+ </p>
+ <p>
+ The default value for the <code>"rendering"</code> setting is <code>"true"</code>.
+ You can set this value to <code>"false"</code> to improve rendering speeds a bit
+ at the loss of some image quality. If this setting has an actual effect depends
+ on the JVM's Java2D backend.
+ </p>
</section>
<section id="tiff-configuration">
<title>TIFF-specific Configuration</title>
@@ -1060,17 +1114,22 @@
actual codecs being available. Here is a list of possible values:
</p>
<ul>
- <li>NONE (no compression)</li>
- <li>PackBits (RLE, run-length encoding)</li>
- <li>JPEG</li>
- <li>Deflate</li>
- <li>LZW</li>
- <li>ZLib</li>
- <li>CCITT T.4 (Fax Group 3)</li>
- <li>CCITT T.6 (Fax Group 4)</li>
+ <li><code>NONE</code> (no compression)</li>
+ <li><code>PackBits</code> (RLE, run-length encoding)</li>
+ <li><code>JPEG</code></li>
+ <li><code>Deflate</code></li>
+ <li><code>LZW</code></li>
+ <li><code>ZLib</code></li>
+ <li><code>CCITT T.4</code> (Fax Group 3)</li>
+ <li><code>CCITT T.6</code> (Fax Group 4)</li>
</ul>
+ <p>
+ This setting may override any setting made using the <code>"color-mode"</code>. For example, if
+ <code>"CCITT T.6"</code> is selected, the color mode is automatically forced to <code>"bi-level"</code> because
+ this compression format only supports bi-level images.
+ </p>
<note>
- If you want to use CCITT compression, please make sure you've got a J2SE 1.4 or later and
+ If you want to use CCITT compression, please make sure you've got
<a href="http://java.sun.com/products/java-media/jai/current.html">
Java Advanced Imaging Image I/O Tools
</a>
@@ -1079,6 +1138,17 @@
Deflate and JPEG compression for writing.
</note>
</section>
+ <section id="bitmap-rendering-options">
+ <title>Runtime Rendering Options</title>
+ <p>
+ The IF-based bitmap output implementations support a rendering option with the key
+ "target-bitmap-size" (value: java.awt.Dimension) that allows to force the pages to
+ be proportionally fit into a bitmap of a given size. This can be used to produce
+ thumbnails or little preview images of the individual pages. An example:
+ </p>
+ <source><![CDATA[userAgent.getRenderingOptions().put(
+ "target-bitmap-size", new Dimension(320, 200));]]></source>
+ </section>
</section>
<section id="txt">
<title>TXT</title>
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/META-INF/services/org.apache.fop.render.intermediate.IFDocumentHandler
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/META-INF/services/org.apache.fop.render.intermediate.IFDocumentHandler?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/META-INF/services/org.apache.fop.render.intermediate.IFDocumentHandler (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/META-INF/services/org.apache.fop.render.intermediate.IFDocumentHandler Tue Oct 13 16:41:13 2009
@@ -1,6 +1,7 @@
org.apache.fop.render.pdf.PDFDocumentHandlerMaker
org.apache.fop.render.pcl.PCLDocumentHandlerMaker
org.apache.fop.render.bitmap.TIFFDocumentHandlerMaker
+org.apache.fop.render.bitmap.PNGDocumentHandlerMaker
org.apache.fop.render.ps.PSDocumentHandlerMaker
org.apache.fop.render.afp.AFPDocumentHandlerMaker
org.apache.fop.render.intermediate.IFSerializerMaker
\ No newline at end of file
Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/META-INF/services/org.apache.fop.render.intermediate.IFDocumentHandler
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 13 16:41:13 2009
@@ -1 +1 @@
-/xmlgraphics/fop/trunk/src/java/META-INF/services/org.apache.fop.render.intermediate.IFDocumentHandler:699793-816269
+/xmlgraphics/fop/trunk/src/java/META-INF/services/org.apache.fop.render.intermediate.IFDocumentHandler:699793-824832
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/AFPGraphics2D.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/AFPGraphics2D.java?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/AFPGraphics2D.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/AFPGraphics2D.java Tue Oct 13 16:41:13 2009
@@ -26,6 +26,7 @@
import java.awt.Font;
import java.awt.FontMetrics;
import java.awt.Graphics;
+import java.awt.Graphics2D;
import java.awt.GraphicsConfiguration;
import java.awt.Image;
import java.awt.Paint;
@@ -67,8 +68,8 @@
import org.apache.fop.svg.NativeImageHandler;
/**
- * This is a concrete implementation of <tt>AbstractGraphics2D</tt> (and
- * therefore of <tt>Graphics2D</tt>) which is able to generate GOCA byte
+ * This is a concrete implementation of {@link AbstractGraphics2D} (and
+ * therefore of {@link Graphics2D}) which is able to generate GOCA byte
* codes.
*
* @see org.apache.xmlgraphics.java2d.AbstractGraphics2D
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/DataStream.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/DataStream.java?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/DataStream.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/DataStream.java Tue Oct 13 16:41:13 2009
@@ -485,9 +485,11 @@
*
* @param name
* the name of the static overlay
+ * @param x x-coordinate
+ * @param y y-coordinate
*/
- public void createIncludePageOverlay(String name) {
- currentPageObject.createIncludePageOverlay(name, 0, 0, paintingState.getRotation());
+ public void createIncludePageOverlay(String name, int x, int y) {
+ currentPageObject.createIncludePageOverlay(name, x, y, paintingState.getRotation());
currentPageObject.getActiveEnvironmentGroup().createOverlay(name);
}
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/goca/AbstractGraphicsDrawingOrderContainer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/goca/AbstractGraphicsDrawingOrderContainer.java?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/goca/AbstractGraphicsDrawingOrderContainer.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/goca/AbstractGraphicsDrawingOrderContainer.java Tue Oct 13 16:41:13 2009
@@ -46,8 +46,6 @@
/** object has started */
private boolean started = false;
- private int dataLength = 0;
-
/**
* Default constructor
*/
@@ -80,7 +78,6 @@
*/
public void addObject(StructuredData object) {
objects.add(object);
- dataLength += object.getDataLength();
}
/**
@@ -91,7 +88,6 @@
public void addAll(AbstractGraphicsDrawingOrderContainer graphicsContainer) {
Collection/*<StructuredDataObject>*/ objects = graphicsContainer.getObjects();
objects.addAll(objects);
- dataLength += graphicsContainer.getDataLength();
}
/**
@@ -111,11 +107,9 @@
public StructuredData removeLast() {
int lastIndex = objects.size() - 1;
StructuredData object = null;
- if (lastIndex >= 0) {
- object = (StructuredData)objects.remove(lastIndex);
- }
- if (object != null) {
- dataLength -= object.getDataLength();
+ if (lastIndex > -1) {
+ object = (StructuredData)objects.get(lastIndex);
+ objects.remove(lastIndex);
}
return object;
}
@@ -127,7 +121,12 @@
* all enclosed objects (and their containers)
*/
public int getDataLength() {
- return this.dataLength;
+ int dataLen = 0;
+ Iterator it = objects.iterator();
+ while (it.hasNext()) {
+ dataLen += ((StructuredData)it.next()).getDataLength();
+ }
+ return dataLen;
}
/** {@inheritDoc} */
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/svg/AFPGraphicsConfiguration.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/svg/AFPGraphicsConfiguration.java?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/svg/AFPGraphicsConfiguration.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/svg/AFPGraphicsConfiguration.java Tue Oct 13 16:41:13 2009
@@ -28,6 +28,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+
import org.apache.fop.svg.GraphicsConfiguration;
/**
@@ -95,7 +96,7 @@
}
/**
- * Return a good color model given <tt>transparency</tt>
+ * Return a good color model given <code>transparency</code>
*
* @param transparency the alpha value for the colour model
* @return the colour model for the configuration
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/svg/AFPTextPainter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/svg/AFPTextPainter.java?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/svg/AFPTextPainter.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/svg/AFPTextPainter.java Tue Oct 13 16:41:13 2009
@@ -25,9 +25,8 @@
import org.apache.fop.svg.AbstractFOPTextPainter;
import org.apache.fop.svg.FOPTextHandler;
-
/**
- * Renders the attributed character iterator of a <tt>TextNode</tt>.
+ * Renders the attributed character iterator of a {@link TextNode}.
* This class draws the text directly into the AFPGraphics2D so that
* the text is not drawn using shapes.
* If the text is simple enough to draw then it sets the font and calls
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/cli/CommandLineOptions.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/cli/CommandLineOptions.java?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/cli/CommandLineOptions.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/cli/CommandLineOptions.java Tue Oct 13 16:41:13 2009
@@ -30,9 +30,10 @@
import javax.swing.UIManager;
+import org.xml.sax.SAXException;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.xml.sax.SAXException;
import org.apache.fop.Version;
import org.apache.fop.accessibility.AccessibilityUtil;
@@ -46,7 +47,9 @@
import org.apache.fop.pdf.PDFXMode;
import org.apache.fop.render.Renderer;
import org.apache.fop.render.awt.AWTRenderer;
-import org.apache.fop.render.intermediate.IFRenderer;
+import org.apache.fop.render.intermediate.IFContext;
+import org.apache.fop.render.intermediate.IFDocumentHandler;
+import org.apache.fop.render.intermediate.IFSerializer;
import org.apache.fop.render.pdf.PDFRenderer;
import org.apache.fop.render.print.PagesMode;
import org.apache.fop.render.print.PrintRenderer;
@@ -210,13 +213,19 @@
//Make sure the prepared XMLRenderer is used
foUserAgent.setRendererOverride(xmlRenderer);
- } else if (MimeConstants.MIME_FOP_IF.equals(outputmode)) {
+ } else if (MimeConstants.MIME_FOP_IF.equals(outputmode)
+ && mimicRenderer != null) {
// render from FO to Intermediate Format
- IFRenderer xml2Renderer = new IFRenderer();
- xml2Renderer.setUserAgent(foUserAgent);
+ IFSerializer serializer = new IFSerializer();
+ serializer.setContext(new IFContext(foUserAgent));
+
+ IFDocumentHandler targetHandler
+ = foUserAgent.getRendererFactory().createDocumentHandler(
+ foUserAgent, mimicRenderer);
+ serializer.mimicDocumentHandler(targetHandler);
- //Make sure the prepared IFRenderer is used
- foUserAgent.setRendererOverride(xml2Renderer);
+ //Make sure the prepared serializer is used
+ foUserAgent.setDocumentHandlerOverride(serializer);
}
return true;
}
@@ -712,11 +721,12 @@
} else if ((i + 2 == args.length)
|| (args[i + 2].charAt(0) == '-')) {
// only output file is specified
- outfile = new File(args[i + 1]);
+ setOutputFile(args[i + 1]);
return 1;
} else {
// mimic format and output file have been specified
- outfile = new File(args[i + 2]);
+ mimicRenderer = args[i + 1];
+ setOutputFile(args[i + 2]);
return 2;
}
}
@@ -1171,16 +1181,18 @@
+ " -png outfile input will be rendered as PNG (outfile req'd)\n"
+ " -txt outfile input will be rendered as plain text (outfile req'd) \n"
+ " -at [mime] out representation of area tree as XML (outfile req'd) \n"
- + " specify optional mime output to allow AT to be converted\n"
+ + " specify optional mime output to allow the AT to be converted\n"
+ + " to final format later\n"
+ + " -if [mime] out representation of document in intermediate format XML (outfile req'd)\n"
+ + " specify optional mime output to allow the IF to be converted\n"
+ " to final format later\n"
- + " -if out representation of area tree as intermediate format XML (outfile req'd)\n"
+ " -print input file will be rendered and sent to the printer \n"
+ " see options with \"-print help\" \n"
+ " -out mime outfile input will be rendered using the given MIME type\n"
+ " (outfile req'd) Example: \"-out application/pdf D:\\out.pdf\"\n"
+ " (Tip: \"-out list\" prints the list of supported MIME types)\n"
- + " -mif outfile input will be rendered as MIF (FrameMaker) (outfile req'd)\n"
- + " Experimental feature - requires additional fop-sandbox.jar.\n"
+ //+ " -mif outfile input will be rendered as MIF (FrameMaker) (outfile req'd)\n"
+ //+ " Experimental feature - requires additional fop-sandbox.jar.\n"
+ " -svg outfile input will be rendered as an SVG slides file (outfile req'd) \n"
+ " Experimental feature - requires additional fop-sandbox.jar.\n"
+ "\n"
@@ -1223,7 +1235,7 @@
break;
case FO_INPUT:
log.info("FO ");
- if (this.useStdIn) {
+ if (isInputFromStdIn()) {
log.info("fo input file: from stdin");
} else {
log.info("fo input file: " + fofile.toString());
@@ -1231,7 +1243,7 @@
break;
case XSLT_INPUT:
log.info("xslt transformation");
- if (this.useStdIn) {
+ if (isInputFromStdIn()) {
log.info("xml input file: from stdin");
} else {
log.info("xml input file: " + xmlfile.toString());
@@ -1240,7 +1252,7 @@
break;
case AREATREE_INPUT:
log.info("AT ");
- if (this.useStdIn) {
+ if (isInputFromStdIn()) {
log.info("area tree input file: from stdin");
} else {
log.info("area tree input file: " + areatreefile.toString());
@@ -1248,7 +1260,7 @@
break;
case IF_INPUT:
log.info("IF ");
- if (this.useStdIn) {
+ if (isInputFromStdIn()) {
log.info("intermediate input file: from stdin");
} else {
log.info("intermediate input file: " + iffile.toString());
@@ -1256,7 +1268,7 @@
break;
case IMAGE_INPUT:
log.info("Image ");
- if (this.useStdIn) {
+ if (isInputFromStdIn()) {
log.info("image input file: from stdin");
} else {
log.info("image input file: " + imagefile.toString());
@@ -1285,7 +1297,7 @@
if (mimicRenderer != null) {
log.info("mimic renderer: " + mimicRenderer);
}
- if (this.useStdOut) {
+ if (isOutputToStdOut()) {
log.info("output file: to stdout");
} else {
log.info("output file: " + outfile.toString());
@@ -1295,7 +1307,7 @@
log.info("output file: " + outfile.toString());
} else {
log.info(outputmode);
- if (this.useStdOut) {
+ if (isOutputToStdOut()) {
log.info("output file: to stdout");
} else {
log.info("output file: " + outfile.toString());
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/events/EventExceptionManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/events/EventExceptionManager.java?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/events/EventExceptionManager.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/events/EventExceptionManager.java Tue Oct 13 16:41:13 2009
@@ -58,7 +58,21 @@
}
} else {
String msg = EventFormatter.format(event);
- throw new RuntimeException(msg);
+ //Get original exception as cause if it is given as one of the parameters
+ Throwable t = null;
+ Iterator iter = event.getParams().values().iterator();
+ while (iter.hasNext()) {
+ Object o = iter.next();
+ if (o instanceof Throwable) {
+ t = (Throwable)o;
+ break;
+ }
+ }
+ if (t != null) {
+ throw new RuntimeException(msg, t);
+ } else {
+ throw new RuntimeException(msg);
+ }
}
}
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/fo/FONode.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/fo/FONode.java?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/fo/FONode.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/fo/FONode.java Tue Oct 13 16:41:13 2009
@@ -23,12 +23,13 @@
import java.util.ListIterator;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.xml.sax.Attributes;
import org.xml.sax.Locator;
import org.xml.sax.helpers.LocatorImpl;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
import org.apache.xmlgraphics.util.QName;
import org.apache.fop.apps.FOPException;
@@ -274,7 +275,7 @@
* @param pList currently applicable PropertyList
* @param locator location in the XSL-FO source file.
* @throws FOPException if there's a problem during processing
- * @deprecated Please override {@code #characters(char[], int, int, PropertyList, Locator)}
+ * @deprecated Please override {@link #characters(char[], int, int, PropertyList, Locator)}
* instead!
*/
protected void addCharacters(char[] data, int start, int end,
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/fo/FOPropertyMapping.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/fo/FOPropertyMapping.java?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/fo/FOPropertyMapping.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/fo/FOPropertyMapping.java Tue Oct 13 16:41:13 2009
@@ -2531,12 +2531,14 @@
m = new LengthProperty.Maker(PR_PROVISIONAL_LABEL_SEPARATION);
m.setInherited(true);
m.setDefault("6pt");
+ m.setPercentBase(LengthBase.CONTAINING_BLOCK_WIDTH);
addPropertyMaker("provisional-label-separation", m);
// provisional-distance-between-starts
m = new LengthProperty.Maker(PR_PROVISIONAL_DISTANCE_BETWEEN_STARTS);
m.setInherited(true);
m.setDefault("24pt");
+ m.setPercentBase(LengthBase.CONTAINING_BLOCK_WIDTH);
addPropertyMaker("provisional-distance-between-starts", m);
// ref-id
Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/fo/PropertyListMaker.java
('svn:executable' removed)
Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/fo/StaticPropertyList.java
('svn:executable' removed)
Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/fo/ValidationException.java
('svn:executable' removed)
Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/fo/expr/NumericOp.java
('svn:executable' removed)
Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/fo/expr/RelativeNumericProperty.java
('svn:executable' removed)
Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java
('svn:executable' removed)
Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/fo/properties/CommonFont.java
('svn:executable' removed)
Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/fo/properties/EnumLength.java
('svn:executable' removed)
Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/fo/properties/EnumNumber.java
('svn:executable' removed)
Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/fo/properties/PositionShorthandParser.java
('svn:executable' removed)
Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/fo/properties/SpacingPropertyMaker.java
('svn:executable' removed)
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/fonts/FontInfoConfigurator.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/fonts/FontInfoConfigurator.java?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/fonts/FontInfoConfigurator.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/fonts/FontInfoConfigurator.java Tue Oct 13 16:41:13 2009
@@ -33,6 +33,7 @@
import org.apache.commons.io.IOUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+
import org.apache.fop.apps.FOPException;
import org.apache.fop.fonts.autodetect.FontFileFinder;
import org.apache.fop.fonts.autodetect.FontInfoFinder;
@@ -83,7 +84,7 @@
}
FontAdder fontAdder = new FontAdder(fontManager, fontResolver, listener);
-
+
// native o/s search (autodetect) configuration
boolean autodetectFonts = (fonts.getChild("auto-detect", false) != null);
if (autodetectFonts) {
@@ -93,7 +94,7 @@
// Add configured directories to FontInfo
addDirectories(fonts, fontAdder, fontInfoList);
-
+
// Add configured fonts to FontInfo
FontCache fontCache = fontManager.getFontCache();
addFonts(fonts, fontCache, fontInfoList);
@@ -101,6 +102,14 @@
// Update referenced fonts (fonts which are not to be embedded)
fontManager.updateReferencedFonts(fontInfoList);
+ // Renderer-specific referenced fonts
+ Configuration referencedFontsCfg = fonts.getChild("referenced-fonts", false);
+ if (referencedFontsCfg != null) {
+ FontTriplet.Matcher matcher = FontManagerConfigurator.createFontsMatcher(
+ referencedFontsCfg, strict);
+ fontManager.updateReferencedFonts(fontInfoList, matcher);
+ }
+
// Update font cache if it has changed
if (fontCache != null && fontCache.hasChanged()) {
fontCache.save();
@@ -112,7 +121,7 @@
}
}
}
-
+
private void addDirectories(Configuration fontsCfg,
FontAdder fontAdder, List/*<URL>*/ fontInfoList) throws FOPException {
// directory (multiple font) configuration
@@ -131,7 +140,7 @@
new FOPException("directory defined without value"), strict);
continue;
}
-
+
// add fonts found in directory
FontFileFinder fontFileFinder = new FontFileFinder(recursive ? -1 : 1);
List/*<URL>*/ fontURLList;
@@ -145,7 +154,7 @@
}
/**
- * Populates the font info list from the fonts configuration
+ * Populates the font info list from the fonts configuration
* @param fontsCfg a fonts configuration
* @param fontCache a font cache
* @param fontInfoList a font info list
@@ -163,7 +172,7 @@
}
}
}
-
+
private static void closeSource(Source src) {
if (src instanceof StreamSource) {
StreamSource streamSource = (StreamSource)src;
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/fonts/FontLoader.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/fonts/FontLoader.java?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/fonts/FontLoader.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/fonts/FontLoader.java Tue Oct 13 16:41:13 2009
@@ -87,8 +87,8 @@
*/
public static CustomFont loadFont(File fontFile, String subFontName,
boolean embedded, EncodingMode encodingMode, FontResolver resolver) throws IOException {
- return loadFont(fontFile.getAbsolutePath(), subFontName,
- embedded, encodingMode, true, resolver);
+ return loadFont(fontFile.toURI().toURL(), subFontName,
+ embedded, encodingMode, resolver);
}
/**
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/fonts/FontManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/fonts/FontManager.java?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/fonts/FontManager.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/fonts/FontManager.java Tue Oct 13 16:41:13 2009
@@ -145,7 +145,7 @@
/**
* Sets up the fonts on a given FontInfo object. The fonts to setup are defined by an
- * array of {@code FontCollection} objects.
+ * array of {@link FontCollection} objects.
* @param fontInfo the FontInfo object to set up
* @param fontCollections the array of font collections/sources
*/
@@ -190,11 +190,21 @@
}
/**
- * Updates the referenced font list
+ * Updates the referenced font list using the FontManager's referenced fonts matcher
+ * ({@link #getReferencedFontsMatcher()}).
* @param fontInfoList a font info list
*/
public void updateReferencedFonts(List fontInfoList) {
Matcher matcher = getReferencedFontsMatcher();
+ updateReferencedFonts(fontInfoList, matcher);
+ }
+
+ /**
+ * Updates the referenced font list.
+ * @param fontInfoList a font info list
+ * @param matcher the font triplet matcher to use
+ */
+ public void updateReferencedFonts(List fontInfoList, Matcher matcher) {
if (matcher == null) {
return; //No referenced fonts
}
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/fonts/FontManagerConfigurator.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/fonts/FontManagerConfigurator.java?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/fonts/FontManagerConfigurator.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/fonts/FontManagerConfigurator.java Tue Oct 13 16:41:13 2009
@@ -93,16 +93,25 @@
// referenced fonts (fonts which are not to be embedded)
Configuration referencedFontsCfg = fontsCfg.getChild("referenced-fonts", false);
if (referencedFontsCfg != null) {
- createReferencedFontsMatcher(referencedFontsCfg, strict, fontManager);
+ FontTriplet.Matcher matcher = createFontsMatcher(
+ referencedFontsCfg, strict);
+ fontManager.setReferencedFontsMatcher(matcher);
}
}
}
- private static void createReferencedFontsMatcher(Configuration referencedFontsCfg,
- boolean strict, FontManager fontManager) throws FOPException {
+ /**
+ * Creates a font triplet matcher from a configuration object.
+ * @param cfg the configuration object
+ * @param strict true for strict configuraton error handling
+ * @return the font matcher
+ * @throws FOPException if an error occurs while building the matcher
+ */
+ public static FontTriplet.Matcher createFontsMatcher(
+ Configuration cfg, boolean strict) throws FOPException {
List matcherList = new java.util.ArrayList();
- Configuration[] matches = referencedFontsCfg.getChildren("match");
+ Configuration[] matches = cfg.getChildren("match");
for (int i = 0; i < matches.length; i++) {
try {
matcherList.add(new FontFamilyRegExFontTripletMatcher(
@@ -115,7 +124,7 @@
FontTriplet.Matcher orMatcher = new OrFontTripletMatcher(
(FontTriplet.Matcher[])matcherList.toArray(
new FontTriplet.Matcher[matcherList.size()]));
- fontManager.setReferencedFontsMatcher(orMatcher);
+ return orMatcher;
}
private static class OrFontTripletMatcher implements FontTriplet.Matcher {
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java Tue Oct 13 16:41:13 2009
@@ -1021,7 +1021,7 @@
/**
* {@inheritDoc}
- * Default implementation throws {@code IllegalStateException}
+ * Default implementation throws a {@link IllegalStateException}.
* Must be implemented by the subclass, if applicable.
*/
public KeepProperty getKeepTogetherProperty() {
@@ -1030,7 +1030,7 @@
/**
* {@inheritDoc}
- * Default implementation throws {@code IllegalStateException}
+ * Default implementation throws a {@link IllegalStateException}.
* Must be implemented by the subclass, if applicable.
*/
public KeepProperty getKeepWithPreviousProperty() {
@@ -1039,7 +1039,7 @@
/**
* {@inheritDoc}
- * Default implementation throws {@code IllegalStateException}
+ * Default implementation throws a {@link IllegalStateException}.
* Must be implemented by the subclass, if applicable.
*/
public KeepProperty getKeepWithNextProperty() {
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/layoutmgr/KnuthPenalty.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/layoutmgr/KnuthPenalty.java?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/layoutmgr/KnuthPenalty.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/layoutmgr/KnuthPenalty.java Tue Oct 13 16:41:13 2009
@@ -86,12 +86,12 @@
}
/**
- * Get the penalty's value as a {@code java.lang.String}.
- * (Mainly used in {@code toString()} methods, to improve readability
+ * Get the penalty's value as a {@link java.lang.String}.
+ * (Mainly used in {@link #toString()} methods, to improve readability
* of the trace logs.)
*
* @param penaltyValue the penalty value
- * @return the penalty value as a {@code java.lang.String}
+ * @return the penalty value as a {@link java.lang.String}
*/
protected static String valueOf(int penaltyValue) {
String result = (penaltyValue < 0) ? "-" : "";
Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java
('svn:executable' removed)
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/ImageHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/ImageHandler.java?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/ImageHandler.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/ImageHandler.java Tue Oct 13 16:41:13 2009
@@ -23,6 +23,7 @@
import java.io.IOException;
import org.apache.xmlgraphics.image.loader.Image;
+import org.apache.xmlgraphics.image.loader.impl.ImageXMLDOM;
/**
* This interface is a service provider interface for image handlers.
@@ -33,7 +34,7 @@
* Indicates whether the image handler is compatible with the indicated target represented
* by the rendering context object and with the image to be processed. The image is also
* passed as a parameter because a handler might not support every subtype of image that is
- * presented. For example: in the case of {@code ImageXMLDOM}, the image might carry an SVG
+ * presented. For example: in the case of {@link ImageXMLDOM}, the image might carry an SVG
* or some other XML format. One handler might only handle SVG but no other XML format.
* @param targetContext the target rendering context
* @param image the image to be processed (or null if only to check based on the rendering
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/ImageHandlerRegistry.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/ImageHandlerRegistry.java?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/ImageHandlerRegistry.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/ImageHandlerRegistry.java Tue Oct 13 16:41:13 2009
@@ -50,7 +50,7 @@
}
};
- /** Map containing image handlers for various {@code Image} subclasses. */
+ /** Map containing image handlers for various {@link Image} subclasses. */
private Map handlers = new java.util.HashMap();
/** List containing the same handlers as above but ordered by priority */
private List handlerList = new java.util.LinkedList();
@@ -112,7 +112,7 @@
}
/**
- * Returns an {@code ImageHandler} which handles an specific image type given the MIME type
+ * Returns an {@link ImageHandler} which handles an specific image type given the MIME type
* of the image.
* @param targetContext the target rendering context that is used for identifying compatibility
* @param image the Image to be handled
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/PrintRendererConfigurator.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/PrintRendererConfigurator.java?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/PrintRendererConfigurator.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/PrintRendererConfigurator.java Tue Oct 13 16:41:13 2009
@@ -29,6 +29,7 @@
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.apps.FopFactory;
import org.apache.fop.fonts.CustomFontCollection;
+import org.apache.fop.fonts.EmbedFontInfo;
import org.apache.fop.fonts.FontCollection;
import org.apache.fop.fonts.FontEventAdapter;
import org.apache.fop.fonts.FontEventListener;
@@ -84,7 +85,7 @@
* @param cfg the configuration object
* @param fontResolver a font resolver
* @param listener the font event listener
- * @return the list of {@code EmbedFontInfo} objects
+ * @return the list of {@link EmbedFontInfo} objects
* @throws FOPException if an error occurs while processing the configuration
*/
protected List/*<EmbedFontInfo>*/ buildFontList(Configuration cfg, FontResolver fontResolver,
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/RendererFactory.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/RendererFactory.java?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/RendererFactory.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/RendererFactory.java Tue Oct 13 16:41:13 2009
@@ -368,10 +368,10 @@
}
/**
- * Creates a {@code IFDocumentHandler} object based on the desired output format.
+ * Creates a {@link IFDocumentHandler} object based on the desired output format.
* @param userAgent the user agent for access to configuration
* @param outputFormat the MIME type of the output format to use (ex. "application/pdf").
- * @return the new {@code IFDocumentHandler} instance
+ * @return the new {@link IFDocumentHandler} instance
* @throws FOPException if the document handler cannot be properly constructed
*/
public IFDocumentHandler createDocumentHandler(FOUserAgent userAgent, String outputFormat)
@@ -464,7 +464,7 @@
}
/**
- * Discovers {@code IFDocumentHandler} implementations through the classpath and dynamically
+ * Discovers {@link IFDocumentHandler} implementations through the classpath and dynamically
* registers them.
*/
private void discoverDocumentHandlers() {
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/afp/AFPDocumentHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/afp/AFPDocumentHandler.java?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/afp/AFPDocumentHandler.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/afp/AFPDocumentHandler.java Tue Oct 13 16:41:13 2009
@@ -47,13 +47,15 @@
import org.apache.fop.render.afp.extensions.AFPIncludeFormMap;
import org.apache.fop.render.afp.extensions.AFPInvokeMediumMap;
import org.apache.fop.render.afp.extensions.AFPPageSetup;
+import org.apache.fop.render.afp.extensions.AFPPageOverlay;
import org.apache.fop.render.intermediate.AbstractBinaryWritingIFDocumentHandler;
+import org.apache.fop.render.intermediate.IFDocumentHandler;
import org.apache.fop.render.intermediate.IFDocumentHandlerConfigurator;
import org.apache.fop.render.intermediate.IFException;
import org.apache.fop.render.intermediate.IFPainter;
/**
- * {@code IFDocumentHandler} implementation that produces AFP (MO:DCA).
+ * {@link IFDocumentHandler} implementation that produces AFP (MO:DCA).
*/
public class AFPDocumentHandler extends AbstractBinaryWritingIFDocumentHandler
implements AFPCustomizable {
@@ -285,12 +287,7 @@
"AFP page setup extension encountered outside the page header: " + aps,
null);
}
- if (AFPElementMapping.INCLUDE_PAGE_OVERLAY.equals(element)) {
- String overlay = aps.getName();
- if (overlay != null) {
- dataStream.createIncludePageOverlay(overlay);
- }
- } else if (AFPElementMapping.INCLUDE_PAGE_SEGMENT.equals(element)) {
+ if (AFPElementMapping.INCLUDE_PAGE_SEGMENT.equals(element)) {
String name = aps.getName();
String source = aps.getValue();
pageSegmentMap.put(source, name);
@@ -301,6 +298,17 @@
}
}
}
+ } else if (extension instanceof AFPPageOverlay) {
+ AFPPageOverlay ipo = (AFPPageOverlay)extension;
+ if (this.location != LOC_IN_PAGE_HEADER) {
+ throw new IFException(
+ "AFP page overlay extension encountered outside the page header: " + ipo,
+ null);
+ }
+ String overlay = ipo.getName();
+ if (overlay != null) {
+ dataStream.createIncludePageOverlay(overlay, ipo.getX(), ipo.getY());
+ }
} else if (extension instanceof AFPInvokeMediumMap) {
if (this.location != LOC_FOLLOWING_PAGE_SEQUENCE
&& this.location != LOC_IN_PAGE_HEADER) {
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/afp/AFPRenderer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/afp/AFPRenderer.java?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/afp/AFPRenderer.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/afp/AFPRenderer.java Tue Oct 13 16:41:13 2009
@@ -91,6 +91,7 @@
import org.apache.fop.render.afp.extensions.AFPIncludeFormMap;
import org.apache.fop.render.afp.extensions.AFPInvokeMediumMap;
import org.apache.fop.render.afp.extensions.AFPPageSetup;
+import org.apache.fop.render.afp.extensions.AFPPageOverlay;
/**
* This is an implementation of a FOP Renderer that renders areas to AFP.
@@ -758,12 +759,7 @@
if (attachment instanceof AFPPageSetup) {
AFPPageSetup aps = (AFPPageSetup) attachment;
String element = aps.getElementName();
- if (AFPElementMapping.INCLUDE_PAGE_OVERLAY.equals(element)) {
- String overlay = aps.getName();
- if (overlay != null) {
- dataStream.createIncludePageOverlay(overlay);
- }
- } else if (AFPElementMapping.INCLUDE_PAGE_SEGMENT
+ if (AFPElementMapping.INCLUDE_PAGE_SEGMENT
.equals(element)) {
String name = aps.getName();
String source = aps.getValue();
@@ -779,6 +775,15 @@
dataStream.createNoOperation(content);
}
}
+ } else if (attachment instanceof AFPPageOverlay) {
+ AFPPageOverlay ipo = (AFPPageOverlay) attachment;
+ String element = ipo.getElementName();
+ if (AFPElementMapping.INCLUDE_PAGE_OVERLAY.equals(element)) {
+ String overlay = ipo.getName();
+ if (overlay != null) {
+ dataStream.createIncludePageOverlay(overlay, ipo.getX(), ipo.getY());
+ }
+ }
}
}
}
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/afp/AFPRendererConfigurator.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/afp/AFPRendererConfigurator.java?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/afp/AFPRendererConfigurator.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/afp/AFPRendererConfigurator.java Tue Oct 13 16:41:13 2009
@@ -43,6 +43,7 @@
import org.apache.fop.fonts.FontCollection;
import org.apache.fop.fonts.FontInfo;
import org.apache.fop.fonts.FontManager;
+import org.apache.fop.fonts.FontManagerConfigurator;
import org.apache.fop.fonts.FontTriplet;
import org.apache.fop.fonts.FontUtil;
import org.apache.fop.fonts.Typeface;
@@ -71,9 +72,7 @@
throws ConfigurationException {
FontManager fontManager = this.userAgent.getFactory().getFontManager();
- FontTriplet.Matcher referencedFontsMatcher = fontManager.getReferencedFontsMatcher();
- boolean embeddable = true;
Configuration[] triple = fontCfg.getChildren("font-triplet");
List/*<FontTriplet>*/ tripletList = new java.util.ArrayList/*<FontTriplet>*/();
if (triple.length == 0) {
@@ -85,9 +84,6 @@
FontTriplet triplet = new FontTriplet(triple[j].getAttribute("name"),
triple[j].getAttribute("style"),
weight);
- if (referencedFontsMatcher != null && referencedFontsMatcher.matches(triplet)) {
- embeddable = false;
- }
tripletList.add(triplet);
}
@@ -142,7 +138,6 @@
// Create a new font object
RasterFont font = new RasterFont(name);
- font.setEmbeddable(embeddable);
Configuration[] rasters = afpFontCfg.getChildren("afp-raster-font");
if (rasters.length == 0) {
@@ -220,7 +215,6 @@
}
// Create a new font object
OutlineFont font = new OutlineFont(name, characterSet);
- font.setEmbeddable(embeddable);
return new AFPFontInfo(font, tripletList);
} else {
log.error("No or incorrect type attribute");
@@ -236,24 +230,49 @@
* @throws ConfigurationException if something's wrong with the config data
*/
private List/*<AFPFontInfo>*/ buildFontListFromConfiguration(Configuration cfg)
- throws ConfigurationException {
+ throws FOPException, ConfigurationException {
+
+ Configuration fonts = cfg.getChild("fonts");
+ FontManager fontManager = this.userAgent.getFactory().getFontManager();
+
+ // General matcher
+ FontTriplet.Matcher referencedFontsMatcher = fontManager.getReferencedFontsMatcher();
+ // Renderer-specific matcher
+ FontTriplet.Matcher localMatcher = null;
+
+ // Renderer-specific referenced fonts
+ Configuration referencedFontsCfg = fonts.getChild("referenced-fonts", false);
+ if (referencedFontsCfg != null) {
+ localMatcher = FontManagerConfigurator.createFontsMatcher(
+ referencedFontsCfg, this.userAgent.getFactory().validateUserConfigStrictly());
+ }
+
List/*<AFPFontInfo>*/ fontList = new java.util.ArrayList();
- Configuration[] font = cfg.getChild("fonts").getChildren("font");
+ Configuration[] font = fonts.getChildren("font");
final String fontPath = null;
for (int i = 0; i < font.length; i++) {
AFPFontInfo afi = buildFont(font[i], fontPath);
if (afi != null) {
if (log.isDebugEnabled()) {
log.debug("Adding font " + afi.getAFPFont().getFontName());
- List/*<FontTriplet>*/ fontTriplets = afi.getFontTriplets();
- for (int j = 0; j < fontTriplets.size(); ++j) {
- FontTriplet triplet = (FontTriplet) fontTriplets.get(j);
+ }
+ List/*<FontTriplet>*/ fontTriplets = afi.getFontTriplets();
+ for (int j = 0; j < fontTriplets.size(); ++j) {
+ FontTriplet triplet = (FontTriplet) fontTriplets.get(j);
+ if (log.isDebugEnabled()) {
log.debug(" Font triplet "
+ triplet.getName() + ", "
+ triplet.getStyle() + ", "
+ triplet.getWeight());
}
+
+ if ((referencedFontsMatcher != null && referencedFontsMatcher.matches(triplet))
+ || (localMatcher != null && localMatcher.matches(triplet))) {
+ afi.getAFPFont().setEmbeddable(false);
+ break;
+ }
}
+
fontList.add(afi);
}
}
Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/afp/extensions/AFPAttribute.java
('svn:executable' removed)
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/afp/extensions/AFPElementMapping.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/afp/extensions/AFPElementMapping.java?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/afp/extensions/AFPElementMapping.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/afp/extensions/AFPElementMapping.java Tue Oct 13 16:41:13 2009
@@ -97,7 +97,7 @@
static class AFPIncludePageOverlayMaker extends ElementMapping.Maker {
public FONode make(FONode parent) {
- return new AFPPageSetupElement(parent, INCLUDE_PAGE_OVERLAY);
+ return new AFPPageOverlayElement(parent, INCLUDE_PAGE_OVERLAY);
}
}
Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/afp/extensions/AFPElementMapping.java
('svn:executable' removed)
Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/afp/extensions/AFPPageSetupElement.java
('svn:executable' removed)
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/bitmap/BitmapRenderingSettings.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/bitmap/BitmapRenderingSettings.java?rev=824839&r1=824838&r2=824839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/bitmap/BitmapRenderingSettings.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/bitmap/BitmapRenderingSettings.java Tue Oct 13 16:41:13 2009
@@ -47,7 +47,6 @@
*/
public BitmapRenderingSettings() {
writerParams = new ImageWriterParams();
- writerParams.setCompressionMethod(COMPRESSION_PACKBITS);
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org