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 ac...@apache.org on 2008/11/28 12:13:33 UTC

svn commit: r721430 [1/6] - in /xmlgraphics/fop/trunk: ./ conf/ lib/ src/documentation/content/xdocs/ src/documentation/content/xdocs/trunk/ src/java/META-INF/services/ src/java/org/apache/fop/afp/ src/java/org/apache/fop/afp/fonts/ src/java/org/apache...

Author: acumiskey
Date: Fri Nov 28 03:13:12 2008
New Revision: 721430

URL: http://svn.apache.org/viewvc?rev=721430&view=rev
Log:
MERGE of https://svn.apache.org/repos/asf/xmlgraphics/fop/{branches/AFP_GOCAResources,trunk}.

Added:
    xmlgraphics/fop/trunk/src/java/META-INF/services/org.apache.fop.render.afp.AFPImageHandler
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/META-INF/services/org.apache.fop.render.afp.AFPImageHandler
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/
      - copied from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPBorderPainter.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPBorderPainter.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPConstants.java   (props changed)
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPConstants.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPDataObjectFactory.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPDataObjectFactory.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPDataObjectInfo.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPDataObjectInfo.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPEventProducer.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPEventProducer.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPEventProducer.xml
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPEventProducer.xml
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPGraphics2D.java   (props changed)
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPGraphics2D.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPGraphicsObjectInfo.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPGraphicsObjectInfo.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPImageObjectInfo.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPImageObjectInfo.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPLineDataInfo.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPLineDataInfo.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPObjectAreaInfo.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPObjectAreaInfo.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPPaintingState.java   (props changed)
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPPaintingState.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPRectanglePainter.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPRectanglePainter.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPResourceInfo.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPResourceInfo.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPResourceLevel.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPResourceLevel.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPResourceManager.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPResourceManager.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPStreamer.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPStreamer.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPTextDataInfo.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPTextDataInfo.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPUnitConverter.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPUnitConverter.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AbstractAFPPainter.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AbstractAFPPainter.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/BorderPaintingInfo.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/BorderPaintingInfo.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/Completable.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/Completable.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/DataStream.java   (props changed)
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/DataStream.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/Factory.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/Factory.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/PaintingInfo.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/PaintingInfo.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/RectanglePaintingInfo.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/RectanglePaintingInfo.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/Startable.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/Startable.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/Streamable.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/Streamable.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/StructuredData.java   (props changed)
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/StructuredData.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/
      - copied from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/AFPBase12FontCollection.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/AFPBase12FontCollection.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/AFPFont.java   (props changed)
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/AFPFont.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/AFPFontAttributes.java   (props changed)
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/AFPFontAttributes.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/AFPFontCollection.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/AFPFontCollection.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/AFPFontInfo.java   (props changed)
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/AFPFontInfo.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/AFPFontReader.java   (props changed)
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/AFPFontReader.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/AFPPageFonts.java   (props changed)
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/AFPPageFonts.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/CharacterSet.java   (props changed)
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/CharacterSet.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/CharacterSetOrientation.java   (props changed)
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/CharacterSetOrientation.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/FontRuntimeException.java   (props changed)
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/FontRuntimeException.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/FopCharacterSet.java   (props changed)
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/FopCharacterSet.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/OutlineFont.java   (props changed)
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/OutlineFont.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/RasterFont.java   (props changed)
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/RasterFont.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/package.html
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/package.html
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/goca/
      - copied from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/goca/
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/goca/AbstractGraphicsCoord.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/goca/AbstractGraphicsCoord.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/goca/AbstractGraphicsDrawingOrder.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/goca/AbstractGraphicsDrawingOrder.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/goca/AbstractGraphicsDrawingOrderContainer.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/goca/AbstractGraphicsDrawingOrderContainer.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/goca/GraphicsAreaBegin.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/goca/GraphicsAreaBegin.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/goca/GraphicsAreaEnd.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/goca/GraphicsAreaEnd.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/goca/GraphicsBox.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/goca/GraphicsBox.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/goca/GraphicsChainedSegment.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/goca/GraphicsChainedSegment.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/goca/GraphicsCharacterString.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/goca/GraphicsCharacterString.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/goca/GraphicsData.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/goca/GraphicsData.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/goca/GraphicsFillet.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/goca/GraphicsFillet.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/goca/GraphicsFullArc.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/goca/GraphicsFullArc.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/goca/GraphicsImage.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/goca/GraphicsImage.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/goca/GraphicsLine.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/goca/GraphicsLine.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/goca/GraphicsSetArcParameters.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/goca/GraphicsSetArcParameters.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/goca/GraphicsSetCharacterSet.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/goca/GraphicsSetCharacterSet.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/goca/GraphicsSetCurrentPosition.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/goca/GraphicsSetCurrentPosition.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/goca/GraphicsSetLineType.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/goca/GraphicsSetLineType.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/goca/GraphicsSetLineWidth.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/goca/GraphicsSetLineWidth.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/goca/GraphicsSetMix.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/goca/GraphicsSetMix.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/goca/GraphicsSetPatternSymbol.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/goca/GraphicsSetPatternSymbol.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/goca/GraphicsSetProcessColor.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/goca/GraphicsSetProcessColor.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/goca/package.html
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/goca/package.html
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/ioca/
      - copied from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/ioca/
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/ioca/ImageCellPosition.java   (props changed)
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/ioca/ImageCellPosition.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/ioca/ImageContent.java   (props changed)
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/ioca/ImageContent.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/ioca/ImageInputDescriptor.java   (props changed)
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/ioca/ImageInputDescriptor.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/ioca/ImageOutputControl.java   (props changed)
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/ioca/ImageOutputControl.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/ioca/ImageRasterData.java   (props changed)
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/ioca/ImageRasterData.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/ioca/ImageRasterPattern.java   (props changed)
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/ioca/ImageRasterPattern.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/ioca/ImageSegment.java   (props changed)
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/ioca/ImageSegment.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/ioca/ImageSizeParameter.java   (props changed)
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/ioca/ImageSizeParameter.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/ioca/package.html
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/ioca/package.html
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/
      - copied from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/AbstractAFPObject.java   (props changed)
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/AbstractAFPObject.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/AbstractDataObject.java   (props changed)
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/AbstractDataObject.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/AbstractDescriptor.java   (props changed)
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/AbstractDescriptor.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/AbstractEnvironmentGroup.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/AbstractEnvironmentGroup.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/AbstractNamedAFPObject.java   (props changed)
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/AbstractNamedAFPObject.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/AbstractPageObject.java   (props changed)
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/AbstractPageObject.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/AbstractResourceEnvironmentGroupContainer.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/AbstractResourceEnvironmentGroupContainer.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/AbstractResourceGroupContainer.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/AbstractResourceGroupContainer.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/AbstractStructuredObject.java   (props changed)
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/AbstractStructuredObject.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/AbstractTripletStructuredObject.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/AbstractTripletStructuredObject.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/ActiveEnvironmentGroup.java   (props changed)
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/ActiveEnvironmentGroup.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/ContainerDataDescriptor.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/ContainerDataDescriptor.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/Document.java   (props changed)
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/Document.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/GraphicsDataDescriptor.java   (props changed)
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/GraphicsDataDescriptor.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/GraphicsObject.java   (props changed)
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/GraphicsObject.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/IMImageObject.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/IMImageObject.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/ImageDataDescriptor.java   (props changed)
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/ImageDataDescriptor.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/ImageObject.java   (props changed)
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/ImageObject.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/IncludeObject.java   (props changed)
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/IncludeObject.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/IncludePageOverlay.java   (props changed)
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/IncludePageOverlay.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/IncludePageSegment.java   (props changed)
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/IncludePageSegment.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/InterchangeSet.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/InterchangeSet.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/InvokeMediumMap.java   (props changed)
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/InvokeMediumMap.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/MapCodedFont.java   (props changed)
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/MapCodedFont.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/MapContainerData.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/MapContainerData.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/MapDataResource.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/MapDataResource.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/MapPageOverlay.java   (props changed)
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/MapPageOverlay.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/MaximumSizeExceededException.java   (props changed)
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/MaximumSizeExceededException.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/NoOperation.java   (props changed)
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/NoOperation.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/ObjectAreaDescriptor.java   (props changed)
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/ObjectAreaDescriptor.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/ObjectAreaPosition.java   (props changed)
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/ObjectAreaPosition.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/ObjectContainer.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/ObjectContainer.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/ObjectEnvironmentGroup.java   (props changed)
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/ObjectEnvironmentGroup.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/Overlay.java   (props changed)
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/Overlay.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/PageDescriptor.java   (props changed)
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/PageDescriptor.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/PageGroup.java   (props changed)
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/PageGroup.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/PageObject.java   (props changed)
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/PageObject.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/PageSegment.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/PageSegment.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/PreprocessPresentationObject.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/PreprocessPresentationObject.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/PresentationEnvironmentControl.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/PresentationEnvironmentControl.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/PresentationTextData.java   (props changed)
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/PresentationTextData.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/PresentationTextDescriptor.java   (props changed)
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/PresentationTextDescriptor.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/PresentationTextObject.java   (props changed)
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/PresentationTextObject.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/Registry.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/Registry.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/ResourceEnvironmentGroup.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/ResourceEnvironmentGroup.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/ResourceGroup.java   (props changed)
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/ResourceGroup.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/ResourceObject.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/ResourceObject.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/StreamedResourceGroup.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/StreamedResourceGroup.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/TagLogicalElement.java   (props changed)
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/TagLogicalElement.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/TagLogicalElementBean.java   (props changed)
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/TagLogicalElementBean.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/package.html
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/package.html
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/triplets/
      - copied from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/triplets/
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/triplets/AbstractTriplet.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/triplets/AbstractTriplet.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/triplets/CommentTriplet.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/triplets/CommentTriplet.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/triplets/DescriptorPositionTriplet.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/triplets/DescriptorPositionTriplet.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/triplets/ExtendedResourceLocalIdentifierTriplet.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/triplets/ExtendedResourceLocalIdentifierTriplet.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/triplets/FullyQualifiedNameTriplet.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/triplets/FullyQualifiedNameTriplet.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/triplets/MappingOptionTriplet.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/triplets/MappingOptionTriplet.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/triplets/MeasurementUnitsTriplet.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/triplets/MeasurementUnitsTriplet.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/triplets/ObjectAreaSizeTriplet.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/triplets/ObjectAreaSizeTriplet.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/triplets/ObjectByteExtentTriplet.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/triplets/ObjectByteExtentTriplet.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/triplets/ObjectClassificationTriplet.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/triplets/ObjectClassificationTriplet.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/triplets/PresentationSpaceMixingRulesTriplet.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/triplets/PresentationSpaceMixingRulesTriplet.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/triplets/PresentationSpaceResetMixingTriplet.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/triplets/PresentationSpaceResetMixingTriplet.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/triplets/ResourceObjectTypeTriplet.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/triplets/ResourceObjectTypeTriplet.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/triplets/package.html
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/triplets/package.html
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/package.html
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/package.html
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/svg/
      - copied from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/svg/
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/svg/AFPBridgeContext.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/svg/AFPBridgeContext.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/svg/AFPGraphicsConfiguration.java   (props changed)
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/svg/AFPGraphicsConfiguration.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/svg/AFPGraphicsDevice.java   (props changed)
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/svg/AFPGraphicsDevice.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/svg/AFPImageElementBridge.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/svg/AFPImageElementBridge.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/svg/AFPTextElementBridge.java   (props changed)
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/svg/AFPTextElementBridge.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/svg/AFPTextHandler.java   (props changed)
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/svg/AFPTextHandler.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/svg/AFPTextPainter.java   (props changed)
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/svg/AFPTextPainter.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/svg/package.html
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/svg/package.html
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/util/
      - copied from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/util/
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/util/BinaryUtils.java   (props changed)
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/util/BinaryUtils.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/util/DTDEntityResolver.java   (props changed)
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/util/DTDEntityResolver.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/util/StringUtils.java   (props changed)
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/util/StringUtils.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/util/StructuredFieldReader.java   (props changed)
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/util/StructuredFieldReader.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/util/package.html
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/util/package.html
    xmlgraphics/fop/trunk/src/java/org/apache/fop/image/loader/batik/Graphics2DImagePainterImpl.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/image/loader/batik/Graphics2DImagePainterImpl.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFPaintingState.java   (props changed)
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/pdf/PDFPaintingState.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractImageHandlerRegistry.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/AbstractImageHandlerRegistry.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ImageHandler.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/ImageHandler.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPForeignAttributeReader.java   (props changed)
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPForeignAttributeReader.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPImageHandler.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPImageHandler.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPImageHandlerGraphics2D.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPImageHandlerGraphics2D.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPImageHandlerRawCCITTFax.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPImageHandlerRawCCITTFax.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPImageHandlerRawStream.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPImageHandlerRawStream.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPImageHandlerRegistry.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPImageHandlerRegistry.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPImageHandlerRenderedImage.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPImageHandlerRenderedImage.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPImageHandlerXML.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPImageHandlerXML.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPInfo.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPInfo.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPRendererContext.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPRendererContext.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPRendererImageInfo.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPRendererImageInfo.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AbstractAFPImageHandlerRawStream.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AbstractAFPImageHandlerRawStream.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/extensions/AFPExtensionAttachment.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/extensions/AFPExtensionAttachment.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/package.html
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/package.html
    xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/AbstractFOPBridgeContext.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/svg/AbstractFOPBridgeContext.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/AbstractFOPImageElementBridge.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/svg/AbstractFOPImageElementBridge.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/AbstractFOPTextElementBridge.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/svg/AbstractFOPTextElementBridge.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/AbstractFOPTextPainter.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/svg/AbstractFOPTextPainter.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/FOPTextHandler.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/svg/FOPTextHandler.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/NativeImageHandler.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/svg/NativeImageHandler.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/util/AbstractPaintingState.java
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/util/AbstractPaintingState.java
    xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table-row_keep-with-previous_2.xml
      - copied unchanged from r721418, xmlgraphics/fop/branches/Temp_AFPGOCAResources/test/layoutengine/standard-testcases/table-row_keep-with-previous_2.xml
