xmlgraphics-fop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerem...@apache.org
Subject svn commit: r746664 [1/8] - in /xmlgraphics/fop/trunk: ./ examples/embedding/java/embedding/atxml/ examples/embedding/java/embedding/intermediate/ examples/embedding/xml/xslt/ examples/plan/src/org/apache/fop/plan/ lib/ src/documentation/content/xdocs/...
Date Sun, 22 Feb 2009 12:40:55 GMT
Author: jeremias
Date: Sun Feb 22 12:40:44 2009
New Revision: 746664

URL: http://svn.apache.org/viewvc?rev=746664&view=rev
Log:
Merged feature branch https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign (603620-746655) into Trunk.
This adds a new intermediate format to FOP. Please see the documentation for details.

Added:
    xmlgraphics/fop/trunk/examples/embedding/java/embedding/atxml/
      - copied from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/examples/embedding/java/embedding/atxml/
    xmlgraphics/fop/trunk/examples/embedding/java/embedding/atxml/ExampleConcat.java   (props changed)
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/examples/embedding/java/embedding/atxml/ExampleConcat.java
    xmlgraphics/fop/trunk/examples/embedding/java/embedding/atxml/ExampleStamp.java   (props changed)
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/examples/embedding/java/embedding/atxml/ExampleStamp.java
    xmlgraphics/fop/trunk/examples/embedding/xml/xslt/ifstamp.xsl   (props changed)
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/examples/embedding/xml/xslt/ifstamp.xsl
    xmlgraphics/fop/trunk/src/documentation/intermediate-format-ng/fop-intermediate-format-ng-nav.xsd
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/intermediate-format-ng/fop-intermediate-format-ng-nav.xsd
    xmlgraphics/fop/trunk/src/documentation/resources/images/if-architecture-overview.png
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/resources/images/if-architecture-overview.png
    xmlgraphics/fop/trunk/src/documentation/resources/images/svg/if-architecture-overview.svg
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/resources/images/svg/if-architecture-overview.svg
    xmlgraphics/fop/trunk/src/java/META-INF/services/org.apache.fop.render.ImageHandler
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/META-INF/services/org.apache.fop.render.ImageHandler
    xmlgraphics/fop/trunk/src/java/META-INF/services/org.apache.fop.render.intermediate.IFDocumentHandler   (props changed)
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/META-INF/services/org.apache.fop.render.intermediate.IFDocumentHandler
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/IncludedResourceObject.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/afp/modca/IncludedResourceObject.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/ptoca/
      - copied from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/afp/ptoca/
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/ptoca/LineDataInfoProducer.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/afp/ptoca/LineDataInfoProducer.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/ptoca/PtocaBuilder.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/afp/ptoca/PtocaBuilder.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/ptoca/PtocaConstants.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/afp/ptoca/PtocaConstants.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/ptoca/PtocaProducer.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/afp/ptoca/PtocaProducer.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/ptoca/TextDataInfoProducer.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/afp/ptoca/TextDataInfoProducer.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/ptoca/package.html
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/afp/ptoca/package.html
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/util/DefaultFOPResourceAccessor.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/afp/util/DefaultFOPResourceAccessor.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/util/ResourceAccessor.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/afp/util/ResourceAccessor.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/util/SimpleResourceAccessor.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/afp/util/SimpleResourceAccessor.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/IFInputHandler.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/cli/IFInputHandler.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/image/loader/batik/BatikImageFlavors.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/image/loader/batik/BatikImageFlavors.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/image/loader/batik/ImageConverterG2D2SVG.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/image/loader/batik/ImageConverterG2D2SVG.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractImageHandlerGraphics2D.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/AbstractImageHandlerGraphics2D.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractRenderingContext.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/AbstractRenderingContext.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ImageHandler.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/ImageHandler.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ImageHandlerBase.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/ImageHandlerBase.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ImageHandlerRegistry.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/ImageHandlerRegistry.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ImageHandlerUtil.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/ImageHandlerUtil.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/RenderingContext.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/RenderingContext.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPCustomizable.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/afp/AFPCustomizable.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPDocumentHandler.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/afp/AFPDocumentHandler.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPDocumentHandlerMaker.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/afp/AFPDocumentHandlerMaker.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPEventProducer.xml
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/afp/AFPEventProducer.xml
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPImageHandlerSVG.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/afp/AFPImageHandlerSVG.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPPainter.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/afp/AFPPainter.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPRenderingContext.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/afp/AFPRenderingContext.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/BitmapRenderingSettings.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/bitmap/BitmapRenderingSettings.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/TIFFConstants.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/bitmap/TIFFConstants.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/TIFFDocumentHandler.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/bitmap/TIFFDocumentHandler.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/TIFFDocumentHandlerMaker.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/bitmap/TIFFDocumentHandlerMaker.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/
      - copied from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/intermediate/
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/AbstractBinaryWritingIFDocumentHandler.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/intermediate/AbstractBinaryWritingIFDocumentHandler.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/AbstractIFDocumentHandler.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/intermediate/AbstractIFDocumentHandler.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/AbstractIFDocumentHandlerMaker.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/intermediate/AbstractIFDocumentHandlerMaker.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/AbstractIFPainter.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/intermediate/AbstractIFPainter.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/AbstractXMLWritingIFDocumentHandler.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/intermediate/AbstractXMLWritingIFDocumentHandler.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/AffineTransformArrayParser.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/intermediate/AffineTransformArrayParser.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/BorderPainter.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/intermediate/BorderPainter.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/DelegatingFragmentContentHandler.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/intermediate/DelegatingFragmentContentHandler.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFConstants.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/intermediate/IFConstants.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFContentHandler.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/intermediate/IFContentHandler.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFContext.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/intermediate/IFContext.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFDocumentHandler.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/intermediate/IFDocumentHandler.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFDocumentHandlerConfigurator.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/intermediate/IFDocumentHandlerConfigurator.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFDocumentNavigationHandler.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/intermediate/IFDocumentNavigationHandler.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFException.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/intermediate/IFException.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFGraphicContext.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/intermediate/IFGraphicContext.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFPainter.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/intermediate/IFPainter.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFParser.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/intermediate/IFParser.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFRenderer.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/intermediate/IFRenderer.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFSerializer.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/intermediate/IFSerializer.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFSerializerMaker.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/intermediate/IFSerializerMaker.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFState.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/intermediate/IFState.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFUtil.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/intermediate/IFUtil.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/extensions/
      - copied from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/intermediate/extensions/
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/extensions/AbstractAction.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/intermediate/extensions/AbstractAction.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/extensions/ActionSet.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/intermediate/extensions/ActionSet.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/extensions/Bookmark.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/intermediate/extensions/Bookmark.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/extensions/BookmarkTree.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/intermediate/extensions/BookmarkTree.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/extensions/DocumentNavigationExtensionConstants.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/intermediate/extensions/DocumentNavigationExtensionConstants.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/extensions/DocumentNavigationHandler.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/intermediate/extensions/DocumentNavigationHandler.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/extensions/GoToXYAction.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/intermediate/extensions/GoToXYAction.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/extensions/Link.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/intermediate/extensions/Link.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/extensions/NamedDestination.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/intermediate/extensions/NamedDestination.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/extensions/URIAction.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/intermediate/extensions/URIAction.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/util/
      - copied from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/intermediate/util/
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/util/IFConcatenator.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/intermediate/util/IFConcatenator.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/util/IFDocumentHandlerProxy.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/intermediate/util/IFDocumentHandlerProxy.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DBorderPainter.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/java2d/Java2DBorderPainter.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DImageHandlerGraphics2D.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/java2d/Java2DImageHandlerGraphics2D.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DImageHandlerRenderedImage.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/java2d/Java2DImageHandlerRenderedImage.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DPainter.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/java2d/Java2DPainter.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DRenderingContext.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/java2d/Java2DRenderingContext.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DRenderingSettings.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/java2d/Java2DRenderingSettings.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DUtil.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/java2d/Java2DUtil.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/HardcodedFonts.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/pcl/HardcodedFonts.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLConstants.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/pcl/PCLConstants.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLDocumentHandler.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/pcl/PCLDocumentHandler.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLDocumentHandlerMaker.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/pcl/PCLDocumentHandlerMaker.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLImageHandlerGraphics2D.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/pcl/PCLImageHandlerGraphics2D.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLImageHandlerRenderedImage.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/pcl/PCLImageHandlerRenderedImage.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLPainter.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/pcl/PCLPainter.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLRenderingContext.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/pcl/PCLRenderingContext.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLRenderingMode.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/pcl/PCLRenderingMode.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLRenderingUtil.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/pcl/PCLRenderingUtil.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFBorderPainter.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/pdf/PDFBorderPainter.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFConfigurationConstants.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/pdf/PDFConfigurationConstants.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFContentGenerator.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/pdf/PDFContentGenerator.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFDocumentHandler.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/pdf/PDFDocumentHandler.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFDocumentHandlerMaker.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/pdf/PDFDocumentHandlerMaker.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFDocumentNavigationHandler.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/pdf/PDFDocumentNavigationHandler.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFImageHandlerSVG.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/pdf/PDFImageHandlerSVG.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFPainter.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/pdf/PDFPainter.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRenderingContext.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/pdf/PDFRenderingContext.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRenderingUtil.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/pdf/PDFRenderingUtil.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/FOPProcSet.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/ps/FOPProcSet.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSBorderPainter.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/ps/PSBorderPainter.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSConfigurationConstants.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/ps/PSConfigurationConstants.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSDocumentHandler.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/ps/PSDocumentHandler.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSDocumentHandlerMaker.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/ps/PSDocumentHandlerMaker.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSImageHandler.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/ps/PSImageHandler.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSImageHandlerEPS.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/ps/PSImageHandlerEPS.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSImageHandlerGraphics2D.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/ps/PSImageHandlerGraphics2D.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSImageHandlerRawCCITTFax.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/ps/PSImageHandlerRawCCITTFax.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSImageHandlerRawJPEG.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/ps/PSImageHandlerRawJPEG.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSImageHandlerRenderedImage.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/ps/PSImageHandlerRenderedImage.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSImageHandlerSVG.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/ps/PSImageHandlerSVG.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSPainter.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/ps/PSPainter.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSRenderingContext.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/ps/PSRenderingContext.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSRenderingUtil.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/ps/PSRenderingUtil.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/traits/BorderStyle.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/traits/BorderStyle.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/traits/RuleStyle.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/traits/RuleStyle.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/traits/TraitEnum.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/traits/TraitEnum.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/util/DecimalFormatCache.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/DecimalFormatCache.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/util/GenerationHelperContentHandler.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/GenerationHelperContentHandler.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/util/XMLConstants.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/XMLConstants.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/util/XMLUtil.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/XMLUtil.java
    xmlgraphics/fop/trunk/src/sandbox/META-INF/services/org.apache.fop.render.ImageHandler
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/sandbox/META-INF/services/org.apache.fop.render.ImageHandler
    xmlgraphics/fop/trunk/src/sandbox/META-INF/services/org.apache.fop.render.intermediate.IFDocumentHandler
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/sandbox/META-INF/services/org.apache.fop.render.intermediate.IFDocumentHandler
    xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/AbstractSVGDocumentHandler.java   (props changed)
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/sandbox/org/apache/fop/render/svg/AbstractSVGDocumentHandler.java
    xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/EmbeddedSVGImageHandler.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/sandbox/org/apache/fop/render/svg/EmbeddedSVGImageHandler.java
    xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGConstants.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/sandbox/org/apache/fop/render/svg/SVGConstants.java
    xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGDataUrlImageHandler.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/sandbox/org/apache/fop/render/svg/SVGDataUrlImageHandler.java
    xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGDocumentHandler.java   (props changed)
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/sandbox/org/apache/fop/render/svg/SVGDocumentHandler.java
    xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGDocumentHandlerMaker.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/sandbox/org/apache/fop/render/svg/SVGDocumentHandlerMaker.java
    xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGPainter.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/sandbox/org/apache/fop/render/svg/SVGPainter.java
    xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGPrintDocumentHandler.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/sandbox/org/apache/fop/render/svg/SVGPrintDocumentHandler.java
    xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGPrintDocumentHandlerMaker.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/sandbox/org/apache/fop/render/svg/SVGPrintDocumentHandlerMaker.java
    xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGRenderingContext.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/sandbox/org/apache/fop/render/svg/SVGRenderingContext.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/AbstractIntermediateTestCase.java   (props changed)
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/intermediate/AbstractIntermediateTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/AreaTreeXMLFormatTestSuite.java   (props changed)
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/intermediate/AreaTreeXMLFormatTestSuite.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/IFCheck.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/intermediate/IFCheck.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/IFParserTestCase.java   (props changed)
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/intermediate/IFParserTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/IFTester.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/intermediate/IFTester.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/layoutengine/TestEnvironment.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/layoutengine/TestEnvironment.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/render/ps/
      - copied from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/render/ps/
    xmlgraphics/fop/trunk/test/java/org/apache/fop/render/ps/AbstractPostScriptTestCase.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/render/ps/AbstractPostScriptTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/render/ps/ImageHandlingTestCase.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/render/ps/ImageHandlingTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/render/ps/ResourceOptimizationTestCase.java
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/render/ps/ResourceOptimizationTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/render/ps/ps-jpeg-image.fo
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/render/ps/ps-jpeg-image.fo
    xmlgraphics/fop/trunk/test/java/org/apache/fop/render/ps/ps-resources.fo
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/render/ps/ps-resources.fo
    xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/pcl-extension_1.xml
      - copied unchanged from r746655, xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/layoutengine/standard-testcases/pcl-extension_1.xml
