[prev in list] [next in list] [prev in thread] [next in thread]
List: fop-cvs
Subject: svn commit: r1343310 [1/4] - in /xmlgraphics/fop/branches/Temp_TrueTypeInPostScript: ./ conf/
From: vhennebert () apache ! org
Date: 2012-05-28 16:16:28
Message-ID: 20120528161634.0E9662388865 () eris ! apache ! org
[Download RAW message or body]
Author: vhennebert
Date: Mon May 28 16:16:23 2012
New Revision: 1343310
URL: http://svn.apache.org/viewvc?rev=1343310&view=rev
Log:
Merged changes from trunk up to revision 1343133
Added:
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/fonts/CharacterSetType.java
- copied unchanged from r1343304, \
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/CharacterSetType.java \
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/goca/GraphicsSetFractionalLineWidth.java
- copied unchanged from r1343304, \
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/goca/GraphicsSetFractionalLineWidth.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/AxisOrientation.java
- copied unchanged from r1343304, \
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/AxisOrientation.java \
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/Rotation.java
- copied unchanged from r1343304, \
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/Rotation.java \
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/ptoca/TransparentDataControlSequence.java
- copied unchanged from r1343304, \
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/ptoca/TransparentDataControlSequence.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/expr/CMYKColorFunction.java
- copied unchanged from r1343304, \
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/CMYKColorFunction.java \
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/expr/FromNearestSpecifiedValueFunction.java
- copied unchanged from r1343304, \
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/FromNearestSpecifiedValueFunction.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/expr/ProportionalColumnWidthFunction.java
- copied unchanged from r1343304, \
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/ProportionalColumnWidthFunction.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/expr/RGBICCColorFunction.java
- copied unchanged from r1343304, \
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/RGBICCColorFunction.java \
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/expr/RGBNamedColorFunction.java
- copied unchanged from r1343304, \
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/RGBNamedColorFunction.java \
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/BreakOpportunity.java
- copied unchanged from r1343304, \
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BreakOpportunity.java \
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/BreakOpportunityHelper.java
- copied unchanged from r1343304, \
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BreakOpportunityHelper.java \
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/ps/extensions/PSPageTrailerCodeBefore.java
- copied unchanged from r1343304, \
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/extensions/PSPageTrailerCodeBefore.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/ps/extensions/PSPageTrailerCodeBeforeElement.java
- copied unchanged from r1343304, \
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/extensions/PSPageTrailerCodeBeforeElement.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/events/viewport-overflow.fo
- copied unchanged from r1343304, \
xmlgraphics/fop/trunk/test/events/viewport-overflow.fo \
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/afp/AFPGraphics2DTestCase.java
- copied unchanged from r1343304, \
xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/AFPGraphics2DTestCase.java \
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/afp/goca/GraphicsSetFractionalLineWidthTestCase.java
- copied unchanged from r1343304, \
xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/goca/GraphicsSetFractionalLineWidthTestCase.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/afp/goca/GraphicsSetLineWidthTestCase.java
- copied unchanged from r1343304, \
xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/goca/GraphicsSetLineWidthTestCase.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/afp/ptoca/
- copied from r1343304, \
xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/ptoca/ \
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/afp/ptoca/TransparentDataControlSequenceTestCase.java
- copied unchanged from r1343304, \
xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/ptoca/TransparentDataControlSequenceTestCase.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/cli/
- copied from r1343304, xmlgraphics/fop/trunk/test/java/org/apache/fop/cli/
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/cli/CommandLineOptionsTestCase.java
- copied unchanged from r1343304, \
xmlgraphics/fop/trunk/test/java/org/apache/fop/cli/CommandLineOptionsTestCase.java \
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/render/ps/PSPainterTestCase.java
- copied unchanged from r1343304, \
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/ps/PSPainterTestCase.java \
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/render/ps/PSRenderingUtilTestCase.java
- copied unchanged from r1343304, \
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/ps/PSRenderingUtilTestCase.java \
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/basic-link_padding_bug50196.xml
- copied unchanged from r1343304, \
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/basic-link_padding_bug50196.xml
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/block-break-inline-break-before.xml
- copied unchanged from r1343304, \
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block-break-inline-break-before.xml
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/block-inline-break-before.xml
- copied unchanged from r1343304, \
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block-inline-break-before.xml
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/block-inline-inline-break-before.xml
- copied unchanged from r1343304, \
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block-inline-inline-break-before.xml
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/table-column_column-progression-rl_1.xml
- copied unchanged from r1343304, \
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table-column_column-progression-rl_1.xml
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/table-column_column-progression-rl_2.xml
- copied unchanged from r1343304, \
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table-column_column-progression-rl_2.xml
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/table-column_column-progression-rl_3.xml
- copied unchanged from r1343304, \
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table-column_column-progression-rl_3.xml
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/table_writing-mode_rl.xml
- copied unchanged from r1343304, \
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table_writing-mode_rl.xml \
Removed: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/checkstyle-4.0.xml
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/expr/CMYKcolorFunction.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/expr/ICCColorFunction.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/expr/NamedColorFunction.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/expr/NearestSpecPropFunction.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/expr/PPColWidthFunction.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/util/DecimalFormatCache.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/table-column_column-progression-rl.xml
Modified:
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/ (props changed)
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/build.xml
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/conf/fop.xconf
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/examples/embedding/build.xml
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/examples/embedding/java/embedding/ExampleEPS.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/examples/embedding/java/embedding/ExampleEPSSimple.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/findbugs-exclude.xml
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/lib/xmlgraphics-commons-1.5svn.jar
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/documentation/content/xdocs/bugs.xml
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/documentation/content/xdocs/compliance.ihtml
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/documentation/content/xdocs/faq.xml
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/documentation/content/xdocs/team.xml
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/documentation/content/xdocs/trunk/complexscripts.xml
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/documentation/content/xdocs/trunk/configuration.xml
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/documentation/content/xdocs/trunk/output.xml
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/documentation/intermediate-format-ng/fop-intermediate-format-ng.xsd
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/accessibility/DummyStructureTreeEventHandler.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/accessibility/StructureTree2SAXEventAdapter.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/accessibility/StructureTreeEventHandler.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/accessibility/fo/StructureTreeEventTrigger.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/AFPConstants.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/AFPGraphics2D.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/AFPPaintingState.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/apps/ \
(props changed) xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/fonts/CharacterSet.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/fonts/CharacterSetBuilder.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/fonts/CharactersetEncoder.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/fonts/FopCharacterSet.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/goca/GraphicsSetLineWidth.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/GraphicsObject.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/IncludeObject.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/parser/ \
(props changed) xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/ptoca/PtocaBuilder.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/ptoca/PtocaConstants.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/ptoca/PtocaProducer.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/ptoca/TextDataInfoProducer.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/cli/CommandLineOptions.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/expr/AbsFunction.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/expr/BodyStartFunction.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/expr/CIELabColorFunction.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/expr/CeilingFunction.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/expr/FloorFunction.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/expr/FromParentFunction.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/expr/FromTableColumnFunction.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/expr/Function.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/expr/FunctionBase.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/expr/InheritedPropFunction.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/expr/LabelEndFunction.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/expr/MaxFunction.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/expr/MinFunction.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/expr/PropertyParser.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/expr/PropertyTokenizer.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/expr/RGBColorFunction.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/expr/RoundFunction.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/expr/SystemColorFunction.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/flow/table/ConditionalBorder.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/flow/table/Table.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/pagination/AbstractPageSequence.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/pagination/Flow.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/properties/FontFamilyProperty.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/properties/SpaceProperty.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fonts/autodetect/FontFileFinder.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fonts/truetype/TTFFile.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fonts/type1/AFMParser.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/AbstractBreaker.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/BlockLevelEventProducer.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/BlockLevelEventProducer.xml
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/inline/ImageLayout.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/inline/InlineStackingLayoutManager.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/table/CollapsingBorderModel.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/table/ColumnSetup.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/table/RowPainter.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/pdf/PDFColorHandler.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/pdf/PDFInfo.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/pdf/PDFJavaScriptLaunchAction.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/pdf/PDFNumber.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/pdf/PDFStructElem.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/afp/AFPCustomizable.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/afp/AFPDocumentHandler.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/afp/AFPRendererConfigurator.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/intermediate/IFParser.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/intermediate/IFSerializer.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/intermediate/IFStructureTreeBuilder.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/intermediate/IFUtil.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pdf/FOToPDFRoleMap.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pdf/PDFLogicalStructureHandler.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pdf/PDFStructureTreeBuilder.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/ps/PSDocumentHandler.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/ps/PSPainter.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/ps/extensions/PSExtensionElementMapping.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/ps/extensions/PSExtensionHandler.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfSection.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/txt/TXTRenderer.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/xml/XMLRenderer.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/svg/PDFGraphics2D.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/util/ColorExt.java \
(props changed) xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/status.xml
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/events/inline-level.fo
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/afp/fonts/CharactersetEncoderTestCase.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/events/EventProcessingTestCase.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/fo/properties/PropertyListMocks.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/render/intermediate/IFStructureTreeBuilderTestCase.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/bidi_propagation_1.xml
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/character_writing-mode_rl.xml
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/pdf/1.5/test.pdf
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/pdf/accessibility/pdf/background-image_jpg_repeat.pdf
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/pdf/accessibility/pdf/background-image_jpg_single.pdf
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/pdf/accessibility/pdf/background-image_png_repeat.pdf
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/pdf/accessibility/pdf/background-image_png_single.pdf
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/pdf/accessibility/pdf/background-image_svg_repeat.pdf
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/pdf/accessibility/pdf/background-image_svg_single.pdf
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/pdf/accessibility/pdf/complete.pdf
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/pdf/accessibility/pdf/image_jpg.pdf
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/pdf/accessibility/pdf/image_png.pdf
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/pdf/accessibility/pdf/image_svg.pdf
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/pdf/accessibility/pdf/image_wmf.pdf
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/pdf/accessibility/pdf/leader.pdf
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/pdf/accessibility/pdf/links.pdf
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/pdf/accessibility/pdf/role.pdf
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/pdf/accessibility/pdf/role_non-standard.pdf
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/pdf/accessibility/pdf/text_1.pdf
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/pdf/accessibility/pdf/text_2.pdf
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/pdf/accessibility/pdf/text_font-embedding.pdf
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/pdf/accessibility/role.fo
Propchange: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/
------------------------------------------------------------------------------
Merged /xmlgraphics/fop/trunk:r1325838-1343304
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/build.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/build.xml?rev=1343310&r1=1343309&r2=1343310&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/build.xml (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/build.xml Mon May 28 16:16:23 \
2012 @@ -54,9 +54,9 @@ list of possible build targets.
<project default="all" basedir="." name="fop">
<!-- See build.properties and build-local.properties for overriding build settings. \
--> <!-- build-local.properties is not stored in SVN and overrides values from \
build.properties --> + <property environment="env"/>
<property file="${basedir}/build-local.properties"/>
<property file="${basedir}/build.properties"/>
- <property environment="env"/>
<fileset dir="${basedir}" id="dist.bin">
<include name="conf/**"/>
<include name="examples/**"/>
@@ -790,7 +790,8 @@ list of possible build targets.
<attribute name="classpath" default="standard-junit-classpath"/>
<sequential>
<echo message="Running @{title} tests..."/>
- <junit dir="${basedir}" errorproperty="fop.junit.error" \
failureproperty="fop.junit.failure" printsummary="${junit.printsummary}"> + \
<junit dir="${basedir}" haltonfailure="yes" fork="${junit.fork}" forkmode="once" + \
errorproperty="fop.junit.error" failureproperty="fop.junit.failure" \
printsummary="${junit.printsummary}"> <sysproperty key="basedir" \
value="${basedir}/@{basedir}"/> <sysproperty key="jawa.awt.headless" value="true"/>
<formatter type="brief" usefile="false" if="junit.formatter.brief.use"/>
@@ -809,7 +810,7 @@ list of possible build targets.
<target name="junit-all" depends="junit-compile, junit-transcoder, \
junit-layout-hyphenation" description="Runs FOP's JUnit basic tests" \
if="junit.present">
<junit dir="${basedir}" haltonfailure="yes" fork="${junit.fork}" forkmode="once" \
- errorproperty="fop.junit.error" failureproperty="fop.junit.failure">
+ errorproperty="fop.junit.error" failureproperty="fop.junit.failure" \
printsummary="${junit.printsummary}"> <sysproperty key="jawa.awt.headless" \
value="true"/>
<formatter type="brief" usefile="false" if="junit.formatter.brief.use"/>
<formatter type="plain" usefile="true"/>
@@ -1031,9 +1032,9 @@ NOTE:
<!-- =================================================================== -->
<!-- Checkstyle -->
<!-- =================================================================== -->
- <property name="checkstyle.location" value="${lib-tools}/checkstyle-all-5.1.jar" \
/> + <property name="checkstyle.location" \
value="${lib-tools}/checkstyle-5.5-all.jar" /> <property \
name="checkstyle.noframes.xslt" \
value="${basedir}/checkstyle-noframes.xsl" />
- <property name="checkstyle.config" value="${basedir}/checkstyle-5.1.xml" />
+ <property name="checkstyle.config" value="${basedir}/checkstyle-5.5.xml" />
<path id="checkstyle-classpath">
<path refid="libs-build-classpath"/>
<pathelement location="${checkstyle.location}"/>
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/conf/fop.xconf
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/conf/fop.xconf?rev=1343310&r1=1343309&r2=1343310&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/conf/fop.xconf (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/conf/fop.xconf Mon May 28 \
16:16:23 2012 @@ -94,6 +94,7 @@ the location of this file.
-->
<images mode="b+w" bits-per-pixel="8"/>
<renderer-resolution>240</renderer-resolution>
+ <line-width-correction>2.5</line-width-correction>
<resource-group-file>resources.afp</resource-group-file>
<fonts>
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/examples/embedding/build.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/examples/embedding/build.xml?rev=1343310&r1=1343309&r2=1343310&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/examples/embedding/build.xml \
(original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/examples/embedding/build.xml \
Mon May 28 16:16:23 2012 @@ -146,8 +146,10 @@
<path refid="project.class.path"/>
<pathelement location="${build.dest}"/>
</classpath>
+ <jvmarg value="-Xmx1024m"/>
</java>
</target>
+ <target name="run" \
depends="example1,example2,example3,example4,example5,example5,example7,example8" \
description="Runs examples"/> <!-- \
=================================================================== --> <!-- Clean \
targets --> <!-- \
=================================================================== -->
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/examples/embedding/java/embedding/ExampleEPS.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/e \
xamples/embedding/java/embedding/ExampleEPS.java?rev=1343310&r1=1343309&r2=1343310&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/examples/embedding/java/embedding/ExampleEPS.java \
(original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/examples/embedding/java/embedding/ExampleEPS.java \
Mon May 28 16:16:23 2012 @@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with this
- * work for additional information regarding copyright ownership. The ASF
- * licenses this file to You under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
/* $Id$ */
@@ -26,11 +26,13 @@ import java.io.OutputStream;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
+
+import org.apache.xmlgraphics.java2d.GraphicContext;
+import org.apache.xmlgraphics.java2d.ps.EPSDocumentGraphics2D;
+
import org.apache.fop.fonts.FontInfo;
import org.apache.fop.render.ps.NativeTextHandler;
import org.apache.fop.svg.PDFDocumentGraphics2DConfigurator;
-import org.apache.xmlgraphics.java2d.GraphicContext;
-import org.apache.xmlgraphics.java2d.ps.EPSDocumentGraphics2D;
public class ExampleEPS {
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/examples/embedding/java/embedding/ExampleEPSSimple.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/e \
xamples/embedding/java/embedding/ExampleEPSSimple.java?rev=1343310&r1=1343309&r2=1343310&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/examples/embedding/java/embedding/ExampleEPSSimple.java \
(original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/examples/embedding/java/embedding/ExampleEPSSimple.java \
Mon May 28 16:16:23 2012 @@ -1,33 +1,33 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with this
- * work for additional information regarding copyright ownership. The ASF
- * licenses this file to You under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
/* $Id$ */
-
package embedding;
import java.awt.Font;
import java.io.FileOutputStream;
import java.io.OutputStream;
-import org.apache.fop.render.ps.NativeTextHandler;
import org.apache.xmlgraphics.java2d.GraphicContext;
import org.apache.xmlgraphics.java2d.ps.EPSDocumentGraphics2D;
+import org.apache.fop.render.ps.NativeTextHandler;
+
public class ExampleEPSSimple {
/**
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/findbugs-exclude.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/findbugs-exclude.xml?rev=1343310&r1=1343309&r2=1343310&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/findbugs-exclude.xml \
(original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/findbugs-exclude.xml Mon May \
28 16:16:23 2012 @@ -1,5 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<FindBugsFilter>
+ <Match>
+ <Class name="org.apache.fop.fo.properties.FontFamilyProperty"/>
+ <Bug pattern="EQ_DOESNT_OVERRIDE_EQUALS"/>
+ </Match>
+ <Match>
+ <Class name="org.apache.fop.fo.properties.CondLengthProperty"/>
+ <Bug pattern="UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR"/>
+ </Match>
+ <Match>
+ <Class name="org.apache.fop.pdf.xref.TrailerDictionary$1FileID"/>
+ <Bug pattern="SIC_INNER_SHOULD_BE_STATIC_ANON"/>
+ </Match>
+ <Match>
+ <Class name="org.apache.fop.fo.properties.ToBeImplementedProperty"/>
+ <Bug pattern="EQ_ALWAYS_TRUE"/>
+ </Match>
<Match>
<Class name="org.apache.fop.render.intermediate.IFStructureTreeBuilder"/>
<Field name="delegate"/>
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/lib/xmlgraphics-commons-1.5svn.jar
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/lib/xmlgraphics-commons-1.5svn.jar?rev=1343310&r1=1343309&r2=1343310&view=diff
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/documentation/content/xdocs/bugs.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/s \
rc/documentation/content/xdocs/bugs.xml?rev=1343310&r1=1343309&r2=1343310&view=diff \
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/documentation/content/xdocs/bugs.xml \
(original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/documentation/content/xdocs/bugs.xml \
Mon May 28 16:16:23 2012 @@ -45,21 +45,66 @@ an email as changes are made to the issu
</section>
<section id="issues_new">
<title>Unreported Issues (Reporting New Issues)</title>
- <p>User reports of bugs and requests for enhancements are extremely
-important parts of FOP development, and we appreciate the time you take to help
-us track these issues down.</p>
+ <p>
+ User reports of bugs and requests for enhancements are extremely
+ important parts of FOP development, and we appreciate the time you take to \
help + us track these issues down.
+ </p>
<ul>
- <li>To help us ensure that the bug database is as useful as it should be, \
please
-use the <link href="gethelp.html">Getting Help</link> checklist to determine whether \
a bug report should be entered.</li>
- <li>Review the <link \
href="http://issues.apache.org/bugzilla/page.cgi?id=bug-writing.html">Apache Bug \
Writing Guidelines</link> before submitting your report.</li>
- <li>Enter a new issue report at <link \
href="http://issues.apache.org/bugzilla/enter_bug.cgi?product=Fop">The FOP issue \
database (Bugzilla)</link>.
-You will be asked to login to an existing Bugzilla account or to create a new
-one.
-When entering the bug report, please make your description complete and concise.
-If appropriate, attach a minimal fo file to your report which demonstrates the
-problem.</li>
- <li>After submission, a copy of your bug report will be automatically
-sent to the FOP developer discussion list.</li>
+ <li>
+ To help us ensure that the bug database is as useful as it should be, \
please + use the <link href="gethelp.html">Getting Help</link> checklist to \
determine whether a bug report should be entered. + </li>
+ <li>
+ Review the <link \
href="http://issues.apache.org/bugzilla/page.cgi?id=bug-writing.html">Apache Bug + \
Writing Guidelines</link> before submitting your report. + </li>
+ <li>
+ Enter a new issue report at <link \
href="http://issues.apache.org/bugzilla/enter_bug.cgi?product=Fop">The + FOP \
issue database (Bugzilla)</link>. You will be asked to login to an existing Bugzilla \
account or to + create a new one. When entering the bug report, please make \
your description complete and concise. + If the issue involves a specific \
input or output file, then you <strong>MUST</strong> include the + following \
information in the bug report (preferably as one or more attachments): + \
<ul> + <li>
+ an input XSL-FO file (an input XML plus XSLT file is not acceptable, \
unless and only if the + issue being reported is related to the built-in \
XSLT transform processing convenience function provided + by FOP); this \
input <strong>SHOULD</strong> be <em>maximally minimal</em>, which means that it \
should + contain nothing more than the minimum needed to demonstrate the \
problem; if you do not take the effort + to provide a maximally minimal \
input FO file, then you will be subsequently asked to do so before the + \
bug is processed; + </li>
+ <li>
+ a resulting output file, preferably in PDF format; if the issue being \
reported involves a different output + format, then provide both a PDF \
output file and the output file for the output format for which the report + \
applies; + </li>
+ <li>
+ a copy of the FOP configuration file you used (e.g., fop.xconf);
+ </li>
+ <li>
+ if FOP was invoked using the command line (or an equivalent), then a \
dump of both the input + command line and any console output (stderr or \
stdout) produced; if the report involves an + exception, then this \
<strong>MUST</strong> include the full stack back trace; + </li>
+ <li>
+ information describing the version of FOP you are using and the \
platform (and OS) on which + you are invoking FOP;
+ </li>
+ <li>
+ if the report applies to the use of a specific font other than one of \
the built-in, base 14 + fonts, then information that describes where to \
obtain the font. + </li>
+ </ul>
+ </li>
+ <li>
+ After submission, a copy of your bug report will be automatically
+ sent to the FOP developer discussion list. If additional information is \
needed to + process the bug, then the bug will be set to the \
<code>NEEDSINFO</code> state, and + you will be asked to provide the \
additional information. You can avoid this extra + step by being diligent \
about providing <strong>all</strong> of the information + indicated above.
+ </li>
</ul>
</section>
</body>
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/documentation/content/xdocs/compliance.ihtml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/s \
rc/documentation/content/xdocs/compliance.ihtml?rev=1343310&r1=1343309&r2=1343310&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/documentation/content/xdocs/compliance.ihtml \
(original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/documentation/content/xdocs/compliance.ihtml \
Mon May 28 16:16:23 2012 @@ -3962,10 +3962,10 @@
<td><a name="fo-property-border-collapse" id=
"fo-property-border-collapse">border-collapse</a></td>
<td class="extended">Extended</td>
- <td class="yes">yes</td>
- <td class="yes">yes</td>
- <td class="yes">yes</td>
- <td>Some small limitations</td>
+ <td class="partial">partial</td>
+ <td class="partial">partial</td>
+ <td class="partial">partial</td>
+ <td>value "collapse-with-precedence" not yet supported</td>
</tr>
<tr>
<td align="center"><a href=
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/documentation/content/xdocs/faq.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/s \
rc/documentation/content/xdocs/faq.xml?rev=1343310&r1=1343309&r2=1343310&view=diff \
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/documentation/content/xdocs/faq.xml \
(original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/documentation/content/xdocs/faq.xml \
Mon May 28 16:16:23 2012 @@ -25,7 +25,7 @@
<question>What is ApacheĆ¢ ¢ FOP?</question>
<answer>
<p>
- FOP is a print formatter for <link href="#XSLFO">XSL formatting
+ FOP is a print formatter for <link href="#xslfo">XSL formatting
objects</link>.
</p>
<p>
@@ -65,16 +65,23 @@
<question>How does FOP interact with other Apache Projects?</question>
<answer>
<p>
- FOP is distributed with <link
- href="http://xml.apache.org/cocoon">Cocoon</link> as a PDF serializer
- for XSL (FO) documents.
+ <link href="http://xmlgraphics.apache.org/commons">XML Graphics \
Commons</link> is used with + FOP to provide graphics functions that are \
common to a number of Apache projects. </p>
<p>
- <link href="http://xmlgraphics.apache.org/batik">Batik</link> can be used \
with + <link href="http://xmlgraphics.apache.org/batik">Batik</link> is used \
with FOP to <link
href="http://xmlgraphics.apache.org/batik/svgrasterizer.html">transcode an \
SVG image</link> into a PDF document.
</p>
+ <p>FOP also makes use of the following Apache projects:</p>
+ <ul>
+ <li><link href="http://excalibur.apache.org/framework/">Avalon \
Framework</link></li> + <li><link \
href="http://jakarta.apache.org/commons/io/">Jakarta Commons IO</link></li> + \
<li><link href="http://jakarta.apache.org/commons/logging/">Jakarta Commons \
Logging</link></li> + <li><link \
href="http://xalan.apache.org/">Xalan-J</link></li> + <li><link \
href="http://xml.apache.org/commons/components/external/">XML Commons \
Externals</link></li> + </ul>
</answer>
</faq>
<faq id="xsl-def">
@@ -83,7 +90,7 @@
<p>
XSL is a W3C standard concerned with publishing XML documents. It
consists of two parts: <link href="#XSLT">XSLT</link> and <link
- href="#XSLFO">XSL-FO</link>. The acronym expands to
+ href="#xslfo">XSL-FO</link>. The acronym expands to
e<strong>X</strong>tensible <strong>S</strong>tylesheet
<strong>L</strong>anguage.
</p>
@@ -93,7 +100,9 @@
<question>What is XSL-FO?</question>
<answer>
<p>
- XSLFO (aka XSL-FO) is an XML vocabulary that is used to specify a \
pagination and + XSLFO (aka XSL-FO) is an XML vocabulary, defined by W3C \
Recommendation + <link href="http://www.w3.org/TR/xsl/">Extensible \
Stylesheet Language (XSL) + Version 1.1</link>, that is used to specify a \
pagination and
other styling for page layout output. The acronym “FO”
stands for
<strong>F</strong>ormatting <strong>O</strong>bjects. XSLFO can be
@@ -226,8 +235,7 @@
<answer>
<p>
This is usually caused by an older version of one of the FOP jars or
- old XML tools in the classpath. Check in particular for parser.jar,
- jaxp.jar, xml4j.jar or lotusxsl.jar.
+ old XML tools in the classpath.
</p>
<p>
Incompatible versions of Batik may also cause this problem. Use the
@@ -269,8 +277,9 @@
the <code>file:</code> prefix, for example <code>file.ext</code>,
<code>path/file.ext</code> or <code>../file.ext</code>. The string
<code>file:path/file.ext</code> is <em>not</em> a relative URL,
- in fact, it isn't a valid URL at all. A relative URL is subject to a
- resolving process, which transforms it into an absolute
+ in fact, it isn't a valid URL at all since the <code>file</code>
+ scheme does not (officially) support relative paths. A relative URL
+ is subject to a resolving process, which transforms it into an absolute
URL.
</p>
<!--p>
@@ -283,31 +292,8 @@
<question>I get an "[ERROR]: null", or a NullPointerException.</question>
<answer>
<p>
- This is often caused by an invalid FO document. Currently only very
- common errors are intercepted and produce a comprehensible error
- message. If you forgot container elements like \
<code>fo:page-sequence</code> or
- <code>fo:flow</code> and put blocks and inline elements directly as \
children of
- <code>fo:root</code> or <code>fo:page-sequence</code>, you'll only get a
- NullPointerException. Check whether your FO file has a proper
- structure. In some cases there are mandatory properties, like the
- master-reference in <code>fo:conditional-page-master-reference</code>, \
check also
- whether you got them right.
- </p>
- <p>
- You may find it helpful to use the <link href="#fo-validate">validation \
tools</link> to validate your
- FO document. This will catch most problems, but should not be
- relied upon to catch all.
- </p>
- <p>
- If you use XSLT, problems in your style sheet and in your
- source XML also can produce a NullPointerException. <link
- href="1.0/running.html#check-input">Run the transformation
- separately</link> to check for this, usually you'll get a
- detailed error message from the XSLT processor.
- </p>
- <p>
- If you turn on debugging with the "<code>-d</code>" option you may be able \
to
- see more detailed information.
+ This is a very likely a bug in FOP. If you encounter this error, please
+ <link href="bugs.html#issues_new">Open a New Bug</link>.
</p>
</answer>
</faq>
@@ -322,9 +308,9 @@
<answer>
<p>
The most likely reason is a known problem with the Java run time
- environment which is triggered by rendering SVGs. Suns JDK 1.4 does
- not have this problem. See also <link href="#svghangs">FOP does not
- exit if a SVG is included</link>.
+ environment which is triggered by rendering SVGs. Sun's JDK 1.4 and
+ later do not have this problem. See also <link href="#svghangs">FOP
+ does not exit if a SVG is included</link>.
</p>
<p>
Another possibility is that FOP went into a non terminating
@@ -340,6 +326,10 @@
the FOP output regularly to empty the pipe buffer. It is best to avoid
exec'ing FOP, use the library interface instead.
</p>
+ <p>
+ If you can reproduce this problem given a specific input and \
configuration, + then please <link href="bugs.html#issues_new">Open a New \
Bug</link>. + </p>
</answer>
</faq>
<faq id="boxoverflow">
@@ -441,8 +431,7 @@ public class DefaultErrorListener implem
To avoid the warning you can simply delete the
old Font Cache file, which lives in ${base}\conf\font.cache (see <link
href="1.0/configuration.html#general-elements">font-base
- configuration</link>). Or you can disable Font Caching altogether using
- the option "use-cache."
+ configuration</link>).
</p>
</answer>
</faq>
@@ -524,7 +513,7 @@ Check the following:</p>
HTTP. Possible issues include security settings on the
server, server configuration, and missing cookies or other
authorization information. Any easy way to check this is to
- cut&paste the source URL from the fo:external-graphic
+ cut and paste the source URL from the <code>fo:external-graphic</code>
into the Location field of a browser <strong>on the machine
where the FOP process will be running</strong>.</li>
</ul>
@@ -627,7 +616,7 @@ Check the following:</p>
explicit wrapping+clipping,
</li>
<li>
- insert zero width spaces (U+200B or &#x200B;) to allow FOP to
+ insert zero width spaces (&#x200B;) to allow FOP to
wrap.
</li>
</ul>
@@ -1281,7 +1270,7 @@ Can I control this?</question>
<question>Where can I learn how the FOP docs and web site are \
built?</question> <answer>
<p>
- See FOP <link href="dev/doc.html">Doc Management</link>. ;-)
+ See FOP <link href="dev/doc.html">Doc Management</link>.
</p>
</answer>
</faq>
@@ -1307,7 +1296,7 @@ Can I control this?</question>
If you have a runtime exception or other runtime problem:
<ul>
<li>
- double-check the <link href="#part-running">Runtime FAQs</link>.
+ Double check the <link href="#part-running">Runtime FAQs</link>.
</li>
<li>
ClassNotFoundException, NoSuchMethodException and
@@ -1325,7 +1314,7 @@ Can I control this?</question>
</li>
<li>
In the case where something works properly with another formatter,
- (AntennaHouse, PassiveTex, etc.) but doesn't work with FOP, please
+ (e.g., AntennaHouse, PassiveTex, etc.) but doesn't work with FOP, please
check the <!--link href="relnotes.html"-->Release Notes<!--/link-->, the
<link href="compliance.html">FOP Standards Compliance</link> document,
and the remaining FAQ in this document. If not found there, look at the
@@ -1348,13 +1337,8 @@ Can I control this?</question>
Problems specific to a certain XSLT processor, like Xalan, Saxon or
MSXML, should be handled by processor specific lists. This includes
problems with deployment, processor specific extensions, suspected
- bugs and processor specific APIs. Note that JDK 1.4 comes with an
- XML parser and an XSLT processor which are older versions of
- Xerces and Xalan, respectively, and both have a number of annoying
- bugs. See http://java.sun.com/developer/EJTechTips/2003/tt0311.html
- and http://java.sun.com/j2se/1.4.2/docs/guide/standards/ (or similar
- pages for later Java releases) for some hints on how to use more
- recent versions or other packages instead.
+ bugs and processor specific APIs. Note that JDK 1.4 and later come with \
an + XML parser and an XSLT processor which may be the source of the \
problem. </li>
<li>
Problems with servlet containers should be asked on the vendor
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/documentation/content/xdocs/team.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/s \
rc/documentation/content/xdocs/team.xml?rev=1343310&r1=1343309&r2=1343310&view=diff \
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/documentation/content/xdocs/team.xml \
(original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/documentation/content/xdocs/team.xml \
Mon May 28 16:16:23 2012 @@ -81,9 +81,7 @@
Geneon media solutions gmbh in Nuremberg, Germany. He needs FOP to wrestle \
gigabytes of electronic data into thousands of printed pages.</li>
<li id="lm">Louis Masters</li>
- <li id="vr">Vanukuri Venkat Reddy is a Senior Software Engineer in UK, using \
XML Graphics
- Project and FOP for his work, and is committed to contributing more to the \
Apache to be part
- a great team.</li>
+ <li id="lb">Luis Bernardo</li>
</ul>
</section>
<section id="founder">
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/documentation/content/xdocs/trunk/complexscripts.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/s \
rc/documentation/content/xdocs/trunk/complexscripts.xml?rev=1343310&r1=1343309&r2=1343310&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/documentation/content/xdocs/trunk/complexscripts.xml \
(original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/documentation/content/xdocs/trunk/complexscripts.xml \
Mon May 28 16:16:23 2012 @@ -21,7 +21,7 @@
<header>
<title>ApacheĆ¢ ¢ FOP: Complex Scripts</title>
</header>
- <body id="complex_scripts">
+ <body>
<section id="overview">
<title>Overview</title>
<p>
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/documentation/content/xdocs/trunk/configuration.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/s \
rc/documentation/content/xdocs/trunk/configuration.xml?rev=1343310&r1=1343309&r2=1343310&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/documentation/content/xdocs/trunk/configuration.xml \
(original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/documentation/content/xdocs/trunk/configuration.xml \
Mon May 28 16:16:23 2012 @@ -443,7 +443,7 @@
<p>
Additionally, there are certain settings that control how the renderer \
handles various elements. </p>
-<source><![CDATA[<renderer mime="application/vnd.hp-PCL">
+<source><![CDATA[<renderer mime="application/x-pcl">
<rendering>quality</rendering>
<text-rendering>bitmap</text-rendering>
</renderer>]]></source>
@@ -471,6 +471,7 @@
<source><![CDATA[<renderer mime="application/x-afp">
<images mode="b+w" bits-per-pixel="8" native="true"/>
<renderer-resolution>240</renderer-resolution>
+ <line-width-correction>2.5</line-width-correction>
<!-- a default external resource group file -->
<resource-group-file>resources.afp</resource-group-file>
@@ -482,6 +483,9 @@
<p>
The default value for the "renderer-resolution" is 240 dpi.
</p>
+ <p>
+ The default line width is device dependent and may need to be fine tuned so \
that the output matches the expected result. The default correction value is 2.5. + \
</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).
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/documentation/content/xdocs/trunk/output.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/s \
rc/documentation/content/xdocs/trunk/output.xml?rev=1343310&r1=1343309&r2=1343310&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/documentation/content/xdocs/trunk/output.xml \
(original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/documentation/content/xdocs/trunk/output.xml \
Mon May 28 16:16:23 2012 @@ -406,7 +406,7 @@ out = proc.getOutputStream();]]></source
<p>
The PCL renderer configuration currently allows the following settings:
</p>
-<source><![CDATA[<renderer mime="application/vnd.hp-PCL">
+<source><![CDATA[<renderer mime="application/x-pcl">
<rendering>quality</rendering>
<text-rendering>bitmap</text-rendering>
<disable-pjl>false</disable-pjl>
@@ -757,6 +757,14 @@ Note that the value of the encoding attr
<source><![CDATA[
<renderer-resolution>240</renderer-resolution>]]></source>
</section>
+ <section id="afp-line-width-correction-config">
+ <title>Line Width Correction</title>
+ <p>The default line width in AFP is device dependent. This means that a line \
width specified in, say, + a SVG source file may not render the way it was \
intended. The output AFP line with can be corrected + by the \
<line-width-correction/> configuration element. Example:</p> + \
<source><![CDATA[ + \
<line-width-correction>2.5</line-width-correction>]]></source> + </section>
<section id="afp-image-config">
<title>Images</title>
<p>By default the AFP Renderer converts all images to 8 bit grey level.
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/documentation/intermediate-format-ng/fop-intermediate-format-ng.xsd
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/s \
rc/documentation/intermediate-format-ng/fop-intermediate-format-ng.xsd?rev=1343310&r1=1343309&r2=1343310&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/documentation/intermediate-format-ng/fop-intermediate-format-ng.xsd \
(original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/documentation/intermediate-format-ng/fop-intermediate-format-ng.xsd \
Mon May 28 16:16:23 2012 @@ -34,6 +34,7 @@
<xs:element ref="mf:page-sequence" minOccurs="1" maxOccurs="unbounded"/>
<xs:element ref="mf:trailer"/>
</xs:sequence>
+ <xs:attribute name="version" type="xs:string"/>
</xs:complexType>
</xs:element>
<xs:element name="header">
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/accessibility/DummyStructureTreeEventHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/s \
rc/java/org/apache/fop/accessibility/DummyStructureTreeEventHandler.java?rev=1343310&r1=1343309&r2=1343310&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/accessibility/DummyStructureTreeEventHandler.java \
(original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/accessibility/DummyStructureTreeEventHandler.java \
Mon May 28 16:16:23 2012 @@ -34,7 +34,7 @@ public final class DummyStructureTreeEve
private DummyStructureTreeEventHandler() { }
/** {@inheritDoc} */
- public void startPageSequence(Locale locale) {
+ public void startPageSequence(Locale locale, String role) {
}
/** {@inheritDoc} */
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/accessibility/StructureTree2SAXEventAdapter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/s \
rc/java/org/apache/fop/accessibility/StructureTree2SAXEventAdapter.java?rev=1343310&r1=1343309&r2=1343310&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/accessibility/StructureTree2SAXEventAdapter.java \
(original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/accessibility/StructureTree2SAXEventAdapter.java \
Mon May 28 16:16:23 2012 @@ -30,6 +30,7 @@ import org.apache.fop.fo.FOElementMappin
import org.apache.fop.fo.extensions.ExtensionElementMapping;
import org.apache.fop.fo.extensions.InternalElementMapping;
import org.apache.fop.render.intermediate.IFConstants;
+import org.apache.fop.util.XMLConstants;
/**
* Converts structure tree events to SAX events.
@@ -52,16 +53,19 @@ public final class StructureTree2SAXEven
}
/** {@inheritDoc} */
- public void startPageSequence(Locale locale) {
+ public void startPageSequence(Locale locale, String role) {
try {
-
+ AttributesImpl attributes = new AttributesImpl();
+ if (role != null) {
+ attributes.addAttribute("", "type", "type", XMLConstants.CDATA, \
role); + }
contentHandler.startPrefixMapping(
InternalElementMapping.STANDARD_PREFIX, \
InternalElementMapping.URI); contentHandler.startPrefixMapping(
ExtensionElementMapping.STANDARD_PREFIX, \
ExtensionElementMapping.URI); contentHandler.startElement(IFConstants.NAMESPACE,
IFConstants.EL_STRUCTURE_TREE, IFConstants.EL_STRUCTURE_TREE,
- new AttributesImpl());
+ attributes);
} catch (SAXException e) {
throw new RuntimeException(e);
}
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/accessibility/StructureTreeEventHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/s \
rc/java/org/apache/fop/accessibility/StructureTreeEventHandler.java?rev=1343310&r1=1343309&r2=1343310&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/accessibility/StructureTreeEventHandler.java \
(original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/accessibility/StructureTreeEventHandler.java \
Mon May 28 16:16:23 2012 @@ -34,8 +34,9 @@ public interface StructureTreeEventHandl
* Starts a page sequence structure tree node.
*
* @param locale The locale of the page sequence
+ * @param role the value of the role property. May be null.
*/
- void startPageSequence(Locale locale);
+ void startPageSequence(Locale locale, String role);
/**
* Starts a structure tree node.
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/accessibility/fo/StructureTreeEventTrigger.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/s \
rc/java/org/apache/fop/accessibility/fo/StructureTreeEventTrigger.java?rev=1343310&r1=1343309&r2=1343310&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/accessibility/fo/StructureTreeEventTrigger.java \
(original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/accessibility/fo/StructureTreeEventTrigger.java \
Mon May 28 16:16:23 2012 @@ -89,7 +89,8 @@ class StructureTreeEventTrigger extends
locale = new Locale(pageSeq.getLanguage());
}
}
- structureTreeEventHandler.startPageSequence(locale);
+ String role = pageSeq.getCommonAccessibility().getRole();
+ structureTreeEventHandler.startPageSequence(locale, role);
}
@Override
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/AFPConstants.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/s \
rc/java/org/apache/fop/afp/AFPConstants.java?rev=1343310&r1=1343309&r2=1343310&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/AFPConstants.java \
(original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/AFPConstants.java \
Mon May 28 16:16:23 2012 @@ -50,4 +50,15 @@ public interface AFPConstants {
* 72dpi in millipoints
*/
int DPI_72_MPTS = DPI_72 * 1000;
+
+ /**
+ * The line width is set as a multiplier of a default line with; the width of \
the default + * line width is implementation defined, which probably means \
different devices use different + * actual widths; this means that the source \
line width (as specified in, say, a SVG line + * element) needs to be corrected \
by a fudge factor that depends on the output device so that + * the final output \
(print to paper, screen viewer) looks as intended. + */
+ float LINE_WIDTH_CORRECTION = 2.5f;
+
}
+
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/AFPGraphics2D.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/s \
rc/java/org/apache/fop/afp/AFPGraphics2D.java?rev=1343310&r1=1343309&r2=1343310&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/AFPGraphics2D.java \
(original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/AFPGraphics2D.java \
Mon May 28 16:16:23 2012 @@ -263,14 +263,6 @@ public class AFPGraphics2D extends \
Abstr return length * factor;
}
- /** IBM's AFP Workbench paints lines that are wider than expected. We correct \
manually. */
- private static final double GUESSED_WIDTH_CORRECTION = 1.7;
-
- private static final double SPEC_NORMAL_LINE_WIDTH = UnitConv.in2pt(0.01); \
//"approx" 0.01 inch
- private static final double NORMAL_LINE_WIDTH
- = SPEC_NORMAL_LINE_WIDTH * GUESSED_WIDTH_CORRECTION;
-
-
/**
* Apply the stroke to the AFP graphics object.
* This takes the java stroke and outputs the appropriate settings
@@ -282,17 +274,11 @@ public class AFPGraphics2D extends Abstr
if (stroke instanceof BasicStroke) {
BasicStroke basicStroke = (BasicStroke) stroke;
- // set line width
+ // set line width and correct it; NOTE: apparently we need to correct \
the width so that the + // output looks OK since the default with depends \
on the output device float lineWidth = basicStroke.getLineWidth();
- if (false) {
- //Old approach. Retained until verified problems with 1440 \
resolution
- graphicsObj.setLineWidth(Math.round(lineWidth / 2));
- } else {
- double absoluteLineWidth = lineWidth * \
Math.abs(getTransform().getScaleY());
- double multiplier = absoluteLineWidth / NORMAL_LINE_WIDTH;
- graphicsObj.setLineWidth((int)Math.round(multiplier));
- //TODO Use GSFLW instead of GSLW for higher accuracy?
- }
+ float correction = paintingState.getLineWidthCorrection();
+ graphicsObj.setLineWidth(lineWidth * correction);
//No line join, miter limit and end cap support in GOCA. :-(
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/AFPPaintingState.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/s \
rc/java/org/apache/fop/afp/AFPPaintingState.java?rev=1343310&r1=1343309&r2=1343310&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/AFPPaintingState.java \
(original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/AFPPaintingState.java \
Mon May 28 16:16:23 2012 @@ -79,6 +79,12 @@ public class AFPPaintingState extends or
/** the output resolution */
private int resolution = 240; // 240 dpi
+ /**
+ * A configurable value to correct the line width so that the output matches the \
expected. Different + * devices may need different values.
+ */
+ private float lineWidthCorrection = AFPConstants.LINE_WIDTH_CORRECTION;
+
/** determines whether GOCA is enabled or disabled */
private boolean gocaEnabled = true;
/** determines whether to stroke text in GOCA mode or to use text operators \
where possible */ @@ -323,6 +329,18 @@ public class AFPPaintingState extends or
}
/**
+ * Sets the line width correction
+ *
+ * @param correction the line width multiplying factor correction
+ */
+ public void setLineWidthCorrection(float correction) {
+ if (log.isDebugEnabled()) {
+ log.debug("line width correction set to: " + correction);
+ }
+ this.lineWidthCorrection = correction;
+ }
+
+ /**
* Returns the output/device resolution.
*
* @return the resolution in dpi
@@ -332,6 +350,14 @@ public class AFPPaintingState extends or
}
/**
+ * Returns the line width correction.
+ * @return the correction
+ */
+ public float getLineWidthCorrection() {
+ return this.lineWidthCorrection;
+ }
+
+ /**
* Controls whether GOCA is enabled or disabled.
* @param enabled true if GOCA is enabled, false if it is disabled
*/
Propchange: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/apps/
------------------------------------------------------------------------------
Merged /xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/apps:r1325838-1343304
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/fonts/CharacterSet.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/s \
rc/java/org/apache/fop/afp/fonts/CharacterSet.java?rev=1343310&r1=1343309&r2=1343310&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/fonts/CharacterSet.java \
(original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/fonts/CharacterSet.java \
Mon May 28 16:16:23 2012 @@ -94,12 +94,12 @@ public class CharacterSet {
*
* @param codePage the code page identifier
* @param encoding the encoding of the font
- * @param isEBDCS if this is an EBCDIC double byte character set.
+ * @param charsetType the type of the characterset
* @param name the character set name
* @param accessor the resource accessor to load resource with
* @param eventProducer for handling AFP related events
*/
- CharacterSet(String codePage, String encoding, boolean isEBDCS, String name,
+ CharacterSet(String codePage, String encoding, CharacterSetType charsetType, \
String name, ResourceAccessor accessor, AFPEventProducer eventProducer) {
if (name.length() > MAX_NAME_LEN) {
String msg = "Character set name '" + name + "' must be a maximum of "
@@ -115,7 +115,7 @@ public class CharacterSet {
}
this.codePage = codePage;
this.encoding = encoding;
- this.encoder = CharactersetEncoder.newInstance(encoding, isEBDCS);
+ this.encoder = CharactersetEncoder.newInstance(encoding, charsetType);
this.accessor = accessor;
this.characterSetOrientations = new HashMap<String, \
CharacterSetOrientation>(4); @@ -306,7 +306,7 @@ public class CharacterSet {
*/
private CharacterSetOrientation getCharacterSetOrientation() {
CharacterSetOrientation c
- = (CharacterSetOrientation) \
characterSetOrientations.get(currentOrientation); + = \
characterSetOrientations.get(currentOrientation); return c;
}
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/fonts/CharacterSetBuilder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/s \
rc/java/org/apache/fop/afp/fonts/CharacterSetBuilder.java?rev=1343310&r1=1343309&r2=1343310&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/fonts/CharacterSetBuilder.java \
(original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/fonts/CharacterSetBuilder.java \
Mon May 28 16:16:23 2012 @@ -190,10 +190,10 @@ public abstract class \
CharacterSetBuilde
* @return CharacterSet object
* @throws IOException if an I/O error occurs
*/
- public CharacterSet build(String characterSetName, String codePageName, String \
encoding, + public CharacterSet buildSBCS(String characterSetName, String \
codePageName, String encoding,
ResourceAccessor accessor, AFPEventProducer eventProducer) throws \
IOException {
- return processFont(characterSetName, codePageName, encoding, false, \
accessor,
- eventProducer);
+ return processFont(characterSetName, codePageName, encoding, \
CharacterSetType.SINGLE_BYTE, + accessor, eventProducer);
}
/**
@@ -204,16 +204,16 @@ public abstract class CharacterSetBuilde
* @param characterSetName name of the characterset
* @param codePageName name of the code page file
* @param encoding encoding name
- * @param isEDBCS if this is an EBCDIC double byte character set (DBCS)
+ * @param charsetType the characterset type
* @param accessor used to load codepage and characterset
* @param eventProducer for handling AFP related events
* @return CharacterSet object
* @throws IOException if an I/O error occurs
*/
public CharacterSet buildDBCS(String characterSetName, String codePageName, \
String encoding,
- boolean isEDBCS, ResourceAccessor accessor, AFPEventProducer \
eventProducer) + CharacterSetType charsetType, ResourceAccessor accessor, \
AFPEventProducer eventProducer) throws IOException {
- return processFont(characterSetName, codePageName, encoding, isEDBCS, \
accessor, + return processFont(characterSetName, codePageName, encoding, \
charsetType, accessor, eventProducer);
}
@@ -236,7 +236,7 @@ public abstract class CharacterSetBuilde
}
private CharacterSet processFont(String characterSetName, String codePageName, \
String encoding,
- boolean isEDBCS, ResourceAccessor accessor, AFPEventProducer \
eventProducer) + CharacterSetType charsetType, ResourceAccessor accessor, \
AFPEventProducer eventProducer) throws IOException {
// check for cached version of the characterset
String descriptor = characterSetName + "_" + encoding + "_" + codePageName;
@@ -247,7 +247,7 @@ public abstract class CharacterSetBuilde
}
// characterset not in the cache, so recreating
- characterSet = new CharacterSet(codePageName, encoding, isEDBCS, \
characterSetName, + characterSet = new CharacterSet(codePageName, encoding, \
charsetType, characterSetName, accessor, eventProducer);
InputStream inputStream = null;
@@ -465,8 +465,7 @@ public abstract class CharacterSetBuilde
}
}
- return (CharacterSetOrientation[]) orientations
- .toArray(EMPTY_CSO_ARRAY);
+ return orientations.toArray(EMPTY_CSO_ARRAY);
}
/**
@@ -570,7 +569,7 @@ public abstract class CharacterSetBuilde
String gcgiString = new String(gcgid, \
AFPConstants.EBCIDIC_ENCODING);
- String idx = (String) codepage.get(gcgiString);
+ String idx = codepage.get(gcgiString);
if (idx != null) {
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/fonts/CharactersetEncoder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/s \
rc/java/org/apache/fop/afp/fonts/CharactersetEncoder.java?rev=1343310&r1=1343309&r2=1343310&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/fonts/CharactersetEncoder.java \
(original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/fonts/CharactersetEncoder.java \
Mon May 28 16:16:23 2012 @@ -82,13 +82,12 @@ public abstract class CharactersetEncode
*
* @param chars the character sequence
* @param encoding the encoding type
- * @param isEDBCS if this encoding represents a double-byte character set
* @return encoded data
* @throws CharacterCodingException if encoding fails
*/
- public static EncodedChars encodeSBCS(CharSequence chars, String encoding, \
boolean isEDBCS) + public static EncodedChars encodeSBCS(CharSequence chars, \
String encoding) throws CharacterCodingException {
- CharactersetEncoder encoder = newInstance(encoding, isEDBCS);
+ CharactersetEncoder encoder = newInstance(encoding, \
CharacterSetType.SINGLE_BYTE); return encoder.encode(chars);
}
@@ -98,16 +97,16 @@ public abstract class CharactersetEncode
* sequence it will return its EBCDIC code-point, however, the "Shift In - Shift \
Out" operators
* are removed from the sequence of bytes. These are only used in Line Data.
*/
- private static final class EbcdicDoubleByteEncoder extends CharactersetEncoder {
- private EbcdicDoubleByteEncoder(String encoding) {
+ private static final class EbcdicDoubleByteLineDataEncoder extends \
CharactersetEncoder { + private EbcdicDoubleByteLineDataEncoder(String \
encoding) { super(encoding);
}
@Override
EncodedChars getEncodedChars(byte[] byteArray, int length) {
if (byteArray[0] == 0x0E && byteArray[length - 1] == 0x0F) {
- return new EncodedChars(byteArray, 1, length - 2);
+ return new EncodedChars(byteArray, 1, length - 2, true);
}
- return new EncodedChars(byteArray);
+ return new EncodedChars(byteArray, true);
}
}
@@ -117,13 +116,16 @@ public abstract class CharactersetEncode
* byte character sets (DBCS).
*/
private static final class DefaultEncoder extends CharactersetEncoder {
- private DefaultEncoder(String encoding) {
+ private final boolean isDBCS;
+
+ private DefaultEncoder(String encoding, boolean isDBCS) {
super(encoding);
+ this.isDBCS = isDBCS;
}
@Override
EncodedChars getEncodedChars(byte[] byteArray, int length) {
- return new EncodedChars(byteArray);
+ return new EncodedChars(byteArray, isDBCS);
}
}
@@ -134,47 +136,40 @@ public abstract class CharactersetEncode
* @param isEbcdicDBCS whether or not this wraps a double-byte EBCDIC code page.
* @return the CharactersetEncoder
*/
- static CharactersetEncoder newInstance(String encoding, boolean isEbcdicDBCS) {
- if (isEbcdicDBCS) {
- return new EbcdicDoubleByteEncoder(encoding);
- } else {
- return new DefaultEncoder(encoding);
+ static CharactersetEncoder newInstance(String encoding, CharacterSetType \
charsetType) { + switch (charsetType) {
+ case DOUBLE_BYTE_LINE_DATA:
+ return new EbcdicDoubleByteLineDataEncoder(encoding);
+ case DOUBLE_BYTE:
+ return new DefaultEncoder(encoding, true);
+ default:
+ return new DefaultEncoder(encoding, false);
}
}
/**
* A container for encoded character bytes
*/
- public static final class EncodedChars {
+ // CSOFF: FinalClass - disabling "final" modifier so that this class can be \
mocked + public static class EncodedChars {
private final byte[] bytes;
-
private final int offset;
-
private final int length;
+ private final boolean isDBCS;
- private EncodedChars(byte[] bytes, int offset, int length) {
- if (offset < 0) {
- throw new IllegalArgumentException();
- }
-
- if (length < 0) {
+ private EncodedChars(byte[] bytes, int offset, int length, boolean isDBCS) {
+ if (offset < 0 || length < 0 || offset + length > bytes.length) {
throw new IllegalArgumentException();
}
-
- if (offset + length > bytes.length) {
- throw new IllegalArgumentException();
- }
-
this.bytes = bytes;
-
this.offset = offset;
-
this.length = length;
+ this.isDBCS = isDBCS;
}
- private EncodedChars(byte[] bytes) {
- this(bytes, 0, bytes.length);
+ private EncodedChars(byte[] bytes, boolean isDBCS) {
+ this(bytes, 0, bytes.length, isDBCS);
}
/**
@@ -186,18 +181,9 @@ public abstract class CharactersetEncode
* @throws IOException if an I/O error occurs
*/
public void writeTo(OutputStream out, int offset, int length) throws \
IOException {
- if (offset < 0) {
+ if (offset < 0 || length < 0 || offset + length > bytes.length) {
throw new IllegalArgumentException();
}
-
- if (length < 0) {
- throw new IllegalArgumentException();
- }
-
- if (offset + length > this.length) {
- throw new IllegalArgumentException();
- }
-
out.write(bytes, this.offset + offset, length);
}
@@ -211,6 +197,15 @@ public abstract class CharactersetEncode
}
/**
+ * Indicates whether or not the EncodedChars object wraps double byte \
characters. + *
+ * @return true if the wrapped characters are double byte (DBCSs)
+ */
+ public boolean isDBCS() {
+ return isDBCS;
+ }
+
+ /**
* The bytes
*
* @return the bytes
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/fonts/FopCharacterSet.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/s \
rc/java/org/apache/fop/afp/fonts/FopCharacterSet.java?rev=1343310&r1=1343309&r2=1343310&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/fonts/FopCharacterSet.java \
(original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/fonts/FopCharacterSet.java \
Mon May 28 16:16:23 2012 @@ -42,7 +42,8 @@ public class FopCharacterSet extends Cha
*/
public FopCharacterSet(String codePage, String encoding, String name, Typeface \
charSet, AFPEventProducer eventProducer) {
- super(codePage, encoding, false, name, (ResourceAccessor) null, \
eventProducer); + super(codePage, encoding, CharacterSetType.SINGLE_BYTE, \
name, (ResourceAccessor) null, + eventProducer);
this.charSet = charSet;
}
@@ -132,5 +133,4 @@ public class FopCharacterSet extends Cha
public char mapChar(char c) {
return charSet.mapChar(c);
}
-
}
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/goca/GraphicsSetLineWidth.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/s \
rc/java/org/apache/fop/afp/goca/GraphicsSetLineWidth.java?rev=1343310&r1=1343309&r2=1343310&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/goca/GraphicsSetLineWidth.java \
(original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/goca/GraphicsSetLineWidth.java \
Mon May 28 16:16:23 2012 @@ -28,7 +28,7 @@ import java.io.OutputStream;
public class GraphicsSetLineWidth extends AbstractGraphicsDrawingOrder {
/** line width multiplier */
- private int multiplier = 1;
+ private final int multiplier;
/**
* Main constructor
@@ -48,7 +48,7 @@ public class GraphicsSetLineWidth extend
public void writeToStream(OutputStream os) throws IOException {
byte[] data = new byte[] {
getOrderCode(), // GSLW order code
- (byte)multiplier // MH (line-width)
+ (byte) multiplier // MH (line-width)
};
os.write(data);
}
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/GraphicsObject.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/s \
rc/java/org/apache/fop/afp/modca/GraphicsObject.java?rev=1343310&r1=1343309&r2=1343310&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/GraphicsObject.java \
(original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/GraphicsObject.java \
Mon May 28 16:16:23 2012 @@ -48,6 +48,7 @@ import org.apache.fop.afp.goca.GraphicsL
import org.apache.fop.afp.goca.GraphicsSetArcParameters;
import org.apache.fop.afp.goca.GraphicsSetCharacterSet;
import org.apache.fop.afp.goca.GraphicsSetCurrentPosition;
+import org.apache.fop.afp.goca.GraphicsSetFractionalLineWidth;
import org.apache.fop.afp.goca.GraphicsSetLineType;
import org.apache.fop.afp.goca.GraphicsSetLineWidth;
import org.apache.fop.afp.goca.GraphicsSetPatternSymbol;
@@ -182,8 +183,21 @@ public class GraphicsObject extends Abst
* @param lineWidth the line width multiplier
*/
public void setLineWidth(int lineWidth) {
- if (lineWidth != graphicsState.lineWidth) {
+ if ((float) lineWidth != graphicsState.lineWidth) {
addObject(new GraphicsSetLineWidth(lineWidth));
+ graphicsState.lineWidth = (float) lineWidth;
+ }
+ }
+
+ /**
+ * Sets the line width
+ *
+ * @param lineWidth the line width multiplier
+ */
+ public void setLineWidth(float lineWidth) {
+ float epsilon = Float.intBitsToFloat ( 0x00800000 ); // Float.MIN_NORMAL \
(JDK1.6) + if ( Math.abs ( graphicsState.lineWidth - lineWidth ) > epsilon ) {
+ addObject(new GraphicsSetFractionalLineWidth(lineWidth));
graphicsState.lineWidth = lineWidth;
}
}
@@ -414,7 +428,7 @@ public class GraphicsObject extends Abst
private byte lineType;
/** the current line width */
- private int lineWidth;
+ private float lineWidth;
/** the current fill pattern */
private byte patternSymbol;
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic