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 sp...@apache.org on 2008/02/14 22:57:53 UTC
svn commit: r627882 [19/41] - in
/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking: ./
examples/embedding/ examples/embedding/java/embedding/
examples/embedding/java/embedding/intermediate/ examples/embedding/xml/xml/
examples/fo/ examples/...
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/status.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/status.xml?rev=627882&r1=627881&r2=627882&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/status.xml (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/status.xml Thu Feb 14 13:55:44 2008
@@ -28,49 +28,136 @@
<changes>
<release version="FOP Trunk">
- <action context="Code" dev="JM" type="add">
+ <action context="Fonts" dev="JM" type="add">
+ Added support for unusual font encodings (like for Symbol or Cyrillic fonts) of Type 1
+ fonts in PDF and PostScript output.
+ </action>
+ <action context="Layout" dev="VH" type="fix" fixes-bug="44321">
+ Moved to the FO tree stage the check for break-before/after on table-row while spanning in
+ progress.
+ </action>
+ <action context="Layout" dev="VH" type="add">
+ Added full support for breaks before and after table cells (that is, break-before/after set
+ on the first/last child of a cell).
+ </action>
+ <action context="Layout" dev="VH" type="add">
+ Added full support for breaks inside the cells of a table.
+ </action>
+ <action context="Code" dev="AD" type="fix" fixes-bug="41631">
+ Added correct percentage resolution for arguments to the proportional-column-width() function.
+ </action>
+ <action context="Fonts" dev="JM" type="fix">
+ Bugfix for date formatting with negative time zones in the PDF's Info object.
+ This affected PDF/A compliance.
+ </action>
+ <action context="Fonts" dev="JM" type="add">
+ Added an option to disable the default sRGB profile in PDF output for those who
+ don't care about color fidelity, but care about PDF file size.
+ </action>
+ <action context="Code" dev="AD" type="fix" fixes-bug="43705">
+ Fixed a bug when the rgb-icc() function was used either before the fo:declarations,
+ or in documents without a fo:declarations node. In such cases, the sRGB fallback
+ is now used to avoid an ugly NullPointerException.
+ </action>
+ <action context="Code" dev="AD" type="add">
+ Added very basic parsing for the xml:lang shorthand.
+ </action>
+ <action context="Code" dev="AD" type="fix" fixes-bug="44343">
+ Fixed a bug when using relative font-size (smaller/larger) in combination
+ with percentages.
+ </action>
+ <action context="Fonts" dev="JM" type="fix">
+ Bugfix for handling of optional tables in subset TrueType fonts. This bug caused errors
+ in various PDF viewers.
+ </action>
+ <action context="Renderers" dev="JM" type="add">
+ Added support for the natural language indentifier ("Lang" in the document catalog)
+ for PDF documents based on the language/country values on fo:page-sequence.
+ </action>
+ <action context="Code" dev="AD" type="fix" fixes-bug="44286" due-to="Stefan Ziel">
+ Fixed a memory-leak in XMLWhiteSpaceHandler.
+ </action>
+ <action context="Layout" dev="VH" type="fix" fixes-bug="44289">
+ Fixed the resolution of borders when header/footer is omitted at page breaks.
+ </action>
+ <action context="Layout" dev="VH" type="add" importance="high" fixes-bug="43934">
+ Added support for conditional borders in tables, for both the separate and the collapsing
+ border model.
+ </action>
+ <action context="Layout" dev="JM" type="fix" fixes-bug="44160">
+ Fixed a possible IndexOutOfBoundsException that could happen with certain constellations
+ when footnotes are used.
+ </action>
+ <action context="Layout" dev="JM" type="fix">
+ Compliance fix: for absolutely positioned block-containers, "top" wasn't
+ interpreted correctly.
+ </action>
+ <action context="Extensions" dev="JM" type="add">
+ New extension attribute fox:transform on fo:block-container allows free-form transformation
+ (rotation, scaling etc.) of absolute and fixed block-containers. Supported only
+ for PDF, PS and Java2D-based renderers.
+ </action>
+ <action context="Renderers" dev="JM" type="fix">
+ Fixed logic error setting the transformation matrix for block-container viewports
+ (applies to absolute and fixed block-containers only).
+ Important: External renderer implementations need to adjust for the change and implement
+ the new method concatenateTransformationMatrix(AffineTransform) if the renderer is
+ derived from AbstractPathOrientedRenderer.
+ </action>
+ <action context="Images" dev="JM" importance="high" type="fix">
+ A new image loading framework has been introduced to fix various problems with external
+ graphics and improve performance.
+ </action>
+ <action context="Renderers" dev="JM" type="fix">
+ Fixed generation of named destinations so it works when the PDF document is encrypted.
+ </action>
+ <action context="Renderers" dev="JM" type="add">
PostScript output now generates the bounding box DSC comments for the whole document.
</action>
- <action context="Code" dev="JM" type="add">
+ <action context="Renderers" dev="JM" type="add">
Added support for PDF page labels.
</action>
- <action context="Code" dev="JM" type="add" fixes-bug="44176" due-to="Patrick Jaromin">
+ <action context="Renderers" dev="JM" type="add" fixes-bug="44176" due-to="Patrick Jaromin">
Added support for custom fonts in Java2DRenderer and derived renderers.
</action>
- <action context="Code" dev="JM" type="add">
+ <action context="Extensions" dev="JM" type="add">
Added new extension element: fox:external-document. It allows to add whole documents
such as multi-page TIFF images to be inserted as peers to a page-sequence. Each image
will make up an entire page. See the documentation for details.
</action>
- <action context="Code" dev="JM" type="add">
+ <action context="Layout" dev="JM" type="add">
+ Added minimal support for the .minimum/.maximum components of block/inline-progression-dimension
+ on fo:external-graphic and fo:instream-foreign-object.
+ </action>
+ <action context="Layout" dev="JM" type="add">
Added support for scale-down-to-fit and scale-up-to-fit (introduced in XSL 1.1).
</action>
- <action context="Code" dev="VH" type="fix" fixes-bug="43633">
+ <action context="Layout" dev="VH" type="fix" fixes-bug="43633">
Bugfix: content of a row with zero height overriding the previous row
</action>
- <action context="Code" dev="AC" importance="high" type="add">
- Added SVG support for AFP (GOCA).
+ <action context="Renderers" dev="AC" importance="high" type="add">
+ Added SVG support for AFP (GOCA).
</action>
- <action context="Code" dev="JM" type="fix" fixes-bug="37993">
+ <action context="Renderers" dev="JM" type="fix" fixes-bug="37993">
Bugfix: allow multiple bookmarks to point at the same destination.
</action>
- <action context="Code" dev="JM" type="fix" fixes-bug="43917">
+ <action context="Layout" dev="JM" type="fix" fixes-bug="43917">
Bugfix for border-after painting and element list generation when a
forced break is involved.
</action>
- <action context="Code" dev="JM" type="fix" fixes-bug="40230">
+ <action context="Layout" dev="JM" type="fix" fixes-bug="40230">
Bugfix: no empty page is generated anymore if there's no content
after a break-after.
</action>
- <action context="Code" dev="VH" type="fix" fixes-bug="43803">
+ <action context="Layout" dev="VH" type="fix" fixes-bug="43803">
Restored proper handling of fo:table-cell having no children, which is allowed in relaxed
validation mode.
</action>
- <action context="Code" dev="JM" type="fix">
+ <action context="Layout" dev="JM" type="fix">
Memory Leak fixed in the Property Cache. Fixed by Jeremias Maerki. Reported and Tested By
Chris Bowditch.
</action>
- <action context="Code" dev="VH" type="fix" fixes-bug="43712">
+ <action context="Layout" dev="VH" type="fix" fixes-bug="43712">
Bugfix in tables: wrong element generation by the merging algorithm when glues must be
produced to cope with conditional spaces. The corresponding length was added twice: one in
the glue itself and one in the following box.
@@ -81,127 +168,137 @@
<action context="Code" dev="JM" type="fix" fixes-bug="43910" due-to="David Delbecq">
Avoid a NullPointerException in AreaTreeHandler.endDocument().
</action>
- <action context="Code" dev="VH" type="fix" fixes-bug="43766">
+ <action context="Layout" dev="VH" type="fix" fixes-bug="43766">
Bugfix: breaks generated by the merging algorithm for a table-row containing empty cells
had always a penalty of 900.
</action>
- <action context="Code" dev="JM" type="add" fixes-bug="43605" due-to="V. Schappert">
+ <action context="Layout" dev="JM" type="add" fixes-bug="43605" due-to="V. Schappert">
Added methods for fo:page-number-citation(-last) in FOEventHandler.
</action>
- <action context="Code" dev="VH" type="add">
+ <action context="Layout" dev="VH" type="add">
Step towards performance: the collapsing-border resolution algorithm no longer triggers the
retrieving of the whole table, when possible.
</action>
- <action context="Code" dev="VH" type="fix">
+ <action context="Layout" dev="VH" type="fix">
In case of missing cells the border-end of the table was applied to an inner cell, instead
of the (empty) cell in the last column.
</action>
- <action context="Code" dev="VH" type="fix">
+ <action context="Layout" dev="VH" type="fix">
Fixed the resolution of borders with table-columns (border-before/after was wrongly applied
to every cell of the column).
</action>
- <action context="Code" dev="VH" type="fix" fixes-bug="42768">
+ <action context="Layout" dev="VH" type="fix" fixes-bug="42768">
Fixed the resolution of border-end on cells spanning several rows.
</action>
- <action context="Code" dev="JM" type="fix" fixes-bug="43835" due-to="David Churavy">
+ <action context="Fonts" dev="JM" type="fix" fixes-bug="43835" due-to="David Churavy">
Bugfix: Use Font.getName() (logical font name) instead of Font.getFontName()
(localized) when registering fonts from AWT.
</action>
- <action context="Code" dev="JM" type="fix">
+ <action context="Fonts" dev="JM" type="fix">
Made the way TrueType fonts are embedded in PDF compliant to the
specification so viewers correctly identify subset fonts.
</action>
- <action context="Code" dev="JM" type="fix">
+ <action context="Fonts" dev="JM" type="fix">
Fixed font-autodetection so fonts with uppercase extensions are
detected, too.
</action>
- <action context="Code" dev="JM" type="update">
+ <action context="Fonts" dev="JM" type="update">
Improved font auto-detection and handling of AWT-supplied fonts in order
to achieve better results when using multiple output formats. Whenever
possible, the font names appearing in the operating system can also
be used in XSL-FO.
</action>
- <action context="Code" dev="JM" type="fix">
+ <action context="Renderers" dev="JM" type="fix">
Fixed regression: transparent-page-background was not recognized for PNG output.
</action>
- <action context="Code" dev="VH" type="add">
+ <action context="Layout" dev="VH" type="add">
Added check for table-cells which span more rows than available in their parent element
(table-header/footer/body).
</action>
- <action context="Code" dev="AD" type="add">
+ <action context="Layout" dev="AD" type="add">
Added support for fo:markers in fo:inline and fo:basic-link.
</action>
- <action context="Code" dev="JM" type="update">
+ <action context="Renderers" dev="JM" type="update">
PDF Transcoder (SVG) text painting has been completely rewritten.
Except for some special cases (with filters for example), all text
(including flow text) is now painted using PDF text operators.
</action>
- <action context="Code" dev="AD" type="add" fixes-bug="42748">
+ <action context="Layout" dev="AD" type="add" fixes-bug="42748">
Added support for ids on empty fo:inlines.
</action>
- <action context="Code" dev="AC" type="add" fixes-bug="42982" due-to="Max Berger">
+ <action context="Fonts" dev="AC" type="add" fixes-bug="42982" due-to="Max Berger">
Add Font support in jar files.
</action>
- <action context="Code" dev="AC" type="fix" fixes-bug="43042" due-to="Andrejus Chaliapinas">
+ <action context="Renderers" dev="AC" type="fix" fixes-bug="43042" due-to="Andrejus Chaliapinas">
Postscript extension cleanup.
</action>
- <action context="Code" dev="AC" type="fix" fixes-bug="43587">
+ <action context="Renderers" dev="AC" type="fix" fixes-bug="43587">
Fix to avoid ClassCastException where multiple ps:ps-comments are declared within fo:declarations.
</action>
- <action context="Code" dev="AC" type="fix" fixes-bug="43143">
- Fix to avoid NullPointerException when parsing ExpertEncoded and ExpertSubsetEncoded Type 1 fonts.
+ <action context="Fonts" dev="AC" type="fix" fixes-bug="43143">
+ Fix to avoid NullPointerException when parsing ExpertEncoded and ExpertSubsetEncoded Type 1 fonts.
</action>
- <action context="Code" dev="AC" type="fix" fixes-bug="43439">
+ <action context="Renderers" dev="AC" type="fix" fixes-bug="43439">
Fixes missing TLE value attribute when using AreaTree input with the AFP renderer.
</action>
- <action context="Code" dev="JM" type="add">
+ <action context="Renderers" dev="JM" type="add">
Added generic structures to the PDF library in order to support PDF
file in fo:external-graphic later.
</action>
<action context="Code" dev="JM" type="add" fixes-bug="43597" due-to="Max Berger">
Added support for SVGZ.
</action>
- <action context="Code" dev="JM" type="fix">
+ <action context="Layout" dev="JM" type="fix">
Bugfix for NPE with empty table-row (regression from 0.93).
</action>
- <action context="Code" dev="JM" type="add">
+ <action context="Renderers" dev="JM" type="add">
Added a configuration setting to the PCL renderer to disable PJL commands.
</action>
- <action context="Code" dev="JM" type="fix" fixes-bug="43464" due-to="Bruno Feurer">
+ <action context="Renderers" dev="JM" type="fix" fixes-bug="43464" due-to="Bruno Feurer">
Fix to avoid a ClassCastException in renderer configuration.
</action>
- <action context="Code" dev="JM" type="fix" fixes-bug="43439" due-to="Adrian Cumiskey">
+ <action context="Renderers" dev="JM" type="fix" fixes-bug="43439" due-to="Adrian Cumiskey">
Fixed the restoration of the TLE values from the intermediate format
for the AFP extension elements.
</action>
- <action context="Code" dev="JM" type="add" fixes-bug="43041" due-to="Adrian Cumiskey">
+ <action context="Renderers" dev="JM" type="add" fixes-bug="43041" due-to="Adrian Cumiskey">
Added a configuration setting for the renderer/device resolution to the AFP renderer.
</action>
- <action context="code" dev="AD" type="update">
- Facilitate the implementation for font-selection-strategy:
- * Changed FontInfo.fontLookup to always return an array of FontTriplet
- * Changed CommonFont.getFontState to return an array of FontTriplet
- * Initial modifications to the related LMs: initialized with
- the font corresponding to the first of the triplets
- </action>
- <action context="code" dev="AD" type="update">
- PropertyCache phase 2:
- * improvement of the PropertyCache itself should now guarantee acceptable
- performance of the static caches in multi-session environments, which is
- a possible problem with synchronizedMap
- * changed CommonFont to use the cache:
- added CachedCommonFont to contain the properties that are always cacheable
- CommonFont itself is only cached if the remaining properties are absolutes
- * changed CommonHyphenation, KeepProperty, ColorProperty and FontFamilyProperty to use the cache
+ <action context="Layout" dev="AD" type="update">
+ <p>
+ Facilitate the implementation for font-selection-strategy:
+ </p>
+ <ul>
+ <li>Changed FontInfo.fontLookup to always return an array of FontTriplet</li>
+ <li>Changed CommonFont.getFontState to return an array of FontTriplet</li>
+ <li>Initial modifications to the related LMs: initialized with
+ the font corresponding to the first of the triplets</li>
+ </ul>
+ </action>
+ <action context="Layout" dev="AD" type="update">
+ <p>PropertyCache phase 2:</p>
+ <ul>
+ <li>
+ improvement of the PropertyCache itself should now guarantee acceptable
+ performance of the static caches in multi-session environments, which is
+ a possible problem with synchronizedMap
+ </li>
+ <li>
+ changed CommonFont to use the cache:
+ added CachedCommonFont to contain the properties that are always cacheable
+ CommonFont itself is only cached if the remaining properties are absolutes
+ </li>
+ <li>changed CommonHyphenation, KeepProperty, ColorProperty and FontFamilyProperty to use the cache</li>
+ </ul>
</action>
- <action context="Code" dev="AD" type="fix" fixes-bug="42705">
+ <action context="Layout" dev="AD" type="fix" fixes-bug="42705">
Fixed swallowing PCDATA in text-node children of
retrieved markers.
</action>
- <action context="Code" dev="AD" type="fix" fixes-bug="42703">
+ <action context="Layout" dev="AD" type="fix" fixes-bug="42703">
Fixed erroneous white-space removal in retrieved markers.
</action>
- <action context="Code" dev="AD" type="fix" fixes-bug="43274" due-to="ckohrn.at.tng.de">
+ <action context="Layout" dev="AD" type="fix" fixes-bug="43274" due-to="ckohrn.at.tng.de">
Fixed erroneous usage of inherited color-values in SVG.
</action>
</release>
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/status.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/basictests.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/bugtests.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/disabled-testcases.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Id
+Revision Id
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/testcases/background-position-shorthand-test.fo
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/testcases/background-position-shorthand-test.fo?rev=627882&r1=627881&r2=627882&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/testcases/background-position-shorthand-test.fo (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/testcases/background-position-shorthand-test.fo Thu Feb 14 13:55:44 2008
@@ -25,47 +25,59 @@
<fo:page-sequence master-reference="simpleA4">
<fo:flow flow-name="xsl-region-body">
<fo:block background-image="../../resources/images/bgimg72dpi.jpg">
- <test:assert property="background-position-horizontal" expected="0.0%"/>
- <test:assert property="background-position-vertical" expected="0.0%"/>
+ <test:assert property="background-position-horizontal" expected="0mpt"/>
+ <test:assert property="background-position-vertical" expected="0mpt"/>
Test background-position shorthand: initial values
</fo:block>
<fo:block background-image="../../resources/images/bgimg72dpi.jpg"
background-position="50% 50%">
- <test:assert property="background-position-horizontal" expected="0.5"/>
- <test:assert property="background-position-vertical" expected="0.5"/>
+ <test:assert property="background-position-horizontal" expected="50.0%"/>
+ <test:assert property="background-position-vertical" expected="50.0%"/>
Test background-position shorthand: "50% 50%"
</fo:block>
<fo:block background-image="../../resources/images/bgimg72dpi.jpg"
background-position="2in 50%">
<test:assert property="background-position-horizontal" expected="144000mpt"/>
- <test:assert property="background-position-vertical" expected="0.5"/>
+ <test:assert property="background-position-vertical" expected="50.0%"/>
Test background-position shorthand: "2in 50%"
</fo:block>
<fo:block background-image="../../resources/images/bgimg72dpi.jpg"
background-position="100%">
- <test:assert property="background-position-horizontal" expected="1.0"/>
+ <test:assert property="background-position-horizontal" expected="100.0%"/>
<test:assert property="background-position-vertical" expected="50.0%"/>
Test background-position shorthand: "100%"
</fo:block>
<fo:block background-image="../../resources/images/bgimg72dpi.jpg"
background-position="top center">
- <test:assert property="background-position-horizontal" expected="top"/>
- <test:assert property="background-position-vertical" expected="center"/>
+ <test:assert property="background-position-horizontal" expected="50.0%"/>
+ <test:assert property="background-position-vertical" expected="0mpt"/>
Test background-position shorthand: "top center"
</fo:block>
<fo:block background-image="../../resources/images/bgimg72dpi.jpg"
background-position="right bottom">
- <test:assert property="background-position-horizontal" expected="right"/>
- <test:assert property="background-position-vertical" expected="bottom"/>
+ <test:assert property="background-position-horizontal" expected="100.0%"/>
+ <test:assert property="background-position-vertical" expected="100.0%"/>
Test background-position shorthand: "right bottom"
</fo:block>
<fo:block background-position="right bottom">
<fo:block background-image="../../resources/images/bgimg72dpi.jpg"
background-position="inherit">
- <test:assert property="background-position-horizontal" expected="right"/>
- <test:assert property="background-position-vertical" expected="bottom"/>
+ <test:assert property="background-position-horizontal" expected="100.0%"/>
+ <test:assert property="background-position-vertical" expected="100.0%"/>
Test background-position shorthand: "inherit"
</fo:block>
+ </fo:block>
+ <fo:block background-image="../../resources/images/bgimg72dpi.jpg"
+ background-position="top right">
+ <test:assert property="background-position-horizontal" expected="100.0%"/>
+ <test:assert property="background-position-vertical" expected="0mpt"/>
+ Test background-position shorthand: "top right"
+ </fo:block>
+ <fo:block background-image="../../resources/images/bgimg72dpi.jpg"
+ background-position="center">
+ <test:assert property="background-position-horizontal" expected="50.0%"/>
+ <test:assert property="background-position-vertical" expected="50.0%"/>
+ Test background-position shorthand: "center"
</fo:block>
</fo:flow>
</fo:page-sequence>
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/testcases/font-shorthand-test.fo
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/testcases/font-shorthand-test.fo?rev=627882&r1=627881&r2=627882&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/testcases/font-shorthand-test.fo (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/testcases/font-shorthand-test.fo Thu Feb 14 13:55:44 2008
@@ -29,7 +29,7 @@
<test:assert property="font-size" expected="10000mpt"/>
<test:assert property="font-weight" expected="700" />
<test:assert property="font-style" expected="NORMAL" />
- <test:assert property="line-height.optimum" expected="120.0%" />
+ <test:assert property="line-height.optimum" expected="12000mpt" />
<test:assert property="font-variant" expected="NORMAL" />
</fo:block>
<fo:block font="italic small-caps 14pt 'Times New Roman', serif">
@@ -37,7 +37,7 @@
<test:assert property="font-size" expected="14000mpt"/>
<test:assert property="font-weight" expected="400" />
<test:assert property="font-style" expected="ITALIC" />
- <test:assert property="line-height.optimum" expected="120.0%" />
+ <test:assert property="line-height.optimum" expected="16800mpt" />
<test:assert property="font-variant" expected="SMALL_CAPS" />
Test font shorthand
</fo:block>
@@ -46,7 +46,7 @@
<test:assert property="font-size" expected="14000mpt"/>
<test:assert property="font-weight" expected="700" />
<test:assert property="font-style" expected="ITALIC" />
- <test:assert property="line-height.optimum" expected="80.0%" />
+ <test:assert property="line-height.optimum" expected="11200mpt" />
<test:assert property="font-variant" expected="NORMAL" />
Test font shorthand
</fo:block>
@@ -55,7 +55,7 @@
<test:assert property="font-size" expected="20736mpt"/>
<test:assert property="font-weight" expected="400" />
<test:assert property="font-style" expected="NORMAL" />
- <test:assert property="line-height.optimum" expected="140.0%" />
+ <test:assert property="line-height.optimum" expected="29030mpt" />
<test:assert property="font-variant" expected="NORMAL" />
Test font shorthand
</fo:block>
@@ -65,7 +65,7 @@
<test:assert property="font-size" expected="14000mpt"/>
<test:assert property="font-weight" expected="700" />
<test:assert property="font-style" expected="ITALIC" />
- <test:assert property="line-height.optimum" expected="80.0%" />
+ <test:assert property="line-height.optimum" expected="11200mpt" />
<test:assert property="font-variant" expected="NORMAL" />
Test font shorthand inheritance
</fo:block>
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/unittests/table/collapsed-conditional-borders_test-generator.py
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/unittests/table/collapsed-conditional-borders_test-generator.py?rev=627882&r1=627881&r2=627882&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/unittests/table/collapsed-conditional-borders_test-generator.py (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/unittests/table/collapsed-conditional-borders_test-generator.py Thu Feb 14 13:55:44 2008
@@ -1,4 +1,20 @@
#!/usr/bin/python
+#
+# 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$
"""A testcase generator for conditional borders and the collapsing border model, in the FO
@@ -74,7 +90,7 @@
]
bordersBefore = None
- resBefore = None
+ resBefore = {}
"""The comma between each table; nothing before the first one."""
separator = ''
@@ -85,8 +101,8 @@
Params:
borderSet: a list of 5 border specifications for resp. table, table-column,
table-body, table-row and table-cell
- resolution: the resolved border for the leading and rest cases (for the normal
- case the resolution is always the same)
+ resolution: the resolved border for the rest case (for the normal and leading
+ cases the resolution is always the same)
"""
if not self.bordersBefore:
self.bordersBefore = borderSet
@@ -110,16 +126,14 @@
sys.stderr.write(self.separator + '{')
comma = ''
for beforeAfter in [self.resBefore, resolution]:
- for leadRest in range(2):
- sys.stderr.write(comma + '{border' + beforeAfter[leadRest]['length']
- + ', Color.' + beforeAfter[leadRest]['color']
- + '}')
- comma = ', '
+ sys.stderr.write(comma + '{border' + beforeAfter['length']
+ + ', Color.' + beforeAfter['color'] + '}')
+ comma = ', '
sys.stderr.write('}')
self.separator = ',\n'
# Reset
self.bordersBefore = None
- self.resBefore = None
+ self.resBefore = {}
class TableHFGenerator:
"""Generates on stdout tables with headers and footers, and the border specifications
@@ -221,7 +235,7 @@
comma = ', '
resBody = self.bordersBody[tableNum][1]
for i in range(4):
- for normLeadRest in ['non-lead', 'lead', 'rest']:
+ for normLeadRest in ['normal', 'lead', 'rest']:
sys.stderr.write(', {border'
+ resBody[i][normLeadRest][0]
+ ', Color.' + resBody[i][normLeadRest][1]
@@ -254,7 +268,7 @@
defaultBorders.append({'length': '4pt', 'cond': 'discard', 'color': color})
defaultBorders[fo_table]['length'] = '8pt'
- resolution = [{'length': '4pt', 'color': 'yellow'}, {'length': '0pt', 'color': 'black'}]
+ resolution = {'length': '0pt', 'color': 'black'}
tableGenerator.addBorderSet(defaultBorders, resolution)
for combinations in createAllCombinations()[1:]:
for combination in combinations:
@@ -266,9 +280,9 @@
if index != fo_table:
finalBorders[index]['length'] = '6pt'
if fo_table in combination:
- resolution = [{'length': '8pt', 'color': 'black'}] * 2
+ resolution = {'length': '8pt', 'color': 'black'}
else:
- resolution = [{'length': '6pt', 'color': finalBorders[index]['color']}] * 2
+ resolution = {'length': '6pt', 'color': finalBorders[index]['color']}
tableGenerator.addBorderSet(finalBorders, resolution)
printFOEnd()
@@ -336,10 +350,10 @@
{'length': '4pt', 'cond': 'discard', 'color': 'magenta'} # footer > row > cell
]
defaultResolution = [
- {'non-lead': ('4pt', 'black'), 'lead': ('4pt', 'black'), 'rest': ('4pt', 'red')}, # border-before cell 1
- {'non-lead': ('4pt', 'black'), 'lead': ('4pt', 'black'), 'rest': ('4pt', 'magenta')}, # border-after cell 1
- {'non-lead': ('4pt', 'blue'), 'lead': ('4pt', 'blue'), 'rest': ('4pt', 'red')}, # border-before cell 2
- {'non-lead': ('4pt', 'blue'), 'lead': ('4pt', 'blue'), 'rest': ('4pt', 'magenta')} # border-after cell 2
+ {'normal': ('4pt', 'black'), 'lead': ('4pt', 'black'), 'rest': ('4pt', 'red')}, # border-before cell 1
+ {'normal': ('4pt', 'black'), 'lead': ('4pt', 'black'), 'rest': ('4pt', 'magenta')}, # border-after cell 1
+ {'normal': ('4pt', 'blue'), 'lead': ('4pt', 'blue'), 'rest': ('4pt', 'red')}, # border-before cell 2
+ {'normal': ('4pt', 'blue'), 'lead': ('4pt', 'blue'), 'rest': ('4pt', 'magenta')} # border-after cell 2
]
# The following contains changes to the default borders. Depending on the object
# targeted (in header, footer, body1 or body2), the affected border is either before
@@ -350,46 +364,46 @@
# - for footer: border-before
for setting in [
{'borders': [(body2, '8pt', 'discard'), (body1, '6pt', 'discard')], 'res': [
- {'non-lead': ('4pt', 'black'), 'lead': ('4pt', 'black'), 'rest': ('4pt', 'red')},
- {'non-lead': ('8pt', 'blue'), 'lead': ('6pt', 'black'), 'rest': ('4pt', 'magenta')},
- {'non-lead': ('8pt', 'blue'), 'lead': ('8pt', 'blue'), 'rest': ('4pt', 'red')},
- {'non-lead': ('4pt', 'blue'), 'lead': ('4pt', 'blue'), 'rest': ('4pt', 'magenta')}]},
+ {'normal': ('4pt', 'black'), 'lead': ('4pt', 'black'), 'rest': ('4pt', 'red')},
+ {'normal': ('8pt', 'blue'), 'lead': ('6pt', 'black'), 'rest': ('4pt', 'magenta')},
+ {'normal': ('8pt', 'blue'), 'lead': ('8pt', 'blue'), 'rest': ('4pt', 'red')},
+ {'normal': ('4pt', 'blue'), 'lead': ('4pt', 'blue'), 'rest': ('4pt', 'magenta')}]},
{'borders': [(row2, '8pt', 'discard'), (row1, '6pt', 'retain')], 'res': [
- {'non-lead': ('4pt', 'black'), 'lead': ('4pt', 'black'), 'rest': ('4pt', 'red')},
- {'non-lead': ('8pt', 'blue'), 'lead': ('6pt', 'black'), 'rest': ('6pt', 'black')},
- {'non-lead': ('8pt', 'blue'), 'lead': ('8pt', 'blue'), 'rest': ('4pt', 'red')},
- {'non-lead': ('4pt', 'blue'), 'lead': ('4pt', 'blue'), 'rest': ('4pt', 'magenta')}]},
+ {'normal': ('4pt', 'black'), 'lead': ('4pt', 'black'), 'rest': ('4pt', 'red')},
+ {'normal': ('8pt', 'blue'), 'lead': ('6pt', 'black'), 'rest': ('6pt', 'black')},
+ {'normal': ('8pt', 'blue'), 'lead': ('8pt', 'blue'), 'rest': ('4pt', 'red')},
+ {'normal': ('4pt', 'blue'), 'lead': ('4pt', 'blue'), 'rest': ('4pt', 'magenta')}]},
{'borders': [(cell2, '6pt', 'retain'), (cellh, '8pt', 'discard'), (cell1, '4pt', 'retain')], 'res': [
- {'non-lead': ('8pt', 'red'), 'lead': ('8pt', 'red'), 'rest': ('8pt', 'red')},
- {'non-lead': ('6pt', 'blue'), 'lead': ('4pt', 'black'), 'rest': ('4pt', 'black')},
- {'non-lead': ('6pt', 'blue'), 'lead': ('8pt', 'red'), 'rest': ('8pt', 'red')},
- {'non-lead': ('4pt', 'blue'), 'lead': ('4pt', 'blue'), 'rest': ('4pt', 'magenta')}]},
+ {'normal': ('8pt', 'red'), 'lead': ('8pt', 'red'), 'rest': ('8pt', 'red')},
+ {'normal': ('6pt', 'blue'), 'lead': ('4pt', 'black'), 'rest': ('4pt', 'black')},
+ {'normal': ('6pt', 'blue'), 'lead': ('8pt', 'red'), 'rest': ('8pt', 'red')},
+ {'normal': ('4pt', 'blue'), 'lead': ('4pt', 'blue'), 'rest': ('4pt', 'magenta')}]},
{'borders': [(body2, '6pt', 'retain'), (rowh, '8pt', 'discard'), (row1, '4pt', 'retain')], 'res': [
- {'non-lead': ('8pt', 'red'), 'lead': ('8pt', 'red'), 'rest': ('8pt', 'red')},
- {'non-lead': ('6pt', 'blue'), 'lead': ('4pt', 'black'), 'rest': ('4pt', 'magenta')},
- {'non-lead': ('6pt', 'blue'), 'lead': ('8pt', 'red'), 'rest': ('8pt', 'red')},
- {'non-lead': ('4pt', 'blue'), 'lead': ('4pt', 'blue'), 'rest': ('4pt', 'magenta')}]},
+ {'normal': ('8pt', 'red'), 'lead': ('8pt', 'red'), 'rest': ('8pt', 'red')},
+ {'normal': ('6pt', 'blue'), 'lead': ('4pt', 'black'), 'rest': ('4pt', 'magenta')},
+ {'normal': ('6pt', 'blue'), 'lead': ('8pt', 'red'), 'rest': ('8pt', 'red')},
+ {'normal': ('4pt', 'blue'), 'lead': ('4pt', 'blue'), 'rest': ('4pt', 'magenta')}]},
# Almost a copy-paste of the above, swapping 1 and 2, header and footer
{'borders': [(body1, '8pt', 'discard'), (body2, '6pt', 'discard')], 'res': [
- {'non-lead': ('4pt', 'black'), 'lead': ('4pt', 'black'), 'rest': ('4pt', 'red')},
- {'non-lead': ('8pt', 'black'), 'lead': ('8pt', 'black'), 'rest': ('4pt', 'magenta')},
- {'non-lead': ('8pt', 'black'), 'lead': ('6pt', 'blue'), 'rest': ('4pt', 'red')},
- {'non-lead': ('4pt', 'blue'), 'lead': ('4pt', 'blue'), 'rest': ('4pt', 'magenta')}]},
+ {'normal': ('4pt', 'black'), 'lead': ('4pt', 'black'), 'rest': ('4pt', 'red')},
+ {'normal': ('8pt', 'black'), 'lead': ('8pt', 'black'), 'rest': ('4pt', 'magenta')},
+ {'normal': ('8pt', 'black'), 'lead': ('6pt', 'blue'), 'rest': ('4pt', 'red')},
+ {'normal': ('4pt', 'blue'), 'lead': ('4pt', 'blue'), 'rest': ('4pt', 'magenta')}]},
{'borders': [(cell1, '8pt', 'discard'), (cell2, '6pt', 'retain')], 'res': [
- {'non-lead': ('4pt', 'black'), 'lead': ('4pt', 'black'), 'rest': ('4pt', 'red')},
- {'non-lead': ('8pt', 'black'), 'lead': ('8pt', 'black'), 'rest': ('4pt', 'magenta')},
- {'non-lead': ('8pt', 'black'), 'lead': ('6pt', 'blue'), 'rest': ('6pt', 'blue')},
- {'non-lead': ('4pt', 'blue'), 'lead': ('4pt', 'blue'), 'rest': ('4pt', 'magenta')}]},
+ {'normal': ('4pt', 'black'), 'lead': ('4pt', 'black'), 'rest': ('4pt', 'red')},
+ {'normal': ('8pt', 'black'), 'lead': ('8pt', 'black'), 'rest': ('4pt', 'magenta')},
+ {'normal': ('8pt', 'black'), 'lead': ('6pt', 'blue'), 'rest': ('6pt', 'blue')},
+ {'normal': ('4pt', 'blue'), 'lead': ('4pt', 'blue'), 'rest': ('4pt', 'magenta')}]},
{'borders': [(row1, '6pt', 'retain'), (footer, '8pt', 'discard'), (body2, '4pt', 'retain')], 'res': [
- {'non-lead': ('4pt', 'black'), 'lead': ('4pt', 'black'), 'rest': ('4pt', 'red')},
- {'non-lead': ('6pt', 'black'), 'lead': ('8pt', 'magenta'), 'rest': ('8pt', 'magenta')},
- {'non-lead': ('6pt', 'black'), 'lead': ('4pt', 'blue'), 'rest': ('4pt', 'red')},
- {'non-lead': ('8pt', 'magenta'), 'lead': ('8pt', 'magenta'), 'rest': ('8pt', 'magenta')}]},
+ {'normal': ('4pt', 'black'), 'lead': ('4pt', 'black'), 'rest': ('4pt', 'red')},
+ {'normal': ('6pt', 'black'), 'lead': ('8pt', 'magenta'), 'rest': ('8pt', 'magenta')},
+ {'normal': ('6pt', 'black'), 'lead': ('4pt', 'blue'), 'rest': ('4pt', 'red')},
+ {'normal': ('8pt', 'magenta'), 'lead': ('8pt', 'magenta'), 'rest': ('8pt', 'magenta')}]},
{'borders': [(body1, '8pt', 'retain'), (cellf, '6pt', 'discard'), (row2, '4pt', 'retain')], 'res': [
- {'non-lead': ('4pt', 'black'), 'lead': ('4pt', 'black'), 'rest': ('4pt', 'red')},
- {'non-lead': ('8pt', 'black'), 'lead': ('8pt', 'black'), 'rest': ('8pt', 'black')},
- {'non-lead': ('8pt', 'black'), 'lead': ('4pt', 'blue'), 'rest': ('4pt', 'red')},
- {'non-lead': ('6pt', 'magenta'), 'lead': ('6pt', 'magenta'), 'rest': ('6pt', 'magenta')}]}]:
+ {'normal': ('4pt', 'black'), 'lead': ('4pt', 'black'), 'rest': ('4pt', 'red')},
+ {'normal': ('8pt', 'black'), 'lead': ('8pt', 'black'), 'rest': ('8pt', 'black')},
+ {'normal': ('8pt', 'black'), 'lead': ('4pt', 'blue'), 'rest': ('4pt', 'red')},
+ {'normal': ('6pt', 'magenta'), 'lead': ('6pt', 'magenta'), 'rest': ('6pt', 'magenta')}]}]:
finalBorders = copy.deepcopy(defaultBorders)
for border in setting['borders']:
finalBorders[border[0]]['length'] = border[1]
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/AbstractBasicTranscoderTestCase.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/AbstractFOPTestCase.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/BasicDriverTestCase.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/BasicDriverTestSuite.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/BasicPDFTranscoderTestCase.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/BasicPSTranscoderTestCase.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/BasicTranscoderTestSuite.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/DebugHelper.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/DigestFilterTestCase.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/GenericFOPTestCase.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/StandardTestSuite.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/StandardTestSuite.java?rev=627882&r1=627881&r2=627882&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/StandardTestSuite.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/StandardTestSuite.java Thu Feb 14 13:55:44 2008
@@ -15,18 +15,19 @@
* limitations under the License.
*/
-/* $Id: BasicDriverTestSuite.java 231325 2005-08-10 21:05:39Z jeremias $ */
+/* $Id$ */
package org.apache.fop;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
import org.apache.fop.render.pdf.PDFAConformanceTestCase;
import org.apache.fop.render.pdf.PDFCMapTestCase;
import org.apache.fop.render.pdf.PDFEncodingTestCase;
+import org.apache.fop.render.pdf.PDFsRGBSettingsTestCase;
import org.apache.fop.render.rtf.RichTextFormatTestSuite;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
/**
* Test suite for basic functionality of FOP.
*/
@@ -45,6 +46,7 @@
suite.addTest(new TestSuite(PDFAConformanceTestCase.class));
suite.addTest(new TestSuite(PDFEncodingTestCase.class));
suite.addTest(new TestSuite(PDFCMapTestCase.class));
+ suite.addTest(new TestSuite(PDFsRGBSettingsTestCase.class));
suite.addTest(RichTextFormatTestSuite.suite());
//$JUnit-END$
return suite;
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/StandardTestSuite.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/UtilityCodeTestSuite.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/UtilityCodeTestSuite.java?rev=627882&r1=627881&r2=627882&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/UtilityCodeTestSuite.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/UtilityCodeTestSuite.java Thu Feb 14 13:55:44 2008
@@ -19,6 +19,10 @@
package org.apache.fop;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.apache.fop.pdf.PDFObjectTestCase;
import org.apache.fop.traits.BorderPropsTestCase;
import org.apache.fop.traits.TraitColorTestCase;
import org.apache.fop.util.DataURIResolverTestCase;
@@ -26,9 +30,6 @@
import org.apache.fop.util.PDFNumberTestCase;
import org.apache.fop.util.UnitConvTestCase;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
/**
* Test suite for FOP's utility classes.
*/
@@ -43,6 +44,7 @@
"Test suite for FOP's utility classes");
//$JUnit-BEGIN$
suite.addTest(new TestSuite(PDFNumberTestCase.class));
+ suite.addTest(new TestSuite(PDFObjectTestCase.class));
suite.addTest(new TestSuite(UnitConvTestCase.class));
suite.addTest(new TestSuite(TraitColorTestCase.class));
suite.addTest(new TestSuite(BorderPropsTestCase.class));
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/UtilityCodeTestSuite.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/config/BaseConstructiveUserConfigTestCase.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/config/BaseDestructiveUserConfigTestCase.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/config/BaseUserConfigTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/config/BaseUserConfigTestCase.java?rev=627882&r1=627881&r2=627882&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/config/BaseUserConfigTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/config/BaseUserConfigTestCase.java Thu Feb 14 13:55:44 2008
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-/* $Id: $ */
+/* $Id$ */
package org.apache.fop.config;
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/config/BaseUserConfigTestCase.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/config/FontAttributesMissingTestCase.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/config/FontBaseBadTestCase.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/config/FontEmbedUrlBadTestCase.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/config/FontEmbedUrlMalformedTestCase.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/config/FontMetricsUrlBadTestCase.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/config/FontMetricsUrlMalformedTestCase.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/config/FontTripletAttributeMissingTestCase.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/config/FontsAutoDetectTestCase.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/config/FontsDirectoryBadTestCase.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/config/FontsDirectoryRecursiveTestCase.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/config/UserConfigTestSuite.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/fo/flow/table/CollapsedConditionalBorderTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/fo/flow/table/CollapsedConditionalBorderTestCase.java?rev=627882&r1=627881&r2=627882&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/fo/flow/table/CollapsedConditionalBorderTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/fo/flow/table/CollapsedConditionalBorderTestCase.java Thu Feb 14 13:55:44 2008
@@ -47,46 +47,46 @@
* script.
*/
private Object[][][] resolvedBorders = {
-{{border4pt, Color.yellow}, {border0pt, Color.black}, {border8pt, Color.black}, {border8pt, Color.black}},
-{{border6pt, Color.red}, {border6pt, Color.red}, {border6pt, Color.magenta}, {border6pt, Color.magenta}},
-{{border6pt, Color.blue}, {border6pt, Color.blue}, {border6pt, Color.yellow}, {border6pt, Color.yellow}},
-{{border8pt, Color.black}, {border8pt, Color.black}, {border8pt, Color.black}, {border8pt, Color.black}},
-{{border8pt, Color.black}, {border8pt, Color.black}, {border8pt, Color.black}, {border8pt, Color.black}},
-{{border6pt, Color.red}, {border6pt, Color.red}, {border6pt, Color.magenta}, {border6pt, Color.magenta}},
-{{border8pt, Color.black}, {border8pt, Color.black}, {border8pt, Color.black}, {border8pt, Color.black}},
-{{border6pt, Color.red}, {border6pt, Color.red}, {border6pt, Color.blue}, {border6pt, Color.blue}},
-{{border6pt, Color.magenta}, {border6pt, Color.magenta}, {border6pt, Color.blue}, {border6pt, Color.blue}},
-{{border8pt, Color.black}, {border8pt, Color.black}, {border8pt, Color.black}, {border8pt, Color.black}},
-{{border6pt, Color.red}, {border6pt, Color.red}, {border6pt, Color.yellow}, {border6pt, Color.yellow}},
-{{border6pt, Color.magenta}, {border6pt, Color.magenta}, {border6pt, Color.yellow}, {border6pt, Color.yellow}},
-{{border6pt, Color.blue}, {border6pt, Color.blue}, {border6pt, Color.yellow}, {border6pt, Color.yellow}},
-{{border8pt, Color.black}, {border8pt, Color.black}, {border8pt, Color.black}, {border8pt, Color.black}},
-{{border8pt, Color.black}, {border8pt, Color.black}, {border8pt, Color.black}, {border8pt, Color.black}},
-{{border8pt, Color.black}, {border8pt, Color.black}, {border8pt, Color.black}, {border8pt, Color.black}},
-{{border8pt, Color.black}, {border8pt, Color.black}, {border8pt, Color.black}, {border8pt, Color.black}},
-{{border8pt, Color.black}, {border8pt, Color.black}, {border6pt, Color.red}, {border6pt, Color.red}},
-{{border6pt, Color.magenta}, {border6pt, Color.magenta}, {border6pt, Color.blue}, {border6pt, Color.blue}},
-{{border8pt, Color.black}, {border8pt, Color.black}, {border8pt, Color.black}, {border8pt, Color.black}},
-{{border8pt, Color.black}, {border8pt, Color.black}, {border8pt, Color.black}, {border8pt, Color.black}},
-{{border8pt, Color.black}, {border8pt, Color.black}, {border8pt, Color.black}, {border8pt, Color.black}},
-{{border6pt, Color.red}, {border6pt, Color.red}, {border6pt, Color.magenta}, {border6pt, Color.magenta}},
-{{border6pt, Color.yellow}, {border6pt, Color.yellow}, {border8pt, Color.black}, {border8pt, Color.black}},
-{{border8pt, Color.black}, {border8pt, Color.black}, {border8pt, Color.black}, {border8pt, Color.black}},
-{{border6pt, Color.red}, {border6pt, Color.red}, {border6pt, Color.blue}, {border6pt, Color.blue}},
-{{border6pt, Color.yellow}, {border6pt, Color.yellow}, {border6pt, Color.magenta}, {border6pt, Color.magenta}},
-{{border6pt, Color.blue}, {border6pt, Color.blue}, {border6pt, Color.yellow}, {border6pt, Color.yellow}},
-{{border8pt, Color.black}, {border8pt, Color.black}, {border8pt, Color.black}, {border8pt, Color.black}},
-{{border8pt, Color.black}, {border8pt, Color.black}, {border8pt, Color.black}, {border8pt, Color.black}},
-{{border8pt, Color.black}, {border8pt, Color.black}, {border8pt, Color.black}, {border8pt, Color.black}},
-{{border8pt, Color.black}, {border8pt, Color.black}, {border8pt, Color.black}, {border8pt, Color.black}},
-{{border8pt, Color.black}, {border8pt, Color.black}, {border8pt, Color.black}, {border8pt, Color.black}},
-{{border8pt, Color.black}, {border8pt, Color.black}, {border8pt, Color.black}, {border8pt, Color.black}},
-{{border8pt, Color.black}, {border8pt, Color.black}, {border8pt, Color.black}, {border8pt, Color.black}},
-{{border8pt, Color.black}, {border8pt, Color.black}, {border8pt, Color.black}, {border8pt, Color.black}},
-{{border6pt, Color.red}, {border6pt, Color.red}, {border6pt, Color.magenta}, {border6pt, Color.magenta}},
-{{border6pt, Color.blue}, {border6pt, Color.blue}, {border6pt, Color.yellow}, {border6pt, Color.yellow}},
-{{border8pt, Color.black}, {border8pt, Color.black}, {border8pt, Color.black}, {border8pt, Color.black}},
-{{border8pt, Color.black}, {border8pt, Color.black}, {border8pt, Color.black}, {border8pt, Color.black}}
+ {{border0pt, Color.black}, {border8pt, Color.black}},
+ {{border6pt, Color.red}, {border6pt, Color.magenta}},
+ {{border6pt, Color.blue}, {border6pt, Color.yellow}},
+ {{border8pt, Color.black}, {border8pt, Color.black}},
+ {{border8pt, Color.black}, {border8pt, Color.black}},
+ {{border6pt, Color.red}, {border6pt, Color.magenta}},
+ {{border8pt, Color.black}, {border8pt, Color.black}},
+ {{border6pt, Color.red}, {border6pt, Color.blue}},
+ {{border6pt, Color.magenta}, {border6pt, Color.blue}},
+ {{border8pt, Color.black}, {border8pt, Color.black}},
+ {{border6pt, Color.red}, {border6pt, Color.yellow}},
+ {{border6pt, Color.magenta}, {border6pt, Color.yellow}},
+ {{border6pt, Color.blue}, {border6pt, Color.yellow}},
+ {{border8pt, Color.black}, {border8pt, Color.black}},
+ {{border8pt, Color.black}, {border8pt, Color.black}},
+ {{border8pt, Color.black}, {border8pt, Color.black}},
+ {{border8pt, Color.black}, {border8pt, Color.black}},
+ {{border8pt, Color.black}, {border6pt, Color.red}},
+ {{border6pt, Color.magenta}, {border6pt, Color.blue}},
+ {{border8pt, Color.black}, {border8pt, Color.black}},
+ {{border8pt, Color.black}, {border8pt, Color.black}},
+ {{border8pt, Color.black}, {border8pt, Color.black}},
+ {{border6pt, Color.red}, {border6pt, Color.magenta}},
+ {{border6pt, Color.yellow}, {border8pt, Color.black}},
+ {{border8pt, Color.black}, {border8pt, Color.black}},
+ {{border6pt, Color.red}, {border6pt, Color.blue}},
+ {{border6pt, Color.yellow}, {border6pt, Color.magenta}},
+ {{border6pt, Color.blue}, {border6pt, Color.yellow}},
+ {{border8pt, Color.black}, {border8pt, Color.black}},
+ {{border8pt, Color.black}, {border8pt, Color.black}},
+ {{border8pt, Color.black}, {border8pt, Color.black}},
+ {{border8pt, Color.black}, {border8pt, Color.black}},
+ {{border8pt, Color.black}, {border8pt, Color.black}},
+ {{border8pt, Color.black}, {border8pt, Color.black}},
+ {{border8pt, Color.black}, {border8pt, Color.black}},
+ {{border8pt, Color.black}, {border8pt, Color.black}},
+ {{border6pt, Color.red}, {border6pt, Color.magenta}},
+ {{border6pt, Color.blue}, {border6pt, Color.yellow}},
+ {{border8pt, Color.black}, {border8pt, Color.black}},
+ {{border8pt, Color.black}, {border8pt, Color.black}}
};
/**
@@ -142,13 +142,13 @@
String errorMsge = baseErrorMsge + "border-before";
checkBorder(errorMsge, gu.borderBefore.nonLeadingTrailing, 8000, Color.black);
- checkBorder(errorMsge, gu.borderBefore.leadingTrailing, resolvedBorders[tableNum][0]);
- checkBorder(errorMsge, gu.borderBefore.rest, resolvedBorders[tableNum][1]);
+ checkBorder(errorMsge, gu.borderBefore.leadingTrailing, 8000, Color.black);
+ checkBorder(errorMsge, gu.borderBefore.rest, resolvedBorders[tableNum][0]);
errorMsge = baseErrorMsge + "border-after";
checkBorder(errorMsge, gu.borderAfter.nonLeadingTrailing, 8000, Color.black);
- checkBorder(errorMsge, gu.borderAfter.leadingTrailing, resolvedBorders[tableNum][2]);
- checkBorder(errorMsge, gu.borderAfter.rest, resolvedBorders[tableNum][3]);
+ checkBorder(errorMsge, gu.borderAfter.leadingTrailing, 8000, Color.black);
+ checkBorder(errorMsge, gu.borderAfter.rest, resolvedBorders[tableNum][1]);
tableNum++;
} while (tableIterator.hasNext());
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/fotreetest/FOTreeTestSuite.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/fotreetest/FOTreeTestSuite.java?rev=627882&r1=627881&r2=627882&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/fotreetest/FOTreeTestSuite.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/fotreetest/FOTreeTestSuite.java Thu Feb 14 13:55:44 2008
@@ -36,6 +36,7 @@
import org.apache.commons.io.filefilter.SuffixFileFilter;
import org.apache.commons.io.filefilter.TrueFileFilter;
import org.apache.fop.DebugHelper;
+import org.apache.fop.fo.flow.table.CollapsedConditionalBorderTestCase;
import org.apache.fop.fo.flow.table.IllegalRowSpanTestCase;
import org.apache.fop.fo.flow.table.RowGroupBuilderTestCase;
import org.apache.fop.fo.flow.table.TableColumnColumnNumberTestCase;
@@ -115,6 +116,7 @@
suite.addTestSuite(IllegalRowSpanTestCase.class);
suite.addTestSuite(RowGroupBuilderTestCase.class);
suite.addTestSuite(TableColumnColumnNumberTestCase.class);
+ suite.addTestSuite(CollapsedConditionalBorderTestCase.class);
}
private static class FOTreeTestCase extends TestCase {
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/fotreetest/ext/AssertElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/fotreetest/ext/AssertElement.java?rev=627882&r1=627881&r2=627882&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/fotreetest/ext/AssertElement.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/fotreetest/ext/AssertElement.java Thu Feb 14 13:55:44 2008
@@ -27,6 +27,7 @@
import org.apache.fop.fo.properties.KeepProperty;
import org.apache.fop.fo.properties.LengthPairProperty;
import org.apache.fop.fo.properties.LengthRangeProperty;
+import org.apache.fop.fo.properties.PercentLength;
import org.apache.fop.fo.properties.Property;
import org.apache.fop.fo.properties.SpaceProperty;
import org.apache.fop.fotreetest.ResultCollector;
@@ -91,7 +92,12 @@
prop = sp.getComponent(FOPropertyMapping.getSubPropertyId(component));
}
}
- String s = String.valueOf(prop);
+ String s;
+ if (prop instanceof PercentLength) {
+ s = ((PercentLength)prop).getString();
+ } else {
+ s = String.valueOf(prop);
+ }
String expected = attlist.getValue("expected");
if (!expected.equals(s)) {
collector.notifyException(
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/intermediate/AreaTreeParserTestCase.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/intermediate/IntermediateFormatTestSuite.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/layoutengine/ElementListCheck.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/layoutengine/ElementListCollector.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/layoutengine/EvalCheck.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/layoutengine/LayoutEngineCheck.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/layoutengine/LayoutEngineTestSuite.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/layoutengine/LayoutEngineTester.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/layoutengine/LayoutResult.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/layoutengine/TrueCheck.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/logging/LoggingElementListObserver.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/memory/MemoryEater.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/memory/MemoryEater.java?rev=627882&r1=627881&r2=627882&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/memory/MemoryEater.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/memory/MemoryEater.java Thu Feb 14 13:55:44 2008
@@ -36,6 +36,7 @@
import org.apache.commons.io.output.NullOutputStream;
+import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.apps.Fop;
import org.apache.fop.apps.FopFactory;
import org.apache.fop.apps.MimeConstants;
@@ -63,7 +64,9 @@
transformer.setParameter("repeats", new Integer(replicatorRepeats));
OutputStream out = new NullOutputStream(); //write to /dev/nul
- Fop fop = fopFactory.newFop(MimeConstants.MIME_PDF, out);
+ FOUserAgent userAgent = fopFactory.newFOUserAgent();
+ userAgent.setBaseURL(foFile.getParentFile().toURL().toExternalForm());
+ Fop fop = fopFactory.newFop(MimeConstants.MIME_PDF, userAgent, out);
Result res = new SAXResult(fop.getDefaultHandler());
transformer.transform(src, res);
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/memory/MemoryEater.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/render/pdf/PDFAConformanceTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/render/pdf/PDFAConformanceTestCase.java?rev=627882&r1=627881&r2=627882&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/render/pdf/PDFAConformanceTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/render/pdf/PDFAConformanceTestCase.java Thu Feb 14 13:55:44 2008
@@ -89,20 +89,6 @@
}
/**
- * Test exception when PDF/A-1 is enabled and an EPS is used.
- * @throws Exception if the test fails
- */
- public void testEPSUsage() throws Exception {
- File foFile = new File(foBaseDir, "with-eps.fo");
- try {
- convertFO(foFile, getUserAgent(), dumpPDF);
- fail("Expected PDFConformanceException. PDF/A-1 does not allow PostScript XObjects.");
- } catch (PDFConformanceException e) {
- //Good!
- }
- }
-
- /**
* Test exception when PDF/A-1 is enabled and images.
* @throws Exception if the test fails
*/
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/render/pdf/PDFAMetadataTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/render/pdf/PDFAMetadataTestCase.java?rev=627882&r1=627881&r2=627882&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/render/pdf/PDFAMetadataTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/render/pdf/PDFAMetadataTestCase.java Thu Feb 14 13:55:44 2008
@@ -94,7 +94,7 @@
cal2.set(Calendar.MILLISECOND, 0);
info.setModDate(cal2.getTime());
- Metadata meta = PDFMetadata.createXMPFromUserAgent(doc);
+ Metadata meta = PDFMetadata.createXMPFromPDFDocument(doc);
DublinCoreAdapter dc = DublinCoreSchema.getAdapter(meta);
assertEquals("MyTitle", dc.getTitle());
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/render/pdf/PDFAMetadataTestCase.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/render/pdf/PDFCMapTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/render/pdf/PDFCMapTestCase.java?rev=627882&r1=627881&r2=627882&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/render/pdf/PDFCMapTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/render/pdf/PDFCMapTestCase.java Thu Feb 14 13:55:44 2008
@@ -15,18 +15,20 @@
* limitations under the License.
*/
-/* $Id: PDFCMap.java 426576 2006-07-28 15:44:37Z jeremias $ */
+/* $Id$ */
package org.apache.fop.render.pdf;
-import org.apache.fop.pdf.PDFCMap;
+import java.io.StringWriter;
import junit.framework.TestCase;
+import org.apache.fop.pdf.CMapBuilder;
+
/** Simple sanity test of the PDFCmap class */
public class PDFCMapTestCase extends TestCase {
- public void testPDFCMapFillInPDF() {
+ public void testPDFCMapFillInPDF() throws Exception {
final String EOL = "\n";
final String expected =
"%!PS-Adobe-3.0 Resource-CMap" + EOL
@@ -59,10 +61,10 @@
+"%%EOF" + EOL
;
- final PDFCMap m = new PDFCMap("test", null);
- final StringBuffer b = new StringBuffer();
- m.fillInPDF(b);
- final String actual = b.toString();
+ final StringWriter w = new StringWriter();
+ final CMapBuilder builder = new CMapBuilder(w, "test");
+ builder.writeCMap();
+ final String actual = w.getBuffer().toString();
assertEquals("PDFCMap output matches expected PostScript code", expected, actual);
}
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/render/pdf/PDFCMapTestCase.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/render/rtf/Bug39607TestCase.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/render/rtf/RichTextFormatTestSuite.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/render/rtf/rtflib/testdocs/BasicLink.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/render/rtf/rtflib/testdocs/CreateTestDocuments.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/render/rtf/rtflib/testdocs/DummyTableColumnsInfo.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/render/rtf/rtflib/testdocs/ExternalGraphic.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/render/rtf/rtflib/testdocs/ListInTable.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/render/rtf/rtflib/testdocs/MergedTableCells.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/render/rtf/rtflib/testdocs/NestedTable.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/render/rtf/rtflib/testdocs/ParagraphAlignment.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/render/rtf/rtflib/testdocs/SimpleDocument.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/render/rtf/rtflib/testdocs/SimpleLists.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/render/rtf/rtflib/testdocs/SimpleTable.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/render/rtf/rtflib/testdocs/TestDocument.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/render/rtf/rtflib/testdocs/TextAttributes.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/render/rtf/rtflib/testdocs/Whitespace.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/threading/FOPTestbed.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/threading/FOPTestbed.java?rev=627882&r1=627881&r2=627882&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/threading/FOPTestbed.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/threading/FOPTestbed.java Thu Feb 14 13:55:44 2008
@@ -19,12 +19,12 @@
package org.apache.fop.threading;
-import java.util.List;
-import java.util.Iterator;
import java.io.File;
import java.io.InputStream;
import java.io.OutputStream;
import java.text.DecimalFormat;
+import java.util.Iterator;
+import java.util.List;
import javax.xml.transform.Source;
import javax.xml.transform.Templates;
@@ -40,35 +40,45 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.logger.Logger;
import org.apache.commons.io.IOUtils;
+/**
+ * Testbed for multi-threading tests. The class can run a configurable set of task a number of
+ * times in a configurable number of threads to easily reproduce multi-threading issues.
+ */
public class FOPTestbed extends AbstractLogEnabled
implements Configurable, Initializable {
private int repeat;
- private List tasks = new java.util.ArrayList();
+ private List taskList = new java.util.ArrayList();
private int threads;
private File outputDir;
private Configuration fopCfg;
+ private FOProcessor foprocessor;
private int counter = 0;
+ /** {@inheritDoc} */
public void configure(Configuration configuration) throws ConfigurationException {
this.threads = configuration.getChild("threads").getValueAsInteger(10);
this.outputDir = new File(configuration.getChild("output-dir").getValue());
Configuration tasks = configuration.getChild("tasks");
this.repeat = tasks.getAttributeAsInteger("repeat", 1);
Configuration[] entries = tasks.getChildren("task");
- for (int i=0; i<entries.length; i++) {
- this.tasks.add(new TaskDef(entries[i]));
+ for (int i = 0; i < entries.length; i++) {
+ this.taskList.add(new TaskDef(entries[i]));
}
this.fopCfg = configuration.getChild("foprocessor");
}
+ /** {@inheritDoc} */
public void initialize() throws Exception {
+ this.foprocessor = createFOProcessor();
}
+ /**
+ * Starts the stress test.
+ */
public void doStressTest() {
getLogger().info("Starting stress test...");
long start = System.currentTimeMillis();
@@ -99,6 +109,7 @@
try {
Thread.sleep(100);
} catch (InterruptedException ie) {
+ //ignore
}
}
getLogger().info("Stress test duration: " + (System.currentTimeMillis() - start) + "ms");
@@ -109,10 +120,10 @@
public void run() {
try {
for (int r = 0; r < repeat; r++) {
- Iterator i = tasks.iterator();
+ Iterator i = taskList.iterator();
while (i.hasNext()) {
TaskDef def = (TaskDef)i.next();
- final Task task = new Task(def, counter++);
+ final Task task = new Task(def, counter++, foprocessor);
ContainerUtil.enableLogging(task, getLogger());
task.execute();
}
@@ -124,7 +135,10 @@
}
-
+ /**
+ * Creates a new FOProcessor.
+ * @return the newly created instance
+ */
public FOProcessor createFOProcessor() {
try {
Class clazz = Class.forName(this.fopCfg.getAttribute("class",
@@ -197,18 +211,19 @@
private TaskDef def;
private int num;
+ private FOProcessor fop;
- public Task(TaskDef def, int num) {
+ public Task(TaskDef def, int num, FOProcessor fop) {
this.def = def;
this.num = num;
+ this.fop = fop;
}
public void execute() throws Exception {
getLogger().info("Processing: " + def);
- FOProcessor fop = (FOProcessor)createFOProcessor();
DecimalFormat df = new DecimalFormat("00000");
- File outfile = new File(outputDir, df.format(num) + ".pdf");
+ File outfile = new File(outputDir, df.format(num) + fop.getTargetFileExtension());
OutputStream out = new java.io.FileOutputStream(outfile);
try {
InputStream in;
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/threading/FOPTestbed.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/threading/FOProcessor.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/threading/FOProcessor.java?rev=627882&r1=627881&r2=627882&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/threading/FOProcessor.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/threading/FOProcessor.java Thu Feb 14 13:55:44 2008
@@ -24,11 +24,24 @@
import javax.xml.transform.Templates;
+/**
+ * Represents an FO processor.
+ */
public interface FOProcessor {
- String ROLE = FOProcessor.class.getName();
-
+ /**
+ * Process a file.
+ * @param in the InputStream for the FO or XML file
+ * @param templates a JAXP Templates object for an XSLT transformation or null
+ * @param out the OutputStream for the target file
+ * @throws Exception if an error occurs
+ */
void process(InputStream in, Templates templates, OutputStream out)
- throws org.apache.fop.apps.FOPException, java.io.IOException;
+ throws Exception;
+ /**
+ * Returns the target file extension for the configured output format.
+ * @return the target file extension (for example ".pdf")
+ */
+ String getTargetFileExtension();
}
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/threading/FOProcessor.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org