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/trunk@681307 13f79535-47bb-0310-9956-ffa450edef68
16 years ago 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/trunk@681307 13f79535-47bb-0310-9956-ffa450edef68
16 years ago 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/trunk@681307 13f79535-47bb-0310-9956-ffa450edef68
16 years ago 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/trunk@681307 13f79535-47bb-0310-9956-ffa450edef68
16 years ago |
123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431 |
- /*
- * 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.awt.viewer;
-
- import java.awt.Color;
- import java.awt.Dimension;
- import java.awt.GridLayout;
- import java.awt.Point;
- import java.awt.Toolkit;
- import java.awt.event.MouseEvent;
- import java.awt.event.MouseListener;
- import java.awt.event.MouseMotionListener;
- import java.awt.geom.Rectangle2D;
-
- import javax.swing.JLabel;
- import javax.swing.JOptionPane;
- import javax.swing.JPanel;
- import javax.swing.JScrollPane;
- import javax.swing.JViewport;
- import javax.swing.SwingUtilities;
- import javax.swing.border.EmptyBorder;
-
- import org.apache.xmlgraphics.util.UnitConv;
-
- import org.apache.fop.apps.FOPException;
- import org.apache.fop.apps.FOUserAgent;
- import org.apache.fop.apps.MimeConstants;
- import org.apache.fop.area.PageViewport;
- import org.apache.fop.render.awt.AWTRenderer;
-
-
- /**
- * <p>Holds a scrollpane with the rendered page(s) and handles actions performed
- * to alter the display of the page.
- * </p>
- * <p>Use PreviewPanel when you want to embed a preview in your own application
- * with your own controls. Use PreviewDialog when you want to use the standard
- * Fop controls.
- * </p>
- * <p>In order to embed a PreviewPanel in your own app, create your own renderer,
- * and your own agent. In order to support reloads, you may also implement your
- * own Renderable extension or the default InputHandler. Setting the Renderable
- * to null works fine though.
- * Then call setPreviewDialogDisplayed(false) to hide the
- * default dialog. Finally create a preview panel with the agent, renderable and
- * renderer and add it to your gui:
- * </p>
- * <pre>
- * FopFactory fopFactory = FopFactory.newInstance();
- * AWTRenderer renderer = new AWTRenderer();
- * FOUserAgent agent = fopFactory.newFOUserAgent();
- * agent.setRendererOverride(renderer);
- * renderer.setPreviewDialogDisplayed(false);
- * renderer.setUserAgent(agent);
- * renderer.setUserAgent(agent);
- * previewPanel = new PreviewPanel(agent, null, renderer);
- * previewPanel = new PreviewPanel(ua);
- * myGui.add(previewPanel);
- * </pre>
- *
- * In order to set options and display a page do:
- * <pre>
- * renderer.clearViewportList();
- * // build report xml here
- * reload(); // optional if setting changed
- * </pre>
- *
- * If you wan't to change settings, don't call reload. A good example is
- * to set the page to fill the screen and set the scrolling mode:
- * <pre>
- * double scale = previewPanel.getScaleToFitWindow();
- * previewPanel.setScaleFactor(scale);
- * previewPanel.setDisplayMode(PreviewPanel.CONTINUOUS);
- * </pre>
- */
- public class PreviewPanel extends JPanel {
-
- /** Constant for setting single page display. */
- public static final int SINGLE = 1;
- /** Constant for setting continuous page display. */
- public static final int CONTINUOUS = 2;
- /** Constant for displaying even/odd pages side by side in continuous form. */
- public static final int CONT_FACING = 3;
-
- /** The number of pixels left empty at the top bottom and sides of the page. */
- private static final int BORDER_SPACING = 10;
-
- /** The main display area */
- private JScrollPane previewArea;
-
- /** The AWT renderer - often shared with PreviewDialog */
- private AWTRenderer renderer;
-
- /** The FOUserAgent associated with this panel - often shared with PreviewDialog */
- protected FOUserAgent foUserAgent;
- /**
- * Renderable instance that can be used to reload and re-render a document after
- * modifications.
- */
- protected Renderable renderable;
- /** The number of the page which is currently selected */
- private int currentPage = 0;
-
- /** The index of the first page displayed on screen. */
- private int firstPage = 0;
-
- /** The number of pages concurrently displayed on screen. */
- private int pageRange = 1;
-
- /** The display mode. One of SINGLE, CONTINUOUS or CONT_FACING. */
- private int displayMode = SINGLE;
-
- /** The component(s) that hold the rendered page(s) */
- private ImageProxyPanel[] pagePanels = null;
-
- /**
- * Panel showing the page panels in a grid. Usually the dimensions
- * of the grid are 1x1, nx1 or nx2.
- */
- private JPanel gridPanel = null;
-
- /** Asynchronous reloader thread, used when reload() method is called. */
- private Reloader reloader;
-
- /**
- * Allows any mouse drag on the page area to scroll the display window.
- */
- private ViewportScroller scroller;
-
-
- /**
- * Creates a new PreviewPanel instance.
- * @param foUserAgent the user agent
- * @param renderable the Renderable instance that is used to reload/re-render a document
- * after modifications.
- * @param renderer the AWT Renderer instance to paint with
- */
- public PreviewPanel(FOUserAgent foUserAgent, Renderable renderable, AWTRenderer renderer) {
- super(new GridLayout(1, 1));
- this.renderable = renderable;
- this.renderer = renderer;
- this.foUserAgent = foUserAgent;
- //Override target resolution for the computer screen
- this.foUserAgent.setTargetResolution(Toolkit.getDefaultToolkit().getScreenResolution());
-
- gridPanel = new JPanel();
- gridPanel.setLayout(new GridLayout(0, 1)); // rows, cols
-
- previewArea = new JScrollPane(gridPanel);
- previewArea.getViewport().setBackground(Color.gray);
-
- // FIXME should add scroll wheel support here at some point.
- scroller = new ViewportScroller(previewArea.getViewport());
- previewArea.addMouseListener(scroller);
- previewArea.addMouseMotionListener(scroller);
-
- previewArea.setMinimumSize(new Dimension(50, 50));
- add(previewArea);
- }
-
- /**
- * @return the currently visible page
- */
- public int getPage() {
- return currentPage;
- }
-
- /**
- * Selects the given page, displays it on screen and notifies
- * listeners about the change in selection.
- * @param number the page number
- */
- public void setPage(int number) {
- if (displayMode == CONTINUOUS || displayMode == CONT_FACING) {
- currentPage = number;
- gridPanel.scrollRectToVisible(pagePanels[currentPage].getBounds());
- } else { // single page mode
- currentPage = number;
- firstPage = currentPage;
- }
- showPage();
- }
-
- /**
- * Sets the display mode.
- * @param mode One of SINGLE, CONTINUOUS or CONT_FACING.
- */
- public void setDisplayMode(int mode) {
- if (mode != displayMode) {
- displayMode = mode;
- gridPanel.setLayout(new GridLayout(0, displayMode == CONT_FACING ? 2 : 1));
- reload();
- }
- }
-
- /**
- * Returns the display mode.
- * @return mode One of SINGLE, CONTINUOUS or CONT_FACING.
- */
- public int getDisplayMode() {
- return displayMode;
- }
-
- /**
- * Reloads and reformats document.
- */
- public synchronized void reload() {
- if (reloader == null || !reloader.isAlive()) {
- reloader = new Reloader();
- reloader.start();
- }
- }
-
- /**
- * Allows a (yet) simple visual debug of the document.
- */
- void debug() {
- renderer.debug = !renderer.debug;
- reload();
- }
-
- /**
- * Allows any mouse drag on the page area to scroll the display window.
- */
- private class ViewportScroller implements MouseListener, MouseMotionListener {
- /** The viewport to be scrolled */
- private final JViewport viewport;
- /** Starting position of a mouse drag - X co-ordinate */
- private int startPosX = 0;
- /** Starting position of a mouse drag - Y co-ordinate */
- private int startPosY = 0;
-
- ViewportScroller(JViewport vp) {
- viewport = vp;
- }
-
- // ***** MouseMotionListener *****
-
- public synchronized void mouseDragged(MouseEvent e) {
- if (viewport == null) {
- return;
- }
- int x = e.getX();
- int y = e.getY();
- int xmove = x - startPosX;
- int ymove = y - startPosY;
- int viewWidth = viewport.getExtentSize().width;
- int viewHeight = viewport.getExtentSize().height;
- int imageWidth = viewport.getViewSize().width;
- int imageHeight = viewport.getViewSize().height;
-
- Point viewPoint = viewport.getViewPosition();
- int viewX = Math.max(0, Math.min(imageWidth - viewWidth, viewPoint.x - xmove));
- int viewY = Math.max(0, Math.min(imageHeight - viewHeight, viewPoint.y - ymove));
-
- viewport.setViewPosition(new Point(viewX, viewY));
-
- startPosX = x;
- startPosY = y;
- }
-
- public void mouseMoved(MouseEvent e) { }
-
- // ***** MouseListener *****
-
- public void mousePressed(MouseEvent e) {
- startPosX = e.getX();
- startPosY = e.getY();
- }
-
- public void mouseExited(MouseEvent e) { }
- public void mouseEntered(MouseEvent e) { }
- public void mouseClicked(MouseEvent e) { }
- public void mouseReleased(MouseEvent e) { }
- }
-
- /**
- * This class is used to reload document in a thread safe way.
- */
- private class Reloader extends Thread {
-
- public void run() {
- if (!renderer.isRenderingDone()) {
- // do not allow the reloading while FOP is still rendering
- JOptionPane.showMessageDialog(previewArea,
- "Cannot perform the requested operation until "
- + "all page are rendered. Please wait",
- "Please wait ", 1 /* INFORMATION_MESSAGE */);
- return;
- }
-
- pagePanels = null;
-
- int savedCurrentPage = currentPage;
- currentPage = 0;
-
- gridPanel.removeAll();
- switch(displayMode) {
- case CONT_FACING:
- // This page intentionally left blank
- // Makes 0th/1st page on rhs
- gridPanel.add(new JLabel(""));
- case CONTINUOUS:
- currentPage = 0;
- firstPage = 0;
- pageRange = renderer.getNumberOfPages();
- break;
- case SINGLE:
- default:
- currentPage = 0;
- firstPage = 0;
- pageRange = 1;
- break;
- }
-
- pagePanels = new ImageProxyPanel[pageRange];
- for (int pg = 0; pg < pageRange; pg++) {
- pagePanels[pg] = new ImageProxyPanel(renderer, pg + firstPage);
- pagePanels[pg].setBorder(new EmptyBorder(
- BORDER_SPACING, BORDER_SPACING, BORDER_SPACING, BORDER_SPACING));
- gridPanel.add(pagePanels[pg]);
- }
-
- try {
- if (renderable != null) {
- renderer.clearViewportList();
- renderable.renderTo(foUserAgent, MimeConstants.MIME_FOP_AWT_PREVIEW);
- }
- } catch (FOPException e) {
- e.printStackTrace();
- // FIXME Should show exception in gui - was reportException(e);
- }
-
- setPage(savedCurrentPage);
- }
- }
-
- /**
- * Scales page image
- * @param scale [0;1]
- */
- public void setScaleFactor(double scale) {
- renderer.setScaleFactor(scale);
- reload();
- }
-
- /**
- * Returns the scale factor required in order to fit either the current
- * page within the current window or to fit two adjacent pages within
- * the display if the displaymode is continuous.
- * @return the requested scale factor
- * @throws FOPException in case of an error while fetching the PageViewport
- */
- public double getScaleToFitWindow() throws FOPException {
- Dimension extents = previewArea.getViewport().getExtentSize();
- return getScaleToFit(extents.getWidth() - 2 * BORDER_SPACING,
- extents.getHeight() - 2 * BORDER_SPACING);
- }
-
- /**
- * As getScaleToFitWindow, but ignoring the Y axis.
- * @return the requested scale factor
- * @throws FOPException in case of an error while fetching the PageViewport
- */
- public double getScaleToFitWidth() throws FOPException {
- Dimension extents = previewArea.getViewport().getExtentSize();
- return getScaleToFit(extents.getWidth() - 2 * BORDER_SPACING, Double.MAX_VALUE);
- }
-
- /**
- * Returns the scale factor required in order to fit either the current page or
- * two adjacent pages within a window of the given height and width, depending
- * on the display mode. In order to ignore either dimension,
- * just specify it as Double.MAX_VALUE.
- * @param viewWidth width of the view
- * @param viewHeight height of the view
- * @return the requested scale factor
- * @throws FOPException in case of an error while fetching the PageViewport
- */
- public double getScaleToFit(double viewWidth, double viewHeight) throws FOPException {
- PageViewport pageViewport = renderer.getPageViewport(currentPage);
- Rectangle2D pageSize = pageViewport.getViewArea();
- float screenResolution = Toolkit.getDefaultToolkit().getScreenResolution();
- float screenFactor = screenResolution / UnitConv.IN2PT;
- double widthScale = viewWidth / (pageSize.getWidth() / 1000f) / screenFactor;
- double heightScale = viewHeight / (pageSize.getHeight() / 1000f) / screenFactor;
- return Math.min(displayMode == CONT_FACING ? widthScale / 2 : widthScale, heightScale);
- }
-
- /** Starts rendering process and shows the current page. */
- public synchronized void showPage() {
- ShowPageImage viewer = new ShowPageImage();
-
- if (SwingUtilities.isEventDispatchThread()) {
- viewer.run();
- } else {
- SwingUtilities.invokeLater(viewer);
- }
- }
-
- /** This class is used to render the page image in a thread safe way. */
- private class ShowPageImage implements Runnable {
-
- /**
- * The run method that does the actual rendering of the viewed page
- */
- public void run() {
- for (int pg = firstPage; pg < firstPage + pageRange; pg++) {
- pagePanels[pg - firstPage].setPage(pg);
- }
- revalidate();
- }
- }
- }
|