Removed:
    xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFState.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPEventProducer.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPEventProducer.xml
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPFontAttributes.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/apps/
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/exceptions/FontRuntimeException.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/fonts/
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/tools/
Modified:
    xmlgraphics/fop/trunk/   (props changed)
    xmlgraphics/fop/trunk/build.xml
    xmlgraphics/fop/trunk/conf/fop.xconf
    xmlgraphics/fop/trunk/lib/README.txt
    xmlgraphics/fop/trunk/src/documentation/content/xdocs/team.xml
    xmlgraphics/fop/trunk/src/documentation/content/xdocs/trunk/configuration.xml
    xmlgraphics/fop/trunk/src/documentation/content/xdocs/trunk/output.xml
    xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/MimeConstants.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Area.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AreaTreeHandler.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AreaTreeModel.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AreaTreeObject.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/area/IDTracker.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/area/PageViewport.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/area/RegionReference.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/area/RenderPagesModel.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/FilledArea.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/Image.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineArea.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/TextArea.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/Viewport.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/InputHandler.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/events/EventFormatter.xml
    xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/ElementMapping.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FObj.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/Base14Font.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/CIDFont.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/CustomFont.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/Font.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontCollection.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontDescriptor.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontEventListener.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontInfo.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontMetrics.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontTriplet.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontType.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontUtil.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/MultiByteFont.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/MutableFont.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/Typeface.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/package.html
    xmlgraphics/fop/trunk/src/java/org/apache/fop/image/loader/batik/ImageConverterSVG2G2D.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/TraitSetter.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/PageNumberLayoutManager.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/package.html
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractGenericSVGHandler.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractGraphics2DAdapter.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/PrintRenderer.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/RendererContext.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPGraphics2DAdapter.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/AFPRendererContextConstants.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPSVGHandler.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/extensions/AFPAttribute.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/extensions/AFPElement.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/extensions/AFPElementMapping.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/extensions/AFPExtensionHandler.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/extensions/AFPPageSetup.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/extensions/AFPPageSetupElement.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/extensions/AbstractAFPExtensionObject.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/AWTRenderer.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/PCLRenderer.java
    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/PDFImageHandlerRegistry.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFImageHandlerRenderedImage.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFImageHandlerXML.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/PSTextPainter.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/extensions/PSCommentAfterElement.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/extensions/PSCommentBeforeElement.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/extensions/PSExtensionElementMapping.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/GraphicsConfiguration.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFBridgeContext.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFDocumentGraphics2D.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFGraphics2D.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFGraphicsConfiguration.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFImageElementBridge.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFTextElementBridge.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFTextPainter.java
    xmlgraphics/fop/trunk/status.xml

Propchange: xmlgraphics/fop/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 28 03:13:12 2008
@@ -1 +1,2 @@
+/xmlgraphics/fop/branches/Temp_AFPGOCAResources:630874-721418
 /xmlgraphics/fop/branches/fop-0_95:684572,688085,688696

Propchange: xmlgraphics/fop/trunk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Nov 28 03:13:12 2008
@@ -1 +1 @@
-/xmlgraphics/fop/trunk:1-611115
+/xmlgraphics/fop/trunk:1-720845

Modified: xmlgraphics/fop/trunk/build.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/build.xml?rev=721430&r1=721429&r2=721430&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/build.xml (original)
+++ xmlgraphics/fop/trunk/build.xml Fri Nov 28 03:13:12 2008
@@ -612,6 +612,7 @@
       <exclude name="org/apache/fop/render/pdf/PDFRenderer.class"/>
       <exclude name="org/apache/fop/render/pdf/PDFXMLHandler*"/>
       <include name="org/apache/fop/render/*RendererConfigurator**"/>
+      <include name="org/apache/fop/util/AbstractPaintingState**"/>
       <include name="org/apache/fop/pdf/**"/>
     </patternset>
 <!-- PS transcoder -->

Modified: xmlgraphics/fop/trunk/conf/fop.xconf
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/conf/fop.xconf?rev=721430&r1=721429&r2=721430&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/conf/fop.xconf (original)
+++ xmlgraphics/fop/trunk/conf/fop.xconf Fri Nov 28 03:13:12 2008
@@ -87,6 +87,318 @@
 
     </renderer>
 
