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 ac...@apache.org on 2008/07/07 16:09:10 UTC
svn commit: r674497 [11/11] - in
/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign: ./ lib/ lib/build/
src/codegen/unicode/data/
src/codegen/unicode/java/org/apache/fop/text/linebreak/ src/documentation/
src/documentation/content/xdocs/ src/documentatio...
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/CharUtilities.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/CharUtilities.java?rev=674497&r1=674496&r2=674497&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/CharUtilities.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/CharUtilities.java Mon Jul 7 07:09:01 2008
@@ -54,10 +54,20 @@
public static final int XMLWHITESPACE = 4;
+ /** null char */
+ public static final char NULL_CHAR = '\u0000';
+ /** linefeed character */
+ public static final char LINEFEED_CHAR = '\n';
+ /** carriage return */
+ public static final char CARRIAGE_RETURN = '\r';
+ /** normal tab */
+ public static final char TAB = '\t';
/** normal space */
public static final char SPACE = '\u0020';
/** non-breaking space */
public static final char NBSPACE = '\u00A0';
+ /** next line control character */
+ public static final char NEXT_LINE = '\u0085';
/** zero-width space */
public static final char ZERO_WIDTH_SPACE = '\u200B';
/** word joiner */
@@ -68,11 +78,18 @@
public static final char ZERO_WIDTH_NOBREAK_SPACE = '\uFEFF';
/** soft hyphen */
public static final char SOFT_HYPHEN = '\u00AD';
+ /** line-separator */
+ public static final char LINE_SEPARATOR = '\u2028';
+ /** paragraph-separator */
+ public static final char PARAGRAPH_SEPARATOR = '\u2029';
/** missing ideograph */
public static final char MISSING_IDEOGRAPH = '\u25A1';
+ /** Ideogreaphic space */
+ public static final char IDEOGRAPHIC_SPACE = '\u3000';
/** Unicode value indicating the the character is "not a character". */
public static final char NOT_A_CHARACTER = '\uFFFF';
+
/**
* Utility class: Constructor prevents instantiating when subclassed.
*/
@@ -87,11 +104,18 @@
* @return the determined character class
*/
public static int classOf(char c) {
- if (c == CODE_EOT) { return EOT; }
- if (c == '\n') { return LINEFEED; }
- if (c == ' ' || c == '\r' || c == '\t') { return XMLWHITESPACE; }
- if (isAnySpace(c)) { return UCWHITESPACE; }
- return NONWHITESPACE;
+ switch (c) {
+ case CODE_EOT:
+ return EOT;
+ case LINEFEED_CHAR:
+ return LINEFEED;
+ case SPACE:
+ case CARRIAGE_RETURN:
+ case TAB:
+ return XMLWHITESPACE;
+ default:
+ return isAnySpace(c) ? UCWHITESPACE : NONWHITESPACE;
+ }
}
@@ -174,8 +198,7 @@
* @return True if the character represents any kind of space
*/
public static boolean isAnySpace(char c) {
- boolean ret = (isBreakableSpace(c) || isNonBreakableSpace(c));
- return ret;
+ return (isBreakableSpace(c) || isNonBreakableSpace(c));
}
/**
@@ -188,19 +211,31 @@
//Generated from: Other_Alphabetic + Lu + Ll + Lt + Lm + Lo + Nl
int generalCategory = Character.getType(ch);
switch (generalCategory) {
- case Character.UPPERCASE_LETTER: //Lu
- case Character.LOWERCASE_LETTER: //Ll
- case Character.TITLECASE_LETTER: //Lt
- case Character.MODIFIER_LETTER: //Lm
- case Character.OTHER_LETTER: //Lo
- case Character.LETTER_NUMBER: //Nl
- return true;
- default:
- //TODO if (ch in Other_Alphabetic) return true; (Probably need ICU4J for that)
- //Other_Alphabetic contains mostly more exotic characters
- return false;
+ case Character.UPPERCASE_LETTER: //Lu
+ case Character.LOWERCASE_LETTER: //Ll
+ case Character.TITLECASE_LETTER: //Lt
+ case Character.MODIFIER_LETTER: //Lm
+ case Character.OTHER_LETTER: //Lo
+ case Character.LETTER_NUMBER: //Nl
+ return true;
+ default:
+ //TODO if (ch in Other_Alphabetic) return true; (Probably need ICU4J for that)
+ //Other_Alphabetic contains mostly more exotic characters
+ return false;
}
}
-
+
+ /**
+ * Indicates whether the given character is an explicit break-character
+ * @param ch the character to check
+ * @return true if the character represents an explicit break
+ */
+ public static boolean isExplicitBreak(char ch) {
+ return (ch == LINEFEED_CHAR
+ || ch == CARRIAGE_RETURN
+ || ch == NEXT_LINE
+ || ch == LINE_SEPARATOR
+ || ch == PARAGRAPH_SEPARATOR);
+ }
}
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/CloseBlockerOutputStream.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/CloseBlockerOutputStream.java?rev=674497&r1=674496&r2=674497&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/CloseBlockerOutputStream.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/CloseBlockerOutputStream.java Mon Jul 7 07:09:01 2008
@@ -19,25 +19,25 @@
package org.apache.fop.util;
-import java.io.FilterOutputStream;
import java.io.IOException;
import java.io.OutputStream;
+import org.apache.commons.io.output.ProxyOutputStream;
+
/**
* This is a decorator to block calls to close() to the underlying stream.
*/
-public class CloseBlockerOutputStream extends FilterOutputStream {
+public class CloseBlockerOutputStream extends ProxyOutputStream {
/**
- * @see java.io.FilterOutputStream#FilterOutputStream(OutputStream)
+ * Main constructor.
+ * @param out the underlying stream
*/
public CloseBlockerOutputStream(OutputStream out) {
super(out);
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void close() throws IOException {
try {
flush();
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/status.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/status.xml?rev=674497&r1=674496&r2=674497&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/status.xml (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/status.xml Mon Jul 7 07:09:01 2008
@@ -53,10 +53,33 @@
<changes>
<release version="FOP Trunk" date="TBD">
+ <action context="Renderers" dev="AC" type="add">
+ Added PDF encryption parameter support in configuration.
+ </action>
+ <action context="Layout" dev="LF" type="add">
+ Allowing non-zero borders and padding on page regions when
+ relaxed validation is turned on.
+ </action>
+ <action context="Layout" dev="LF" type="fix">
+ Fixed an inconsistency in footnote handling that led to unnecessary
+ empty areas in pages whose last normal line contains footnotes
+ when the page bpd is not the same for all pages.
+ </action>
<!-- change reverted, to be added back later
<action context="Renderers" dev="AC" importance="high" type="add">
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
+ the simplex/duplex mode.
+ </action>
+ <action context="Code" dev="AD" type="fix" fixes-bug="45097">
+ Corrected white-space-treatment for situations where an inline-node is the first/last
+ child node of an fo:block, without preceding/following text.
+ </action>
+ <action context="Layout" dev="MB" type="add">
+ Implemented word-by-ford font-selection strategy on text.
+ </action>
<action context="Layout" dev="MB" type="add">
Support character-by-character font-selection strategy on fo:character element.
</action>
@@ -133,7 +156,28 @@
in the font's primary encoding.
</action>
</release>
- <release version="0.95beta" date="22 March 2008">
+ <release version="0.95" date="TBD">
+ <action context="Renderers" dev="JM" type="fix">
+ Fixed positioning of absolutely positioned block-containers in multi-column documents.
+ </action>
+ <action context="Renderers" dev="JM" type="fix">
+ Fixed rendering of fixed block-containers in AFP output.
+ </action>
+ <action context="Renderers" dev="JM" type="fix">
+ Fixed regression causing bad positioning of block-containers if used as descendant
+ of a table-cell.
+ </action>
+ <action context="Fonts" dev="JM" type="fix">
+ Fixed text extraction problem with ZapfDingbats and Symbol font in PDF output.
+ </action>
+ <action context="Images" dev="JM" type="fix">
+ Fixed a performance problem concerning image serialization.
+ </action>
+ <action context="Fonts" dev="JM" type="fix">
+ Fixed NullPointerException when loading a TrueType font using XML font metric files.
+ </action>
+ </release>
+ <release version="0.95beta" date="26 March 2008">
<notes>
<section>
<title>Notes</title>
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/fotree/testcases/column-number_cells_rows.fo
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/fotree/testcases/column-number_cells_rows.fo?rev=674497&r1=674496&r2=674497&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/fotree/testcases/column-number_cells_rows.fo (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/fotree/testcases/column-number_cells_rows.fo Mon Jul 7 07:09:01 2008
@@ -181,6 +181,10 @@
</fo:table-row>
</fo:table-body>
</fo:table>
+ <fo:block column-number="4">
+ <test:assert property="column-number" expected="4" />
+ Test column-number when specified on fo:block
+ </fo:block>
</fo:flow>
</fo:page-sequence>
</fo:root>
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/StandardTestSuite.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/StandardTestSuite.java?rev=674497&r1=674496&r2=674497&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/StandardTestSuite.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/StandardTestSuite.java Mon Jul 7 07:09:01 2008
@@ -22,6 +22,7 @@
import junit.framework.Test;
import junit.framework.TestSuite;
+import org.apache.fop.fonts.TrueTypeAnsiTestCase;
import org.apache.fop.render.pdf.PDFAConformanceTestCase;
import org.apache.fop.render.pdf.PDFCMapTestCase;
import org.apache.fop.render.pdf.PDFEncodingTestCase;
@@ -47,6 +48,7 @@
suite.addTest(new TestSuite(PDFEncodingTestCase.class));
suite.addTest(new TestSuite(PDFCMapTestCase.class));
suite.addTest(new TestSuite(PDFsRGBSettingsTestCase.class));
+ suite.addTest(new TestSuite(TrueTypeAnsiTestCase.class));
suite.addTest(RichTextFormatTestSuite.suite());
//$JUnit-END$
return suite;
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/fo/flow/table/CollapsedConditionalBorderTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/fo/flow/table/CollapsedConditionalBorderTestCase.java?rev=674497&r1=674496&r2=674497&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/fo/flow/table/CollapsedConditionalBorderTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/fo/flow/table/CollapsedConditionalBorderTestCase.java Mon Jul 7 07:09:01 2008
@@ -108,7 +108,7 @@
super();
}
- private static GridUnit getGridUnit(TableBody part) {
+ private static GridUnit getGridUnit(TablePart part) {
return (GridUnit) ((List) ((List) part.getRowGroups().get(0)).get(0)).get(0);
}
@@ -137,8 +137,8 @@
do {
String baseErrorMsge = "table " + Integer.toString(tableNum) + " (0-based), ";
Table table = (Table) tableIterator.next();
- TableBody body = (TableBody) table.getChildNodes().nextNode();
- GridUnit gu = getGridUnit(body);
+ TablePart part = (TablePart) table.getChildNodes().nextNode();
+ GridUnit gu = getGridUnit(part);
String errorMsge = baseErrorMsge + "border-before";
checkBorder(errorMsge, gu.borderBefore.normal, 8000, Color.black);
@@ -163,14 +163,14 @@
int borderNum = 0;
Table table = (Table) tableIterator.next();
- TableBody header = table.getTableHeader();
+ TableHeader header = table.getTableHeader();
GridUnit gu = getGridUnit(header);
checkBorder(errorMsge, gu.borderBefore.normal,
resolvedBordersHF[tableNum][borderNum++]);
checkBorder(errorMsge, gu.borderBefore.rest,
resolvedBordersHF[tableNum][borderNum++]);
- TableBody footer = table.getTableFooter();
+ TableFooter footer = table.getTableFooter();
gu = getGridUnit(footer);
checkBorder(errorMsge, gu.borderAfter.normal,
resolvedBordersHF[tableNum][borderNum++]);
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/fo/flow/table/RowGroupBuilderTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/fo/flow/table/RowGroupBuilderTestCase.java?rev=674497&r1=674496&r2=674497&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/fo/flow/table/RowGroupBuilderTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/fo/flow/table/RowGroupBuilderTestCase.java Mon Jul 7 07:09:01 2008
@@ -38,12 +38,12 @@
* given array, and that the number of rows inside each row group is equal to the
* corresponding integer in the array.
*
- * @param body a body whose row groups are to be checked
+ * @param part a table part whose row groups are to be checked
* @param expectedRowLengths expected lengths of all the row groups of this part of
* the table
*/
- private void checkTablePartRowGroups(TableBody body, int[] expectedRowLengths) {
- Iterator rowGroupIter = body.getRowGroups().iterator();
+ private void checkTablePartRowGroups(TablePart part, int[] expectedRowLengths) {
+ Iterator rowGroupIter = part.getRowGroups().iterator();
for (int i = 0; i < expectedRowLengths.length; i++) {
assertTrue(rowGroupIter.hasNext());
List rowGroup = (List) rowGroupIter.next();
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/layoutengine/disabled-testcases.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/layoutengine/disabled-testcases.xml?rev=674497&r1=674496&r2=674497&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/layoutengine/disabled-testcases.xml (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/layoutengine/disabled-testcases.xml Mon Jul 7 07:09:01 2008
@@ -98,24 +98,6 @@
regions.</description>
</testcase>
<testcase>
- <name>Footnotes swallowed in lists</name>
- <file>footnote_in_list.xml</file>
- <description>Element lists for lists are created by combining the
- element lists from list-item-label and list-item-body. The
- footnotes contained in the KnuthBlockBoxes are not propagated to
- the combined element list.</description>
- <reference>http://issues.apache.org/bugzilla/show_bug.cgi?id=37579</reference>
- </testcase>
- <testcase>
- <name>Footnotes swallowed in tables</name>
- <file>footnote_in_table.xml</file>
- <description>Element lists for tables are created by combining the
- element lists from the individual table-cells. The footnotes
- contained in the KnuthBlockBoxes are not propagated to the combined
- element list.</description>
- <reference>http://issues.apache.org/bugzilla/show_bug.cgi?id=37579</reference>
- </testcase>
- <testcase>
<name>NPE for table inside an inline</name>
<file>inline_block_nested_3.xml</file>
<description>Placing a table as a child of an fo:inline produces a
@@ -234,4 +216,16 @@
<description>A soft hyphen should be a preferred as break compared to a
normal hyphenation point but is not.</description>
</testcase>
+ <testcase>
+ <name>Borders and padding on page regions</name>
+ <file>simple-page-master_borders_padding.xml</file>
+ <description>Borders and padding on regions are now implemented but
+ relaxed validation must be switched on, otherwise there is a validation
+ exception.</description>
+ </testcase>
+ <testcase>
+ <name>Instream foreign objects in markers</name>
+ <file>marker_instream-foreign-object.xml</file>
+ <description>Foreign objects in markers do not work.</description>
+ </testcase>
</disabled-testcases>
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/layoutengine/standard-testcases/block_keep-together_integers_1.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/layoutengine/standard-testcases/block_keep-together_integers_1.xml?rev=674497&r1=674496&r2=674497&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/layoutengine/standard-testcases/block_keep-together_integers_1.xml (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/layoutengine/standard-testcases/block_keep-together_integers_1.xml Mon Jul 7 07:09:01 2008
@@ -54,6 +54,11 @@
</fo:block>
<fo:block>block10</fo:block>
</fo:block>
+ <fo:block keep-together.within-column="5" linefeed-treatment="preserve">The quick brown fox jumps over the lazy dog.
+ The quick brown fox jumps over the lazy dog.
+ The quick brown fox jumps over the lazy dog.
+ The quick brown fox jumps over the lazy dog.
+ </fo:block>
</fo:flow>
</fo:page-sequence>
</fo:root>
@@ -76,7 +81,9 @@
<box/>
<penalty w="0" p="0"/>
<box/> <!-- block 3 -->
+ <penalty w="0" p="999"/>
<box/>
+ <penalty w="0" p="999"/>
<box/>
<penalty w="0" p="0"/>
<box/> <!-- block4 -->
@@ -91,7 +98,17 @@
<penalty w="0" p="INF"/>
<box/> <!-- block9 -->
<penalty w="0" p="999"/>
+ <box/> <!-- block10 -->
+ <penalty w="0" p="0"/>
+
+ <box/>
+ <penalty w="0" p="999"/>
<box/>
+ <penalty w="0" p="999"/>
+ <box/>
+ <penalty w="0" p="999"/>
+ <box/>
+
<skip>3</skip>
</element-list>
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/layoutengine/standard-testcases/footnote_in_list.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/layoutengine/standard-testcases/footnote_in_list.xml?rev=674497&r1=674496&r2=674497&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/layoutengine/standard-testcases/footnote_in_list.xml (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/layoutengine/standard-testcases/footnote_in_list.xml Mon Jul 7 07:09:01 2008
@@ -65,5 +65,7 @@
</fo>
<checks>
<eval expected="2" xpath="count(//footnote/block)"/>
+ <eval expected="1) The footnote from the normal block." xpath="//footnote/block[1]"/>
+ <eval expected="2) The footnote from the list." xpath="//footnote/block[2]"/>
</checks>
</testcase>
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/layoutengine/standard-testcases/footnote_in_table.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/layoutengine/standard-testcases/footnote_in_table.xml?rev=674497&r1=674496&r2=674497&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/layoutengine/standard-testcases/footnote_in_table.xml (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/layoutengine/standard-testcases/footnote_in_table.xml Mon Jul 7 07:09:01 2008
@@ -69,5 +69,7 @@
</fo>
<checks>
<eval expected="2" xpath="count(//footnote/block)"/>
+ <eval expected="1) The footnote from the normal block." xpath="//footnote/block[1]"/>
+ <eval expected="2) The footnote from the table." xpath="//footnote/block[2]"/>
</checks>
</testcase>
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/layoutengine/standard-testcases/page-number-citation_background-color.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/layoutengine/standard-testcases/page-number-citation_background-color.xml?rev=674497&r1=674496&r2=674497&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/layoutengine/standard-testcases/page-number-citation_background-color.xml (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/layoutengine/standard-testcases/page-number-citation_background-color.xml Mon Jul 7 07:09:01 2008
@@ -30,7 +30,7 @@
</fo:simple-page-master>
</fo:layout-master-set>
<fo:page-sequence master-reference="normal" white-space-collapse="true">
- <fo:flow flow-name="xsl-region-body" font-size="10pt" id="ref">
+ <fo:flow flow-name="xsl-region-body" font-size="10pt">
<fo:block background-color="silver" id="ref">
To emphasize a page number citation <fo:page-number-citation ref-id="ref" background-color="yellow" /> highlight it.
</fo:block>
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/layoutengine/standard-testcases/table_bug44621.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/layoutengine/standard-testcases/table_bug44621.xml?rev=674497&r1=674496&r2=674497&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/layoutengine/standard-testcases/table_bug44621.xml (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/layoutengine/standard-testcases/table_bug44621.xml Mon Jul 7 07:09:01 2008
@@ -66,12 +66,32 @@
</fo:table-row>
</fo:table-body>
</fo:table>
+
+ <fo:block space-before="20pt" space-after="10pt">The after border of cell 1, in the normal
+ case, is thicker than in the trailing case.</fo:block>
+ <fo:table width="100%" table-layout="fixed"
+ font-size="8pt" line-height="10pt">
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell border="1pt solid black">
+ <fo:block>Cell 1</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell border="2pt solid black">
+ <fo:block>Cell 2</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+
</fo:flow>
</fo:page-sequence>
</fo:root>
</fo>
<checks>
+ <!-- table 1 -->
<eval expected="39000" xpath="//pageViewport//flow/block[2]/@bpd"/>
<eval expected="39000" xpath="//pageViewport//flow/block[2]/@bpda"/>
<!-- cell 1.1 -->
@@ -93,12 +113,27 @@
<eval expected="10000" xpath="//pageViewport//flow/block[2]/block[6]/@bpd"/>
<eval expected="18000" xpath="//pageViewport//flow/block[2]/block[6]/@bpda"/>
+ <!-- table 2 -->
+ <eval expected="23500" xpath="//pageViewport//flow/block[4]/@bpd"/>
+ <eval expected="23500" xpath="//pageViewport//flow/block[4]/@bpda"/>
+ <!-- cell 1 -->
+ <eval expected="10000" xpath="//pageViewport//flow/block[4]/block[1]/@bpd"/>
+ <eval expected="13000" xpath="//pageViewport//flow/block[4]/block[1]/@bpda"/>
+ <!-- cell 2 -->
+ <eval expected="10000" xpath="//pageViewport//flow/block[4]/block[2]/@bpd"/>
+ <eval expected="14000" xpath="//pageViewport//flow/block[4]/block[2]/@bpda"/>
+
<element-list category="breaker">
<skip>4</skip>
<box w="12000"/>
- <penalty w="14000" p="0"/><!-- should be 15000 -->
+ <penalty w="15000" p="0"/>
<box w="13000"/>
<box w="14000"/>
+ <skip>6</skip>
+ <box w="11000"/>
+ <penalty w="0" p="0"/>
+ <glue w="500"/>
+ <box w="12000"/>
<skip>3</skip>
</element-list>
</checks>
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/layoutengine/testcase2checks.xsl
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/layoutengine/testcase2checks.xsl?rev=674497&r1=674496&r2=674497&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/layoutengine/testcase2checks.xsl (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/layoutengine/testcase2checks.xsl Mon Jul 7 07:09:01 2008
@@ -19,15 +19,19 @@
<!-- This stylesheet extracts the checks from the testcase so the list of checks can be built in Java code. -->
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format">
- <xsl:template match="testcase">
- <checks>
- <xsl:apply-templates select="checks/*" mode="copy"/>
- </checks>
- </xsl:template>
+<xsl:variable name="basic-checks" select="document('basic-checks.xml')/checks/*" />
+
+<xsl:template match="testcase">
+ <xsl:apply-templates select="checks" />
+</xsl:template>
+
+<xsl:template match="checks">
+ <checks>
+ <xsl:copy-of select="$basic-checks" />
+ <xsl:copy-of select="*" />
+ </checks>
+</xsl:template>
+
+<xsl:template match="text()" />
- <xsl:template match="node()|@*" mode="copy">
- <xsl:copy>
- <xsl:apply-templates select="@*|node()" mode="copy"/>
- </xsl:copy>
- </xsl:template>
</xsl:stylesheet>
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/layoutengine/testcase2fo.xsl
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/layoutengine/testcase2fo.xsl?rev=674497&r1=674496&r2=674497&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/layoutengine/testcase2fo.xsl (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/layoutengine/testcase2fo.xsl Mon Jul 7 07:09:01 2008
@@ -50,16 +50,12 @@
</xsl:when>
<xsl:otherwise>
<!-- if variable isn't defined, just copy -->
- <xsl:copy>
- <xsl:apply-templates select="node()" mode="copy"/>
- </xsl:copy>
+ <xsl:copy-of select="." />
</xsl:otherwise>
</xsl:choose>
</xsl:when>
<xsl:otherwise>
- <xsl:copy>
- <xsl:apply-templates select="node()" mode="copy"/>
- </xsl:copy>
+ <xsl:copy-of select="." />
</xsl:otherwise>
</xsl:choose>
</xsl:template>
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/xmlgraphics-fop-pom-template.pom
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/xmlgraphics-fop-pom-template.pom?rev=674497&r1=674496&r2=674497&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/xmlgraphics-fop-pom-template.pom (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/xmlgraphics-fop-pom-template.pom Mon Jul 7 07:09:01 2008
@@ -70,48 +70,48 @@
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>xmlgraphics-commons</artifactId>
- <version>1.2</version>
+ <version>1.3</version>
</dependency>
<dependency>
- <groupId>batik</groupId>
+ <groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-svg-dom</artifactId>
- <version>1.6-1</version>
+ <version>1.7</version>
</dependency>
<dependency>
- <groupId>batik</groupId>
+ <groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-bridge</artifactId>
- <version>1.6-1</version>
+ <version>1.7</version>
</dependency>
<dependency>
- <groupId>batik</groupId>
+ <groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-awt-util</artifactId>
- <version>1.6-1</version>
+ <version>1.7</version>
</dependency>
<dependency>
- <groupId>batik</groupId>
+ <groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-gvt</artifactId>
- <version>1.6-1</version>
+ <version>1.7</version>
</dependency>
<dependency>
- <groupId>batik</groupId>
+ <groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-transcoder</artifactId>
- <version>1.6-1</version>
+ <version>1.7</version>
<exclusions>
<exclusion>
- <groupId>fop</groupId>
+ <groupId>org.apache.xmlgraphics</groupId>
<artifactId>fop</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
- <groupId>batik</groupId>
+ <groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-extension</artifactId>
- <version>1.6-1</version>
+ <version>1.7</version>
</dependency>
<dependency>
- <groupId>batik</groupId>
+ <groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-ext</artifactId>
- <version>1.6-1</version>
+ <version>1.7</version>
</dependency>
<!-- other dependencies -->
<dependency>
@@ -122,23 +122,24 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>1.1</version>
+ <version>1.3.1</version>
</dependency>
<dependency>
<groupId>org.apache.avalon.framework</groupId>
<artifactId>avalon-framework-api</artifactId>
<version>4.3.1</version>
</dependency>
- <dependency>
- <groupId>org.apache.avalon.framework</groupId>
- <artifactId>avalon-framework-impl</artifactId>
- <version>4.3.1</version>
- </dependency>
- <dependency>
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.3</version>
+ <version>2.2</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ <version>2.7.0</version>
<scope>provided</scope>
</dependency>
- </dependencies>
+ </dependencies>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org