You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by vh...@apache.org on 2013/12/14 00:41:17 UTC
svn commit: r1550851 [1/6] - in
/xmlgraphics/fop/branches/Temp_WhitespaceManagement: ./ examples/fo/basic/
lib/ src/codegen/unicode/java/org/apache/fop/complexscripts/bidi/
src/documentation/intermediate-format-ng/ src/java/META-INF/services/
src/java/...
Author: vhennebert
Date: Fri Dec 13 23:41:13 2013
New Revision: 1550851
URL: http://svn.apache.org/r1550851
Log:
Brought the branch in sync with rev. 1550844 of trunk
Added:
xmlgraphics/fop/branches/Temp_WhitespaceManagement/lib/fontbox-1.8.3-patched.jar
- copied unchanged from r1550848, xmlgraphics/fop/trunk/lib/fontbox-1.8.3-patched.jar
xmlgraphics/fop/branches/Temp_WhitespaceManagement/lib/pdfbox-1645.patch
- copied unchanged from r1550848, xmlgraphics/fop/trunk/lib/pdfbox-1645.patch
xmlgraphics/fop/branches/Temp_WhitespaceManagement/lib/pdfbox-1646.patch
- copied unchanged from r1550848, xmlgraphics/fop/trunk/lib/pdfbox-1646.patch
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/pdf/PDFIdentifiedDictionary.java
- copied unchanged from r1550848, xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFIdentifiedDictionary.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/pdf/PDFLayer.java
- copied unchanged from r1550848, xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFLayer.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/pdf/PDFNavigator.java
- copied unchanged from r1550848, xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFNavigator.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/pdf/PDFNavigatorAction.java
- copied unchanged from r1550848, xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFNavigatorAction.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/pdf/PDFSetOCGStateAction.java
- copied unchanged from r1550848, xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFSetOCGStateAction.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/pdf/PDFTransitionAction.java
- copied unchanged from r1550848, xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFTransitionAction.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/render/pdf/extensions/PDFActionElement.java
- copied unchanged from r1550848, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/extensions/PDFActionElement.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/render/pdf/extensions/PDFActionExtension.java
- copied unchanged from r1550848, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/extensions/PDFActionExtension.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/render/pdf/extensions/PDFArrayElement.java
- copied unchanged from r1550848, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/extensions/PDFArrayElement.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/render/pdf/extensions/PDFArrayExtension.java
- copied unchanged from r1550848, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/extensions/PDFArrayExtension.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/render/pdf/extensions/PDFCatalogElement.java
- copied unchanged from r1550848, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/extensions/PDFCatalogElement.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/render/pdf/extensions/PDFCatalogExtension.java
- copied unchanged from r1550848, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/extensions/PDFCatalogExtension.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/render/pdf/extensions/PDFCollectionEntryElement.java
- copied unchanged from r1550848, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/extensions/PDFCollectionEntryElement.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/render/pdf/extensions/PDFCollectionEntryExtension.java
- copied unchanged from r1550848, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/extensions/PDFCollectionEntryExtension.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/render/pdf/extensions/PDFCollectionExtension.java
- copied unchanged from r1550848, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/extensions/PDFCollectionExtension.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/render/pdf/extensions/PDFDictionaryAttachment.java
- copied unchanged from r1550848, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/extensions/PDFDictionaryAttachment.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/render/pdf/extensions/PDFDictionaryElement.java
- copied unchanged from r1550848, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/extensions/PDFDictionaryElement.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/render/pdf/extensions/PDFDictionaryExtension.java
- copied unchanged from r1550848, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/extensions/PDFDictionaryExtension.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/render/pdf/extensions/PDFDictionaryType.java
- copied unchanged from r1550848, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/extensions/PDFDictionaryType.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/render/pdf/extensions/PDFEmbeddedFileAttachment.java
- copied unchanged from r1550848, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/extensions/PDFEmbeddedFileAttachment.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/render/pdf/extensions/PDFExtensionHandlerFactory.java
- copied unchanged from r1550848, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/extensions/PDFExtensionHandlerFactory.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/render/pdf/extensions/PDFLayerElement.java
- copied unchanged from r1550848, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/extensions/PDFLayerElement.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/render/pdf/extensions/PDFLayerExtension.java
- copied unchanged from r1550848, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/extensions/PDFLayerExtension.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/render/pdf/extensions/PDFNavigatorElement.java
- copied unchanged from r1550848, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/extensions/PDFNavigatorElement.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/render/pdf/extensions/PDFNavigatorExtension.java
- copied unchanged from r1550848, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/extensions/PDFNavigatorExtension.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/render/pdf/extensions/PDFObjectExtension.java
- copied unchanged from r1550848, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/extensions/PDFObjectExtension.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/render/pdf/extensions/PDFObjectType.java
- copied unchanged from r1550848, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/extensions/PDFObjectType.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/render/pdf/extensions/PDFPageElement.java
- copied unchanged from r1550848, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/extensions/PDFPageElement.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/render/pdf/extensions/PDFPageExtension.java
- copied unchanged from r1550848, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/extensions/PDFPageExtension.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/render/pdf/extensions/PDFReferenceElement.java
- copied unchanged from r1550848, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/extensions/PDFReferenceElement.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/render/pdf/extensions/PDFReferenceExtension.java
- copied unchanged from r1550848, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/extensions/PDFReferenceExtension.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/render/ps/svg/
- copied from r1550848, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/svg/
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/render/ps/svg/PSFunction.java
- copied unchanged from r1550848, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/svg/PSFunction.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/render/ps/svg/PSPattern.java
- copied unchanged from r1550848, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/svg/PSPattern.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/render/ps/svg/PSSVGGraphics2D.java
- copied unchanged from r1550848, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/svg/PSSVGGraphics2D.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/render/ps/svg/PSShading.java
- copied unchanged from r1550848, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/svg/PSShading.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/render/rtf/RTFPlaceHolderHelper.java
- copied unchanged from r1550848, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/RTFPlaceHolderHelper.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/render/shading/
- copied from r1550848, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/shading/
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/render/shading/Function.java
- copied unchanged from r1550848, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/shading/Function.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/render/shading/FunctionDelegate.java
- copied unchanged from r1550848, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/shading/FunctionDelegate.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/render/shading/FunctionPattern.java
- copied unchanged from r1550848, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/shading/FunctionPattern.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/render/shading/GradientFactory.java
- copied unchanged from r1550848, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/shading/GradientFactory.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/render/shading/GradientRegistrar.java
- copied unchanged from r1550848, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/shading/GradientRegistrar.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/render/shading/PDFGradientFactory.java
- copied unchanged from r1550848, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/shading/PDFGradientFactory.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/render/shading/PSGradientFactory.java
- copied unchanged from r1550848, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/shading/PSGradientFactory.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/render/shading/Pattern.java
- copied unchanged from r1550848, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/shading/Pattern.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/render/shading/Shading.java
- copied unchanged from r1550848, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/shading/Shading.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/render/shading/ShadingPattern.java
- copied unchanged from r1550848, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/shading/ShadingPattern.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/config/relative-uri/
- copied from r1550848, xmlgraphics/fop/trunk/test/config/relative-uri/
xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/config/relative-uri/base_font.xconf
- copied unchanged from r1550848, xmlgraphics/fop/trunk/test/config/relative-uri/base_font.xconf
xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/config/relative-uri/base_no-font.xconf
- copied unchanged from r1550848, xmlgraphics/fop/trunk/test/config/relative-uri/base_no-font.xconf
xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/config/relative-uri/no-base_font.xconf
- copied unchanged from r1550848, xmlgraphics/fop/trunk/test/config/relative-uri/no-base_font.xconf
xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/config/relative-uri/no-base_no-font.xconf
- copied unchanged from r1550848, xmlgraphics/fop/trunk/test/config/relative-uri/no-base_no-font.xconf
xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/java/org/apache/fop/render/ps/svg/
- copied from r1550848, xmlgraphics/fop/trunk/test/java/org/apache/fop/render/ps/svg/
xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/java/org/apache/fop/render/ps/svg/PSSVGGraphics2DTestCase.java
- copied unchanged from r1550848, xmlgraphics/fop/trunk/test/java/org/apache/fop/render/ps/svg/PSSVGGraphics2DTestCase.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/java/org/apache/fop/render/ps/svg/PSSVGLinearGraphics2DTestCase.java
- copied unchanged from r1550848, xmlgraphics/fop/trunk/test/java/org/apache/fop/render/ps/svg/PSSVGLinearGraphics2DTestCase.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/java/org/apache/fop/render/ps/svg/axial-shading-expected.dat
- copied unchanged from r1550848, xmlgraphics/fop/trunk/test/java/org/apache/fop/render/ps/svg/axial-shading-expected.dat
xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/java/org/apache/fop/render/ps/svg/expected.ps
- copied unchanged from r1550848, xmlgraphics/fop/trunk/test/java/org/apache/fop/render/ps/svg/expected.ps
xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/footnote_jira1749.xml
- copied unchanged from r1550848, xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/footnote_jira1749.xml
xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/footnote_jira2106.xml
- copied unchanged from r1550848, xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/footnote_jira2106.xml
xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/footnote_reset.xml
- copied unchanged from r1550848, xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/footnote_reset.xml
xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/pdf-dictionary-extension_1.xml
- copied unchanged from r1550848, xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/pdf-dictionary-extension_1.xml
xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/pdf-dictionary-extension_2.xml
- copied unchanged from r1550848, xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/pdf-dictionary-extension_2.xml
xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/pdf-dictionary-extension_3.xml
- copied unchanged from r1550848, xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/pdf-dictionary-extension_3.xml
Removed:
xmlgraphics/fop/branches/Temp_WhitespaceManagement/lib/fontbox-1.8.0-SNAPSHOT.jar
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/fo/extensions/ExtensionObj.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/render/pdf/extensions/PDFEmbeddedFileExtensionAttachment.java
Modified:
xmlgraphics/fop/branches/Temp_WhitespaceManagement/ (props changed)
xmlgraphics/fop/branches/Temp_WhitespaceManagement/build.xml
xmlgraphics/fop/branches/Temp_WhitespaceManagement/checkstyle-5.5.xml
xmlgraphics/fop/branches/Temp_WhitespaceManagement/checkstyle-suppressions.xml
xmlgraphics/fop/branches/Temp_WhitespaceManagement/examples/fo/basic/leader.fo
xmlgraphics/fop/branches/Temp_WhitespaceManagement/findbugs-exclude.xml
xmlgraphics/fop/branches/Temp_WhitespaceManagement/lib/xmlgraphics-commons-svn-trunk.jar
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/codegen/unicode/java/org/apache/fop/complexscripts/bidi/GenerateBidiClass.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/codegen/unicode/java/org/apache/fop/complexscripts/bidi/GenerateBidiTestData.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/documentation/intermediate-format-ng/fop-intermediate-format-ng-content.xsd
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/META-INF/services/org.apache.fop.util.ContentHandlerFactory
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/apps/FOUserAgent.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/apps/FopConfParser.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/area/AreaTreeParser.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/area/Footnote.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/area/Trait.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/cli/CommandLineOptions.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/complexscripts/bidi/BidiClass.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/complexscripts/bidi/BidiResolver.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/complexscripts/bidi/DelimitedTextRange.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/complexscripts/bidi/InlineRun.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/complexscripts/bidi/TextInterval.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/complexscripts/bidi/UnflattenProcessor.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/complexscripts/bidi/UnicodeBidiAlgorithm.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/complexscripts/fonts/GlyphClassTable.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/complexscripts/fonts/GlyphCoverageTable.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/complexscripts/fonts/GlyphDefinitionSubtable.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/complexscripts/fonts/GlyphDefinitionTable.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/complexscripts/fonts/GlyphMappingTable.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/complexscripts/fonts/GlyphPositioningState.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/complexscripts/fonts/GlyphPositioningSubtable.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/complexscripts/fonts/GlyphPositioningTable.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/complexscripts/fonts/GlyphProcessingState.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/complexscripts/fonts/GlyphSubstitutionState.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/complexscripts/fonts/GlyphSubstitutionSubtable.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/complexscripts/fonts/GlyphSubstitutionTable.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/complexscripts/fonts/GlyphSubtable.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/complexscripts/fonts/GlyphTable.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/complexscripts/fonts/OTFAdvancedTypographicTableReader.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/complexscripts/scripts/ArabicScriptProcessor.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/complexscripts/scripts/DevanagariScriptProcessor.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/complexscripts/scripts/GujaratiScriptProcessor.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/complexscripts/scripts/GurmukhiScriptProcessor.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/complexscripts/scripts/IndicScriptProcessor.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/complexscripts/scripts/ScriptProcessor.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/complexscripts/util/CharScript.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/complexscripts/util/GlyphSequence.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/complexscripts/util/NumberConverter.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/complexscripts/util/UTF32.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/fo/Constants.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/fo/FOPropertyMapping.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/fo/FObj.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/fo/expr/FunctionBase.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/fo/expr/PropertyParser.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/fo/extensions/ExtensionElementMapping.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/fo/flow/BlockContainer.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/fo/flow/InlineContainer.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/fo/flow/table/Table.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/fo/pagination/PageSequence.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/fo/properties/GenericShorthandParser.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/fonts/FontManagerConfigurator.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/fonts/FontTriplet.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/fonts/apps/PFMReader.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/fonts/apps/TTFReader.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/fonts/truetype/OTFSubSetFile.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/fonts/type1/AFMFile.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/fonts/type1/CharMetricsHandler.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/fonts/type1/Type1FontLoader.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/layoutmgr/ExternalDocumentLayoutManager.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/layoutmgr/PageBreakingAlgorithm.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/layoutmgr/TraitSetter.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/layoutmgr/list/ListBlockLayoutManager.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/layoutmgr/list/ListItemContentLayoutManager.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/layoutmgr/table/TableAndCaptionLayoutManager.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/layoutmgr/table/TableCaptionLayoutManager.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/pdf/AbstractPDFStream.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/pdf/PDFDictionary.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/pdf/PDFDocument.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/pdf/PDFFactory.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/pdf/PDFFunction.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/pdf/PDFNumber.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/pdf/PDFPaintingState.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/pdf/PDFPattern.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/pdf/PDFResources.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/pdf/PDFShading.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/render/AbstractRenderer.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/render/afp/AFPFontConfig.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/render/afp/AFPPainter.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/render/afp/AFPRendererConfig.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/render/intermediate/AbstractIFPainter.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/render/intermediate/AbstractXMLWritingIFDocumentHandler.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/render/intermediate/IFContext.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/render/intermediate/IFGraphicContext.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/render/intermediate/IFPainter.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/render/intermediate/IFParser.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/render/intermediate/IFRenderer.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/render/intermediate/IFSerializer.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/render/java2d/Java2DPainter.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/render/java2d/Java2DRenderer.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/render/pcl/PCLPainter.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/render/pdf/PDFContentGenerator.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/render/pdf/PDFDocumentHandler.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/render/pdf/PDFPainter.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/render/pdf/PDFRenderingUtil.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/render/pdf/PDFStructureTreeBuilder.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/render/pdf/extensions/AbstractPDFExtensionElement.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/render/pdf/extensions/PDFElementMapping.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/render/pdf/extensions/PDFEmbeddedFileElement.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/render/pdf/extensions/PDFExtensionAttachment.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/render/pdf/extensions/PDFExtensionHandler.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/render/ps/PSFontUtils.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/render/ps/PSImageHandlerSVG.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/render/ps/PSPainter.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/render/rtf/RTFHandler.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/render/rtf/rtflib/tools/BuilderContext.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/render/txt/TXTRenderer.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/render/xml/XMLRenderer.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/svg/PDFDocumentGraphics2D.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/svg/PDFDocumentGraphics2DConfigurator.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/svg/PDFGraphics2D.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/svg/SimpleSVGUserAgent.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/text/linebreak/LineBreakUtils.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/tools/fontlist/FontListMain.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/traits/WritingMode.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/traits/WritingModeTraits.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/traits/WritingModeTraitsGetter.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/traits/WritingModeTraitsSetter.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/util/AbstractPaintingState.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/util/GenerationHelperContentHandler.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/util/XMLUtil.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/sandbox/org/apache/fop/render/svg/SVGDocumentHandler.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/sandbox/org/apache/fop/render/svg/SVGPainter.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/status.xml
xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/java/org/apache/fop/apps/FopConfParserTestCase.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/java/org/apache/fop/complexscripts/bidi/BidiTestData.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/java/org/apache/fop/complexscripts/fonts/ttx/TTXFile.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/java/org/apache/fop/fonts/EmbedFontInfoTestCase.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/java/org/apache/fop/fonts/FontsTestSuite.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/java/org/apache/fop/pdf/PDFDestsTestCase.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/java/org/apache/fop/pdf/PDFDictionaryTestCase.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/java/org/apache/fop/pdf/PDFPageLabelsTestCase.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/java/org/apache/fop/pdf/PDFStreamTestCase.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/java/org/apache/fop/pdf/xref/CrossReferenceTableTestCase.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/java/org/apache/fop/render/intermediate/AbstractIFPainterTestCase.java
xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/fox_external-document_2.xml
Propchange: xmlgraphics/fop/branches/Temp_WhitespaceManagement/
------------------------------------------------------------------------------
Merged /xmlgraphics/fop/trunk:r1518682-1550848
Modified: xmlgraphics/fop/branches/Temp_WhitespaceManagement/build.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_WhitespaceManagement/build.xml?rev=1550851&r1=1550850&r2=1550851&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_WhitespaceManagement/build.xml (original)
+++ xmlgraphics/fop/branches/Temp_WhitespaceManagement/build.xml Fri Dec 13 23:41:13 2013
@@ -579,6 +579,7 @@ list of possible build targets.
<include name="org/apache/fop/util/Finalizable.class"/>
<include name="org/apache/fop/util/CharUtilities.class"/>
<include name="org/apache/fop/util/DecimalFormatCache*.class"/>
+ <include name="org/apache/fop/render/shading/**"/>
</patternset>
<!-- PDF transcoder -->
<patternset>
@@ -1087,6 +1088,7 @@ NOTE:
<path refid="libs-tools-build-classpath"/>
</classpath>
</taskdef>
+ <mkdir dir="${build.dir}"/>
<pmd shortFilenames="true" targetjdk="${javac.target}">
<ruleset>basic</ruleset>
<ruleset>rulesets/migrating_to_14.xml</ruleset>
Modified: xmlgraphics/fop/branches/Temp_WhitespaceManagement/checkstyle-5.5.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_WhitespaceManagement/checkstyle-5.5.xml?rev=1550851&r1=1550850&r2=1550851&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_WhitespaceManagement/checkstyle-5.5.xml (original)
+++ xmlgraphics/fop/branches/Temp_WhitespaceManagement/checkstyle-5.5.xml Fri Dec 13 23:41:13 2013
@@ -37,16 +37,26 @@
<!-- ===================================================================================================== -->
<module name="SuppressionCommentFilter">
- <property name="offCommentFormat" value="CSOFF\: ([\w\|]+)"/>
+ <property name="offCommentFormat" value="CSOFF\: (LineLength)"/>
<property name="onCommentFormat" value="CSON\: ([\w\|]+)"/>
<property name="checkFormat" value="$1"/>
</module>
<!-- ===================================================================================================== -->
+ <module name="SuppressionFilter">
+ <property name="file" value="${samedir}/checkstyle-suppressions.xml"/>
+ </module>
+
<!-- ===================================================================================================== -->
<module name="TreeWalker">
<!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
+ <module name="LineLength">
+ <property name="max" value="120"/>
+ </module>
+ <!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
+
+ <!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
<module name="AnnotationUseStyle"/>
<!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
@@ -172,10 +182,6 @@
<property name="allowLineBreaks" value="false"/>
<property name="tokens" value="BNOT,DEC,DOT,INC,LNOT,UNARY_MINUS,UNARY_PLUS"/>
</module>
- <module name="NoWhitespaceAfter">
- <property name="allowLineBreaks" value="true"/>
- <property name="tokens" value="ARRAY_INIT"/>
- </module>
<!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
<!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
Modified: xmlgraphics/fop/branches/Temp_WhitespaceManagement/checkstyle-suppressions.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_WhitespaceManagement/checkstyle-suppressions.xml?rev=1550851&r1=1550850&r2=1550851&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_WhitespaceManagement/checkstyle-suppressions.xml (original)
+++ xmlgraphics/fop/branches/Temp_WhitespaceManagement/checkstyle-suppressions.xml Fri Dec 13 23:41:13 2013
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE suppressions PUBLIC "-//Puppy Crawl//DTD Suppressions 1.1//EN" "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
<suppressions>
- <suppress files="org/apache/fop/fo/FOPropertyMapping.java" checks="FileLengthCheck"/>
- <suppress files="org/apache/fop/complexscripts/fonts/GlyphPositioningTable.java" checks="FileLengthCheck"/>
- <suppress files="org/apache/fop/complexscripts/fonts/OTFAdvancedTypographicTableReader.java" checks="FileLengthCheck"/>
- <suppress files="org/apache/fop/Version.java" lines="40-50" checks="LineLengthCheck"/>
+ <suppress files="org/apache/fop/afp/fonts/CharactersetEncoder.java" checks="FinalClass"/>
+ <suppress files="org/apache/fop/complexscripts/bidi/BidiClass.java" checks="WhitespaceAfter"/>
+ <suppress files="org/apache/fop/complexscripts/bidi/GenerateBidiTestData.java" checks="SimplifyBooleanReturn"/>
+ <suppress files="org/apache/fop/complexscripts/scripts/ArabicScriptProcessor.java" checks="SimplifyBooleanReturn"/>
+ <suppress files="org/apache/fop/complexscripts/util/CharScript.java" checks="SimplifyBooleanReturn"/>
</suppressions>
Modified: xmlgraphics/fop/branches/Temp_WhitespaceManagement/examples/fo/basic/leader.fo
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_WhitespaceManagement/examples/fo/basic/leader.fo?rev=1550851&r1=1550850&r2=1550851&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_WhitespaceManagement/examples/fo/basic/leader.fo (original)
+++ xmlgraphics/fop/branches/Temp_WhitespaceManagement/examples/fo/basic/leader.fo Fri Dec 13 23:41:13 2013
@@ -2,7 +2,7 @@
<!-- examples for the use of the fo leader -->
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="sans-serif">
<fo:layout-master-set>
@@ -272,7 +272,7 @@
<fo:list-item>
<!-- insert a bullet -->
<fo:list-item-label end-indent="label-end()">
- <fo:block><fo:inline font-size="10pt" font-family="Symbol">·</fo:inline></fo:block>
+ <fo:block><fo:inline font-size="10pt">·</fo:inline></fo:block>
</fo:list-item-label>
<!-- list text -->
<fo:list-item-body start-indent="body-start()">
@@ -291,7 +291,7 @@
<fo:list-item>
<!-- insert a bullet -->
<fo:list-item-label end-indent="label-end()">
- <fo:block><fo:inline font-size="10pt" font-family="Symbol">·</fo:inline></fo:block>
+ <fo:block><fo:inline font-size="10pt">·</fo:inline></fo:block>
</fo:list-item-label>
<!-- list text -->
<fo:list-item-body start-indent="body-start()">
@@ -391,7 +391,7 @@
<fo:table-row line-height="12pt">
<fo:table-cell><fo:block text-align="end">A) </fo:block></fo:table-cell>
- <fo:table-cell><fo:block text-align="start">This is some longer sample text<fo:leader leader-pattern="dots"
+ <fo:table-cell><fo:block text-align="start" text-align-last="justify">This is some longer sample text<fo:leader leader-pattern="dots"
leader-pattern-width="8pt"
leader-alignment="reference-area"
/></fo:block></fo:table-cell>
@@ -401,7 +401,7 @@
<fo:table-row line-height="12pt">
<fo:table-cell><fo:block text-align="end">B) </fo:block></fo:table-cell>
- <fo:table-cell><fo:block text-align="start">Some text<fo:leader leader-pattern="dots"
+ <fo:table-cell><fo:block text-align="start" text-align-last="justify">Some text<fo:leader leader-pattern="dots"
leader-pattern-width="8pt"
leader-alignment="reference-area"
/></fo:block></fo:table-cell>
@@ -410,7 +410,7 @@
<fo:table-row line-height="12pt">
<fo:table-cell><fo:block text-align="end" >C) </fo:block></fo:table-cell>
- <fo:table-cell><fo:block text-align="start">Text<fo:leader leader-pattern="dots"
+ <fo:table-cell><fo:block text-align="start" text-align-last="justify">Text<fo:leader leader-pattern="dots"
leader-pattern-width="8pt"
leader-alignment="reference-area"
/></fo:block></fo:table-cell>
@@ -419,7 +419,7 @@
<fo:table-row line-height="12pt">
<fo:table-cell><fo:block text-align="end">D) </fo:block></fo:table-cell>
- <fo:table-cell><fo:block text-align="start">This text is even longer than the first entry <fo:leader leader-pattern="dots"
+ <fo:table-cell><fo:block text-align="start" text-align-last="justify">This text is even longer than the first entry <fo:leader leader-pattern="dots"
leader-pattern-width="8pt"
leader-alignment="reference-area"
/></fo:block></fo:table-cell>
@@ -428,7 +428,7 @@
<fo:table-row line-height="12pt">
<fo:table-cell><fo:block text-align="end">E) </fo:block></fo:table-cell>
- <fo:table-cell><fo:block text-align="start">Shorter text example<fo:leader leader-pattern="dots"
+ <fo:table-cell><fo:block text-align="start" text-align-last="justify">Shorter text example<fo:leader leader-pattern="dots"
leader-pattern-width="8pt"
leader-alignment="reference-area"
/></fo:block></fo:table-cell>
Modified: xmlgraphics/fop/branches/Temp_WhitespaceManagement/findbugs-exclude.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_WhitespaceManagement/findbugs-exclude.xml?rev=1550851&r1=1550850&r2=1550851&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_WhitespaceManagement/findbugs-exclude.xml (original)
+++ xmlgraphics/fop/branches/Temp_WhitespaceManagement/findbugs-exclude.xml Fri Dec 13 23:41:13 2013
@@ -5413,4 +5413,24 @@
</Or>
<Bug pattern="SE_TRANSIENT_FIELD_NOT_RESTORED"/>
</Match>
+ <Match>
+ <Class name="org.apache.fop.render.pdf.extensions.PDFExtensionHandlerFactory"/>
+ <Method name="getSupportedNamespaces"/>
+ <Bug pattern="EI_EXPOSE_REP"/>
+ </Match>
+ <Match>
+ <Class name="org.apache.fop.render.pdf.extensions.PDFDictionaryEntryExtension"/>
+ <Method name="getValueAsNumber"/>
+ <Bug pattern="FE_FLOATING_POINT_EQUALITY"/>
+ </Match>
+ <Match>
+ <Class name="org.apache.fop.render.pdf.extensions.PDFDictionaryType"/>
+ <Method name="hasValueOfElementName"/>
+ <Bug pattern="RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE"/>
+ </Match>
+ <Match>
+ <Class name="org.apache.fop.render.pdf.extensions.PDFDictionaryEntryType"/>
+ <Method name="hasValueOfElementName"/>
+ <Bug pattern="RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE"/>
+ </Match>
</FindBugsFilter>
Modified: xmlgraphics/fop/branches/Temp_WhitespaceManagement/lib/xmlgraphics-commons-svn-trunk.jar
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_WhitespaceManagement/lib/xmlgraphics-commons-svn-trunk.jar?rev=1550851&r1=1550850&r2=1550851&view=diff
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/codegen/unicode/java/org/apache/fop/complexscripts/bidi/GenerateBidiClass.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/codegen/unicode/java/org/apache/fop/complexscripts/bidi/GenerateBidiClass.java?rev=1550851&r1=1550850&r2=1550851&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/codegen/unicode/java/org/apache/fop/complexscripts/bidi/GenerateBidiClass.java (original)
+++ xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/codegen/unicode/java/org/apache/fop/complexscripts/bidi/GenerateBidiClass.java Fri Dec 13 23:41:13 2013
@@ -32,7 +32,6 @@ import java.util.TreeSet;
import org.apache.fop.util.License;
// CSOFF: LineLength
-// CSOFF: NoWhitespaceAfter
/**
* <p>Utility for generating a Java class representing bidirectional
@@ -303,7 +302,7 @@ public final class GenerateBidiClass {
sb.setLength(0);
out.println("private static byte[] bcL1 = {");
for (int i = 0; i < bcL1.length; i++) {
- if (! first) {
+ if (!first) {
sb.append(",");
} else {
first = false;
@@ -327,7 +326,7 @@ public final class GenerateBidiClass {
sb.setLength(0);
out.println("private static byte[] bcR1 = {");
for (int i = 0; i < bcR1.length; i++) {
- if (! first) {
+ if (!first) {
sb.append(",");
} else {
first = false;
@@ -351,7 +350,7 @@ public final class GenerateBidiClass {
sb.setLength(0);
out.println("private static int[] bcS1 = {");
for (int i = 0; i < bcS1.length; i++) {
- if (! first) {
+ if (!first) {
sb.append(",");
} else {
first = false;
@@ -375,7 +374,7 @@ public final class GenerateBidiClass {
sb.setLength(0);
out.println("private static int[] bcE1 = {");
for (int i = 0; i < bcE1.length; i++) {
- if (! first) {
+ if (!first) {
sb.append(",");
} else {
first = false;
@@ -399,7 +398,7 @@ public final class GenerateBidiClass {
sb.setLength(0);
out.println("private static byte[] bcC1 = {");
for (int i = 0; i < bcC1.length; i++) {
- if (! first) {
+ if (!first) {
sb.append(",");
} else {
first = false;
@@ -434,7 +433,7 @@ public final class GenerateBidiClass {
if (k >= 0) {
return ca [ k ];
} else {
- k = - (k + 1);
+ k = -(k + 1);
if (k == 0) {
return BidiConstants.L;
} else if (ch <= ea [ k - 1 ]) {
Modified: xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/codegen/unicode/java/org/apache/fop/complexscripts/bidi/GenerateBidiTestData.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/codegen/unicode/java/org/apache/fop/complexscripts/bidi/GenerateBidiTestData.java?rev=1550851&r1=1550850&r2=1550851&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/codegen/unicode/java/org/apache/fop/complexscripts/bidi/GenerateBidiTestData.java (original)
+++ xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/codegen/unicode/java/org/apache/fop/complexscripts/bidi/GenerateBidiTestData.java Fri Dec 13 23:41:13 2013
@@ -40,10 +40,6 @@ import java.util.TreeMap;
import org.apache.fop.util.License;
// CSOFF: LineLengthCheck
-// CSOFF: NoWhitespaceAfterCheck
-// CSOFF: InnerAssignmentCheck
-// CSOFF: SimplifyBooleanReturnCheck
-// CSOFF: EmptyForIteratorPadCheck
/**
* <p>Utility for generating a Java class and associated data files representing
@@ -202,7 +198,7 @@ public final class GenerateBidiTestData
String ucName = sa[1];
if (isBlockStart(ucName)) {
String ucBlock = getBlockName(ucName);
- if (! im.containsKey(ucBlock)) {
+ if (!im.containsKey(ucBlock)) {
im.put(ucBlock, new int[] { uc, -1, bc });
} else {
throw new IllegalArgumentException("duplicate start of block '" + ucBlock + "' at entry: " + line);
@@ -223,7 +219,7 @@ public final class GenerateBidiTestData
} else {
Integer k = Integer.valueOf(bc);
List sl;
- if (! sm.containsKey(k)) {
+ if (!sm.containsKey(k)) {
sl = new ArrayList();
sm.put(k, sl);
} else {
@@ -267,7 +263,7 @@ public final class GenerateBidiTestData
}
}
// populate intervals from (block) interval map
- if (! im.isEmpty()) {
+ if (!im.isEmpty()) {
for (Iterator it = im.values().iterator(); it.hasNext(); ) {
int[] ba = (int[]) it.next();
assert (ba != null) && (ba.length > 2);
@@ -335,7 +331,7 @@ public final class GenerateBidiTestData
continue;
} else if (line.startsWith("#")) {
continue;
- } else if (line.startsWith(PFX_TYPE) && ! ignoreDeprecatedTypeData) {
+ } else if (line.startsWith(PFX_TYPE) && !ignoreDeprecatedTypeData) {
List lines = new ArrayList();
if ((n = readType(line, b, lines)) < 0) {
break;
@@ -356,14 +352,14 @@ public final class GenerateBidiTestData
// dump instrumentation
if (verbose) {
System.out.println();
- if (! ignoreDeprecatedTypeData) {
+ if (!ignoreDeprecatedTypeData) {
System.out.println("Read type ranges : " + numTypeRanges);
}
System.out.println("Read level specs : " + numLevelSpecs);
System.out.println("Read test specs : " + numTestSpecs);
System.out.println("Read lines : " + lineNumber);
}
- if (! ignoreDeprecatedTypeData) {
+ if (!ignoreDeprecatedTypeData) {
td = (int[][]) tdl.toArray(new int [ tdl.size() ] []);
}
ld = (int[][]) ldl.toArray(new int [ ldl.size() ] []);
@@ -378,12 +374,12 @@ public final class GenerateBidiTestData
boolean done = false;
int n = 0;
lines.add(line);
- while (! done) {
+ while (!done) {
switch (testPrefix(b, PFX_LEVELS)) {
case 0: // within current levels
if ((line = b.readLine()) != null) {
n++;
- if ((line.length() > 0) && ! line.startsWith("#")) {
+ if ((line.length() > 0) && !line.startsWith("#")) {
lines.add(line);
}
} else {
@@ -509,7 +505,7 @@ public final class GenerateBidiTestData
CharacterIterator ci = new StringCharacterIterator(charRanges);
// read initial list delimiter
skipSpace(ci);
- if (! readStartOfList(ci)) {
+ if (!readStartOfList(ci)) {
badRangeSpec("missing initial list delimiter", charRanges);
}
// read negation token if present
@@ -538,7 +534,7 @@ public final class GenerateBidiTestData
String s;
skipSpace(ci);
if ((s = maybeReadSeparator(ci)) != null) {
- if ((s.length() != 0) && ! s.equals("||")) {
+ if ((s.length() != 0) && !s.equals("||")) {
badRangeSpec("invalid item separator \"" + s + "\"", charRanges);
}
}
@@ -557,10 +553,10 @@ public final class GenerateBidiTestData
}
// read terminating list delimiter
skipSpace(ci);
- if (! readEndOfList(ci)) {
+ if (!readEndOfList(ci)) {
badRangeSpec("missing terminating list delimiter", charRanges);
}
- if (! atEnd(ci)) {
+ if (!atEnd(ci)) {
badRangeSpec("extraneous content prior to end of line", ci);
}
if (negated) {
@@ -578,9 +574,9 @@ public final class GenerateBidiTestData
}
private static void skipSpace(CharacterIterator ci) {
- while (! atEnd(ci)) {
+ while (!atEnd(ci)) {
char c = ci.current();
- if (! Character.isWhitespace(c)) {
+ if (!Character.isWhitespace(c)) {
break;
} else {
ci.next();
@@ -589,7 +585,7 @@ public final class GenerateBidiTestData
}
private static boolean maybeReadNext(CharacterIterator ci, char next) {
- while (! atEnd(ci)) {
+ while (!atEnd(ci)) {
char c = ci.current();
if (c == next) {
ci.next();
@@ -906,7 +902,7 @@ public final class GenerateBidiTestData
List ll = new ArrayList();
// read prefix
skipSpace(ci);
- if (! maybeReadToken(ci, PFX_LEVELS)) {
+ if (!maybeReadToken(ci, PFX_LEVELS)) {
badLevelSpec("missing prefix \"" + PFX_LEVELS + "\"", ci);
}
// read level values
@@ -924,7 +920,7 @@ public final class GenerateBidiTestData
}
// read to end of line
skipSpace(ci);
- if (! atEnd(ci)) {
+ if (!atEnd(ci)) {
badLevelSpec("extraneous content prior to end of line", ci);
}
if (ll.size() == 0) {
@@ -1007,7 +1003,7 @@ public final class GenerateBidiTestData
List rl = new ArrayList();
// read prefix
skipSpace(ci);
- if (! maybeReadToken(ci, PFX_REORDER)) {
+ if (!maybeReadToken(ci, PFX_REORDER)) {
badReorderSpec("missing prefix \"" + PFX_REORDER + "\"", ci);
}
// read reorder values
@@ -1023,7 +1019,7 @@ public final class GenerateBidiTestData
}
// read to end of line
skipSpace(ci);
- if (! atEnd(ci)) {
+ if (!atEnd(ci)) {
badReorderSpec("extraneous content prior to end of line", ci);
}
return createReorderArray(rl, levels);
@@ -1066,7 +1062,7 @@ public final class GenerateBidiTestData
CharacterIterator ci = new StringCharacterIterator(line);
List cl = new ArrayList();
// read bidi class identifier sequence
- while (! atEnd(ci) && ! maybeReadNext(ci, ';')) {
+ while (!atEnd(ci) && !maybeReadNext(ci, ';')) {
skipSpace(ci);
int bc;
if ((bc = maybeReadBidiClass(ci)) >= 0) {
@@ -1086,7 +1082,7 @@ public final class GenerateBidiTestData
}
// read to end of line
skipSpace(ci);
- if (! atEnd(ci)) {
+ if (!atEnd(ci)) {
badTestSpec("extraneous content prior to end of line", ci);
}
return createTestArray(cl, bs, levels);
@@ -1244,7 +1240,7 @@ public final class GenerateBidiTestData
ok = false;
}
}
- if (! ok) {
+ if (!ok) {
System.out.println("Usage: GenerateBidiTestData [-v] [-i] [-d <ucdFile>] [-b <bidiFile>] [-o <outputFile>]");
System.out.println(" defaults:");
if (ignoreDeprecatedTypeData) {
Modified: xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/documentation/intermediate-format-ng/fop-intermediate-format-ng-content.xsd
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/documentation/intermediate-format-ng/fop-intermediate-format-ng-content.xsd?rev=1550851&r1=1550850&r2=1550851&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/documentation/intermediate-format-ng/fop-intermediate-format-ng-content.xsd (original)
+++ xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/documentation/intermediate-format-ng/fop-intermediate-format-ng-content.xsd Fri Dec 13 23:41:13 2013
@@ -38,6 +38,7 @@
<xs:complexContent>
<xs:extension base="mf:contentType">
<xs:attribute name="transform" type="xs:string"/>
+ <xs:attribute name="layer" type="xs:string"/>
</xs:extension>
</xs:complexContent>
</xs:complexType>
Modified: xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/META-INF/services/org.apache.fop.util.ContentHandlerFactory
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/META-INF/services/org.apache.fop.util.ContentHandlerFactory?rev=1550851&r1=1550850&r2=1550851&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/META-INF/services/org.apache.fop.util.ContentHandlerFactory (original)
+++ xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/META-INF/services/org.apache.fop.util.ContentHandlerFactory Fri Dec 13 23:41:13 2013
@@ -1,3 +1,4 @@
org.apache.fop.render.afp.extensions.AFPExtensionHandlerFactory
+org.apache.fop.render.pdf.extensions.PDFExtensionHandlerFactory
org.apache.fop.render.ps.extensions.PSExtensionHandlerFactory
org.apache.fop.fo.extensions.xmp.XMPContentHandlerFactory
Modified: xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/apps/FOUserAgent.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/apps/FOUserAgent.java?rev=1550851&r1=1550850&r2=1550851&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/apps/FOUserAgent.java (original)
+++ xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/apps/FOUserAgent.java Fri Dec 13 23:41:13 2013
@@ -408,7 +408,7 @@ public class FOUserAgent {
try {
// Have to do this so we can resolve data URIs
StreamSource src = new StreamSource(resourceResolver.getResource(uri));
- src.setSystemId(uri);
+ src.setSystemId(new File(uri).toURI().toURL().toExternalForm());
return src;
} catch (URISyntaxException use) {
return null;
Modified: xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/apps/FopConfParser.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/apps/FopConfParser.java?rev=1550851&r1=1550850&r2=1550851&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/apps/FopConfParser.java (original)
+++ xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/apps/FopConfParser.java Fri Dec 13 23:41:13 2013
@@ -70,16 +70,7 @@ public class FopConfParser {
*/
public FopConfParser(InputStream fopConfStream, EnvironmentProfile enviro)
throws SAXException, IOException {
- DefaultConfigurationBuilder cfgBuilder = new DefaultConfigurationBuilder();
- Configuration cfg;
- try {
- cfg = cfgBuilder.build(fopConfStream);
- } catch (ConfigurationException e) {
- throw new FOPException(e);
- }
- // The default base URI is taken from the directory in which the fopConf resides
- fopFactoryBuilder = new FopFactoryBuilder(enviro).setConfiguration(cfg);
- configure(enviro.getDefaultBaseURI(), enviro.getResourceResolver(), cfg);
+ this(fopConfStream, enviro.getDefaultBaseURI(), enviro);
}
/**
@@ -94,7 +85,8 @@ public class FopConfParser {
*/
public FopConfParser(InputStream fopConfStream, URI defaultBaseURI,
ResourceResolver resourceResolver) throws SAXException, IOException {
- this(fopConfStream, EnvironmentalProfileFactory.createDefault(defaultBaseURI, resourceResolver));
+ this(fopConfStream, defaultBaseURI,
+ EnvironmentalProfileFactory.createDefault(defaultBaseURI, resourceResolver));
}
/**
@@ -123,6 +115,20 @@ public class FopConfParser {
}
/**
+ * Constructor that takes the FOP conf and a default base URI and uses the default URI resolver.
+ *
+ * @param fopConfFile the FOP conf file
+ * @param defaultBaseURI the default base URI
+ * @throws SAXException if a SAX error was thrown parsing the FOP conf
+ * @throws IOException if an I/O error is thrown while parsing the FOP conf
+ */
+ public FopConfParser(File fopConfFile, URI defaultBaseURI) throws SAXException, IOException {
+ this(new FileInputStream(fopConfFile), fopConfFile.toURI(),
+ EnvironmentalProfileFactory.createDefault(defaultBaseURI,
+ ResourceResolverFactory.createDefaultResourceResolver()));
+ }
+
+ /**
* Constructor that parses the FOP conf and uses the URI resolver given.
*
* @param fopConfFile the FOP conf file
@@ -132,11 +138,24 @@ public class FopConfParser {
*/
public FopConfParser(File fopConfFile, ResourceResolver resourceResolver)
throws SAXException, IOException {
- this(new FileInputStream(fopConfFile),
- fopConfFile.getAbsoluteFile().getParentFile().toURI(), resourceResolver);
+ this(new FileInputStream(fopConfFile), fopConfFile.toURI(), resourceResolver);
+ }
+
+ private FopConfParser(InputStream fopConfStream, URI baseURI, EnvironmentProfile enviro)
+ throws SAXException, IOException {
+ DefaultConfigurationBuilder cfgBuilder = new DefaultConfigurationBuilder();
+ Configuration cfg;
+ try {
+ cfg = cfgBuilder.build(fopConfStream);
+ } catch (ConfigurationException e) {
+ throw new FOPException(e);
+ }
+ // The default base URI is taken from the directory in which the fopConf resides
+ fopFactoryBuilder = new FopFactoryBuilder(enviro).setConfiguration(cfg);
+ configure(baseURI, enviro.getResourceResolver(), cfg);
}
- private void configure(final URI defaultBaseURI, final ResourceResolver resourceResolver,
+ private void configure(final URI baseURI, final ResourceResolver resourceResolver,
Configuration cfg) throws FOPException {
if (log.isDebugEnabled()) {
log.debug("Initializing FopFactory Configuration");
@@ -174,7 +193,7 @@ public class FopConfParser {
if (cfg.getChild("base", false) != null) {
try {
URI confUri = InternalResourceResolver.getBaseURI(cfg.getChild("base").getValue(null));
- fopFactoryBuilder.setBaseURI(defaultBaseURI.resolve(confUri));
+ fopFactoryBuilder.setBaseURI(baseURI.resolve(confUri));
} catch (URISyntaxException use) {
LogUtil.handleException(log, use, strict);
}
@@ -242,8 +261,8 @@ public class FopConfParser {
}
// configure font manager
- new FontManagerConfigurator(cfg, fopFactoryBuilder.getBaseURI(), resourceResolver).configure(
- fopFactoryBuilder.getFontManager(), strict);
+ new FontManagerConfigurator(cfg, baseURI, fopFactoryBuilder.getBaseURI(), resourceResolver)
+ .configure(fopFactoryBuilder.getFontManager(), strict);
// configure image loader framework
configureImageLoading(cfg.getChild("image-loading", false), strict);
Modified: xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/area/AreaTreeParser.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/area/AreaTreeParser.java?rev=1550851&r1=1550850&r2=1550851&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/area/AreaTreeParser.java (original)
+++ xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/area/AreaTreeParser.java Fri Dec 13 23:41:13 2013
@@ -1040,7 +1040,7 @@ public class AreaTreeParser {
}
private static final Object[] SUBSET_COMMON = new Object[] {
- Trait.PROD_ID};
+ Trait.PROD_ID, Trait.LAYER};
private static final Object[] SUBSET_LINK = new Object[] {
Trait.INTERNAL_LINK, Trait.EXTERNAL_LINK};
private static final Object[] SUBSET_COLOR = new Object[] {
Modified: xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/area/Footnote.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/area/Footnote.java?rev=1550851&r1=1550850&r2=1550851&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/area/Footnote.java (original)
+++ xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/area/Footnote.java Fri Dec 13 23:41:13 2013
@@ -83,7 +83,7 @@ public class Footnote extends BlockParen
@Override
public void addBlock(Block child) {
addChildArea(child);
- this.setBPD(this.getBPD() + child.getBPD());
+ setBPD(getBPD() + child.getAllocBPD());
}
}
Modified: xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/area/Trait.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/area/Trait.java?rev=1550851&r1=1550850&r2=1550851&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/area/Trait.java (original)
+++ xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/area/Trait.java Fri Dec 13 23:41:13 2013
@@ -169,9 +169,11 @@ public final class Trait implements Seri
/** shift direction trait */
public static final Integer SHIFT_DIRECTION = 42;
+ /** For optional content groups. */
+ public static final Integer LAYER = 43;
/** Maximum value used by trait keys */
- public static final int MAX_TRAIT_KEY = 42;
+ public static final int MAX_TRAIT_KEY = 43;
private static final TraitInfo[] TRAIT_INFO = new TraitInfo[MAX_TRAIT_KEY + 1];
@@ -243,6 +245,7 @@ public final class Trait implements Seri
new TraitInfo("block-progression-direction", Direction.class));
put(SHIFT_DIRECTION,
new TraitInfo("shift-direction", Direction.class));
+ put(LAYER, new TraitInfo("layer", String.class));
}
Modified: xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/cli/CommandLineOptions.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/cli/CommandLineOptions.java?rev=1550851&r1=1550850&r2=1550851&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/cli/CommandLineOptions.java (original)
+++ xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/cli/CommandLineOptions.java Fri Dec 13 23:41:13 2013
@@ -144,7 +144,6 @@ public class CommandLineOptions {
* Construct a command line option object.
*/
public CommandLineOptions() {
- LogFactory logFactory = LogFactory.getFactory();
log = LogFactory.getLog("FOP");
}
@@ -174,9 +173,6 @@ public class CommandLineOptions {
//Factory config is set up, now we can create the user agent
foUserAgent = factory.newFOUserAgent();
foUserAgent.getRendererOptions().putAll(renderingOptions);
- if (targetResolution != 0) {
- foUserAgent.setTargetResolution(targetResolution);
- }
addXSLTParameter("fop-output-format", getOutputFormat());
addXSLTParameter("fop-version", Version.getVersion());
foUserAgent.setConserveMemoryPolicy(conserveMemoryPolicy);
@@ -1019,7 +1015,8 @@ public class CommandLineOptions {
fopFactoryBuilder.setComplexScriptFeatures(useComplexScriptFeatures);
} else {
try {
- fopFactoryBuilder = new FopConfParser(userConfigFile).getFopFactoryBuilder();
+ FopConfParser fopConfParser = new FopConfParser(userConfigFile, baseURI);
+ fopFactoryBuilder = fopConfParser.getFopFactoryBuilder();
} catch (SAXException e) {
throw new FOPException(e);
}
Modified: xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/complexscripts/bidi/BidiClass.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/complexscripts/bidi/BidiClass.java?rev=1550851&r1=1550850&r2=1550851&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/complexscripts/bidi/BidiClass.java (original)
+++ xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/complexscripts/bidi/BidiClass.java Fri Dec 13 23:41:13 2013
@@ -21,7 +21,6 @@ package org.apache.fop.complexscripts.bi
import java.util.Arrays;
-// CSOFF: WhitespaceAfterCheck
// CSOFF: LineLengthCheck
/*
Modified: xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/complexscripts/bidi/BidiResolver.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/complexscripts/bidi/BidiResolver.java?rev=1550851&r1=1550850&r2=1550851&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/complexscripts/bidi/BidiResolver.java (original)
+++ xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/complexscripts/bidi/BidiResolver.java Fri Dec 13 23:41:13 2013
@@ -32,11 +32,7 @@ import org.apache.fop.area.LineArea;
import org.apache.fop.area.inline.InlineArea;
import org.apache.fop.fo.pagination.PageSequence;
-// CSOFF: EmptyForIteratorPadCheck
-// CSOFF: InnerAssignmentCheck
// CSOFF: LineLengthCheck
-// CSOFF: NoWhitespaceAfterCheck
-// CSOFF: SimplifyBooleanReturnCheck
/**
* <p>A utility class for performing bidirectional resolution processing.</p>
@@ -140,7 +136,7 @@ public final class BidiResolver {
runsNew.addAll(ir.split());
}
}
- if (! runsNew.equals(runs)) {
+ if (!runsNew.equals(runs)) {
runs = runsNew;
}
return runs;
@@ -180,7 +176,7 @@ public final class BidiResolver {
i = e - 1;
}
}
- if (! runsNew.equals(runs)) {
+ if (!runsNew.equals(runs)) {
runs = runsNew;
}
return runs;
@@ -232,7 +228,7 @@ public final class BidiResolver {
Vector rv = new Vector();
for (Iterator it = ranges.iterator(); it.hasNext(); ) {
DelimitedTextRange r = (DelimitedTextRange) it.next();
- if (! r.isEmpty()) {
+ if (!r.isEmpty()) {
rv.add(r);
}
}
Modified: xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/complexscripts/bidi/DelimitedTextRange.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/complexscripts/bidi/DelimitedTextRange.java?rev=1550851&r1=1550850&r2=1550851&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/complexscripts/bidi/DelimitedTextRange.java (original)
+++ xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/complexscripts/bidi/DelimitedTextRange.java Fri Dec 13 23:41:13 2013
@@ -34,10 +34,7 @@ import org.apache.fop.traits.WritingMode
import org.apache.fop.traits.WritingModeTraitsGetter;
import org.apache.fop.util.CharUtilities;
-// CSOFF: EmptyForIteratorPadCheck
-// CSOFF: InnerAssignmentCheck
// CSOFF: LineLengthCheck
-// CSOFF: NoWhitespaceAfterCheck
/**
* The <code>DelimitedTextRange</code> class implements the "delimited text range" as described
@@ -151,7 +148,7 @@ public class DelimitedTextRange {
TextInterval ti = (TextInterval) it.next();
intervalsNew.addAll(assignLevels(ti, levels));
}
- if (! intervalsNew.equals(intervals)) {
+ if (!intervalsNew.equals(intervals)) {
intervals = intervalsNew;
}
}
Modified: xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/complexscripts/bidi/InlineRun.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/complexscripts/bidi/InlineRun.java?rev=1550851&r1=1550850&r2=1550851&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/complexscripts/bidi/InlineRun.java (original)
+++ xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/complexscripts/bidi/InlineRun.java Fri Dec 13 23:41:13 2013
@@ -35,11 +35,6 @@ import org.apache.fop.area.inline.Unreso
import org.apache.fop.area.inline.WordArea;
import org.apache.fop.util.CharUtilities;
-// CSOFF: EmptyForIteratorPadCheck
-// CSOFF: InnerAssignmentCheck
-// CSOFF: NoWhitespaceAfterCheck
-// CSOFF: SimplifyBooleanReturnCheck
-
/**
* The <code>InlineRun</code> class is a utility class, the instances of which are used
* to capture a sequence of reordering levels associated with an inline area.
@@ -179,7 +174,7 @@ public class InlineRun {
if (inline instanceof WordArea) {
WordArea w = (WordArea) inline;
// if not already reversed, then reverse now
- if (! w.isReversed()) {
+ if (!w.isReversed()) {
if ((reversals & 1) != 0) {
w.reverse(mirror);
} else if (mirror && maybeNeedsMirroring()) {
@@ -209,10 +204,8 @@ public class InlineRun {
}
return true;
}
- } else if ((ir.levels == null) && (levels == null)) {
- return true;
} else {
- return false;
+ return (ir.levels == null) && (levels == null);
}
} else {
return false;
Modified: xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/complexscripts/bidi/TextInterval.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/complexscripts/bidi/TextInterval.java?rev=1550851&r1=1550850&r2=1550851&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/complexscripts/bidi/TextInterval.java (original)
+++ xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/complexscripts/bidi/TextInterval.java Fri Dec 13 23:41:13 2013
@@ -28,7 +28,6 @@ import org.apache.fop.fo.flow.Character;
import org.apache.fop.fo.flow.Leader;
// CSOFF: LineLengthCheck
-// CSOFF: SimplifyBooleanReturnCheck
/**
* <p>The <code>TextInterval</code> class is a utility class, the instances of which are used
@@ -102,10 +101,8 @@ class TextInterval {
return false;
} else if (ti.getStart() != start) {
return false;
- } else if (ti.getEnd() != end) {
- return false;
} else {
- return true;
+ return ti.getEnd() == end;
}
} else {
return false;
Modified: xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/complexscripts/bidi/UnflattenProcessor.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/complexscripts/bidi/UnflattenProcessor.java?rev=1550851&r1=1550850&r2=1550851&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/complexscripts/bidi/UnflattenProcessor.java (original)
+++ xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/complexscripts/bidi/UnflattenProcessor.java Fri Dec 13 23:41:13 2013
@@ -35,10 +35,7 @@ import org.apache.fop.area.inline.SpaceA
import org.apache.fop.area.inline.TextArea;
import org.apache.fop.area.inline.UnresolvedPageNumber;
-// CSOFF: EmptyForIteratorPadCheck
// CSOFF: LineLengthCheck
-// CSOFF: NoWhitespaceAfterCheck
-// CSOFF: SimplifyBooleanReturnCheck
/**
* <p>The <code>UnflattenProcessor</code> class is used to reconstruct (by unflattening) a line
@@ -86,10 +83,8 @@ class UnflattenProcessor {
private boolean shouldFinishTextContainer(TextArea tc, InlineArea ia) {
if ((tcOrig != null) && (tc != tcOrig)) {
return true;
- } else if ((iaLevelLast != -1) && (ia.getBidiLevel() != iaLevelLast)) {
- return true;
} else {
- return false;
+ return (iaLevelLast != -1) && (ia.getBidiLevel() != iaLevelLast);
}
}
private void finishTextContainer() {
@@ -98,7 +93,7 @@ class UnflattenProcessor {
private void finishTextContainer(TextArea tc, InlineArea ia) {
if (tcNew != null) {
updateIPD(tcNew);
- if (! icNew.empty()) {
+ if (!icNew.empty()) {
icNew.peek().addChildArea(tcNew);
} else {
ilNew.add(tcNew);
@@ -113,12 +108,12 @@ class UnflattenProcessor {
}
private boolean shouldFinishInlineContainer(List<InlineParent> ich, TextArea tc, InlineArea ia) {
if ((ich == null) || ich.isEmpty()) {
- return ! icOrig.empty();
+ return !icOrig.empty();
} else {
- if (! icOrig.empty()) {
+ if (!icOrig.empty()) {
InlineParent ic = ich.get(0);
InlineParent ic0 = icOrig.peek();
- return (ic != ic0) && ! isInlineParentOf(ic, ic0);
+ return (ic != ic0) && !isInlineParentOf(ic, ic0);
} else {
return false;
}
@@ -128,14 +123,14 @@ class UnflattenProcessor {
finishInlineContainer(null, null, null);
}
private void finishInlineContainer(List<InlineParent> ich, TextArea tc, InlineArea ia) {
- if ((ich != null) && ! ich.isEmpty()) { // finish non-matching inner inline container(s)
+ if ((ich != null) && !ich.isEmpty()) { // finish non-matching inner inline container(s)
for (Iterator<InlineParent> it = ich.iterator(); it.hasNext(); ) {
InlineParent ic = it.next();
InlineParent ic0 = icOrig.empty() ? null : icOrig.peek();
if (ic0 == null) {
assert icNew.empty();
} else if (ic != ic0) {
- assert ! icNew.empty();
+ assert !icNew.empty();
InlineParent icO0 = icOrig.pop();
InlineParent icN0 = icNew.pop();
assert icO0 != null;
@@ -145,7 +140,7 @@ class UnflattenProcessor {
} else {
icNew.peek().addChildArea(icN0);
}
- if (! icOrig.empty() && (icOrig.peek() == ic)) {
+ if (!icOrig.empty() && (icOrig.peek() == ic)) {
break;
}
} else {
@@ -153,7 +148,7 @@ class UnflattenProcessor {
}
}
} else { // finish all inline containers
- while (! icNew.empty()) {
+ while (!icNew.empty()) {
InlineParent icO0 = icOrig.pop();
InlineParent icN0 = icNew.pop();
assert icO0 != null;
@@ -176,8 +171,8 @@ class UnflattenProcessor {
finishInlineContainer();
}
private void update(List<InlineParent> ich, TextArea tc, InlineArea ia) {
- if (! alreadyUnflattened(ia)) {
- if ((ich != null) && ! ich.isEmpty()) {
+ if (!alreadyUnflattened(ia)) {
+ if ((ich != null) && !ich.isEmpty()) {
pushInlineContainers(ich);
}
if (tc != null) {
@@ -345,7 +340,7 @@ class UnflattenProcessor {
Area a = ia.getParentArea();
while (a != null) {
if (a instanceof InlineArea) {
- if ((a instanceof InlineParent) && ! (a instanceof TextArea)) {
+ if ((a instanceof InlineParent) && !(a instanceof TextArea)) {
ich.add((InlineParent) a);
}
a = ((InlineArea) a) .getParentArea();
Modified: xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/complexscripts/bidi/UnicodeBidiAlgorithm.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/complexscripts/bidi/UnicodeBidiAlgorithm.java?rev=1550851&r1=1550850&r2=1550851&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/complexscripts/bidi/UnicodeBidiAlgorithm.java (original)
+++ xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/complexscripts/bidi/UnicodeBidiAlgorithm.java Fri Dec 13 23:41:13 2013
@@ -25,12 +25,7 @@ import org.apache.commons.logging.LogFac
import org.apache.fop.traits.Direction;
import org.apache.fop.util.CharUtilities;
-// CSOFF: AvoidNestedBlocksCheck
-// CSOFF: EmptyForIteratorPadCheck
-// CSOFF: InnerAssignmentCheck
// CSOFF: LineLengthCheck
-// CSOFF: NoWhitespaceAfterCheck
-// CSOFF: ParameterNumberCheck
/**
* <p>The <code>UnicodeBidiAlgorithm</code> class implements functionality prescribed by
@@ -125,47 +120,39 @@ public final class UnicodeBidiAlgorithm
case RLE: // start right-to-left embedding
case LRO: // start left-to-right override
case RLO: // start right-to-left override
- {
- int en; /* new embedding level */
- if ((bc == RLE) || (bc == RLO)) {
- en = ((ec & ~OVERRIDE) + 1) | 1;
- } else {
- en = ((ec & ~OVERRIDE) + 2) & ~1;
- }
- if (en < (MAX_LEVELS + 1)) {
- es [ ei++ ] = ec;
- if ((bc == LRO) || (bc == RLO)) {
- ec = en | OVERRIDE;
- } else {
- ec = en & ~OVERRIDE;
- }
+ int en; /* new embedding level */
+ if ((bc == RLE) || (bc == RLO)) {
+ en = ((ec & ~OVERRIDE) + 1) | 1;
+ } else {
+ en = ((ec & ~OVERRIDE) + 2) & ~1;
+ }
+ if (en < (MAX_LEVELS + 1)) {
+ es [ ei++ ] = ec;
+ if ((bc == LRO) || (bc == RLO)) {
+ ec = en | OVERRIDE;
} else {
- // max levels exceeded, so don't change level or override
+ ec = en & ~OVERRIDE;
}
- el = ec;
- break;
+ } else {
+ // max levels exceeded, so don't change level or override
}
+ el = ec;
+ break;
case PDF: // pop directional formatting
- {
- el = ec;
- if (ei > 0) {
- ec = es [ --ei ];
- } else {
- // ignore isolated PDF
- }
- break;
+ el = ec;
+ if (ei > 0) {
+ ec = es [ --ei ];
+ } else {
+ // ignore isolated PDF
}
+ break;
case B: // paragraph separator
- {
- el = ec = defaultLevel;
- ei = 0;
- break;
- }
+ el = ec = defaultLevel;
+ ei = 0;
+ break;
default:
- {
- el = ec;
- break;
- }
+ el = ec;
+ break;
}
switch (bc) {
case BN:
@@ -608,7 +595,7 @@ public final class UnicodeBidiAlgorithm
private static boolean isRetainedFormatting(int[] ca, int s, int e) {
for (int i = s; i < e; i++) {
- if (! isRetainedFormatting(ca[i])) {
+ if (!isRetainedFormatting(ca[i])) {
return false;
}
}
@@ -680,7 +667,7 @@ public final class UnicodeBidiAlgorithm
} else {
chOut = chIn;
}
- if (! triggered && triggersBidi(chOut)) {
+ if (!triggered && triggersBidi(chOut)) {
triggered = true;
}
if ((chOut & 0xFF0000) == 0) {
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org