+    <renderer mime="application/x-afp">
+      <!--
+           The bit depth and type of images produced
+           (this is the default setting)
+      -->
+      <images mode="b+w" bits-per-pixel="8"/>
+      <renderer-resolution>240</renderer-resolution>
+      <resource-group-file>resources.afp</resource-group-file>
+
+      <fonts>
+      <!--
+           Below is an example using raster font configuration using FOP builtin base-14 font metrics.
+           for Times Roman, Helvetica and Courier.
+
+           Depending on AFP raster and outline font availability on your installation you will
+           most likely need to modify the configuration provided below.
+
+           See http://xmlgraphics.apache.org/fop/trunk/output.html#afp-configuration
+           for details of FOP configuration for AFP
+      -->
+
+        <!-- Times Roman -->
+        <font>
+          <afp-font name="Times Roman" type="raster" codepage="T1V10500" encoding="Cp500">
+            <afp-raster-font size="6" characterset="C0N20060" base14-font="TimesRoman"/>
+            <afp-raster-font size="7" characterset="C0N20070" base14-font="TimesRoman"/>
+            <afp-raster-font size="8" characterset="C0N20080" base14-font="TimesRoman"/>
+            <afp-raster-font size="9" characterset="C0N20090" base14-font="TimesRoman"/>
+            <afp-raster-font size="10" characterset="C0N20000" base14-font="TimesRoman"/>
+            <afp-raster-font size="11" characterset="C0N200A0" base14-font="TimesRoman"/>
+            <afp-raster-font size="12" characterset="C0N200B0" base14-font="TimesRoman"/>
+            <afp-raster-font size="14" characterset="C0N200D0" base14-font="TimesRoman"/>
+            <afp-raster-font size="16" characterset="C0N200F0" base14-font="TimesRoman"/>
+            <afp-raster-font size="18" characterset="C0N200H0" base14-font="TimesRoman"/>
+            <afp-raster-font size="20" characterset="C0N200J0" base14-font="TimesRoman"/>
+            <afp-raster-font size="24" characterset="C0N200N0" base14-font="TimesRoman"/>
+            <afp-raster-font size="30" characterset="C0N200T0" base14-font="TimesRoman"/>
+            <afp-raster-font size="36" characterset="C0N200Z0" base14-font="TimesRoman"/>
+          </afp-font>
+          <font-triplet name="Times" style="normal" weight="normal"/>
+          <font-triplet name="TimesRoman" style="normal" weight="normal"/>
+          <font-triplet name="Times Roman" style="normal" weight="normal"/>
+          <font-triplet name="Times-Roman" style="normal" weight="normal"/>
+          <font-triplet name="Times New Roman" style="normal" weight="normal"/>
+          <font-triplet name="TimesNewRoman" style="normal" weight="normal"/>
+          <font-triplet name="serif" style="normal" weight="normal"/>
+        </font>
+ 
+        <!-- Times Roman Italic -->
+        <font>
+          <afp-font name="Times Roman Italic" type="raster" codepage="T1V10500" encoding="Cp500">
+            <afp-raster-font size="6" characterset="C0N30060" base14-font="TimesItalic"/>
+            <afp-raster-font size="7" characterset="C0N30070" base14-font="TimesItalic"/>
+            <afp-raster-font size="8" characterset="C0N30080" base14-font="TimesItalic"/>
+            <afp-raster-font size="9" characterset="C0N30090" base14-font="TimesItalic"/>
+            <afp-raster-font size="10" characterset="C0N30000" base14-font="TimesItalic"/>
+            <afp-raster-font size="11" characterset="C0N300A0" base14-font="TimesItalic"/>
+            <afp-raster-font size="12" characterset="C0N300B0" base14-font="TimesItalic"/>
+            <afp-raster-font size="14" characterset="C0N300D0" base14-font="TimesItalic"/>
+            <afp-raster-font size="16" characterset="C0N300F0" base14-font="TimesItalic"/>
+            <afp-raster-font size="18" characterset="C0N300H0" base14-font="TimesItalic"/>
+            <afp-raster-font size="20" characterset="C0N300J0" base14-font="TimesItalic"/>
+            <afp-raster-font size="24" characterset="C0N300N0" base14-font="TimesItalic"/>
+            <afp-raster-font size="30" characterset="C0N300T0" base14-font="TimesItalic"/>
+            <afp-raster-font size="36" characterset="C0N300Z0" base14-font="TimesItalic"/>
+          </afp-font>
+          <font-triplet name="Times" style="italic" weight="normal"/>
+          <font-triplet name="TimesRoman" style="italic" weight="normal"/>
+          <font-triplet name="Times Roman" style="italic" weight="normal"/>
+          <font-triplet name="Times-Roman" style="italic" weight="normal"/>
+          <font-triplet name="Times New Roman" style="italic" weight="normal"/>
+          <font-triplet name="TimesNewRoman" style="italic" weight="normal"/>
+          <font-triplet name="serif" style="italic" weight="normal"/>
+        </font>
+ 
+        <!-- Times Roman Bold -->
+        <font>
+          <afp-font name="Times Roman Bold" type="raster" codepage="T1V10500" encoding="Cp500">
+            <afp-raster-font size="6" characterset="C0N40060" base14-font="TimesBold"/>
+            <afp-raster-font size="7" characterset="C0N40070" base14-font="TimesBold"/>
+            <afp-raster-font size="8" characterset="C0N40080" base14-font="TimesBold"/>
+            <afp-raster-font size="9" characterset="C0N40090" base14-font="TimesBold"/>
+            <afp-raster-font size="10" characterset="C0N40000" base14-font="TimesBold"/>
+            <afp-raster-font size="11" characterset="C0N400A0" base14-font="TimesBold"/>
+            <afp-raster-font size="12" characterset="C0N400B0" base14-font="TimesBold"/>
+            <afp-raster-font size="14" characterset="C0N400D0" base14-font="TimesBold"/>
+            <afp-raster-font size="16" characterset="C0N400F0" base14-font="TimesBold"/>
+            <afp-raster-font size="18" characterset="C0N400H0" base14-font="TimesBold"/>
+            <afp-raster-font size="20" characterset="C0N400J0" base14-font="TimesBold"/>
+            <afp-raster-font size="24" characterset="C0N400N0" base14-font="TimesBold"/>
+            <afp-raster-font size="30" characterset="C0N400T0" base14-font="TimesBold"/>
+            <afp-raster-font size="36" characterset="C0N400Z0" base14-font="TimesBold"/>
+          </afp-font>
+          <font-triplet name="Times" style="normal" weight="bold"/>
+          <font-triplet name="TimesRoman" style="normal" weight="bold"/>
+          <font-triplet name="Times Roman" style="normal" weight="bold"/>
+          <font-triplet name="Times-Roman" style="normal" weight="bold"/>
+          <font-triplet name="Times New Roman" style="normal" weight="bold"/>
+          <font-triplet name="TimesNewRoman" style="normal" weight="bold"/>
+          <font-triplet name="serif" style="normal" weight="bold"/>
+        </font>
+
+        <!-- Times Roman Italic Bold -->
+        <font>
+          <afp-font name="Times Roman Italic Bold" type="raster" codepage="T1V10500" encoding="Cp500">
+            <afp-raster-font size="6" characterset="C0N50060" base14-font="TimesBoldItalic"/>
+            <afp-raster-font size="7" characterset="C0N50070" base14-font="TimesBoldItalic"/>
+            <afp-raster-font size="8" characterset="C0N50080" base14-font="TimesBoldItalic"/>
+            <afp-raster-font size="9" characterset="C0N50090" base14-font="TimesBoldItalic"/>
+            <afp-raster-font size="10" characterset="C0N50000" base14-font="TimesBoldItalic"/>
+            <afp-raster-font size="11" characterset="C0N500A0" base14-font="TimesBoldItalic"/>
+            <afp-raster-font size="12" characterset="C0N500B0" base14-font="TimesBoldItalic"/>
+            <afp-raster-font size="14" characterset="C0N500D0" base14-font="TimesBoldItalic"/>
+            <afp-raster-font size="16" characterset="C0N500F0" base14-font="TimesBoldItalic"/>
+            <afp-raster-font size="18" characterset="C0N500H0" base14-font="TimesBoldItalic"/>
+            <afp-raster-font size="20" characterset="C0N500J0" base14-font="TimesBoldItalic"/>
+            <afp-raster-font size="24" characterset="C0N500N0" base14-font="TimesBoldItalic"/>
+            <afp-raster-font size="30" characterset="C0N500T0" base14-font="TimesBoldItalic"/>
+            <afp-raster-font size="36" characterset="C0N500Z0" base14-font="TimesBoldItalic"/>
+          </afp-font>
+          <font-triplet name="Times" style="italic" weight="bold"/>
+          <font-triplet name="TimesRoman" style="italic" weight="bold"/>
+          <font-triplet name="Times Roman" style="italic" weight="bold"/>
+          <font-triplet name="Times-Roman" style="italic" weight="bold"/>
+          <font-triplet name="Times New Roman" style="italic" weight="bold"/>
+          <font-triplet name="TimesNewRoman" style="italic" weight="bold"/>
+          <font-triplet name="serif" style="italic" weight="bold"/>
+        </font>
+
+        <!-- Helvetica -->
+        <font>
+          <afp-font name="Helvetica" type="raster" codepage="T1V10500" encoding="Cp500">
+            <afp-raster-font size="6" characterset="C0H20060" base14-font="Helvetica"/>
+            <afp-raster-font size="7" characterset="C0H20070" base14-font="Helvetica"/>
+            <afp-raster-font size="8" characterset="C0H20080" base14-font="Helvetica"/>
+            <afp-raster-font size="9" characterset="C0H20090" base14-font="Helvetica"/>
+            <afp-raster-font size="10" characterset="C0H20000" base14-font="Helvetica"/>
+            <afp-raster-font size="11" characterset="C0H200A0" base14-font="Helvetica"/>
+            <afp-raster-font size="12" characterset="C0H200B0" base14-font="Helvetica"/>
+            <afp-raster-font size="14" characterset="C0H200D0" base14-font="Helvetica"/>
+            <afp-raster-font size="16" characterset="C0H200F0" base14-font="Helvetica"/>
+            <afp-raster-font size="18" characterset="C0H200H0" base14-font="Helvetica"/>
+            <afp-raster-font size="20" characterset="C0H200J0" base14-font="Helvetica"/>
+            <afp-raster-font size="24" characterset="C0H200N0" base14-font="Helvetica"/>
+            <afp-raster-font size="30" characterset="C0H200T0" base14-font="Helvetica"/>
+            <afp-raster-font size="36" characterset="C0H200Z0" base14-font="Helvetica"/>
+          </afp-font>
+          <font-triplet name="Helvetica" style="normal" weight="normal"/>
+          <font-triplet name="Arial" style="normal" weight="normal"/>
+          <font-triplet name="sans-serif" style="normal" weight="normal"/>
+          <font-triplet name="any" style="normal" weight="normal"/>
+        </font>
+
+        <!-- Helvetica Italic -->
+        <font>
+          <afp-font name="Helvetica Italic" type="raster" codepage="T1V10500" encoding="Cp500">
+            <afp-raster-font size="6" characterset="C0H30060" base14-font="HelveticaOblique"/>
+            <afp-raster-font size="7" characterset="C0H30070" base14-font="HelveticaOblique"/>
+            <afp-raster-font size="8" characterset="C0H30080" base14-font="HelveticaOblique"/>
+            <afp-raster-font size="9" characterset="C0H30090" base14-font="HelveticaOblique"/>
+            <afp-raster-font size="10" characterset="C0H30000" base14-font="HelveticaOblique"/>
+            <afp-raster-font size="11" characterset="C0H300A0" base14-font="HelveticaOblique"/>
+            <afp-raster-font size="12" characterset="C0H300B0" base14-font="HelveticaOblique"/>
+            <afp-raster-font size="14" characterset="C0H300D0" base14-font="HelveticaOblique"/>
+            <afp-raster-font size="16" characterset="C0H300F0" base14-font="HelveticaOblique"/>
+            <afp-raster-font size="18" characterset="C0H300H0" base14-font="HelveticaOblique"/>
+            <afp-raster-font size="20" characterset="C0H300J0" base14-font="HelveticaOblique"/>
+            <afp-raster-font size="24" characterset="C0H300N0" base14-font="HelveticaOblique"/>
+            <afp-raster-font size="30" characterset="C0H300T0" base14-font="HelveticaOblique"/>
+            <afp-raster-font size="36" characterset="C0H300Z0" base14-font="HelveticaOblique"/>
+          </afp-font>
+          <font-triplet name="Helvetica" style="italic" weight="normal"/>
+          <font-triplet name="Arial" style="italic" weight="normal"/>
+          <font-triplet name="sans-serif" style="italic" weight="normal"/>
+        </font>
+
+        <!-- Helvetica (Semi) Bold -->
+        <font>
+          <afp-font name="Helvetica (Semi) Bold" type="raster" codepage="T1V10500" encoding="Cp500">
+            <afp-raster-font size="6" characterset="C0H40060" base14-font="HelveticaBold"/>
+            <afp-raster-font size="7" characterset="C0H40070" base14-font="HelveticaBold"/>
+            <afp-raster-font size="8" characterset="C0H40080" base14-font="HelveticaBold"/>
+            <afp-raster-font size="9" characterset="C0H40090" base14-font="HelveticaBold"/>
+            <afp-raster-font size="10" characterset="C0H40000" base14-font="HelveticaBold"/>
+            <afp-raster-font size="11" characterset="C0H400A0" base14-font="HelveticaBold"/>
+            <afp-raster-font size="12" characterset="C0H400B0" base14-font="HelveticaBold"/>
+            <afp-raster-font size="14" characterset="C0H400D0" base14-font="HelveticaBold"/>
+            <afp-raster-font size="16" characterset="C0H400F0" base14-font="HelveticaBold"/>
+            <afp-raster-font size="18" characterset="C0H400H0" base14-font="HelveticaBold"/>
+            <afp-raster-font size="20" characterset="C0H400J0" base14-font="HelveticaBold"/>
+            <afp-raster-font size="24" characterset="C0H400N0" base14-font="HelveticaBold"/>
+            <afp-raster-font size="30" characterset="C0H400T0" base14-font="HelveticaBold"/>
+            <afp-raster-font size="36" characterset="C0H400Z0" base14-font="HelveticaBold"/>
+          </afp-font>
+          <font-triplet name="Helvetica" style="normal" weight="bold"/>
+          <font-triplet name="Arial" style="normal" weight="bold"/>
+          <font-triplet name="sans-serif" style="normal" weight="bold"/>
+        </font>
+
+        <!-- Helvetica Italic (Semi) Bold -->
+        <font>
+          <afp-font name="Helvetica Italic (Semi) Bold" type="raster" codepage="T1V10500" encoding="Cp500">
+            <afp-raster-font size="6" characterset="C0H50060" base14-font="HelveticaBoldOblique"/>
+            <afp-raster-font size="7" characterset="C0H50070" base14-font="HelveticaBoldOblique"/>
+            <afp-raster-font size="8" characterset="C0H50080" base14-font="HelveticaBoldOblique"/>
+            <afp-raster-font size="9" characterset="C0H50090" base14-font="HelveticaBoldOblique"/>
+            <afp-raster-font size="10" characterset="C0H50000" base14-font="HelveticaBoldOblique"/>
+            <afp-raster-font size="11" characterset="C0H500A0" base14-font="HelveticaBoldOblique"/>
+            <afp-raster-font size="12" characterset="C0H500B0" base14-font="HelveticaBoldOblique"/>
+            <afp-raster-font size="14" characterset="C0H500D0" base14-font="HelveticaBoldOblique"/>
+            <afp-raster-font size="16" characterset="C0H500F0" base14-font="HelveticaBoldOblique"/>
+            <afp-raster-font size="18" characterset="C0H500H0" base14-font="HelveticaBoldOblique"/>
+            <afp-raster-font size="20" characterset="C0H500J0" base14-font="HelveticaBoldOblique"/>
+            <afp-raster-font size="24" characterset="C0H500N0" base14-font="HelveticaBoldOblique"/>
+            <afp-raster-font size="30" characterset="C0H500T0" base14-font="HelveticaBoldOblique"/>
+            <afp-raster-font size="36" characterset="C0H500Z0" base14-font="HelveticaBoldOblique"/>
+          </afp-font>
+          <font-triplet name="Helvetica" style="italic" weight="bold"/>
+          <font-triplet name="Arial" style="italic" weight="bold"/>
+          <font-triplet name="sans-serif" style="italic" weight="bold"/>
+        </font>
+
+        <!-- Courier -->
+        <font>
+          <afp-font name="Courier" type="raster" codepage="T1V10500" encoding="Cp500">
+            <afp-raster-font size="6" characterset="C0420060" base14-font="Courier"/>
+            <afp-raster-font size="7" characterset="C0420070" base14-font="Courier"/>
+            <afp-raster-font size="8" characterset="C0420080" base14-font="Courier"/>
+            <afp-raster-font size="9" characterset="C0420090" base14-font="Courier"/>
+            <afp-raster-font size="10" characterset="C0420000" base14-font="Courier"/>
+            <afp-raster-font size="11" characterset="C04200A0" base14-font="Courier"/>
+            <afp-raster-font size="12" characterset="C04200B0" base14-font="Courier"/>
+            <afp-raster-font size="14" characterset="C04200D0" base14-font="Courier"/>
+            <afp-raster-font size="16" characterset="C04200F0" base14-font="Courier"/>
+            <afp-raster-font size="18" characterset="C04200H0" base14-font="Courier"/>
+            <afp-raster-font size="20" characterset="C04200J0" base14-font="Courier"/>
+            <afp-raster-font size="24" characterset="C04200N0" base14-font="Courier"/>
+            <afp-raster-font size="30" characterset="C04200T0" base14-font="Courier"/>
+            <afp-raster-font size="36" characterset="C04200Z0" base14-font="Courier"/>
+          </afp-font>
+          <font-triplet name="Courier" style="normal" weight="normal"/>
+          <font-triplet name="monospace" style="normal" weight="normal"/>
+        </font>
+
+        <!-- Courier Italic -->
+        <font>
+          <afp-font name="Courier Italic" type="raster" codepage="T1V10500" encoding="Cp500">
+            <afp-raster-font size="6" characterset="C0430060" base14-font="CourierOblique"/>
+            <afp-raster-font size="7" characterset="C0430070" base14-font="CourierOblique"/>
+            <afp-raster-font size="8" characterset="C0430080" base14-font="CourierOblique"/>
+            <afp-raster-font size="9" characterset="C0430090" base14-font="CourierOblique"/>
+            <afp-raster-font size="10" characterset="C0430000" base14-font="CourierOblique"/>
+            <afp-raster-font size="11" characterset="C04300A0" base14-font="CourierOblique"/>
+            <afp-raster-font size="12" characterset="C04300B0" base14-font="CourierOblique"/>
+            <afp-raster-font size="14" characterset="C04300D0" base14-font="CourierOblique"/>
+            <afp-raster-font size="16" characterset="C04300F0" base14-font="CourierOblique"/>
+            <afp-raster-font size="18" characterset="C04300H0" base14-font="CourierOblique"/>
+            <afp-raster-font size="20" characterset="C04300J0" base14-font="CourierOblique"/>
+            <afp-raster-font size="24" characterset="C04300N0" base14-font="CourierOblique"/>
+            <afp-raster-font size="30" characterset="C04300T0" base14-font="CourierOblique"/>
+            <afp-raster-font size="36" characterset="C04300Z0" base14-font="CourierOblique"/>
+          </afp-font>
+          <font-triplet name="Courier" style="italic" weight="normal"/>
+          <font-triplet name="monospace" style="italic" weight="normal"/>
+        </font>
+
+        <!-- Courier Bold -->
+        <font>
+          <afp-font name="Courier Bold" type="raster" codepage="T1V10500" encoding="Cp500">
+            <afp-raster-font size="6" characterset="C0440060" base14-font="CourierBold"/>
+            <afp-raster-font size="7" characterset="C0440070" base14-font="CourierBold"/>
+            <afp-raster-font size="8" characterset="C0440080" base14-font="CourierBold"/>
+            <afp-raster-font size="9" characterset="C0440090" base14-font="CourierBold"/>
+            <afp-raster-font size="10" characterset="C0440000" base14-font="CourierBold"/>
+            <afp-raster-font size="11" characterset="C04400A0" base14-font="CourierBold"/>
+            <afp-raster-font size="12" characterset="C04400B0" base14-font="CourierBold"/>
+            <afp-raster-font size="14" characterset="C04400D0" base14-font="CourierBold"/>
+            <afp-raster-font size="16" characterset="C04400F0" base14-font="CourierBold"/>
+            <afp-raster-font size="18" characterset="C04400H0" base14-font="CourierBold"/>
+            <afp-raster-font size="20" characterset="C04400J0" base14-font="CourierBold"/>
+            <afp-raster-font size="24" characterset="C04400N0" base14-font="CourierBold"/>
+            <afp-raster-font size="30" characterset="C04400T0" base14-font="CourierBold"/>
+            <afp-raster-font size="36" characterset="C04400Z0" base14-font="CourierBold"/>
+          </afp-font>
+          <font-triplet name="Courier" style="normal" weight="bold"/>
+          <font-triplet name="monospace" style="normal" weight="bold"/>
+        </font>
+
+        <!-- Courier Italic Bold -->
+        <font>
+          <afp-font name="Courier Italic Bold" type="raster" codepage="T1V10500" encoding="Cp500">
+            <afp-raster-font size="6" characterset="C0450060" base14-font="CourierBoldOblique"/>
+            <afp-raster-font size="7" characterset="C0450070" base14-font="CourierBoldOblique"/>
+            <afp-raster-font size="8" characterset="C0450080" base14-font="CourierBoldOblique"/>
+            <afp-raster-font size="9" characterset="C0450090" base14-font="CourierBoldOblique"/>
+            <afp-raster-font size="10" characterset="C0450000" base14-font="CourierBoldOblique"/>
+            <afp-raster-font size="11" characterset="C04500A0" base14-font="CourierBoldOblique"/>
+            <afp-raster-font size="12" characterset="C04500B0" base14-font="CourierBoldOblique"/>
+            <afp-raster-font size="14" characterset="C04500D0" base14-font="CourierBoldOblique"/>
+            <afp-raster-font size="16" characterset="C04500F0" base14-font="CourierBoldOblique"/>
+            <afp-raster-font size="18" characterset="C04500H0" base14-font="CourierBoldOblique"/>
+            <afp-raster-font size="20" characterset="C04500J0" base14-font="CourierBoldOblique"/>
+            <afp-raster-font size="24" characterset="C04500N0" base14-font="CourierBoldOblique"/>
+            <afp-raster-font size="30" characterset="C04500T0" base14-font="CourierBoldOblique"/>
+            <afp-raster-font size="36" characterset="C04500Z0" base14-font="CourierBoldOblique"/>
+          </afp-font>
+          <font-triplet name="Courier" style="italic" weight="bold"/>
+          <font-triplet name="monospace" style="italic" weight="bold"/>
+        </font>
+      </fonts>
+    </renderer>
+
     <renderer mime="application/postscript">
       <!-- This option forces the PS renderer to rotate landscape pages -->
       <!--auto-rotate-landscape>true</auto-rotate-landscape-->

