xmlgraphics-fop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gad...@apache.org
Subject svn commit: r1400689 [12/13] - in /xmlgraphics/fop/branches/fop-1_1: ./ examples/embedding/java/embedding/ examples/embedding/java/embedding/atxml/ examples/embedding/java/embedding/events/ examples/embedding/java/embedding/intermediate/ src/documentat...
Date Sun, 21 Oct 2012 18:06:04 GMT
Modified: xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/block-container_background-image_background-position-relative.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/block-container_background-image_background-position-relative.xml?rev=1400689&r1=1400688&r2=1400689&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/block-container_background-image_background-position-relative.xml (original)
+++ xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/block-container_background-image_background-position-relative.xml Sun Oct 21 18:05:50 2012
@@ -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>

Modified: xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/block-container_background-image_background-repeat.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/block-container_background-image_background-repeat.xml?rev=1400689&r1=1400688&r2=1400689&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/block-container_background-image_background-repeat.xml (original)
+++ xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/block-container_background-image_background-repeat.xml Sun Oct 21 18:05:50 2012
@@ -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>

Modified: xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/character_background-image.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/character_background-image.xml?rev=1400689&r1=1400688&r2=1400689&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/character_background-image.xml (original)
+++ xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/character_background-image.xml Sun Oct 21 18:05:50 2012
@@ -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>

Modified: xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/color_1.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/color_1.xml?rev=1400689&r1=1400688&r2=1400689&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/color_1.xml (original)
+++ xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/color_1.xml Sun Oct 21 18:05:50 2012
@@ -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,&quot;../../../src/java/org/apache/fop/pdf/sRGB Color Space Profile.icm&quot;,1.0,0.5,0.0)" xpath="//block[4]//text/@color"/>
+    <eval expected="fop-rgb-icc(1.0,0.5,0.0,sRGB,&quot;../../src/java/org/apache/fop/pdf/sRGB Color Space Profile.icm&quot;,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"/>

Modified: xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_basic.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_basic.xml?rev=1400689&r1=1400688&r2=1400689&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_basic.xml (original)
+++ xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_basic.xml Sun Oct 21 18:05:50 2012
@@ -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>

Modified: xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_bmp.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_bmp.xml?rev=1400689&r1=1400688&r2=1400689&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_bmp.xml (original)
+++ xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_bmp.xml Sun Oct 21 18:05:50 2012
@@ -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>

Modified: xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_border_padding.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_border_padding.xml?rev=1400689&r1=1400688&r2=1400689&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_border_padding.xml (original)
+++ xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_border_padding.xml Sun Oct 21 18:05:50 2012
@@ -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.

Modified: xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_breaking.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_breaking.xml?rev=1400689&r1=1400688&r2=1400689&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_breaking.xml (original)
+++ xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_breaking.xml Sun Oct 21 18:05:50 2012
@@ -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"/>&#x200b;<fo:external-graphic src="../../resources/images/arrow_down_medium.png"/>&#x200b;<fo:external-graphic src="../../resources/images/arrow_up_medium.png"/>&#x200b;<fo:external-graphic src="../../resources/images/arrow_down_medium.png"/>&#x200b;<fo:external-graphic src="../../resources/images/arrow_up_medium.png"/>&#x200b;<fo:external-graphic src="../../resources/images/arrow_down_medium.png"/>&#x200b;<fo:external-graphic src="../../resources/images/arrow_up_medium.png"/>&#x200b;<fo:external-graphic src="../../resources/images/arrow_down_medium.png"/>&#x200b;<fo:external-graphic src="../../resources/images/arrow_up_medium.png"/>&#x200b;<fo:external-graphic src="../../resources/images/arrow_down_medium.png"/>&#x200b;<fo:external-graphic src="../../resources/images/arrow_up_medium.png"/>&#x200b;<fo:external-graphic src="../../resources/images/arrow_down_medi
 um.png"/></fo:block>
+          <fo:block background-color="orange"><fo:external-graphic src="../resources/images/arrow_up_medium.png"/>&#x200b;<fo:external-graphic src="../resources/images/arrow_down_medium.png"/>&#x200b;<fo:external-graphic src="../resources/images/arrow_up_medium.png"/>&#x200b;<fo:external-graphic src="../resources/images/arrow_down_medium.png"/>&#x200b;<fo:external-graphic src="../resources/images/arrow_up_medium.png"/>&#x200b;<fo:external-graphic src="../resources/images/arrow_down_medium.png"/>&#x200b;<fo:external-graphic src="../resources/images/arrow_up_medium.png"/>&#x200b;<fo:external-graphic src="../resources/images/arrow_down_medium.png"/>&#x200b;<fo:external-graphic src="../resources/images/arrow_up_medium.png"/>&#x200b;<fo:external-graphic src="../resources/images/arrow_down_medium.png"/>&#x200b;<fo:external-graphic src="../resources/images/arrow_up_medium.png"/>&#x200b;<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>

Modified: xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_bug37815.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_bug37815.xml?rev=1400689&r1=1400688&r2=1400689&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_bug37815.xml (original)
+++ xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_bug37815.xml Sun Oct 21 18:05:50 2012
@@ -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>

Modified: xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_content-height_content-width.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_content-height_content-width.xml?rev=1400689&r1=1400688&r2=1400689&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_content-height_content-width.xml (original)
+++ xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_content-height_content-width.xml Sun Oct 21 18:05:50 2012
@@ -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>

Modified: xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_content-height_content-width_2.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_content-height_content-width_2.xml?rev=1400689&r1=1400688&r2=1400689&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_content-height_content-width_2.xml (original)
+++ xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_content-height_content-width_2.xml Sun Oct 21 18:05:50 2012
@@ -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>

Modified: xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_display-align.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_display-align.xml?rev=1400689&r1=1400688&r2=1400689&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_display-align.xml (original)
+++ xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_display-align.xml Sun Oct 21 18:05:50 2012
@@ -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>

Modified: xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_emf.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_emf.xml?rev=1400689&r1=1400688&r2=1400689&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_emf.xml (original)
+++ xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_emf.xml Sun Oct 21 18:05:50 2012
@@ -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>

Modified: xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_eps.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_eps.xml?rev=1400689&r1=1400688&r2=1400689&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_eps.xml (original)
+++ xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_eps.xml Sun Oct 21 18:05:50 2012
@@ -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>

Modified: xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_gif.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_gif.xml?rev=1400689&r1=1400688&r2=1400689&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_gif.xml (original)
+++ xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_gif.xml Sun Oct 21 18:05:50 2012
@@ -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>