Removed:
    xmlgraphics/fop/trunk/src/sandbox/META-INF/services/org.apache.fop.render.Renderer
Modified:
    xmlgraphics/fop/trunk/   (props changed)
    xmlgraphics/fop/trunk/build.xml
    xmlgraphics/fop/trunk/examples/embedding/java/embedding/intermediate/ExampleConcat.java
    xmlgraphics/fop/trunk/examples/embedding/java/embedding/intermediate/ExampleStamp.java
    xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/PreloaderPlan.java
    xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/SimplePlanDrawer.java
    xmlgraphics/fop/trunk/lib/xmlgraphics-commons-1.4svn.jar
    xmlgraphics/fop/trunk/src/documentation/content/xdocs/trunk/intermediate.xml
    xmlgraphics/fop/trunk/src/documentation/intermediate-format-ng/example1.xml
    xmlgraphics/fop/trunk/src/documentation/intermediate-format-ng/fop-intermediate-format-ng-content.xsd
    xmlgraphics/fop/trunk/src/documentation/intermediate-format-ng/fop-intermediate-format-ng-datatypes.xsd
    xmlgraphics/fop/trunk/src/documentation/intermediate-format-ng/fop-intermediate-format-ng.xsd
    xmlgraphics/fop/trunk/src/java/META-INF/services/org.apache.fop.render.Renderer
    xmlgraphics/fop/trunk/src/java/META-INF/services/org.apache.xmlgraphics.image.loader.spi.ImageConverter
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPBorderPainter.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPConstants.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPDataObjectFactory.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPDataObjectInfo.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPEventProducer.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPGraphics2D.java   (contents, props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPGraphicsObjectInfo.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPImageObjectInfo.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPLineDataInfo.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPObjectAreaInfo.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPPaintingState.java   (contents, props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPRectanglePainter.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPResourceInfo.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPResourceLevel.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPResourceManager.java   (contents, props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPStreamer.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPTextDataInfo.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPUnitConverter.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AbstractAFPPainter.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/BorderPaintingInfo.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/DataStream.java   (contents, props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/Factory.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/PaintingInfo.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/RectanglePaintingInfo.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/Streamable.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/StructuredData.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/AFPBase12FontCollection.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/AFPFont.java   (contents, props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/AFPFontAttributes.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/AFPFontCollection.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/AFPFontInfo.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/AFPFontReader.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/AFPPageFonts.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/CharacterSet.java   (contents, props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/CharacterSetOrientation.java   (contents, props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/FontRuntimeException.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/FopCharacterSet.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/OutlineFont.java   (contents, props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/RasterFont.java   (contents, props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/goca/AbstractGraphicsCoord.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/goca/AbstractGraphicsDrawingOrderContainer.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/goca/GraphicsBox.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/goca/GraphicsChainedSegment.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/goca/GraphicsCharacterString.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/goca/GraphicsData.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/goca/GraphicsFillet.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/goca/GraphicsFullArc.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/goca/GraphicsImage.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/goca/GraphicsLine.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/goca/GraphicsSetArcParameters.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/goca/GraphicsSetCharacterSet.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/goca/GraphicsSetCurrentPosition.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/goca/GraphicsSetLineType.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/goca/GraphicsSetLineWidth.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/goca/GraphicsSetMix.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/goca/GraphicsSetPatternSymbol.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/goca/GraphicsSetProcessColor.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/ioca/ImageCellPosition.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/ioca/ImageContent.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/ioca/ImageInputDescriptor.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/ioca/ImageOutputControl.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/ioca/ImageRasterData.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/ioca/ImageRasterPattern.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/ioca/ImageSegment.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/ioca/ImageSizeParameter.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/AbstractAFPObject.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/AbstractDataObject.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/AbstractDescriptor.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/AbstractEnvironmentGroup.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/AbstractNamedAFPObject.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/AbstractPageObject.java   (contents, props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/AbstractResourceEnvironmentGroupContainer.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/AbstractResourceGroupContainer.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/AbstractStructuredObject.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/ActiveEnvironmentGroup.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/ContainerDataDescriptor.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/Document.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/GraphicsDataDescriptor.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/GraphicsObject.java   (contents, props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/IMImageObject.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/ImageDataDescriptor.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/ImageObject.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/IncludeObject.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/IncludePageOverlay.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/IncludePageSegment.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/InterchangeSet.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/InvokeMediumMap.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/MapCodedFont.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/MapContainerData.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/MapDataResource.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/MapPageOverlay.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/MaximumSizeExceededException.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/NoOperation.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/ObjectAreaDescriptor.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/ObjectAreaPosition.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/ObjectContainer.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/ObjectEnvironmentGroup.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/Overlay.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/PageDescriptor.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/PageGroup.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/PageObject.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/PageSegment.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/PreprocessPresentationObject.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/PresentationEnvironmentControl.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/PresentationTextData.java   (contents, props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/PresentationTextDescriptor.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/PresentationTextObject.java   (contents, props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/Registry.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/ResourceEnvironmentGroup.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/ResourceGroup.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/ResourceObject.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/StreamedResourceGroup.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/TagLogicalElement.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/TagLogicalElementBean.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/triplets/AbstractTriplet.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/triplets/ExtendedResourceLocalIdentifierTriplet.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/triplets/FullyQualifiedNameTriplet.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/triplets/MappingOptionTriplet.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/triplets/MeasurementUnitsTriplet.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/triplets/ObjectAreaSizeTriplet.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/triplets/ObjectByteExtentTriplet.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/triplets/ObjectClassificationTriplet.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/triplets/PresentationSpaceMixingRulesTriplet.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/triplets/PresentationSpaceResetMixingTriplet.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/triplets/ResourceObjectTypeTriplet.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/svg/AFPGraphicsConfiguration.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/svg/AFPGraphicsDevice.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/svg/AFPImageElementBridge.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/svg/AFPTextElementBridge.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/svg/AFPTextHandler.java   (contents, props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/svg/AFPTextPainter.java   (contents, props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/util/BinaryUtils.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/util/DTDEntityResolver.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/util/StringUtils.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/util/StructuredFieldReader.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FOUserAgent.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactory.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/MimeConstants.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AreaTreeParser.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Page.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/area/RegionReference.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/AreaTreeInputHandler.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/CommandLineOptions.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/XMLObj.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontLoader.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/LazyFont.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/autodetect/FontInfoFinder.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/truetype/TTFFontLoader.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/type1/Type1FontLoader.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/image/loader/batik/Graphics2DImagePainterImpl.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/image/loader/batik/PreloaderSVG.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFNumber.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFPaintingState.java   (contents, props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFReference.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFTextUtil.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFUri.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractGenericSVGHandler.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractImageHandlerRegistry.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractRenderer.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractRendererConfigurator.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/Graphics2DImagePainter.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ImageAdapter.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/PrintRenderer.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/PrintRendererConfigurator.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/Renderer.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/RendererContext.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/RendererFactory.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPForeignAttributeReader.java   (contents, props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPImageHandler.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPImageHandlerGraphics2D.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPImageHandlerRawCCITTFax.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPImageHandlerRawStream.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPImageHandlerRenderedImage.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPRenderer.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPRendererConfigurator.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPRendererContext.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPRendererImageInfo.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPSVGHandler.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AbstractAFPImageHandlerRawStream.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/TIFFRenderer.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/TIFFRendererConfigurator.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/ConfiguredFontCollection.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DFontMetrics.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DGraphicsState.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DRenderer.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DSVGHandler.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLGenerator.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLPageDefinition.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLRenderer.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLRendererConfigurator.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLRendererContext.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/extensions/PCLElementMapping.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/ImageRenderedAdapter.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFEventProducer.xml
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFGraphics2DAdapter.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFImageHandler.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFImageHandlerGraphics2D.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFImageHandlerRawCCITTFax.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFImageHandlerRawJPEG.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFImageHandlerRenderedImage.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRenderer.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRendererConfigurator.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRendererContextConstants.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFSVGHandler.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSGraphics2DAdapter.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSImageUtils.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSRenderer.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSRendererConfigurator.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSSVGHandler.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/ResourceHandler.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/xml/XMLRenderer.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/AbstractFOPTextPainter.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFGraphics2D.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFImageElementBridge.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/SVGUtilities.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/traits/BorderProps.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/util/AbstractPaintingState.java   (props changed)
    xmlgraphics/fop/trunk/src/java/org/apache/fop/util/ConversionUtils.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/util/DOM2SAX.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/util/DelegatingContentHandler.java
    xmlgraphics/fop/trunk/status.xml
    xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/AreaTreeParserTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/IntermediateFormatTestSuite.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/layoutengine/EvalCheck.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/layoutengine/LayoutEngineTester.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/layoutengine/TrueCheck.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/PDFObjectTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/util/ConsoleEventListenerForTests.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/visual/AbstractPSPDFBitmapProducer.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/visual/BatchDiffer.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/visual/BitmapProducer.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/visual/BitmapProducerJava2D.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/visual/BitmapProducerPDF.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/visual/BitmapProducerPS.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/visual/ReferenceBitmapLoader.java
    xmlgraphics/fop/trunk/test/layoutengine/disabled-testcases.xml
    xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/basic-link_background-image.xml
    xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_letter-spacing.xml
    xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/bookmarks_1.xml
    xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/fox_destination_1.xml
    xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/kerning_1_on.xml
    xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/ps-extension_1.xml
    xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/ps-extension_2.xml
    xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/simple-page-master_borders_padding.xml
    xmlgraphics/fop/trunk/test/layoutengine/testcase2checks.xsl
    xmlgraphics/fop/trunk/test/test.xconf
    xmlgraphics/fop/trunk/test/xsl/fo-replicator.xsl

Propchange: xmlgraphics/fop/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 22 12:40:44 2009
@@ -1,2 +1,3 @@
 /xmlgraphics/fop/branches/Temp_AFPGOCAResources:630874-721418
+/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign:603620-746655
 /xmlgraphics/fop/branches/fop-0_95:684572,688085,688696

Modified: xmlgraphics/fop/trunk/build.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/build.xml?rev=746664&r1=746663&r2=746664&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/build.xml (original)
+++ xmlgraphics/fop/trunk/build.xml Sun Feb 22 12:40:44 2009
@@ -592,11 +592,7 @@
       <include name="org/apache/fop/area/AreaTreeControl*"/>
       <include name="org/apache/fop/svg/**"/>
       <include name="org/apache/fop/fonts/**"/>
-      <include name="org/apache/fop/image/FopImag*.class"/>
-      <include name="org/apache/fop/image/Jpeg*"/>
-      <include name="org/apache/fop/image/EPS*"/>
-      <include name="org/apache/fop/image/Abstract*"/>
-      <include name="org/apache/fop/image/analyser/*.class"/>
+      <include name="org/apache/fop/image/loader/batik/BatikImageFlavors*.class"/>
       <include name="org/apache/fop/util/CMYKColorSpace*.class"/>
       <include name="org/apache/fop/util/Color*.class"/>
       <include name="org/apache/fop/util/ASCII*.class"/>
@@ -604,12 +600,14 @@
       <include name="org/apache/fop/util/SubInputStream.class"/>
       <include name="org/apache/fop/util/Finalizable.class"/>
       <include name="org/apache/fop/util/CharUtilities.class"/>
+      <include name="org/apache/fop/util/DecimalFormatCache*.class"/>
     </patternset>
 <!-- PDF transcoder -->
     <patternset>
       <include name="org/apache/fop/render/pdf/**"/>
       <exclude name="org/apache/fop/render/pdf/PDFRenderer.class"/>
       <exclude name="org/apache/fop/render/pdf/PDFXMLHandler*"/>
+      <include name="org/apache/fop/render/intermediate/IFDocumentHandlerConfigurator.class"/>
       <include name="org/apache/fop/render/*RendererConfigurator**"/>
       <include name="org/apache/fop/util/AbstractPaintingState**"/>
       <include name="org/apache/fop/pdf/**"/>
@@ -897,25 +895,44 @@
       <test name="org.apache.fop.fotreetest.FOTreeTestSuite" todir="${junit.reports.dir}" outfile="TEST-FO-tree"/>
     </junit>
   </target>
-  <target name="junit-intermediate-format" depends="junit-compile, junit-layout" description="Runs FOP's intermediate format JUnit tests" if="xmlunit.present">
-    <echo message="Running intermediate format tests"/>
-    <junit dir="${basedir}" haltonfailure="${junit.haltonfailure}" fork="${junit.fork}" errorproperty="fop.junit.error" failureproperty="fop.junit.failure">
-      <sysproperty key="basedir" value="${basedir}"/>
-      <sysproperty key="jawa.awt.headless" value="true"/>
-      <sysproperty key="fop.layoutengine.disabled" value="${layoutengine.disabled}"/>
-      <sysproperty key="fop.layoutengine.testset" value="standard"/>
-      <formatter type="brief" usefile="false"/>
-      <formatter type="plain" usefile="true"/>
-      <formatter type="xml" usefile="true"/>
-      <classpath>
-        <pathelement location="${build.dir}/test-classes"/>
-        <path refid="libs-build-tools-classpath"/>
-        <fileset dir="build">
-          <include name="fop.jar"/>
-        </fileset>
-      </classpath>
-      <test name="org.apache.fop.intermediate.IntermediateFormatTestSuite" todir="${junit.reports.dir}" outfile="TEST-intermediate-format"/>
-    </junit>
+  <macrodef name="junit-run">
+    <attribute name="title"/>
+    <element name="tests"/>
+    <sequential>
+      <echo message="Running @{title} tests..."/>
+      <junit dir="${basedir}" haltonfailure="${junit.haltonfailure}" fork="${junit.fork}" errorproperty="fop.junit.error" failureproperty="fop.junit.failure">
+        <sysproperty key="basedir" value="${basedir}"/>
+        <sysproperty key="jawa.awt.headless" value="true"/>
+        <sysproperty key="fop.layoutengine.disabled" value="${layoutengine.disabled}"/>
+        <formatter type="brief" usefile="false"/>
+        <formatter type="plain" usefile="true"/>
+        <formatter type="xml" usefile="true"/>
+        <classpath>
+          <pathelement location="${build.dir}/test-classes"/>
+          <path refid="libs-build-tools-classpath"/>
+          <fileset dir="build">
+            <include name="fop.jar"/>
+          </fileset>
+        </classpath>
+        <tests/>
+      </junit>
+    </sequential>
+  </macrodef>
+  <target name="junit-area-tree-xml-format" depends="junit-compile" description="Runs FOP's area tree XML format JUnit tests" if="xmlunit.present">
+    <junit-run title="area tree XML format">
+      <tests>
+        <sysproperty key="fop.layoutengine.testset" value="standard"/>
+        <test name="org.apache.fop.intermediate.AreaTreeXMLFormatTestSuite" todir="${junit.reports.dir}" outfile="TEST-area-tree-xml-format"/>
+      </tests>
+    </junit-run>
+  </target>
+  <target name="junit-intermediate-format" depends="junit-compile" description="Runs FOP's intermediate format JUnit tests" if="xmlunit.present">
+    <junit-run title="intermediate format">
+      <tests>
+        <sysproperty key="fop.layoutengine.testset" value="standard"/>
+        <test name="org.apache.fop.intermediate.IntermediateFormatTestSuite" todir="${junit.reports.dir}" outfile="TEST-intermediate-format"/>
+      </tests>
+    </junit-run>
   </target>
   <target name="junit-text-linebreak" depends="junit-compile" description="Runs FOP's JUnit unicode linebreak tests" if="junit.present">
     <echo message="Running tests for Unicode UAX#14 support"/>
@@ -936,7 +953,7 @@
     </junit>
   </target>
   <target name="junit-reduced" depends="junit-userconfig, junit-basic, junit-transcoder, junit-text-linebreak, junit-fotree"/>
-  <target name="junit-full" depends="junit-reduced, junit-layout, junit-intermediate-format"/>
+  <target name="junit-full" depends="junit-reduced, junit-layout, junit-area-tree-xml-format, junit-intermediate-format"/>
   <target name="junit" depends="junit-full" description="Runs all of FOP's JUnit tests" if="junit.present">
     <fail><condition><or><isset property="fop.junit.error"/><isset property="fop.junit.failure"/><not><isset property="hyphenation.present"/></not></or></condition>
 NOTE:

Propchange: xmlgraphics/fop/trunk/examples/embedding/java/embedding/atxml/ExampleConcat.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: xmlgraphics/fop/trunk/examples/embedding/java/embedding/atxml/ExampleConcat.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: xmlgraphics/fop/trunk/examples/embedding/java/embedding/atxml/ExampleConcat.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Feb 22 12:40:44 2009
@@ -0,0 +1,4 @@
+/xmlgraphics/fop/branches/Temp_AFPGOCAResources/examples/embedding/java/embedding/intermediate/ExampleConcat.java:630874-721418
+/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/examples/embedding/java/embedding/atxml/ExampleConcat.java:603620-746655
+/xmlgraphics/fop/branches/fop-0_95/examples/embedding/java/embedding/intermediate/ExampleConcat.java:684572,688085,688696
+/xmlgraphics/fop/trunk/examples/embedding/java/embedding/intermediate/ExampleConcat.java:603620-741103

Propchange: xmlgraphics/fop/trunk/examples/embedding/java/embedding/atxml/ExampleStamp.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: xmlgraphics/fop/trunk/examples/embedding/java/embedding/atxml/ExampleStamp.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: xmlgraphics/fop/trunk/examples/embedding/java/embedding/atxml/ExampleStamp.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Feb 22 12:40:44 2009
@@ -0,0 +1,4 @@
+/xmlgraphics/fop/branches/Temp_AFPGOCAResources/examples/embedding/java/embedding/intermediate/ExampleStamp.java:630874-721418
+/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/examples/embedding/java/embedding/atxml/ExampleStamp.java:603620-746655
+/xmlgraphics/fop/branches/fop-0_95/examples/embedding/java/embedding/intermediate/ExampleStamp.java:684572,688085,688696
+/xmlgraphics/fop/trunk/examples/embedding/java/embedding/intermediate/ExampleStamp.java:603620-741103

Modified: xmlgraphics/fop/trunk/examples/embedding/java/embedding/intermediate/ExampleConcat.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/examples/embedding/java/embedding/intermediate/ExampleConcat.java?rev=746664&r1=746663&r2=746664&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/examples/embedding/java/embedding/intermediate/ExampleConcat.java (original)
+++ xmlgraphics/fop/trunk/examples/embedding/java/embedding/intermediate/ExampleConcat.java Sun Feb 22 12:40:44 2009
@@ -29,20 +29,22 @@
 import javax.xml.transform.TransformerException;
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.sax.SAXResult;
+import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
 
+import org.xml.sax.SAXException;
+
 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.area.AreaTreeModel;
-import org.apache.fop.area.AreaTreeParser;
-import org.apache.fop.area.RenderPagesModel;
-import org.apache.fop.fonts.FontInfo;
-import org.apache.fop.render.Renderer;
-import org.apache.fop.render.xml.XMLRenderer;
-import org.xml.sax.SAXException;
+import org.apache.fop.render.intermediate.IFContext;
+import org.apache.fop.render.intermediate.IFDocumentHandler;
+import org.apache.fop.render.intermediate.IFException;
+import org.apache.fop.render.intermediate.IFSerializer;
+import org.apache.fop.render.intermediate.IFUtil;
+import org.apache.fop.render.intermediate.util.IFConcatenator;
 
 import embedding.ExampleObj2XML;
 import embedding.model.ProjectMember;
@@ -50,7 +52,7 @@
 
 /**
  * Example for the intermediate format that demonstrates the concatenation of two documents
- * renderered to the intermediate format. A single PDF file is generated from the two intermediate
+ * rendered to the intermediate format. A single PDF file is generated from the two intermediate
  * files.
  */
 public class ExampleConcat {
@@ -76,7 +78,7 @@
      * Converts an XSL-FO document to an intermediate file.
      * @param src the source file
      * @param xslt the stylesheet file
-     * @param intermediate the target intermediate file (area tree XML)
+     * @param intermediate the target intermediate file
      * @throws IOException In case of an I/O problem
      * @throws FOPException In case of a FOP problem
      * @throws TransformerException In case of a XSL transformation problem
@@ -87,25 +89,26 @@
         //Create a user agent
         FOUserAgent userAgent = fopFactory.newFOUserAgent();
 
-        //Create an instance of the target renderer so the XMLRenderer can use its font setup
-        Renderer targetRenderer = userAgent.getRendererFactory().createRenderer(
-                userAgent, MimeConstants.MIME_PDF);
-
-        //Create the XMLRenderer to create the intermediate format (area tree XML)
-        XMLRenderer xmlRenderer = new XMLRenderer();
-        xmlRenderer.setUserAgent(userAgent);
+        //Create an instance of the target document handler so the IFSerializer
+        //can use its font setup
+        IFDocumentHandler targetHandler = userAgent.getRendererFactory().createDocumentHandler(
+                userAgent, MimeConstants.MIME_PDF + ";mode=painter");
+
+        //Create the IFSerializer to write the intermediate format
+        IFSerializer ifSerializer = new IFSerializer();
+        ifSerializer.setContext(new IFContext(userAgent));
 
-        //Tell the XMLRenderer to mimic the target renderer
-        xmlRenderer.mimicRenderer(targetRenderer);
+        //Tell the IFSerializer to mimic the target format
+        ifSerializer.mimicDocumentHandler(targetHandler);
 
-        //Make sure the prepared XMLRenderer is used
-        userAgent.setRendererOverride(xmlRenderer);
+        //Make sure the prepared document handler is used
+        userAgent.setDocumentHandlerOverride(ifSerializer);
 
         // Setup output
         OutputStream out = new java.io.FileOutputStream(intermediate);
         out = new java.io.BufferedOutputStream(out);
         try {
-            // Construct fop (the MIME type here is unimportant due to the override
+            // Construct FOP (the MIME type here is unimportant due to the override
             // on the user agent)
             Fop fop = fopFactory.newFop(null, userAgent, out);
 
@@ -130,35 +133,41 @@
 
     /**
      * Concatenates an array of intermediate files to a single PDF file.
-     * @param files the array of intermediate files (area tree XML)
+     * @param files the array of intermediate files
      * @param pdffile the target PDF file
      * @throws IOException In case of an I/O problem
      * @throws TransformerException In case of a XSL transformation problem
      * @throws SAXException In case of an XML-related problem
+     * @throws IFException if there was an IF-related error while creating the output file
      */
     public void concatToPDF(File[] files, File pdffile)
-            throws IOException, TransformerException, SAXException {
+            throws IOException, TransformerException, SAXException, IFException {
         // Setup output
         OutputStream out = new java.io.FileOutputStream(pdffile);
         out = new java.io.BufferedOutputStream(out);
         try {
-            //Setup fonts and user agent
-            FontInfo fontInfo = new FontInfo();
+            //Setup user agent
             FOUserAgent userAgent = fopFactory.newFOUserAgent();
 
-            //Construct the AreaTreeModel that will received the individual pages
-            AreaTreeModel treeModel = new RenderPagesModel(userAgent,
-                    MimeConstants.MIME_PDF, fontInfo, out);
+            //Setup target handler
+            String mime = MimeConstants.MIME_PDF + ";mode=painter";
+            IFDocumentHandler targetHandler = fopFactory.getRendererFactory().createDocumentHandler(
+                    userAgent, mime);
+
+            //Setup fonts
+            IFUtil.setupFonts(targetHandler);
+            targetHandler.setResult(new StreamResult(pdffile));
+
+            IFConcatenator concatenator = new IFConcatenator(targetHandler, null);
 
             //Iterate over all intermediate files
-            AreaTreeParser parser = new AreaTreeParser();
             for (int i = 0; i < files.length; i++) {
                 Source src = new StreamSource(files[i]);
-                parser.parse(src, treeModel, userAgent);
+                concatenator.appendDocument(src);
             }
 
-            //Signal the end of the processing. The renderer can finalize the target document.
-            treeModel.endDocument();
+            //Signal the end of the processing so the target file can be finalized properly.
+            concatenator.finish();
         } finally {
             out.close();
         }
@@ -170,7 +179,7 @@
      */
     public static void main(String[] args) {
         try {
-            System.out.println("FOP ExampleConcat\n");
+            System.out.println("FOP ExampleConcat (for the Intermediate Format)\n");
 
             //Setup directories
             File baseDir = new File(".");
@@ -180,9 +189,9 @@
             //Setup output file
             File xsltfile = new File(baseDir, "xml/xslt/projectteam2fo.xsl");
             File[] files = new File[] {
-                    new File(outDir, "team1.at.xml"),
-                    new File(outDir, "team2.at.xml")};
-            File pdffile = new File(outDir, "ResultConcat.pdf");
+                    new File(outDir, "team1.if.xml"),
+                    new File(outDir, "team2.if.xml")};
+            File pdffile = new File(outDir, "ResultIFConcat.pdf");
             for (int i = 0; i < files.length; i++) {
                 System.out.println("Intermediate file " + (i + 1) + ": "
                         + files[i].getCanonicalPath());

Modified: xmlgraphics/fop/trunk/examples/embedding/java/embedding/intermediate/ExampleStamp.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/examples/embedding/java/embedding/intermediate/ExampleStamp.java?rev=746664&r1=746663&r2=746664&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/examples/embedding/java/embedding/intermediate/ExampleStamp.java (original)
+++ xmlgraphics/fop/trunk/examples/embedding/java/embedding/intermediate/ExampleStamp.java Sun Feb 22 12:40:44 2009
@@ -28,16 +28,18 @@
 import javax.xml.transform.TransformerException;
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.sax.SAXResult;
+import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
 
+import org.xml.sax.SAXException;
+
 import org.apache.fop.apps.FOUserAgent;
 import org.apache.fop.apps.FopFactory;
 import org.apache.fop.apps.MimeConstants;
-import org.apache.fop.area.AreaTreeModel;
-import org.apache.fop.area.AreaTreeParser;
-import org.apache.fop.area.RenderPagesModel;
-import org.apache.fop.fonts.FontInfo;
-import org.xml.sax.SAXException;
+import org.apache.fop.render.intermediate.IFDocumentHandler;
+import org.apache.fop.render.intermediate.IFException;
+import org.apache.fop.render.intermediate.IFParser;
+import org.apache.fop.render.intermediate.IFUtil;
 
 import embedding.ExampleObj2XML;
 import embedding.model.ProjectTeam;
@@ -53,30 +55,35 @@
 
     /**
      * Stamps an intermediate file and renders it to a PDF file.
-     * @param atfile the intermediate file (area tree XML)
+     * @param iffile the intermediate file (area tree XML)
      * @param stampSheet the stylesheet that does the stamping
      * @param pdffile the target PDF file
      * @throws IOException In case of an I/O problem
      * @throws TransformerException In case of a XSL transformation problem
      * @throws SAXException In case of an XML-related problem
+     * @throws IFException if there was an IF-related error while creating the output file
      */
-    public void stampToPDF(File atfile, File stampSheet, File pdffile)
-            throws IOException, TransformerException, SAXException {
+    public void stampToPDF(File iffile, File stampSheet, File pdffile)
+            throws IOException, TransformerException, SAXException, IFException {
         // Setup output
         OutputStream out = new java.io.FileOutputStream(pdffile);
         out = new java.io.BufferedOutputStream(out);
         try {
-            //Setup fonts and user agent
-            FontInfo fontInfo = new FontInfo();
+            //user agent
             FOUserAgent userAgent = fopFactory.newFOUserAgent();
 
-            //Construct the AreaTreeModel that will received the individual pages
-            AreaTreeModel treeModel = new RenderPagesModel(userAgent,
-                    MimeConstants.MIME_PDF, fontInfo, out);
-
-            //Iterate over all intermediate files
-            AreaTreeParser parser = new AreaTreeParser();
-            Source src = new StreamSource(atfile);
+            //Setup target handler
+            String mime = MimeConstants.MIME_PDF + ";mode=painter";
+            IFDocumentHandler targetHandler = fopFactory.getRendererFactory().createDocumentHandler(
+                    userAgent, mime);
+
+            //Setup fonts
+            IFUtil.setupFonts(targetHandler);
+            targetHandler.setResult(new StreamResult(pdffile));
+
+            IFParser parser = new IFParser();
+
+            Source src = new StreamSource(iffile);
             Source xslt = new StreamSource(stampSheet);
 
             //Setup Transformer for XSLT processing
@@ -84,13 +91,10 @@
             Transformer transformer = tFactory.newTransformer(xslt);
 
             //Send XSLT result to AreaTreeParser
-            SAXResult res = new SAXResult(parser.getContentHandler(treeModel, userAgent));
+            SAXResult res = new SAXResult(parser.getContentHandler(targetHandler, userAgent));
 
             //Start XSLT transformation and area tree parsing
             transformer.transform(src, res);
-
-            //Signal the end of the processing. The renderer can finalize the target document.
-            treeModel.endDocument();
         } finally {
             out.close();
         }
@@ -102,7 +106,7 @@
      */
     public static void main(String[] args) {
         try {
-            System.out.println("FOP ExampleConcat\n");
+            System.out.println("FOP ExampleConcat (for the Intermediate Format)\n");
 
             //Setup directories
             File baseDir = new File(".");
@@ -111,10 +115,10 @@
 
             //Setup output file
             File xsltfile = new File(baseDir, "xml/xslt/projectteam2fo.xsl");
-            File atfile = new File(outDir, "team.at.xml");
-            File stampxsltfile = new File(baseDir, "xml/xslt/atstamp.xsl");
-            File pdffile = new File(outDir, "ResultStamped.pdf");
-            System.out.println("Intermediate file : " + atfile.getCanonicalPath());
+            File iffile = new File(outDir, "team.if.xml");
+            File stampxsltfile = new File(baseDir, "xml/xslt/ifstamp.xsl");
+            File pdffile = new File(outDir, "ResultIFStamped.pdf");
+            System.out.println("Intermediate file : " + iffile.getCanonicalPath());
             System.out.println("Stamp XSLT: " + stampxsltfile.getCanonicalPath());
             System.out.println("PDF Output File: " + pdffile.getCanonicalPath());
             System.out.println();
@@ -125,11 +129,11 @@
             ExampleConcat concatapp = new ExampleConcat();
             concatapp.convertToIntermediate(
                     team1.getSourceForProjectTeam(),
-                    new StreamSource(xsltfile), atfile);
+                    new StreamSource(xsltfile), iffile);
 
             //Stamp document and produce a PDF from the intermediate format
             ExampleStamp app = new ExampleStamp();
-            app.stampToPDF(atfile, stampxsltfile, pdffile);
+            app.stampToPDF(iffile, stampxsltfile, pdffile);
 
             System.out.println("Success!");
 

Propchange: xmlgraphics/fop/trunk/examples/embedding/xml/xslt/ifstamp.xsl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: xmlgraphics/fop/trunk/examples/embedding/xml/xslt/ifstamp.xsl
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: xmlgraphics/fop/trunk/examples/embedding/xml/xslt/ifstamp.xsl
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Feb 22 12:40:44 2009
@@ -0,0 +1,4 @@
+/xmlgraphics/fop/branches/Temp_AFPGOCAResources/examples/embedding/xml/xslt/atstamp.xsl:630874-721418
+/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/examples/embedding/xml/xslt/ifstamp.xsl:603620-746655
+/xmlgraphics/fop/branches/fop-0_95/examples/embedding/xml/xslt/atstamp.xsl:684572,688085,688696
+/xmlgraphics/fop/trunk/examples/embedding/xml/xslt/atstamp.xsl:603620-741103

Modified: xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/PreloaderPlan.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/PreloaderPlan.java?rev=746664&r1=746663&r2=746664&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/PreloaderPlan.java (original)
+++ xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/PreloaderPlan.java Sun Feb 22 12:40:44 2009
@@ -22,6 +22,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 
+import javax.xml.transform.ErrorListener;
 import javax.xml.transform.Source;
 import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerException;
@@ -43,6 +44,7 @@
 import org.apache.xmlgraphics.image.loader.impl.ImageXMLDOM;
 import org.apache.xmlgraphics.image.loader.util.ImageUtil;
 
+import org.apache.fop.util.DefaultErrorListener;
 import org.apache.fop.util.UnclosableInputStream;
 
 /**
@@ -71,21 +73,16 @@
 
         InputStream in = new UnclosableInputStream(ImageUtil.needInputStream(src));
         try {
-            TransformerFactory tFactory = TransformerFactory.newInstance();
-            Transformer transformer = tFactory.newTransformer();
-            Source source = new StreamSource(in);
-            DOMResult res = new DOMResult();
-            transformer.transform(source, res);
-
-            //Have to render the plan to know its size
-            PlanRenderer pr = new PlanRenderer();
-            Document planDoc = (Document)res.getNode();
+            Document planDoc = getDocument(in);
             Element rootEl = planDoc.getDocumentElement();
-            if (!PlanElementMapping.NAMESPACE.equals(rootEl.getNamespaceURI())) {
+            if (!PlanElementMapping.NAMESPACE.equals(
+                    rootEl.getNamespaceURI())) {
                 in.reset();
                 return null;
             }
 
+            //Have to render the plan to know its size
+            PlanRenderer pr = new PlanRenderer();
             Document svgDoc = pr.createSVGDocument(planDoc);
             float width = pr.getWidth();
             float height = pr.getHeight();
@@ -119,4 +116,19 @@
         }
     }
 
+    private Document getDocument(InputStream in) throws TransformerException {
+        TransformerFactory tFactory = TransformerFactory.newInstance();
+        //Custom error listener to minimize output to console
+        ErrorListener errorListener = new DefaultErrorListener(log);
+        tFactory.setErrorListener(errorListener);
+        Transformer transformer = tFactory.newTransformer();
+        transformer.setErrorListener(errorListener);
+        Source source = new StreamSource(in);
+        DOMResult res = new DOMResult();
+        transformer.transform(source, res);
+
+        Document doc = (Document)res.getNode();
+        return doc;
+    }
+
 }

Modified: xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/SimplePlanDrawer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/SimplePlanDrawer.java?rev=746664&r1=746663&r2=746664&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/SimplePlanDrawer.java (original)
+++ xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/SimplePlanDrawer.java Sun Feb 22 12:40:44 2009
@@ -29,6 +29,7 @@
 import org.w3c.dom.Element;
 
 import org.apache.batik.dom.svg.SVGDOMImplementation;
+
 import org.apache.fop.svg.SVGUtilities;
 
 /**
@@ -83,13 +84,15 @@
 
         String title = "";
 
-        DOMImplementation impl =
-            SVGDOMImplementation.getDOMImplementation();
+        DOMImplementation impl
+            = SVGDOMImplementation.getDOMImplementation();
         Document doc = impl.createDocument(SVG_NAMESPACE, "svg", null);
 
         Element svgRoot = doc.getDocumentElement();
-        svgRoot.setAttributeNS(null, "width", "" + width);
-        svgRoot.setAttributeNS(null, "height", "" + height);
+        svgRoot.setAttributeNS(null, "width", Float.toString(width));
+        svgRoot.setAttributeNS(null, "height", Float.toString(height));
+        svgRoot.setAttributeNS(null, "viewBox",
+                "0 0 " + Float.toString(width) + " " + Float.toString(height));
         svgRoot.setAttributeNS(null, "style",
                                "font-size:" + 8
                                    + ";font-family:"
@@ -99,8 +102,8 @@
                                   java.awt.Font.PLAIN, (int)fontSize);
 
         if (bord) {
-            Element border =
-                SVGUtilities.createRect(doc, 0, 0, width, height);
+            Element border
+                = SVGUtilities.createRect(doc, 0, 0, width, height);
             border.setAttributeNS(null, "style", "stroke:black;fill:none");
             svgRoot.appendChild(border);
         }



---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org


Mime
View raw message