Modified: xmlgraphics/fop/trunk/lib/README.txt
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/lib/README.txt?rev=721430&r1=721429&r2=721430&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/lib/README.txt (original)
+++ xmlgraphics/fop/trunk/lib/README.txt Fri Nov 28 03:13:12 2008
@@ -190,4 +190,4 @@
 
     (not bundled, to be added to your Apache Ant installation)
     http://xmlunit.sourceforge.net/
-    BSD style license
\ No newline at end of file
+    BSD style license

Modified: xmlgraphics/fop/trunk/src/documentation/content/xdocs/team.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/documentation/content/xdocs/team.xml?rev=721430&r1=721429&r2=721430&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/documentation/content/xdocs/team.xml (original)
+++ xmlgraphics/fop/trunk/src/documentation/content/xdocs/team.xml Fri Nov 28 03:13:12 2008
@@ -78,6 +78,11 @@
             from the TeX/LaTeX world. See his <fork href="http://www.leverkruid.eu">home
             page</fork> for some of his private projects.</li>
         <li id="jp"><link href="mailto:pietsch@apache.org">J&#x00F6;rg Pietschmann</link> (JP)</li>
+        <li id="mb"><link href="mailto:max AT berger DOT name">Max Berger</link> (MB) is currently a
+          PostDoc pursuing an academic career in computer science. His main interest in FOP is to
+          improve the DocBook to PDF tool-chain to produce high quality output, while still
+          conforming to given style-guides. See his <link href="http://max.berger.name">home
+            page</link> for more information.</li>
       </ul>
     </section>
     <section id="contribute-active">

Modified: xmlgraphics/fop/trunk/src/documentation/content/xdocs/trunk/configuration.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/documentation/content/xdocs/trunk/configuration.xml?rev=721430&r1=721429&r2=721430&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/documentation/content/xdocs/trunk/configuration.xml (original)
+++ xmlgraphics/fop/trunk/src/documentation/content/xdocs/trunk/configuration.xml Fri Nov 28 03:13:12 2008
@@ -368,6 +368,36 @@
         to "bitmap" which causes all text to be rendered as bitmaps.
       </p>
     </section>
+    <section id="afp-renderer">
+      <title>Special Settings for the AFP Renderer</title>
+      <p>
+      </p>
+      <p>
+        Additionally, there are certain settings that control how the renderer handles various elements.
+      </p>
+<source><![CDATA[<renderer mime="application/x-afp">
+  <images mode="b+w" bits-per-pixel="8" native="true"/>
+  <renderer-resolution>240</renderer-resolution>
+  
+  <!-- a default external resource group file -->
+  <resource-group-file>resources.afp</resource-group-file>
+</renderer>]]></source>
+      <p>
+        The default value for the images "mode" setting is "b+w" (black and white).  When the images "mode" setting is "b+w" a "bits-per-pixel" setting can be provided to aid the grayscale conversion process.  With this setting all images referenced in your source document are converted to an IOCA FS45 grayscale bitmap image form. 
+        When the setting is "color" all images are converted to an IOCA FS45 color bitmap image form.  When "native" setting is "true", all images encountered (TIFF, GIF, JPEG and Encapsulated Postscript etc.) will be embedded directly in the datastream in their native form using a MO:DCA Object Container.
+      </p>
+      <p>
+        The default value for the "renderer-resolution" is 240 dpi. 
+      </p>
+ <!--
+      <p>
+        The default value for the MO:DCA "interchange-set" is "MO:DCA-L". Other compliance settings include presentation interchange sets "MO:DCA-P IS/1" and "MO:DCA-P IS/2" (Resource Groups). 
+      </p>
+ -->
+      <p>
+        By default if there is no configuration definition for "resource-group-file", external resources will be placed in a file called resources.afp. 
+      </p>
+    </section>
   </section>
 
         <section>