Modified: xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_jpeg.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_jpeg.xml?rev=1400689&r1=1400688&r2=1400689&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_jpeg.xml (original)
+++ xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_jpeg.xml Sun Oct 21 18:05:50 2012
@@ -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>

Modified: xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_overflow_hidden.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_overflow_hidden.xml?rev=1400689&r1=1400688&r2=1400689&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_overflow_hidden.xml (original)
+++ xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_overflow_hidden.xml Sun Oct 21 18:05:50 2012
@@ -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>

Modified: xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_oversized.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_oversized.xml?rev=1400689&r1=1400688&r2=1400689&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_oversized.xml (original)
+++ xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_oversized.xml Sun Oct 21 18:05:50 2012
@@ -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>

Modified: xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_png.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_png.xml?rev=1400689&r1=1400688&r2=1400689&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_png.xml (original)
+++ xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_png.xml Sun Oct 21 18:05:50 2012
@@ -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>

Modified: xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_rfc2397.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_rfc2397.xml?rev=1400689&r1=1400688&r2=1400689&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_rfc2397.xml (original)
+++ xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_rfc2397.xml Sun Oct 21 18:05:50 2012
@@ -33,7 +33,7 @@
         <fo:flow flow-name="xsl-region-body">
           <fo:block>Image referenced by RFC 2397 "data" URL:</fo:block>
           <fo:block>
