xmlgraphics-fop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerem...@apache.org
Subject svn commit: r764744 [1/4] - in /xmlgraphics/fop/branches/Temp_Accessibility: ./ examples/embedding/java/embedding/intermediate/ src/documentation/ src/documentation/content/xdocs/trunk/ src/documentation/intermediate-format-ng/ src/java/META-INF/servic...
Date Tue, 14 Apr 2009 11:35:15 GMT
Author: jeremias
Date: Tue Apr 14 11:35:08 2009
New Revision: 764744

URL: http://svn.apache.org/viewvc?rev=764744&view=rev
Log:
Merge from Trunk revisions 744927 - 763662.

Added:
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/fonts/FontAdder.java
      - copied unchanged from r763662, xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontAdder.java
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/fonts/FontDetector.java
      - copied unchanged from r763662, xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontDetector.java
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/fonts/FontInfoConfigurator.java
      - copied unchanged from r763662, xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontInfoConfigurator.java
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/AbstractConfigurator.java
      - copied unchanged from r763662, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractConfigurator.java
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/ImageHandler.java
      - copied unchanged from r763662, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ImageHandler.java
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/afp/extensions/AFPInvokeMediumMap.java
      - copied unchanged from r763662, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/extensions/AFPInvokeMediumMap.java
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/afp/extensions/AFPInvokeMediumMapElement.java
      - copied unchanged from r763662, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/extensions/AFPInvokeMediumMapElement.java
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/afp/extensions/AFPPageSetupElement.java
      - copied unchanged from r763662, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/extensions/AFPPageSetupElement.java
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/tools/fontlist/
      - copied from r763662, xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/fontlist/
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/tools/fontlist/FontListGenerator.java
      - copied unchanged from r763662, xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/fontlist/FontListGenerator.java
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/tools/fontlist/FontListMain.java
      - copied unchanged from r763662, xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/fontlist/FontListMain.java
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/tools/fontlist/FontListSerializer.java
      - copied unchanged from r763662, xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/fontlist/FontListSerializer.java
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/tools/fontlist/FontSpec.java
      - copied unchanged from r763662, xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/fontlist/FontSpec.java
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/tools/fontlist/fonts2fo.xsl
      - copied unchanged from r763662, xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/fontlist/fonts2fo.xsl
    xmlgraphics/fop/branches/Temp_Accessibility/test/java/org/apache/fop/config/FOURIResolverTestCase.java
      - copied unchanged from r763662, xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FOURIResolverTestCase.java
    xmlgraphics/fop/branches/Temp_Accessibility/test/java/org/apache/fop/intermediate/IFMimickingTestCase.java
      - copied unchanged from r763662, xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/IFMimickingTestCase.java
    xmlgraphics/fop/branches/Temp_Accessibility/test/java/org/apache/fop/render/RendererFactoryTest.java
      - copied unchanged from r763662, xmlgraphics/fop/trunk/test/java/org/apache/fop/render/RendererFactoryTest.java
    xmlgraphics/fop/branches/Temp_Accessibility/test/layoutengine/standard-testcases/page-position-last_break-before_bugzilla46489.xml
      - copied unchanged from r763662, xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/page-position-last_break-before_bugzilla46489.xml
    xmlgraphics/fop/branches/Temp_Accessibility/test/test-no-xml-metrics.xconf
      - copied unchanged from r763662, xmlgraphics/fop/trunk/test/test-no-xml-metrics.xconf
