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 ga...@apache.org on 2012/06/27 20:20:46 UTC
svn commit: r1354655 - in /xmlgraphics/fop/branches/fop-1_1rc1: ./
examples/fo/ examples/fo/advanced/ examples/fo/basic/ examples/fo/svg/
examples/fo/tables/ src/documentation/content/xdocs/
src/documentation/content/xdocs/fo/ src/java/org/apache/fop/h...
Author: gadams
Date: Wed Jun 27 18:20:40 2012
New Revision: 1354655
URL: http://svn.apache.org/viewvc?rev=1354655&view=rev
Log:
Merge from origin/trunk.
Added:
xmlgraphics/fop/branches/fop-1_1rc1/src/documentation/content/xdocs/fo/align.pdf
xmlgraphics/fop/branches/fop-1_1rc1/src/documentation/content/xdocs/fo/align2.pdf
xmlgraphics/fop/branches/fop-1_1rc1/src/documentation/content/xdocs/fo/build.xml
xmlgraphics/fop/branches/fop-1_1rc1/src/documentation/content/xdocs/fo/embed.pdf
xmlgraphics/fop/branches/fop-1_1rc1/src/documentation/content/xdocs/fo/fonts.pdf
xmlgraphics/fop/branches/fop-1_1rc1/src/documentation/content/xdocs/fo/size.pdf
xmlgraphics/fop/branches/fop-1_1rc1/test/java/org/apache/fop/svg/
xmlgraphics/fop/branches/fop-1_1rc1/test/java/org/apache/fop/svg/PDFGraphics2DTestCase.java
Removed:
xmlgraphics/fop/branches/fop-1_1rc1/src/documentation/content/xdocs/fo/align.fo.pdf
xmlgraphics/fop/branches/fop-1_1rc1/src/documentation/content/xdocs/fo/align2.fo.pdf
xmlgraphics/fop/branches/fop-1_1rc1/src/documentation/content/xdocs/fo/embed.fo.pdf
xmlgraphics/fop/branches/fop-1_1rc1/src/documentation/content/xdocs/fo/fonts.fo.pdf
xmlgraphics/fop/branches/fop-1_1rc1/src/documentation/content/xdocs/fo/size.fo.pdf
Modified:
xmlgraphics/fop/branches/fop-1_1rc1/examples/fo/advanced/cid-fonts.fo
xmlgraphics/fop/branches/fop-1_1rc1/examples/fo/advanced/giro.fo
xmlgraphics/fop/branches/fop-1_1rc1/examples/fo/basic/images.fo
xmlgraphics/fop/branches/fop-1_1rc1/examples/fo/basic/tableunits.fo
xmlgraphics/fop/branches/fop-1_1rc1/examples/fo/build.xml
xmlgraphics/fop/branches/fop-1_1rc1/examples/fo/svg/embedding.fo
xmlgraphics/fop/branches/fop-1_1rc1/examples/fo/tables/background.fo
xmlgraphics/fop/branches/fop-1_1rc1/examples/fo/tables/borders.fo
xmlgraphics/fop/branches/fop-1_1rc1/examples/fo/tables/break.fo
xmlgraphics/fop/branches/fop-1_1rc1/examples/fo/tables/headfoot.fo
xmlgraphics/fop/branches/fop-1_1rc1/examples/fo/tables/keep.fo
xmlgraphics/fop/branches/fop-1_1rc1/examples/fo/tables/omit.fo
xmlgraphics/fop/branches/fop-1_1rc1/examples/fo/tables/space.fo
xmlgraphics/fop/branches/fop-1_1rc1/findbugs-exclude.xml
xmlgraphics/fop/branches/fop-1_1rc1/src/documentation/content/xdocs/examples.xml
xmlgraphics/fop/branches/fop-1_1rc1/src/documentation/content/xdocs/fo/align.fo
xmlgraphics/fop/branches/fop-1_1rc1/src/documentation/content/xdocs/fo/align2.fo
xmlgraphics/fop/branches/fop-1_1rc1/src/documentation/content/xdocs/fo/embed.fo
xmlgraphics/fop/branches/fop-1_1rc1/src/documentation/content/xdocs/fo/fonts.fo
xmlgraphics/fop/branches/fop-1_1rc1/src/documentation/content/xdocs/fo/size.fo
xmlgraphics/fop/branches/fop-1_1rc1/src/java/org/apache/fop/hyphenation/HyphenationTreeCache.java
xmlgraphics/fop/branches/fop-1_1rc1/src/java/org/apache/fop/pdf/AbstractPDFStream.java
xmlgraphics/fop/branches/fop-1_1rc1/src/java/org/apache/fop/pdf/AlphaRasterImage.java
xmlgraphics/fop/branches/fop-1_1rc1/src/java/org/apache/fop/pdf/BitmapImage.java
xmlgraphics/fop/branches/fop-1_1rc1/src/java/org/apache/fop/pdf/PDFImage.java
xmlgraphics/fop/branches/fop-1_1rc1/src/java/org/apache/fop/pdf/PDFImageXObject.java
xmlgraphics/fop/branches/fop-1_1rc1/src/java/org/apache/fop/render/pdf/AbstractImageAdapter.java
xmlgraphics/fop/branches/fop-1_1rc1/src/java/org/apache/fop/render/pdf/ImageRawPNGAdapter.java
xmlgraphics/fop/branches/fop-1_1rc1/src/java/org/apache/fop/svg/PDFGraphics2D.java
xmlgraphics/fop/branches/fop-1_1rc1/status.xml
Modified: xmlgraphics/fop/branches/fop-1_1rc1/examples/fo/advanced/cid-fonts.fo
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-1_1rc1/examples/fo/advanced/cid-fonts.fo?rev=1354655&r1=1354654&r2=1354655&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-1_1rc1/examples/fo/advanced/cid-fonts.fo (original)
+++ xmlgraphics/fop/branches/fop-1_1rc1/examples/fo/advanced/cid-fonts.fo Wed Jun 27 18:20:40 2012
@@ -369,7 +369,7 @@ This font contains no embedding license
</fo:block>
</fo:wrapper>
- <fo:table>
+ <fo:table table-layout="fixed" width="100%">
<fo:table-column column-width="50mm"/>
<fo:table-column column-width="50mm"/>
<fo:table-column column-width="50mm"/>
Modified: xmlgraphics/fop/branches/fop-1_1rc1/examples/fo/advanced/giro.fo
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-1_1rc1/examples/fo/advanced/giro.fo?rev=1354655&r1=1354654&r2=1354655&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-1_1rc1/examples/fo/advanced/giro.fo (original)
+++ xmlgraphics/fop/branches/fop-1_1rc1/examples/fo/advanced/giro.fo Wed Jun 27 18:20:40 2012
@@ -32,7 +32,7 @@
<fo:block-container absolute-position="absolute" width="100%" height="100%" border-top-color="silver" border-top-style="dotted" border-top-width="0.13mm">
<fo:block/>
</fo:block-container>
- <fo:table space-before.optimum="1in div 12" margin-left="2in div 12" margin-top="1in div 10" font-family="sans-serif" font-size="7pt" color="green">
+ <fo:table space-before.optimum="1in div 12" margin-left="2in div 12" margin-top="1in div 10" font-family="sans-serif" font-size="7pt" color="green" table-layout="fixed" width="100%">
<fo:table-column column-width="8in div 10 - 2in div 12"/>
<fo:table-column border-right-style="solid" border-right-width="0.5mm" column-width="36in div 10"/>
<fo:table-column column-width="5in div 10"/>
@@ -107,7 +107,7 @@
<fo:block>Från konto nr</fo:block>
</fo:table-cell>
<fo:table-cell border-bottom-style="solid" border-bottom-width="0.13mm" padding-top="6mm" display-align="after">
- <fo:table height="3mm">
+ <fo:table height="3mm" table-layout="fixed" width="100%">
<fo:table-column border-right-style="solid" border-right-width="0.13mm" column-width="0.2in"/>
<fo:table-column border-right-style="solid" border-right-width="0.13mm" column-width="0.2in"/>
<fo:table-column border-right-style="solid" border-right-width="0.13mm" column-width="0.2in"/>
@@ -182,7 +182,7 @@
<fo:block color="black">16.6.2006</fo:block>
</fo:table-cell>
<fo:table-cell border-bottom-style="solid" border-bottom-width="0.5mm" padding-left="2mm" padding-top="4mm" font-size="10pt">
- <fo:table>
+ <fo:table table-layout="fixed" width="100%">
<fo:table-column column-width="0.5cm"/>
<fo:table-column column-width="2cm"/>
<fo:table-body>
@@ -201,7 +201,7 @@
<fo:table-row height="13in div 12 - 5mm">
<fo:table-cell number-columns-spanned="4" padding-left="40mm" display-align="after">
<fo:block>
- <fo:table height="5in div 12" margin-left="2.5mm" margin-right="2.5mm"><!--105-->
+ <fo:table height="5in div 12" margin-left="2.5mm" margin-right="2.5mm" table-layout="fixed" width="100%"><!--105-->
<fo:table-column column-width="0.5mm"/>
<fo:table-column column-width="0.25mm"/>
<fo:table-column column-width="0.25mm"/>
@@ -950,7 +950,7 @@
</fo:page-sequence>
<fo:page-sequence master-reference="A4">
<fo:static-content flow-name="xsl-region-after">
- <fo:table space-before.optimum="1in div 12" margin-left="2in div 12" margin-top="1in div 10" font-family="sans-serif" font-size="7pt" color="green">
+ <fo:table space-before.optimum="1in div 12" margin-left="2in div 12" margin-top="1in div 10" font-family="sans-serif" font-size="7pt" color="green" table-layout="fixed" width="100%">
<fo:table-column column-width="8in div 10 - 2in div 12"/>
<fo:table-column border-right-style="solid" border-right-width="0.5mm" column-width="36in div 10"/>
<fo:table-column column-width="5in div 10"/>
@@ -1025,7 +1025,7 @@
<fo:block>Från konto nr</fo:block>
</fo:table-cell>
<fo:table-cell border-bottom-style="solid" border-bottom-width="0.13mm" padding-top="6mm" display-align="after">
- <fo:table height="3mm">
+ <fo:table height="3mm" table-layout="fixed" width="100%">
<fo:table-column border-right-style="solid" border-right-width="0.13mm" column-width="0.2in"/>
<fo:table-column border-right-style="solid" border-right-width="0.13mm" column-width="0.2in"/>
<fo:table-column border-right-style="solid" border-right-width="0.13mm" column-width="0.2in"/>
@@ -1100,7 +1100,7 @@
<fo:block color="black">16.6.2006</fo:block>
</fo:table-cell>
<fo:table-cell border-bottom-style="solid" border-bottom-width="0.5mm" padding-left="2mm" padding-top="4mm" font-size="10pt">
- <fo:table>
+ <fo:table table-layout="fixed" width="100%">
<fo:table-column column-width="0.5cm"/>
<fo:table-column column-width="2cm"/>
<fo:table-body>
Modified: xmlgraphics/fop/branches/fop-1_1rc1/examples/fo/basic/images.fo
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-1_1rc1/examples/fo/basic/images.fo?rev=1354655&r1=1354654&r2=1354655&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-1_1rc1/examples/fo/basic/images.fo (original)
+++ xmlgraphics/fop/branches/fop-1_1rc1/examples/fo/basic/images.fo Wed Jun 27 18:20:40 2012
@@ -31,8 +31,6 @@
odd-or-even="even" />
<fo:conditional-page-master-reference master-reference="right"
odd-or-even="odd" />
- <!-- recommended fallback procedure -->
- <fo:conditional-page-master-reference master-reference="rest" />
</fo:repeatable-page-master-alternatives>
</fo:page-sequence-master>
</fo:layout-master-set>
Modified: xmlgraphics/fop/branches/fop-1_1rc1/examples/fo/basic/tableunits.fo
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-1_1rc1/examples/fo/basic/tableunits.fo?rev=1354655&r1=1354654&r2=1354655&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-1_1rc1/examples/fo/basic/tableunits.fo (original)
+++ xmlgraphics/fop/branches/fop-1_1rc1/examples/fo/basic/tableunits.fo Wed Jun 27 18:20:40 2012
@@ -67,9 +67,9 @@
<fo:block space-before="12pt" space-after="6pt">The next table has width=100% on the table no column widths specified on the table-column element.</fo:block>
<!-- table start -->
<fo:table border-collapse="separate" table-layout="fixed" width="100%">
- <fo:table-column background-color="yellow"/>
- <fo:table-column background-color="blue"/>
- <fo:table-column background-color="green"/>
+ <fo:table-column column-width="proportional-column-width(1)" background-color="yellow"/>
+ <fo:table-column column-width="proportional-column-width(1)" background-color="blue"/>
+ <fo:table-column column-width="proportional-column-width(1)" background-color="green"/>
<fo:table-body>
<fo:table-row>
<fo:table-cell display-align="before"><fo:block>Some text to make this cell
@@ -83,7 +83,7 @@
<fo:block space-before="12pt" space-after="6pt">The next table has fixed column widths=13cm, ipd.optimum=12cm and ipd.max = 100%.</fo:block>
<!-- table start -->
<fo:table border-collapse="separate"
- table-layout="fixed"
+ table-layout="fixed" width="100%"
inline-progression-dimension="12cm"
inline-progression-dimension.maximum="100%"
>
@@ -122,8 +122,8 @@
<!-- table start -->
<fo:table border-collapse="separate" table-layout="fixed" width="70% + 1cm">
<fo:table-column column-width="from-parent('width') div 3" background-color="yellow"/>
- <fo:table-column background-color="blue"/>
- <fo:table-column background-color="green"/>
+ <fo:table-column column-width="proportional-column-width(1)" background-color="blue"/>
+ <fo:table-column column-width="proportional-column-width(1)" background-color="green"/>
<fo:table-body>
<fo:table-row>
<fo:table-cell display-align="before"><fo:block>Some text to make this cell
@@ -140,11 +140,11 @@
</fo:block>
<!-- table start -->
<fo:table border-collapse="separate"
- table-layout="fixed"
+ table-layout="fixed" width="100%"
inline-progression-dimension="15cm">
- <fo:table-column background-color="yellow"/>
+ <fo:table-column column-width="proportional-column-width(1)" background-color="yellow"/>
<fo:table-column column-width="3cm" background-color="blue"/>
- <fo:table-column background-color="green"/>
+ <fo:table-column column-width="proportional-column-width(1)" background-color="green"/>
<fo:table-body>
<fo:table-row>
<fo:table-cell display-align="before"><fo:block>Some text to make this cell
@@ -159,10 +159,10 @@
The next table specifies neither width nor inline-progression-dimension.
</fo:block>
<!-- table start -->
- <fo:table table-layout="fixed" border-collapse="separate">
- <fo:table-column background-color="yellow"/>
+ <fo:table table-layout="fixed" width="100%" border-collapse="separate">
+ <fo:table-column column-width="proportional-column-width(1)" background-color="yellow"/>
<fo:table-column column-width="3cm" background-color="blue"/>
- <fo:table-column background-color="green"/>
+ <fo:table-column column-width="proportional-column-width(1)" background-color="green"/>
<fo:table-body>
<fo:table-row>
<fo:table-cell display-align="before"><fo:block>Some text to make this cell
@@ -178,11 +178,11 @@
specifies a column width of 5cm on the middle column only.
</fo:block>
<!-- table start -->
- <fo:table table-layout="fixed" border-collapse="separate"
+ <fo:table table-layout="fixed" width="100%" border-collapse="separate"
inline-progression-dimension.minimum="10cm">
- <fo:table-column background-color="yellow"/>
+ <fo:table-column column-width="proportional-column-width(1)" background-color="yellow"/>
<fo:table-column column-width="5cm" background-color="blue"/>
- <fo:table-column background-color="green"/>
+ <fo:table-column column-width="proportional-column-width(1)" background-color="green"/>
<fo:table-body>
<fo:table-row>
<fo:table-cell display-align="before"><fo:block>Some text to make this cell
@@ -194,17 +194,17 @@
</fo:table>
<fo:block space-before="12pt" space-after="6pt">
- The next table specifies inline-progression-dimension.minimum="10cm",
- inline-progression-dimension.maximum="17cm and
+ The next table specifies inline-progression-dimension.minimum="10cm",
+ inline-progression-dimension.maximum="17cm and
specifies a column width of 5cm on the middle column only.
</fo:block>
<!-- table start -->
- <fo:table table-layout="fixed" border-collapse="separate"
+ <fo:table table-layout="fixed" width="100%" border-collapse="separate"
inline-progression-dimension.minimum="10cm"
inline-progression-dimension.maximum="17cm">
- <fo:table-column background-color="yellow"/>
+ <fo:table-column column-width="proportional-column-width(1)" background-color="yellow"/>
<fo:table-column column-width="5cm" background-color="blue"/>
- <fo:table-column background-color="green"/>
+ <fo:table-column column-width="proportional-column-width(1)" background-color="green"/>
<fo:table-body>
<fo:table-row>
<fo:table-cell display-align="before"><fo:block>Some text to make this cell
Modified: xmlgraphics/fop/branches/fop-1_1rc1/examples/fo/build.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-1_1rc1/examples/fo/build.xml?rev=1354655&r1=1354654&r2=1354655&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-1_1rc1/examples/fo/build.xml (original)
+++ xmlgraphics/fop/branches/fop-1_1rc1/examples/fo/build.xml Wed Jun 27 18:20:40 2012
@@ -127,6 +127,7 @@
</target>
<!-- =================================================================== -->
<!-- Compares new test pdf files to reference pdf files -->
+ <!-- N.B. All comparisons fail due to differences in /CreationDate -->
<!-- =================================================================== -->
<target name="comparePDF" depends="newPDF">
<compare referenceDirectory="${referenceDir}" testDirectory="${testDir}" filenames="normal.pdf,table.pdf,list.pdf,link.pdf,border.pdf,images.pdf,extensive.pdf,readme.pdf,fonts.pdf,bordershorthand.pdf,character.pdf,corresprop.pdf,hyphen.pdf,inhprop.pdf,instream.pdf,leader.pdf,newlinktest.pdf,normalex.pdf,pdfoutline.pdf,simple.pdf,textdeko.pdf,tableunits.pdf"/>
@@ -144,6 +145,7 @@
<!-- =================================================================== -->
<!-- Starts the test -->
+ <!-- N.B. All tests fail due to differences in /CreationDate -->
<!-- =================================================================== -->
<target name="runtest" depends="comparePDF">
<echo message="Running Fop tests"/>
@@ -154,6 +156,9 @@
<target name="clean" depends="init">
<delete dir="${testDir}"/>
</target>
+ <target name="cleantest" depends="init">
+ <delete dir="${referenceDir}"/>
+ </target>
</project>
<!-- End of file -->
Modified: xmlgraphics/fop/branches/fop-1_1rc1/examples/fo/svg/embedding.fo
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-1_1rc1/examples/fo/svg/embedding.fo?rev=1354655&r1=1354654&r2=1354655&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-1_1rc1/examples/fo/svg/embedding.fo (original)
+++ xmlgraphics/fop/branches/fop-1_1rc1/examples/fo/svg/embedding.fo Wed Jun 27 18:20:40 2012
@@ -794,7 +794,7 @@ XML Syntax
<fo:block>
Here we have some examples of how the XML can be specified in the fo document.
<fo:block>
- <fo:table>
+ <fo:table table-layout="fixed" width="100%">
<fo:table-column column-width="350pt"/>
<fo:table-column column-width="150pt"/>
<fo:table-body>
@@ -932,7 +932,7 @@ Sizing
The size of the instream-foreign-object is obtained in a number of ways.
<fo:block>
- <fo:table xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:table xmlns:svg="http://www.w3.org/2000/svg" table-layout="fixed" width="100%">
<fo:table-column column-width="350pt"/>
<fo:table-column column-width="150pt"/>
<fo:table-body>
Modified: xmlgraphics/fop/branches/fop-1_1rc1/examples/fo/tables/background.fo
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-1_1rc1/examples/fo/tables/background.fo?rev=1354655&r1=1354654&r2=1354655&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-1_1rc1/examples/fo/tables/background.fo (original)
+++ xmlgraphics/fop/branches/fop-1_1rc1/examples/fo/tables/background.fo Wed Jun 27 18:20:40 2012
@@ -30,7 +30,7 @@
Table 1: cell background
</fo:block>
- <fo:table>
+ <fo:table table-layout="fixed" width="100%">
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
@@ -72,7 +72,7 @@
Table 1: row background
</fo:block>
- <fo:table>
+ <fo:table table-layout="fixed" width="100%">
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
@@ -152,7 +152,7 @@
Table 1: column background
</fo:block>
- <fo:table>
+ <fo:table table-layout="fixed" width="100%">
<fo:table-column column-width="3cm" background-color="green"/>
<fo:table-column column-width="3cm" background-color="red"/>
<fo:table-column column-width="3cm" background-color="blue"/>
@@ -219,7 +219,7 @@
Table 1: column backgrounds over page
</fo:block>
- <fo:table>
+ <fo:table table-layout="fixed" width="100%">
<fo:table-column column-width="3cm" background-color="green"/>
<fo:table-column column-width="3cm" background-color="red"/>
<fo:table-column column-width="3cm" background-color="blue"/>
@@ -286,7 +286,7 @@
Table 1: body background
</fo:block>
- <fo:table>
+ <fo:table table-layout="fixed" width="100%">
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
@@ -323,7 +323,7 @@
</fo:table-body>
</fo:table>
- <fo:table>
+ <fo:table table-layout="fixed" width="100%">
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
@@ -360,7 +360,7 @@
</fo:table-body>
</fo:table>
- <fo:table>
+ <fo:table table-layout="fixed" width="100%">
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
@@ -397,7 +397,7 @@
</fo:table-body>
</fo:table>
- <fo:table>
+ <fo:table table-layout="fixed" width="100%">
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
@@ -438,7 +438,7 @@
Table 1: table background
</fo:block>
- <fo:table background-color="green">
+ <fo:table background-color="green" table-layout="fixed" width="100%">
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
@@ -475,7 +475,7 @@
</fo:table-body>
</fo:table>
- <fo:table background-color="red">
+ <fo:table background-color="red" table-layout="fixed" width="100%">
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
@@ -516,7 +516,7 @@
Table 1: combinations
</fo:block>
- <fo:table background-color="green">
+ <fo:table background-color="green" table-layout="fixed" width="100%">
<fo:table-column column-width="2.5cm"/>
<fo:table-column column-width="2.5cm" background-color="green"/>
<fo:table-column column-width="2.5cm" background-color="red"/>
Modified: xmlgraphics/fop/branches/fop-1_1rc1/examples/fo/tables/borders.fo
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-1_1rc1/examples/fo/tables/borders.fo?rev=1354655&r1=1354654&r2=1354655&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-1_1rc1/examples/fo/tables/borders.fo (original)
+++ xmlgraphics/fop/branches/fop-1_1rc1/examples/fo/tables/borders.fo Wed Jun 27 18:20:40 2012
@@ -30,7 +30,7 @@
Table 1: cell borders
</fo:block>
- <fo:table border-collapse="separate">
+ <fo:table border-collapse="separate" table-layout="fixed" width="100%">
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
@@ -186,7 +186,7 @@
Table 2: row borders
</fo:block>
- <fo:table border-collapse="collapse">
+ <fo:table border-collapse="collapse" table-layout="fixed" width="100%">
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
@@ -310,7 +310,7 @@
Table 3: column borders
</fo:block>
- <fo:table border-collapse="collapse">
+ <fo:table border-collapse="collapse" table-layout="fixed" width="100%">
<fo:table-column column-width="3cm" border-left-color="green" border-left-width="0.5pt" border-left-style="solid"/>
<fo:table-column column-width="3cm" border-top-color="red" border-top-width="0.5pt" border-top-style="solid"/>
<fo:table-column column-width="3cm" border-right-color="blue" border-right-width="0.5pt" border-right-style="solid"/>
@@ -377,7 +377,7 @@
Table 4: column borders over page
</fo:block>
- <fo:table border-collapse="collapse">
+ <fo:table border-collapse="collapse" table-layout="fixed" width="100%">
<fo:table-column column-width="3cm" border-left-color="green" border-left-width="0.5pt" border-left-style="solid"/>
<fo:table-column column-width="3cm" border-top-color="red" border-top-width="0.5pt" border-top-style="solid"/>
<fo:table-column column-width="3cm" border-right-color="blue" border-right-width="0.5pt" border-right-style="solid"/>
@@ -444,7 +444,7 @@
Table 5: body borders
</fo:block>
- <fo:table border-collapse="separate">
+ <fo:table border-collapse="separate" table-layout="fixed" width="100%">
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
@@ -480,7 +480,7 @@
</fo:table-body>
</fo:table>
- <fo:table border-collapse="separate">
+ <fo:table border-collapse="separate" table-layout="fixed" width="100%">
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
@@ -516,7 +516,7 @@
</fo:table-body>
</fo:table>
- <fo:table border-collapse="separate">
+ <fo:table border-collapse="separate" table-layout="fixed" width="100%">
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
@@ -552,7 +552,7 @@
</fo:table-body>
</fo:table>
- <fo:table border-collapse="separate">
+ <fo:table border-collapse="separate" table-layout="fixed" width="100%">
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
@@ -588,7 +588,7 @@
</fo:table-body>
</fo:table>
- <fo:table border-collapse="separate">
+ <fo:table border-collapse="separate" table-layout="fixed" width="100%">
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
@@ -628,8 +628,7 @@
Table 6: table borders
</fo:block>
- <fo:table border-left-color="green" border-left-width="0.5pt" border-left-style="solid"
- border-collapse="separate">
+ <fo:table border-left-color="green" border-left-width="0.5pt" border-left-style="solid" border-collapse="separate" table-layout="fixed" width="100%">
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
@@ -665,7 +664,7 @@
</fo:table-body>
</fo:table>
- <fo:table border-top-color="red" border-top-width="0.5pt" border-top-style="solid" border-collapse="separate">
+ <fo:table border-top-color="red" border-top-width="0.5pt" border-top-style="solid" border-collapse="separate" table-layout="fixed" width="100%">
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
@@ -701,7 +700,7 @@
</fo:table-body>
</fo:table>
- <fo:table border-right-color="blue" border-right-width="0.5pt" border-right-style="solid" border-collapse="separate">
+ <fo:table border-right-color="blue" border-right-width="0.5pt" border-right-style="solid" border-collapse="separate" table-layout="fixed" width="100%">
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
@@ -737,7 +736,7 @@
</fo:table-body>
</fo:table>
- <fo:table border-bottom-color="yellow" border-bottom-width="0.5pt" border-bottom-style="solid" border-collapse="separate">
+ <fo:table border-bottom-color="yellow" border-bottom-width="0.5pt" border-bottom-style="solid" border-collapse="separate" table-layout="fixed" width="100%">
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
@@ -773,7 +772,7 @@
</fo:table-body>
</fo:table>
- <fo:table border-color="orange" border-width="0.5pt" border-style="solid" border-collapse="separate">
+ <fo:table border-color="orange" border-width="0.5pt" border-style="solid" border-collapse="separate" table-layout="fixed" width="100%">
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
@@ -813,7 +812,7 @@
Table 7: combinations
</fo:block>
- <fo:table border-left-color="green" border-left-width="0.5pt" border-left-style="solid" border-collapse="collapse">
+ <fo:table border-left-color="green" border-left-width="0.5pt" border-left-style="solid" border-collapse="collapse" table-layout="fixed" width="100%">
<fo:table-column column-width="2.5cm"/>
<fo:table-column column-width="2.5cm" border-left-color="green" border-left-width="0.5pt" border-left-style="solid"/>
<fo:table-column column-width="2.5cm" border-top-color="red" border-top-width="0.5pt" border-top-style="solid"/>
@@ -1025,7 +1024,7 @@
implementation status.
</fo:block>
- <fo:table border-collapse="collapse" table-layout="fixed">
+ <fo:table border-collapse="collapse" table-layout="fixed" width="100%">
<fo:table-column column-width="3cm" border-color="blue" border-width="0.5pt" border-style="solid"/>
<fo:table-column column-width="3cm" border-color="blue" border-width="0.5pt" border-style="solid"/>
<fo:table-column column-width="3cm" border-color="blue" border-width="0.5pt" border-style="solid"/>
@@ -1090,7 +1089,7 @@
fo:table-cell level.
</fo:block>
- <fo:table border-collapse="collapse" table-layout="fixed">
+ <fo:table border-collapse="collapse" table-layout="fixed" width="100%">
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
@@ -1159,7 +1158,7 @@
Check the FOP compliance page for current implementation status.
</fo:block>
- <fo:table border-collapse="collapse" table-layout="fixed"
+ <fo:table border-collapse="collapse" table-layout="fixed" width="100%"
border-style="solid" border-width="5pt" border-color="yellow">
<fo:table-column column-width="3cm"
border-style="solid" border-width="3pt" border-color="black"/>
@@ -1264,7 +1263,7 @@
the border properties differ only on color.
</fo:block>
- <fo:table border-collapse="collapse" table-layout="fixed">
+ <fo:table border-collapse="collapse" table-layout="fixed" width="100%">
<fo:table-column column-width="3cm"
border-style="solid" border-width="3pt" border-color="black"/>
Modified: xmlgraphics/fop/branches/fop-1_1rc1/examples/fo/tables/break.fo
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-1_1rc1/examples/fo/tables/break.fo?rev=1354655&r1=1354654&r2=1354655&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-1_1rc1/examples/fo/tables/break.fo (original)
+++ xmlgraphics/fop/branches/fop-1_1rc1/examples/fo/tables/break.fo Wed Jun 27 18:20:40 2012
@@ -34,7 +34,7 @@
Table 1: basic break after with next
</fo:block>
- <fo:table border-width="0.5pt" border-color="red">
+ <fo:table border-width="0.5pt" border-color="red" table-layout="fixed" width="100%">
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
@@ -81,7 +81,7 @@
Table 2: basic break before with next
</fo:block>
- <fo:table border-width="0.5pt" border-color="red">
+ <fo:table border-width="0.5pt" border-color="red" table-layout="fixed" width="100%">
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
@@ -128,7 +128,7 @@
Table 3: basic break before a keep with next
</fo:block>
- <fo:table border-width="0.5pt" border-color="red">
+ <fo:table border-width="0.5pt" border-color="red" table-layout="fixed" width="100%">
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
@@ -175,7 +175,7 @@
Table 4: basic break after a keep with previous
</fo:block>
- <fo:table border-width="0.5pt" border-color="red">
+ <fo:table border-width="0.5pt" border-color="red" table-layout="fixed" width="100%">
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
@@ -222,7 +222,7 @@
Table 5: basic break after a keep with previous
</fo:block>
- <fo:table border-width="0.5pt" border-color="red">
+ <fo:table border-width="0.5pt" border-color="red" table-layout="fixed" width="100%">
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
Modified: xmlgraphics/fop/branches/fop-1_1rc1/examples/fo/tables/headfoot.fo
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-1_1rc1/examples/fo/tables/headfoot.fo?rev=1354655&r1=1354654&r2=1354655&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-1_1rc1/examples/fo/tables/headfoot.fo (original)
+++ xmlgraphics/fop/branches/fop-1_1rc1/examples/fo/tables/headfoot.fo Wed Jun 27 18:20:40 2012
@@ -30,7 +30,7 @@
Table 1: with header
</fo:block>
- <fo:table>
+ <fo:table table-layout="fixed" width="100%">
<fo:table-column column-width="2cm"/>
<fo:table-column column-width="2cm"/>
<fo:table-column column-width="2cm"/>
@@ -311,7 +311,7 @@
Table 2: with footer
</fo:block>
- <fo:table>
+ <fo:table table-layout="fixed" width="100%">
<fo:table-column column-width="2cm"/>
<fo:table-column column-width="2cm"/>
<fo:table-column column-width="2cm"/>
@@ -592,7 +592,7 @@
Table 3: with header and footer and keeps
</fo:block>
- <fo:table>
+ <fo:table table-layout="fixed" width="100%">
<fo:table-column column-width="2cm"/>
<fo:table-column column-width="2cm"/>
<fo:table-column column-width="2cm"/>
@@ -888,7 +888,7 @@
Table 4: cells spanning columns
</fo:block>
- <fo:table>
+ <fo:table table-layout="fixed" width="100%">
<fo:table-column column-width="2cm"/>
<fo:table-column column-width="2cm"/>
<fo:table-column column-width="2cm"/>
@@ -940,7 +940,7 @@
Table 5: cells spanning rows
</fo:block>
- <fo:table>
+ <fo:table table-layout="fixed" width="100%">
<fo:table-column column-width="48pt"/>
<fo:table-column column-width="48pt"/>
<fo:table-column column-width="48pt"/>
@@ -1054,7 +1054,7 @@
Table 6: table with header and multiple body's
</fo:block>
- <fo:table>
+ <fo:table table-layout="fixed" width="100%">
<fo:table-column column-width="2cm"/>
<fo:table-column column-width="2cm"/>
<fo:table-column column-width="2cm"/>
@@ -1242,7 +1242,7 @@
Table 6: table with footer and multiple body's
</fo:block>
- <fo:table>
+ <fo:table table-layout="fixed" width="100%">
<fo:table-column column-width="2cm"/>
<fo:table-column column-width="2cm"/>
<fo:table-column column-width="2cm"/>
Modified: xmlgraphics/fop/branches/fop-1_1rc1/examples/fo/tables/keep.fo
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-1_1rc1/examples/fo/tables/keep.fo?rev=1354655&r1=1354654&r2=1354655&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-1_1rc1/examples/fo/tables/keep.fo (original)
+++ xmlgraphics/fop/branches/fop-1_1rc1/examples/fo/tables/keep.fo Wed Jun 27 18:20:40 2012
@@ -34,7 +34,7 @@
Table 1: basic keep with next
</fo:block>
- <fo:table border-width="0.5pt" border-color="red">
+ <fo:table border-width="0.5pt" border-color="red" table-layout="fixed" width="100%">
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
@@ -81,7 +81,7 @@
Table 1: basic keep with previous
</fo:block>
- <fo:table border-width="0.5pt" border-color="red">
+ <fo:table border-width="0.5pt" border-color="red" table-layout="fixed" width="100%">
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
@@ -128,7 +128,7 @@
Table 1: basic keep with next and keep with previous
</fo:block>
- <fo:table border-width="0.5pt" border-color="red">
+ <fo:table border-width="0.5pt" border-color="red" table-layout="fixed" width="100%">
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
@@ -192,7 +192,7 @@
Table 1: basic multiple keep with next after normal row
</fo:block>
- <fo:table border-width="0.5pt" border-color="red">
+ <fo:table border-width="0.5pt" border-color="red" table-layout="fixed" width="100%">
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
@@ -324,7 +324,7 @@
Table 1: basic multiple keep (next and previous) after normal row
</fo:block>
- <fo:table border-width="0.5pt" border-color="red">
+ <fo:table border-width="0.5pt" border-color="red" table-layout="fixed" width="100%">
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="6cm"/>
@@ -456,7 +456,7 @@
Table 1: basic multiple keep with next after normal row with normal row in middle
</fo:block>
- <fo:table border-width="0.5pt" border-color="red">
+ <fo:table border-width="0.5pt" border-color="red" table-layout="fixed" width="100%">
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="6cm"/>
Modified: xmlgraphics/fop/branches/fop-1_1rc1/examples/fo/tables/omit.fo
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-1_1rc1/examples/fo/tables/omit.fo?rev=1354655&r1=1354654&r2=1354655&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-1_1rc1/examples/fo/tables/omit.fo (original)
+++ xmlgraphics/fop/branches/fop-1_1rc1/examples/fo/tables/omit.fo Wed Jun 27 18:20:40 2012
@@ -30,7 +30,7 @@
Table 1: with header
</fo:block>
- <fo:table table-omit-header-at-break="true">
+ <fo:table table-omit-header-at-break="true" table-layout="fixed" width="100%">
<fo:table-column column-width="2cm"/>
<fo:table-column column-width="2cm"/>
<fo:table-column column-width="2cm"/>
@@ -311,7 +311,7 @@
Table 2: with footer
</fo:block>
- <fo:table table-omit-footer-at-break="true">
+ <fo:table table-omit-footer-at-break="true" table-layout="fixed" width="100%">
<fo:table-column column-width="2cm"/>
<fo:table-column column-width="2cm"/>
<fo:table-column column-width="2cm"/>
@@ -592,7 +592,7 @@
Table 3: with header and footer and keeps
</fo:block>
- <fo:table table-omit-header-at-break="true" table-omit-footer-at-break="true">
+ <fo:table table-omit-header-at-break="true" table-omit-footer-at-break="true" table-layout="fixed" width="100%">
<fo:table-column column-width="2cm"/>
<fo:table-column column-width="2cm"/>
<fo:table-column column-width="2cm"/>
@@ -888,7 +888,7 @@
Table 6: table with multiple body's
</fo:block>
- <fo:table table-omit-header-at-break="true">
+ <fo:table table-omit-header-at-break="true" table-layout="fixed" width="100%">
<fo:table-column column-width="2cm"/>
<fo:table-column column-width="2cm"/>
<fo:table-column column-width="2cm"/>
@@ -1076,7 +1076,7 @@
Table 6: table with multiple body's
</fo:block>
- <fo:table table-omit-footer-at-break="true">
+ <fo:table table-omit-footer-at-break="true" table-layout="fixed" width="100%">
<fo:table-column column-width="2cm"/>
<fo:table-column column-width="2cm"/>
<fo:table-column column-width="2cm"/>
Modified: xmlgraphics/fop/branches/fop-1_1rc1/examples/fo/tables/space.fo
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-1_1rc1/examples/fo/tables/space.fo?rev=1354655&r1=1354654&r2=1354655&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-1_1rc1/examples/fo/tables/space.fo (original)
+++ xmlgraphics/fop/branches/fop-1_1rc1/examples/fo/tables/space.fo Wed Jun 27 18:20:40 2012
@@ -30,7 +30,7 @@
Table 1: spaces around cells
</fo:block>
- <fo:table border-style="solid" border-width="0.5pt" border-color="red">
+ <fo:table border-style="solid" border-width="0.5pt" border-color="red" table-layout="fixed" width="100%">
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
@@ -109,7 +109,7 @@
Table 2: spaces around rows
</fo:block>
- <fo:table border-style="solid" border-width="0.5pt" border-color="red">
+ <fo:table border-style="solid" border-width="0.5pt" border-color="red" table-layout="fixed" width="100%">
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
@@ -190,7 +190,7 @@
Table 3: spaces around body
</fo:block>
- <fo:table border-style="solid" border-width="0.5pt" border-color="red">
+ <fo:table border-style="solid" border-width="0.5pt" border-color="red" table-layout="fixed" width="100%">
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
@@ -281,7 +281,7 @@
</fo:block>
<fo:block border-style="solid" border-width="0.5pt">
- <fo:table space-before.optimum="5pt" border-style="solid" border-width="0.5pt" border-color="red">
+ <fo:table space-before.optimum="5pt" border-style="solid" border-width="0.5pt" border-color="red" table-layout="fixed" width="100%">
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
@@ -309,7 +309,7 @@
</fo:block>
<fo:block border-style="solid" border-width="0.5pt">
- <fo:table padding-left="5pt" border-style="solid" border-width="0.5pt" border-color="red">
+ <fo:table padding-left="5pt" border-style="solid" border-width="0.5pt" border-color="red" table-layout="fixed" width="100%">
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
@@ -337,7 +337,7 @@
</fo:block>
<fo:block border-style="solid" border-width="0.5pt">
- <fo:table padding-right="5pt" border-style="solid" border-width="0.5pt" border-color="red">
+ <fo:table padding-right="5pt" border-style="solid" border-width="0.5pt" border-color="red" table-layout="fixed" width="100%">
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
@@ -365,7 +365,7 @@
</fo:block>
<fo:block border-style="solid" border-width="0.5pt">
- <fo:table space-after.optimum="5pt" border-style="solid" border-width="0.5pt" border-color="red">
+ <fo:table space-after.optimum="5pt" border-style="solid" border-width="0.5pt" border-color="red" table-layout="fixed" width="100%">
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
@@ -397,7 +397,7 @@
</fo:block>
<fo:block border-style="solid" border-width="0.5pt">
- <fo:table space-after.optimum="20pt" border-style="solid" border-width="0.5pt" border-color="red">
+ <fo:table space-after.optimum="20pt" border-style="solid" border-width="0.5pt" border-color="red" table-layout="fixed" width="100%">
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
@@ -462,7 +462,7 @@
</fo:block>
<fo:block border-style="solid" border-width="0.5pt">
- <fo:table space-after.optimum="5pt" border-style="solid" border-width="0.5pt" border-color="red">
+ <fo:table space-after.optimum="5pt" border-style="solid" border-width="0.5pt" border-color="red" table-layout="fixed" width="100%">
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
<fo:table-column column-width="3cm"/>
Modified: xmlgraphics/fop/branches/fop-1_1rc1/findbugs-exclude.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-1_1rc1/findbugs-exclude.xml?rev=1354655&r1=1354654&r2=1354655&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-1_1rc1/findbugs-exclude.xml (original)
+++ xmlgraphics/fop/branches/fop-1_1rc1/findbugs-exclude.xml Wed Jun 27 18:20:40 2012
@@ -959,11 +959,6 @@
<Bug pattern="RV_EXCEPTION_NOT_THROWN"/>
</Match>
<Match>
- <Class name="org.apache.fop.hyphenation.HyphenationTreeCache"/>
- <Method name="constructUserKey"/>
- <Bug pattern="RV_RETURN_VALUE_IGNORED"/>
- </Match>
- <Match>
<Class name="org.apache.fop.afp.AFPResourceLevel"/>
<Method name="equals"/>
<Bug pattern="SA_FIELD_SELF_COMPARISON"/>
Modified: xmlgraphics/fop/branches/fop-1_1rc1/src/documentation/content/xdocs/examples.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-1_1rc1/src/documentation/content/xdocs/examples.xml?rev=1354655&r1=1354654&r2=1354655&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-1_1rc1/src/documentation/content/xdocs/examples.xml (original)
+++ xmlgraphics/fop/branches/fop-1_1rc1/src/documentation/content/xdocs/examples.xml Wed Jun 27 18:20:40 2012
@@ -39,7 +39,7 @@
<tr>
<td>default font characters</td>
<td><link href="fo/fonts.fo">fonts.fo</link></td>
- <td><link href="fo/fonts.fo.pdf">fonts.fo.pdf</link></td>
+ <td><link href="fo/fonts.pdf">fonts.pdf</link></td>
</tr>
</table>
<p>Other basic examples on the use of XSL-FO can be found in the FOP distribution in
@@ -100,17 +100,17 @@ Embedding images in FO:
<tr>
<td>align in larger viewport</td>
<td><link href="fo/align.fo">align.fo</link></td>
- <td><link href="fo/align.fo.pdf">align.fo.pdf</link></td>
+ <td><link href="fo/align.pdf">align.pdf</link></td>
</tr>
<tr>
<td>align in smaller viewport</td>
<td><link href="fo/align2.fo">align2.fo</link></td>
- <td><link href="fo/align2.fo.pdf">align2.fo.pdf</link></td>
+ <td><link href="fo/align2.pdf">align2.pdf</link></td>
</tr>
<tr>
<td>scaling image</td>
<td><link href="fo/size.fo">size.fo</link></td>
- <td><link href="fo/size.fo.pdf">size.fo.pdf</link></td>
+ <td><link href="fo/size.pdf">size.pdf</link></td>
</tr>
</table>
<p>Look also into the directory examples/fo/svg. There you find some very extensive SVG examples.
@@ -132,7 +132,7 @@ Instream Foreign Object images in FO, th
<tr>
<td>embedding svg in viewport</td>
<td><link href="fo/embed.fo">embed.fo</link></td>
- <td><link href="fo/embed.fo.pdf">embed.fo.pdf</link></td>
+ <td><link href="fo/embed.pdf">embed.pdf</link></td>
</tr>
</table>
</section>
Modified: xmlgraphics/fop/branches/fop-1_1rc1/src/documentation/content/xdocs/fo/align.fo
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-1_1rc1/src/documentation/content/xdocs/fo/align.fo?rev=1354655&r1=1354654&r2=1354655&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-1_1rc1/src/documentation/content/xdocs/fo/align.fo (original)
+++ xmlgraphics/fop/branches/fop-1_1rc1/src/documentation/content/xdocs/fo/align.fo Wed Jun 27 18:20:40 2012
@@ -19,19 +19,18 @@
<fo:root font-family="Times Roman" font-size="12pt" text-align="center" xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:layout-master-set>
- <fo:simple-page-master
- margin-right="1.5cm"
- margin-left="1.5cm"
- margin-bottom="2cm"
- margin-top="1cm"
- page-width="21cm"
- page-height="29.7cm"
- master-name="left">
- <fo:region-before extent="1cm"/>
- <fo:region-body margin-top="1cm"/>
- <fo:region-after extent="1.5cm"/>
- </fo:simple-page-master>
-
+ <fo:simple-page-master
+ margin-right="1.5cm"
+ margin-left="1.5cm"
+ margin-bottom="2cm"
+ margin-top="1cm"
+ page-width="21cm"
+ page-height="29.7cm"
+ master-name="left">
+ <fo:region-body margin-top="1cm"/>
+ <fo:region-before extent="1cm"/>
+ <fo:region-after extent="1.5cm"/>
+ </fo:simple-page-master>
</fo:layout-master-set>
<fo:page-sequence id="N2528" master-reference="left">
Added: xmlgraphics/fop/branches/fop-1_1rc1/src/documentation/content/xdocs/fo/align.pdf
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-1_1rc1/src/documentation/content/xdocs/fo/align.pdf?rev=1354655&view=auto
==============================================================================
Files xmlgraphics/fop/branches/fop-1_1rc1/src/documentation/content/xdocs/fo/align.pdf (added) and xmlgraphics/fop/branches/fop-1_1rc1/src/documentation/content/xdocs/fo/align.pdf Wed Jun 27 18:20:40 2012 differ
Modified: xmlgraphics/fop/branches/fop-1_1rc1/src/documentation/content/xdocs/fo/align2.fo
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-1_1rc1/src/documentation/content/xdocs/fo/align2.fo?rev=1354655&r1=1354654&r2=1354655&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-1_1rc1/src/documentation/content/xdocs/fo/align2.fo (original)
+++ xmlgraphics/fop/branches/fop-1_1rc1/src/documentation/content/xdocs/fo/align2.fo Wed Jun 27 18:20:40 2012
@@ -19,19 +19,18 @@
<fo:root font-family="Times Roman" font-size="12pt" text-align="center" xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:layout-master-set>
- <fo:simple-page-master
- margin-right="1.5cm"
- margin-left="1.5cm"
- margin-bottom="2cm"
- margin-top="1cm"
- page-width="21cm"
- page-height="29.7cm"
- master-name="left">
- <fo:region-before extent="1cm"/>
- <fo:region-body margin-top="1cm"/>
- <fo:region-after extent="1.5cm"/>
- </fo:simple-page-master>
-
+ <fo:simple-page-master
+ margin-right="1.5cm"
+ margin-left="1.5cm"
+ margin-bottom="2cm"
+ margin-top="1cm"
+ page-width="21cm"
+ page-height="29.7cm"
+ master-name="left">
+ <fo:region-body margin-top="1cm"/>
+ <fo:region-before extent="1cm"/>
+ <fo:region-after extent="1.5cm"/>
+ </fo:simple-page-master>
</fo:layout-master-set>
<fo:page-sequence id="N2528" master-reference="left">
@@ -59,7 +58,7 @@ Default align:
<fo:block>
Default align:
(<fo:external-graphic width="50pt" height="50pt" overflow="hidden" src="images/fop.jpg"/>), start-before
-(<fo:external-graphic width="50pt" height="50pt" overflow="hidden" text-align="start" display-align="start" src="images/fop.jpg"/>), start-center
+(<fo:external-graphic width="50pt" height="50pt" overflow="hidden" text-align="start" display-align="before" src="images/fop.jpg"/>), start-center
(<fo:external-graphic width="50pt" height="50pt" overflow="hidden" text-align="start" display-align="center" src="images/fop.jpg"/>), start-after
(<fo:external-graphic width="50pt" height="50pt" overflow="hidden" text-align="start" display-align="after" src="images/fop.jpg"/>), center-before
(<fo:external-graphic width="50pt" height="50pt" overflow="hidden" text-align="center" display-align="before" src="images/fop.jpg"/>), center-after
Added: xmlgraphics/fop/branches/fop-1_1rc1/src/documentation/content/xdocs/fo/align2.pdf
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-1_1rc1/src/documentation/content/xdocs/fo/align2.pdf?rev=1354655&view=auto
==============================================================================
Files xmlgraphics/fop/branches/fop-1_1rc1/src/documentation/content/xdocs/fo/align2.pdf (added) and xmlgraphics/fop/branches/fop-1_1rc1/src/documentation/content/xdocs/fo/align2.pdf Wed Jun 27 18:20:40 2012 differ
Added: xmlgraphics/fop/branches/fop-1_1rc1/src/documentation/content/xdocs/fo/build.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-1_1rc1/src/documentation/content/xdocs/fo/build.xml?rev=1354655&view=auto
==============================================================================
--- xmlgraphics/fop/branches/fop-1_1rc1/src/documentation/content/xdocs/fo/build.xml (added)
+++ xmlgraphics/fop/branches/fop-1_1rc1/src/documentation/content/xdocs/fo/build.xml Wed Jun 27 18:20:40 2012
@@ -0,0 +1,70 @@
+<?xml version="1.0"?>
+<!--
+ 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.
+-->
+<!-- =========================================================================== -->
+<project default="newPDF" basedir=".">
+ <!-- =================================================================== -->
+ <!-- Initialization target -->
+ <!-- =================================================================== -->
+ <target name="init">
+ <tstamp/>
+ <mkdir dir="tests"/>
+ <property name="testDir" value="tests"/>
+ <property name="foDir" value="."/>
+ <path id="run-classpath">
+ <fileset dir="../../../../../lib">
+ <include name="*.jar"/>
+ </fileset>
+ <pathelement location="../../../../../build/fop.jar"/>
+ </path>
+ <taskdef name="fop" classname="org.apache.fop.tools.anttasks.Fop" classpathref="run-classpath"/>
+ </target>
+ <!-- =================================================================== -->
+ <!-- Help on usage -->
+ <!-- =================================================================== -->
+ <target name="usage">
+ <echo message="Use '-projecthelp' instead"/>
+ </target>
+ <!-- =================================================================== -->
+ <!-- Produces new test files (function) -->
+ <!-- =================================================================== -->
+ <target name="newTestFiles">
+ <fop format="${mimetype}" outdir="${outDir}" messagelevel="${msglevel}" relativebase="true" throwexceptions="false">
+ <fileset dir=".">
+ <include name="**/*.fo"/>
+ </fileset>
+ </fop>
+ </target>
+ <!-- =================================================================== -->
+ <!-- Produces new test PDF files -->
+ <!-- =================================================================== -->
+ <target name="newPDF" depends="init" description="Creates a new set of PDF test files">
+ <antcall target="newTestFiles">
+ <param name="mimetype" value="application/pdf"/>
+ <param name="msglevel" value="warn"/>
+ <param name="outDir" value="${testDir}"/>
+ </antcall>
+ </target>
+ <!-- =================================================================== -->
+ <!-- Clean targets -->
+ <!-- =================================================================== -->
+ <target name="clean" depends="init">
+ <delete dir="${testDir}"/>
+ </target>
+
+</project>
+<!-- End of file -->
Modified: xmlgraphics/fop/branches/fop-1_1rc1/src/documentation/content/xdocs/fo/embed.fo
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-1_1rc1/src/documentation/content/xdocs/fo/embed.fo?rev=1354655&r1=1354654&r2=1354655&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-1_1rc1/src/documentation/content/xdocs/fo/embed.fo (original)
+++ xmlgraphics/fop/branches/fop-1_1rc1/src/documentation/content/xdocs/fo/embed.fo Wed Jun 27 18:20:40 2012
@@ -23,19 +23,18 @@
<fo:root font-family="Times Roman" font-size="12pt" xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:layout-master-set>
- <fo:simple-page-master
- margin-right="1.5cm"
- margin-left="1.5cm"
- margin-bottom="2cm"
- margin-top="1cm"
- page-width="21cm"
- page-height="29.7cm"
- master-name="left">
- <fo:region-before extent="1cm"/>
- <fo:region-body margin-top="1cm"/>
- <fo:region-after extent="1.5cm"/>
- </fo:simple-page-master>
-
+ <fo:simple-page-master
+ margin-right="1.5cm"
+ margin-left="1.5cm"
+ margin-bottom="2cm"
+ margin-top="1cm"
+ page-width="21cm"
+ page-height="29.7cm"
+ master-name="left">
+ <fo:region-body margin-top="1cm"/>
+ <fo:region-before extent="1cm"/>
+ <fo:region-after extent="1.5cm"/>
+ </fo:simple-page-master>
</fo:layout-master-set>
<fo:page-sequence id="N2528" master-reference="left">
Added: xmlgraphics/fop/branches/fop-1_1rc1/src/documentation/content/xdocs/fo/embed.pdf
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-1_1rc1/src/documentation/content/xdocs/fo/embed.pdf?rev=1354655&view=auto
==============================================================================
Files xmlgraphics/fop/branches/fop-1_1rc1/src/documentation/content/xdocs/fo/embed.pdf (added) and xmlgraphics/fop/branches/fop-1_1rc1/src/documentation/content/xdocs/fo/embed.pdf Wed Jun 27 18:20:40 2012 differ
Modified: xmlgraphics/fop/branches/fop-1_1rc1/src/documentation/content/xdocs/fo/fonts.fo
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-1_1rc1/src/documentation/content/xdocs/fo/fonts.fo?rev=1354655&r1=1354654&r2=1354655&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-1_1rc1/src/documentation/content/xdocs/fo/fonts.fo (original)
+++ xmlgraphics/fop/branches/fop-1_1rc1/src/documentation/content/xdocs/fo/fonts.fo Wed Jun 27 18:20:40 2012
@@ -18,32 +18,32 @@
<!-- $Id$ -->
<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
- <!-- defines the layout master -->
- <fo:layout-master-set>
- <fo:simple-page-master master-name="first"
- page-height="29.7cm"
- page-width="21cm"
- margin-top="1cm"
- margin-bottom="2cm"
- margin-left="2.5cm"
- margin-right="2.5cm">
- <fo:region-body margin-top="1cm"/>
- <fo:region-before extent="1cm"/>
- <fo:region-after extent="1.5cm"/>
- </fo:simple-page-master>
- </fo:layout-master-set>
-
- <!-- starts actual layout -->
- <fo:page-sequence master-reference="first">
+<!-- defines the layout master -->
+<fo:layout-master-set>
+ <fo:simple-page-master
+ master-name="first"
+ page-height="29.7cm"
+ page-width="21cm"
+ margin-top="1cm"
+ margin-bottom="2cm"
+ margin-left="2.5cm"
+ margin-right="2.5cm">
+ <fo:region-body margin-top="1cm"/>
+ <fo:region-before extent="1cm"/>
+ <fo:region-after extent="1.5cm"/>
+ </fo:simple-page-master>
+</fo:layout-master-set>
+<!-- starts actual layout -->
+<fo:page-sequence master-reference="first">
<fo:flow flow-name="xsl-region-body">
- <fo:block font-family="Helvetica" font-size="14pt">
+<fo:block font-family="Helvetica" font-size="14pt">
Helvetica
</fo:block>
- <fo:block space-after.optimum="10pt" font-family="Helvetica" font-size="10pt">
-<fo:table>
+<fo:block space-after.optimum="10pt" font-family="Helvetica" font-size="10pt">
+<fo:table table-layout="fixed" width="100%">
<fo:table-column column-width="65pt"/>
<fo:table-column column-width="30pt"/>
<fo:table-column column-width="65pt"/>
@@ -303,7 +303,7 @@ Helvetica
Times Roman
</fo:block>
<fo:block space-after.optimum="10pt" font-family="Times Roman" font-size="10pt">
-<fo:table>
+<fo:table table-layout="fixed" width="100%">
<fo:table-column column-width="65pt"/>
<fo:table-column column-width="30pt"/>
<fo:table-column column-width="65pt"/>
@@ -563,7 +563,7 @@ Times Roman
Courier
</fo:block>
<fo:block space-after.optimum="10pt" font-family="Courier" font-size="10pt">
-<fo:table>
+<fo:table table-layout="fixed" width="100%">
<fo:table-column column-width="65pt"/>
<fo:table-column column-width="30pt"/>
<fo:table-column column-width="65pt"/>
@@ -823,7 +823,7 @@ Courier
ZapfDingbats:
</fo:block>
<fo:block space-after.optimum="10pt" font-family="ZapfDingbats" font-size="10pt">
-<fo:table>
+<fo:table table-layout="fixed" width="100%">
<fo:table-column column-width="65pt"/>
<fo:table-column column-width="30pt"/>
<fo:table-column column-width="65pt"/>
@@ -1071,7 +1071,7 @@ Courier
Symbol:
</fo:block>
<fo:block space-after.optimum="10pt" font-family="Symbol" font-size="10pt">
-<fo:table>
+<fo:table table-layout="fixed" width="100%">
<fo:table-column column-width="65pt"/>
<fo:table-column column-width="30pt"/>
<fo:table-column column-width="65pt"/>
Added: xmlgraphics/fop/branches/fop-1_1rc1/src/documentation/content/xdocs/fo/fonts.pdf
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-1_1rc1/src/documentation/content/xdocs/fo/fonts.pdf?rev=1354655&view=auto
==============================================================================
Files xmlgraphics/fop/branches/fop-1_1rc1/src/documentation/content/xdocs/fo/fonts.pdf (added) and xmlgraphics/fop/branches/fop-1_1rc1/src/documentation/content/xdocs/fo/fonts.pdf Wed Jun 27 18:20:40 2012 differ
Modified: xmlgraphics/fop/branches/fop-1_1rc1/src/documentation/content/xdocs/fo/size.fo
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-1_1rc1/src/documentation/content/xdocs/fo/size.fo?rev=1354655&r1=1354654&r2=1354655&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-1_1rc1/src/documentation/content/xdocs/fo/size.fo (original)
+++ xmlgraphics/fop/branches/fop-1_1rc1/src/documentation/content/xdocs/fo/size.fo Wed Jun 27 18:20:40 2012
@@ -19,19 +19,18 @@
<fo:root font-family="Times Roman" font-size="12pt" xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:layout-master-set>
- <fo:simple-page-master
- margin-right="1.5cm"
- margin-left="1.5cm"
- margin-bottom="2cm"
- margin-top="1cm"
- page-width="21cm"
- page-height="29.7cm"
- master-name="left">
- <fo:region-before extent="0.5cm"/>
- <fo:region-body margin-top="0.5cm" margin-bottom="1.7cm"/>
- <fo:region-after extent="1.5cm"/>
- </fo:simple-page-master>
-
+ <fo:simple-page-master
+ margin-right="1.5cm"
+ margin-left="1.5cm"
+ margin-bottom="2cm"
+ margin-top="1cm"
+ page-width="21cm"
+ page-height="29.7cm"
+ master-name="left">
+ <fo:region-body margin-top="0.5cm" margin-bottom="1.7cm"/>
+ <fo:region-before extent="0.5cm"/>
+ <fo:region-after extent="1.5cm"/>
+ </fo:simple-page-master>
</fo:layout-master-set>
<fo:page-sequence id="N2528" master-reference="left">
Added: xmlgraphics/fop/branches/fop-1_1rc1/src/documentation/content/xdocs/fo/size.pdf
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-1_1rc1/src/documentation/content/xdocs/fo/size.pdf?rev=1354655&view=auto
==============================================================================
Files xmlgraphics/fop/branches/fop-1_1rc1/src/documentation/content/xdocs/fo/size.pdf (added) and xmlgraphics/fop/branches/fop-1_1rc1/src/documentation/content/xdocs/fo/size.pdf Wed Jun 27 18:20:40 2012 differ
Modified: xmlgraphics/fop/branches/fop-1_1rc1/src/java/org/apache/fop/hyphenation/HyphenationTreeCache.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-1_1rc1/src/java/org/apache/fop/hyphenation/HyphenationTreeCache.java?rev=1354655&r1=1354654&r2=1354655&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-1_1rc1/src/java/org/apache/fop/hyphenation/HyphenationTreeCache.java (original)
+++ xmlgraphics/fop/branches/fop-1_1rc1/src/java/org/apache/fop/hyphenation/HyphenationTreeCache.java Wed Jun 27 18:20:40 2012
@@ -79,7 +79,7 @@ public class HyphenationTreeCache {
String userKey = null;
if (hyphPatNames != null) {
String key = constructLlccKey(lang, country);
- key.replace('_', '-');
+ key = key.replace('_', '-');
userKey = (String) hyphPatNames.get(key);
}
return userKey;
@@ -96,7 +96,7 @@ public class HyphenationTreeCache {
/**
* Notes a key to a hyphenation tree as missing.
- * This is to avoid searching a second time for a hyphneation pattern file which is not
+ * This is to avoid searching a second time for a hyphenation pattern file which is not
* available.
* @param key the key (ex. "de_CH" or "en")
*/
@@ -109,7 +109,7 @@ public class HyphenationTreeCache {
/**
* Indicates whether a hyphenation file has been requested before but it wasn't available.
- * This is to avoid searching a second time for a hyphneation pattern file which is not
+ * This is to avoid searching a second time for a hyphenation pattern file which is not
* available.
* @param key the key (ex. "de_CH" or "en")
* @return true if the hyphenation tree is unavailable
Modified: xmlgraphics/fop/branches/fop-1_1rc1/src/java/org/apache/fop/pdf/AbstractPDFStream.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-1_1rc1/src/java/org/apache/fop/pdf/AbstractPDFStream.java?rev=1354655&r1=1354654&r2=1354655&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-1_1rc1/src/java/org/apache/fop/pdf/AbstractPDFStream.java (original)
+++ xmlgraphics/fop/branches/fop-1_1rc1/src/java/org/apache/fop/pdf/AbstractPDFStream.java Wed Jun 27 18:20:40 2012
@@ -78,7 +78,7 @@ public abstract class AbstractPDFStream
* from outside.
*/
protected void setupFilterList() {
- if (!getFilterList().isInitialized()) {
+ if (multipleFiltersAllowed() && !getFilterList().isInitialized()) {
getFilterList().addDefaultFilters(
getDocumentSafely().getFilterMap(),
getDefaultFilterName());
@@ -273,4 +273,11 @@ public abstract class AbstractPDFStream
//nop: No default implicit filters
}
+ /**
+ * Whether multiple filters can be applied.
+ * @return true if multiple filters allowed
+ */
+ protected boolean multipleFiltersAllowed() {
+ return true;
+ }
}
Modified: xmlgraphics/fop/branches/fop-1_1rc1/src/java/org/apache/fop/pdf/AlphaRasterImage.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-1_1rc1/src/java/org/apache/fop/pdf/AlphaRasterImage.java?rev=1354655&r1=1354654&r2=1354655&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-1_1rc1/src/java/org/apache/fop/pdf/AlphaRasterImage.java (original)
+++ xmlgraphics/fop/branches/fop-1_1rc1/src/java/org/apache/fop/pdf/AlphaRasterImage.java Wed Jun 27 18:20:40 2012
@@ -212,6 +212,10 @@ public class AlphaRasterImage implements
return null;
}
+ /** {@inheritDoc} */
+ public boolean multipleFiltersAllowed() {
+ return true;
+ }
}
Modified: xmlgraphics/fop/branches/fop-1_1rc1/src/java/org/apache/fop/pdf/BitmapImage.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-1_1rc1/src/java/org/apache/fop/pdf/BitmapImage.java?rev=1354655&r1=1354654&r2=1354655&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-1_1rc1/src/java/org/apache/fop/pdf/BitmapImage.java (original)
+++ xmlgraphics/fop/branches/fop-1_1rc1/src/java/org/apache/fop/pdf/BitmapImage.java Wed Jun 27 18:20:40 2012
@@ -38,6 +38,7 @@ public class BitmapImage implements PDFI
private String key;
private PDFDocument pdfDoc;
private PDFFilter pdfFilter;
+ private boolean multipleFiltersAllowed = true;
/**
* Create a bitmap image.
@@ -215,6 +216,17 @@ public class BitmapImage implements PDFI
public void setPDFFilter(PDFFilter pdfFilter) {
this.pdfFilter = pdfFilter;
}
-}
+ /** {@inheritDoc} */
+ public boolean multipleFiltersAllowed() {
+ return multipleFiltersAllowed;
+ }
+
+ /**
+ * Disallows multiple filters.
+ */
+ public void disallowMultipleFilters() {
+ multipleFiltersAllowed = false;
+ }
+}
Modified: xmlgraphics/fop/branches/fop-1_1rc1/src/java/org/apache/fop/pdf/PDFImage.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-1_1rc1/src/java/org/apache/fop/pdf/PDFImage.java?rev=1354655&r1=1354654&r2=1354655&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-1_1rc1/src/java/org/apache/fop/pdf/PDFImage.java (original)
+++ xmlgraphics/fop/branches/fop-1_1rc1/src/java/org/apache/fop/pdf/PDFImage.java Wed Jun 27 18:20:40 2012
@@ -151,5 +151,13 @@ public interface PDFImage {
*/
String getFilterHint();
+ /**
+ * Indicates whether multiple image filters are allowed; this is implemented because Adobe
+ * Reader does not like multiple FlateDecode filters applied to an image even though that
+ * allowed by the PDF spec; this is probable due to security concerns since many PDF malware
+ * exploits, like zip bombs, make use of a chain of FlateDecode filters.
+ */
+ boolean multipleFiltersAllowed();
+
}
Modified: xmlgraphics/fop/branches/fop-1_1rc1/src/java/org/apache/fop/pdf/PDFImageXObject.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-1_1rc1/src/java/org/apache/fop/pdf/PDFImageXObject.java?rev=1354655&r1=1354654&r2=1354655&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-1_1rc1/src/java/org/apache/fop/pdf/PDFImageXObject.java (original)
+++ xmlgraphics/fop/branches/fop-1_1rc1/src/java/org/apache/fop/pdf/PDFImageXObject.java Wed Jun 27 18:20:40 2012
@@ -166,4 +166,9 @@ public class PDFImageXObject extends PDF
return pdfimage.getFilterHint();
}
+ /** {@inheritDoc} */
+ protected boolean multipleFiltersAllowed() {
+ return pdfimage.multipleFiltersAllowed();
+ }
+
}
Modified: xmlgraphics/fop/branches/fop-1_1rc1/src/java/org/apache/fop/render/pdf/AbstractImageAdapter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-1_1rc1/src/java/org/apache/fop/render/pdf/AbstractImageAdapter.java?rev=1354655&r1=1354654&r2=1354655&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-1_1rc1/src/java/org/apache/fop/render/pdf/AbstractImageAdapter.java (original)
+++ xmlgraphics/fop/branches/fop-1_1rc1/src/java/org/apache/fop/render/pdf/AbstractImageAdapter.java Wed Jun 27 18:20:40 2012
@@ -57,6 +57,8 @@ public abstract class AbstractImageAdapt
private static final int MAX_HIVAL = 255;
+ private boolean multipleFiltersAllowed = true;
+
/**
* Creates a new PDFImage from an Image instance.
* @param image the image
@@ -293,5 +295,17 @@ public abstract class AbstractImageAdapt
return pdfCS;
}
+ /** {@inheritDoc} */
+ public boolean multipleFiltersAllowed() {
+ return multipleFiltersAllowed;
+ }
+
+ /**
+ * Disallows multiple filters.
+ */
+ public void disallowMultipleFilters() {
+ multipleFiltersAllowed = false;
+ }
+
}
Modified: xmlgraphics/fop/branches/fop-1_1rc1/src/java/org/apache/fop/render/pdf/ImageRawPNGAdapter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-1_1rc1/src/java/org/apache/fop/render/pdf/ImageRawPNGAdapter.java?rev=1354655&r1=1354654&r2=1354655&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-1_1rc1/src/java/org/apache/fop/render/pdf/ImageRawPNGAdapter.java (original)
+++ xmlgraphics/fop/branches/fop-1_1rc1/src/java/org/apache/fop/render/pdf/ImageRawPNGAdapter.java Wed Jun 27 18:20:40 2012
@@ -103,6 +103,7 @@ public class ImageRawPNGAdapter extends
throw new RuntimeException("FlateFilter configuration error", e);
}
this.pdfFilter = flate;
+ this.disallowMultipleFilters();
// Handle transparency channel if applicable; note that for palette images the transparency is
// not TRANSLUCENT
@@ -154,6 +155,7 @@ public class ImageRawPNGAdapter extends
BitmapImage alphaMask = new BitmapImage("Mask:" + this.getKey(), image.getSize().getWidthPx(),
image.getSize().getHeightPx(), baos.toByteArray(), null);
alphaMask.setPDFFilter(transFlate);
+ alphaMask.disallowMultipleFilters();
alphaMask.setColorSpace(new PDFDeviceColorSpace(PDFDeviceColorSpace.DEVICE_GRAY));
softMask = doc.addImage(null, alphaMask).makeReference();
}
Modified: xmlgraphics/fop/branches/fop-1_1rc1/src/java/org/apache/fop/svg/PDFGraphics2D.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-1_1rc1/src/java/org/apache/fop/svg/PDFGraphics2D.java?rev=1354655&r1=1354654&r2=1354655&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-1_1rc1/src/java/org/apache/fop/svg/PDFGraphics2D.java (original)
+++ xmlgraphics/fop/branches/fop-1_1rc1/src/java/org/apache/fop/svg/PDFGraphics2D.java Wed Jun 27 18:20:40 2012
@@ -1201,6 +1201,8 @@ public class PDFGraphics2D extends Abstr
currentStream.write("] ");
float offset = bs.getDashPhase();
currentStream.write(PDFNumber.doubleOut(offset) + " d\n");
+ } else {
+ currentStream.write("[] 0 d\n");
}
int ec = bs.getEndCap();
switch (ec) {
Modified: xmlgraphics/fop/branches/fop-1_1rc1/status.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-1_1rc1/status.xml?rev=1354655&r1=1354654&r2=1354655&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-1_1rc1/status.xml (original)
+++ xmlgraphics/fop/branches/fop-1_1rc1/status.xml Wed Jun 27 18:20:40 2012
@@ -62,6 +62,18 @@
documents. Example: the fix of marks layering will be such a case when it's done.
-->
<release version="1.1rc1" date="02 July 2012">
+ <action context="Test" dev="GA" type="fix">
+ Fix errors and warnings in example files. Add build.xml for documentation examples.
+ </action>
+ <action context="Code" dev="GA" type="fix" fixes-bug="53458" due-to="Dieter von Holten">
+ Fix incorrect language and country code key generation in hyphenation tree cache.
+ </action>
+ <action context="Images" dev="GA" type="fix" fixes-bug="53431" due-to="Luis Bernardo">
+ Fix incorrect SVG line dash pattern with PDF output format.
+ </action>
+ <action context="Images" dev="GA" type="update" fixes-bug="40676" due-to="Luis Bernardo">
+ Fix interoperability issue with Adobe reader regarding use of multiple filters.
+ </action>
<action context="Code" dev="GA" type="fix">
Eliminate javadocs warnings.
</action>
Added: xmlgraphics/fop/branches/fop-1_1rc1/test/java/org/apache/fop/svg/PDFGraphics2DTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-1_1rc1/test/java/org/apache/fop/svg/PDFGraphics2DTestCase.java?rev=1354655&view=auto
==============================================================================
--- xmlgraphics/fop/branches/fop-1_1rc1/test/java/org/apache/fop/svg/PDFGraphics2DTestCase.java (added)
+++ xmlgraphics/fop/branches/fop-1_1rc1/test/java/org/apache/fop/svg/PDFGraphics2DTestCase.java Wed Jun 27 18:20:40 2012
@@ -0,0 +1,48 @@
+/*
+ * 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.svg;
+
+import java.awt.BasicStroke;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertTrue;
+
+public class PDFGraphics2DTestCase {
+
+ @Test
+ public void testApplyStrokeNullDash() {
+ PDFGraphics2D g2d = new PDFGraphics2D(false);
+ BasicStroke stroke = new BasicStroke();
+ g2d.applyStroke(stroke);
+ assertTrue(g2d.getString().contains("[] 0 d\n"));
+ }
+
+ @Test
+ public void testApplyStrokeNonNullDash() {
+ PDFGraphics2D g2d = new PDFGraphics2D(false);
+ float[] dashArray = {3.0f, 5.0f};
+ BasicStroke stroke = new BasicStroke(1.0f, BasicStroke.CAP_SQUARE, BasicStroke.JOIN_MITER, 10.0f,
+ dashArray, 0.0f);
+ g2d.applyStroke(stroke);
+ assertTrue(g2d.getString().contains("[3 5] 0 d\n"));
+ }
+
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org