-            <fo:external-graphic src="url(&quot;data:image/gif;base64, R0lGODlhGQIzANUAAOzs608OWhkWGfQCMURERLGfR1oNffPcXOS3UnZ3d8cIRpFoN94EOPROPq4K&#xA;UbQHKuDg4K1qaPB4RmsJP/T09IkJMpmCPMvMzHsMbJcLXrClfru7u/glOIiIiGtNJTUHQbAuMMyk&#xA;qXWAhY4uKpyprrKIeaqqqpmZmZE3V4mcpswiK7TDyc3FtoaVndfW0bJNOaMEJsEbdZ0UJmVmZ5+z&#xA;vVNWWN3Ly7ywmoGOlTMzM8XW272dmu7U2MMCKQAAAP///yH5BAAAAAAALAAAAAAZAjMAAAb/wJ9w&#xA;SCwaj8ikcslsOp/QqHRKrVqv2Kx2y+16v+Dw7yQum8/otHrNbrvf8OdFFK/b7/i8fs/P5xIAUisX&#xA;PyYkfYiJiouMjY5lGz4+M4FOLi0mPykkGwB0j6ChoqOkpWgQHZI+BBBNJiuHLScJOIdDITs/ESMg&#xA;uhE8pRAbw8TDhCcEBKZRwsbLQs0brc/UTtGEXsWVYhAnqqvYSSc0OD84HSKc0CMMDBUDAw8y8A8l&#xA;ADs7242p36rK/FxMdBg4cA+/VWpQzUhGYEaHDVdOCOgHsRoTghgzTkt0UJmXbxXLCJuoKkdIIxda&#xA;0ECHI4WIiigUuGvXowcDeAxg9BjAAUSE/0fICOSQJCBZgh8At5BUtfFOx1M1+vXrQOUgyB8EVFG1&#xA;WESq1JN9nk6JpMrI1TMQIMzoJ4CMEQrpWiSYQSPdDxsOFCio0A5GOwY9HsAb0APGg8IqXpRYbC8R&#xA;2a1C+G0YKiBT5KE+TDYh+w2yU39nLiz1inDK0qIEBEDMKskz1x+kz3IEPfabWVVgxQCAIJqtCH0d&#xA;arQUkYCECDIRHDiYkHeCXgWB2xE
 WjFOGCg4cGjR4EWFHCD6PiVglGmjtKpLhkpj/JkCP2DKj/wxk&#xA;XToKZwH6sGp9TSQ27kXv2WcbHml5w1YN01CwQg0tpDCDg2SgkEEGzDlQQV57/ZXTXw9Qx/+TCjox&#xA;wIEKIOSSR3hDSIaUJBtcwOIPAEw0AxOjqZLeD9fg2IFRTcG4QQcJMERAB5YdoVAyNXQQzlOo8IgE&#xA;KjUg2UF+SJjQWREASOTREBfsmMwMJ+T3Y0nE7DaZKjMQE400RESjzwVq+gikkEQeoQ00bA4BpZRU&#xA;JnHlEl0yBCaVdwoBQDFE3HnCQjW4ZUSTDQlEmxAXnBCcoB30OCZuxAhR6BBZLpSMko8SQwikCfT4&#xA;FgQu0PeNSRSkJdwMLTD4g4QUUqichRjuJZM7Ow0W2GCEwWCdTzbYgWJkknjKIj8MTbQlEgb6IMBS&#xA;M4rnTwc1OvoDZ1IJcCMACZCWbUfc9lP/5BDlhustElatC6qjAETlbn+kbepVB5hNQoS9Pni2VCbg&#xA;snUjSGcGzK5XbTnxJxL1MvyubODi25qrmRkxXj/TYvzNUUP4J4RshdQoCQHAbVujvEaOJLELLtQg&#xA;nHC3YvABBrlmUMGFGFagVwU2SRfiYH4Ry8EDEdxwAxzLruiDsz5sKiQBICcBMJCqtKetfz5sVDBb&#xA;+vQrlUcbg02E2FKxXIRVApAKMdr9OBqbvlINlDWor+p597f+4WfxKn/C/Y3at7WWBACCq+ItxQOO&#xA;zLVnZX/TsX+QiQzbf0JU61UO20SedZ9FxKoWaUVtQIDM5RhgQAA2Y+D6BBMqV+HOv+b0/4CGHRI7&#xA;gAwgaLddY2w0nRRZG1gZdZtKQPANb994y3YCO36T7bdtY4PK4Cl+U4MJGyBT2ng5YFzkQTkQAsB6&#xA;WifholdU34j+Qya4Ok0H6wU8kDDpnkyQNMsLYTxTmUOT
 p6oHjXj9bSpOy4z50NcE9kyNakJ4X/Hk&#xA;FzLM8a0sFcxaavIGDfacYIKTwsoMTFAJE/QrBymqH0Yc9yIcSY57+fMXs14lPifsJmaxEcAfyKC6&#xA;AKzOAK+b0IRgR6Hn/Ow5fdFQYbCTHRl0SB4v+E4ahNesC0KEMg5JQNuUQD4h9KsGW8vYEACWPiT0&#xA;aysxEqB4yJa1aazPcEJYij6WkpsieP+MPZYBQPOIsJSqVcyO++Gj4iKIwB+s511FOOMBUZMDqshR&#xA;kC1UAteUocdBDqGPGTwe1KrIQoUJAWBPE0K7rNW5EB7hf6HcZCozWZFRllFzlTiIANz4sCakxQWj&#xA;ZEtRINDDH66Oda/DGex2pYAKPcdntfPQhoQFghc4MwIRAN0WqBhK4sEIlA1LwlK2YpWNBOiNXStC&#xA;pea0TVVKM0DlvGBmipEwTx4OlF4hw//KmEAUqtII9HHNKLNFEtaA8Qf9ys84g5TOTr6LMyYphiKX&#xA;MMlC7C17krDn5SL5x06GRHND6FfVEjgtQ/0oOGJLVONY6cVAXlIVlkGnSZ+QFlSYTBX/H/hAAGaq&#xA;ug+oznXAJGIGlhO7XSFTLzAYzIZusjsV+M4wKiCRFPFwqBYBqn8uNGmAJqrJMbwUjlNdWwjzOcPH&#xA;bWYGV+3aVCta0SFwVaREuWAO/geASvrgn5kLq2dIlkDKMcGBUzvKWBvHOAxadAgVJVmARhcbtHKS&#xA;pFQFy1kDdFYp7IY3d5RETFXny14aYAI4G6IQh7grC/1lAHz5S1CxowIP7W4EEdBACVjwiPoJiT0Q&#xA;rc9fDTm2dGY1jJPDKtfg6IRKaXEqe/VrWYXQ2JNKAgLtOgpJTvA/yNTvZAVNrFZ365oj1BK3RQis&#xA;BcvaV04KdlK9YU9IATvS2dJ1sVtd/2kT6iWCFpxDZjm41ksFIFMf1tSHNnUdB
 jCrX83utAIw+NVP&#xA;FRBUeNRkMLxrgAQk0AAZ8I47JUhWIsL6DWwEyK0+IAQ4M0XcQHYxCYz1MJnYGackQAB0KgwuJ4er&#xA;H94O4ZDo+YG9ZjBKWmplGsWlK/lIXGJJqje2HdUuRUfa3VR+92RjLIllysris5xXxEg264+XECsR&#xA;yKwGVs5BlLR8LdLElKaVxYB99QvMIT7nARcCKlGHmhMmqkAGweIJB0bggQVoQAP4yAceUOkfkAUI&#xA;lV2VaIs9CS5VAZkIZwWXNLmoGjt1RtFEGOWWWFxc/5UkrWMgCmYk+uEOu5iukKbCdf/Jqwp9SDqT&#xA;juLudhunUex2skhMLq90B71RDFckxC5uggtEIIIUOEhmM5DZCVplgJheVaaVBTNlgbnfzg7TQkFz&#xA;h15yBw/DEEsGI3jBgnlnHe048wULUNoNAKA0F6wBYI3MyGm6uiXEqbHTADXpUmoAHDZG2dPuXArK&#xA;sqsZEEf0IUMwYf8KmkbeUlqNRMCwJLKlcHfCe6GzheQqxNRvH+da4pApuDtf1YoLgPJvIako+rAR&#xA;sXtjz9J+VWc4Qd5Vv7X80FK+uBI2UAtez2AGvWbQDLpBIdcV+wPznWyxKXtfyhJxOZmdQIBlkuYH&#xA;FBi0teuBDHznxMGQlhe987a2F1z/gjRgGJEGlCX0fos5VMLPVZB5Hv2kxW5ES5U9SVp7JI/guT9Z&#xA;ZUhkJyWpDyvKR3fAUfAsEjzDYXYQrpSudRVA3ME6dySMOrarANJpthFZIq9auBzD2JZOCMPRJPxV&#xA;xcvWWTQuAOihHeb4rm4SXGCcFhin1yRIQApwABEU8JRCmP35sZG97GVjdkLMZs5zZveXCjxALww4&#xA;DGllQNRq+4WJc/addhyc7RLsQMJgsAqVMAzGurvzB/Nd6XMl1/aYfz+XXqkj5EnjmfFnLT0s/po7&#
 xA;NeeDbWiOnuH/tAUjzTX1/031L5ZD6UF/RGF5Q5Zy7qdvQ0CA1lJedxRx4eUV08NR/24nc0jgEBdQ&#xA;CwmwAitAHHWxG8fnM7eXAayzOkBHOl9mX6ujXxPgQ2K2U7JjZu2AZhhSNIQRWjRhgzgBA24mA083&#xA;Z80EYazVBV+EBKAEALI0GltEBBEIDpVmAiazhLj2fd+SOAiyBCbAeGyxcxpjMqyQXbKWaYUUVfcG&#xA;Ix8jTqNBABeQY/uXKFZoaF0xZeLhhaqCfgmgagfId/VTGQGSS20zXO7WDxGHIx6zhKg3aACIEjgw&#xA;B7PAgcexAilACCXQDsznKzGYAWKGAT8XGymogjalOjpVAZg1AT9VIQ6gE4PhM6J1O813YPBgfNIx&#xA;AIaBHdohAeBmASVwZ2/wFALxd/+g04s3oj6WMhD+BwUQ0IvEKAWfggQf9XdwyARZQhAm8IxRAIxa&#xA;cIwYUYxX0Iwn8IyocD9d0CW+uATfGCZNII7JyATdsD9mAAEUsBstoAOZ8grm+ALwwHwz8TPKQYI4&#xA;VVMn6GUpWFP95YKmWAGZpTPF1yuwqCGoeIPIl3zzAA8jkm0LtmAjMAIVgAIRsFRocFv88ZEgGZJx&#xA;QAEkSZIkQALuaAI6YBkgQA/3OINLpwBkZlkB8I8AOVk4ZV9HF3zIBwMwuBxGxHR/0QNp9jM2sYPX&#xA;4TsTYEwK8AAeYAEWUAAu8Atl4JEieZVYmZVlIAIXQAE4QglCEJHUEZFDVUzAZ1n/PzRTH8A19PVl&#xA;xZZ0LogBRalTpoghzsF0z+YrQ1lg2CEDrNNTFGmLTpR8MPACYWCVWpmYirmYUnABlUABM+CVP1AC&#xA;BnaPgyEY7VABMRAD9qWCKlhsNbmWXPNl/VhTu8JfOfOTRSmKmbUcGGI7xAIDcYkzI+A7C9l8MgAM&#xA;XhAUEMSYvvmbwJ
 k8TAgqEfBm1XaZqbiZndl7y2ZfMhVTuxVTKShEwec6Q/RsLdhfeQk0zVcBKug6&#xA;PDgiRTmU2DYCShOc6Jme6qkbQxArO1Cb2EEdHqKZMQA7maiJzIafNUVZzymao/kBE/CJQ0dmOgVm&#xA;YnZ0FlI77vCZAVBgDJCXexGY/xW5AAsQAYwxhOuZoRq6oU4gOi+gHSCAHU/HgzHAM8zhXzO5gjhF&#xA;ZqFJYVkjnfjFbAL6S9apK0hUAUSnOg76eztlLNnhO7Y4As/3oy/gAQVwpEeaBsJACks6c9TIoVSQ&#xA;J1cppY4AAC6wABJQmw2QVBwgi9jBF76iFzqFokRUoM3ZortlLdLplkUHRM2mHEDFoKE1AHGpMzsB&#xA;fRwAYEYzAliKAH6KAAcAlRpQABqwaFiQCtZQjFR6BsGWPBkGpV1AhR+pPMHICG2lAVhqkQ2AHTHQ&#xA;AO8AWgnZWSJ4e0VZgr4ko8aWpuwBozUpRLvymQaAgwIql81XbTh4j7VZkQsWlf8HcABIagEasDRf&#xA;gKhNQKyOl4hfoEeIFGn0BKlYIKn8oUWk8Fg3kKna1gAooB1ENZ9GhI97sSt+8aBCxIJCVKBqmaqq&#xA;ClMxFaBgFgB3WUxENwGxCA/Ch3xS96O1uAAW0Ku8yq9RWQDCygXGugQDaxbIupvNWgSG6KxZAK2v&#xA;sbCjYKV3dgMLtnUF9nQD5qA/pbGn6QA6c4kk2EPUOVOhaZPp2pZLya6gyIp/8Wx5ATRyhh0jYAGA&#xA;2q+Buq+92qsa0AWp4HHWslFEIBGrkAz4ZC3JsKwEYCkTUT5J0JtK8AdKYCV9Ej/TED8pAlf/AhmN&#xA;YigEwDJU6z9bEhxSwC9EkYj/yOCzpfckG/RWlQoN9tJIx5ouTEstmAGWU5AuAmC3R5C0F7AQweiz&#xA;b1UDQFsEUvsMjwUBLACVC4AAIdql1FE
 TxZeKxyS5R/StymGi5Xq5KlimJFuyJquq67ozMHAzQqSn&#xA;xAICi+urOKu6vYoAUImkAGuoT5AKf5gKy2o69lNdqTAkAHcbI2RCs+R4HYUSj2o1WMuEPmAZUWEZ&#xA;WnYENWBPLmJPVvK3yftJ1QtQx9sENDYM5QKAtPsQqTC439Io3RNfT6JD3COt1vVWJgC88BIw3aND&#xA;U9C98StoXTEUQgEWEIC+P1IUSiAzr9FWLnADJbAAH9oAvfOlokUsrHiUsvgr/0v3U8iUoK55ia/z&#xA;qr7nOjZ1rmsKnWmKssZ3O6j7p6nLrwVgwjnbq0fqATt7qPV3SdnLLJKErD5QNcrjvcsaafaLJdd7&#xA;BGmrR3k7MqqXCoHwW63ALUjww9YiegfLBOHzvtsAVkxgJXUEVtsAOjW8gMXbJu4UCYRjYu7kIjmc&#xA;GXBoxWY1vHjzxaXQVrfUARZQsQvWAB7SuHn6FzKAHbIoWjOYmcdUfHrBKz51mmSWWbDKoxmwwZ4r&#xA;nWElAB5QZxT6rwVAs35aAIDauhawACd8AAvgARhaFatEtHS3SgY7w2eDxk6QTfCSsGOkDFAoEXxT&#xA;qS5yRRJBFadjhKzcFu0RCf9tCyj0kxqmPLBUfATRKBRVxUcT6CeQEQm54Q3s5LD+FjYxDBuJmLZn&#xA;DGKqXA3vmBaDGsl++gJENQJxDALBMnXTRzTVVnxDWW3HFJSl6LG6ohwM+pOH3ENE9Jk3s5QdXGce&#xA;IBQksc+PrK+UjACL67pQ6acWcAUDC8oaI8pdQcOeodDV+MJJALX+ZkiAkLxInMSZUn8JgEIQmz0W&#xA;rUcCcc1KkBVaxi2/vErKbARQWBRzUcwh08TSTF65UTYyrS12ZMrO/H0QnUjiyx+7cUMaAKgvsBM9&#xA;ENASEJEDsHVJjZx5zGZPh4/uMAAaIsHD9xwzGgC94gDO+ar6
 9aZIp18Djcn/R2oBjtzIC0AAaL3J&#xA;Aw2VFtDJY/vJKU3KyHw20cwENXDM4rRyTxI14iJjc3HXCyG2LlLYfb0Bfy24jRoF3uAoPQ3SAbfF&#xA;l8Q5zlJHWXxXyQzTK+LC+vDYQqxNG+XZP+AiT8oV77gbLDCoC9CSKlDJCCCfAV3Ux5nHsy2LBsay&#xA;n4oTOBiuMwEY+fmuOcFfd/kAhvyuoihEI3DCR9q6mRzQCBDJBUAAl1xnUbkAVpDQc13X2u1CAOhU&#xA;h60EC0EjqRFXcEstOuQWikfSRaE1ElHepdIn2P2+RCDFo1zZzkvSMU3TxJvDRSAMfeIiRaJHAOjM&#xA;NeByiGPK4c2YotNSO7AY/0i6ABEJApXckpVJ2zlRHSLafE9H1eHqir0trkLE28E9IaHVA3WpisnH&#xA;M8qxAL6aya7LrzlLs4FaszR70FUQ30fgDVRhaNcSCIb2Vq0AAfGFxaaMFPiNyupx2ZXkjZJQCeWi&#xA;1/Ot5Mf1vnVkJVSBhLKlLSkFrTmQA61wJnUUCWBptdaV2XWUGm7Rt3WUCuqXGhAh5C5X30cgGm2j&#xA;Rf7rw/yNlSXJxifGxgCAAiCAbZR8AC9wHVx6NMFCHQyQdcyn27pTYLdjzvGg4g4QZ7J4uYqesd15&#xA;fHqR3C8O44Ha3JLMqxZgbjcu102bcgFHEqrXgESxy1nOR8gqEbLrDeFQ4P9LoHhc4gN5butjdM1s&#xA;foGq0NEpjUlzThJto9lxZUr5bd9GcD4cF8rqBwD08dfHqgR92xCmg8a0rqFt9e0n1lKpjakfCgJa&#xA;+mZ9MRggsGAggJt0nHwGFmcFRpRnZunIdBi6zbLWRg+8/QD7uroyDt0q7NZvLZloACdw2FTHeii7&#xA;zASRQI0NwR/+TbBPAyeG6t0O3wla0FSymzwYnwXUbEdQ7u3ffrj3AE0lYKE7EAFO5
 GA7oQKYnNRE&#xA;1QPOxGByjOFdCgPXUcc00bjTN4M7zwEywJ1UnWDTF2ce8Nw4G8kxbmcawAJp0fF34MxPsNh93fAi&#xA;WbAM240wUi65QakMewT/Xnm4LVX2JxYCgG7umOwBTrQTD/ACbywBT5dtINo7SR0sDCChjd4DWQei&#xA;Ptgh2FbzI4DvAwDzsFsA+npnZQ8ABs8IVO8EvYsEXQKcWu+sHjTnNx32RHDafG72bRUC0ITyJVAA&#xA;IxAsPRCYTO2DNfH2+moBIzAPDOABTA1NLtBSbXUDtb8BEeBMJTDAuO/5pLComi8FTTr83zIMxg8G&#xA;JUmSQU32ZR8CTvT2ADDuuYiLTx8C1sfn91ACrHJnGlD7JV/y4e7nts/4yX/+6J/+W8D5fd7+th/1&#xA;2i/+nW/+SVCS6n//+J//V2D/oQMEFMqPWDQekUnlktl0PqFR6ZRatV6xB1ntltv1OoMAO4==&#xA;&quot;)"/>EOG
