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 je...@apache.org on 2007/12/12 17:13:16 UTC
svn commit: r603656 [1/7] - in
/xmlgraphics/fop/branches/Temp_ImagePackageRedesign: ./ examples/fo/basic/
lib/ src/documentation/ src/documentation/content/xdocs/
src/documentation/content/xdocs/trunk/
src/documentation/intermediate-format-ng/ src/java...
Author: jeremias
Date: Wed Dec 12 08:13:06 2007
New Revision: 603656
URL: http://svn.apache.org/viewvc?rev=603656&view=rev
Log:
Merged revisions 594558-603642 via svnmerge from
https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk
........
r594571 | vhennebert | 2007-11-13 17:24:32 +0100 (Di, 13 Nov 2007) | 7 lines
Moved the creation of grid units to the FO tree building stage. Brought a few improvements along with the move:
- bugfix: border-resolution for border-end on row-spanning cells was wrong
- bugfix: in case of missing cells the border-end of the table was applied to an inner cell, instead of the cell in the last column (but missing cells aren't painted yet :-\)
- bugfix: in collapsing-border model, border-before and -after specified on table-column were applied to every cell of the column, instead of only the first and the last ones
- border resolution is now made progressively when possible, and no longer triggers the fetching of all the rows of the table
Added testcases for the border conflict resolution (between the various elements of a table and not only the cells)
........
r594578 | vhennebert | 2007-11-13 17:50:09 +0100 (Di, 13 Nov 2007) | 2 lines
Moved *GridUnit from layoutmgr/table to fo/flow/table
........
r594579 | vhennebert | 2007-11-13 17:55:54 +0100 (Di, 13 Nov 2007) | 2 lines
Changed back visibility of fields from public to package-private, due to the move of *GridUnit in the fo.flow.table package
........
r594584 | vhennebert | 2007-11-13 18:13:19 +0100 (Di, 13 Nov 2007) | 2 lines
Use a singleton for a default BorderInfo of style none, instead of every time a new instance
........
r594592 | vhennebert | 2007-11-13 18:39:17 +0100 (Di, 13 Nov 2007) | 2 lines
Cleaned up RowGroupLayoutManager and TableRowIterator
........
r594821 | vhennebert | 2007-11-14 11:18:45 +0100 (Mi, 14 Nov 2007) | 2 lines
Moved EffRow to the fo.flow.table package
........
r594829 | vhennebert | 2007-11-14 11:41:52 +0100 (Mi, 14 Nov 2007) | 2 lines
Reduced visibility of some methods and constructors from public to package-private, as a consequence of the move of *GridUnit to the fo.flow.table package
........
r594836 | vhennebert | 2007-11-14 12:14:03 +0100 (Mi, 14 Nov 2007) | 2 lines
Restored the setting of the parent table-row element on grid units
........
r594852 | vhennebert | 2007-11-14 13:21:53 +0100 (Mi, 14 Nov 2007) | 2 lines
Restored the setting of rowIndex on primary grid units (although testcases were already working...)
........
r595297 | jeremias | 2007-11-15 14:28:58 +0100 (Do, 15 Nov 2007) | 2 lines
Bugzilla #43143:
Had to remove the Expert(Subset) Encoding detection as this caused problems with a barcode font that used dfCharset=2 but was not using ExpertSubset encoding. To detect Expert(Subset)Encoding, the AFM needs to be parsed. And since we don't support that encoding, yet, the fallback to WinAnsiEncoding should work well enough.
........
r595637 | acumiskey | 2007-11-16 13:12:52 +0100 (Fr, 16 Nov 2007) | 3 lines
This should improve the ability of the FontLoader when resolving PFM files
for Type 1 fonts on case sensitive Unix systems.
........
r596072 | jeremias | 2007-11-18 11:48:53 +0100 (So, 18 Nov 2007) | 4 lines
ApacheCon US is over.
OSSSummit was cancelled/postponed.
Added example for total page count using XSL 1.1
Adjusted total page count example to new FOP API. (Thanks to Miroslav Gregan for the hint)
........
r596097 | jeremias | 2007-11-18 17:56:09 +0100 (So, 18 Nov 2007) | 6 lines
Bugzilla #43605:
Added methods for page-number-citation and page-number-citation-last in FOEventHandler.java
Submitted by: V. Schappert <vschappert.at.bloomberg.net>
Patch modified by Jeremias:
Bugfix: FOEventHandler.startPageNumberCitation() was also called in the case of a page-number-citation-last. Introduced abstract base classes to avoid this.
........
r596100 | jeremias | 2007-11-18 18:17:24 +0100 (So, 18 Nov 2007) | 1 line
Added sample as suggested by Kumar Puppala.
........
r596390 | vhennebert | 2007-11-19 19:25:27 +0100 (Mo, 19 Nov 2007) | 2 lines
Bugzilla #43766: breaks generated by the merging algorithm for table rows containing empty cells has always a penalty of 900
........
r596554 | jeremias | 2007-11-20 08:14:33 +0100 (Di, 20 Nov 2007) | 2 lines
Bugzilla #43904:
Buffer the OutputStreams in our transcoders if the users forget.
........
r596600 | jeremias | 2007-11-20 11:20:29 +0100 (Di, 20 Nov 2007) | 3 lines
Bugzilla #43910:
Avoid a NullPointerException in AreaTreeHandler.endDocument().
Submitted by: David Delbecq <delbd.at.oma.be>
........
r596724 | jeremias | 2007-11-20 16:56:33 +0100 (Di, 20 Nov 2007) | 3 lines
Bugfix: Bugfix for URI resolution: Make StreamSources without system identifier work again.
Bugfix: Close streams opened by test font resolution in font configuration (the font URIs will be resolved again later anyway).
Better error message when the loading of font metric files doesn't work due to missing information in the returned Source instances.
........
r596727 | vhennebert | 2007-11-20 17:07:32 +0100 (Di, 20 Nov 2007) | 2 lines
Bugfix in tables: wrong element generation by the merging algorithm when glues must be produced to cope with conditional spaces. The corresponding length was added twice: one in the glue itself and one in the following box.
........
r596739 | cbowditch | 2007-11-20 17:49:13 +0100 (Di, 20 Nov 2007) | 1 line
bug fix: memory leak in PropertyCache. Fix provided by Jeremias. There are still some thread synchronization issues to be addressed in the PropertyCache. See the following thread for details: http://mail-archives.apache.org/mod_mbox/xmlgraphics-fop-dev/200711.mbox/%3cBAY117-DAV109E36CC066889386AB917FB870@phx.gbl%3e
........
r596742 | vhennebert | 2007-11-20 18:08:46 +0100 (Di, 20 Nov 2007) | 2 lines
Added a news entry about Max Berger becoming a committer. Welcome Max!
........
r596776 | vhennebert | 2007-11-20 19:47:39 +0100 (Di, 20 Nov 2007) | 2 lines
Bugzilla #43803: table cells having no children are allowed in relaxed validation mode.
........
r597052 | vhennebert | 2007-11-21 13:23:59 +0100 (Mi, 21 Nov 2007) | 2 lines
Bugfix: the last element generated by the merging algorithm may now be a glue
........
r597448 | jeremias | 2007-11-22 17:13:05 +0100 (Do, 22 Nov 2007) | 2 lines
First draft of a possible new intermediate format for Apache FOP.
Details on: http://wiki.apache.org/xmlgraphics-fop/AreaTreeIntermediateXml/NewDesign
........
r598558 | jeremias | 2007-11-27 09:36:23 +0100 (Di, 27 Nov 2007) | 6 lines
Bugzilla #40230:
Bugfix: no empty page is generated anymore if there's no content after a break-after.
Bugzilla #43917:
Bugfix for border-after painting and element list generation when a forced break is involved.
........
r599536 | vhennebert | 2007-11-29 19:31:13 +0100 (Do, 29 Nov 2007) | 4 lines
Added fixes-bug attributes for:
- wrong element generation in table when glues are produced
- border-resolution on row-spanning cells
........
r599746 | jeremias | 2007-11-30 10:04:54 +0100 (Fr, 30 Nov 2007) | 2 lines
Bugzilla #37993:
Bugfix: allow multiple bookmarks to point at the same destination.
........
r600195 | adelmelle | 2007-12-01 22:11:53 +0100 (Sa, 01 Dez 2007) | 1 line
Correction and simplification of the PropertyCache: subclass WeakReference and remove internal threading
........
r600467 | jeremias | 2007-12-03 11:16:27 +0100 (Mo, 03 Dez 2007) | 2 lines
Log RuntimeExceptions during rendering so that they are at least visible somewhere if someone doesn't set an ErrorListener on the XSLT processor (this could lead to exceptions being swallowed). This is a temporary measure until we have time to improve the exception handling in FOP.
The original problem that led to this change was: "The number of this PDFNumber must not be empty" while producing a PDF/A with customized filter entries in the PDF configuration. The exception was a follow-up exception after a PDFConformanceException that was swallowed by a default ErrorListener.
........
r600521 | jeremias | 2007-12-03 14:21:06 +0100 (Mo, 03 Dez 2007) | 1 line
Added a possibility to rerun the whole run a defined number of times to test for possible issues outside a single rendering run.
........
r600529 | jeremias | 2007-12-03 14:32:04 +0100 (Mo, 03 Dez 2007) | 1 line
Oops.
........
r601413 | vhennebert | 2007-12-05 17:56:47 +0100 (Mi, 05 Dez 2007) | 2 lines
Typo in property: svn:kewords -> svn:keywords
........
r601415 | acumiskey | 2007-12-05 18:11:44 +0100 (Mi, 05 Dez 2007) | 2 lines
Corrected javadocs
........
r601416 | acumiskey | 2007-12-05 18:12:54 +0100 (Mi, 05 Dez 2007) | 2 lines
Corrected javadoc
........
r601417 | acumiskey | 2007-12-05 18:13:31 +0100 (Mi, 05 Dez 2007) | 2 lines
Corrected javadoc
........
r601419 | acumiskey | 2007-12-05 18:15:46 +0100 (Mi, 05 Dez 2007) | 2 lines
Improved use of logging
........
r601423 | acumiskey | 2007-12-05 18:19:43 +0100 (Mi, 05 Dez 2007) | 2 lines
Corrected javadoc, fixed checkstyle issues, and now also correctly caters for negative number conversions
........
r601424 | acumiskey | 2007-12-05 18:21:15 +0100 (Mi, 05 Dez 2007) | 2 lines
Fixed checkstyle issues
........
r601426 | acumiskey | 2007-12-05 18:24:15 +0100 (Mi, 05 Dez 2007) | 2 lines
Checkstyle fixes
........
r601427 | acumiskey | 2007-12-05 18:25:07 +0100 (Mi, 05 Dez 2007) | 2 lines
Checkstyle fixes
........
r601428 | acumiskey | 2007-12-05 18:25:58 +0100 (Mi, 05 Dez 2007) | 2 lines
Checkstyle fixes
........
r601429 | acumiskey | 2007-12-05 18:27:06 +0100 (Mi, 05 Dez 2007) | 2 lines
Checkstyle fixes
........
r601430 | acumiskey | 2007-12-05 18:28:03 +0100 (Mi, 05 Dez 2007) | 2 lines
Checkstyle fixes
........
r601431 | acumiskey | 2007-12-05 18:28:48 +0100 (Mi, 05 Dez 2007) | 2 lines
Checkstyle fixes
........
r601432 | acumiskey | 2007-12-05 18:29:31 +0100 (Mi, 05 Dez 2007) | 2 lines
Checkstyle fixes
........
r601433 | acumiskey | 2007-12-05 18:30:04 +0100 (Mi, 05 Dez 2007) | 2 lines
Checkstyle fixes
........
r601434 | acumiskey | 2007-12-05 18:31:20 +0100 (Mi, 05 Dez 2007) | 2 lines
Checkstyle fixes
........
r601435 | acumiskey | 2007-12-05 18:32:29 +0100 (Mi, 05 Dez 2007) | 2 lines
Checkstyle fixes
........
r601436 | acumiskey | 2007-12-05 18:34:44 +0100 (Mi, 05 Dez 2007) | 2 lines
Checkstyle fixes
........
r601437 | acumiskey | 2007-12-05 18:35:31 +0100 (Mi, 05 Dez 2007) | 2 lines
Checkstyle fixes
........
r601438 | acumiskey | 2007-12-05 18:36:12 +0100 (Mi, 05 Dez 2007) | 2 lines
Checkstyle fixes and cleanup
........
r601439 | acumiskey | 2007-12-05 18:37:40 +0100 (Mi, 05 Dez 2007) | 2 lines
Checkstyle fixes
........
r601440 | acumiskey | 2007-12-05 18:39:54 +0100 (Mi, 05 Dez 2007) | 2 lines
Checkstyle fixes
........
r601442 | acumiskey | 2007-12-05 18:42:13 +0100 (Mi, 05 Dez 2007) | 2 lines
Checkstyle fixes
........
r601443 | acumiskey | 2007-12-05 18:42:48 +0100 (Mi, 05 Dez 2007) | 2 lines
Checkstyle fixes
........
r601444 | acumiskey | 2007-12-05 18:43:46 +0100 (Mi, 05 Dez 2007) | 2 lines
Checkstyle fixes
........
r601445 | acumiskey | 2007-12-05 18:44:36 +0100 (Mi, 05 Dez 2007) | 2 lines
Checkstyle fixes
........
r601446 | acumiskey | 2007-12-05 18:45:20 +0100 (Mi, 05 Dez 2007) | 2 lines
Checkstyle fixes
........
r601447 | acumiskey | 2007-12-05 18:47:44 +0100 (Mi, 05 Dez 2007) | 2 lines
Checkstyle fixes
........
r601448 | acumiskey | 2007-12-05 18:48:56 +0100 (Mi, 05 Dez 2007) | 2 lines
Checkstyle fixes
........
r601449 | acumiskey | 2007-12-05 18:49:46 +0100 (Mi, 05 Dez 2007) | 2 lines
Checkstyle fixes
........
r601712 | acumiskey | 2007-12-06 12:57:14 +0100 (Do, 06 Dez 2007) | 2 lines
Temporary fix to the build
........
r602045 | jeremias | 2007-12-07 10:20:28 +0100 (Fr, 07 Dez 2007) | 1 line
Avoid a NPE in toString().
........
r602125 | maxberger | 2007-12-07 16:36:53 +0100 (Fr, 07 Dez 2007) | 6 lines
Updated xmlgraphics from SVN
Added autodetection of fonts in jar files (x-font and x-font-truetype)
Added files needed for testcase
Please note: Actual testcase is still missing!
........
r602898 | maxberger | 2007-12-10 14:35:33 +0100 (Mo, 10 Dez 2007) | 2 lines
Added documentation for font-in-jar-files
........
r603590 | acumiskey | 2007-12-12 13:24:10 +0100 (Mi, 12 Dez 2007) | 4 lines
* Added an SVG handler and Graphics2D implementation for AFP which injects AFP GOCA structured fields into the AFPDataStream.
* Fixed many checkstyle problems.
* Updated xmlgraphics-commons-1.3svn.jar to include changes to TextHandler
........
r603592 | acumiskey | 2007-12-12 13:26:39 +0100 (Mi, 12 Dez 2007) | 2 lines
Updated status with SVG support for AFP.
........
Added:
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/documentation/intermediate-format-ng/
- copied from r603592, xmlgraphics/fop/trunk/src/documentation/intermediate-format-ng/
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/documentation/intermediate-format-ng/README.txt
- copied unchanged from r603592, xmlgraphics/fop/trunk/src/documentation/intermediate-format-ng/README.txt
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/documentation/intermediate-format-ng/example1.xml
- copied unchanged from r603592, xmlgraphics/fop/trunk/src/documentation/intermediate-format-ng/example1.xml
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/documentation/intermediate-format-ng/fop-intermediate-format-ng-content.xsd
- copied unchanged from r603592, xmlgraphics/fop/trunk/src/documentation/intermediate-format-ng/fop-intermediate-format-ng-content.xsd
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/documentation/intermediate-format-ng/fop-intermediate-format-ng-datatypes.xsd
- copied unchanged from r603592, xmlgraphics/fop/trunk/src/documentation/intermediate-format-ng/fop-intermediate-format-ng-datatypes.xsd
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/documentation/intermediate-format-ng/fop-intermediate-format-ng.xsd
- copied unchanged from r603592, xmlgraphics/fop/trunk/src/documentation/intermediate-format-ng/fop-intermediate-format-ng.xsd
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/documentation/intermediate-format-ng/xmp-metadata.xsd
- copied unchanged from r603592, xmlgraphics/fop/trunk/src/documentation/intermediate-format-ng/xmp-metadata.xsd
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/documentation/intermediate-format-ng/xmp-rdf-metadata.xsd
- copied unchanged from r603592, xmlgraphics/fop/trunk/src/documentation/intermediate-format-ng/xmp-rdf-metadata.xsd
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/fo/flow/AbstractPageNumberCitation.java
- copied unchanged from r603592, xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/AbstractPageNumberCitation.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/fo/flow/table/BorderResolver.java
- copied unchanged from r603592, xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/BorderResolver.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/fo/flow/table/BorderSpecification.java
- copied unchanged from r603592, xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/BorderSpecification.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/fo/flow/table/CollapsingBorderResolver.java
- copied unchanged from r603592, xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/CollapsingBorderResolver.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/fo/flow/table/EffRow.java
- copied unchanged from r603592, xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/EffRow.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/fo/flow/table/EmptyGridUnit.java
- copied unchanged from r603592, xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/EmptyGridUnit.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/fo/flow/table/GridUnit.java
- copied unchanged from r603592, xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/GridUnit.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/fo/flow/table/PrimaryGridUnit.java
- copied unchanged from r603592, xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/PrimaryGridUnit.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/fo/flow/table/SeparateBorderResolver.java
- copied unchanged from r603592, xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/SeparateBorderResolver.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/layoutmgr/inline/AbstractPageNumberCitationLayoutManager.java
- copied unchanged from r603592, xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/AbstractPageNumberCitationLayoutManager.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/AFPGraphics2D.java
- copied unchanged from r603592, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPGraphics2D.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/AFPGraphicsConfiguration.java
- copied unchanged from r603592, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPGraphicsConfiguration.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/AFPGraphicsDevice.java
- copied unchanged from r603592, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPGraphicsDevice.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/AFPInfo.java
- copied unchanged from r603592, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPInfo.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/AFPPageFonts.java
- copied unchanged from r603592, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPPageFonts.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/AFPState.java
- copied unchanged from r603592, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPState.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/AFPTextElementBridge.java
- copied unchanged from r603592, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPTextElementBridge.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/AFPTextHandler.java
- copied unchanged from r603592, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPTextHandler.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/AFPTextPainter.java
- copied unchanged from r603592, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPTextPainter.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/modca/AbstractDataObject.java
- copied unchanged from r603592, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/AbstractDataObject.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/modca/AbstractStructuredAFPObject.java
- copied unchanged from r603592, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/AbstractStructuredAFPObject.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/modca/GraphicsDataDescriptor.java
- copied unchanged from r603592, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/GraphicsDataDescriptor.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/modca/GraphicsObject.java
- copied unchanged from r603592, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/GraphicsObject.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/modca/PreparedAFPObject.java
- copied unchanged from r603592, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/PreparedAFPObject.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/modca/goca/
- copied from r603592, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/goca/
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/modca/goca/AbstractGraphicsContainer.java
- copied unchanged from r603592, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/goca/AbstractGraphicsContainer.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/modca/goca/AbstractGraphicsCoord.java
- copied unchanged from r603592, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/goca/AbstractGraphicsCoord.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/modca/goca/AbstractPreparedAFPObject.java
- copied unchanged from r603592, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/goca/AbstractPreparedAFPObject.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/modca/goca/GraphicsArea.java
- copied unchanged from r603592, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/goca/GraphicsArea.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/modca/goca/GraphicsBox.java
- copied unchanged from r603592, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/goca/GraphicsBox.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/modca/goca/GraphicsChainedSegment.java
- copied unchanged from r603592, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/goca/GraphicsChainedSegment.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/modca/goca/GraphicsData.java
- copied unchanged from r603592, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/goca/GraphicsData.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/modca/goca/GraphicsFillet.java
- copied unchanged from r603592, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/goca/GraphicsFillet.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/modca/goca/GraphicsFullArc.java
- copied unchanged from r603592, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/goca/GraphicsFullArc.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/modca/goca/GraphicsImageBegin.java
- copied unchanged from r603592, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/goca/GraphicsImageBegin.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/modca/goca/GraphicsImageData.java
- copied unchanged from r603592, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/goca/GraphicsImageData.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/modca/goca/GraphicsImageEnd.java
- copied unchanged from r603592, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/goca/GraphicsImageEnd.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/modca/goca/GraphicsLine.java
- copied unchanged from r603592, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/goca/GraphicsLine.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/modca/goca/GraphicsSetArcParameters.java
- copied unchanged from r603592, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/goca/GraphicsSetArcParameters.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/modca/goca/GraphicsSetCharacterSet.java
- copied unchanged from r603592, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/goca/GraphicsSetCharacterSet.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/modca/goca/GraphicsSetCurrentPosition.java
- copied unchanged from r603592, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/goca/GraphicsSetCurrentPosition.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/modca/goca/GraphicsSetLineType.java
- copied unchanged from r603592, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/goca/GraphicsSetLineType.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/modca/goca/GraphicsSetLineWidth.java
- copied unchanged from r603592, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/goca/GraphicsSetLineWidth.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/modca/goca/GraphicsSetPatternSymbol.java
- copied unchanged from r603592, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/goca/GraphicsSetPatternSymbol.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/modca/goca/GraphicsSetProcessColor.java
- copied unchanged from r603592, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/goca/GraphicsSetProcessColor.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/modca/goca/GraphicsString.java
- copied unchanged from r603592, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/goca/GraphicsString.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/layoutengine/standard-testcases/block_border_bug43917.xml
- copied unchanged from r603592, xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_border_bug43917.xml
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/layoutengine/standard-testcases/bookmarks_2.xml
- copied unchanged from r603592, xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/bookmarks_2.xml
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/layoutengine/standard-testcases/table_border-collapse_collapse_nrnc_no-col.xml
- copied unchanged from r603592, xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table_border-collapse_collapse_nrnc_no-col.xml
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/layoutengine/standard-testcases/table_border-collapse_collapse_resolution.xml
- copied unchanged from r603592, xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table_border-collapse_collapse_resolution.xml
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/layoutengine/standard-testcases/table_border-collapse_collapse_resolution_no-col.xml
- copied unchanged from r603592, xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table_border-collapse_collapse_resolution_no-col.xml
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/layoutengine/standard-testcases/table_border-collapse_collapse_spans_2_no-col.xml
- copied unchanged from r603592, xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table_border-collapse_collapse_spans_2_no-col.xml
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/layoutengine/standard-testcases/table_empty-cells.xml
- copied unchanged from r603592, xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table_empty-cells.xml
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/resources/META-INF/
- copied from r603592, xmlgraphics/fop/trunk/test/resources/META-INF/
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/resources/META-INF/MANIFEST.MF
- copied unchanged from r603592, xmlgraphics/fop/trunk/test/resources/META-INF/MANIFEST.MF
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/resources/fonts/DejaVuLGCSerif.LICENSE
- copied unchanged from r603592, xmlgraphics/fop/trunk/test/resources/fonts/DejaVuLGCSerif.LICENSE
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/resources/fonts/DejaVuLGCSerif.ttf
- copied unchanged from r603592, xmlgraphics/fop/trunk/test/resources/fonts/DejaVuLGCSerif.ttf
Removed:
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/layoutmgr/table/EffRow.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/layoutmgr/table/EmptyGridUnit.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/layoutmgr/table/GridUnit.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/layoutmgr/table/PrimaryGridUnit.java
Modified:
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/ (props changed)
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/examples/fo/basic/images.fo
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/lib/xmlgraphics-commons-1.3svn.jar
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/documentation/content/xdocs/fo.xml
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/documentation/content/xdocs/news.xml
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/documentation/content/xdocs/trunk/fonts.xml
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/documentation/skinconf.xml
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/area/AreaTreeHandler.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/area/BookmarkData.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/fo/FOEventHandler.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/fo/flow/PageNumberCitation.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/fo/flow/PageNumberCitationLast.java (contents, props changed)
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/fo/flow/RetrieveMarker.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/fo/flow/table/FixedColRowGroupBuilder.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/fo/flow/table/RowGroupBuilder.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/fo/flow/table/Table.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/fo/flow/table/TableBody.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/fo/flow/table/TableCell.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/fo/flow/table/TableCellContainer.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/fo/flow/table/TableColumn.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/fo/flow/table/TableFObj.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/fo/flow/table/TableFooter.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/fo/flow/table/TableHeader.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/fo/flow/table/TableRow.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/fo/flow/table/VariableColRowGroupBuilder.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/fo/properties/ColorProperty.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/fo/properties/PropertyCache.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/fonts/FontLoader.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/fonts/LazyFont.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/fonts/MutableFont.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/fonts/type1/PFMFile.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/layoutmgr/BreakElement.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/layoutmgr/FlowLayoutManager.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/layoutmgr/LayoutContext.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/layoutmgr/SpaceResolver.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/layoutmgr/inline/PageNumberCitationLastLayoutManager.java (contents, props changed)
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/layoutmgr/inline/PageNumberCitationLayoutManager.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/layoutmgr/table/ActiveCell.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/layoutmgr/table/CollapsingBorderModel.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/layoutmgr/table/CollapsingBorderModelEyeCatching.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/layoutmgr/table/GridUnitPart.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/layoutmgr/table/RowGroupLayoutManager.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/layoutmgr/table/RowPainter.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/layoutmgr/table/TableContentPosition.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/layoutmgr/table/TableRowIterator.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/layoutmgr/table/TableStepper.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/PrintRendererConfigurator.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/AFPFontAttributes.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/AFPRenderer.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/AFPRendererConfigurator.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/AFPRendererContextConstants.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/AFPSVGHandler.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/exceptions/NestedRuntimeException.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/extensions/AFPAttribute.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/extensions/AFPElementMapping.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/extensions/AFPExtensionHandler.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/fonts/AFPFontReader.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/fonts/CharacterSet.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/fonts/CharacterSetOrientation.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/fonts/FopCharacterSet.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/fonts/OutlineFont.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/fonts/RasterFont.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/modca/AFPConstants.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/modca/AFPDataStream.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/modca/AbstractAFPObject.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/modca/AbstractDescriptor.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/modca/AbstractNamedAFPObject.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/modca/AbstractPageObject.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/modca/ActiveEnvironmentGroup.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/modca/ImageCellPosition.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/modca/ImageContent.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/modca/ImageDataDescriptor.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/modca/ImageInputDescriptor.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/modca/ImageObject.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/modca/ImageOutputControl.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/modca/ImageRasterData.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/modca/ImageRasterPattern.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/modca/ImageSegment.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/modca/ImageSizeParameter.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/modca/MapCodedFont.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/modca/MapPageOverlay.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/modca/MaximumSizeExceededException.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/modca/ObjectAreaDescriptor.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/modca/ObjectAreaPosition.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/modca/ObjectEnvironmentGroup.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/modca/PageDescriptor.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/modca/PageObject.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/modca/PresentationTextData.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/modca/PresentationTextDescriptor.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/modca/PresentationTextObject.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/modca/TagLogicalElement.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/modca/TagLogicalElementBean.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/tools/BinaryUtils.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/tools/DTDEntityResolver.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/afp/tools/StructuredFieldReader.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/pdf/PDFSVGHandler.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/ps/AbstractPSTranscoder.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/ps/NativeTextHandler.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/ps/PSTextPainter.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/svg/PDFGraphicsDevice.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/status.xml
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/fotree/unittests/table/RowGroupBuilder_no-row_simple.fo (props changed)
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/fotree/unittests/table/RowGroupBuilder_no-row_spans.fo (props changed)
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/java/org/apache/fop/memory/MemoryEater.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/layoutengine/disabled-testcases.xml
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/layoutengine/standard-testcases/page-production_empty_block_only.xml
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/layoutengine/standard-testcases/table-cell_block_break-after.xml
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/layoutengine/standard-testcases/table-cell_conditional-spaces_1.xml
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/layoutengine/standard-testcases/table_border-collapse_collapse_spans_2.xml
Propchange: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Dec 12 08:13:06 2007
@@ -1 +1 @@
-/xmlgraphics/fop/trunk:1-594557
+/xmlgraphics/fop/trunk:1-603642
Modified: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/examples/fo/basic/images.fo
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImagePackageRedesign/examples/fo/basic/images.fo?rev=603656&r1=603655&r2=603656&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/examples/fo/basic/images.fo (original)
+++ xmlgraphics/fop/branches/Temp_ImagePackageRedesign/examples/fo/basic/images.fo Wed Dec 12 08:13:06 2007
@@ -146,6 +146,21 @@
<fo:block keep-with-next.within-column="always">Properties: width="60mm" content-width="scale-to-fit"</fo:block>
<fo:block><fo:external-graphic src="../graphics/asf-logo-nt.png" width="60mm" content-width="scale-to-fit" border="solid 0.1pt" background-color="yellow"/></fo:block>
+
+ <fo:block break-before="page"/>
+ <fo:block keep-with-next.within-column="always">Properties: width="100%" content-width="scale-to-fit"</fo:block>
+ <fo:block><fo:external-graphic src="../graphics/asf-logo-nt.png" width="100%" content-width="scale-to-fit" border="solid 0.1pt" background-color="yellow"/></fo:block>
+ <fo:block space-before="0.5em">
+ The following example shows how to fit an oversized image into the
+ available width, but not scale smaller images up. This is a work-around
+ until "scale-down-to-fit" is supported. The second feather below is in
+ a block-container with a width of 40mm to simulate an oversized image.
+ </fo:block>
+ <fo:block keep-with-next.within-column="always">Properties: width="100%" content-width="scale-to-fit" content-height="100%"</fo:block>
+ <fo:block><fo:external-graphic src="../graphics/asf-logo-nt.png" width="100%" content-width="scale-to-fit" content-height="100%" border="solid 0.1pt" background-color="yellow"/></fo:block>
+ <fo:block-container width="40mm" background-color="lightgray">
+ <fo:block><fo:external-graphic src="../graphics/asf-logo-nt.png" width="100%" content-width="scale-to-fit" content-height="100%" border="solid 0.1pt" background-color="yellow"/></fo:block>
+ </fo:block-container>
</fo:block>
</fo:flow>
Modified: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/lib/xmlgraphics-commons-1.3svn.jar
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImagePackageRedesign/lib/xmlgraphics-commons-1.3svn.jar?rev=603656&r1=603655&r2=603656&view=diff
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/documentation/content/xdocs/fo.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/documentation/content/xdocs/fo.xml?rev=603656&r1=603655&r2=603656&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/documentation/content/xdocs/fo.xml (original)
+++ xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/documentation/content/xdocs/fo.xml Wed Dec 12 08:13:06 2007
@@ -362,9 +362,14 @@
<section id="fo-total-pages">
<title>Total Document Pages</title>
<p>
- It is frequently desirable to know the total number of pages in a document and to use that number within the document.
-For example, you might wish to show the page number on the first page as being "page 1 of 12".
-To accomplish this, place an empty block with an id at the end of the flow:
+ It is frequently desirable to know the total number of pages in a
+ document and to use that number within the document. For example, you
+ might wish to show the page number on the first page as being
+ "page 1 of 12".
+ </p>
+ <p>
+ To accomplish this in <strong>XSL 1.0</strong>, place an empty block
+ with an id at the end of the flow:
</p>
<source><![CDATA[<fo:flow ...>
...
@@ -373,10 +378,20 @@
<p>
Get the number of the last page as follows:
</p>
- <source><![CDATA[ <fo:page-number-citation ref-id="last-page"/>]]></source>
+ <source><![CDATA[<fo:page-number-citation ref-id="last-page"/>]]></source>
<p>
This does not work in certain situations: multiple page sequences, an initial page number other than 1, or forcing a certain page count, thereby producing blank pages at the end.
</p>
+ <p>
+ In <strong>XSL 1.1</strong>, you get another option to do this: make
+ sure an "id" is set on the page-sequence and reference it using
+ fo:page-number-citation-last. First, the page-sequence:
+ </p>
+ <source><![CDATA[<fo:page-sequence id="seq1" ...]]></source>
+ <p>
+ After that, reference the last page the page-sequence generates:
+ </p>
+ <source><![CDATA[<fo:page-number-citation-last ref-id="seq1"/>]]></source>
<warning>
There is no reliable way to get the real total page count with FO mechanisms. You can only get <em>page numbers</em>.
</warning>
@@ -394,27 +409,42 @@
class rendtest {
+ private static FopFactory fopFactory = FopFactory.newInstance();
+ private static TransformerFactory tFactory = TransformerFactory.newInstance();
+
public static void main(String args[]) {
+ OutputStream out;
try {
- Driver driver=new Driver();
- driver.setOutputStream(new FileOutputStream(args[2]));
- driver.setRenderer(Driver.RENDER_PDF);
- Transformer transformer=TransformerFactory.newInstance()
- .newTransformer(new StreamSource(new File(args[1])));
- transformer.setParameter("page-count","#");
+ //Load the stylesheet
+ Templates templates = tFactory.newTemplates(
+ new StreamSource(new File(args[1])));
+
+ //First run (to /dev/null)
+ out = new org.apache.commons.io.output.NullOutputStream();
+ FOUserAgent foUserAgent = fopFactory.newFOUserAgent();
+ Fop fop = fopFactory.newFop(MimeConstants.MIME_PDF, foUserAgent, out);
+ Transformer transformer = templates.newTransformer();
+ transformer.setParameter("page-count", "#");
transformer.transform(new StreamSource(new File(args[0])),
- new SAXResult(driver.getContentHandler()));
- String pageCount=Integer.toString(driver.getResults().getPageCount());
- driver=new Driver();
- driver.setOutputStream(new FileOutputStream(args[2]));
- driver.setRenderer(Driver.RENDER_PDF);
- transformer=TransformerFactory.newInstance()
- .newTransformer(new StreamSource(new File(args[1])));
- transformer.setParameter("page-count",pageCount);
+ new SAXResult(fop.getDefaultHandler()));
+
+ //Get total page count
+ String pageCount = Integer.toString(driver.getResults().getPageCount());
+
+ //Second run (the real thing)
+ out = new java.io.FileOutputStream(args[2]);
+ out = new java.io.BufferedOutputStream(out);
+ try {
+ foUserAgent = fopFactory.newFOUserAgent();
+ fop = fopFactory.newFop(MimeConstants.MIME_PDF, foUserAgent, out);
+ transformer = templates.newTransformer();
+ transformer.setParameter("page-count", pageCount);
transformer.transform(new StreamSource(new File(args[0])),
- new SAXResult(driver.getContentHandler()));
- }
- catch( Exception e) {
+ new SAXResult(fop.getDefaultHandler()));
+ } finally {
+ out.close();
+ }
+ } catch( Exception e) {
e.printStackTrace();
}
}
Modified: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/documentation/content/xdocs/news.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/documentation/content/xdocs/news.xml?rev=603656&r1=603655&r2=603656&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/documentation/content/xdocs/news.xml (original)
+++ xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/documentation/content/xdocs/news.xml Wed Dec 12 08:13:06 2007
@@ -26,6 +26,10 @@
</header>
<body>
<section>
+ <title>30 October 2007 - New Committer</title>
+ <p>Welcome Max Berger!</p>
+ </section>
+ <section>
<title>15 October 2007 - New Committer</title>
<p>Welcome Adrian Cumiskey!</p>
</section>
Modified: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/documentation/content/xdocs/trunk/fonts.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/documentation/content/xdocs/trunk/fonts.xml?rev=603656&r1=603655&r2=603656&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/documentation/content/xdocs/trunk/fonts.xml (original)
+++ xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/documentation/content/xdocs/trunk/fonts.xml Wed Dec 12 08:13:06 2007
@@ -25,6 +25,7 @@
<person name="Jeremias Märki" email=""/>
<person name="Tore Engvig" email=""/>
<person name="Adrian Cumiskey" email=""/>
+ <person name="Max Berger" email=""/>
</authors>
</header>
<body>
@@ -301,6 +302,16 @@
</li>
</ul>
<!--note>Cocoon users will need to setup the config, see FOPSerializer for more information.</note-->
+ </section>
+ <section id="autodetect">
+ <title>Auto-Detect and auto-embedd feature</title>
+ <p>When the "auto-detect" flag is set in the configuration, FOP will automatically search for fonts in the default paths for your operating system.</p>
+ <p>FOP will also auto-detect fonts which are available in the classpath, if they are described as "application/x-font" in the MANIFEST.MF file. For example, if your .jar file contains font/myfont.ttf:</p>
+ <source>Manifest-Version: 1.0
+
+Name: font/myfont.ttf
+Content-Type: application/x-font</source>
+ <p>This feature allows you to create JAR files containing fonts. The JAR files can be added to fop by providem them in the classpath, e.g. copying them into the lib/ directory.</p>
</section>
<section id="embedding">
<title>Embedding</title>
Modified: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/documentation/skinconf.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/documentation/skinconf.xml?rev=603656&r1=603655&r2=603656&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/documentation/skinconf.xml (original)
+++ xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/documentation/skinconf.xml Wed Dec 12 08:13:06 2007
@@ -369,20 +369,6 @@
<height>31</height>
</credit>
<credit box-location="alt2">
- <name>ApacheCon US 2007 (Atlanta)</name>
- <url>http://apachecon.com/2007/US/</url>
- <image>http://www.apache.org/ads/ApacheCon/2007-usa-125x125.png</image>
- <width>125</width>
- <height>125</height>
- </credit>
- <credit box-location="alt2">
- <name>OS Summit Asia 2007</name>
- <url>http://www.ossummit.com/</url>
- <image>http://www.ossummit.com/ads/ossummit_button_3.jpg</image>
- <width>125</width>
- <height>125</height>
- </credit>
- <credit box-location="alt2">
<name>ApacheCon Europe 2008</name>
<url>http://eu.apachecon.com/</url>
<image>http://apache.org/ads/ApacheCon/2008-europe-125x125.png</image>
Modified: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/area/AreaTreeHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/area/AreaTreeHandler.java?rev=603656&r1=603655&r2=603656&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/area/AreaTreeHandler.java (original)
+++ xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/area/AreaTreeHandler.java Wed Dec 12 08:13:06 2007
@@ -21,30 +21,27 @@
// Java
import java.io.OutputStream;
-import java.util.List;
import java.util.Iterator;
+import java.util.List;
-// XML
import org.xml.sax.SAXException;
-// Apache
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+
import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.apps.FormattingResults;
import org.apache.fop.datatypes.Numeric;
import org.apache.fop.fo.FOEventHandler;
import org.apache.fop.fo.extensions.ExtensionAttachment;
+import org.apache.fop.fo.extensions.destination.Destination;
import org.apache.fop.fo.pagination.PageSequence;
import org.apache.fop.fo.pagination.Root;
import org.apache.fop.fo.pagination.bookmarks.BookmarkTree;
-import org.apache.fop.layoutmgr.PageSequenceLayoutManager;
import org.apache.fop.layoutmgr.LayoutManagerMaker;
import org.apache.fop.layoutmgr.LayoutManagerMapping;
-
-import org.apache.fop.area.DestinationData;
-import org.apache.fop.fo.extensions.destination.Destination;
+import org.apache.fop.layoutmgr.PageSequenceLayoutManager;
/**
* Area tree handler for formatting objects.
@@ -261,25 +258,26 @@
finishPrevPageSequence(null);
// process fox:destination elements
- List destinationList = rootFObj.getDestinationList();
- if (destinationList != null) {
- while (destinationList.size() > 0) {
- Destination destination = (Destination) destinationList.remove(0);
- DestinationData destinationData = new DestinationData(destination);
- addOffDocumentItem(destinationData);
+ if (rootFObj != null) {
+ List destinationList = rootFObj.getDestinationList();
+ if (destinationList != null) {
+ while (destinationList.size() > 0) {
+ Destination destination = (Destination) destinationList.remove(0);
+ DestinationData destinationData = new DestinationData(destination);
+ addOffDocumentItem(destinationData);
+ }
}
- }
- // process fo:bookmark-tree
- BookmarkTree bookmarkTree = rootFObj.getBookmarkTree();
- if (bookmarkTree != null) {
- BookmarkData data = new BookmarkData(bookmarkTree);
- addOffDocumentItem(data);
- if (!data.isResolved()) {
- // bookmarks did not fully resolve, add anyway. (hacky? yeah)
- model.handleOffDocumentItem(data);
+ // process fo:bookmark-tree
+ BookmarkTree bookmarkTree = rootFObj.getBookmarkTree();
+ if (bookmarkTree != null) {
+ BookmarkData data = new BookmarkData(bookmarkTree);
+ addOffDocumentItem(data);
+ if (!data.isResolved()) {
+ // bookmarks did not fully resolve, add anyway. (hacky? yeah)
+ model.handleOffDocumentItem(data);
+ }
}
}
-
model.endDocument();
if (statistics != null) {
Modified: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/area/BookmarkData.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/area/BookmarkData.java?rev=603656&r1=603655&r2=603656&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/area/BookmarkData.java (original)
+++ xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/area/BookmarkData.java Wed Dec 12 08:13:06 2007
@@ -19,11 +19,13 @@
package org.apache.fop.area;
+import java.util.Collection;
+import java.util.Iterator;
import java.util.List;
-import java.util.HashMap;
+import java.util.Map;
-import org.apache.fop.fo.pagination.bookmarks.BookmarkTree;
import org.apache.fop.fo.pagination.bookmarks.Bookmark;
+import org.apache.fop.fo.pagination.bookmarks.BookmarkTree;
/**
* An instance of this class is either a PDF bookmark-tree and
@@ -31,6 +33,7 @@
* child bookmark-items under it.
*/
public class BookmarkData extends AbstractOffDocumentItem implements Resolvable {
+
private List subData = new java.util.ArrayList();
// bookmark-title for this fo:bookmark
@@ -46,7 +49,7 @@
private PageViewport pageRef = null;
// unresolved idrefs by this bookmark and child bookmarks below it
- private HashMap unresolvedIDRefs = new HashMap();
+ private Map unresolvedIDRefs = new java.util.HashMap();
/**
* Create a new bookmark data object.
@@ -79,9 +82,17 @@
bookmarkTitle = bookmark.getBookmarkTitle();
bShow = bookmark.showChildItems();
this.idRef = bookmark.getInternalDestination();
- unresolvedIDRefs.put(idRef, this);
}
+ private void putUnresolved(String id, BookmarkData bd) {
+ List refs = (List)unresolvedIDRefs.get(id);
+ if (refs == null) {
+ refs = new java.util.ArrayList();
+ unresolvedIDRefs.put(id, refs);
+ }
+ refs.add(bd);
+ }
+
/**
* Create a new bookmark data root object.
* This constructor is called by the AreaTreeParser when the
@@ -128,10 +139,10 @@
public void addSubData(BookmarkData sub) {
subData.add(sub);
if (sub.pageRef == null || sub.pageRef.equals("")) {
- unresolvedIDRefs.put(sub.getIDRef(), sub);
+ putUnresolved(sub.getIDRef(), sub);
String[] ids = sub.getIDRefs();
for (int count = 0; count < ids.length; count++) {
- unresolvedIDRefs.put(ids[count], sub);
+ putUnresolved(ids[count], sub);
}
}
}
@@ -212,9 +223,13 @@
*/
public void resolveIDRef(String id, List pages) {
if (!id.equals(idRef)) {
- BookmarkData bd = (BookmarkData) unresolvedIDRefs.get(id);
- if (bd != null) {
- bd.resolveIDRef(id, pages);
+ Collection refs = (Collection)unresolvedIDRefs.get(id);
+ if (refs != null) {
+ Iterator iter = refs.iterator();
+ while (iter.hasNext()) {
+ BookmarkData bd = (BookmarkData)iter.next();
+ bd.resolveIDRef(id, pages);
+ }
unresolvedIDRefs.remove(id);
}
} else {
Modified: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/fo/FOEventHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/fo/FOEventHandler.java?rev=603656&r1=603655&r2=603656&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/fo/FOEventHandler.java (original)
+++ xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/fo/FOEventHandler.java Wed Dec 12 08:13:06 2007
@@ -19,12 +19,11 @@
package org.apache.fop.fo;
-// Java
import java.util.HashSet;
import java.util.Set;
+
import org.xml.sax.SAXException;
-// Apache
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.fo.flow.BasicLink;
import org.apache.fop.fo.flow.Block;
@@ -39,6 +38,8 @@
import org.apache.fop.fo.flow.ListBlock;
import org.apache.fop.fo.flow.ListItem;
import org.apache.fop.fo.flow.PageNumber;
+import org.apache.fop.fo.flow.PageNumberCitation;
+import org.apache.fop.fo.flow.PageNumberCitationLast;
import org.apache.fop.fo.flow.table.Table;
import org.apache.fop.fo.flow.table.TableBody;
import org.apache.fop.fo.flow.table.TableCell;
@@ -48,7 +49,6 @@
import org.apache.fop.fo.pagination.PageSequence;
import org.apache.fop.fonts.FontInfo;
-
/**
* Abstract class defining what should be done with SAX events that map to
* XSL-FO input. The events are actually captured by fo/FOTreeBuilder, passed
@@ -204,6 +204,34 @@
* @param pagenum PageNumber that is ending.
*/
public void endPageNumber(PageNumber pagenum) {
+ }
+
+ /**
+ *
+ * @param pageCite PageNumberCitation that is starting.
+ */
+ public void startPageNumberCitation(PageNumberCitation pageCite) {
+ }
+
+ /**
+ *
+ * @param pageCite PageNumberCitation that is ending.
+ */
+ public void endPageNumberCitation(PageNumberCitation pageCite) {
+ }
+
+ /**
+ *
+ * @param pageLast PageNumberCitationLast that is starting.
+ */
+ public void startPageNumberCitationLast(PageNumberCitationLast pageLast) {
+ }
+
+ /**
+ *
+ * @param pageLast PageNumberCitationLast that is ending.
+ */
+ public void endPageNumberCitationLast(PageNumberCitationLast pageLast) {
}
/**
Modified: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/fo/flow/PageNumberCitation.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/fo/flow/PageNumberCitation.java?rev=603656&r1=603655&r2=603656&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/fo/flow/PageNumberCitation.java (original)
+++ xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/fo/flow/PageNumberCitation.java Wed Dec 12 08:13:06 2007
@@ -19,21 +19,8 @@
package org.apache.fop.fo.flow;
-import java.awt.Color;
-
-import org.xml.sax.Locator;
-
import org.apache.fop.apps.FOPException;
-import org.apache.fop.datatypes.Length;
-import org.apache.fop.fo.Constants;
import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.FObj;
-import org.apache.fop.fo.PropertyList;
-import org.apache.fop.fo.ValidationException;
-import org.apache.fop.fo.properties.CommonBorderPaddingBackground;
-import org.apache.fop.fo.properties.CommonFont;
-import org.apache.fop.fo.properties.CommonTextDecoration;
-import org.apache.fop.fo.properties.SpaceProperty;
/**
* Class modelling the fo:page-number-citation object.
@@ -41,146 +28,28 @@
* The page number used is the page that contains the start of the
* block referenced with the ref-id attribute.
*/
-public class PageNumberCitation extends FObj {
- // The value of properties relevant for fo:page-number-citation.
- private CommonBorderPaddingBackground commonBorderPaddingBackground;
- private CommonFont commonFont;
- private Length alignmentAdjust;
- private int alignmentBaseline;
- private Length baselineShift;
- private int dominantBaseline;
- // private ToBeImplementedProperty letterSpacing;
- private SpaceProperty lineHeight;
- private String refId;
- /** Holds the text decoration values. May be null */
- private CommonTextDecoration textDecoration;
- // private ToBeImplementedProperty textShadow;
- // Unused but valid items, commented out for performance:
- // private CommonAccessibility commonAccessibility;
- // private CommonAural commonAural;
- // private CommonMarginInline commonMarginInline;
- // private CommonRelativePosition commonRelativePosition;
- // private KeepProperty keepWithNext;
- // private KeepProperty keepWithPrevious;
- // private int scoreSpaces;
- // private Length textAltitude;
- // private Length textDepth;
- // private int textTransform;
- // private int visibility;
- // private SpaceProperty wordSpacing;
- // private int wrapOption;
- // End of property values
-
- // Properties which are not explicitely listed but are still applicable
- private Color color;
+public class PageNumberCitation extends AbstractPageNumberCitation {
/**
+ * Main constructor
* @param parent FONode that is the parent of this object
*/
public PageNumberCitation(FONode parent) {
super(parent);
}
- /**
- * {@inheritDoc}
- */
- public void bind(PropertyList pList) throws FOPException {
- super.bind(pList);
- commonBorderPaddingBackground = pList.getBorderPaddingBackgroundProps();
- commonFont = pList.getFontProps();
- alignmentAdjust = pList.get(PR_ALIGNMENT_ADJUST).getLength();
- alignmentBaseline = pList.get(PR_ALIGNMENT_BASELINE).getEnum();
- baselineShift = pList.get(PR_BASELINE_SHIFT).getLength();
- dominantBaseline = pList.get(PR_DOMINANT_BASELINE).getEnum();
- // letterSpacing = pList.get(PR_LETTER_SPACING);
- lineHeight = pList.get(PR_LINE_HEIGHT).getSpace();
- refId = pList.get(PR_REF_ID).getString();
- textDecoration = pList.getTextDecorationProps();
- // textShadow = pList.get(PR_TEXT_SHADOW);
-
- // implicit properties
- color = pList.get(Constants.PR_COLOR).getColor(getUserAgent());
- }
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
protected void startOfNode() throws FOPException {
super.startOfNode();
- if (refId.equals("")) {
- missingPropertyError("ref-id");
- }
- }
-
- /**
- * {@inheritDoc}
- * XSL Content Model: empty
- */
- protected void validateChildNode(Locator loc, String nsURI, String localName)
- throws ValidationException {
- invalidChildError(loc, nsURI, localName);
- }
-
- /** @return the Common Font Properties. */
- public CommonFont getCommonFont() {
- return commonFont;
- }
-
- /** @return the "color" property. */
- public Color getColor() {
- return color;
+ getFOEventHandler().startPageNumberCitation(this);
}
- /** @return the "text-decoration" property. */
- public CommonTextDecoration getTextDecoration() {
- return textDecoration;
- }
-
- /**
- * @return the "alignment-adjust" property
- */
- public Length getAlignmentAdjust() {
- return alignmentAdjust;
- }
-
- /**
- * @return the "alignment-baseline" property
- */
- public int getAlignmentBaseline() {
- return alignmentBaseline;
- }
-
- /**
- * @return the "baseline-shift" property
- */
- public Length getBaselineShift() {
- return baselineShift;
- }
-
- /**
- * @return the "dominant-baseline" property
- */
- public int getDominantBaseline() {
- return dominantBaseline;
- }
-
- /** @return the Common Border, Padding, and Background Properties. */
- public CommonBorderPaddingBackground getCommonBorderPaddingBackground() {
- return commonBorderPaddingBackground;
+ /** {@inheritDoc} */
+ protected void endOfNode() throws FOPException {
+ super.endOfNode();
+ getFOEventHandler().endPageNumberCitation(this);
}
- /**
- * @return the "line-height" property
- */
- public SpaceProperty getLineHeight() {
- return lineHeight;
- }
-
- /** @return the "ref-id" property. */
- public String getRefId() {
- return refId;
- }
-
/** {@inheritDoc} */
public String getLocalName() {
return "page-number-citation";
Modified: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/fo/flow/PageNumberCitationLast.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/fo/flow/PageNumberCitationLast.java?rev=603656&r1=603655&r2=603656&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/fo/flow/PageNumberCitationLast.java (original)
+++ xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/fo/flow/PageNumberCitationLast.java Wed Dec 12 08:13:06 2007
@@ -19,6 +19,7 @@
package org.apache.fop.fo.flow;
+import org.apache.fop.apps.FOPException;
import org.apache.fop.fo.FONode;
/**
@@ -28,7 +29,7 @@
* block referenced with the ref-id attribute.
* @since XSL 1.1
*/
-public class PageNumberCitationLast extends PageNumberCitation {
+public class PageNumberCitationLast extends AbstractPageNumberCitation {
/**
* Main constructor
@@ -39,6 +40,18 @@
}
/** {@inheritDoc} */
+ protected void startOfNode() throws FOPException {
+ super.startOfNode();
+ getFOEventHandler().startPageNumberCitationLast(this);
+ }
+
+ /** {@inheritDoc} */
+ protected void endOfNode() throws FOPException {
+ super.endOfNode();
+ getFOEventHandler().endPageNumberCitationLast(this);
+ }
+
+ /** {@inheritDoc} */
public String getLocalName() {
return "page-number-citation-last";
}
@@ -47,4 +60,5 @@
public int getNameId() {
return FO_PAGE_NUMBER_CITATION_LAST;
}
+
}
Propchange: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/fo/flow/PageNumberCitationLast.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/fo/flow/RetrieveMarker.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/fo/flow/RetrieveMarker.java?rev=603656&r1=603655&r2=603656&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/fo/flow/RetrieveMarker.java (original)
+++ xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/fo/flow/RetrieveMarker.java Wed Dec 12 08:13:06 2007
@@ -23,12 +23,13 @@
import org.apache.fop.apps.FOPException;
import org.apache.fop.fo.FONode;
+import org.apache.fop.fo.FOText;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.FObjMixed;
-import org.apache.fop.fo.FOText;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.fo.ValidationException;
import org.apache.fop.fo.flow.table.Table;
+import org.apache.fop.fo.flow.table.TableFObj;
import org.xml.sax.Locator;
/**
@@ -126,6 +127,12 @@
getLocator(),
pList,
newPropertyList);
+ if (newChild instanceof TableFObj) {
+ // TODO calling startOfNode (and endOfNode, below) on other fobjs may
+ // have undesirable side-effects. This is really ugly and will need to
+ // be addressed sooner or later
+ ((TableFObj) newChild).startOfNode();
+ }
addChildTo(newChild, (FObj) newParent);
if (newChild.getNameId() == FO_TABLE) {
Table t = (Table) child;
@@ -138,6 +145,10 @@
}
cloneSubtree(child.getChildNodes(), newChild,
marker, newPropertyList);
+ if (newChild instanceof TableFObj) {
+ // TODO this is ugly
+ ((TableFObj) newChild).endOfNode();
+ }
} else if (child instanceof FOText) {
FOText ft = (FOText) newChild;
ft.bind(parentPropertyList);
Modified: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/fo/flow/table/FixedColRowGroupBuilder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/fo/flow/table/FixedColRowGroupBuilder.java?rev=603656&r1=603655&r2=603656&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/fo/flow/table/FixedColRowGroupBuilder.java (original)
+++ xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/fo/flow/table/FixedColRowGroupBuilder.java Wed Dec 12 08:13:06 2007
@@ -19,6 +19,12 @@
package org.apache.fop.fo.flow.table;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.ListIterator;
+
+import org.apache.fop.fo.ValidationException;
+
/**
* A row group builder optimised for a fixed number of columns, known before the parsing
@@ -26,10 +32,157 @@
*/
class FixedColRowGroupBuilder extends RowGroupBuilder {
+ /** Number of columns in the corresponding table. */
+ private int numberOfColumns;
+
+ private TableRow currentTableRow = null;
+
+ /** 0-based, index in the row group. */
+ private int currentRowIndex;
+
+ /** The rows belonging to this row group. List of List of {@link GridUnit}s. */
+ private List/*<List<GridUnit>>*/ rows;
+
+ private boolean firstInTable = true;
+
+ private boolean firstInPart = true;
+
+ /** The last encountered row. This is the last row of the table if it has no footer. */
+ private List lastRow;
+
+ private BorderResolver borderResolver;
+
+ private boolean inFooter;
+
+ private List lastFooterRow;
FixedColRowGroupBuilder(Table t) {
super(t);
numberOfColumns = t.getNumberOfColumns();
+ if (t.isSeparateBorderModel()) {
+ borderResolver = new SeparateBorderResolver();
+ } else {
+ borderResolver = new CollapsingBorderResolver(t);
+ }
+ initialize();
+ }
+
+ /**
+ * Prepares this builder for creating a new row group.
+ */
+ private void initialize() {
+ rows = new ArrayList();
+ currentRowIndex = 0;
}
+ /** {@inheritDoc} */
+ void addTableCell(TableCell cell) {
+ for (int i = rows.size(); i < currentRowIndex + cell.getNumberRowsSpanned(); i++) {
+ List effRow = new ArrayList(numberOfColumns);
+ for (int j = 0; j < numberOfColumns; j++) {
+ effRow.add(null);
+ }
+ rows.add(effRow);
+ }
+ int columnIndex = cell.getColumnNumber() - 1;
+ PrimaryGridUnit pgu = new PrimaryGridUnit(cell, currentTableRow,
+ table.getColumn(columnIndex), columnIndex);
+ List row = (List) rows.get(currentRowIndex);
+ row.set(columnIndex, pgu);
+ // TODO
+ GridUnit[] cellRow = new GridUnit[cell.getNumberColumnsSpanned()];
+ cellRow[0] = pgu;
+ for (int j = 1; j < cell.getNumberColumnsSpanned(); j++) {
+ GridUnit gu = new GridUnit(pgu, currentTableRow, table.getColumn(columnIndex + j),
+ columnIndex + j, j, 0);
+ row.set(columnIndex + j, gu);
+ cellRow[j] = gu;
+ }
+ pgu.addRow(cellRow);
+ for (int i = 1; i < cell.getNumberRowsSpanned(); i++) {
+ row = (List) rows.get(currentRowIndex + i);
+ cellRow = new GridUnit[cell.getNumberColumnsSpanned()];
+ for (int j = 0; j < cell.getNumberColumnsSpanned(); j++) {
+ GridUnit gu = new GridUnit(pgu, currentTableRow, table.getColumn(columnIndex + j),
+ columnIndex + j, j, i);
+ row.set(columnIndex + j, gu);
+ cellRow[j] = gu;
+ }
+ pgu.addRow(cellRow);
+ }
+ }
+
+ private static void setFlagForCols(int flag, List row) {
+ for (ListIterator iter = row.listIterator(); iter.hasNext();) {
+ ((GridUnit) iter.next()).setFlag(flag);
+ }
+ }
+
+ /** {@inheritDoc} */
+ void startRow(TableRow tableRow) {
+ currentTableRow = tableRow;
+ }
+
+ /** {@inheritDoc} */
+ void endRow(TableCellContainer container) {
+ List currentRow = (List) rows.get(currentRowIndex);
+ lastRow = currentRow;
+ // Fill gaps with empty grid units
+ for (int i = 0; i < numberOfColumns; i++) {
+ if (currentRow.get(i) == null) {
+ currentRow.set(i, new EmptyGridUnit(table, currentTableRow, currentRowIndex, i));
+ }
+ }
+ borderResolver.endRow(currentRow, container);
+ ((GridUnit) currentRow.get(0)).setFlag(GridUnit.IN_FIRST_COLUMN);
+ ((GridUnit) currentRow.get(numberOfColumns - 1)).setFlag(GridUnit.IN_LAST_COLUMN);
+ if (inFooter) {
+ lastFooterRow = currentRow;
+ } else if (firstInTable) {
+ setFlagForCols(GridUnit.FIRST_IN_TABLE, currentRow);
+ firstInTable = false;
+ }
+ if (firstInPart) {
+ setFlagForCols(GridUnit.FIRST_IN_PART, currentRow);
+ firstInPart = false;
+ }
+ if (currentRowIndex == rows.size() - 1) {
+ // Means that the current row has no cell spanning over following rows
+ container.getTablePart().addRowGroup(rows);
+ initialize();
+ } else {
+ currentRowIndex++;
+ }
+ currentTableRow = null;
+ }
+
+ /** {@inheritDoc} */
+ void startTablePart(TableBody part) {
+ firstInPart = true;
+ inFooter = part.isTableFooter();
+ borderResolver.startPart(part);
+ }
+
+ /** {@inheritDoc} */
+ void endTablePart(TableBody tableBody) throws ValidationException {
+ if (rows.size() > 0) {
+ throw new ValidationException(
+ "A table-cell is spanning more rows than available in its parent element.");
+ }
+ setFlagForCols(GridUnit.LAST_IN_PART, lastRow);
+ borderResolver.endPart(tableBody);
+ inFooter = false;
+ }
+
+ /** {@inheritDoc} */
+ void endTable(TableBody lastTablePart) {
+ List lastTableRow;
+ if (lastFooterRow != null) {
+ lastTableRow = lastFooterRow;
+ } else {
+ lastTableRow = lastRow;
+ }
+ setFlagForCols(GridUnit.LAST_IN_TABLE, lastTableRow);
+ borderResolver.endTable();
+ }
}
Modified: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/fo/flow/table/RowGroupBuilder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/fo/flow/table/RowGroupBuilder.java?rev=603656&r1=603655&r2=603656&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/fo/flow/table/RowGroupBuilder.java (original)
+++ xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/fo/flow/table/RowGroupBuilder.java Wed Dec 12 08:13:06 2007
@@ -19,12 +19,7 @@
package org.apache.fop.fo.flow.table;
-import java.util.ArrayList;
-import java.util.List;
-
import org.apache.fop.fo.ValidationException;
-import org.apache.fop.layoutmgr.table.GridUnit;
-import org.apache.fop.layoutmgr.table.PrimaryGridUnit;
/**
* A class that creates groups of rows belonging to a same set of spans. The first row of
@@ -34,16 +29,7 @@
*/
abstract class RowGroupBuilder {
- /** Number of columns in the corresponding table. */
- protected int numberOfColumns;
-
- /** 0-based, index in the row group. */
- private int currentRowIndex;
-
- private Table table;
-
- /** The rows belonging to this row group. List of List of {@link GridUnit}s. */
- protected List rows;
+ protected Table table;
/**
* Creates and initialises a new builder for the given table.
@@ -52,81 +38,55 @@
*/
protected RowGroupBuilder(Table t) {
table = t;
- initialize();
}
+
/**
- * Prepares this builder for creating a new row group.
+ * Adds a table-cell to the current row-group, creating {@link GridUnit}s accordingly.
+ *
+ * @param cell the cell to add
*/
- private void initialize() {
- rows = new ArrayList();
- currentRowIndex = 0;
- }
+ abstract void addTableCell(TableCell cell);
/**
- * Adds a table-cell to the row-group, creating {@link GridUnit}s accordingly.
+ * Receives notification of the start of an fo:table-row element.
*
- * @param cell
+ * @param tableRow the row being started
*/
- void addTableCell(TableCell cell) {
- for (int i = rows.size(); i < currentRowIndex + cell.getNumberRowsSpanned(); i++) {
- List effRow = new ArrayList(numberOfColumns);
- for (int j = 0; j < numberOfColumns; j++) {
- effRow.add(null);
- }
- rows.add(effRow);
- }
- int columnIndex = cell.getColumnNumber() - 1;
- PrimaryGridUnit pgu = new PrimaryGridUnit(cell, table.getColumn(columnIndex), columnIndex,
- currentRowIndex);
- List row = (List) rows.get(currentRowIndex);
- row.set(columnIndex, pgu);
- for (int j = 1; j < cell.getNumberColumnsSpanned(); j++) {
- row.set(j + columnIndex,
- new GridUnit(pgu, table.getColumn(columnIndex + j), columnIndex + j, j));
- }
- for (int i = 1; i < cell.getNumberRowsSpanned(); i++) {
- row = (List) rows.get(currentRowIndex + i);
- for (int j = 0; j < cell.getNumberColumnsSpanned(); j++) {
- row.set(j + columnIndex,
- new GridUnit(pgu, table.getColumn(columnIndex + j), columnIndex + j, j));
- }
- }
-
- }
+ abstract void startRow(TableRow tableRow);
/**
- * Signals that a table row has just ended, potentially finishing the current row
- * group.
+ * Receives notification of the end of the current row. If the current row finishes
+ * the row group, the {@link TableBody#addRowGroup(List)} method of the parent table
+ * part (i.e., the given container itself or its parent if this is a table-row) will
+ * be called
*
- * @param body the table-body containing the row. Its
- * {@link TableBody#addRowGroup(List)} method will be called if the current row group
- * is finished.
- */
- void signalRowEnd(TableBody body) {
- if (currentRowIndex == rows.size() - 1) {
- // Means that the current row has no cell spanning over following rows
- body.addRowGroup(rows);
- initialize();
- } else {
- currentRowIndex++;
- }
- }
+ * @param container the parent element of the current row
+ */
+ abstract void endRow(TableCellContainer container);
+
+ /**
+ * Receives notification of the start of a table-header/footer/body.
+ *
+ * @param part the part being started
+ */
+ abstract void startTablePart(TableBody part);
/**
- * Signals that the end of a table-header/footer/body has been reached. The current
+ * Receives notification of the end of a table-header/footer/body. The current
* row-group is checked for emptiness. This row group builder is reset for handling
* further possible table parts.
*
- * @param tableBody the table part being finished
- * @throws ValidationException if a cell is spanning further than the given table part
+ * @param tableBody the table part being ended
+ * @throws ValidationException if a row-spanning cell overflows the given table part
*/
- void signalEndOfPart(TableBody tableBody) throws ValidationException {
- if (rows.size() > 0) {
- throw new ValidationException(
- "A table-cell is spanning more rows than available in its parent element.");
- }
- initialize();
- }
+ abstract void endTablePart(TableBody tableBody) throws ValidationException;
+ /**
+ * Receives notification of the end of the table.
+ *
+ * @param lastTablePart the last part of the table
+ * @throws ValidationException if a row-spanning cell overflows one of the table's parts
+ */
+ abstract void endTable(TableBody lastTablePart) throws ValidationException;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org