Removed:
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/afp/extensions/AFPElement.java
Modified:
    xmlgraphics/fop/branches/Temp_Accessibility/   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/build.xml
    xmlgraphics/fop/branches/Temp_Accessibility/examples/embedding/java/embedding/intermediate/ExampleConcat.java
    xmlgraphics/fop/branches/Temp_Accessibility/examples/embedding/java/embedding/intermediate/ExampleStamp.java
    xmlgraphics/fop/branches/Temp_Accessibility/src/documentation/content/xdocs/trunk/configuration.xml
    xmlgraphics/fop/branches/Temp_Accessibility/src/documentation/content/xdocs/trunk/fonts.xml
    xmlgraphics/fop/branches/Temp_Accessibility/src/documentation/content/xdocs/trunk/output.xml
    xmlgraphics/fop/branches/Temp_Accessibility/src/documentation/intermediate-format-ng/fop-intermediate-format-ng.xsd
    xmlgraphics/fop/branches/Temp_Accessibility/src/documentation/skinconf.xml
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/META-INF/services/org.apache.fop.render.intermediate.IFDocumentHandler   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/META-INF/services/org.apache.xmlgraphics.image.loader.spi.ImageLoaderFactory
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/AFPBorderPainter.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/AFPConstants.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/AFPDataObjectFactory.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/AFPDataObjectInfo.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/AFPEventProducer.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/AFPGraphics2D.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/AFPGraphicsObjectInfo.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/AFPImageObjectInfo.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/AFPLineDataInfo.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/AFPObjectAreaInfo.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/AFPPaintingState.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/AFPRectanglePainter.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/AFPResourceInfo.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/AFPResourceLevel.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/AFPResourceManager.java   (contents, props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/AFPStreamer.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/AFPTextDataInfo.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/AFPUnitConverter.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/AbstractAFPPainter.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/BorderPaintingInfo.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/DataStream.java   (contents, props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/Factory.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/PaintingInfo.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/RectanglePaintingInfo.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/Streamable.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/StructuredData.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/fonts/AFPBase12FontCollection.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/fonts/AFPFont.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/fonts/AFPFontAttributes.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/fonts/AFPFontCollection.java   (contents, props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/fonts/AFPFontInfo.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/fonts/AFPFontReader.java   (contents, props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/fonts/AFPPageFonts.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/fonts/CharacterSet.java   (contents, props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/fonts/CharacterSetOrientation.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/fonts/FontRuntimeException.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/fonts/FopCharacterSet.java   (contents, props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/fonts/OutlineFont.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/fonts/RasterFont.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/goca/AbstractGraphicsCoord.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/goca/AbstractGraphicsDrawingOrderContainer.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/goca/GraphicsBox.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/goca/GraphicsChainedSegment.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/goca/GraphicsCharacterString.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/goca/GraphicsData.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/goca/GraphicsFillet.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/goca/GraphicsFullArc.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/goca/GraphicsImage.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/goca/GraphicsLine.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/goca/GraphicsSetArcParameters.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/goca/GraphicsSetCharacterSet.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/goca/GraphicsSetCurrentPosition.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/goca/GraphicsSetLineType.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/goca/GraphicsSetLineWidth.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/goca/GraphicsSetMix.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/goca/GraphicsSetPatternSymbol.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/goca/GraphicsSetProcessColor.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/ioca/ImageCellPosition.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/ioca/ImageContent.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/ioca/ImageInputDescriptor.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/ioca/ImageOutputControl.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/ioca/ImageRasterData.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/ioca/ImageRasterPattern.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/ioca/ImageSegment.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/ioca/ImageSizeParameter.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/AbstractAFPObject.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/AbstractDataObject.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/AbstractDescriptor.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/AbstractEnvironmentGroup.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/AbstractNamedAFPObject.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/AbstractPageObject.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/AbstractResourceEnvironmentGroupContainer.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/AbstractResourceGroupContainer.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/AbstractStructuredObject.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/ActiveEnvironmentGroup.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/ContainerDataDescriptor.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/Document.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/GraphicsDataDescriptor.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/GraphicsObject.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/IMImageObject.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/ImageDataDescriptor.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/ImageObject.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/IncludeObject.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/IncludePageOverlay.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/IncludePageSegment.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/InterchangeSet.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/InvokeMediumMap.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/MapCodedFont.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/MapContainerData.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/MapDataResource.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/MapPageOverlay.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/MaximumSizeExceededException.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/NoOperation.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/ObjectAreaDescriptor.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/ObjectAreaPosition.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/ObjectContainer.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/ObjectEnvironmentGroup.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/Overlay.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/PageDescriptor.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/PageGroup.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/PageObject.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/PageSegment.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/PreprocessPresentationObject.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/PresentationEnvironmentControl.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/PresentationTextData.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/PresentationTextDescriptor.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/PresentationTextObject.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/Registry.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/ResourceEnvironmentGroup.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/ResourceGroup.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/ResourceObject.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/StreamedResourceGroup.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/TagLogicalElement.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/TagLogicalElementBean.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/triplets/AbstractTriplet.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/triplets/ExtendedResourceLocalIdentifierTriplet.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/triplets/FullyQualifiedNameTriplet.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/triplets/MappingOptionTriplet.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/triplets/MeasurementUnitsTriplet.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/triplets/ObjectAreaSizeTriplet.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/triplets/ObjectByteExtentTriplet.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/triplets/ObjectClassificationTriplet.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/triplets/PresentationSpaceMixingRulesTriplet.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/triplets/PresentationSpaceResetMixingTriplet.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/triplets/ResourceObjectTypeTriplet.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/svg/AFPGraphicsConfiguration.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/svg/AFPGraphicsDevice.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/svg/AFPTextElementBridge.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/svg/AFPTextHandler.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/svg/AFPTextPainter.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/util/BinaryUtils.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/util/DTDEntityResolver.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/util/DefaultFOPResourceAccessor.java
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/util/SimpleResourceAccessor.java
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/util/StringUtils.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/util/StructuredFieldReader.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/apps/FOURIResolver.java
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/apps/FOUserAgent.java
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/apps/FopFactory.java
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/apps/FopFactoryConfigurator.java
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/area/AreaTreeHandler.java
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/area/AreaTreeParser.java
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/area/CachedRenderPagesModel.java
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/area/PageSequence.java
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/area/inline/InlineArea.java
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/cli/CommandLineOptions.java
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/events/EventFormatter.xml
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/fo/Constants.java
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/fo/flow/Leader.java
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/fo/pagination/PageSequence.java
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/fo/pagination/Region.java
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/fo/pagination/RegionAfter.java
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/fo/pagination/RegionBody.java
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/fo/pagination/RegionEnd.java
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/fo/pagination/RegionStart.java
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/fo/properties/CommonFont.java
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/fonts/FontManager.java
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/fonts/autodetect/FontFileFinder.java
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/fonts/autodetect/FontFinder.java
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/image/loader/batik/Graphics2DImagePainterImpl.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/layoutmgr/ElementListUtils.java
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/layoutmgr/ExternalDocumentLayoutManager.java
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/layoutmgr/FlowLayoutManager.java
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/layoutmgr/PageBreaker.java
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/layoutmgr/inline/LeaderLayoutManager.java
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/pdf/AbstractPDFFontStream.java
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/pdf/AbstractPDFStream.java
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/pdf/PDFImageXObject.java
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/pdf/PDFMetadata.java
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/pdf/PDFPaintingState.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/AbstractRenderer.java
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/AbstractRendererConfigurator.java
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/DefaultFontResolver.java
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/PrintRendererConfigurator.java
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/RendererFactory.java
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/afp/AFPDocumentHandler.java
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/afp/AFPDocumentHandlerMaker.java
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/afp/AFPForeignAttributeReader.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/afp/AFPPainter.java
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/afp/AFPRenderer.java
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/afp/AFPRendererConfigurator.java
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/afp/AFPRendererImageInfo.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/afp/extensions/AFPElementMapping.java
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/afp/extensions/AFPExtensionAttachment.java
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/afp/extensions/AFPExtensionHandler.java
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/afp/extensions/AFPPageSetup.java
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/afp/extensions/AbstractAFPExtensionObject.java
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/bitmap/TIFFDocumentHandlerMaker.java
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/AbstractIFDocumentHandler.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/IFContentHandler.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/IFPainter.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/IFRenderer.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/extensions/DocumentNavigationExtensionConstants.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pcl/PCLDocumentHandler.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pcl/PCLDocumentHandlerMaker.java   (contents, props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pdf/PDFDocumentHandler.java   (contents, props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pdf/PDFDocumentHandlerMaker.java
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/print/PageableRenderer.java
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/ps/PSDocumentHandlerMaker.java
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/xml/XMLRenderer.java
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/svg/PDFDocumentGraphics2DConfigurator.java
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/svg/PDFGraphics2D.java
    xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/util/AbstractPaintingState.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/sandbox/org/apache/fop/render/svg/AbstractSVGDocumentHandler.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/src/sandbox/org/apache/fop/render/svg/SVGDocumentHandler.java   (props changed)
    xmlgraphics/fop/branches/Temp_Accessibility/status.xml
    xmlgraphics/fop/branches/Temp_Accessibility/test/java/org/apache/fop/StandardTestSuite.java
    xmlgraphics/fop/branches/Temp_Accessibility/test/java/org/apache/fop/config/FontBaseBadTestCase.java
    xmlgraphics/fop/branches/Temp_Accessibility/test/java/org/apache/fop/intermediate/IFParserTestCase.java
    xmlgraphics/fop/branches/Temp_Accessibility/test/java/org/apache/fop/intermediate/IFTester.java
    xmlgraphics/fop/branches/Temp_Accessibility/test/java/org/apache/fop/threading/FOPTestbed.java
    xmlgraphics/fop/branches/Temp_Accessibility/test/java/org/apache/fop/threading/FOProcessor.java
    xmlgraphics/fop/branches/Temp_Accessibility/test/java/org/apache/fop/threading/FOProcessorImpl.java
    xmlgraphics/fop/branches/Temp_Accessibility/test/layoutengine/standard-testcases/afp-extension_1.xml
    xmlgraphics/fop/branches/Temp_Accessibility/test/layoutengine/standard-testcases/leader_border_padding.xml

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 14 11:35:08 2009
@@ -1,3 +1,4 @@
 /xmlgraphics/fop/branches/Temp_AFPGOCAResources:630874-721418
+/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign:745924-746655
 /xmlgraphics/fop/branches/fop-0_95:684572,688085,688696
-/xmlgraphics/fop/trunk:603620-744926
+/xmlgraphics/fop/trunk:603620-763662

Modified: xmlgraphics/fop/branches/Temp_Accessibility/build.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/build.xml?rev=764744&r1=764743&r2=764744&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/build.xml (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/build.xml Tue Apr 14 11:35:08 2009
@@ -358,12 +358,12 @@
       </fileset>
     </eventResourceGenerator>
     <fixcrlf file="${src.java.dir}/org/apache/fop/events/EventFormatter.xml" tab="remove" tablength="2"/>
-    <eventResourceGenerator modelfile="${build.gensrc.dir}/org/apache/fop/render/afp/event-model.xml" translationfile="${src.java.dir}/org/apache/fop/render/afp/AFPEventProducer.xml">
+    <eventResourceGenerator modelfile="${build.gensrc.dir}/org/apache/fop/afp/event-model.xml" translationfile="${src.java.dir}/org/apache/fop/afp/AFPEventProducer.xml">
       <fileset dir="${src.java.dir}">
         <include name="org/apache/fop/render/afp/**/*.java"/>
       </fileset>
     </eventResourceGenerator>
-    <fixcrlf file="${src.java.dir}/org/apache/fop/render/afp/AFPEventProducer.xml" tab="remove" tablength="2"/>
+    <fixcrlf file="${src.java.dir}/org/apache/fop/afp/AFPEventProducer.xml" tab="remove" tablength="2"/>
     <eventResourceGenerator modelfile="${build.gensrc.dir}/org/apache/fop/render/bitmap/event-model.xml" translationfile="${src.java.dir}/org/apache/fop/render/bitmap/BitmapRendererEventProducer.xml">
       <fileset dir="${src.java.dir}">
         <include name="org/apache/fop/render/bitmap/**/*.java"/>
@@ -608,7 +608,7 @@
       <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/render/**Configurator**"/>
       <include name="org/apache/fop/util/AbstractPaintingState**"/>
       <include name="org/apache/fop/pdf/**"/>
     </patternset>

Modified: xmlgraphics/fop/branches/Temp_Accessibility/examples/embedding/java/embedding/intermediate/ExampleConcat.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/examples/embedding/java/embedding/intermediate/ExampleConcat.java?rev=764744&r1=764743&r2=764744&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/examples/embedding/java/embedding/intermediate/ExampleConcat.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/examples/embedding/java/embedding/intermediate/ExampleConcat.java Tue Apr 14 11:35:08 2009
@@ -92,7 +92,7 @@
         //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");
+                userAgent, MimeConstants.MIME_PDF);
 
         //Create the IFSerializer to write the intermediate format
         IFSerializer ifSerializer = new IFSerializer();
@@ -150,7 +150,7 @@
             FOUserAgent userAgent = fopFactory.newFOUserAgent();
 
             //Setup target handler
-            String mime = MimeConstants.MIME_PDF + ";mode=painter";
+            String mime = MimeConstants.MIME_PDF;
             IFDocumentHandler targetHandler = fopFactory.getRendererFactory().createDocumentHandler(
                     userAgent, mime);
 

Modified: xmlgraphics/fop/branches/Temp_Accessibility/examples/embedding/java/embedding/intermediate/ExampleStamp.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/examples/embedding/java/embedding/intermediate/ExampleStamp.java?rev=764744&r1=764743&r2=764744&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/examples/embedding/java/embedding/intermediate/ExampleStamp.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/examples/embedding/java/embedding/intermediate/ExampleStamp.java Tue Apr 14 11:35:08 2009
@@ -73,7 +73,7 @@
             FOUserAgent userAgent = fopFactory.newFOUserAgent();
 
             //Setup target handler
-            String mime = MimeConstants.MIME_PDF + ";mode=painter";
+            String mime = MimeConstants.MIME_PDF;
             IFDocumentHandler targetHandler = fopFactory.getRendererFactory().createDocumentHandler(
                     userAgent, mime);
 

Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/documentation/content/xdocs/trunk/configuration.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/documentation/content/xdocs/trunk/configuration.xml?rev=764744&r1=764743&r2=764744&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/documentation/content/xdocs/trunk/configuration.xml (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/documentation/content/xdocs/trunk/configuration.xml Tue Apr 14 11:35:08 2009
@@ -152,6 +152,18 @@
         <td>"height" 11 inches, "width" 8.26 inches</td>
       </tr>
       <tr>
+        <td>prefer-renderer</td>
+        <td>boolean (true, false)</td>
+        <td>
+          By default, FOP prefers the newer output implementations based on the
+          <code>IFDocumentHandler</code> interface. If no such implementation can be found for
+          a given MIME type, it looks for an implementation of the <code>Renderer</code> interface.
+          If necessary, you can invert the lookup order to prefer the Renderer variant over the
+          IFDocumentHandler variant by setting this value to true. 
+        </td>
+        <td>false</td>
+      </tr>
+      <tr>
         <td>use-cache</td>
         <td>boolean (true, false)</td>
         <td>All fonts information that has been gathered as a result of "directory"

Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/documentation/content/xdocs/trunk/fonts.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/documentation/content/xdocs/trunk/fonts.xml?rev=764744&r1=764743&r2=764744&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/documentation/content/xdocs/trunk/fonts.xml (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/documentation/content/xdocs/trunk/fonts.xml Tue Apr 14 11:35:08 2009
@@ -344,7 +344,7 @@
         </warning>
       </section>
       <section id="truetype-collections-metrics">
-        <title>TrueType Collections Font Metrics</title>
+        <title>TrueType Collections</title>
         <p>TrueType collections (.ttc files) contain more than one font.
           To create metrics files for these fonts, you must specify which font in the collection should be generated, by using the "-ttcname" option with the TTFReader.</p>
         <p>To get a list of the fonts in a collection, just start the TTFReader as if it were a normal TrueType file (without the -ttcname option).
@@ -356,8 +356,11 @@
         <p>
           Alternatively, the individual sub-fonts of a TrueType Collections can be selected
           using the "sub-font" attribute on the "font" element. That means that generating
-          an XML font metrics file for TrueType collections is not necessary anymore.
+          an XML font metrics file for TrueType collections is not necessary anymore. Example:
         </p>
+        <source><![CDATA[<font embed-url="gulim.ttc" sub-font="GulimChe">
+  <font-triplet name="GulimChe" style="normal" weight="normal"/>
+</font>]]></source>
       </section>
       <section id="register">
         <title>Register Fonts with FOP</title>
@@ -542,5 +545,13 @@
       </ul>
       <p>Character-by-Character is NOT yet supported!</p>
     </section>
+    <section id="font-list">
+      <title>Font List Command-Line Tool</title>
+      <p>
+        FOP contains a small command-line tool that lets you generate a list of all configured
+        fonts. Its class name is: <code>org.apache.fop.tools.fontlist.FontListMain</code>.
+        Run it with the "-?" parameter to get help for the various options.
+      </p>
+    </section>
   </body>
 </document>

Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/documentation/content/xdocs/trunk/output.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/documentation/content/xdocs/trunk/output.xml?rev=764744&r1=764743&r2=764744&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/documentation/content/xdocs/trunk/output.xml (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/documentation/content/xdocs/trunk/output.xml Tue Apr 14 11:35:08 2009
@@ -451,11 +451,35 @@
   </section>
   <section id="afp">
     <title>AFP</title>
-    <warning>The AFP Renderer is a new addition (27-Apr-2006) to the sandbox and as such not yet fully tested or feature complete.</warning>
     <p>
       The FOP AFP Renderer deals with creating documents conforming to the IBM AFP document architecture
       also refered to as MO:DCA (Mixed Object Document Content Architecture).
     </p>
+    <p>
+      The mapping of XSL-FO elements to the major MO:DCA structures is as follows:
+    </p>
+    <table>
+      <tr>
+        <th>XSL-FO element</th>
+        <th>MO:DCA-P object</th>
+      </tr>
+      <tr>
+        <td>fo:root</td>
+        <td>Document</td>
+      </tr>
+      <tr>
+        <td>fo:page-sequence</td>
+        <td>Page Group</td>
+      </tr>
+      <tr>
+        <td>fo:simple-page-master</td>
+        <td>Page</td>
+      </tr>
+    </table>
+    <p>
+      FOP creates exactly one Document per Printfile with an optional Resource Group at the
+      beginning. FOP does not create document indices.
+    </p>
     <section id="afp-references">
       <title>References</title>
       <ul>
@@ -512,8 +536,8 @@
 <source><![CDATA[      <!-- This is an example of mapping actual IBM raster fonts / code pages to a FOP font -->
         <font>
         <!-- The afp-font element defines the IBM code page, the matching Java encoding and the
-             path to the font -->
-        <afp-font type="raster" codepage="T1V10500" encoding="Cp500" path="fonts/ibm">
+             base URI for the font -->
+        <afp-font type="raster" codepage="T1V10500" encoding="Cp500" base-uri="fonts/ibm/">
           <!-- For a raster font a separate element for each font size is required providing
                the font size and the corresponding IBM Character set name -->
           <afp-raster-font size="7" characterset="C0N20070"/>
@@ -539,15 +563,24 @@
       However, the characterset definition is now required within the afp-font element.</p>
 <source><![CDATA[      <font>
           <afp-font type="outline" codepage="T1V10500" encoding="Cp500" characterset="CZH200  "
-             path="fonts/ibm" />
+             base-uri="file:/fonts/ibm" />
           <font-triplet name="sans-serif" style="normal" weight="normal"/>
           <font-triplet name="Helvetica" style="normal" weight="normal"/>
           <font-triplet name="any" style="normal" weight="normal"/>
       </font>
 ]]></source>
+      <p>
+        If "base-uri" is missing or a relative URI, the fonts are resolved relative to
+        the font base URI specified in the configuration (or on the FopFactory).
+      </p>
+      <note>
+        Previously, the location of the font files was given by the "path" attribute. This is still
+        supported for the time being, but you should move to using the more flexible "base-uri"
+        attribute so you can profit from the power of URI resolvers.
+      </note>
       <p>Experimentation has shown that the font metrics for the FOP built-in Base14 fonts are actually
       very similar to some of the IBM outline and raster fonts. In cases were the IBM font files are not
-      available the path attribute in the afp-font element can be replaced by a base14-font attribute 
+      available the base-uri attribute in the afp-font element can be replaced by a base14-font attribute 
       giving the name of the matching Base14 font. In this case the AFP Renderer will take the
       font metrics from the built-in font.</p>
 <source><![CDATA[      <!-- The following are examples of defining outline fonts based on FOP built-in
@@ -687,7 +720,7 @@
                xmlns:afp="http://xmlgraphics.apache.org/fop/extensions/afp">
 ]]></source>
       <section id="afp-page-overlay">
-        <title>Page Overlay Extension</title>
+        <title>Page Overlay (IPO) Extension</title>
         <p>The include-page-overlay extension element allows to define on a per simple-page-master basis a page overlay resource. Example:</p>
       <source><![CDATA[
       <fo:layout-master-set>
@@ -701,7 +734,7 @@
         must be known in the AFP processing environment.</p>
       </section>
       <section id="afp-page-segment">
-        <title>Page Segment Extension</title>
+        <title>Page Segment (IPS) Extension</title>
         <p>The include-page-segment extension element allows to define resource substitution for fo:external-graphics elements. 
           Example:</p>
       <source><![CDATA[
@@ -724,7 +757,7 @@
         </p>
       </section>
       <section id="afp-tag-logical-element">
-        <title>Tag Logical Element Extension</title>
+        <title>Tag Logical Element (TLE) Extension</title>
         <p>The tag-logical-element extension element allows to injects TLEs into the AFP output stream. Example:</p>
       <source><![CDATA[
     <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"
@@ -735,14 +768,21 @@
           <fo:region-body/>
         </fo:simple-page-master>
       </fo:layout-master-set>
+      [..]
+      <fo:page-sequence master-reference="simple">
+        <afp:tag-logical-element name="foo" value="bar"/>
+        <fo:flow flow-name="xsl-region-body">
+          [..]
 ]]></source>
-        <p>The tag-logical-element extension element can only occur within a simple-page-master.
-        Multiple tag-logical-element extension elements within a simple-page-master are allowed.
-        The name and value attributes are mandatory.
+        <p>
+          The tag-logical-element extension element can appear within a simple-page-master
+          (page level) or it can appear as child of page-sequence (page group level).
+          Multiple tag-logical-element extension elements within a simple-page-master or
+          page-sequence are allowed. The name and value attributes are mandatory.
         </p>
       </section>
       <section id="afp-no-operation">
-        <title>No Operation Extension</title>
+        <title>No Operation (NOP) Extension</title>
         <p>The no-operation extension provides the ability to carry up to 32K of comments or any other type
         of unarchitected data into the AFP output stream. Example:</p>
       <source><![CDATA[
@@ -759,6 +799,29 @@
         The name attribute is mandatory.
         </p>
       </section>
+      <section id="afp-invoke-medium-map">
+        <title>Invoke Medium Map (IMM) Extension</title>
+        <p>
+          The invoke-medium-map extension allows to generate IMM fields (Invoke Medium Map) in the
+          generated AFP output. 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:page-sequence master-reference="normal">
+        <afp:invoke-medium-map name="MYMAP"/>
+        <fo:flow flow-name="xsl-region-body">
+          [..]
+]]></source>
+        <p>
+          The invoke-medium-map element is allowed as child of fo:page-sequence (page group
+          level). It is NOT supported on document level (fo:root), yet. FOP also doesn't support
+          specifying medium maps inside XML (using BMM/EMM). It can only reference an existing
+          medium map by name. The medium map has to be constructed through different means and
+          available on the target platform.
+        </p>
+      </section>
     </section>
     <section id="afp-foreign-attributes">
       <title>Foreign Attributes</title>

Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/documentation/intermediate-format-ng/fop-intermediate-format-ng.xsd
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/documentation/intermediate-format-ng/fop-intermediate-format-ng.xsd?rev=764744&r1=764743&r2=764744&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/documentation/intermediate-format-ng/fop-intermediate-format-ng.xsd (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/documentation/intermediate-format-ng/fop-intermediate-format-ng.xsd Tue Apr 14 11:35:08 2009
@@ -55,6 +55,9 @@
   <xs:element name="page-sequence">
     <xs:complexType>
       <xs:sequence>
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:any namespace="##other" processContents="lax"/>
+        </xs:choice>
         <xs:element ref="mf:page" minOccurs="1" maxOccurs="unbounded"/>
       </xs:sequence>
       <xs:attribute name="id" type="xs:ID"/>

Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/documentation/skinconf.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/documentation/skinconf.xml?rev=764744&r1=764743&r2=764744&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/documentation/skinconf.xml (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/documentation/skinconf.xml Tue Apr 14 11:35:08 2009
@@ -91,7 +91,7 @@
   <favicon-url></favicon-url>
 
   <!-- The following used to construct a copyright statement -->
-  <year>1999-2008</year>
+  <year>1999-2009</year>
   <vendor>The Apache Software Foundation.</vendor>
   <copyright-link>http://www.apache.org/licenses/</copyright-link>
   

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/META-INF/services/org.apache.fop.render.intermediate.IFDocumentHandler
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 14 11:35:08 2009
@@ -1 +1 @@
-/xmlgraphics/fop/trunk/src/java/META-INF/services/org.apache.fop.render.intermediate.IFDocumentHandler:699793-744926
+/xmlgraphics/fop/trunk/src/java/META-INF/services/org.apache.fop.render.intermediate.IFDocumentHandler:699793-763662

Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/META-INF/services/org.apache.xmlgraphics.image.loader.spi.ImageLoaderFactory
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/META-INF/services/org.apache.xmlgraphics.image.loader.spi.ImageLoaderFactory?rev=764744&r1=764743&r2=764744&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/META-INF/services/org.apache.xmlgraphics.image.loader.spi.ImageLoaderFactory (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/META-INF/services/org.apache.xmlgraphics.image.loader.spi.ImageLoaderFactory Tue Apr 14 11:35:08 2009
@@ -1,2 +1,2 @@
 org.apache.fop.image.loader.batik.ImageLoaderFactorySVG
-org.apache.fop.image.loader.batik.ImageLoaderFactoryWMF
\ No newline at end of file
+org.apache.fop.image.loader.batik.ImageLoaderFactoryWMF

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/AFPBorderPainter.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/AFPConstants.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/AFPDataObjectFactory.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/AFPDataObjectInfo.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/AFPEventProducer.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/AFPGraphics2D.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/AFPGraphicsObjectInfo.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/AFPImageObjectInfo.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/AFPLineDataInfo.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/AFPObjectAreaInfo.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/AFPPaintingState.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/AFPRectanglePainter.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/AFPResourceInfo.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/AFPResourceLevel.java
            ('svn:mergeinfo' removed)

Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/AFPResourceManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/AFPResourceManager.java?rev=764744&r1=764743&r2=764744&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/AFPResourceManager.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/AFPResourceManager.java Tue Apr 14 11:35:08 2009
@@ -37,7 +37,6 @@
 import org.apache.fop.afp.modca.ResourceGroup;
 import org.apache.fop.afp.modca.ResourceObject;
 import org.apache.fop.afp.util.ResourceAccessor;
-import org.apache.fop.afp.util.SimpleResourceAccessor;
 
 /**
  * Manages the creation and storage of document resources
@@ -236,11 +235,11 @@
     /**
      * Creates an included resource object by loading the contained object from a file.
      * @param resourceName the name of the resource
-     * @param basePath the base path in which to look for the resource files
+     * @param accessor resource accessor to access the resource with
      * @param resourceObjectType the resource object type ({@link ResourceObject}.*)
      * @throws IOException if an I/O error occurs while loading the resource
      */
-    public void createIncludedResource(String resourceName, String basePath,
+    public void createIncludedResource(String resourceName, ResourceAccessor accessor,
                 byte resourceObjectType) throws IOException {
         AFPResourceLevel resourceLevel = new AFPResourceLevel(AFPResourceLevel.PRINT_FILE);
         URI uri;
@@ -261,9 +260,6 @@
             if (log.isDebugEnabled()) {
                 log.debug("Adding included resource: " + resourceName);
             }
-            //TODO This works with local filenames only. In the long term, this
-            //should work through FOP's URI resolver.
-            ResourceAccessor accessor = new SimpleResourceAccessor(basePath);
             IncludedResourceObject resourceContent = new IncludedResourceObject(
                         resourceName, accessor, uri);
 

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/AFPResourceManager.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/AFPStreamer.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/AFPTextDataInfo.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/AFPUnitConverter.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/AbstractAFPPainter.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/BorderPaintingInfo.java
            ('svn:mergeinfo' removed)

Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/DataStream.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/DataStream.java?rev=764744&r1=764743&r2=764744&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/DataStream.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/DataStream.java Tue Apr 14 11:35:08 2009
@@ -486,10 +486,10 @@
      *            The tag value
      */
     public void createTagLogicalElement(String name, String value) {
-        if (currentPageGroup != null) {
-            currentPageGroup.createTagLogicalElement(name, value);
-        } else {
+        if (currentPage != null) {
             currentPage.createTagLogicalElement(name, value, tleSequence++);
+        } else {
+            currentPageGroup.createTagLogicalElement(name, value);
         }
     }
 

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/DataStream.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/Factory.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/PaintingInfo.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/RectanglePaintingInfo.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/Streamable.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/StructuredData.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/fonts/AFPBase12FontCollection.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/fonts/AFPFont.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/fonts/AFPFontAttributes.java
            ('svn:mergeinfo' removed)

Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/fonts/AFPFontCollection.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/fonts/AFPFontCollection.java?rev=764744&r1=764743&r2=764744&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/fonts/AFPFontCollection.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/fonts/AFPFontCollection.java Tue Apr 14 11:35:08 2009
@@ -67,18 +67,14 @@
                     num++;
                 }
             }
-            if (!fontInfo.hasFont("any", Font.STYLE_NORMAL, Font.WEIGHT_NORMAL)) {
-                eventProducer.warnMissingDefaultFont(this, Font.STYLE_NORMAL, Font.WEIGHT_NORMAL);
-            }
-            if (!fontInfo.hasFont("any", Font.STYLE_ITALIC, Font.WEIGHT_NORMAL)) {
-                eventProducer.warnMissingDefaultFont(this, Font.STYLE_ITALIC, Font.WEIGHT_NORMAL);
-            }
-            if (!fontInfo.hasFont("any", Font.STYLE_NORMAL, Font.WEIGHT_BOLD)) {
-                eventProducer.warnMissingDefaultFont(this, Font.STYLE_ITALIC, Font.WEIGHT_BOLD);
-            }
-            if (!fontInfo.hasFont("any", Font.STYLE_ITALIC, Font.WEIGHT_BOLD)) {
-                eventProducer.warnMissingDefaultFont(this, Font.STYLE_ITALIC, Font.WEIGHT_BOLD);
-            }
+            checkDefaultFontAvailable(fontInfo, eventProducer,
+                    Font.STYLE_NORMAL, Font.WEIGHT_NORMAL);
+            checkDefaultFontAvailable(fontInfo, eventProducer,
+                    Font.STYLE_ITALIC, Font.WEIGHT_NORMAL);
+            checkDefaultFontAvailable(fontInfo, eventProducer,
+                    Font.STYLE_NORMAL, Font.WEIGHT_BOLD);
+            checkDefaultFontAvailable(fontInfo, eventProducer,
+                    Font.STYLE_ITALIC, Font.WEIGHT_BOLD);
         } else {
             eventProducer.warnDefaultFontSetup(this);
 
@@ -89,4 +85,11 @@
         return num;
     }
 
+    private void checkDefaultFontAvailable(FontInfo fontInfo, AFPEventProducer eventProducer,
+            String style, int weight) {
+        if (!fontInfo.hasFont("any", style, weight)) {
+            eventProducer.warnMissingDefaultFont(this, style, weight);
+        }
+    }
+
 }

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/fonts/AFPFontCollection.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/fonts/AFPFontInfo.java
            ('svn:mergeinfo' removed)

Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/fonts/AFPFontReader.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/fonts/AFPFontReader.java?rev=764744&r1=764743&r2=764744&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/fonts/AFPFontReader.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/fonts/AFPFontReader.java Tue Apr 14 11:35:08 2009
@@ -19,21 +19,19 @@
 
 package org.apache.fop.afp.fonts;
 
-import java.io.File;
 import java.io.FileNotFoundException;
-import java.io.FilenameFilter;
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.io.FileUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import org.apache.fop.afp.AFPConstants;
+import org.apache.fop.afp.util.ResourceAccessor;
 import org.apache.fop.afp.util.StructuredFieldReader;
 
 /**
@@ -58,7 +56,7 @@
     /**
      * Static logging instance
      */
-    protected static final Log log = LogFactory.getLog("org.apache.xmlgraphics.afp.fonts");
+    protected static final Log log = LogFactory.getLog(AFPFontReader.class);
 
     /**
      * Template used to convert lists to arrays.
@@ -96,7 +94,7 @@
     /**
      * The collection of code pages
      */
-    private final Map/*<String, Map<String, String>>*/ codePages
+    private final Map/*<String, Map<String, String>>*/ codePagesCache
         = new java.util.HashMap/*<String, Map<String, String>>*/();
 
     /**
@@ -108,65 +106,16 @@
      *
      * @throws IOException in the event that an I/O exception of some sort has occurred
      */
-    private InputStream openInputStream(String path, String filename) throws IOException {
-        ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
-        if (classLoader == null) {
-            classLoader = AFPFontReader.class.getClassLoader();
-        }
-
-        URL url = classLoader.getResource(path);
-
-        if (url == null) {
-            try {
-                File file = new File(path);
-                url = file.toURI().toURL();
-                if (url == null) {
-                    String msg = "file not found " + filename + " in classpath: " + path;
-                    log.error(msg);
-                    throw new FileNotFoundException(msg);
-                }
-            } catch (MalformedURLException ex) {
-                String msg = "file not found " + filename + " in classpath: " + path;
-                log.error(msg);
-                throw new FileNotFoundException(msg);
-            }
-        }
-
-        File directory = FileUtils.toFile(url);
-        if (!directory.canRead()) {
-            String msg = "Failed to read directory " + url.getPath();
-            log.error(msg);
-            throw new FileNotFoundException(msg);
-        }
-
-        final String filterpattern = filename.trim();
-        FilenameFilter filter = new FilenameFilter() {
-            public boolean accept(File dir, String name) {
-                return name.startsWith(filterpattern);
-            }
-        };
-
-        File[] files = directory.listFiles(filter);
-
-        if (files.length < 1) {
-            String msg = "file search for " + filename + " located "
-                + files.length + " files";
-            log.error(msg);
-            throw new FileNotFoundException(msg);
-        } else if (files.length > 1) {
-            String msg = "file search for " + filename + " located "
-                + files.length + " files";
-            log.warn(msg);
-        }
-
-        InputStream inputStream = files[0].toURI().toURL().openStream();
-
-        if (inputStream == null) {
-            String msg = "AFPFontReader:: getInputStream():: file not found for " + filename;
-            log.error(msg);
-            throw new FileNotFoundException(msg);
+    private InputStream openInputStream(ResourceAccessor accessor, String filename)
+            throws IOException {
+        URI uri;
+        try {
+            uri = new URI(filename.trim());
+        } catch (URISyntaxException e) {
+            throw new FileNotFoundException("Invalid filename: "
+                    + filename + " (" + e.getMessage() + ")");
         }
-
+        InputStream inputStream = accessor.createInputStream(uri);
         return inputStream;
     }
 
@@ -206,13 +155,14 @@
              * chracter global identifier.
              */
             String codePageId = new String(characterSet.getCodePage());
-            String path = characterSet.getPath();
+            ResourceAccessor accessor = characterSet.getResourceAccessor();
 
-            Map/*<String,String>*/ codePage = (Map/*<String,String>*/)codePages.get(codePageId);
+            Map/*<String,String>*/ codePage
+                = (Map/*<String,String>*/)codePagesCache.get(codePageId);
 
             if (codePage == null) {
-                codePage = loadCodePage(codePageId, characterSet.getEncoding(), path);
-                codePages.put(codePageId, codePage);
+                codePage = loadCodePage(codePageId, characterSet.getEncoding(), accessor);
+                codePagesCache.put(codePageId, codePage);
             }
 
             /**
@@ -222,7 +172,7 @@
              */
             final String characterSetName = characterSet.getName();
 
-            inputStream = openInputStream(path, characterSetName);
+            inputStream = openInputStream(accessor, characterSetName);
 
             StructuredFieldReader structuredFieldReader = new StructuredFieldReader(inputStream);
 
@@ -246,7 +196,8 @@
                 }
 
                 //process D3AC89 Font Position
-                processFontPosition(structuredFieldReader, characterSetOrientations, metricNormalizationFactor);
+                processFontPosition(structuredFieldReader, characterSetOrientations,
+                        metricNormalizationFactor);
 
                 //process D38C89 Font Index (per orientation)
                 for (int i = 0; i < characterSetOrientations.length; i++) {
@@ -274,17 +225,18 @@
      *            the code page identifier
      * @param encoding
      *            the encoding to use for the character decoding
+     * @param accessor the resource accessor
      * @returns a code page mapping
      */
     private Map/*<String,String>*/ loadCodePage(String codePage, String encoding,
-        String path) throws IOException {
+        ResourceAccessor accessor) throws IOException {
 
         // Create the HashMap to store code page information
         Map/*<String,String>*/ codePages = new java.util.HashMap/*<String,String>*/();
 
         InputStream inputStream = null;
         try {
-            inputStream = openInputStream(path, codePage.trim());
+            inputStream = openInputStream(accessor, codePage.trim());
 
             StructuredFieldReader structuredFieldReader = new StructuredFieldReader(inputStream);
             byte[] data = structuredFieldReader.getNext(CHARACTER_TABLE_SF);

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/fonts/AFPFontReader.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/fonts/AFPPageFonts.java
            ('svn:mergeinfo' removed)

Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/fonts/CharacterSet.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/fonts/CharacterSet.java?rev=764744&r1=764743&r2=764744&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/fonts/CharacterSet.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/fonts/CharacterSet.java Tue Apr 14 11:35:08 2009
@@ -19,20 +19,25 @@
 
 package org.apache.fop.afp.fonts;
 
+import java.io.File;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
+import java.net.URI;
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;
 import java.nio.charset.CharacterCodingException;
 import java.nio.charset.Charset;
 import java.nio.charset.CharsetEncoder;
 import java.nio.charset.CodingErrorAction;
+import java.nio.charset.UnsupportedCharsetException;
 import java.util.Map;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import org.apache.fop.afp.AFPConstants;
+import org.apache.fop.afp.util.ResourceAccessor;
+import org.apache.fop.afp.util.SimpleResourceAccessor;
 import org.apache.fop.afp.util.StringUtils;
 
 /**
@@ -79,7 +84,7 @@
     protected String name;
 
     /** The path to the installed fonts */
-    protected String path;
+    private ResourceAccessor accessor;
 
     /** Indicator as to whether to metrics have been loaded */
     private boolean isMetricsLoaded = false;
@@ -98,8 +103,23 @@
      * @param encoding the encoding of the font
      * @param name the character set name
      * @param path the path to the installed afp fonts
+     * @deprecated Please use {@link #CharacterSet(String, String, String, URI)} instead.
      */
     public CharacterSet(String codePage, String encoding, String name, String path) {
+        this(codePage, encoding, name,
+                new SimpleResourceAccessor(path != null ? new File(path) : null));
+    }
+
+    /**
+     * Constructor for the CharacterSetMetric object, the character set is used
+     * to load the font information from the actual AFP font.
+     *
+     * @param codePage the code page identifier
+     * @param encoding the encoding of the font
+     * @param name the character set name
+     * @param accessor the resource accessor to load resource with
+     */
+    public CharacterSet(String codePage, String encoding, String name, ResourceAccessor accessor) {
         if (name.length() > MAX_NAME_LEN) {
             String msg = "Character set name '" + name + "' must be a maximum of "
                 + MAX_NAME_LEN + " characters";
@@ -114,9 +134,15 @@
         }
         this.codePage = codePage;
         this.encoding = encoding;
-        this.encoder = Charset.forName(encoding).newEncoder();
-        this.encoder.onUnmappableCharacter(CodingErrorAction.REPLACE);
-        this.path = path;
+        try {
+            this.encoder = Charset.forName(encoding).newEncoder();
+            this.encoder.onUnmappableCharacter(CodingErrorAction.REPLACE);
+        } catch (UnsupportedCharsetException uce) {
+            //No nio-capable encoder available
+            //This may happen with "Cp500" on Sun Java 1.4.2
+            this.encoder = null;
+        }
+        this.accessor = accessor;
 
         this.characterSetOrientations = new java.util.HashMap(4);
     }
@@ -195,12 +221,11 @@
     }
 
     /**
-     * Returns the path where the font resources are installed
-     *
-     * @return the path where the font resources are installed
+     * Returns the resource accessor to load the font resources with.
+     * @return the resource accessor to load the font resources with
      */
-    public String getPath() {
-        return path;
+    public ResourceAccessor getResourceAccessor() {
+        return this.accessor;
     }
 
     /**
@@ -321,7 +346,12 @@
      * @return true if the character is in the character set
      */
     public boolean hasChar(char c) {
-        return encoder.canEncode(c);
+        if (encoder != null) {
+            return encoder.canEncode(c);
+        } else {
+            //Sun Java 1.4.2 compatibility
+            return true;
+        }
     }
 
     /**
@@ -331,14 +361,26 @@
      * @throws CharacterCodingException if the encoding operation fails
      */
     public byte[] encodeChars(CharSequence chars) throws CharacterCodingException {
-        ByteBuffer bb = encoder.encode(CharBuffer.wrap(chars));
-        if (bb.hasArray()) {
-            return bb.array();
+        if (encoder != null) {
+            ByteBuffer bb = encoder.encode(CharBuffer.wrap(chars));
+            if (bb.hasArray()) {
+                return bb.array();
+            } else {
+                bb.rewind();
+                byte[] bytes = new byte[bb.remaining()];
+                bb.get(bytes);
+                return bytes;
+            }
         } else {
-            bb.rewind();
-            byte[] bytes = new byte[bb.remaining()];
-            bb.get(bytes);
-            return bytes;
+            //Sun Java 1.4.2 compatibility
+            byte[] bytes;
+            try {
+                bytes = chars.toString().getBytes(this.encoding);
+                return bytes;
+            } catch (UnsupportedEncodingException uee) {
+                throw new UnsupportedOperationException(
+                        "Unsupported encoding: " + uee.getMessage());
+            }
         }
     }
 

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/fonts/CharacterSet.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/fonts/CharacterSetOrientation.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/fonts/FontRuntimeException.java
            ('svn:mergeinfo' removed)

Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/fonts/FopCharacterSet.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/fonts/FopCharacterSet.java?rev=764744&r1=764743&r2=764744&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/fonts/FopCharacterSet.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/fonts/FopCharacterSet.java Tue Apr 14 11:35:08 2009
@@ -19,6 +19,7 @@
 
 package org.apache.fop.afp.fonts;
 
+import org.apache.fop.afp.util.ResourceAccessor;
 import org.apache.fop.fonts.Typeface;
 
 /**
@@ -43,7 +44,7 @@
         String name,
         Typeface charSet) {
 
-        super(codePage, encoding, name, null);
+        super(codePage, encoding, name, (ResourceAccessor)null);
         this.charSet = charSet;
     }
 

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/fonts/FopCharacterSet.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/fonts/OutlineFont.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/fonts/RasterFont.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/goca/AbstractGraphicsCoord.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/goca/AbstractGraphicsDrawingOrderContainer.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/goca/GraphicsBox.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/goca/GraphicsChainedSegment.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/goca/GraphicsCharacterString.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/goca/GraphicsData.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/goca/GraphicsFillet.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/goca/GraphicsFullArc.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/goca/GraphicsImage.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/goca/GraphicsLine.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/goca/GraphicsSetArcParameters.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/goca/GraphicsSetCharacterSet.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/goca/GraphicsSetCurrentPosition.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/goca/GraphicsSetLineType.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/goca/GraphicsSetLineWidth.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/goca/GraphicsSetMix.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/goca/GraphicsSetPatternSymbol.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/goca/GraphicsSetProcessColor.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/ioca/ImageCellPosition.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/ioca/ImageContent.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/ioca/ImageInputDescriptor.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/ioca/ImageOutputControl.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/ioca/ImageRasterData.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/ioca/ImageRasterPattern.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/ioca/ImageSegment.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/ioca/ImageSizeParameter.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/AbstractAFPObject.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/AbstractDataObject.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/AbstractDescriptor.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/AbstractEnvironmentGroup.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/AbstractNamedAFPObject.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/AbstractPageObject.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/AbstractResourceEnvironmentGroupContainer.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/AbstractResourceGroupContainer.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/AbstractStructuredObject.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/ActiveEnvironmentGroup.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/ContainerDataDescriptor.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/Document.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/GraphicsDataDescriptor.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/GraphicsObject.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/IMImageObject.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/ImageDataDescriptor.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/ImageObject.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/IncludeObject.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/IncludePageOverlay.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/IncludePageSegment.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/InterchangeSet.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/InvokeMediumMap.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/MapCodedFont.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/MapContainerData.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/MapDataResource.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/MapPageOverlay.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/MaximumSizeExceededException.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/NoOperation.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/ObjectAreaDescriptor.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/ObjectAreaPosition.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/ObjectContainer.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/ObjectEnvironmentGroup.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/Overlay.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/PageDescriptor.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/PageGroup.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/PageObject.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/PageSegment.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/PreprocessPresentationObject.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/PresentationEnvironmentControl.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/PresentationTextData.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/PresentationTextDescriptor.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/PresentationTextObject.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/Registry.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/ResourceEnvironmentGroup.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/ResourceGroup.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/ResourceObject.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/StreamedResourceGroup.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/TagLogicalElement.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/TagLogicalElementBean.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/triplets/AbstractTriplet.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/triplets/ExtendedResourceLocalIdentifierTriplet.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/triplets/FullyQualifiedNameTriplet.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/triplets/MappingOptionTriplet.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/triplets/MeasurementUnitsTriplet.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/afp/modca/triplets/ObjectAreaSizeTriplet.java
            ('svn:mergeinfo' removed)



---------------------------------------------------------------------
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