+            <fo:external-graphic src="url(&quot;data:image/gif;base64,R0lGODlhGQIzANUAAOzs608OWhkWGfQCMURERLGfR1oNffPcXOS3UnZ3d8cIRpFoN94EOPROPq4K&#xA;UbQHKuDg4K1qaPB4RmsJP/T09IkJMpmCPMvMzHsMbJcLXrClfru7u/glOIiIiGtNJTUHQbAuMMyk&#xA;qXWAhY4uKpyprrKIeaqqqpmZmZE3V4mcpswiK7TDyc3FtoaVndfW0bJNOaMEJsEbdZ0UJmVmZ5+z&#xA;vVNWWN3Ly7ywmoGOlTMzM8XW272dmu7U2MMCKQAAAP///yH5BAAAAAAALAAAAAAZAjMAAAb/wJ9w&#xA;SCwaj8ikcslsOp/QqHRKrVqv2Kx2y+16v+Dw7yQum8/otHrNbrvf8OdFFK/b7/i8fs/P5xIAUisX&#xA;PyYkfYiJiouMjY5lGz4+M4FOLi0mPykkGwB0j6ChoqOkpWgQHZI+BBBNJiuHLScJOIdDITs/ESMg&#xA;uhE8pRAbw8TDhCcEBKZRwsbLQs0brc/UTtGEXsWVYhAnqqvYSSc0OD84HSKc0CMMDBUDAw8y8A8l&#xA;ADs7242p36rK/FxMdBg4cA+/VWpQzUhGYEaHDVdOCOgHsRoTghgzTkt0UJmXbxXLCJuoKkdIIxda&#xA;0ECHI4WIiigUuGvXowcDeAxg9BjAAUSE/0fICOSQJCBZgh8At5BUtfFOx1M1+vXrQOUgyB8EVFG1&#xA;WESq1JN9nk6JpMrI1TMQIMzoJ4CMEQrpWiSYQSPdDxsOFCio0A5GOwY9HsAb0APGg8IqXpRYbC8R&#xA;2a1C+G0YKiBT5KE+TDYh+w2yU39nLiz1inDK0qIEBEDMKskz1x+kz3IEPfabWVVgxQCAIJqtCH0d&#xA;arQUkYCECDIRHDiYkHeCXgWB2xEW
 jFOGCg4cGjR4EWFHCD6PiVglGmjtKpLhkpj/JkCP2DKj/wxk&#xA;XToKZwH6sGp9TSQ27kXv2WcbHml5w1YN01CwQg0tpDCDg2SgkEEGzDlQQV57/ZXTXw9Qx/+TCjox&#xA;wIEKIOSSR3hDSIaUJBtcwOIPAEw0AxOjqZLeD9fg2IFRTcG4QQcJMERAB5YdoVAyNXQQzlOo8IgE&#xA;KjUg2UF+SJjQWREASOTREBfsmMwMJ+T3Y0nE7DaZKjMQE400RESjzwVq+gikkEQeoQ00bA4BpZRU&#xA;JnHlEl0yBCaVdwoBQDFE3HnCQjW4ZUSTDQlEmxAXnBCcoB30OCZuxAhR6BBZLpSMko8SQwikCfT4&#xA;FgQu0PeNSRSkJdwMLTD4g4QUUqichRjuJZM7Ow0W2GCEwWCdTzbYgWJkknjKIj8MTbQlEgb6IMBS&#xA;M4rnTwc1OvoDZ1IJcCMACZCWbUfc9lP/5BDlhustElatC6qjAETlbn+kbepVB5hNQoS9Pni2VCbg&#xA;snUjSGcGzK5XbTnxJxL1MvyubODi25qrmRkxXj/TYvzNUUP4J4RshdQoCQHAbVujvEaOJLELLtQg&#xA;nHC3YvABBrlmUMGFGFagVwU2SRfiYH4Ry8EDEdxwAxzLruiDsz5sKiQBICcBMJCqtKetfz5sVDBb&#xA;+vQrlUcbg02E2FKxXIRVApAKMdr9OBqbvlINlDWor+p597f+4WfxKn/C/Y3at7WWBACCq+ItxQOO&#xA;zLVnZX/TsX+QiQzbf0JU61UO20SedZ9FxKoWaUVtQIDM5RhgQAA2Y+D6BBMqV+HOv+b0/4CGHRI7&#xA;gAwgaLddY2w0nRRZG1gZdZtKQPANb994y3YCO36T7bdtY4PK4Cl+U4MJGyBT2ng5YFzkQTkQAsB6&#xA;WifholdU34j+Qya4Ok0H6wU8kDDpnkyQNMsLYTxTmUOTp
 6oHjXj9bSpOy4z50NcE9kyNakJ4X/Hk&#xA;FzLM8a0sFcxaavIGDfacYIKTwsoMTFAJE/QrBymqH0Yc9yIcSY57+fMXs14lPifsJmaxEcAfyKC6&#xA;AKzOAK+b0IRgR6Hn/Ow5fdFQYbCTHRl0SB4v+E4ahNesC0KEMg5JQNuUQD4h9KsGW8vYEACWPiT0&#xA;aysxEqB4yJa1aazPcEJYij6WkpsieP+MPZYBQPOIsJSqVcyO++Gj4iKIwB+s511FOOMBUZMDqshR&#xA;kC1UAteUocdBDqGPGTwe1KrIQoUJAWBPE0K7rNW5EB7hf6HcZCozWZFRllFzlTiIANz4sCakxQWj&#xA;ZEtRINDDH66Oda/DGex2pYAKPcdntfPQhoQFghc4MwIRAN0WqBhK4sEIlA1LwlK2YpWNBOiNXStC&#xA;pea0TVVKM0DlvGBmipEwTx4OlF4hw//KmEAUqtII9HHNKLNFEtaA8Qf9ys84g5TOTr6LMyYphiKX&#xA;MMlC7C17krDn5SL5x06GRHND6FfVEjgtQ/0oOGJLVONY6cVAXlIVlkGnSZ+QFlSYTBX/H/hAAGaq&#xA;ug+oznXAJGIGlhO7XSFTLzAYzIZusjsV+M4wKiCRFPFwqBYBqn8uNGmAJqrJMbwUjlNdWwjzOcPH&#xA;bWYGV+3aVCta0SFwVaREuWAO/geASvrgn5kLq2dIlkDKMcGBUzvKWBvHOAxadAgVJVmARhcbtHKS&#xA;pFQFy1kDdFYp7IY3d5RETFXny14aYAI4G6IQh7grC/1lAHz5S1CxowIP7W4EEdBACVjwiPoJiT0Q&#xA;rc9fDTm2dGY1jJPDKtfg6IRKaXEqe/VrWYXQ2JNKAgLtOgpJTvA/yNTvZAVNrFZ365oj1BK3RQis&#xA;BcvaV04KdlK9YU9IATvS2dJ1sVtd/2kT6iWCFpxDZjm41ksFIFMf1tSHNnUdBj
 CrX83utAIw+NVP&#xA;FRBUeNRkMLxrgAQk0AAZ8I47JUhWIsL6DWwEyK0+IAQ4M0XcQHYxCYz1MJnYGackQAB0KgwuJ4er&#xA;H94O4ZDo+YG9ZjBKWmplGsWlK/lIXGJJqje2HdUuRUfa3VR+92RjLIllysris5xXxEg264+XECsR&#xA;yKwGVs5BlLR8LdLElKaVxYB99QvMIT7nARcCKlGHmhMmqkAGweIJB0bggQVoQAP4yAceUOkfkAUI&#xA;lV2VaIs9CS5VAZkIZwWXNLmoGjt1RtFEGOWWWFxc/5UkrWMgCmYk+uEOu5iukKbCdf/Jqwp9SDqT&#xA;juLudhunUex2skhMLq90B71RDFckxC5uggtEIIIUOEhmM5DZCVplgJheVaaVBTNlgbnfzg7TQkFz&#xA;h15yBw/DEEsGI3jBgnlnHe048wULUNoNAKA0F6wBYI3MyGm6uiXEqbHTADXpUmoAHDZG2dPuXArK&#xA;sqsZEEf0IUMwYf8KmkbeUlqNRMCwJLKlcHfCe6GzheQqxNRvH+da4pApuDtf1YoLgPJvIako+rAR&#xA;sXtjz9J+VWc4Qd5Vv7X80FK+uBI2UAtez2AGvWbQDLpBIdcV+wPznWyxKXtfyhJxOZmdQIBlkuYH&#xA;FBi0teuBDHznxMGQlhe987a2F1z/gjRgGJEGlCX0fos5VMLPVZB5Hv2kxW5ES5U9SVp7JI/guT9Z&#xA;ZUhkJyWpDyvKR3fAUfAsEjzDYXYQrpSudRVA3ME6dySMOrarANJpthFZIq9auBzD2JZOCMPRJPxV&#xA;xcvWWTQuAOihHeb4rm4SXGCcFhin1yRIQApwABEU8JRCmP35sZG97GVjdkLMZs5zZveXCjxALww4&#xA;DGllQNRq+4WJc/addhyc7RLsQMJgsAqVMAzGurvzB/Nd6XMl1/aYfz+XXqkj5EnjmfFnLT0s/po7&#x
 A;NeeDbWiOnuH/tAUjzTX1/031L5ZD6UF/RGF5Q5Zy7qdvQ0CA1lJedxRx4eUV08NR/24nc0jgEBdQ&#xA;CwmwAitAHHWxG8fnM7eXAayzOkBHOl9mX6ujXxPgQ2K2U7JjZu2AZhhSNIQRWjRhgzgBA24mA083&#xA;Z80EYazVBV+EBKAEALI0GltEBBEIDpVmAiazhLj2fd+SOAiyBCbAeGyxcxpjMqyQXbKWaYUUVfcG&#xA;Ix8jTqNBABeQY/uXKFZoaF0xZeLhhaqCfgmgagfId/VTGQGSS20zXO7WDxGHIx6zhKg3aACIEjgw&#xA;B7PAgcexAilACCXQDsznKzGYAWKGAT8XGymogjalOjpVAZg1AT9VIQ6gE4PhM6J1O813YPBgfNIx&#xA;AIaBHdohAeBmASVwZ2/wFALxd/+g04s3oj6WMhD+BwUQ0IvEKAWfggQf9XdwyARZQhAm8IxRAIxa&#xA;cIwYUYxX0Iwn8IyocD9d0CW+uATfGCZNII7JyATdsD9mAAEUsBstoAOZ8grm+ALwwHwz8TPKQYI4&#xA;VVMn6GUpWFP95YKmWAGZpTPF1yuwqCGoeIPIl3zzAA8jkm0LtmAjMAIVgAIRsFRocFv88ZEgGZJx&#xA;QAEkSZIkQALuaAI6YBkgQA/3OINLpwBkZlkB8I8AOVk4ZV9HF3zIBwMwuBxGxHR/0QNp9jM2sYPX&#xA;4TsTYEwK8AAeYAEWUAAu8Atl4JEieZVYmZVlIAIXQAE4QglCEJHUEZFDVUzAZ1n/PzRTH8A19PVl&#xA;xZZ0LogBRalTpoghzsF0z+YrQ1lg2CEDrNNTFGmLTpR8MPACYWCVWpmYirmYUnABlUABM+CVP1AC&#xA;BnaPgyEY7VABMRAD9qWCKlhsNbmWXPNl/VhTu8JfOfOTRSmKmbUcGGI7xAIDcYkzI+A7C9l8MgAM&#xA;XhAUEMSYvvmbwJk
 8TAgqEfBm1XaZqbiZndl7y2ZfMhVTuxVTKShEwec6Q/RsLdhfeQk0zVcBKug6&#xA;PDgiRTmU2DYCShOc6Jme6qkbQxArO1Cb2EEdHqKZMQA7maiJzIafNUVZzymao/kBE/CJQ0dmOgVm&#xA;YnZ0FlI77vCZAVBgDJCXexGY/xW5AAsQAYwxhOuZoRq6oU4gOi+gHSCAHU/HgzHAM8zhXzO5gjhF&#xA;ZqFJYVkjnfjFbAL6S9apK0hUAUSnOg76eztlLNnhO7Y4As/3oy/gAQVwpEeaBsJACks6c9TIoVSQ&#xA;J1cppY4AAC6wABJQmw2QVBwgi9jBF76iFzqFokRUoM3ZortlLdLplkUHRM2mHEDFoKE1AHGpMzsB&#xA;fRwAYEYzAliKAH6KAAcAlRpQABqwaFiQCtZQjFR6BsGWPBkGpV1AhR+pPMHICG2lAVhqkQ2AHTHQ&#xA;AO8AWgnZWSJ4e0VZgr4ko8aWpuwBozUpRLvymQaAgwIql81XbTh4j7VZkQsWlf8HcABIagEasDRf&#xA;gKhNQKyOl4hfoEeIFGn0BKlYIKn8oUWk8Fg3kKna1gAooB1ENZ9GhI97sSt+8aBCxIJCVKBqmaqq&#xA;ClMxFaBgFgB3WUxENwGxCA/Ch3xS96O1uAAW0Ku8yq9RWQDCygXGugQDaxbIupvNWgSG6KxZAK2v&#xA;sbCjYKV3dgMLtnUF9nQD5qA/pbGn6QA6c4kk2EPUOVOhaZPp2pZLya6gyIp/8Wx5ATRyhh0jYAGA&#xA;2q+Buq+92qsa0AWp4HHWslFEIBGrkAz4ZC3JsKwEYCkTUT5J0JtK8AdKYCV9Ej/TED8pAlf/AhmN&#xA;YigEwDJU6z9bEhxSwC9EkYj/yOCzpfckG/RWlQoN9tJIx5ouTEstmAGWU5AuAmC3R5C0F7AQweiz&#xA;b1UDQFsEUvsMjwUBLACVC4AAIdql1FET
 xZeKxyS5R/StymGi5Xq5KlimJFuyJquq67ozMHAzQqSn&#xA;xAICi+urOKu6vYoAUImkAGuoT5AKf5gKy2o69lNdqTAkAHcbI2RCs+R4HYUSj2o1WMuEPmAZUWEZ&#xA;WnYENWBPLmJPVvK3yftJ1QtQx9sENDYM5QKAtPsQqTC439Io3RNfT6JD3COt1vVWJgC88BIw3aND&#xA;U9C98StoXTEUQgEWEIC+P1IUSiAzr9FWLnADJbAAH9oAvfOlokUsrHiUsvgr/0v3U8iUoK55ia/z&#xA;qr7nOjZ1rmsKnWmKssZ3O6j7p6nLrwVgwjnbq0fqATt7qPV3SdnLLJKErD5QNcrjvcsaafaLJdd7&#xA;BGmrR3k7MqqXCoHwW63ALUjww9YiegfLBOHzvtsAVkxgJXUEVtsAOjW8gMXbJu4UCYRjYu7kIjmc&#xA;GXBoxWY1vHjzxaXQVrfUARZQsQvWAB7SuHn6FzKAHbIoWjOYmcdUfHrBKz51mmSWWbDKoxmwwZ4r&#xA;nWElAB5QZxT6rwVAs35aAIDauhawACd8AAvgARhaFatEtHS3SgY7w2eDxk6QTfCSsGOkDFAoEXxT&#xA;qS5yRRJBFadjhKzcFu0RCf9tCyj0kxqmPLBUfATRKBRVxUcT6CeQEQm54Q3s5LD+FjYxDBuJmLZn&#xA;DGKqXA3vmBaDGsl++gJENQJxDALBMnXTRzTVVnxDWW3HFJSl6LG6ohwM+pOH3ENE9Jk3s5QdXGce&#xA;IBQksc+PrK+UjACL67pQ6acWcAUDC8oaI8pdQcOeodDV+MJJALX+ZkiAkLxInMSZUn8JgEIQmz0W&#xA;rUcCcc1KkBVaxi2/vErKbARQWBRzUcwh08TSTF65UTYyrS12ZMrO/H0QnUjiyx+7cUMaAKgvsBM9&#xA;ENASEJEDsHVJjZx5zGZPh4/uMAAaIsHD9xwzGgC94gDO+ar69
 aZIp18Djcn/R2oBjtzIC0AAaL3J&#xA;Aw2VFtDJY/vJKU3KyHw20cwENXDM4rRyTxI14iJjc3HXCyG2LlLYfb0Bfy24jRoF3uAoPQ3SAbfF&#xA;l8Q5zlJHWXxXyQzTK+LC+vDYQqxNG+XZP+AiT8oV77gbLDCoC9CSKlDJCCCfAV3Ux5nHsy2LBsay&#xA;n4oTOBiuMwEY+fmuOcFfd/kAhvyuoihEI3DCR9q6mRzQCBDJBUAAl1xnUbkAVpDQc13X2u1CAOhU&#xA;h60EC0EjqRFXcEstOuQWikfSRaE1ElHepdIn2P2+RCDFo1zZzkvSMU3TxJvDRSAMfeIiRaJHAOjM&#xA;NeByiGPK4c2YotNSO7AY/0i6ABEJApXckpVJ2zlRHSLafE9H1eHqir0trkLE28E9IaHVA3WpisnH&#xA;M8qxAL6aya7LrzlLs4FaszR70FUQ30fgDVRhaNcSCIb2Vq0AAfGFxaaMFPiNyupx2ZXkjZJQCeWi&#xA;1/Ot5Mf1vnVkJVSBhLKlLSkFrTmQA61wJnUUCWBptdaV2XWUGm7Rt3WUCuqXGhAh5C5X30cgGm2j&#xA;Rf7rw/yNlSXJxifGxgCAAiCAbZR8AC9wHVx6NMFCHQyQdcyn27pTYLdjzvGg4g4QZ7J4uYqesd15&#xA;fHqR3C8O44Ha3JLMqxZgbjcu102bcgFHEqrXgESxy1nOR8gqEbLrDeFQ4P9LoHhc4gN5butjdM1s&#xA;foGq0NEpjUlzThJto9lxZUr5bd9GcD4cF8rqBwD08dfHqgR92xCmg8a0rqFt9e0n1lKpjakfCgJa&#xA;+mZ9MRggsGAggJt0nHwGFmcFRpRnZunIdBi6zbLWRg+8/QD7uroyDt0q7NZvLZloACdw2FTHeii7&#xA;zASRQI0NwR/+TbBPAyeG6t0O3wla0FSymzwYnwXUbEdQ7u3ffrj3AE0lYKE7EAFO5G
 A7oQKYnNRE&#xA;1QPOxGByjOFdCgPXUcc00bjTN4M7zwEywJ1UnWDTF2ce8Nw4G8kxbmcawAJp0fF34MxPsNh93fAi&#xA;WbAM240wUi65QakMewT/Xnm4LVX2JxYCgG7umOwBTrQTD/ACbywBT5dtINo7SR0sDCChjd4DWQei&#xA;Ptgh2FbzI4DvAwDzsFsA+npnZQ8ABs8IVO8EvYsEXQKcWu+sHjTnNx32RHDafG72bRUC0ITyJVAA&#xA;IxAsPRCYTO2DNfH2+moBIzAPDOABTA1NLtBSbXUDtb8BEeBMJTDAuO/5pLComi8FTTr83zIMxg8G&#xA;JUmSQU32ZR8CTvT2ADDuuYiLTx8C1sfn91ACrHJnGlD7JV/y4e7nts/4yX/+6J/+W8D5fd7+th/1&#xA;2i/+nW/+SVCS6n//+J//V2D/oQMEFMqPWDQekUnlktl0PqFR6ZRatV6xB1ntltv1OoMAO4==&#xA;&quot;)"/>EOG
           </fo:block>
           <fo:block>EOF</fo:block>
         </fo:flow>

Modified: xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_size_1.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_size_1.xml?rev=1400689&r1=1400688&r2=1400689&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_size_1.xml (original)
+++ xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_size_1.xml Sun Oct 21 18:05:50 2012
@@ -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"

Modified: xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_size_2.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_size_2.xml?rev=1400689&r1=1400688&r2=1400689&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_size_2.xml (original)
+++ xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_size_2.xml Sun Oct 21 18:05:50 2012
@@ -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"

Modified: xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_src_uri.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_src_uri.xml?rev=1400689&r1=1400688&r2=1400689&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_src_uri.xml (original)
+++ xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_src_uri.xml Sun Oct 21 18:05:50 2012
@@ -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>

Modified: xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_svg.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_svg.xml?rev=1400689&r1=1400688&r2=1400689&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_svg.xml (original)
+++ xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_svg.xml Sun Oct 21 18:05:50 2012
@@ -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>

Modified: xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_svgz.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_svgz.xml?rev=1400689&r1=1400688&r2=1400689&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_svgz.xml (original)
+++ xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_svgz.xml Sun Oct 21 18:05:50 2012
@@ -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>

Modified: xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_tiff.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_tiff.xml?rev=1400689&r1=1400688&r2=1400689&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_tiff.xml (original)
+++ xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_tiff.xml Sun Oct 21 18:05:50 2012
@@ -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>

