You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by je...@apache.org on 2008/08/12 14:36:35 UTC
svn commit: r685132 [3/3] - in
/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign: ./ lib/
src/documentation/ src/documentation/content/
src/documentation/content/xdocs/ src/documentation/content/xdocs/0.95/
src/documentation/content/xdocs/dev/ src/docum...
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/status.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/status.xml?rev=685132&r1=685131&r2=685132&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/status.xml (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/status.xml Tue Aug 12 05:36:18 2008
@@ -50,9 +50,19 @@
<context id="Extensions" title="Changes to the Bundled Extensions"/>
<context id="Images" title="Changes to the Image Support"/>
</contexts>
-
+
<changes>
<release version="FOP Trunk" date="TBD">
+ <action context="Renderers" dev="JM" type="fix" fixes-bug="45606" due-to="Pavel Kysilka">
+ Fixed generation of "fonttbl" for RTF output to fix loading problem with AbiWord.
+ </action>
+ <action context="Layout" dev="JM" type="fix">
+ Fixed ID resolution for nested bookmarks with duplicated IDs.
+ </action>
+ <action context="Code" dev="AD" type="fix" fixes-bug="45490" due-to="Thomas Stieler">
+ Fixed a slight error when resolving non-file URLs: avoid
+ altering the original 'href' if the protocol is other than 'file:'
+ </action>
<action context="Layout" dev="JM" type="fix" fixes-bug="45470">
Added LayoutManagerMapping.registerMaker() to make registration of custom
layout managers easier.
@@ -74,10 +84,10 @@
when the page bpd is not the same for all pages.
</action>
<action context="Code" dev="AD" type="update" importance="high">
- Changed FONode.addCharacters() parameter to closer match the signature of
+ Changed FONode.addCharacters() parameter to closer match the signature of
the standard SAX characters() event (reduces confusion and computations).
- <em>!! Implementors of extensions that subclass FONode directly, and
- offer an implementation for addCharacters() should take care to make
+ <em>!! Implementors of extensions that subclass FONode directly, and
+ offer an implementation for addCharacters() should take care to make
similar modifications in their code !!</em>
</action>
<!-- change reverted, to be added back later
@@ -85,7 +95,7 @@
Added SVG support for AFP (GOCA).
</action -->
<action context="Renderers" dev="JM" type="add" fixes-bug="45115" due-to="Martin Edge">
- Added a PCL-specific extension attribute on simple-page-master for controlling
+ Added a PCL-specific extension attribute on simple-page-master for controlling
the simplex/duplex mode.
</action>
<action context="Code" dev="AD" type="fix" fixes-bug="45097">
@@ -99,7 +109,7 @@
Support character-by-character font-selection strategy on fo:character element.
</action>
<action context="Layout" dev="AD" type="fix" fixes-bug="44794">
- Added support for page-number-citation and page-number-citation-last
+ Added support for page-number-citation and page-number-citation-last
of fo:inline. Corrected behavior for page-number-citation-last
of fo:block: forward references now properly resolved.
</action>
@@ -171,13 +181,118 @@
in the font's primary encoding.
</action>
</release>
- <release version="0.95" date="TBD">
+ <release version="0.95" date="05 August 2008">
+ <notes>
+ <section>
+ <title>Notes</title>
+ <p>
+ Besides the important changes listed below, the most important areas with
+ improvements in this release are:
+ </p>
+ <ul>
+ <li>
+ Many bugfixes in tables, plus some new features (full support for keeps and
+ breaks, border conditionality, background on columns and header/footer/body)
+ </li>
+ <li>
+ Improvements and bugfixes for font handling and font
+ auto-detection/-registration.
+ </li>
+ <li>
+ Performance improvements and memory optimizations for the property handling
+ in the FO tree.
+ </li>
+ </ul>
+ <p>
+ Please note that with this release, we've dropped support for Java 1.3.
+ FOP will, from now on, <strong>require at least Java 1.4</strong>.
+ </p>
+ <p>
+ There have been a few changes in tables that make FOP both more strict and more
+ compliant to the Recommendation:
+ <ul>
+ <li>XSL-FO 1.1 explicitly states that a row-spanning fo:table-cell element is not
+ allowed to span further than its enclosing fo:table-header/footer/body element
+ (see bottom of <link href="http://www.w3.org/TR/xsl11/#fo_table">section
+ 6.7.3</link>). From now on FOP will give a validation error if a document
+ contains such an erroneous cell.
+ </li>
+ <li>
+ <p>If an fo:table element contains explicit fo:table-column children, then those
+ elements set the total number of columns in the table. This means that a
+ validation error will now occur if a row contains more cells than available
+ columns. This change allows to improve performance, since the rendering of the
+ table may start as soon as the table-column elements have been parsed.</p>
+ <p>If more flexibility is needed, then the fo:table-column elements may be just
+ omitted. The final number of columns will then be set by the row that has the
+ most cells.</p>
+ </li>
+ </ul>
+ </p>
+ <p>
+ The image libraries Jimi and JAI are no longer needed (and used) for image loading.
+ Instead we rely completely on the Image I/O API that has been introduced with
+ Java 1.4. If you still need support for bitmap image formats that do not work
+ out-of-the-box, we recommend adding
+ <link href="http://jai-imageio.dev.java.net/">JAI Image I/O Tools</link>
+ (an Image I/O compatible image codec package) to the classpath. JAI is still required
+ for building the FOP distribution but it is optional for normal builds and at run-time.
+ </p>
+ <note>
+ This final 0.95 release also includes all of the
+ <a href="changes_0.95beta.html">changes made for Apache FOP 0.95beta</a>.
+ </note>
+ </section>
+ </notes>
<action context="Renderers" dev="JM" type="fix">
- Fixed positioning of absolutely positioned block-containers in multi-column documents.
+ Fixed a color selection problem which occurred after an image has been painted
+ through the Graphics2DAdapter in PDF output.
+ </action>
+ <action context="Renderers" dev="JM" type="fix" fixes-bug="41306">
+ Fixed page ordering problem with AWTRenderer.
+ </action>
+ <action context="Renderers" dev="JM" type="fix" fixes-bug="39980">
+ Fixed image scaling for RTF output.
+ </action>
+ <action context="API" dev="JM" type="fix">
+ Fixed the -imagein command-line option.
+ </action>
+ <action context="Renderers" dev="JM" type="add" fixes-bug="43825" due-to="Maximilian Aster">
+ Added support for fo:leader for RTF output (no full support!). Fixes problems with empty leaders
+ being used to force empty lines among other issues.
+ </action>
+ <action context="Renderers" dev="JM" type="add" fixes-bug="43824" due-to="Maximilian Aster">
+ Added support for page-number-citation for RTF output.
+ </action>
+ <action context="Renderers" dev="JM" type="fix" fixes-bug="43606" due-to="Maximilian Aster">
+ Fixed handling of proportional-column-width() and percentages for table column in RTF
+ output.
+ </action>
+ <action context="Layout" dev="AD" type="fix" fixes-bug="45295">
+ Fixed NullPointerException when page-number-citations are used inside a marker.
+ </action>
+ <action context="Images" dev="JM" type="fix">
+ Fixed two bugs concerning resolution handling with SVG images and their
+ conversion to bitmaps for RTF output.
+ </action>
+ <action context="Code" dev="JM" type="fix" fixes-bug="44887" importance="high">
+ Fixed potential multi-threading problem concerning the use of DecimalFormat.
+ </action>
+ <action context="Layout" dev="JM" type="fix" fixes-bug="44412">
+ Regression bugfix: Multiple collapsible breaks don't cause empty pages anymore.
</action>
<action context="Renderers" dev="JM" type="fix">
+ Fixed resolution handling inside AWT preview dialog.
+ </action>
+ <action context="Renderers" dev="JM" type="fix" importance="high">
+ Fixed positioning of absolutely positioned block-containers in multi-column documents.
+ </action>
+ <action context="Renderers" dev="JM" type="fix" importance="high">
Fixed rendering of fixed block-containers in AFP output.
</action>
+ <action context="Layout" dev="VH" type="fix" fixes-bug="44621" importance="high">
+ Various bugfixes for table layout.
+ </action>
<action context="Renderers" dev="JM" type="fix">
Fixed regression causing bad positioning of block-containers if used as descendant
of a table-cell.
@@ -393,7 +508,7 @@
will make up an entire page. See the documentation for details.
</action>
<action context="Layout" dev="JM" type="add">
- Added minimal support for the .minimum/.maximum components of block/inline-progression-dimension
+ 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" importance="high">
@@ -522,7 +637,7 @@
Fix to avoid a ClassCastException in renderer configuration.
</action>
<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
+ Fixed the restoration of the TLE values from the intermediate format
for the AFP extension elements.
</action>
<action context="Renderers" dev="JM" type="add" fixes-bug="43041" due-to="Adrian Cumiskey">
@@ -538,9 +653,9 @@
<action context="Layout" dev="AD" type="update">
PropertyCache phase 2:<br/>
⢠improvement of the PropertyCache itself should now guarantee acceptable
- performance of the static caches in multi-session environments, which is
+ performance of the static caches in multi-session environments, which is
a possible problem with synchronizedMap.<br/>
- ⢠changed CommonFont to use the cache:
+ ⢠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.<br/>
⢠changed CommonHyphenation, KeepProperty, ColorProperty and FontFamilyProperty to use the cache.<br/>
@@ -555,7 +670,7 @@
<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>
+ </release>
<release version="0.94" date="24th August 2007">
<action context="Code" dev="JM" type="fix">
AFP Renderer: Bugfix for 1 bit images where the width is not a multiple of 8.
@@ -588,7 +703,7 @@
-> changed implementations of FObj.addChildNode(), .removeChild() and .getChildNodes()
</action>
<action context="Code" dev="AD" type="update" fixes-bug="42089" due-to="Adrian Cumiskey">
- Code cleanup and restructuring:
+ Code cleanup and restructuring:
Refactoring of PageSequenceLayoutManager and provide common FObj id property use
</action>
<action context="Code" dev="AD" type="add">
@@ -677,7 +792,7 @@
the available ipd, causing a restart.
</action>
<action context="Code" dev="JM" type="fix">
- Fix for PDF corruption when a TrueType font with spaces in its name is embedded and no
+ Fix for PDF corruption when a TrueType font with spaces in its name is embedded and no
XML font metrics file for that font is used.
</action>
<action context="Code" dev="JM" type="fix" fixes-bug="41426" due-to="Adrian Cumiskey">
@@ -700,7 +815,7 @@
<action context="Code" dev="MM" type="add" importance="high">
Added support for UAX#14 type line breaking. Support does not extend across nested fo:inline elements.
</action>
- </release>
+ </release>
<release version="0.93" date="9 January 2007">
<notes>
<section>
@@ -741,10 +856,10 @@
Enabled Copy/Paste from PDF content in Acrobat Reader for text using embedded TrueType fonts.
</action>
<action context="Code" dev="SP" type="update" fixes-bug="41044" due-to="Richard Wheeldon">
- Commented out unused properties, in order to minimize memory usage.
+ Commented out unused properties, in order to minimize memory usage.
</action>
<action context="Code" dev="SP" type="update" fixes-bug="41009" due-to="Richard Wheeldon">
- Removed unused attributes from TableCell.
+ Removed unused attributes from TableCell.
</action>
<action context="Code" dev="JM" type="add">
Added initial support for loading fonts without a pre-created XML font metric
@@ -752,7 +867,7 @@
</action>
<action context="Code" dev="JM" type="add" fixes-bug="40729" due-to="Peter Coppens" importance="high">
Support for the rgb-icc() function and for a proprietary cmyk() function (for device CMYK
- colors only through the PDF renderer so far).
+ colors only through the PDF renderer so far).
</action>
<action context="Code" dev="JM" type="update" fixes-bug="40813" due-to="Richard Wheeldon">
Minor fixes and improvements for the AWT Preview (keyboard shortcuts, scrolling, windows
@@ -782,7 +897,7 @@
white background in order to produce bitmap output with transparency.
</action>
<action context="Code" dev="AD" type="fix" fixes-bug="39414">
- Split up FOText instances larger than 32K characters to avoid
+ Split up FOText instances larger than 32K characters to avoid
integer overflow during layout.
</action>
<action context="Code" dev="JM" type="fix">
@@ -800,7 +915,7 @@
Added relaxed validation for empty list-item-*, as suggested by Gary Reed.
</action>
<action context="Code" dev="AD" type="update">
- Modified proportional-column-width() function to log an error if used
+ Modified proportional-column-width() function to log an error if used
with table-layout=auto
</action>
<action context="Code" dev="AD" type="fix">
@@ -820,7 +935,7 @@
Bugfix: Table headers and footers were swallowed when a table was nested in a list-block.
</action>
<action context="Code" dev="JM" type="fix">
- Fixed a bug with indent handling when margins are used on a surrounding block and
+ Fixed a bug with indent handling when margins are used on a surrounding block and
not start/end-indent.
</action>
<action context="Code" dev="JM" type="fix" fixes-bug="40106" due-to="Jeroen Meijer">
@@ -843,7 +958,7 @@
(Note: the use of pixels in XSL-FO is discouraged!)
</action>
<action context="Code" dev="JM" type="fix">
- Bugfix: Potential multi-threading issue (ConcurrentModificationException)
+ Bugfix: Potential multi-threading issue (ConcurrentModificationException)
eliminated for ElementMapping classes.
</action>
<action context="Code" dev="JM" type="fix">
@@ -891,7 +1006,7 @@
Bugfix: All fonts names were converted unnecessarily to lower case in RTF output.
</action>
<action context="Code" dev="JM" type="fix">
- Bugfix: The combination of hyphenation and kerning resulted in slightly ragged
+ Bugfix: The combination of hyphenation and kerning resulted in slightly ragged
right ends for right-aligned and justified text.
</action>
<action context="Code" dev="JM" type="fix">
@@ -903,7 +1018,7 @@
table-columns.
</action>
<action context="Code" dev="JM" type="fix" fixes-bug="39607" due-to="Julien Aymé">
- Bugfix: NullPointerException in RTF library when there are no borders on
+ Bugfix: NullPointerException in RTF library when there are no borders on
the parent table.
</action>
<action context="Code" dev="JM" type="add" importance="high">
@@ -942,7 +1057,7 @@
in a block-container.
</action>
<action context="Code" dev="JM" type="fix">
- Bugfix: basic-links with internal destinations in documents with multiple
+ Bugfix: basic-links with internal destinations in documents with multiple
page-sequences sometimes pointed at the wrong page.
</action>
<action context="Code" dev="JM" type="fix">
@@ -954,14 +1069,14 @@
Bugfix: Fixed OutOfMemoryException with long data URLs (RFC 2397).
</action>
<action context="Code" dev="JM" type="add" fixes-bug="39118" due-to="Pierre-Henri Kraus">
- Initial support for page-number-citation-last (XSL 1.1). Works without problems
+ Initial support for page-number-citation-last (XSL 1.1). Works without problems
only for page-sequence so far.
</action>
</release>
<release version="0.92beta" date="18 Apr 2006">
<action context="Code" dev="JM" type="fix">
Bugfix: The generation of the PDF "d" (setdash) command was assuming that
- only integer values can be used but that isn't the case. Dash patterns
+ only integer values can be used but that isn't the case. Dash patterns
PDFGraphics2D would be wrong in the process.
</action>
<action context="Code" dev="JM" type="fix">
@@ -995,7 +1110,7 @@
FOP 0.20.5. (See "hyphenation-base" option in the user configuration)
</action>
<action context="Code" dev="JM" type="fix">
- Bugfix: Certain filter combinations in PDF could lead to invalid PDFs.
+ Bugfix: Certain filter combinations in PDF could lead to invalid PDFs.
DecodeParams were not properly handled.
</action>
<action context="Code" dev="JM" type="fix">
@@ -1061,19 +1176,19 @@
Added support for the from-table-column() function.
</action>
<action context="Code" dev="JM" type="fix" fixes-bug="38397">
- Bugfix: Spanned cells could lead to an false error message about overlapping
+ Bugfix: Spanned cells could lead to an false error message about overlapping
cells and ultimately a NullPointerException.
</action>
<action context="Code" dev="JM" type="fix">
- Bugfix: Regions with non-standard names got ignored in RTF output leading to
+ Bugfix: Regions with non-standard names got ignored in RTF output leading to
missing headers and footers.
</action>
<action context="Code" dev="JM" type="fix">
- The RTF output now properly generates the "\landscape" flag for documents in
+ The RTF output now properly generates the "\landscape" flag for documents in
landscape orientation.
</action>
<action context="Code" dev="JM" type="fix">
- Following a clarification by the XSL FO SG, space traits are only set on the
+ Following a clarification by the XSL FO SG, space traits are only set on the
first and last area generated by an FO, and not on every area anymore.
</action>
<action context="Code" dev="JM" type="add">
@@ -1184,7 +1299,7 @@
was not rendered at all.
</action>
<action context="Code" dev="JM" type="fix">
- Fixed a bug where the area for a finished cell that is broken over pages was
+ Fixed a bug where the area for a finished cell that is broken over pages was
created once for each row it was spanned over instead of only once.
</action>
<action context="Code" dev="JM" type="add">
@@ -1235,7 +1350,7 @@
<action context="Code" dev="JM" type="add">
Added an alternative set of rules for calculating text indents which tries to mimic
the behaviour of many commercial FO implementations that chose to break the rules
- in the FO specification in order to better meet the natural expectations of
+ in the FO specification in order to better meet the natural expectations of
inexperienced FO users.
</action>
<action context="Code" dev="JM" type="fix" fixes-bug="37815" due-to="Tom Craddock">
@@ -1255,14 +1370,14 @@
</action>
<action context="Code" dev="JM" type="add">
font-family list still not fully supported but a comma-separated list is now properly tokenized.
- FOP will now go through all fonts in the list to find one that is available, but it doesn't
- do so per character, yet.
+ FOP will now go through all fonts in the list to find one that is available, but it doesn't
+ do so per character, yet.
</action>
<action context="Code" dev="JM" type="add">
Implemented "Overconstrained Geometry" rules (5.3.4, XSL 1.0) for the most important cases.
</action>
<action context="Code" dev="JM" type="fix">
- Bugfix: Relatively positioned BlockViewports (from block-containers) caused the paint
+ Bugfix: Relatively positioned BlockViewports (from block-containers) caused the paint
cursor not be be properly advanced when space-before or space-after were present.
</action>
<action context="Code" dev="JM" type="fix">
@@ -1270,12 +1385,12 @@
didn't get removed.
</action>
<action context="Code" dev="JM" type="fix">
- The validation check for non-zero borders and padding on a region-* and for empty static-content
- elements is now turned off when relaxed validation is active to improve compatibility with
+ The validation check for non-zero borders and padding on a region-* and for empty static-content
+ elements is now turned off when relaxed validation is active to improve compatibility with
FO documents written for other FO implementations.
</action>
<action context="Code" dev="JM" type="fix">
- Bugfix for "/ by zero" ArithmeticExceptions when an URL to a non-existing image is used
+ Bugfix for "/ by zero" ArithmeticExceptions when an URL to a non-existing image is used
and content-width and/or content-height is used.
</action>
<action context="Code" dev="JM" type="fix">
@@ -1298,15 +1413,15 @@
</release>
<release version="0.90alpha1" date="22 Nov 2005">
<action context="Code" dev="all" type="update">
- <strong>Complete redesign of the FOP codebase</strong> in the period between Dec 2001 and Nov 2005.
- There are just too many changes to list here. If you like to know details, run
+ <strong>Complete redesign of the FOP codebase</strong> in the period between Dec 2001 and Nov 2005.
+ There are just too many changes to list here. If you like to know details, run
<code>"svn log --verbose http://svn.apache.org/repos/asf/xmlgraphics/fop/trunk/"</code>.
</action>
</release>
<release version="0.20.5" date="18 July 2003">
<action context="Code" dev="all" type="update">
- For the change log for the maintenance branch
- (where FOP 0.20.5 came from), please see the "CHANGES" file in the distribution, or
+ For the change log for the maintenance branch
+ (where FOP 0.20.5 came from), please see the "CHANGES" file in the distribution, or
<link href="http://svn.apache.org/viewcvs.cgi/xmlgraphics/fop/branches/fop-0_20_2-maintain/CHANGES?view=markup">the CHANGES file in the SVN repository</link>.
</action>
</release>
@@ -1320,5 +1435,5 @@
</action>
</actions>
</todo>
-
+
</status>
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/image/loader/batik/ImageLoaderTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/image/loader/batik/ImageLoaderTestCase.java?rev=685132&r1=685131&r2=685132&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/image/loader/batik/ImageLoaderTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/image/loader/batik/ImageLoaderTestCase.java Tue Aug 12 05:36:18 2008
@@ -88,6 +88,51 @@
assertEquals(16000, info.getSize().getHeightMpt());
}
+ public void testSVGNoViewbox() throws Exception {
+ String uri = "test/resources/images/circles.svg";
+
+ FopFactory ff = FopFactory.newInstance();
+ ff.setSourceResolution(96);
+ ff.setTargetResolution(300);
+
+ FOUserAgent userAgent = ff.newFOUserAgent();
+
+ ImageManager manager = ff.getImageManager();
+ ImageInfo info = manager.preloadImage(uri, userAgent.getImageSessionContext());
+ assertNotNull("ImageInfo must not be null", info);
+
+ Image img = manager.getImage(info, ImageFlavor.XML_DOM,
+ userAgent.getImageSessionContext());
+ assertNotNull("Image must not be null", img);
+ assertEquals(ImageFlavor.XML_DOM, img.getFlavor());
+ ImageXMLDOM imgDom = (ImageXMLDOM)img;
+ assertNotNull(imgDom.getDocument());
+ assertEquals("http://www.w3.org/2000/svg", imgDom.getRootNamespace());
+ info = imgDom.getInfo(); //Switch to the ImageInfo returned by the image
+ assertEquals(96, info.getSize().getDpiHorizontal(), 0);
+ assertEquals(340158, info.getSize().getWidthMpt());
+ assertEquals(340158, info.getSize().getHeightMpt());
+ assertEquals(454, info.getSize().getWidthPx());
+ assertEquals(454, info.getSize().getHeightPx());
+
+ img = manager.getImage(info, ImageFlavor.RENDERED_IMAGE,
+ userAgent.getImageSessionContext());
+ assertNotNull("Image must not be null", img);
+ assertEquals(ImageFlavor.RENDERED_IMAGE, img.getFlavor());
+ ImageRendered imgRed = (ImageRendered)img;
+ assertNotNull(imgRed.getRenderedImage());
+ if (DEBUG_TARGET_DIR != null) {
+ ImageWriterUtil.saveAsPNG(imgRed.getRenderedImage(),
+ (int)userAgent.getTargetResolution(),
+ new File(DEBUG_TARGET_DIR, "circles.svg.png"));
+ }
+ assertEquals(1418, imgRed.getRenderedImage().getWidth());
+ assertEquals(1418, imgRed.getRenderedImage().getHeight());
+ info = imgRed.getInfo(); //Switch to the ImageInfo returned by the image
+ assertEquals(340158, info.getSize().getWidthMpt());
+ assertEquals(340158, info.getSize().getHeightMpt());
+ }
+
public void testWMF() throws Exception {
String uri = "test/resources/images/testChart.wmf";
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/layoutengine/standard-testcases/block_break-before_bug44412.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/layoutengine/standard-testcases/block_break-before_bug44412.xml?rev=685132&r1=685131&r2=685132&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/layoutengine/standard-testcases/block_break-before_bug44412.xml (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/layoutengine/standard-testcases/block_break-before_bug44412.xml Tue Aug 12 05:36:18 2008
@@ -20,8 +20,7 @@
<info>
<p>
This test checks Bugzilla #44412 where a break-before on the first child of an otherwise
- empty block is set. It is expected that the parent block creates two areas, the first with
- only border-before on the first page and zero bpd.
+ empty block is set.
</p>
</info>
<fo>
@@ -44,20 +43,12 @@
</fo:root>
</fo>
<checks>
- <eval expected="2" xpath="count(//block[@prod-id = 'b1'])"/>
- <eval expected="4000 4000 4000 0" xpath="(//block[@prod-id = 'b1'])[1]/@bap"/>
- <eval expected="4000 4000 0 4000" xpath="(//block[@prod-id = 'b1'])[2]/@bap"/>
- <eval expected="0" xpath="(//block[@prod-id = 'b1'])[1]/@bpd"/>
- <eval expected="43200" xpath="(//block[@prod-id = 'b1'])[2]/@bpd"/>
+ <eval expected="1" xpath="count(//block[@prod-id = 'b1'])"/>
+ <eval expected="4000 4000 4000 4000" xpath="(//block[@prod-id = 'b1'])[1]/@bap"/>
+ <eval expected="43200" xpath="(//block[@prod-id = 'b1'])[1]/@bpd"/>
<element-list category="breaker" index="0">
<box w="14400"/>
- <penalty w="0" p="0"/>
- <box w="0" aux="true"/>
- <penalty w="0" p="INF"/>
- <glue w="4000"/> <!-- border-before -->
- <box w="0"/> <!-- first block area of the "b1" block with zero bpd -->
-
<skip>3</skip>
</element-list>
</checks>
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/layoutengine/standard-testcases/bookmarks_2.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/layoutengine/standard-testcases/bookmarks_2.xml?rev=685132&r1=685131&r2=685132&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/layoutengine/standard-testcases/bookmarks_2.xml (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/layoutengine/standard-testcases/bookmarks_2.xml Tue Aug 12 05:36:18 2008
@@ -34,10 +34,16 @@
<fo:bookmark-tree>
<fo:bookmark internal-destination="chapter1">
<fo:bookmark-title>Chapter 1</fo:bookmark-title>
+ <fo:bookmark internal-destination="chapter1">
+ <fo:bookmark-title>Nested Chapter 1</fo:bookmark-title>
+ </fo:bookmark>
</fo:bookmark>
<fo:bookmark internal-destination="chapter1" starting-state="hide">
<fo:bookmark-title>Again Chapter 1</fo:bookmark-title>
</fo:bookmark>
+ <fo:bookmark internal-destination="chapter2">
+ <fo:bookmark-title>Chapter 2</fo:bookmark-title>
+ </fo:bookmark>
</fo:bookmark-tree>
<fo:page-sequence id="page-sequence" master-reference="normal">
<fo:flow flow-name="xsl-region-body">
@@ -58,10 +64,13 @@
<eval expected="Chapter 1" xpath="//bookmarkTree/bookmark[1]/@title"/>
<eval expected="true" xpath="//bookmarkTree/bookmark[1]/@show-children"/>
+ <eval expected="Nested Chapter 1" xpath="//bookmarkTree/bookmark[1]/bookmark[1]/@title"/>
+ <eval expected="true" xpath="//bookmarkTree/bookmark[1]/bookmark[1]/@show-children"/>
<eval expected="Again Chapter 1" xpath="//bookmarkTree/bookmark[2]/@title"/>
<eval expected="false" xpath="//bookmarkTree/bookmark[2]/@show-children"/>
<eval expected="(P1,chapter1)" xpath="//bookmarkTree/bookmark[1]/@internal-link"/>
+ <eval expected="(P1,chapter1)" xpath="//bookmarkTree/bookmark[1]/bookmark[1]/@internal-link"/>
<eval expected="(P1,chapter1)" xpath="//bookmarkTree/bookmark[2]/@internal-link"/>
</checks>
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org