Modified: xmlgraphics/fop/trunk/src/documentation/content/xdocs/trunk/output.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/documentation/content/xdocs/trunk/output.xml?rev=721430&r1=721429&r2=721430&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/documentation/content/xdocs/trunk/output.xml (original)
+++ xmlgraphics/fop/trunk/src/documentation/content/xdocs/trunk/output.xml Fri Nov 28 03:13:12 2008
@@ -479,7 +479,7 @@
     <section id="afp-configuration">
       <title>Configuration</title>
       <section id="afp-font-config">
-        <title>Fonts</title>
+      <title>Fonts</title>
       <p>The AFP Renderer requires special configuration particularly related to fonts.
       AFP Render configuration is done through the normal FOP configuration file. The MIME type
       for the AFP Renderer is application/x-afp which means the AFP Renderer section in the FOP configuration file
@@ -615,16 +615,33 @@
       <section id="afp-image-config">
         <title>Images</title>
         <p>By default the AFP Renderer converts all images to 8 bit grey level.
-        This can be overridden by the &lt;images&gt; configuration element. Example:</p>
+        This can be overridden by the &lt;images/&gt; configuration element. Example:</p>
       <source><![CDATA[
       <images mode="color" />
 ]]></source>
       <p>This will put images as RGB images into the AFP output stream. The default setting is:</p>
       <source><![CDATA[
-      <images mode="b+w" bits-per-pixel="8" />
+      <images mode="b+w" bits-per-pixel="8" native="true"/>
 ]]></source>