Modified: xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_wmf.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_wmf.xml?rev=1400689&r1=1400688&r2=1400689&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_wmf.xml (original)
+++ xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/external-graphic_wmf.xml Sun Oct 21 18:05:50 2012
@@ -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>

Modified: xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/flow_changing-ipd_image.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/flow_changing-ipd_image.xml?rev=1400689&r1=1400688&r2=1400689&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/flow_changing-ipd_image.xml (original)
+++ xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/flow_changing-ipd_image.xml Sun Oct 21 18:05:50 2012
@@ -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>

Modified: xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/fox_external-document_1.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/fox_external-document_1.xml?rev=1400689&r1=1400688&r2=1400689&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/fox_external-document_1.xml (original)
+++ xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/fox_external-document_1.xml Sun Oct 21 18:05:50 2012
@@ -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>

Modified: xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/fox_external-document_2.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/fox_external-document_2.xml?rev=1400689&r1=1400688&r2=1400689&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/fox_external-document_2.xml (original)
+++ xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/fox_external-document_2.xml Sun Oct 21 18:05:50 2012
@@ -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>

Modified: xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/fox_external-document_3.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/fox_external-document_3.xml?rev=1400689&r1=1400688&r2=1400689&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/fox_external-document_3.xml (original)
+++ xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/fox_external-document_3.xml Sun Oct 21 18:05:50 2012
@@ -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>

