Merged revisions 681296,681307 via svnmerge from
https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk
................
r681296 | jeremias | 2008-07-31 09:07:42 +0100 (Thu, 31 Jul 2008) | 12 lines
Blocked revisions 681286,681291 via svnmerge
........
r681286 | jeremias | 2008-07-31 09:15:23 +0200 (Do, 31 Jul 2008) | 1 line
Move to XML Graphics Commons 1.3.1.
........
r681291 | jeremias | 2008-07-31 09:45:13 +0200 (Do, 31 Jul 2008) | 1 line
Increase version number.
........
................
r681307 | jeremias | 2008-07-31 10:06:10 +0100 (Thu, 31 Jul 2008) | 149 lines
Merged revisions 636407-637074,637076-637118,637120-637790,637792-637856,637858-637992,637994-638047,638049-638307,638309-638315,638318-638936,638938-640888,640890-642905,642907-647402,647404-647536,647538-648983,648985-649005,649007-649013,649015-650549,650551-651301,651303-653536,653538-654452,654454-656285,656287-656523,656525-657519,657521-661579,661581-663481,663483-664691,664693-681285,681287-681290,681292-681298 via svnmerge from
https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/fop-0_95
........
r666635 | jeremias | 2008-06-11 14:18:53 +0200 (Mi, 11 Jun 2008) | 1 line
Fixed resolution handling inside AWT preview dialog.
........
r666662 | jeremias | 2008-06-11 15:33:20 +0200 (Mi, 11 Jun 2008) | 1 line
Some notes on RTF and print output.
........
r668533 | jeremias | 2008-06-17 09:57:55 +0200 (Di, 17 Jun 2008) | 2 lines
Bugzilla #45151:
Note on the "compiling" page that Ant 1.7 is required. The README file already points to this page.
........
r668534 | jeremias | 2008-06-17 09:58:40 +0200 (Di, 17 Jun 2008) | 2 lines
Update known issues.
Remove ApacheConEU logo.
........
r668550 | jeremias | 2008-06-17 10:05:22 +0200 (Di, 17 Jun 2008) | 2 lines
Bugzilla #45146:
Removed duplicate LICENSE.txt and Notice.txt from the JAR.
........
r668570 | jeremias | 2008-06-17 10:54:07 +0200 (Di, 17 Jun 2008) | 1 line
Wrong line number reported in the case of a line overflow.
........
r668641 | jeremias | 2008-06-17 14:59:25 +0200 (Di, 17 Jun 2008) | 1 line
Fixed potential NPE.
........
r669118 | jeremias | 2008-06-18 11:02:45 +0200 (Mi, 18 Jun 2008) | 4 lines
Bugzilla #44412:
Regression fix for empty pages caused by multiple collapsible breaks.
No more empty block areas if a break-before occurs on the first child of an FO to match the behaviour of tables and other FO implementations (clarification by XSL WG pending).
Added an accessor interface for break-before/-after to avoid long if..else lists in BlockStackingLayoutManager.
........
r669173 | jeremias | 2008-06-18 16:07:27 +0200 (Mi, 18 Jun 2008) | 7 lines
Bugzilla #44887:
Fixed potential multi-threading problem concerning the use of DecimalFormat.
Results from performance measurements in a separate test (operation repeated 100'000 times, exemplary):
shared static variable: ~220ms (old choice, problematic!)
always create new instance: ~480ms
ThreadLocal: ~220ms (new choice)
........
r669478 | jeremias | 2008-06-19 15:03:57 +0200 (Do, 19 Jun 2008) | 4 lines
Bugzilla #44412:
Improvements after Vincent's feedback:
Removal of the somewhat ugly Reference.
getBreakBefore() reduced to private visibility.
........
r670551 | jeremias | 2008-06-23 14:54:27 +0200 (Mo, 23 Jun 2008) | 3 lines
Use configured source and target resolution for foreign objects in RTF output.
Fixed intrinsic size calculation for SVG images when source resolution is not 72 dpi.
Fixed calculation of px2mm values in the SVG to G2D converter (used by RTF output).
........
r673750 | adelmelle | 2008-07-03 20:25:01 +0200 (Do, 03 Jul 2008) | 1 line
Fix for Bugzilla 45295 (already committed to the trunk with r672010, r672495 and r672496)
........
r674304 | jeremias | 2008-07-06 17:09:10 +0200 (So, 06 Jul 2008) | 18 lines
Bugzilla #43606:
column-width accepts percent values (proportional-column-width and % working)
Table width accepts percent values (100% of the page width as standard)
Nested tables are working
It is also possible to make nested tables with a higher depth than 3 without causing word to crash
Submitted by: Maximilan Aster <maximilian.aster.at.boc-eu.com>
Changes to the patch by Jeremias:
- Patch simplified (reuse of ColumnSetup from the layoutmgr package)
- Percentages and proportional-column-width didn't work properly in my tests -> fixed
- Adjustments for FOP code conventions
Bugzilla #43824:
page-number-citation working but has to be refreshed inside word to show the correct values
Submitted by: Maximilan Aster <maximilian.aster.at.boc-eu.com>
Changes to the patch by Jeremias:
- Adjustments for FOP code conventions
........
r674314 | jeremias | 2008-07-06 18:40:08 +0200 (So, 06 Jul 2008) | 7 lines
Bugzilla #43825:
leader supports fixed percent values for leader-length, most other properties
use-content, leader-pattern-width not implemented
Submitted by: Maximilan Aster <maximilian.aster.at.boc-eu.com>
Changes to the patch by Jeremias:
- Adjustments for FOP code conventions
........
r674317 | jeremias | 2008-07-06 18:44:43 +0200 (So, 06 Jul 2008) | 1 line
Doc update after RTF changes.
........
r675106 | jeremias | 2008-07-09 09:03:46 +0200 (Mi, 09 Jul 2008) | 2 lines
Bugzilla #45366:
Document missing feature.
........
r675150 | jeremias | 2008-07-09 14:56:41 +0200 (Mi, 09 Jul 2008) | 2 lines
Bugzilla #39980:
Fixed image scaling for RTF output.
........
r675151 | jeremias | 2008-07-09 14:57:06 +0200 (Mi, 09 Jul 2008) | 1 line
Removed unused code.
........
r675152 | jeremias | 2008-07-09 14:58:18 +0200 (Mi, 09 Jul 2008) | 1 line
Don't generate commands for default values.
........
r675707 | jeremias | 2008-07-10 21:58:27 +0200 (Do, 10 Jul 2008) | 1 line
Bugfix: -imagein didn't work because the stylesheet didn't get copied into fop.jar.
........
r680715 | jeremias | 2008-07-29 16:37:10 +0200 (Di, 29 Jul 2008) | 1 line
Found a surplus "pop state" which somehow causes a regression (fill color doesn't get properly reset) between 0.94 and 0.95. Shows in Barcode4J's fop-extension-demo.fo. The line has already been there in 0.94 but only shows in 0.95 probably due to an additional save/restore state pair added in PDFRenderer for reference areas after the block-container area refactoring.
........
r680820 | jeremias | 2008-07-29 22:02:14 +0200 (Di, 29 Jul 2008) | 2 lines
Bugzilla #41306:
The AWT Renderer is really not out-of-order capable.
........
r681284 | jeremias | 2008-07-31 08:47:49 +0200 (Do, 31 Jul 2008) | 1 line
Some updates to status.xml (I was not the only one working on the final release).
........
r681290 | jeremias | 2008-07-31 09:44:51 +0200 (Do, 31 Jul 2008) | 2 lines
Website updates for the 0.95 release.
The projectInfo plug-in of Forrest is not ideal for doing a bugfix release. It's not possible to combine the changes for two releases.
........
r681292 | jeremias | 2008-07-31 09:47:13 +0200 (Do, 31 Jul 2008) | 1 line
Disabling the ApacheCon ad for the release build.
........
................
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_AFPGOCAResources@681410 13f79535-47bb-0310-9956-ffa450edef68
16 년 전 Merged revisions 681296,681307 via svnmerge from
https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk
................
r681296 | jeremias | 2008-07-31 09:07:42 +0100 (Thu, 31 Jul 2008) | 12 lines
Blocked revisions 681286,681291 via svnmerge
........
r681286 | jeremias | 2008-07-31 09:15:23 +0200 (Do, 31 Jul 2008) | 1 line
Move to XML Graphics Commons 1.3.1.
........
r681291 | jeremias | 2008-07-31 09:45:13 +0200 (Do, 31 Jul 2008) | 1 line
Increase version number.
........
................
r681307 | jeremias | 2008-07-31 10:06:10 +0100 (Thu, 31 Jul 2008) | 149 lines
Merged revisions 636407-637074,637076-637118,637120-637790,637792-637856,637858-637992,637994-638047,638049-638307,638309-638315,638318-638936,638938-640888,640890-642905,642907-647402,647404-647536,647538-648983,648985-649005,649007-649013,649015-650549,650551-651301,651303-653536,653538-654452,654454-656285,656287-656523,656525-657519,657521-661579,661581-663481,663483-664691,664693-681285,681287-681290,681292-681298 via svnmerge from
https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/fop-0_95
........
r666635 | jeremias | 2008-06-11 14:18:53 +0200 (Mi, 11 Jun 2008) | 1 line
Fixed resolution handling inside AWT preview dialog.
........
r666662 | jeremias | 2008-06-11 15:33:20 +0200 (Mi, 11 Jun 2008) | 1 line
Some notes on RTF and print output.
........
r668533 | jeremias | 2008-06-17 09:57:55 +0200 (Di, 17 Jun 2008) | 2 lines
Bugzilla #45151:
Note on the "compiling" page that Ant 1.7 is required. The README file already points to this page.
........
r668534 | jeremias | 2008-06-17 09:58:40 +0200 (Di, 17 Jun 2008) | 2 lines
Update known issues.
Remove ApacheConEU logo.
........
r668550 | jeremias | 2008-06-17 10:05:22 +0200 (Di, 17 Jun 2008) | 2 lines
Bugzilla #45146:
Removed duplicate LICENSE.txt and Notice.txt from the JAR.
........
r668570 | jeremias | 2008-06-17 10:54:07 +0200 (Di, 17 Jun 2008) | 1 line
Wrong line number reported in the case of a line overflow.
........
r668641 | jeremias | 2008-06-17 14:59:25 +0200 (Di, 17 Jun 2008) | 1 line
Fixed potential NPE.
........
r669118 | jeremias | 2008-06-18 11:02:45 +0200 (Mi, 18 Jun 2008) | 4 lines
Bugzilla #44412:
Regression fix for empty pages caused by multiple collapsible breaks.
No more empty block areas if a break-before occurs on the first child of an FO to match the behaviour of tables and other FO implementations (clarification by XSL WG pending).
Added an accessor interface for break-before/-after to avoid long if..else lists in BlockStackingLayoutManager.
........
r669173 | jeremias | 2008-06-18 16:07:27 +0200 (Mi, 18 Jun 2008) | 7 lines
Bugzilla #44887:
Fixed potential multi-threading problem concerning the use of DecimalFormat.
Results from performance measurements in a separate test (operation repeated 100'000 times, exemplary):
shared static variable: ~220ms (old choice, problematic!)
always create new instance: ~480ms
ThreadLocal: ~220ms (new choice)
........
r669478 | jeremias | 2008-06-19 15:03:57 +0200 (Do, 19 Jun 2008) | 4 lines
Bugzilla #44412:
Improvements after Vincent's feedback:
Removal of the somewhat ugly Reference.
getBreakBefore() reduced to private visibility.
........
r670551 | jeremias | 2008-06-23 14:54:27 +0200 (Mo, 23 Jun 2008) | 3 lines
Use configured source and target resolution for foreign objects in RTF output.
Fixed intrinsic size calculation for SVG images when source resolution is not 72 dpi.
Fixed calculation of px2mm values in the SVG to G2D converter (used by RTF output).
........
r673750 | adelmelle | 2008-07-03 20:25:01 +0200 (Do, 03 Jul 2008) | 1 line
Fix for Bugzilla 45295 (already committed to the trunk with r672010, r672495 and r672496)
........
r674304 | jeremias | 2008-07-06 17:09:10 +0200 (So, 06 Jul 2008) | 18 lines
Bugzilla #43606:
column-width accepts percent values (proportional-column-width and % working)
Table width accepts percent values (100% of the page width as standard)
Nested tables are working
It is also possible to make nested tables with a higher depth than 3 without causing word to crash
Submitted by: Maximilan Aster <maximilian.aster.at.boc-eu.com>
Changes to the patch by Jeremias:
- Patch simplified (reuse of ColumnSetup from the layoutmgr package)
- Percentages and proportional-column-width didn't work properly in my tests -> fixed
- Adjustments for FOP code conventions
Bugzilla #43824:
page-number-citation working but has to be refreshed inside word to show the correct values
Submitted by: Maximilan Aster <maximilian.aster.at.boc-eu.com>
Changes to the patch by Jeremias:
- Adjustments for FOP code conventions
........
r674314 | jeremias | 2008-07-06 18:40:08 +0200 (So, 06 Jul 2008) | 7 lines
Bugzilla #43825:
leader supports fixed percent values for leader-length, most other properties
use-content, leader-pattern-width not implemented
Submitted by: Maximilan Aster <maximilian.aster.at.boc-eu.com>
Changes to the patch by Jeremias:
- Adjustments for FOP code conventions
........
r674317 | jeremias | 2008-07-06 18:44:43 +0200 (So, 06 Jul 2008) | 1 line
Doc update after RTF changes.
........
r675106 | jeremias | 2008-07-09 09:03:46 +0200 (Mi, 09 Jul 2008) | 2 lines
Bugzilla #45366:
Document missing feature.
........
r675150 | jeremias | 2008-07-09 14:56:41 +0200 (Mi, 09 Jul 2008) | 2 lines
Bugzilla #39980:
Fixed image scaling for RTF output.
........
r675151 | jeremias | 2008-07-09 14:57:06 +0200 (Mi, 09 Jul 2008) | 1 line
Removed unused code.
........
r675152 | jeremias | 2008-07-09 14:58:18 +0200 (Mi, 09 Jul 2008) | 1 line
Don't generate commands for default values.
........
r675707 | jeremias | 2008-07-10 21:58:27 +0200 (Do, 10 Jul 2008) | 1 line
Bugfix: -imagein didn't work because the stylesheet didn't get copied into fop.jar.
........
r680715 | jeremias | 2008-07-29 16:37:10 +0200 (Di, 29 Jul 2008) | 1 line
Found a surplus "pop state" which somehow causes a regression (fill color doesn't get properly reset) between 0.94 and 0.95. Shows in Barcode4J's fop-extension-demo.fo. The line has already been there in 0.94 but only shows in 0.95 probably due to an additional save/restore state pair added in PDFRenderer for reference areas after the block-container area refactoring.
........
r680820 | jeremias | 2008-07-29 22:02:14 +0200 (Di, 29 Jul 2008) | 2 lines
Bugzilla #41306:
The AWT Renderer is really not out-of-order capable.
........
r681284 | jeremias | 2008-07-31 08:47:49 +0200 (Do, 31 Jul 2008) | 1 line
Some updates to status.xml (I was not the only one working on the final release).
........
r681290 | jeremias | 2008-07-31 09:44:51 +0200 (Do, 31 Jul 2008) | 2 lines
Website updates for the 0.95 release.
The projectInfo plug-in of Forrest is not ideal for doing a bugfix release. It's not possible to combine the changes for two releases.
........
r681292 | jeremias | 2008-07-31 09:47:13 +0200 (Do, 31 Jul 2008) | 1 line
Disabling the ApacheCon ad for the release build.
........
................
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_AFPGOCAResources@681410 13f79535-47bb-0310-9956-ffa450edef68
16 년 전 Merged revisions 681296,681307 via svnmerge from
https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk
................
r681296 | jeremias | 2008-07-31 09:07:42 +0100 (Thu, 31 Jul 2008) | 12 lines
Blocked revisions 681286,681291 via svnmerge
........
r681286 | jeremias | 2008-07-31 09:15:23 +0200 (Do, 31 Jul 2008) | 1 line
Move to XML Graphics Commons 1.3.1.
........
r681291 | jeremias | 2008-07-31 09:45:13 +0200 (Do, 31 Jul 2008) | 1 line
Increase version number.
........
................
r681307 | jeremias | 2008-07-31 10:06:10 +0100 (Thu, 31 Jul 2008) | 149 lines
Merged revisions 636407-637074,637076-637118,637120-637790,637792-637856,637858-637992,637994-638047,638049-638307,638309-638315,638318-638936,638938-640888,640890-642905,642907-647402,647404-647536,647538-648983,648985-649005,649007-649013,649015-650549,650551-651301,651303-653536,653538-654452,654454-656285,656287-656523,656525-657519,657521-661579,661581-663481,663483-664691,664693-681285,681287-681290,681292-681298 via svnmerge from
https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/fop-0_95
........
r666635 | jeremias | 2008-06-11 14:18:53 +0200 (Mi, 11 Jun 2008) | 1 line
Fixed resolution handling inside AWT preview dialog.
........
r666662 | jeremias | 2008-06-11 15:33:20 +0200 (Mi, 11 Jun 2008) | 1 line
Some notes on RTF and print output.
........
r668533 | jeremias | 2008-06-17 09:57:55 +0200 (Di, 17 Jun 2008) | 2 lines
Bugzilla #45151:
Note on the "compiling" page that Ant 1.7 is required. The README file already points to this page.
........
r668534 | jeremias | 2008-06-17 09:58:40 +0200 (Di, 17 Jun 2008) | 2 lines
Update known issues.
Remove ApacheConEU logo.
........
r668550 | jeremias | 2008-06-17 10:05:22 +0200 (Di, 17 Jun 2008) | 2 lines
Bugzilla #45146:
Removed duplicate LICENSE.txt and Notice.txt from the JAR.
........
r668570 | jeremias | 2008-06-17 10:54:07 +0200 (Di, 17 Jun 2008) | 1 line
Wrong line number reported in the case of a line overflow.
........
r668641 | jeremias | 2008-06-17 14:59:25 +0200 (Di, 17 Jun 2008) | 1 line
Fixed potential NPE.
........
r669118 | jeremias | 2008-06-18 11:02:45 +0200 (Mi, 18 Jun 2008) | 4 lines
Bugzilla #44412:
Regression fix for empty pages caused by multiple collapsible breaks.
No more empty block areas if a break-before occurs on the first child of an FO to match the behaviour of tables and other FO implementations (clarification by XSL WG pending).
Added an accessor interface for break-before/-after to avoid long if..else lists in BlockStackingLayoutManager.
........
r669173 | jeremias | 2008-06-18 16:07:27 +0200 (Mi, 18 Jun 2008) | 7 lines
Bugzilla #44887:
Fixed potential multi-threading problem concerning the use of DecimalFormat.
Results from performance measurements in a separate test (operation repeated 100'000 times, exemplary):
shared static variable: ~220ms (old choice, problematic!)
always create new instance: ~480ms
ThreadLocal: ~220ms (new choice)
........
r669478 | jeremias | 2008-06-19 15:03:57 +0200 (Do, 19 Jun 2008) | 4 lines
Bugzilla #44412:
Improvements after Vincent's feedback:
Removal of the somewhat ugly Reference.
getBreakBefore() reduced to private visibility.
........
r670551 | jeremias | 2008-06-23 14:54:27 +0200 (Mo, 23 Jun 2008) | 3 lines
Use configured source and target resolution for foreign objects in RTF output.
Fixed intrinsic size calculation for SVG images when source resolution is not 72 dpi.
Fixed calculation of px2mm values in the SVG to G2D converter (used by RTF output).
........
r673750 | adelmelle | 2008-07-03 20:25:01 +0200 (Do, 03 Jul 2008) | 1 line
Fix for Bugzilla 45295 (already committed to the trunk with r672010, r672495 and r672496)
........
r674304 | jeremias | 2008-07-06 17:09:10 +0200 (So, 06 Jul 2008) | 18 lines
Bugzilla #43606:
column-width accepts percent values (proportional-column-width and % working)
Table width accepts percent values (100% of the page width as standard)
Nested tables are working
It is also possible to make nested tables with a higher depth than 3 without causing word to crash
Submitted by: Maximilan Aster <maximilian.aster.at.boc-eu.com>
Changes to the patch by Jeremias:
- Patch simplified (reuse of ColumnSetup from the layoutmgr package)
- Percentages and proportional-column-width didn't work properly in my tests -> fixed
- Adjustments for FOP code conventions
Bugzilla #43824:
page-number-citation working but has to be refreshed inside word to show the correct values
Submitted by: Maximilan Aster <maximilian.aster.at.boc-eu.com>
Changes to the patch by Jeremias:
- Adjustments for FOP code conventions
........
r674314 | jeremias | 2008-07-06 18:40:08 +0200 (So, 06 Jul 2008) | 7 lines
Bugzilla #43825:
leader supports fixed percent values for leader-length, most other properties
use-content, leader-pattern-width not implemented
Submitted by: Maximilan Aster <maximilian.aster.at.boc-eu.com>
Changes to the patch by Jeremias:
- Adjustments for FOP code conventions
........
r674317 | jeremias | 2008-07-06 18:44:43 +0200 (So, 06 Jul 2008) | 1 line
Doc update after RTF changes.
........
r675106 | jeremias | 2008-07-09 09:03:46 +0200 (Mi, 09 Jul 2008) | 2 lines
Bugzilla #45366:
Document missing feature.
........
r675150 | jeremias | 2008-07-09 14:56:41 +0200 (Mi, 09 Jul 2008) | 2 lines
Bugzilla #39980:
Fixed image scaling for RTF output.
........
r675151 | jeremias | 2008-07-09 14:57:06 +0200 (Mi, 09 Jul 2008) | 1 line
Removed unused code.
........
r675152 | jeremias | 2008-07-09 14:58:18 +0200 (Mi, 09 Jul 2008) | 1 line
Don't generate commands for default values.
........
r675707 | jeremias | 2008-07-10 21:58:27 +0200 (Do, 10 Jul 2008) | 1 line
Bugfix: -imagein didn't work because the stylesheet didn't get copied into fop.jar.
........
r680715 | jeremias | 2008-07-29 16:37:10 +0200 (Di, 29 Jul 2008) | 1 line
Found a surplus "pop state" which somehow causes a regression (fill color doesn't get properly reset) between 0.94 and 0.95. Shows in Barcode4J's fop-extension-demo.fo. The line has already been there in 0.94 but only shows in 0.95 probably due to an additional save/restore state pair added in PDFRenderer for reference areas after the block-container area refactoring.
........
r680820 | jeremias | 2008-07-29 22:02:14 +0200 (Di, 29 Jul 2008) | 2 lines
Bugzilla #41306:
The AWT Renderer is really not out-of-order capable.
........
r681284 | jeremias | 2008-07-31 08:47:49 +0200 (Do, 31 Jul 2008) | 1 line
Some updates to status.xml (I was not the only one working on the final release).
........
r681290 | jeremias | 2008-07-31 09:44:51 +0200 (Do, 31 Jul 2008) | 2 lines
Website updates for the 0.95 release.
The projectInfo plug-in of Forrest is not ideal for doing a bugfix release. It's not possible to combine the changes for two releases.
........
r681292 | jeremias | 2008-07-31 09:47:13 +0200 (Do, 31 Jul 2008) | 1 line
Disabling the ApacheCon ad for the release build.
........
................
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_AFPGOCAResources@681410 13f79535-47bb-0310-9956-ffa450edef68
16 년 전 |
123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249 |
- /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
- /* $Id$ */
-
- package org.apache.fop.render.rtf.rtflib.rtfdoc;
-
- /*
- * This file is part of the RTF library of the FOP project, which was originally
- * created by Bertrand Delacretaz <bdelacretaz@codeconsult.ch> and by other
- * contributors to the jfor project (www.jfor.org), who agreed to donate jfor to
- * the FOP project.
- */
-
- import java.io.IOException;
- import java.io.Writer;
-
- /** Container for RtfRow elements
- * @author Bertrand Delacretaz bdelacretaz@codeconsult.ch
- */
-
- public class RtfTable extends RtfContainer {
- private RtfTableRow row;
- private int highestRow = 0;
- private Boolean isNestedTable = null;
- private RtfAttributes borderAttributes = null;
-
- /** Added by Boris Poudérous on 07/22/2002 in order to process
- * number-columns-spanned attribute */
- private ITableColumnsInfo tableContext;
-
- /** Shows the table depth necessary for nested tables */
- private int nestedTableDepth = 0;
-
- /** Create an RTF element as a child of given container */
- RtfTable(IRtfTableContainer parent, Writer w, ITableColumnsInfo tc)
- throws IOException {
- super((RtfContainer)parent, w);
- // Line added by Boris Poudérous on 07/22/2002
- tableContext = tc;
- }
-
- /** Create an RTF element as a child of given container
- * Modified by Boris Poudérous in order to process 'number-columns-spanned' attribute
- */
- RtfTable(IRtfTableContainer parent, Writer w, RtfAttributes attrs,
- ITableColumnsInfo tc) throws IOException {
- super((RtfContainer)parent, w, attrs);
- // Line added by Boris Poudérous on 07/22/2002
- tableContext = tc;
- }
-
- /**
- * Close current row if any and start a new one
- * @return new RtfTableRow
- * @throws IOException for I/O problems
- */
- public RtfTableRow newTableRow() throws IOException {
- if (row != null) {
- row.close();
- }
-
- highestRow++;
- row = new RtfTableRow(this, writer, attrib, highestRow);
- return row;
- }
-
- /**
- * Close current row if any and start a new one
- * @param attrs attributs of new RtfTableRow
- * @return new RtfTableRow
- * @throws IOException for I/O problems
- */
- public RtfTableRow newTableRow(RtfAttributes attrs) throws IOException {
- RtfAttributes attr = null;
- if (attrib != null) {
- attr = (RtfAttributes) attrib.clone ();
- attr.set (attrs);
- } else {
- attr = attrs;
- }
- if (row != null) {
- row.close();
- }
- highestRow++;
-
- row = new RtfTableRow(this, writer, attr, highestRow);
- return row;
- }
-
-
-
- /**
- * Overridden to write RTF prefix code, what comes before our children
- * @throws IOException for I/O problems
- */
- protected void writeRtfPrefix() throws IOException {
- if (isNestedTable()) {
- writeControlWordNS("pard");
- }
-
- writeGroupMark(true);
- }
-
- /**
- * Overridden to write RTF suffix code, what comes after our children
- * @throws IOException for I/O problems
- */
- protected void writeRtfSuffix() throws IOException {
- writeGroupMark(false);
-
- if (isNestedTable()) {
- getRow().writeRowAndCellsDefintions();
- }
- }
-
- /**
- *
- * @param id row to check (??)
- * @return true if id is the highestRow
- */
- public boolean isHighestRow(int id) {
- return (highestRow == id) ? true : false;
- }
-
- /**
- * Added by Boris Poudérous on 07/22/2002
- * @return ITableColumnsInfo for this table
- */
- public ITableColumnsInfo getITableColumnsInfo() {
- return this.tableContext;
- }
-
- private RtfAttributes headerAttribs = null;
-
- /**
- * Added by Normand Masse
- * Support for table-header attributes (used instead of table attributes)
- * @param attrs attributes to be set
- */
- public void setHeaderAttribs(RtfAttributes attrs) {
- headerAttribs = attrs;
- }
-
- /**
- *
- * @return RtfAttributes of Header
- */
- public RtfAttributes getHeaderAttribs() {
- return headerAttribs;
- }
-
- /**
- * Added by Normand Masse
- * @return the table-header attributes if they are present, otherwise the
- * parent's attributes are returned normally.
- */
- public RtfAttributes getRtfAttributes() {
- if (headerAttribs != null) {
- return headerAttribs;
- }
-
- return super.getRtfAttributes();
- }
-
- /** @return true if the the table is a nested table */
- public boolean isNestedTable() {
- if (isNestedTable == null) {
- RtfElement e = this;
- while (e.parent != null) {
- if (e.parent instanceof RtfTableCell) {
- isNestedTable = Boolean.TRUE;
- return true;
- }
-
- e = e.parent;
- }
-
- isNestedTable = Boolean.FALSE;
- } else {
- return isNestedTable.booleanValue();
- }
-
- return false;
- }
-
- /**
- *
- * @return Parent row table (for nested tables only)
- */
- public RtfTableRow getRow() {
- RtfElement e = this;
- while (e.parent != null) {
- if (e.parent instanceof RtfTableRow) {
- return (RtfTableRow) e.parent;
- }
-
- e = e.parent;
- }
-
- return null;
- }
-
- /**
- * Sets the nested table depth.
- * @param nestedTableDepth the nested table depth
- */
- public void setNestedTableDepth(int nestedTableDepth) {
- this.nestedTableDepth = nestedTableDepth;
- }
-
- /**
- * Returns the nested table depth.
- * @return the nested table depth
- */
- public int getNestedTableDepth() {
- return this.nestedTableDepth;
- }
-
- /**
- * Sets the RtfAttributes for the borders of the table.
- * @param attributes Border attributes of the table.
- */
- public void setBorderAttributes(RtfAttributes attributes) {
- borderAttributes = attributes;
- }
-
- /**
- * Returns the RtfAttributes for the borders of the table.
- * @return Border attributes of the table.
- */
- public RtfAttributes getBorderAttributes() {
- return borderAttributes;
- }
- }
|