diff options
| author | Mehdi Houshmand <mehdi@apache.org> | 2012-05-31 08:33:36 +0000 |
|---|---|---|
| committer | Mehdi Houshmand <mehdi@apache.org> | 2012-05-31 08:33:36 +0000 |
| commit | eccd73c523bdda6a0634e9849141492f7b14ad63 (patch) | |
| tree | 72f06ec1481249bdd639083ee646b3c3fd4be7a4 /test/layoutengine | |
| parent | 05761b1df54ada8a762bfa879dc0e3455d33d828 (diff) | |
| download | xmlgraphics-fop-eccd73c523bdda6a0634e9849141492f7b14ad63.tar.gz xmlgraphics-fop-eccd73c523bdda6a0634e9849141492f7b14ad63.zip | |
Started unifying URI resolution mechanism, redesigned configuration system and created flexible config testing
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_URI_Unification@1344594 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'test/layoutengine')
61 files changed, 208 insertions, 196 deletions
diff --git a/test/layoutengine/standard-testcases/afp-extension_1.xml b/test/layoutengine/standard-testcases/afp-extension_1.xml index 41659ab6d..74dd5e145 100644 --- a/test/layoutengine/standard-testcases/afp-extension_1.xml +++ b/test/layoutengine/standard-testcases/afp-extension_1.xml @@ -30,7 +30,7 @@ <fo:layout-master-set> <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in"> <afp:include-page-overlay name="O1SAMP1 "/> - <afp:include-page-segment name="S1ISLOGO" src="../../resources/images/bgimg300dpi.jpg"/> + <afp:include-page-segment name="S1ISLOGO" src="../resources/images/bgimg300dpi.jpg"/> <afp:tag-logical-element name="The TLE Name" value="The TLE Value"/> <afp:no-operation name="My NOP">insert up to 32k of character data here!</afp:no-operation> <fo:region-body/> @@ -38,7 +38,7 @@ </fo:layout-master-set> <fo:declarations> - <afp:include-form-map name="FORMMAP1" src="file:../../resources/afp/F1SAMPLE.afp"/> + <afp:include-form-map name="FORMMAP1" src="file:../resources/afp/F1SAMPLE.afp"/> </fo:declarations> <fo:page-sequence master-reference="normal" fox:test-ignore="this"> @@ -53,7 +53,7 @@ </fo> <checks xmlns:afp="apache:fop:extensions:afp"> <eval expected="FORMMAP1" xpath="/areaTree/extension-attachments/afp:include-form-map/@name"/> - <eval expected="file:../../resources/afp/F1SAMPLE.afp" xpath="/areaTree/extension-attachments/afp:include-form-map/@src"/> + <eval expected="file:../resources/afp/F1SAMPLE.afp" xpath="/areaTree/extension-attachments/afp:include-form-map/@src"/> <eval expected="4" xpath="count(/areaTree/pageSequence/pageViewport[@nr=1]/page/extension-attachments/child::*)"/> <eval expected="O1SAMP1 " xpath="/areaTree/pageSequence/pageViewport[@nr=1]/page/extension-attachments/child::*[1]/@name"/> @@ -74,7 +74,7 @@ <if-checks xmlns:if="http://xmlgraphics.apache.org/fop/intermediate" xmlns:afp="apache:fop:extensions:afp"> <eval expected="FORMMAP1" xpath="/if:document/if:header/afp:include-form-map/@name"/> - <eval expected="file:../../resources/afp/F1SAMPLE.afp" xpath="/if:document/if:header/afp:include-form-map/@src"/> + <eval expected="file:../resources/afp/F1SAMPLE.afp" xpath="/if:document/if:header/afp:include-form-map/@src"/> <eval expected="4" xpath="count(//if:page[@name = '1']/if:page-header/child::*)"/> <eval expected="O1SAMP1 " xpath="//if:page[@name = '1']/if:page-header/afp:include-page-overlay[1]/@name"/> diff --git a/test/layoutengine/standard-testcases/basic-link_background-image.xml b/test/layoutengine/standard-testcases/basic-link_background-image.xml index 51766de9a..357d40a45 100644 --- a/test/layoutengine/standard-testcases/basic-link_background-image.xml +++ b/test/layoutengine/standard-testcases/basic-link_background-image.xml @@ -23,7 +23,7 @@ </p> </info> <variables> - <img>../../resources/images/bgimg300dpi.jpg</img> + <img>../resources/images/bgimg300dpi.jpg</img> </variables> <fo> <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> @@ -44,7 +44,7 @@ <checks> <eval expected="197376" xpath="//flow/block/lineArea/inlineparent/@ipd"/> <eval expected="88800" xpath="//flow/block/lineArea/inlineparent/@bpd"/> - <eval expected="color=#ffff00,url=../../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=75648,vertical=21360" xpath="//flow/block/lineArea/inlineparent/@background"/> + <eval expected="color=#ffff00,url=../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=75648,vertical=21360" xpath="//flow/block/lineArea/inlineparent/@background"/> </checks> <if-checks xmlns:n="http://xmlgraphics.apache.org/fop/intermediate/document-navigation"> <eval expected="page-trailer" xpath="local-name(//n:link/..)"/> diff --git a/test/layoutengine/standard-testcases/basic-link_background-image_writing-mode_rl.xml b/test/layoutengine/standard-testcases/basic-link_background-image_writing-mode_rl.xml index 8aa5480ec..271708726 100644 --- a/test/layoutengine/standard-testcases/basic-link_background-image_writing-mode_rl.xml +++ b/test/layoutengine/standard-testcases/basic-link_background-image_writing-mode_rl.xml @@ -23,7 +23,7 @@ </p> </info> <variables> - <img>../../resources/images/bgimg300dpi.jpg</img> + <img>../resources/images/bgimg300dpi.jpg</img> </variables> <fo> <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> @@ -44,7 +44,7 @@ <checks> <eval expected="197376" xpath="//flow/block/lineArea/inlineparent/@ipd"/> <eval expected="88800" xpath="//flow/block/lineArea/inlineparent/@bpd"/> - <eval expected="color=#ffff00,url=../../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=75648,vertical=21360" xpath="//flow/block/lineArea/inlineparent/@background"/> + <eval expected="color=#ffff00,url=../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=75648,vertical=21360" xpath="//flow/block/lineArea/inlineparent/@background"/> </checks> <if-checks xmlns:n="http://xmlgraphics.apache.org/fop/intermediate/document-navigation"> <eval expected="page-trailer" xpath="local-name(//n:link/..)"/> diff --git a/test/layoutengine/standard-testcases/block-container_background-image_background-position-relative.xml b/test/layoutengine/standard-testcases/block-container_background-image_background-position-relative.xml index 41e8f6b4b..5a91752e7 100644 --- a/test/layoutengine/standard-testcases/block-container_background-image_background-position-relative.xml +++ b/test/layoutengine/standard-testcases/block-container_background-image_background-position-relative.xml @@ -23,7 +23,7 @@ </p> </info> <variables> - <img>../../resources/images/box1.png</img> + <img>../resources/images/box1.png</img> </variables> <fo> <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> @@ -97,22 +97,22 @@ </fo> <checks> <!-- first container in row 1 --> - <eval expected="color=#0000ff,url=../../resources/images/box1.png,repeat=no-repeat,horiz=74991,vertical=0" xpath="//flow/block[1]/@background"/> + <eval expected="color=#0000ff,url=../resources/images/box1.png,repeat=no-repeat,horiz=74991,vertical=0" xpath="//flow/block[1]/@background"/> <!-- second container in row 1 --> - <eval expected="color=#008000,url=../../resources/images/box1.png,repeat=no-repeat,horiz=74991,vertical=27495" xpath="//flow/block[2]/@background"/> + <eval expected="color=#008000,url=../resources/images/box1.png,repeat=no-repeat,horiz=74991,vertical=27495" xpath="//flow/block[2]/@background"/> <!-- third container in row 1 --> - <eval expected="color=#ffff00,url=../../resources/images/box1.png,repeat=no-repeat,horiz=74991,vertical=54991" xpath="//flow/block[3]/@background"/> + <eval expected="color=#ffff00,url=../resources/images/box1.png,repeat=no-repeat,horiz=74991,vertical=54991" xpath="//flow/block[3]/@background"/> <!-- first container in row 2 --> - <eval expected="color=#ffff00,url=../../resources/images/box1.png,repeat=no-repeat,horiz=37495,vertical=0" xpath="//flow/block[4]/@background"/> + <eval expected="color=#ffff00,url=../resources/images/box1.png,repeat=no-repeat,horiz=37495,vertical=0" xpath="//flow/block[4]/@background"/> <!-- second container in row 2 --> - <eval expected="color=#0000ff,url=../../resources/images/box1.png,repeat=no-repeat,horiz=37495,vertical=27495" xpath="//flow/block[5]/@background"/> + <eval expected="color=#0000ff,url=../resources/images/box1.png,repeat=no-repeat,horiz=37495,vertical=27495" xpath="//flow/block[5]/@background"/> <!-- third container in row 2 --> - <eval expected="color=#008000,url=../../resources/images/box1.png,repeat=no-repeat,horiz=37495,vertical=54991" xpath="//flow/block[6]/@background"/> + <eval expected="color=#008000,url=../resources/images/box1.png,repeat=no-repeat,horiz=37495,vertical=54991" xpath="//flow/block[6]/@background"/> <!-- first container in row 3 --> - <eval expected="color=#008000,url=../../resources/images/box1.png,repeat=no-repeat,horiz=0,vertical=0" xpath="//flow/block[7]/@background"/> + <eval expected="color=#008000,url=../resources/images/box1.png,repeat=no-repeat,horiz=0,vertical=0" xpath="//flow/block[7]/@background"/> <!-- second container in row 3 --> - <eval expected="color=#ffff00,url=../../resources/images/box1.png,repeat=no-repeat,horiz=0,vertical=27495" xpath="//flow/block[8]/@background"/> + <eval expected="color=#ffff00,url=../resources/images/box1.png,repeat=no-repeat,horiz=0,vertical=27495" xpath="//flow/block[8]/@background"/> <!-- third container in row 3 --> - <eval expected="color=#0000ff,url=../../resources/images/box1.png,repeat=no-repeat,horiz=0,vertical=54991" xpath="//flow/block[9]/@background"/> + <eval expected="color=#0000ff,url=../resources/images/box1.png,repeat=no-repeat,horiz=0,vertical=54991" xpath="//flow/block[9]/@background"/> </checks> </testcase> diff --git a/test/layoutengine/standard-testcases/block-container_background-image_background-repeat.xml b/test/layoutengine/standard-testcases/block-container_background-image_background-repeat.xml index 6175b04ed..c24418eee 100644 --- a/test/layoutengine/standard-testcases/block-container_background-image_background-repeat.xml +++ b/test/layoutengine/standard-testcases/block-container_background-image_background-repeat.xml @@ -23,7 +23,7 @@ </p> </info> <variables> - <img>../../resources/images/bgimg300dpi.jpg</img> + <img>../resources/images/bgimg300dpi.jpg</img> </variables> <fo> <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> @@ -57,11 +57,11 @@ </fo:root> </fo> <checks> - <eval expected="color=#0000ff,url=../../resources/images/bgimg300dpi.jpg,repeat=repeat-x,horiz=0,vertical=0" xpath="//flow/block[1]/@background"/> - <eval expected="color=#0000ff,url=../../resources/images/bgimg300dpi.jpg,repeat=repeat-y,horiz=0,vertical=0" xpath="//flow/block[2]/@background"/> - <eval expected="color=#0000ff,url=../../resources/images/bgimg300dpi.jpg,repeat=repeat,horiz=0,vertical=0" xpath="//flow/block[3]/@background"/> - <eval expected="color=#0000ff,url=../../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=0,vertical=0" xpath="//flow/block[4]/@background"/> - <eval expected="color=#0000ff,url=../../resources/images/bgimg300dpi.jpg,repeat=repeat-x,horiz=0,vertical=10440" xpath="//flow/block[5]/@background"/> - <eval expected="color=#0000ff,url=../../resources/images/bgimg300dpi.jpg,repeat=repeat-y,horiz=47940,vertical=0" xpath="//flow/block[6]/@background"/> + <eval expected="color=#0000ff,url=../resources/images/bgimg300dpi.jpg,repeat=repeat-x,horiz=0,vertical=0" xpath="//flow/block[1]/@background"/> + <eval expected="color=#0000ff,url=../resources/images/bgimg300dpi.jpg,repeat=repeat-y,horiz=0,vertical=0" xpath="//flow/block[2]/@background"/> + <eval expected="color=#0000ff,url=../resources/images/bgimg300dpi.jpg,repeat=repeat,horiz=0,vertical=0" xpath="//flow/block[3]/@background"/> + <eval expected="color=#0000ff,url=../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=0,vertical=0" xpath="//flow/block[4]/@background"/> + <eval expected="color=#0000ff,url=../resources/images/bgimg300dpi.jpg,repeat=repeat-x,horiz=0,vertical=10440" xpath="//flow/block[5]/@background"/> + <eval expected="color=#0000ff,url=../resources/images/bgimg300dpi.jpg,repeat=repeat-y,horiz=47940,vertical=0" xpath="//flow/block[6]/@background"/> </checks> </testcase> diff --git a/test/layoutengine/standard-testcases/character_background-image.xml b/test/layoutengine/standard-testcases/character_background-image.xml index b887315f2..c3965d71d 100644 --- a/test/layoutengine/standard-testcases/character_background-image.xml +++ b/test/layoutengine/standard-testcases/character_background-image.xml @@ -23,7 +23,7 @@ </p> </info> <variables> - <img>../../resources/images/bgimg300dpi.jpg</img> + <img>../resources/images/bgimg300dpi.jpg</img> </variables> <fo> <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> @@ -43,7 +43,7 @@ </fo:root> </fo> <checks> - <eval expected="color=#ffff00,url=../../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=8976,vertical=21360" xpath="//flow/block[1]/lineArea/text[1]/@background"/> - <eval expected="color=#ffff00,url=../../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=-9696,vertical=-840" xpath="//flow/block[1]/lineArea/text[3]/@background"/> + <eval expected="color=#ffff00,url=../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=8976,vertical=21360" xpath="//flow/block[1]/lineArea/text[1]/@background"/> + <eval expected="color=#ffff00,url=../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=-9696,vertical=-840" xpath="//flow/block[1]/lineArea/text[3]/@background"/> </checks> </testcase> diff --git a/test/layoutengine/standard-testcases/color_1.xml b/test/layoutengine/standard-testcases/color_1.xml index 3b9e1edf9..eea054bd2 100644 --- a/test/layoutengine/standard-testcases/color_1.xml +++ b/test/layoutengine/standard-testcases/color_1.xml @@ -30,7 +30,7 @@ </fo:simple-page-master> </fo:layout-master-set> <fo:declarations> - <fo:color-profile src="../../../src/java/org/apache/fop/pdf/sRGB Color Space Profile.icm" color-profile-name="sRGB"/> + <fo:color-profile src="../../src/java/org/apache/fop/pdf/sRGB Color Space Profile.icm" color-profile-name="sRGB"/> <fo:color-profile src="nonexistent.icc" color-profile-name="unknown"/> </fo:declarations> <fo:page-sequence master-reference="normal" white-space-collapse="true"> @@ -54,7 +54,7 @@ <eval expected="#ff0000" xpath="//block[1]//text/@color"/> <eval expected="#ff8000" xpath="//block[2]//text/@color"/> <eval expected="#ff8000" xpath="//block[3]//text/@color"/> - <eval expected="fop-rgb-icc(1.0,0.5,0.0,sRGB,"../../../src/java/org/apache/fop/pdf/sRGB Color Space Profile.icm",1.0,0.5,0.0)" xpath="//block[4]//text/@color"/> + <eval expected="fop-rgb-icc(1.0,0.5,0.0,sRGB,"../../src/java/org/apache/fop/pdf/sRGB Color Space Profile.icm",1.0,0.5,0.0)" xpath="//block[4]//text/@color"/> <eval expected="#00ff00" xpath="//block[5]//text/@color"/> <eval expected="fop-rgb-icc(0.6,0.6,0.48000002,#CMYK,,0.0,0.0,0.2,0.4)" xpath="//block[6]//text/@color"/> <eval expected="fop-rgb-icc(0.6,0.6,0.4,#CMYK,,0.0,0.0,0.2,0.4)" xpath="//block[7]//text/@color"/> diff --git a/test/layoutengine/standard-testcases/external-graphic_basic.xml b/test/layoutengine/standard-testcases/external-graphic_basic.xml index b28f52456..a5140fbff 100644 --- a/test/layoutengine/standard-testcases/external-graphic_basic.xml +++ b/test/layoutengine/standard-testcases/external-graphic_basic.xml @@ -33,7 +33,7 @@ <fo:flow flow-name="xsl-region-body"> <fo:block>plain external-graphic</fo:block> <fo:block background-color="orange"> - <fo:external-graphic src="../../resources/images/bgimg300dpi.jpg"/>EOG + <fo:external-graphic src="../resources/images/bgimg300dpi.jpg"/>EOG </fo:block> <fo:block>EOF</fo:block> </fo:flow> diff --git a/test/layoutengine/standard-testcases/external-graphic_bmp.xml b/test/layoutengine/standard-testcases/external-graphic_bmp.xml index 4e1a2d4b9..0c633c75d 100644 --- a/test/layoutengine/standard-testcases/external-graphic_bmp.xml +++ b/test/layoutengine/standard-testcases/external-graphic_bmp.xml @@ -33,11 +33,11 @@ <fo:flow flow-name="xsl-region-body"> <fo:block>BMP external-graphic 300dpi</fo:block> <fo:block> - <fo:external-graphic src="../../resources/images/bgimg300dpi.bmp"/>EOG + <fo:external-graphic src="../resources/images/bgimg300dpi.bmp"/>EOG </fo:block> <fo:block>BMP external-graphic 72dpi</fo:block> <fo:block> - <fo:external-graphic src="../../resources/images/bgimg72dpi.bmp"/>EOG + <fo:external-graphic src="../resources/images/bgimg72dpi.bmp"/>EOG </fo:block> <fo:block>EOF</fo:block> </fo:flow> diff --git a/test/layoutengine/standard-testcases/external-graphic_border_padding.xml b/test/layoutengine/standard-testcases/external-graphic_border_padding.xml index d0df5c605..a04353542 100644 --- a/test/layoutengine/standard-testcases/external-graphic_border_padding.xml +++ b/test/layoutengine/standard-testcases/external-graphic_border_padding.xml @@ -32,10 +32,10 @@ <fo:page-sequence master-reference="normal" white-space-collapse="true"> <fo:flow flow-name="xsl-region-body"> <fo:block background-color="orange"> - <fo:external-graphic src="../../resources/images/bgimg300dpi.jpg" border-style="solid" border-width="5pt 10pt 20pt 15pt" padding="15pt 20pt 10pt 5pt" background-color="white"/> Normal font + <fo:external-graphic src="../resources/images/bgimg300dpi.jpg" border-style="solid" border-width="5pt 10pt 20pt 15pt" padding="15pt 20pt 10pt 5pt" background-color="white"/> Normal font </fo:block> <fo:block background-color="yellow" font-size="140pt"> - <fo:external-graphic src="../../resources/images/bgimg300dpi.jpg" border-style="solid" border-width="5pt 10pt 20pt 15pt" padding="15pt 20pt 10pt 5pt" background-color="white"/> FO + <fo:external-graphic src="../resources/images/bgimg300dpi.jpg" border-style="solid" border-width="5pt 10pt 20pt 15pt" padding="15pt 20pt 10pt 5pt" background-color="white"/> FO </fo:block> <fo:block font-size="9pt"> In both blocks we have a setting of border-width="5pt 10pt 20pt 15pt" padding="15pt 20pt 10pt 5pt" on the e-g. diff --git a/test/layoutengine/standard-testcases/external-graphic_breaking.xml b/test/layoutengine/standard-testcases/external-graphic_breaking.xml index 18d58173e..251246816 100644 --- a/test/layoutengine/standard-testcases/external-graphic_breaking.xml +++ b/test/layoutengine/standard-testcases/external-graphic_breaking.xml @@ -35,17 +35,17 @@ <fo:page-sequence master-reference="normal" white-space-collapse="true"> <fo:flow flow-name="xsl-region-body"> <fo:block>12 external-graphic elements - no space between them</fo:block> - <fo:block background-color="orange"><fo:external-graphic src="../../resources/images/arrow_up_medium.png"/><fo:external-graphic src="../../resources/images/arrow_down_medium.png"/><fo:external-graphic src="../../resources/images/arrow_up_medium.png"/><fo:external-graphic src="../../resources/images/arrow_down_medium.png"/><fo:external-graphic src="../../resources/images/arrow_up_medium.png"/><fo:external-graphic src="../../resources/images/arrow_down_medium.png"/><fo:external-graphic src="../../resources/images/arrow_up_medium.png"/><fo:external-graphic src="../../resources/images/arrow_down_medium.png"/><fo:external-graphic src="../../resources/images/arrow_up_medium.png"/><fo:external-graphic src="../../resources/images/arrow_down_medium.png"/><fo:external-graphic src="../../resources/images/arrow_up_medium.png"/><fo:external-graphic src="../../resources/images/arrow_down_medium.png"/></fo:block> + <fo:block background-color="orange"><fo:external-graphic src="../resources/images/arrow_up_medium.png"/><fo:external-graphic src="../resources/images/arrow_down_medium.png"/><fo:external-graphic src="../resources/images/arrow_up_medium.png"/><fo:external-graphic src="../resources/images/arrow_down_medium.png"/><fo:external-graphic src="../resources/images/arrow_up_medium.png"/><fo:external-graphic src="../resources/images/arrow_down_medium.png"/><fo:external-graphic src="../resources/images/arrow_up_medium.png"/><fo:external-graphic src="../resources/images/arrow_down_medium.png"/><fo:external-graphic src="../resources/images/arrow_up_medium.png"/><fo:external-graphic src="../resources/images/arrow_down_medium.png"/><fo:external-graphic src="../resources/images/arrow_up_medium.png"/><fo:external-graphic src="../resources/images/arrow_down_medium.png"/></fo:block> <fo:block>12 external-graphic elements - zwsp between them</fo:block> - <fo:block background-color="orange"><fo:external-graphic src="../../resources/images/arrow_up_medium.png"/>​<fo:external-graphic src="../../resources/images/arrow_down_medium.png"/>​<fo:external-graphic src="../../resources/images/arrow_up_medium.png"/>​<fo:external-graphic src="../../resources/images/arrow_down_medium.png"/>​<fo:external-graphic src="../../resources/images/arrow_up_medium.png"/>​<fo:external-graphic src="../../resources/images/arrow_down_medium.png"/>​<fo:external-graphic src="../../resources/images/arrow_up_medium.png"/>​<fo:external-graphic src="../../resources/images/arrow_down_medium.png"/>​<fo:external-graphic src="../../resources/images/arrow_up_medium.png"/>​<fo:external-graphic src="../../resources/images/arrow_down_medium.png"/>​<fo:external-graphic src="../../resources/images/arrow_up_medium.png"/>​<fo:external-graphic src="../../resources/images/arrow_down_medium.png"/></fo:block> + <fo:block background-color="orange"><fo:external-graphic src="../resources/images/arrow_up_medium.png"/>​<fo:external-graphic src="../resources/images/arrow_down_medium.png"/>​<fo:external-graphic src="../resources/images/arrow_up_medium.png"/>​<fo:external-graphic src="../resources/images/arrow_down_medium.png"/>​<fo:external-graphic src="../resources/images/arrow_up_medium.png"/>​<fo:external-graphic src="../resources/images/arrow_down_medium.png"/>​<fo:external-graphic src="../resources/images/arrow_up_medium.png"/>​<fo:external-graphic src="../resources/images/arrow_down_medium.png"/>​<fo:external-graphic src="../resources/images/arrow_up_medium.png"/>​<fo:external-graphic src="../resources/images/arrow_down_medium.png"/>​<fo:external-graphic src="../resources/images/arrow_up_medium.png"/>​<fo:external-graphic src="../resources/images/arrow_down_medium.png"/></fo:block> <fo:block>12 external-graphic elements - with spaces between every 2nd</fo:block> <fo:block background-color="orange"> - <fo:external-graphic src="../../resources/images/arrow_up_medium.png"/><fo:external-graphic src="../../resources/images/arrow_down_medium.png"/> - <fo:external-graphic src="../../resources/images/arrow_up_medium.png"/><fo:external-graphic src="../../resources/images/arrow_down_medium.png"/> - <fo:external-graphic src="../../resources/images/arrow_up_medium.png"/><fo:external-graphic src="../../resources/images/arrow_down_medium.png"/> - <fo:external-graphic src="../../resources/images/arrow_up_medium.png"/><fo:external-graphic src="../../resources/images/arrow_down_medium.png"/> - <fo:external-graphic src="../../resources/images/arrow_up_medium.png"/><fo:external-graphic src="../../resources/images/arrow_down_medium.png"/> - <fo:external-graphic src="../../resources/images/arrow_up_medium.png"/><fo:external-graphic src="../../resources/images/arrow_down_medium.png"/> + <fo:external-graphic src="../resources/images/arrow_up_medium.png"/><fo:external-graphic src="../resources/images/arrow_down_medium.png"/> + <fo:external-graphic src="../resources/images/arrow_up_medium.png"/><fo:external-graphic src="../resources/images/arrow_down_medium.png"/> + <fo:external-graphic src="../resources/images/arrow_up_medium.png"/><fo:external-graphic src="../resources/images/arrow_down_medium.png"/> + <fo:external-graphic src="../resources/images/arrow_up_medium.png"/><fo:external-graphic src="../resources/images/arrow_down_medium.png"/> + <fo:external-graphic src="../resources/images/arrow_up_medium.png"/><fo:external-graphic src="../resources/images/arrow_down_medium.png"/> + <fo:external-graphic src="../resources/images/arrow_up_medium.png"/><fo:external-graphic src="../resources/images/arrow_down_medium.png"/> </fo:block> </fo:flow> </fo:page-sequence> diff --git a/test/layoutengine/standard-testcases/external-graphic_bug37815.xml b/test/layoutengine/standard-testcases/external-graphic_bug37815.xml index 0c78d36da..5b39fd15b 100644 --- a/test/layoutengine/standard-testcases/external-graphic_bug37815.xml +++ b/test/layoutengine/standard-testcases/external-graphic_bug37815.xml @@ -32,10 +32,10 @@ <fo:page-sequence master-reference="normal" white-space-collapse="true"> <fo:flow flow-name="xsl-region-body"> <fo:block> - <fo:external-graphic src="../../resources/images/bgimg72dpi.jpg" width="50%" content-width="scale-to-fit" content-height="100%" border="solid 1pt" background-color="yellow"/>EOG + <fo:external-graphic src="../resources/images/bgimg72dpi.jpg" width="50%" content-width="scale-to-fit" content-height="100%" border="solid 1pt" background-color="yellow"/>EOG </fo:block> <fo:block> - <fo:external-graphic src="../../resources/images/bgimg300dpi.jpg" width="50%" content-width="scale-to-fit" content-height="100%" border="solid 1pt" background-color="yellow"/>EOG + <fo:external-graphic src="../resources/images/bgimg300dpi.jpg" width="50%" content-width="scale-to-fit" content-height="100%" border="solid 1pt" background-color="yellow"/>EOG </fo:block> <fo:block>EOF</fo:block> </fo:flow> diff --git a/test/layoutengine/standard-testcases/external-graphic_content-height_content-width.xml b/test/layoutengine/standard-testcases/external-graphic_content-height_content-width.xml index cac54e853..45d8e063b 100644 --- a/test/layoutengine/standard-testcases/external-graphic_content-height_content-width.xml +++ b/test/layoutengine/standard-testcases/external-graphic_content-height_content-width.xml @@ -33,7 +33,7 @@ <fo:flow flow-name="xsl-region-body"> <fo:block>plain external-graphic</fo:block> <fo:block> - <fo:external-graphic src="../../resources/images/bgimg300dpi.jpg" content-height="200%" content-width="200%" />EOG + <fo:external-graphic src="../resources/images/bgimg300dpi.jpg" content-height="200%" content-width="200%" />EOG </fo:block> <fo:block>EOF</fo:block> </fo:flow> diff --git a/test/layoutengine/standard-testcases/external-graphic_content-height_content-width_2.xml b/test/layoutengine/standard-testcases/external-graphic_content-height_content-width_2.xml index 78ff03ecb..c3c2988f5 100644 --- a/test/layoutengine/standard-testcases/external-graphic_content-height_content-width_2.xml +++ b/test/layoutengine/standard-testcases/external-graphic_content-height_content-width_2.xml @@ -33,30 +33,30 @@ <fo:page-sequence master-reference="normal" font-size="0" line-height="1"> <fo:flow flow-name="xsl-region-body"> <fo:block> - <fo:external-graphic id="img1" src="../../resources/images/bgimg72dpi.jpg"/> + <fo:external-graphic id="img1" src="../resources/images/bgimg72dpi.jpg"/> </fo:block> <fo:block> - <fo:external-graphic id="img2" src="../../resources/images/bgimg72dpi.jpg" + <fo:external-graphic id="img2" src="../resources/images/bgimg72dpi.jpg" inline-progression-dimension="250pt" block-progression-dimension="250pt" content-height="scale-to-fit" content-width="scale-to-fit"/> </fo:block> <fo:block> - <fo:external-graphic id="img3" src="../../resources/images/bgimg72dpi.jpg" + <fo:external-graphic id="img3" src="../resources/images/bgimg72dpi.jpg" inline-progression-dimension="250pt" block-progression-dimension="250pt" content-height="scale-down-to-fit" content-width="scale-down-to-fit"/> </fo:block> <fo:block> - <fo:external-graphic id="img4" src="../../resources/images/bgimg72dpi.jpg" + <fo:external-graphic id="img4" src="../resources/images/bgimg72dpi.jpg" inline-progression-dimension="250pt" block-progression-dimension="250pt" content-height="scale-up-to-fit" content-width="scale-up-to-fit"/> </fo:block> <fo:block> - <fo:external-graphic id="img5" src="../../resources/images/bgimg300dpi.jpg" + <fo:external-graphic id="img5" src="../resources/images/bgimg300dpi.jpg" inline-progression-dimension="250pt" block-progression-dimension="250pt" content-height="scale-down-to-fit" content-width="scale-down-to-fit"/> </fo:block> <fo:block> - <fo:external-graphic id="img6" src="../../resources/images/bgimg300dpi.jpg" + <fo:external-graphic id="img6" src="../resources/images/bgimg300dpi.jpg" inline-progression-dimension="250pt" block-progression-dimension="250pt" content-height="scale-up-to-fit" content-width="scale-up-to-fit"/> </fo:block> diff --git a/test/layoutengine/standard-testcases/external-graphic_display-align.xml b/test/layoutengine/standard-testcases/external-graphic_display-align.xml index 461b7e5e7..962b199d0 100644 --- a/test/layoutengine/standard-testcases/external-graphic_display-align.xml +++ b/test/layoutengine/standard-testcases/external-graphic_display-align.xml @@ -33,23 +33,23 @@ <fo:flow flow-name="xsl-region-body"> <fo:block>plain external-graphic</fo:block> <fo:block> - <fo:external-graphic src="../../resources/images/bgimg300dpi.jpg" block-progression-dimension="60pt" background-color="yellow"/>EOG + <fo:external-graphic src="../resources/images/bgimg300dpi.jpg" block-progression-dimension="60pt" background-color="yellow"/>EOG </fo:block> <fo:block>external-graphic with display-align="auto"</fo:block> <fo:block> - <fo:external-graphic src="../../resources/images/bgimg300dpi.jpg" display-align="auto" block-progression-dimension="60pt" background-color="yellow"/>EOG + <fo:external-graphic src="../resources/images/bgimg300dpi.jpg" display-align="auto" block-progression-dimension="60pt" background-color="yellow"/>EOG </fo:block> <fo:block>external-graphic with display-align="before"</fo:block> <fo:block> - <fo:external-graphic src="../../resources/images/bgimg300dpi.jpg" display-align="before" block-progression-dimension="60pt" background-color="yellow"/>EOG + <fo:external-graphic src="../resources/images/bgimg300dpi.jpg" display-align="before" block-progression-dimension="60pt" background-color="yellow"/>EOG </fo:block> <fo:block>external-graphic with display-align="center"</fo:block> <fo:block> - <fo:external-graphic src="../../resources/images/bgimg300dpi.jpg" display-align="center" block-progression-dimension="60pt" background-color="yellow"/>EOG + <fo:external-graphic src="../resources/images/bgimg300dpi.jpg" display-align="center" block-progression-dimension="60pt" background-color="yellow"/>EOG </fo:block> <fo:block>external-graphic with display-align="after"</fo:block> <fo:block> - <fo:external-graphic src="../../resources/images/bgimg300dpi.jpg" display-align="after" block-progression-dimension="60pt" background-color="yellow"/>EOG + <fo:external-graphic src="../resources/images/bgimg300dpi.jpg" display-align="after" block-progression-dimension="60pt" background-color="yellow"/>EOG </fo:block> <fo:block>EOF</fo:block> </fo:flow> diff --git a/test/layoutengine/standard-testcases/external-graphic_emf.xml b/test/layoutengine/standard-testcases/external-graphic_emf.xml index 9c3f03302..a927f27da 100644 --- a/test/layoutengine/standard-testcases/external-graphic_emf.xml +++ b/test/layoutengine/standard-testcases/external-graphic_emf.xml @@ -33,7 +33,7 @@ <fo:flow flow-name="xsl-region-body"> <fo:block>EMF external-graphic</fo:block> <fo:block> - <fo:external-graphic src="../../resources/images/img.emf"/>EOG + <fo:external-graphic src="../resources/images/img.emf"/>EOG </fo:block> <fo:block>EOF</fo:block> </fo:flow> diff --git a/test/layoutengine/standard-testcases/external-graphic_eps.xml b/test/layoutengine/standard-testcases/external-graphic_eps.xml index 3a4af488b..75cb0c63a 100644 --- a/test/layoutengine/standard-testcases/external-graphic_eps.xml +++ b/test/layoutengine/standard-testcases/external-graphic_eps.xml @@ -33,7 +33,7 @@ <fo:flow flow-name="xsl-region-body"> <fo:block>EPS external-graphic</fo:block> <fo:block> - <fo:external-graphic src="../../resources/images/barcode.eps"/>EOG + <fo:external-graphic src="../resources/images/barcode.eps"/>EOG </fo:block> <fo:block>EOF</fo:block> </fo:flow> diff --git a/test/layoutengine/standard-testcases/external-graphic_gif.xml b/test/layoutengine/standard-testcases/external-graphic_gif.xml index a3cbd300e..e2f123b6c 100644 --- a/test/layoutengine/standard-testcases/external-graphic_gif.xml +++ b/test/layoutengine/standard-testcases/external-graphic_gif.xml @@ -33,7 +33,7 @@ <fo:flow flow-name="xsl-region-body"> <fo:block>GIF external-graphic</fo:block> <fo:block> - <fo:external-graphic src="../../resources/images/bgimg72dpi.gif"/>EOG + <fo:external-graphic src="../resources/images/bgimg72dpi.gif"/>EOG </fo:block> <fo:block>EOF</fo:block> </fo:flow> diff --git a/test/layoutengine/standard-testcases/external-graphic_jpeg.xml b/test/layoutengine/standard-testcases/external-graphic_jpeg.xml index a669145b4..e41c346ff 100644 --- a/test/layoutengine/standard-testcases/external-graphic_jpeg.xml +++ b/test/layoutengine/standard-testcases/external-graphic_jpeg.xml @@ -33,11 +33,11 @@ <fo:flow flow-name="xsl-region-body"> <fo:block>JPEG external-graphic 300dpi</fo:block> <fo:block> - <fo:external-graphic src="../../resources/images/bgimg300dpi.jpg"/>EOG + <fo:external-graphic src="../resources/images/bgimg300dpi.jpg"/>EOG </fo:block> <fo:block>JPEG external-graphic 72dpi</fo:block> <fo:block> - <fo:external-graphic src="../../resources/images/bgimg72dpi.jpg"/>EOG + <fo:external-graphic src="../resources/images/bgimg72dpi.jpg"/>EOG </fo:block> <fo:block>EOF</fo:block> </fo:flow> diff --git a/test/layoutengine/standard-testcases/external-graphic_overflow_hidden.xml b/test/layoutengine/standard-testcases/external-graphic_overflow_hidden.xml index f119c6988..9fa47834a 100644 --- a/test/layoutengine/standard-testcases/external-graphic_overflow_hidden.xml +++ b/test/layoutengine/standard-testcases/external-graphic_overflow_hidden.xml @@ -33,11 +33,11 @@ <fo:flow flow-name="xsl-region-body"> <fo:block>height="40pt"</fo:block> <fo:block> - <fo:external-graphic overflow="hidden" src="../../resources/images/bgimg300dpi.jpg" height="40pt"/>EOG + <fo:external-graphic overflow="hidden" src="../resources/images/bgimg300dpi.jpg" height="40pt"/>EOG </fo:block> <fo:block>width="40pt"</fo:block> <fo:block> - <fo:external-graphic overflow="hidden" src="../../resources/images/bgimg300dpi.jpg" width="40pt"/>EOG + <fo:external-graphic overflow="hidden" src="../resources/images/bgimg300dpi.jpg" width="40pt"/>EOG </fo:block> <fo:block>EOF</fo:block> </fo:flow> diff --git a/test/layoutengine/standard-testcases/external-graphic_oversized.xml b/test/layoutengine/standard-testcases/external-graphic_oversized.xml index 3d8f85d1d..55313257b 100644 --- a/test/layoutengine/standard-testcases/external-graphic_oversized.xml +++ b/test/layoutengine/standard-testcases/external-graphic_oversized.xml @@ -34,7 +34,7 @@ <fo:block font-size="8pt">This first block is only to force an infinite loop if the image is not scaled down.</fo:block> <!-- TODO If you remove the above block, the image is placed on the page although it's too big. No warnings. --> <fo:block> - <fo:external-graphic src="../../resources/images/big-image.png" + <fo:external-graphic src="../resources/images/big-image.png" inline-progression-dimension.maximum="100%" block-progression-dimension.maximum="100%" content-width="scale-to-fit" content-height="scale-to-fit" overflow="hidden"/> </fo:block> diff --git a/test/layoutengine/standard-testcases/external-graphic_png.xml b/test/layoutengine/standard-testcases/external-graphic_png.xml index da8c1807f..19fa690a7 100644 --- a/test/layoutengine/standard-testcases/external-graphic_png.xml +++ b/test/layoutengine/standard-testcases/external-graphic_png.xml @@ -33,11 +33,11 @@ <fo:flow flow-name="xsl-region-body"> <fo:block>PNG external-graphic 300dpi</fo:block> <fo:block> - <fo:external-graphic src="../../resources/images/bgimg300dpi.png"/>EOG + <fo:external-graphic src="../resources/images/bgimg300dpi.png"/>EOG </fo:block> <fo:block>PNG external-graphic 72dpi</fo:block> <fo:block> - <fo:external-graphic src="../../resources/images/bgimg72dpi.png"/>EOG + <fo:external-graphic src="../resources/images/bgimg72dpi.png"/>EOG </fo:block> <fo:block>EOF</fo:block> </fo:flow> diff --git a/test/layoutengine/standard-testcases/external-graphic_size_1.xml b/test/layoutengine/standard-testcases/external-graphic_size_1.xml index e0dfcaa56..a12b34562 100644 --- a/test/layoutengine/standard-testcases/external-graphic_size_1.xml +++ b/test/layoutengine/standard-testcases/external-graphic_size_1.xml @@ -32,44 +32,44 @@ <fo:page-sequence master-reference="normal"> <fo:flow flow-name="xsl-region-body"> <fo:block> - <fo:external-graphic src="../../resources/images/big-image.png" + <fo:external-graphic src="../resources/images/big-image.png" block-progression-dimension.maximum="4in" inline-progression-dimension.maximum="auto" content-width="scale-down-to-fit" content-height="scale-down-to-fit" overflow="hidden" background-color="yellow" id="big1"/> </fo:block> <fo:block> - <fo:external-graphic src="../../resources/images/big-image.png" + <fo:external-graphic src="../resources/images/big-image.png" block-progression-dimension.maximum="4in" inline-progression-dimension.maximum="4in" content-width="scale-down-to-fit" content-height="scale-down-to-fit" overflow="hidden" scaling="non-uniform" background-color="yellow" id="big2"/> </fo:block> <fo:block> - <fo:external-graphic src="../../resources/images/big-image.png" + <fo:external-graphic src="../resources/images/big-image.png" block-progression-dimension.maximum="4in" inline-progression-dimension.maximum="4in" overflow="hidden" background-color="yellow" id="big3"/> </fo:block> <fo:block> - <fo:external-graphic src="../../resources/images/box1.png" + <fo:external-graphic src="../resources/images/box1.png" inline-progression-dimension.minimum="1in" content-width="scale-to-fit" overflow="hidden" background-color="yellow" id="box1"/> </fo:block> <fo:block> - <fo:external-graphic src="../../resources/images/box1.png" + <fo:external-graphic src="../resources/images/box1.png" inline-progression-dimension.minimum="1in" overflow="hidden" background-color="yellow" id="box2"/> </fo:block> <fo:block> - <fo:external-graphic src="../../resources/images/box1.png" + <fo:external-graphic src="../resources/images/box1.png" inline-progression-dimension.minimum="1in" inline-progression-dimension.optimum="2in" overflow="hidden" background-color="yellow" id="box3"/> </fo:block> <fo:block> - <fo:external-graphic src="../../resources/images/box1.png" + <fo:external-graphic src="../resources/images/box1.png" inline-progression-dimension.minimum="1in" inline-progression-dimension.optimum="2in" content-width="scale-up-to-fit" diff --git a/test/layoutengine/standard-testcases/external-graphic_size_2.xml b/test/layoutengine/standard-testcases/external-graphic_size_2.xml index e2fc5ce19..1fd32ff0c 100644 --- a/test/layoutengine/standard-testcases/external-graphic_size_2.xml +++ b/test/layoutengine/standard-testcases/external-graphic_size_2.xml @@ -32,18 +32,18 @@ <fo:page-sequence master-reference="normal"> <fo:flow flow-name="xsl-region-body"> <fo:block> - <fo:external-graphic src="../../resources/images/box1.png" + <fo:external-graphic src="../resources/images/box1.png" overflow="hidden" background-color="yellow" id="box-org"/> </fo:block> <fo:block> - <fo:external-graphic src="../../resources/images/box1.png" + <fo:external-graphic src="../resources/images/box1.png" inline-progression-dimension="1in" block-progression-dimension="1in" content-width="scale-down-to-fit" content-height="scale-down-to-fit" text-align="center" display-align="center" overflow="hidden" background-color="yellow" id="box1"/> - <fo:external-graphic src="../../resources/images/box1.png" + <fo:external-graphic src="../resources/images/box1.png" inline-progression-dimension="0.5in" block-progression-dimension="0.5in" content-width="scale-up-to-fit" @@ -52,14 +52,14 @@ overflow="hidden" background-color="yellow" id="box1a"/> </fo:block> <fo:block> - <fo:external-graphic src="../../resources/images/box1.png" + <fo:external-graphic src="../resources/images/box1.png" inline-progression-dimension="2in" block-progression-dimension="1in" content-width="scale-down-to-fit" content-height="scale-down-to-fit" text-align="center" display-align="center" overflow="hidden" background-color="yellow" id="box2"/> - <fo:external-graphic src="../../resources/images/box1.png" + <fo:external-graphic src="../resources/images/box1.png" inline-progression-dimension="1in" block-progression-dimension="2in" content-width="scale-down-to-fit" @@ -68,7 +68,7 @@ overflow="hidden" background-color="yellow" id="box3"/> </fo:block> <fo:block> - <fo:external-graphic src="../../resources/images/box1.png" + <fo:external-graphic src="../resources/images/box1.png" inline-progression-dimension="0.5in" block-progression-dimension="0.4in" content-width="scale-up-to-fit" diff --git a/test/layoutengine/standard-testcases/external-graphic_src_uri.xml b/test/layoutengine/standard-testcases/external-graphic_src_uri.xml index 1b28fe8f2..a786d8b64 100644 --- a/test/layoutengine/standard-testcases/external-graphic_src_uri.xml +++ b/test/layoutengine/standard-testcases/external-graphic_src_uri.xml @@ -33,11 +33,11 @@ <fo:flow flow-name="xsl-region-body"> <fo:block>plain external-graphic (relative URI)</fo:block> <fo:block> - <fo:external-graphic src="../../resources/images/bgimg300dpi.jpg"/>EOG + <fo:external-graphic src="../resources/images/bgimg300dpi.jpg"/>EOG </fo:block> <fo:block>plain external-graphic (relative URI with scheme)</fo:block> <fo:block> - <fo:external-graphic src="file:../../resources/images/bgimg300dpi.jpg"/>EOG + <fo:external-graphic src="file:../resources/images/bgimg300dpi.jpg"/>EOG </fo:block> <!-- Commented out until portable solution found <fo:block>plain external-graphic (absolute URI)</fo:block> @@ -51,7 +51,7 @@ --> <fo:block>plain external-graphic (relative URI using url(...) function)</fo:block> <fo:block> - <fo:external-graphic src="url(../../resources/images/bgimg300dpi.jpg)"/>EOG + <fo:external-graphic src="url(../resources/images/bgimg300dpi.jpg)"/>EOG </fo:block> <fo:block>plain external-graphic (absolute HTTP URI)</fo:block> <fo:block> diff --git a/test/layoutengine/standard-testcases/external-graphic_svg.xml b/test/layoutengine/standard-testcases/external-graphic_svg.xml index 8ec53ea3d..c88a4f28b 100644 --- a/test/layoutengine/standard-testcases/external-graphic_svg.xml +++ b/test/layoutengine/standard-testcases/external-graphic_svg.xml @@ -34,23 +34,23 @@ <fo:flow flow-name="xsl-region-body"> <fo:block text-align="left">2 inch wide SVG external-graphic on LHS</fo:block> <fo:block text-align="left"> - <fo:external-graphic src="../../resources/images/img.svg" content-width="2in" scaling="uniform" />EOG + <fo:external-graphic src="../resources/images/img.svg" content-width="2in" scaling="uniform" />EOG </fo:block> <fo:block text-align="right">4 inch wide SVG external-graphic on RHS</fo:block> <fo:block text-align="right"> - <fo:external-graphic src="../../resources/images/img.svg" content-width="4in" scaling="uniform" />EOG + <fo:external-graphic src="../resources/images/img.svg" content-width="4in" scaling="uniform" />EOG </fo:block> <fo:block text-align="center">6 inch wide SVG external-graphic in center, non-uniformly squeezed to a height of 4in.</fo:block> <fo:block text-align="center"> - <fo:external-graphic src="../../resources/images/img.svg" content-width="6in" content-height="4in" scaling="non-uniform" />EOG + <fo:external-graphic src="../resources/images/img.svg" content-width="6in" content-height="4in" scaling="non-uniform" />EOG </fo:block> <fo:block text-align="left">SVG external-graphic with an intrinsic size (16ptx16pt)</fo:block> <fo:block text-align="left"> - <fo:external-graphic src="../../resources/images/img-w-size.svg"/>EOG + <fo:external-graphic src="../resources/images/img-w-size.svg"/>EOG </fo:block> <fo:block text-align="left">SVG external-graphic with an intrinsic size and fox:conversion-mode="bitmap"</fo:block> <fo:block text-align="left"> - <fo:external-graphic src="../../resources/images/img-w-size.svg" + <fo:external-graphic src="../resources/images/img-w-size.svg" fox:conversion-mode="bitmap"/>EOG </fo:block> <fo:block>EOF</fo:block> diff --git a/test/layoutengine/standard-testcases/external-graphic_svgz.xml b/test/layoutengine/standard-testcases/external-graphic_svgz.xml index f0fbe8edb..872209fd7 100644 --- a/test/layoutengine/standard-testcases/external-graphic_svgz.xml +++ b/test/layoutengine/standard-testcases/external-graphic_svgz.xml @@ -33,11 +33,11 @@ <fo:flow flow-name="xsl-region-body"> <fo:block>SVGZ external-graphic with an intrinsic size (16ptx16pt)</fo:block> <fo:block> - <fo:external-graphic id="img-intr" src="../../resources/images/img-w-size.svgz"/>EOG + <fo:external-graphic id="img-intr" src="../resources/images/img-w-size.svgz"/>EOG </fo:block> <fo:block>2 inch wide SVGZ external-graphic on LHS</fo:block> <fo:block> - <fo:external-graphic id="img-scaled" src="../../resources/images/img-w-size.svgz" content-width="2in" scaling="uniform" />EOG + <fo:external-graphic id="img-scaled" src="../resources/images/img-w-size.svgz" content-width="2in" scaling="uniform" />EOG </fo:block> <fo:block>EOF</fo:block> </fo:flow> diff --git a/test/layoutengine/standard-testcases/external-graphic_tiff.xml b/test/layoutengine/standard-testcases/external-graphic_tiff.xml index 63ad60d66..2539baffb 100644 --- a/test/layoutengine/standard-testcases/external-graphic_tiff.xml +++ b/test/layoutengine/standard-testcases/external-graphic_tiff.xml @@ -33,19 +33,19 @@ <fo:flow flow-name="xsl-region-body"> <fo:block>TIFF external-graphic 300dpi</fo:block> <fo:block> - <fo:external-graphic src="../../resources/images/bgimg300dpi.tif"/>EOG + <fo:external-graphic src="../resources/images/bgimg300dpi.tif"/>EOG </fo:block> <fo:block>TIFF external-graphic 72dpi</fo:block> <fo:block> - <fo:external-graphic src="../../resources/images/bgimg72dpi.tif"/>EOG + <fo:external-graphic src="../resources/images/bgimg72dpi.tif"/>EOG </fo:block> <fo:block>TIFF external-graphic (CCITT group 4 encoding)</fo:block> <fo:block> - <fo:external-graphic src="../../resources/images/tiff_group4.tif"/>EOG + <fo:external-graphic src="../resources/images/tiff_group4.tif"/>EOG </fo:block> <fo:block>TIFF external-graphic (CCITT group 4 encoding, multiple strips)</fo:block> <fo:block> - <fo:external-graphic src="../../resources/images/tiff_group4-multi-strip.tif"/>EOG + <fo:external-graphic src="../resources/images/tiff_group4-multi-strip.tif"/>EOG </fo:block> <fo:block>EOF</fo:block> </fo:flow> diff --git a/test/layoutengine/standard-testcases/external-graphic_wmf.xml b/test/layoutengine/standard-testcases/external-graphic_wmf.xml index f95a16bd9..5063d4509 100644 --- a/test/layoutengine/standard-testcases/external-graphic_wmf.xml +++ b/test/layoutengine/standard-testcases/external-graphic_wmf.xml @@ -34,11 +34,11 @@ <fo:flow flow-name="xsl-region-body"> <fo:block>WMF external-graphic</fo:block> <fo:block> - <fo:external-graphic src="../../resources/images/testChart.wmf" content-width="25%"/>EOG + <fo:external-graphic src="../resources/images/testChart.wmf" content-width="25%"/>EOG </fo:block> <fo:block> <!-- the same image but with conversion-mode="bitmap" --> - <fo:external-graphic src="../../resources/images/testChart.wmf" content-width="25%" + <fo:external-graphic src="../resources/images/testChart.wmf" content-width="25%" fox:conversion-mode="bitmap"/>EOG </fo:block> <fo:block>EOF</fo:block> diff --git a/test/layoutengine/standard-testcases/flow_changing-ipd_image.xml b/test/layoutengine/standard-testcases/flow_changing-ipd_image.xml index 37014f49a..eca01e1f0 100644 --- a/test/layoutengine/standard-testcases/flow_changing-ipd_image.xml +++ b/test/layoutengine/standard-testcases/flow_changing-ipd_image.xml @@ -47,7 +47,7 @@ <fo:block id="before">Block before the page break.</fo:block> <fo:block id="after">Block after the page break.</fo:block> <fo:block id="image-block"><fo:external-graphic id="image" - src="../../resources/images/fop-logo-color-24bit.png"/></fo:block> + src="../resources/images/fop-logo-color-24bit.png"/></fo:block> </fo:flow> </fo:page-sequence> </fo:root> diff --git a/test/layoutengine/standard-testcases/fox_external-document_1.xml b/test/layoutengine/standard-testcases/fox_external-document_1.xml index 1780202a6..fe51eff8a 100644 --- a/test/layoutengine/standard-testcases/fox_external-document_1.xml +++ b/test/layoutengine/standard-testcases/fox_external-document_1.xml @@ -30,7 +30,7 @@ <fo:region-body/> </fo:simple-page-master> </fo:layout-master-set> - <fox:external-document id="img" src="../../resources/images/bgimg72dpi.png"/> + <fox:external-document id="img" src="../resources/images/bgimg72dpi.png"/> </fo:root> </fo> <checks> diff --git a/test/layoutengine/standard-testcases/fox_external-document_2.xml b/test/layoutengine/standard-testcases/fox_external-document_2.xml index 365af5b21..b2f397580 100644 --- a/test/layoutengine/standard-testcases/fox_external-document_2.xml +++ b/test/layoutengine/standard-testcases/fox_external-document_2.xml @@ -30,7 +30,7 @@ <fo:region-body reference-orientation="90"/> </fo:simple-page-master> </fo:layout-master-set> - <fox:external-document id="img1" src="../../resources/images/bgimg72dpi.png" + <fox:external-document id="img1" src="../resources/images/bgimg72dpi.png" width="5in" height="5in" text-align="center" display-align="center"/> <fo:page-sequence master-reference="normal" id="ps1"> <fo:flow flow-name="xsl-region-body"> @@ -39,11 +39,11 @@ </fo:block> </fo:flow> </fo:page-sequence> - <fox:external-document id="img2" src="../../resources/images/bgimg72dpi.png" + <fox:external-document id="img2" src="../resources/images/bgimg72dpi.png" width="5in" height="5in" content-width="scale-to-fit"/> - <fox:external-document id="img3" src="../../resources/images/bgimg72dpi.png" + <fox:external-document id="img3" src="../resources/images/bgimg72dpi.png" width="5in" height="5in" content-width="scale-down-to-fit" initial-page-number="5"/> - <fox:external-document id="img4" src="../../resources/images/big-image.png" + <fox:external-document id="img4" src="../resources/images/big-image.png" reference-orientation="90"/> </fo:root> </fo> diff --git a/test/layoutengine/standard-testcases/fox_external-document_3.xml b/test/layoutengine/standard-testcases/fox_external-document_3.xml index 789c30f0b..4be1e888d 100644 --- a/test/layoutengine/standard-testcases/fox_external-document_3.xml +++ b/test/layoutengine/standard-testcases/fox_external-document_3.xml @@ -30,7 +30,7 @@ <fo:region-body reference-orientation="90"/> </fo:simple-page-master> </fo:layout-master-set> - <fox:external-document id="img2" src="../../resources/images/multi-page.tiff"/> + <fox:external-document id="img2" src="../resources/images/multi-page.tiff"/> </fo:root> </fo> <checks> diff --git a/test/layoutengine/standard-testcases/inline-level_id.xml b/test/layoutengine/standard-testcases/inline-level_id.xml index d6e7d6edc..7f90e4a82 100644 --- a/test/layoutengine/standard-testcases/inline-level_id.xml +++ b/test/layoutengine/standard-testcases/inline-level_id.xml @@ -58,7 +58,7 @@ </svg:g> </svg:svg> </fo:instream-foreign-object>text</fo:block> - <fo:block>text<fo:external-graphic id="eg1" src="../../resources/images/bgimg72dpi.jpg" content-height="12pt"/>text</fo:block> + <fo:block>text<fo:external-graphic id="eg1" src="../resources/images/bgimg72dpi.jpg" content-height="12pt"/>text</fo:block> </fo:flow> </fo:page-sequence> </fo:root> diff --git a/test/layoutengine/standard-testcases/inline_background-image.xml b/test/layoutengine/standard-testcases/inline_background-image.xml index 165b28c14..76d40f318 100644 --- a/test/layoutengine/standard-testcases/inline_background-image.xml +++ b/test/layoutengine/standard-testcases/inline_background-image.xml @@ -23,7 +23,7 @@ </p> </info> <variables> - <img>../../resources/images/bgimg300dpi.jpg</img> + <img>../resources/images/bgimg300dpi.jpg</img> </variables> <fo> <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> @@ -44,6 +44,6 @@ <checks> <eval expected="197376" xpath="//flow/block/lineArea/inlineparent/@ipd"/> <eval expected="88800" xpath="//flow/block/lineArea/inlineparent/@bpd"/> - <eval expected="color=#ffff00,url=../../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=75648,vertical=21360" xpath="//flow/block/lineArea/inlineparent/@background"/> + <eval expected="color=#ffff00,url=../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=75648,vertical=21360" xpath="//flow/block/lineArea/inlineparent/@background"/> </checks> </testcase> diff --git a/test/layoutengine/standard-testcases/inline_block_nested_bug36248.xml b/test/layoutengine/standard-testcases/inline_block_nested_bug36248.xml index d6ae38578..6b269ba45 100644 --- a/test/layoutengine/standard-testcases/inline_block_nested_bug36248.xml +++ b/test/layoutengine/standard-testcases/inline_block_nested_bug36248.xml @@ -34,7 +34,7 @@ <fo:block>normal<fo:inline><fo:page-number/></fo:inline>normal</fo:block> <fo:block>normal<fo:inline><fo:page-number-citation ref-id="ps1"/></fo:inline>normal</fo:block> <fo:block>normal<fo:inline><fo:character character="x"/></fo:inline>normal</fo:block> - <fo:block>normal<fo:inline><fo:external-graphic src="../../resources/images/bgimg300dpi.jpg"/></fo:inline>normal</fo:block> + <fo:block>normal<fo:inline><fo:external-graphic src="../resources/images/bgimg300dpi.jpg"/></fo:inline>normal</fo:block> <fo:block>normal<fo:inline><fo:instream-foreign-object content-width="20pt" content-height="20pt"> <svg:svg viewBox="0 0 20 20"> <svg:g style="fill:red; stroke:#000000"> diff --git a/test/layoutengine/standard-testcases/inline_vertical-align_2.xml b/test/layoutengine/standard-testcases/inline_vertical-align_2.xml index e013f5e92..a84d1af57 100644 --- a/test/layoutengine/standard-testcases/inline_vertical-align_2.xml +++ b/test/layoutengine/standard-testcases/inline_vertical-align_2.xml @@ -34,36 +34,36 @@ <fo:flow flow-name="xsl-region-body"> <fo:block background-color="yellow" margin="2pt 0pt 2pt 0pt" font-size="10pt"> This is a longer line that provides a context for the line with images aligned on it. - Before edge <fo:external-graphic src="url(../../resources/images/arrow_down_small.png)" vertical-align="top" /><fo:external-graphic src="url(../../resources/images/arrow_down_large.png)" vertical-align="top" />, - after edge <fo:external-graphic src="url(../../resources/images/arrow_up_small.png)" vertical-align="bottom" /><fo:external-graphic src="url(../../resources/images/arrow_up_medium.png)" vertical-align="bottom" />, - middle <fo:external-graphic src="url(../../resources/images/arrow_up_down_small.png)" vertical-align="middle" />, - none <fo:external-graphic src="url(../../resources/images/line_medium.png)" />. + Before edge <fo:external-graphic src="url(../resources/images/arrow_down_small.png)" vertical-align="top" /><fo:external-graphic src="url(../resources/images/arrow_down_large.png)" vertical-align="top" />, + after edge <fo:external-graphic src="url(../resources/images/arrow_up_small.png)" vertical-align="bottom" /><fo:external-graphic src="url(../resources/images/arrow_up_medium.png)" vertical-align="bottom" />, + middle <fo:external-graphic src="url(../resources/images/arrow_up_down_small.png)" vertical-align="middle" />, + none <fo:external-graphic src="url(../resources/images/line_medium.png)" />. And this is a line of text that follows the line with the objects aligned on it. </fo:block> <fo:block background-color="yellow" margin="2pt 0pt 2pt 0pt" font-size="10pt"> This is a longer line that provides a context for the line with images aligned on it. - Before edge <fo:external-graphic src="url(../../resources/images/arrow_down_small.png)" vertical-align="top" /><fo:external-graphic src="url(../../resources/images/arrow_down_large.png)" vertical-align="top" />, - after edge <fo:external-graphic src="url(../../resources/images/arrow_up_small.png)" vertical-align="bottom" /><fo:external-graphic src="url(../../resources/images/arrow_up_medium.png)" vertical-align="bottom" />, - middle <fo:external-graphic src="url(../../resources/images/arrow_up_down_small.png)" vertical-align="middle" />. + Before edge <fo:external-graphic src="url(../resources/images/arrow_down_small.png)" vertical-align="top" /><fo:external-graphic src="url(../resources/images/arrow_down_large.png)" vertical-align="top" />, + after edge <fo:external-graphic src="url(../resources/images/arrow_up_small.png)" vertical-align="bottom" /><fo:external-graphic src="url(../resources/images/arrow_up_medium.png)" vertical-align="bottom" />, + middle <fo:external-graphic src="url(../resources/images/arrow_up_down_small.png)" vertical-align="middle" />. And this is a line of text that follows the line with the objects aligned on it. </fo:block> <fo:block background-color="yellow" margin="2pt 0pt 2pt 0pt" font-size="10pt"> This is a longer line that provides a context for the line with images aligned on it. - Before edge <fo:external-graphic src="url(../../resources/images/arrow_down_small.png)" vertical-align="top" /><fo:external-graphic src="url(../../resources/images/arrow_down_large.png)" vertical-align="top" />, - after edge <fo:external-graphic src="url(../../resources/images/arrow_up_small.png)" vertical-align="bottom" /><fo:external-graphic src="url(../../resources/images/arrow_up_medium.png)" vertical-align="bottom" />. + Before edge <fo:external-graphic src="url(../resources/images/arrow_down_small.png)" vertical-align="top" /><fo:external-graphic src="url(../resources/images/arrow_down_large.png)" vertical-align="top" />, + after edge <fo:external-graphic src="url(../resources/images/arrow_up_small.png)" vertical-align="bottom" /><fo:external-graphic src="url(../resources/images/arrow_up_medium.png)" vertical-align="bottom" />. And this is a line of text that follows the line with the objects aligned on it. </fo:block> <fo:block background-color="yellow" margin="2pt 0pt 2pt 0pt" font-size="10pt"> This is a longer line that provides a context for the line with images aligned on it. - Before edge <fo:external-graphic src="url(../../resources/images/arrow_down_small.png)" vertical-align="top" /><fo:external-graphic src="url(../../resources/images/arrow_down_medium.png)" vertical-align="top" />, - after edge <fo:external-graphic src="url(../../resources/images/arrow_up_small.png)" vertical-align="bottom" /><fo:external-graphic src="url(../../resources/images/arrow_up_large.png)" vertical-align="bottom" />. + Before edge <fo:external-graphic src="url(../resources/images/arrow_down_small.png)" vertical-align="top" /><fo:external-graphic src="url(../resources/images/arrow_down_medium.png)" vertical-align="top" />, + after edge <fo:external-graphic src="url(../resources/images/arrow_up_small.png)" vertical-align="bottom" /><fo:external-graphic src="url(../resources/images/arrow_up_large.png)" vertical-align="bottom" />. And this is a line of text that follows the line with the objects aligned on it. </fo:block> <fo:block background-color="yellow" margin="2pt 0pt 2pt 0pt" font-size="10pt"> This is a longer line that provides a context for the line with images aligned on it. - Before edge <fo:external-graphic src="url(../../resources/images/arrow_down_small.png)" vertical-align="top" /><fo:external-graphic src="url(../../resources/images/arrow_down_medium.png)" vertical-align="top" />, - after edge <fo:external-graphic src="url(../../resources/images/arrow_up_small.png)" vertical-align="bottom" /><fo:external-graphic src="url(../../resources/images/arrow_up_large.png)" vertical-align="bottom" />, - middle <fo:external-graphic src="url(../../resources/images/arrow_up_down_small.png)" vertical-align="middle" />. + Before edge <fo:external-graphic src="url(../resources/images/arrow_down_small.png)" vertical-align="top" /><fo:external-graphic src="url(../resources/images/arrow_down_medium.png)" vertical-align="top" />, + after edge <fo:external-graphic src="url(../resources/images/arrow_up_small.png)" vertical-align="bottom" /><fo:external-graphic src="url(../resources/images/arrow_up_large.png)" vertical-align="bottom" />, + middle <fo:external-graphic src="url(../resources/images/arrow_up_down_small.png)" vertical-align="middle" />. And this is a line of text that follows the line with the objects aligned on it. </fo:block> </fo:flow> diff --git a/test/layoutengine/standard-testcases/list-block_background-image.xml b/test/layoutengine/standard-testcases/list-block_background-image.xml index 0dc92102b..9dd96a9d6 100644 --- a/test/layoutengine/standard-testcases/list-block_background-image.xml +++ b/test/layoutengine/standard-testcases/list-block_background-image.xml @@ -23,7 +23,7 @@ </p> </info> <variables> - <img>../../resources/images/bgimg300dpi.jpg</img> + <img>../resources/images/bgimg300dpi.jpg</img> </variables> <fo> <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> @@ -79,6 +79,6 @@ <checks> <eval expected="360000" xpath="//flow/block/@ipd"/> <eval expected="172800" xpath="//flow/block/@bpd"/> - <eval expected="color=#ffff00,url=../../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=156960,vertical=63360" xpath="//flow/block/@background"/> + <eval expected="color=#ffff00,url=../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=156960,vertical=63360" xpath="//flow/block/@background"/> </checks> </testcase> diff --git a/test/layoutengine/standard-testcases/list-item_background-image.xml b/test/layoutengine/standard-testcases/list-item_background-image.xml index e1f4a27b7..c5c9756b8 100644 --- a/test/layoutengine/standard-testcases/list-item_background-image.xml +++ b/test/layoutengine/standard-testcases/list-item_background-image.xml @@ -23,7 +23,7 @@ </p> </info> <variables> - <img>../../resources/images/bgimg300dpi.jpg</img> + <img>../resources/images/bgimg300dpi.jpg</img> </variables> <fo> <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> @@ -79,6 +79,6 @@ <checks> <eval expected="360000" xpath="//flow/block/block/@ipd"/> <eval expected="72000" xpath="//flow/block/block/@bpd"/> - <eval expected="color=#ffff00,url=../../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=156960,vertical=12960" xpath="//flow/block/block/@background"/> + <eval expected="color=#ffff00,url=../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=156960,vertical=12960" xpath="//flow/block/block/@background"/> </checks> </testcase> diff --git a/test/layoutengine/standard-testcases/list-item_padding_percentages.xml b/test/layoutengine/standard-testcases/list-item_padding_percentages.xml index 768e25d90..4fad8bbb4 100644 --- a/test/layoutengine/standard-testcases/list-item_padding_percentages.xml +++ b/test/layoutengine/standard-testcases/list-item_padding_percentages.xml @@ -23,7 +23,7 @@ </p> </info> <variables> - <img>../../resources/images/bgimg300dpi.jpg</img> + <img>../resources/images/bgimg300dpi.jpg</img> </variables> <fo> <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> diff --git a/test/layoutengine/standard-testcases/marker_white-space-treatment_bug42703.xml b/test/layoutengine/standard-testcases/marker_white-space-treatment_bug42703.xml index 50ef57bb2..5343b8f26 100644 --- a/test/layoutengine/standard-testcases/marker_white-space-treatment_bug42703.xml +++ b/test/layoutengine/standard-testcases/marker_white-space-treatment_bug42703.xml @@ -52,7 +52,7 @@ <fo:block font-size="20pt"> <fo:block margin-top="2cm"> <fo:marker marker-class-name="marker1"> - <fo:block>Block<fo:inline> with inline element <fo:external-graphic src="../../resources/images/img.svg" content-type="content-type:xml/svg" alignment-baseline="text-after-edge" height="1em" content-height="scale-to-fit"/> and a graphic </fo:inline>.</fo:block> + <fo:block>Block<fo:inline> with inline element <fo:external-graphic src="../resources/images/img.svg" content-type="content-type:xml/svg" alignment-baseline="text-after-edge" height="1em" content-height="scale-to-fit"/> and a graphic </fo:inline>.</fo:block> </fo:marker> text with the marker </fo:block> diff --git a/test/layoutengine/standard-testcases/page-number-citation_background-image.xml b/test/layoutengine/standard-testcases/page-number-citation_background-image.xml index 503d506d9..b49d2ed66 100644 --- a/test/layoutengine/standard-testcases/page-number-citation_background-image.xml +++ b/test/layoutengine/standard-testcases/page-number-citation_background-image.xml @@ -23,7 +23,7 @@ </p> </info> <variables> - <img>../../resources/images/bgimg300dpi.jpg</img> + <img>../resources/images/bgimg300dpi.jpg</img> </variables> <fo> <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> @@ -44,7 +44,7 @@ </fo> <checks> <!-- currently not working because of late ipd adjustment after the image is positioned --> - <eval expected="color=#ffff00,url=../../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=3648,vertical=21360" xpath="//flow/block[1]/lineArea/text[2]/@background"/> - <eval expected="color=#ffff00,url=../../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=-9696,vertical=-840" xpath="//flow/block[1]/lineArea/text[4]/@background"/> + <eval expected="color=#ffff00,url=../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=3648,vertical=21360" xpath="//flow/block[1]/lineArea/text[2]/@background"/> + <eval expected="color=#ffff00,url=../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=-9696,vertical=-840" xpath="//flow/block[1]/lineArea/text[4]/@background"/> </checks> </testcase> diff --git a/test/layoutengine/standard-testcases/page-number-citation_complex_2.xml b/test/layoutengine/standard-testcases/page-number-citation_complex_2.xml index 17fa20aa8..d15cce1ef 100644 --- a/test/layoutengine/standard-testcases/page-number-citation_complex_2.xml +++ b/test/layoutengine/standard-testcases/page-number-citation_complex_2.xml @@ -54,7 +54,7 @@ </svg:g> </svg:svg> </fo:instream-foreign-object>text</fo:block> - <fo:block>text<fo:external-graphic id="eg1" src="../../resources/images/bgimg72dpi.jpg" content-height="12pt"/>text</fo:block> + <fo:block>text<fo:external-graphic id="eg1" src="../resources/images/bgimg72dpi.jpg" content-height="12pt"/>text</fo:block> </fo:flow> </fo:page-sequence> <fo:page-sequence master-reference="normal"> diff --git a/test/layoutengine/standard-testcases/page-number_background-image.xml b/test/layoutengine/standard-testcases/page-number_background-image.xml index d11a2d3da..edd9f767d 100644 --- a/test/layoutengine/standard-testcases/page-number_background-image.xml +++ b/test/layoutengine/standard-testcases/page-number_background-image.xml @@ -23,7 +23,7 @@ </p> </info> <variables> - <img>../../resources/images/bgimg300dpi.jpg</img> + <img>../resources/images/bgimg300dpi.jpg</img> </variables> <fo> <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> @@ -43,7 +43,7 @@ </fo:root> </fo> <checks> - <eval expected="color=#ffff00,url=../../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=3648,vertical=21360" xpath="//flow/block[1]/lineArea/text[2]/@background"/> - <eval expected="color=#ffff00,url=../../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=-9696,vertical=-840" xpath="//flow/block[1]/lineArea/text[4]/@background"/> + <eval expected="color=#ffff00,url=../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=3648,vertical=21360" xpath="//flow/block[1]/lineArea/text[2]/@background"/> + <eval expected="color=#ffff00,url=../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=-9696,vertical=-840" xpath="//flow/block[1]/lineArea/text[4]/@background"/> </checks> </testcase> diff --git a/test/layoutengine/standard-testcases/page-sequence-force-page-count-odd.xml b/test/layoutengine/standard-testcases/page-sequence-force-page-count-odd.xml index d75f9ba45..87d47b49a 100644 --- a/test/layoutengine/standard-testcases/page-sequence-force-page-count-odd.xml +++ b/test/layoutengine/standard-testcases/page-sequence-force-page-count-odd.xml @@ -25,7 +25,7 @@ </p> </info> <variables> - <img>../../resources/images/bgimg300dpi.jpg</img> + <img>../resources/images/bgimg300dpi.jpg</img> </variables> <fo> <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> diff --git a/test/layoutengine/standard-testcases/page-sequence-force-page-count_bug42576.xml b/test/layoutengine/standard-testcases/page-sequence-force-page-count_bug42576.xml index 30489ae6e..c424f8a2f 100644 --- a/test/layoutengine/standard-testcases/page-sequence-force-page-count_bug42576.xml +++ b/test/layoutengine/standard-testcases/page-sequence-force-page-count_bug42576.xml @@ -25,7 +25,7 @@ </p> </info> <variables> - <img>../../resources/images/bgimg300dpi.jpg</img> + <img>../resources/images/bgimg300dpi.jpg</img> </variables> <fo> <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> diff --git a/test/layoutengine/standard-testcases/region-body_background-image.xml b/test/layoutengine/standard-testcases/region-body_background-image.xml index f5c0fae8f..e46e716e9 100644 --- a/test/layoutengine/standard-testcases/region-body_background-image.xml +++ b/test/layoutengine/standard-testcases/region-body_background-image.xml @@ -23,7 +23,7 @@ </p> </info> <variables> - <img>../../resources/images/bgimg300dpi.jpg</img> + <img>../resources/images/bgimg300dpi.jpg</img> </variables> <fo> <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> @@ -45,8 +45,8 @@ </fo:root> </fo> <checks> - <eval expected="url=../../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=136960,vertical=136960" xpath="//regionViewport/@background"/> - <eval expected="url=../../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=56960,vertical=56960" xpath="//flow/block[1]/@background"/> - <eval expected="url=../../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=56960,vertical=-8640" xpath="//flow/block[1]/block[1]/block[1]/@background"/> + <eval expected="url=../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=136960,vertical=136960" xpath="//regionViewport/@background"/> + <eval expected="url=../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=56960,vertical=56960" xpath="//flow/block[1]/@background"/> + <eval expected="url=../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=56960,vertical=-8640" xpath="//flow/block[1]/block[1]/block[1]/@background"/> </checks> </testcase> diff --git a/test/layoutengine/standard-testcases/simple-page-master_margin_region-body_margin_relative.xml b/test/layoutengine/standard-testcases/simple-page-master_margin_region-body_margin_relative.xml index 1dfe99990..416a6b87a 100644 --- a/test/layoutengine/standard-testcases/simple-page-master_margin_region-body_margin_relative.xml +++ b/test/layoutengine/standard-testcases/simple-page-master_margin_region-body_margin_relative.xml @@ -23,7 +23,7 @@ </p> </info> <variables> - <img>../../resources/images/bgimg300dpi.jpg</img> + <img>../resources/images/bgimg300dpi.jpg</img> </variables> <fo> <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> diff --git a/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_0_region-body_margin_relative.xml b/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_0_region-body_margin_relative.xml index 2d63815b5..dedd30393 100644 --- a/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_0_region-body_margin_relative.xml +++ b/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_0_region-body_margin_relative.xml @@ -23,7 +23,7 @@ </p> </info> <variables> - <img>../../resources/images/bgimg300dpi.jpg</img> + <img>../resources/images/bgimg300dpi.jpg</img> </variables> <fo> <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> diff --git a/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_0_writing-mode_rl_region-body_margin_relative.xml b/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_0_writing-mode_rl_region-body_margin_relative.xml index bfbc90565..9336ad7b7 100644 --- a/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_0_writing-mode_rl_region-body_margin_relative.xml +++ b/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_0_writing-mode_rl_region-body_margin_relative.xml @@ -23,6 +23,9 @@ with reference orientation 0. </p> </info> + <variables> + <img>../resources/images/bgimg300dpi.jpg</img> + </variables> <fo> <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> <fo:layout-master-set> diff --git a/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_180_region-body_margin_relative.xml b/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_180_region-body_margin_relative.xml index 4a3054a9a..7ee68b2d6 100644 --- a/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_180_region-body_margin_relative.xml +++ b/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_180_region-body_margin_relative.xml @@ -23,7 +23,7 @@ </p> </info> <variables> - <img>../../resources/images/bgimg300dpi.jpg</img> + <img>../resources/images/bgimg300dpi.jpg</img> </variables> <fo> <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> diff --git a/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_180_writing-mode_rl_region-body_margin_relative.xml b/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_180_writing-mode_rl_region-body_margin_relative.xml index 284fdf02c..7a6300a8b 100644 --- a/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_180_writing-mode_rl_region-body_margin_relative.xml +++ b/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_180_writing-mode_rl_region-body_margin_relative.xml @@ -23,6 +23,9 @@ with reference orientation 180. </p> </info> + <variables> + <img>../resources/images/bgimg300dpi.jpg</img> + </variables> <fo> <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> <fo:layout-master-set> diff --git a/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_270_region-body_margin_relative.xml b/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_270_region-body_margin_relative.xml index 7d7196ece..1496d7dcc 100644 --- a/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_270_region-body_margin_relative.xml +++ b/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_270_region-body_margin_relative.xml @@ -23,7 +23,7 @@ </p> </info> <variables> - <img>../../resources/images/bgimg300dpi.jpg</img> + <img>../resources/images/bgimg300dpi.jpg</img> </variables> <fo> <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> diff --git a/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_270_writing-mode_rl_region-body_margin_relative.xml b/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_270_writing-mode_rl_region-body_margin_relative.xml index 550785af6..da48c4050 100644 --- a/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_270_writing-mode_rl_region-body_margin_relative.xml +++ b/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_270_writing-mode_rl_region-body_margin_relative.xml @@ -23,6 +23,9 @@ with reference orientation 270. </p> </info> + <variables> + <img>../resources/images/bgimg300dpi.jpg</img> + </variables> <fo> <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> <fo:layout-master-set> diff --git a/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_90_region-body_margin_relative.xml b/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_90_region-body_margin_relative.xml index ab6a58400..774d58c3f 100644 --- a/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_90_region-body_margin_relative.xml +++ b/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_90_region-body_margin_relative.xml @@ -23,7 +23,7 @@ </p> </info> <variables> - <img>../../resources/images/bgimg300dpi.jpg</img> + <img>../resources/images/bgimg300dpi.jpg</img> </variables> <fo> <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> diff --git a/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_90_writing-mode_rl_region-body_margin_relative.xml b/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_90_writing-mode_rl_region-body_margin_relative.xml index cdb3140d1..e911ac8d1 100644 --- a/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_90_writing-mode_rl_region-body_margin_relative.xml +++ b/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_90_writing-mode_rl_region-body_margin_relative.xml @@ -23,6 +23,9 @@ with reference orientation 90. </p> </info> + <variables> + <img>../resources/images/bgimg300dpi.jpg</img> + </variables> <fo> <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> <fo:layout-master-set> diff --git a/test/layoutengine/standard-testcases/simple-page-master_writing-mode_rl_region-body_writing-mode-lr.xml b/test/layoutengine/standard-testcases/simple-page-master_writing-mode_rl_region-body_writing-mode-lr.xml index 68db2454e..0422ec540 100644 --- a/test/layoutengine/standard-testcases/simple-page-master_writing-mode_rl_region-body_writing-mode-lr.xml +++ b/test/layoutengine/standard-testcases/simple-page-master_writing-mode_rl_region-body_writing-mode-lr.xml @@ -23,7 +23,7 @@ </p> </info> <variables> - <img>../../resources/images/bgimg300dpi.jpg</img> + <img>../resources/images/bgimg300dpi.jpg</img> </variables> <fo> <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> diff --git a/test/layoutengine/standard-testcases/table-cell_background-image.xml b/test/layoutengine/standard-testcases/table-cell_background-image.xml index 1c4587b25..08f00ef2f 100644 --- a/test/layoutengine/standard-testcases/table-cell_background-image.xml +++ b/test/layoutengine/standard-testcases/table-cell_background-image.xml @@ -23,7 +23,7 @@ </p> </info> <variables> - <img>../../resources/images/box1.png</img> + <img>../resources/images/box1.png</img> </variables> <fo> <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> @@ -110,22 +110,22 @@ </fo> <checks> <!-- first cell in row 1 --> - <eval expected="color=#0000ff,url=../../resources/images/box1.png,repeat=no-repeat,horiz=69991,vertical=0" xpath="//flow/block/block[1]/@background"/> + <eval expected="color=#0000ff,url=../resources/images/box1.png,repeat=no-repeat,horiz=69991,vertical=0" xpath="//flow/block/block[1]/@background"/> <!-- second cell in row 1 --> - <eval expected="color=#008000,url=../../resources/images/box1.png,repeat=no-repeat,horiz=69991,vertical=28495" xpath="//flow/block/block[2]/@background"/> + <eval expected="color=#008000,url=../resources/images/box1.png,repeat=no-repeat,horiz=69991,vertical=28495" xpath="//flow/block/block[2]/@background"/> <!-- third cell in row 1 --> - <eval expected="color=#ffff00,url=../../resources/images/box1.png,repeat=no-repeat,horiz=69991,vertical=56991" xpath="//flow/block/block[3]/@background"/> + <eval expected="color=#ffff00,url=../resources/images/box1.png,repeat=no-repeat,horiz=69991,vertical=56991" xpath="//flow/block/block[3]/@background"/> <!-- first cell in row 2 --> - <eval expected="color=#ffff00,url=../../resources/images/box1.png,repeat=no-repeat,horiz=34995,vertical=0" xpath="//flow/block/block[4]/@background"/> + <eval expected="color=#ffff00,url=../resources/images/box1.png,repeat=no-repeat,horiz=34995,vertical=0" xpath="//flow/block/block[4]/@background"/> <!-- second cell in row 2 --> - <eval expected="color=#0000ff,url=../../resources/images/box1.png,repeat=no-repeat,horiz=34995,vertical=28495" xpath="//flow/block/block[5]/@background"/> + <eval expected="color=#0000ff,url=../resources/images/box1.png,repeat=no-repeat,horiz=34995,vertical=28495" xpath="//flow/block/block[5]/@background"/> <!-- third cell in row 2 --> - <eval expected="color=#008000,url=../../resources/images/box1.png,repeat=no-repeat,horiz=34995,vertical=56991" xpath="//flow/block/block[6]/@background"/> + <eval expected="color=#008000,url=../resources/images/box1.png,repeat=no-repeat,horiz=34995,vertical=56991" xpath="//flow/block/block[6]/@background"/> <!-- first cell in row 3 --> - <eval expected="color=#008000,url=../../resources/images/box1.png,repeat=no-repeat,horiz=0,vertical=0" xpath="//flow/block/block[7]/@background"/> + <eval expected="color=#008000,url=../resources/images/box1.png,repeat=no-repeat,horiz=0,vertical=0" xpath="//flow/block/block[7]/@background"/> <!-- second cell in row 3 --> - <eval expected="color=#ffff00,url=../../resources/images/box1.png,repeat=no-repeat,horiz=0,vertical=28495" xpath="//flow/block/block[8]/@background"/> + <eval expected="color=#ffff00,url=../resources/images/box1.png,repeat=no-repeat,horiz=0,vertical=28495" xpath="//flow/block/block[8]/@background"/> <!-- third cell in row 3 --> - <eval expected="color=#0000ff,url=../../resources/images/box1.png,repeat=no-repeat,horiz=0,vertical=56991" xpath="//flow/block/block[9]/@background"/> + <eval expected="color=#0000ff,url=../resources/images/box1.png,repeat=no-repeat,horiz=0,vertical=56991" xpath="//flow/block/block[9]/@background"/> </checks> </testcase> diff --git a/test/layoutengine/standard-testcases/table-row_background-image.xml b/test/layoutengine/standard-testcases/table-row_background-image.xml index f4dc65ae7..faac82f9b 100644 --- a/test/layoutengine/standard-testcases/table-row_background-image.xml +++ b/test/layoutengine/standard-testcases/table-row_background-image.xml @@ -23,7 +23,7 @@ </p> </info> <variables> - <img>../../resources/images/bgimg300dpi.jpg</img> + <img>../resources/images/bgimg300dpi.jpg</img> </variables> <fo> <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> @@ -82,17 +82,17 @@ <checks> <eval expected="120000" xpath="//flow/block/block[4]/@ipd"/> <eval expected="72000" xpath="//flow/block/block[4]/@bpd"/> - <eval expected="color=#ffff00,url=../../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=156960,vertical=12960" xpath="//flow/block/block[4]/@background"/> + <eval expected="color=#ffff00,url=../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=156960,vertical=12960" xpath="//flow/block/block[4]/@background"/> <eval expected="" xpath="//flow/block/block[4]/@left-offset"/> <eval expected="120000" xpath="//flow/block/block[6]/@ipd"/> <eval expected="72000" xpath="//flow/block/block[6]/@bpd"/> - <eval expected="color=#ffff00,url=../../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=36960,vertical=12960" xpath="//flow/block/block[6]/@background"/> + <eval expected="color=#ffff00,url=../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=36960,vertical=12960" xpath="//flow/block/block[6]/@background"/> <eval expected="120000" xpath="//flow/block/block[6]/@left-offset"/> <eval expected="120000" xpath="//flow/block/block[8]/@ipd"/> <eval expected="72000" xpath="//flow/block/block[8]/@bpd"/> - <eval expected="color=#ffff00,url=../../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=-83040,vertical=12960" xpath="//flow/block/block[8]/@background"/> + <eval expected="color=#ffff00,url=../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=-83040,vertical=12960" xpath="//flow/block/block[8]/@background"/> <eval expected="240000" xpath="//flow/block/block[8]/@left-offset"/> </checks> diff --git a/test/layoutengine/standard-testcases/table_background-image.xml b/test/layoutengine/standard-testcases/table_background-image.xml index 3efce48e6..f2be05547 100644 --- a/test/layoutengine/standard-testcases/table_background-image.xml +++ b/test/layoutengine/standard-testcases/table_background-image.xml @@ -23,7 +23,7 @@ </p> </info> <variables> - <img>../../resources/images/bgimg300dpi.jpg</img> + <img>../resources/images/bgimg300dpi.jpg</img> </variables> <fo> <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> @@ -108,6 +108,6 @@ </fo:root> </fo> <checks> - <eval expected="color=#ffff00,url=../../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=156960,vertical=12960" xpath="//flow/block[1]/@background"/> + <eval expected="color=#ffff00,url=../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=156960,vertical=12960" xpath="//flow/block[1]/@background"/> </checks> </testcase> diff --git a/test/layoutengine/standard-testcases/table_backgrounds.xml b/test/layoutengine/standard-testcases/table_backgrounds.xml index 30564ecf7..9a11ad960 100644 --- a/test/layoutengine/standard-testcases/table_backgrounds.xml +++ b/test/layoutengine/standard-testcases/table_backgrounds.xml @@ -23,12 +23,12 @@ </p> </info> <variables> - <table>../../resources/images/fop-logo-gray-8bit.png</table> - <col>../../resources/images/bgimg72dpi.jpg</col> - <body>../../resources/images/fop-logo-color-24bit.png</body> - <row>../../../examples/fo/graphics/asf-logo.png</row> - <headFoot>../../../examples/fo/graphics/asf-logo.png</headFoot> - <header>../../resources/images/box1.png</header> + <table>../resources/images/fop-logo-gray-8bit.png</table> + <col>../resources/images/bgimg72dpi.jpg</col> + <body>../resources/images/fop-logo-color-24bit.png</body> + <row>../../examples/fo/graphics/asf-logo.png</row> + <headFoot>../../examples/fo/graphics/asf-logo.png</headFoot> + <header>../resources/images/box1.png</header> </variables> <fo> <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> @@ -157,7 +157,7 @@ </fo> <checks> <!-- table background --> - <eval expected="color=#f0f0f0,url=../../resources/images/fop-logo-gray-8bit.png,repeat=no-repeat,horiz=53480,vertical=108960" + <eval expected="color=#f0f0f0,url=../resources/images/fop-logo-gray-8bit.png,repeat=no-repeat,horiz=53480,vertical=108960" xpath="//flow/block[2]/@background"/> <!-- column background, header 1.1 --> @@ -166,7 +166,7 @@ <eval expected="4000" xpath="//flow/block[2]/block[1]/@top-offset"/> <eval expected="4000" xpath="//flow/block[2]/block[1]/@left-offset"/> <eval xpath="//flow/block[2]/block[1]/@background" - expected="color=#ffff00,url=../../resources/images/bgimg72dpi.jpg,repeat=no-repeat,horiz=-28000,vertical=54000"/> + expected="color=#ffff00,url=../resources/images/bgimg72dpi.jpg,repeat=no-repeat,horiz=-28000,vertical=54000"/> <!-- table-header background, header 1.1 --> <eval expected="136000" xpath="//flow/block[2]/block[2]/@ipd"/> @@ -174,7 +174,7 @@ <eval expected="4000" xpath="//flow/block[2]/block[2]/@top-offset"/> <eval expected="4000" xpath="//flow/block[2]/block[2]/@left-offset"/> <eval xpath="//flow/block[2]/block[2]/@background" - expected="url=../../../examples/fo/graphics/asf-logo.png,repeat=no-repeat,horiz=76633,vertical=5877"/> + expected="url=../../examples/fo/graphics/asf-logo.png,repeat=no-repeat,horiz=76633,vertical=5877"/> <!-- column background, header 1.2 --> @@ -183,7 +183,7 @@ <eval expected="4000" xpath="//flow/block[2]/block[4]/@top-offset"/> <eval expected="148000" xpath="//flow/block[2]/block[4]/@left-offset"/> <eval xpath="//flow/block[2]/block[4]/@background" - expected="url=../../resources/images/bgimg72dpi.jpg,repeat=no-repeat,horiz=-28000,vertical=54000"/> + expected="url=../resources/images/bgimg72dpi.jpg,repeat=no-repeat,horiz=-28000,vertical=54000"/> <!-- table-header background, header 1.2 --> <eval expected="136000" xpath="//flow/block[2]/block[5]/@ipd"/> @@ -191,7 +191,7 @@ <eval expected="4000" xpath="//flow/block[2]/block[5]/@top-offset"/> <eval expected="148000" xpath="//flow/block[2]/block[5]/@left-offset"/> <eval xpath="//flow/block[2]/block[5]/@background" - expected="url=../../../examples/fo/graphics/asf-logo.png,repeat=no-repeat,horiz=-67367,vertical=5877"/> + expected="url=../../examples/fo/graphics/asf-logo.png,repeat=no-repeat,horiz=-67367,vertical=5877"/> <!-- header 1.2 background --> <eval expected="136000" xpath="//flow/block[2]/block[6]/@ipd"/> @@ -199,7 +199,7 @@ <eval expected="2000" xpath="//flow/block[2]/block[6]/@top-offset"/> <eval expected="148000" xpath="//flow/block[2]/block[6]/@left-offset"/> <eval xpath="//flow/block[2]/block[6]/@background" - expected="color=#ffff00,url=../../resources/images/box1.png,repeat=no-repeat,horiz=47995,vertical=4995"/> + expected="color=#ffff00,url=../resources/images/box1.png,repeat=no-repeat,horiz=47995,vertical=4995"/> <!-- column background, cell 1.2 --> @@ -208,7 +208,7 @@ <eval expected="60000" xpath="//flow/block[2]/block[7]/@top-offset"/> <eval expected="146000" xpath="//flow/block[2]/block[7]/@left-offset"/> <eval xpath="//flow/block[2]/block[7]/@background" - expected="url=../../resources/images/bgimg72dpi.jpg,repeat=no-repeat,horiz=-26000,vertical=-2000"/> + expected="url=../resources/images/bgimg72dpi.jpg,repeat=no-repeat,horiz=-26000,vertical=-2000"/> <!-- table-row background, cell 1.2 --> <eval expected="140000" xpath="//flow/block[2]/block[8]/@ipd"/> @@ -216,7 +216,7 @@ <eval expected="60000" xpath="//flow/block[2]/block[8]/@top-offset"/> <eval expected="146000" xpath="//flow/block[2]/block[8]/@left-offset"/> <eval xpath="//flow/block[2]/block[8]/@background" - expected="url=../../../examples/fo/graphics/asf-logo.png,repeat=no-repeat,horiz=-65367,vertical=-9122"/> + expected="url=../../examples/fo/graphics/asf-logo.png,repeat=no-repeat,horiz=-65367,vertical=-9122"/> <!-- column background, cell 1.1 --> @@ -225,7 +225,7 @@ <eval expected="62000" xpath="//flow/block[2]/block[10]/@top-offset"/> <eval expected="4000" xpath="//flow/block[2]/block[10]/@left-offset"/> <eval xpath="//flow/block[2]/block[10]/@background" - expected="color=#ffff00,url=../../resources/images/bgimg72dpi.jpg,repeat=no-repeat,horiz=-28000,vertical=-4000"/> + expected="color=#ffff00,url=../resources/images/bgimg72dpi.jpg,repeat=no-repeat,horiz=-28000,vertical=-4000"/> <!-- table-row background, cell 1.1 --> <eval expected="136000" xpath="//flow/block[2]/block[11]/@ipd"/> @@ -233,7 +233,7 @@ <eval expected="62000" xpath="//flow/block[2]/block[11]/@top-offset"/> <eval expected="4000" xpath="//flow/block[2]/block[11]/@left-offset"/> <eval xpath="//flow/block[2]/block[11]/@background" - expected="url=../../../examples/fo/graphics/asf-logo.png,repeat=no-repeat,horiz=76633,vertical=-11122"/> + expected="url=../../examples/fo/graphics/asf-logo.png,repeat=no-repeat,horiz=76633,vertical=-11122"/> <!-- column background, cell 2.2 --> @@ -242,7 +242,7 @@ <eval expected="86000" xpath="//flow/block[2]/block[13]/@top-offset"/> <eval expected="148000" xpath="//flow/block[2]/block[13]/@left-offset"/> <eval xpath="//flow/block[2]/block[13]/@background" - expected="url=../../resources/images/bgimg72dpi.jpg,repeat=no-repeat,horiz=-28000,vertical=-28000"/> + expected="url=../resources/images/bgimg72dpi.jpg,repeat=no-repeat,horiz=-28000,vertical=-28000"/> <!-- table-row background, cell 2.2 --> <eval expected="136000" xpath="//flow/block[2]/block[14]/@ipd"/> @@ -250,7 +250,7 @@ <eval expected="86000" xpath="//flow/block[2]/block[14]/@top-offset"/> <eval expected="148000" xpath="//flow/block[2]/block[14]/@left-offset"/> <eval xpath="//flow/block[2]/block[14]/@background" - expected="url=../../../examples/fo/graphics/asf-logo.png,repeat=no-repeat,horiz=-67367,vertical=-11122"/> + expected="url=../../examples/fo/graphics/asf-logo.png,repeat=no-repeat,horiz=-67367,vertical=-11122"/> <!-- column background, cell 3.1 --> @@ -259,7 +259,7 @@ <eval expected="110000" xpath="//flow/block[2]/block[16]/@top-offset"/> <eval expected="4000" xpath="//flow/block[2]/block[16]/@left-offset"/> <eval xpath="//flow/block[2]/block[16]/@background" - expected="color=#ffff00,url=../../resources/images/bgimg72dpi.jpg,repeat=no-repeat,horiz=-28000,vertical=-52000"/> + expected="color=#ffff00,url=../resources/images/bgimg72dpi.jpg,repeat=no-repeat,horiz=-28000,vertical=-52000"/> <!-- table-row background, cell 3.1 --> <eval expected="280000" xpath="//flow/block[2]/block[17]/@ipd"/> @@ -267,7 +267,7 @@ <eval expected="110000" xpath="//flow/block[2]/block[17]/@top-offset"/> <eval expected="4000" xpath="//flow/block[2]/block[17]/@left-offset"/> <eval xpath="//flow/block[2]/block[17]/@background" - expected="url=../../../examples/fo/graphics/asf-logo.png,repeat=no-repeat,horiz=76633,vertical=-9122"/> + expected="url=../../examples/fo/graphics/asf-logo.png,repeat=no-repeat,horiz=76633,vertical=-9122"/> <!-- column background, cell 4.1 --> @@ -276,7 +276,7 @@ <eval expected="138000" xpath="//flow/block[2]/block[19]/@top-offset"/> <eval expected="4000" xpath="//flow/block[2]/block[19]/@left-offset"/> <eval xpath="//flow/block[2]/block[19]/@background" - expected="color=#ffff00,url=../../resources/images/bgimg72dpi.jpg,repeat=no-repeat,horiz=-28000,vertical=-80000"/> + expected="color=#ffff00,url=../resources/images/bgimg72dpi.jpg,repeat=no-repeat,horiz=-28000,vertical=-80000"/> <!-- table-row background, cell 4.1 --> <eval expected="136000" xpath="//flow/block[2]/block[20]/@ipd"/> @@ -284,7 +284,7 @@ <eval expected="138000" xpath="//flow/block[2]/block[20]/@top-offset"/> <eval expected="4000" xpath="//flow/block[2]/block[20]/@left-offset"/> <eval xpath="//flow/block[2]/block[20]/@background" - expected="url=../../../examples/fo/graphics/asf-logo.png,repeat=no-repeat,horiz=76633,vertical=-9122"/> + expected="url=../../examples/fo/graphics/asf-logo.png,repeat=no-repeat,horiz=76633,vertical=-9122"/> <!-- column background, cell 4.2 --> @@ -293,7 +293,7 @@ <eval expected="136000" xpath="//flow/block[2]/block[22]/@top-offset"/> <eval expected="146000" xpath="//flow/block[2]/block[22]/@left-offset"/> <eval xpath="//flow/block[2]/block[22]/@background" - expected="url=../../resources/images/bgimg72dpi.jpg,repeat=no-repeat,horiz=-26000,vertical=-78000"/> + expected="url=../resources/images/bgimg72dpi.jpg,repeat=no-repeat,horiz=-26000,vertical=-78000"/> <!-- table-row background, cell 4.2 --> <eval expected="140000" xpath="//flow/block[2]/block[23]/@ipd"/> @@ -301,7 +301,7 @@ <eval expected="136000" xpath="//flow/block[2]/block[23]/@top-offset"/> <eval expected="146000" xpath="//flow/block[2]/block[23]/@left-offset"/> <eval xpath="//flow/block[2]/block[23]/@background" - expected="url=../../../examples/fo/graphics/asf-logo.png,repeat=no-repeat,horiz=-65367,vertical=-7122"/> + expected="url=../../examples/fo/graphics/asf-logo.png,repeat=no-repeat,horiz=-65367,vertical=-7122"/> <!-- column background, cell 5.2 --> @@ -310,7 +310,7 @@ <eval expected="164000" xpath="//flow/block[2]/block[25]/@top-offset"/> <eval expected="146000" xpath="//flow/block[2]/block[25]/@left-offset"/> <eval xpath="//flow/block[2]/block[25]/@background" - expected="url=../../resources/images/bgimg72dpi.jpg,repeat=no-repeat,horiz=-26000,vertical=-106000"/> + expected="url=../resources/images/bgimg72dpi.jpg,repeat=no-repeat,horiz=-26000,vertical=-106000"/> <!-- table-body background, cell 5.2 --> <eval expected="140000" xpath="//flow/block[2]/block[26]/@ipd"/> @@ -318,7 +318,7 @@ <eval expected="164000" xpath="//flow/block[2]/block[26]/@top-offset"/> <eval expected="146000" xpath="//flow/block[2]/block[26]/@left-offset"/> <eval xpath="//flow/block[2]/block[26]/@background" - expected="url=../../resources/images/fop-logo-color-24bit.png,repeat=no-repeat,horiz=-94513,vertical=9964"/> + expected="url=../resources/images/fop-logo-color-24bit.png,repeat=no-repeat,horiz=-94513,vertical=9964"/> <!-- column background, cell 5.1 --> @@ -327,7 +327,7 @@ <eval expected="166000" xpath="//flow/block[2]/block[28]/@top-offset"/> <eval expected="4000" xpath="//flow/block[2]/block[28]/@left-offset"/> <eval xpath="//flow/block[2]/block[28]/@background" - expected="color=#ffff00,url=../../resources/images/bgimg72dpi.jpg,repeat=no-repeat,horiz=-28000,vertical=-108000"/> + expected="color=#ffff00,url=../resources/images/bgimg72dpi.jpg,repeat=no-repeat,horiz=-28000,vertical=-108000"/> <!-- table-body background, cell 5.1 --> <eval expected="136000" xpath="//flow/block[2]/block[29]/@ipd"/> @@ -335,7 +335,7 @@ <eval expected="166000" xpath="//flow/block[2]/block[29]/@top-offset"/> <eval expected="4000" xpath="//flow/block[2]/block[29]/@left-offset"/> <eval xpath="//flow/block[2]/block[29]/@background" - expected="url=../../resources/images/fop-logo-color-24bit.png,repeat=no-repeat,horiz=47487,vertical=7964"/> + expected="url=../resources/images/fop-logo-color-24bit.png,repeat=no-repeat,horiz=47487,vertical=7964"/> <!-- column background, cell 6.2 --> @@ -344,7 +344,7 @@ <eval expected="210000" xpath="//flow/block[2]/block[31]/@top-offset"/> <eval expected="148000" xpath="//flow/block[2]/block[31]/@left-offset"/> <eval xpath="//flow/block[2]/block[31]/@background" - expected="url=../../resources/images/bgimg72dpi.jpg,repeat=no-repeat,horiz=-28000,vertical=-152000"/> + expected="url=../resources/images/bgimg72dpi.jpg,repeat=no-repeat,horiz=-28000,vertical=-152000"/> <!-- table-body background, cell 6.2 --> <eval expected="136000" xpath="//flow/block[2]/block[32]/@ipd"/> @@ -352,7 +352,7 @@ <eval expected="210000" xpath="//flow/block[2]/block[32]/@top-offset"/> <eval expected="148000" xpath="//flow/block[2]/block[32]/@left-offset"/> <eval xpath="//flow/block[2]/block[32]/@background" - expected="url=../../resources/images/fop-logo-color-24bit.png,repeat=no-repeat,horiz=-96513,vertical=-36036"/> + expected="url=../resources/images/fop-logo-color-24bit.png,repeat=no-repeat,horiz=-96513,vertical=-36036"/> <!-- column background, footer 1.1 --> @@ -361,7 +361,7 @@ <eval expected="284000" xpath="//flow/block[2]/block[34]/@top-offset"/> <eval expected="4000" xpath="//flow/block[2]/block[34]/@left-offset"/> <eval xpath="//flow/block[2]/block[34]/@background" - expected="color=#ffff00,url=../../resources/images/bgimg72dpi.jpg,repeat=no-repeat,horiz=-28000,vertical=-226000"/> + expected="color=#ffff00,url=../resources/images/bgimg72dpi.jpg,repeat=no-repeat,horiz=-28000,vertical=-226000"/> <!-- table-footer background, footer 1.1 --> <eval expected="136000" xpath="//flow/block[2]/block[35]/@ipd"/> @@ -369,7 +369,7 @@ <eval expected="284000" xpath="//flow/block[2]/block[35]/@top-offset"/> <eval expected="4000" xpath="//flow/block[2]/block[35]/@left-offset"/> <eval xpath="//flow/block[2]/block[35]/@background" - expected="url=../../../examples/fo/graphics/asf-logo.png,repeat=no-repeat,horiz=76633,vertical=-9122"/> + expected="url=../../examples/fo/graphics/asf-logo.png,repeat=no-repeat,horiz=76633,vertical=-9122"/> <!-- column background, footer 1.2 --> @@ -378,7 +378,7 @@ <eval expected="284000" xpath="//flow/block[2]/block[37]/@top-offset"/> <eval expected="148000" xpath="//flow/block[2]/block[37]/@left-offset"/> <eval xpath="//flow/block[2]/block[37]/@background" - expected="url=../../resources/images/bgimg72dpi.jpg,repeat=no-repeat,horiz=-28000,vertical=-226000"/> + expected="url=../resources/images/bgimg72dpi.jpg,repeat=no-repeat,horiz=-28000,vertical=-226000"/> <!-- table-footer background, footer 1.2 --> <eval expected="136000" xpath="//flow/block[2]/block[38]/@ipd"/> @@ -386,7 +386,7 @@ <eval expected="284000" xpath="//flow/block[2]/block[38]/@top-offset"/> <eval expected="148000" xpath="//flow/block[2]/block[38]/@left-offset"/> <eval xpath="//flow/block[2]/block[38]/@background" - expected="url=../../../examples/fo/graphics/asf-logo.png,repeat=no-repeat,horiz=-67367,vertical=-9122"/> + expected="url=../../examples/fo/graphics/asf-logo.png,repeat=no-repeat,horiz=-67367,vertical=-9122"/> </checks> </testcase> |