Modified: xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/inline-level_id.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/inline-level_id.xml?rev=1400689&r1=1400688&r2=1400689&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/inline-level_id.xml (original)
+++ xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/inline-level_id.xml Sun Oct 21 18:05:50 2012
@@ -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>

Modified: xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/inline_background-image.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/inline_background-image.xml?rev=1400689&r1=1400688&r2=1400689&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/inline_background-image.xml (original)
+++ xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/inline_background-image.xml Sun Oct 21 18:05:50 2012
@@ -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>

Modified: xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/inline_block_nested_bug36248.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/inline_block_nested_bug36248.xml?rev=1400689&r1=1400688&r2=1400689&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/inline_block_nested_bug36248.xml (original)
+++ xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/inline_block_nested_bug36248.xml Sun Oct 21 18:05:50 2012
@@ -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">

Modified: xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/inline_vertical-align_2.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/inline_vertical-align_2.xml?rev=1400689&r1=1400688&r2=1400689&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/inline_vertical-align_2.xml (original)
+++ xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/inline_vertical-align_2.xml Sun Oct 21 18:05:50 2012
@@ -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>

Modified: xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/list-block_background-image.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/list-block_background-image.xml?rev=1400689&r1=1400688&r2=1400689&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/list-block_background-image.xml (original)
+++ xmlgraphics/fop/branches/fop-1_1/test/layoutengine/standard-testcases/list-block_background-image.xml Sun Oct 21 18:05:50 2012
@@ -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>



---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org


Mime
View raw message