aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorManuel Mall <manuel@apache.org>2005-10-12 16:11:47 +0000
committerManuel Mall <manuel@apache.org>2005-10-12 16:11:47 +0000
commit7fd03980fea71edc28578218f3a53ca0665698df (patch)
tree381070dd84dcc599093b053727cde8e6767e9097 /test
parent0129397f8aebdbef7eb47695dbbc60e699c649d7 (diff)
downloadxmlgraphics-fop-7fd03980fea71edc28578218f3a53ca0665698df.tar.gz
xmlgraphics-fop-7fd03980fea71edc28578218f3a53ca0665698df.zip
Fixed incorrect IPD for blocks nested in inlines and added IPD adjustment for inlineblockparents with borders when rendering
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@314953 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'test')
-rwxr-xr-xtest/layoutengine/testcases/inline_border_padding_block_nested.xml10
1 files changed, 3 insertions, 7 deletions
diff --git a/test/layoutengine/testcases/inline_border_padding_block_nested.xml b/test/layoutengine/testcases/inline_border_padding_block_nested.xml
index 4536cb0dd..81c340bd5 100755
--- a/test/layoutengine/testcases/inline_border_padding_block_nested.xml
+++ b/test/layoutengine/testcases/inline_border_padding_block_nested.xml
@@ -83,15 +83,14 @@
<checks>
<eval expected="347000" xpath="//flow/block[2]/lineArea[2]/inlineblockparent/@ipd"/>
<eval expected="350000" xpath="//flow/block[2]/lineArea[2]/inlineblockparent/@ipda"/>
- <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[1]/inlineblockparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[2]/inlineblockparent/@border-after"/>
<eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[2]/inlineblockparent/@border-before"/>
<eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[2]/inlineblockparent/@border-start"/>
<eval expected="2000" xpath="//flow/block[2]/lineArea[2]/inlineblockparent/@padding-after"/>
<eval expected="2000" xpath="//flow/block[2]/lineArea[2]/inlineblockparent/@padding-before"/>
<eval expected="2000" xpath="//flow/block[2]/lineArea[2]/inlineblockparent/@padding-start"/>
- <eval expected="48910" xpath="//flow/block[2]/lineArea[3]/inlineparent/@ipd"/>
- <eval expected="51910" xpath="//flow/block[2]/lineArea[3]/inlineparent/@ipda"/>
- <eval expected="1375" xpath="//flow/block[2]/lineArea[3]/inlineparent/@offset"/>
+ <eval expected="46130" xpath="//flow/block[2]/lineArea[3]/inlineparent/@ipd"/>
+ <eval expected="49130" xpath="//flow/block[2]/lineArea[3]/inlineparent/@ipda"/>
<eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[3]/inlineparent/@border-after"/>
<eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[3]/inlineparent/@border-before"/>
<eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[3]/inlineparent/@border-end"/>
@@ -101,7 +100,6 @@
<eval expected="54470" xpath="//flow/block[5]/lineArea[1]/inlineparent/@ipd"/>
<eval expected="57470" xpath="//flow/block[5]/lineArea[1]/inlineparent/@ipda"/>
- <eval expected="1375" xpath="//flow/block[5]/lineArea[1]/inlineparent/@offset"/>
<eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[1]/inlineparent/@border-after"/>
<eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[1]/inlineparent/@border-before"/>
<eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[1]/inlineparent/@border-start"/>
@@ -119,7 +117,6 @@
<eval expected="54470" xpath="//flow/block[8]/lineArea[1]/inlineparent/@ipd"/>
<eval expected="57470" xpath="//flow/block[8]/lineArea[1]/inlineparent/@ipda"/>
- <eval expected="1375" xpath="//flow/block[8]/lineArea[1]/inlineparent/@offset"/>
<eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[1]/inlineparent/@border-after"/>
<eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[1]/inlineparent/@border-before"/>
<eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[1]/inlineparent/@border-start"/>
@@ -134,7 +131,6 @@
<eval expected="1000" xpath="//flow/block[8]/lineArea[2]/inlineblockparent/@padding-before"/>
<eval expected="46130" xpath="//flow/block[8]/lineArea[3]/inlineparent/@ipd"/>
<eval expected="49130" xpath="//flow/block[8]/lineArea[3]/inlineparent/@ipda"/>
- <eval expected="1375" xpath="//flow/block[8]/lineArea[3]/inlineparent/@offset"/>
<eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[3]/inlineparent/@border-after"/>
<eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[3]/inlineparent/@border-before"/>
<eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[3]/inlineparent/@border-end"/>