-      <p>Only the values "color" and "b+w" are allowed for the mode attribute. The bits-per-pixel
-      attribute is ignored if mode is "color". For "b+w" mode is must be 1, 4, or 8.</p>
+      <p>Only the values "color" and "b+w" are allowed for the mode attribute.</p>
+      <p>The bits-per-pixel attribute is ignored if mode is "color". For "b+w" mode is must be 1, 4, or 8.</p>
+      <source><![CDATA[
+      <images native="true"/>
+]]></source>
+      <p>When the native attribute is specified and set to "true", all image resources will be natively injected
+      into the datastream using an object container rather than being converted into an IOCA FS45 image.
+      Support for native image formats (e.g. JPEG, GIF) is not always available on printer implementations
+      so by default this configuration option is set to "false".</p>
+      </section>
+      <section id="afp-resource-group-file">
+      <title>Resource Group File</title>
+      <p>By default the AFP Renderer will place all data resource objects such as images within
+      the document of the main output datastream.  An external resource group file where document resources
+      may be specified with the &lt;resource-group-file/&gt; configuration element.  Example:</p>
+      <source><![CDATA[
+      <resource-group-file>external_resources.afp</resource-group-file>
+]]></source>
+      <note>Be careful when using this option not to overwrite existing resource files from previous rendering runs.</note>
       </section>
     </section>
     <section id="afp-extensions">
@@ -709,6 +726,43 @@
         </p>
       </section>
     </section>
+    <section id="afp-foreign-attributes">
+      <title>Foreign Attributes</title>
+        <section id="afp-foreign-attributes-resource">
+        <title>Resource</title>
+        <p>The resource foreign attributes provides the ability to name and control where data object resources
+        (e.g. images/scalable vector graphics) will reside in the AFP output.
+        The afp foreign attributes are only used in conjuntion with &lt;fo:external-graphic/&gt; and &lt;instream-foreign-object/&gt;.
+        Example:</p>
+      <source><![CDATA[
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"
+     xmlns:afp="http://xmlgraphics.apache.org/fop/extensions/afp">
+     ...
+     <fo:block>
+      <fo:external-graphic width="2.0cm" content-width="2.0cm" height="1.8cm" content-height="1.8cm"
+        src="examples/fo/graphics/xml_feather.gif"
+        afp:resource-name="feather" afp:resource-level="external" afp:resource-group-file="resources.afp"/>
+     </fo:block>
+     <fo:block>
+      <fo:instream-foreign-object height="758.047pt" content-height="758.047pt" width="576.96pt" content-width="576.96pt"
+      afp:resource-name"circles" afp:resource-level="inline">
+       <svg xmlns="http://www.w3.org/2000/svg" width="12cm" height="12cm">
+        <g style="fill-opacity:0.7; stroke:black; stroke-width:0.1cm;">
+         <circle cx="6cm" cy="2cm" r="100" style="fill:red;" transform="translate(0,50)" />
+         <circle cx="6cm" cy="2cm" r="100" style="fill:blue;" transform="translate(70,150)" />
+         <circle cx="6cm" cy="2cm" r="100" style="fill:green;" transform="translate(-70,150)"/>
+        </g>
+       </svg>
+      </fo:instream-foreign-object>
+     </fo:block>
+]]></source>
+        <p>The resource-level attribute where the resource object will reside in the AFP output datastream.
+        The possible values for this are "inline", "print-file" and "external".
+        When no resource-level attribute is provided, resources are by default placed at "print-file" level.
+        When "external" is used a resource-group-file attribute must also be specified.</p>
+        <p></p>
+      </section>
+    </section>
   </section>
 <section id="rtf">
   <title>RTF</title>

Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPConstants.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPConstants.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPConstants.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Nov 28 03:13:12 2008
@@ -0,0 +1,3 @@
+/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPConstants.java:630874-721418
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/AFPConstants.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPConstants.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627

Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPGraphics2D.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPGraphics2D.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPGraphics2D.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Nov 28 03:13:12 2008
@@ -0,0 +1,3 @@
+/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPGraphics2D.java:630874-721418
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/AFPGraphics2D.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPGraphics2D.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627

Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPPaintingState.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPPaintingState.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPPaintingState.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Nov 28 03:13:12 2008
@@ -0,0 +1,3 @@
+/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPPaintingState.java:630874-721418
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/AFPState.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPState.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627

Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/DataStream.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/DataStream.java
------------------------------------------------------------------------------
    svn:keywords = Revision Id

Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/DataStream.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Nov 28 03:13:12 2008
@@ -0,0 +1,3 @@
+/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/DataStream.java:630874-721418
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/modca/DataStream.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/DataStream.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627



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