Jeremias, Re - this and all the related other svn updates.
Unfortunately we are duplicating work here. I had done virtually the same already, that is added checks to the test cases and modified the various layout managers to delay creating the backgrounds until the bpd was known. This is not an efficient way of doing things if me and you work on exactly the same thing at the same time. How can we improve that? Manuel On Mon, 29 Aug 2005 08:03 pm, [EMAIL PROTECTED] wrote: > Author: jeremias > Date: Mon Aug 29 05:03:27 2005 > New Revision: 264120 > > URL: http://svn.apache.org/viewcvs?rev=264120&view=rev > Log: > Background trait's toString() streamlined. Test cases adjusted > accordingly. Test cases without checks will fail from now on!!! > Checks for certain test cases and the others are added to the > disabled list. > > Modified: > xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Trait.java > (contents, props changed) > xmlgraphics/fop/trunk/test/java/org/apache/fop/layoutengine/LayoutEng >ineTester.java > xmlgraphics/fop/trunk/test/layoutengine/disabled-testcases.txt > xmlgraphics/fop/trunk/test/layoutengine/testcases/background-image1.x >ml > xmlgraphics/fop/trunk/test/layoutengine/testcases/background-image2.x >ml > xmlgraphics/fop/trunk/test/layoutengine/testcases/background-image3.x >ml > xmlgraphics/fop/trunk/test/layoutengine/testcases/external-graphic3.x >ml xmlgraphics/fop/trunk/test/layoutengine/testcases/ifo3.xml > xmlgraphics/fop/trunk/test/layoutengine/testcases/indent2.xml > xmlgraphics/fop/trunk/test/layoutengine/testcases/inline-block1.xml > xmlgraphics/fop/trunk/test/layoutengine/testcases/page-master4.xml > xmlgraphics/fop/trunk/test/layoutengine/testcases/table-border-separa >te3.xml > xmlgraphics/fop/trunk/test/layoutengine/testcases/table-cell1.xml > xmlgraphics/fop/trunk/test/layoutengine/testcases/table-hf1.xml > xmlgraphics/fop/trunk/test/layoutengine/testcases/table-row1.xml > xmlgraphics/fop/trunk/test/layoutengine/testcases/table1.xml > xmlgraphics/fop/trunk/test/layoutengine/testcases/table2.xml > > Modified: > xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Trait.java URL: > http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apac >he/fop/area/Trait.java?rev=264120&r1=264119&r2=264120&view=diff > ===================================================================== >========= --- > xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Trait.java > (original) +++ > xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Trait.java Mon Aug > 29 05:03:27 2005 @@ -14,11 +14,12 @@ > * limitations under the License. > */ > > -/* $Id: Trait.java,v 1.4 2004/02/27 17:41:26 jeremias Exp $ */ > +/* $Id$ */ > > package org.apache.fop.area; > > import org.apache.fop.datatypes.ColorType; > +import org.apache.fop.fo.Constants; > import org.apache.fop.image.FopImage; > import org.apache.fop.traits.BorderProps; > > @@ -540,14 +541,29 @@ > */ > public String toString() { > StringBuffer sb = new StringBuffer(); > - sb.append("color=" + color); > + sb.append("color=").append(color); > if (url != null) { > - sb.append(",url="); > - sb.append(url); > + sb.append(",url=").append(url); > + sb.append(",repeat="); > + switch (repeat) { > + case Constants.EN_REPEAT: > + sb.append("repeat"); > + break; > + case Constants.EN_REPEATX: > + sb.append("repeat-x"); > + break; > + case Constants.EN_REPEATY: > + sb.append("repeat-y"); > + break; > + case Constants.EN_NOREPEAT: > + sb.append("no-repeat"); > + break; > + default: > + sb.append("ILLEGAL!"); > + } > + sb.append(",horiz=").append(horiz); > + sb.append(",vertical=").append(vertical); > } > - sb.append(",repeat=" + repeat); > - sb.append(",horiz=" + horiz); > - sb.append(",vertical=" + vertical); > return sb.toString(); > } > > > Propchange: > xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Trait.java > --------------------------------------------------------------------- >--------- svn:keywords = Id > > Modified: > xmlgraphics/fop/trunk/test/java/org/apache/fop/layoutengine/LayoutEng >ineTester.java URL: > http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/test/java/org/apa >che/fop/layoutengine/LayoutEngineTester.java?rev=264120&r1=264119&r2=2 >64120&view=diff > ===================================================================== >========= --- > xmlgraphics/fop/trunk/test/java/org/apache/fop/layoutengine/LayoutEng >ineTester.java (original) +++ > xmlgraphics/fop/trunk/test/java/org/apache/fop/layoutengine/LayoutEng >ineTester.java Mon Aug 29 05:03:27 2005 @@ -189,6 +189,9 @@ > } > } > > + if (checks.size() == 0) { > + throw new RuntimeException("No checks are available!"); > + } > Iterator i = checks.iterator(); > while (i.hasNext()) { > LayoutEngineCheck check = (LayoutEngineCheck)i.next(); > > Modified: > xmlgraphics/fop/trunk/test/layoutengine/disabled-testcases.txt URL: > http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/test/layoutengine >/disabled-testcases.txt?rev=264120&r1=264119&r2=264120&view=diff > ===================================================================== >========= --- > xmlgraphics/fop/trunk/test/layoutengine/disabled-testcases.txt > (original) +++ > xmlgraphics/fop/trunk/test/layoutengine/disabled-testcases.txt Mon > Aug 29 05:03:27 2005 @@ -1,11 +1,26 @@ > +background-image-list1.xml > +background-image-list2.xml > +background-image-table2.xml > +background-image-table3.xml > +background-image-table4.xml > +background-image-table5.xml > +background-image3.xml > +background-image5.xml > +background-image6.xml > +background-image7.xml > block-container4a.xml > external-graphic1.xml > external-graphic2.xml > inline-block2.xml > +inline-container1.xml > keep-with-previous2.xml > keep-with-previous3.xml > keep-with-previous4.xml > keep-with-previous5.xml > +leader-dots.xml > +leader-rule.xml > +leader-space.xml > +letter-spacing3.xml > list4a.xml > multi-column3.xml > multi-column4.xml > @@ -13,8 +28,13 @@ > page-number3.xml > page-number-citation2.xml > page-number-citation3.xml > +space-block2.xml > table-border-collapse1.xml > table-border-collapse2.xml > table-border-separate1.xml > table-column4.xml > table-fixed2.xml > +word-spacing1.xml > +word-spacing2.xml > +word-spacing3.xml > +word-spacing4.xml > > Modified: > xmlgraphics/fop/trunk/test/layoutengine/testcases/background-image1.x >ml URL: > http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/test/layoutengine >/testcases/background-image1.xml?rev=264120&r1=264119&r2=264120&view=d >iff > ===================================================================== >========= --- > xmlgraphics/fop/trunk/test/layoutengine/testcases/background-image1.x >ml (original) +++ > xmlgraphics/fop/trunk/test/layoutengine/testcases/background-image1.x >ml Mon Aug 29 05:03:27 2005 @@ -59,5 +59,12 @@ > </fo:root> > </fo> > <checks> > + <eval expected="color=#0000ff" > xpath="//flow/block[1]/@background"/> + <eval > expected="color=#0000ff,url=../../resources/images/bgimg300dpi.jpg,re >peat=no-repeat,horiz=0,vertical=0" > xpath="//flow/block[2]/@background"/> + <eval > expected="color=#0000ff,url=../../resources/images/bgimg300dpi.jpg,re >peat=no-repeat,horiz=0,vertical=0" > xpath="//flow/block[3]/@background"/> + <eval > expected="color=#0000ff,url=../../resources/images/bgimg300dpi.jpg,re >peat=no-repeat,horiz=31960,vertical=6960" > xpath="//flow/block[4]/@background"/> + <eval > expected="color=#0000ff,url=../../resources/images/bgimg300dpi.jpg,re >peat=no-repeat,horiz=63920,vertical=13920" > xpath="//flow/block[5]/@background"/> + <eval > expected="color=#0000ff,url=../../resources/images/bgimg300dpi.jpg,re >peat=no-repeat,horiz=5000,vertical=5000" > xpath="//flow/block[6]/@background"/> + <eval > expected="color=#0000ff,url=../../resources/images/bgimg300dpi.jpg,re >peat=no-repeat,horiz=12784,vertical=6960" > xpath="//flow/block[7]/@background"/> </checks> > </testcase> > > Modified: > xmlgraphics/fop/trunk/test/layoutengine/testcases/background-image2.x >ml URL: > http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/test/layoutengine >/testcases/background-image2.xml?rev=264120&r1=264119&r2=264120&view=d >iff > ===================================================================== >========= --- > xmlgraphics/fop/trunk/test/layoutengine/testcases/background-image2.x >ml (original) +++ > xmlgraphics/fop/trunk/test/layoutengine/testcases/background-image2.x >ml Mon Aug 29 05:03:27 2005 @@ -56,5 +56,11 @@ > </fo:root> > </fo> > <checks> > + <eval > expected="color=#0000ff,url=../../resources/images/bgimg300dpi.jpg,re >peat=repeat-x,horiz=0,vertical=0" > xpath="//flow/block[1]/@background"/> + <eval > expected="color=#0000ff,url=../../resources/images/bgimg300dpi.jpg,re >peat=repeat-y,horiz=0,vertical=0" > xpath="//flow/block[2]/@background"/> + <eval > expected="color=#0000ff,url=../../resources/images/bgimg300dpi.jpg,re >peat=repeat,horiz=0,vertical=0" xpath="//flow/block[3]/@background"/> > + <eval > expected="color=#0000ff,url=../../resources/images/bgimg300dpi.jpg,re >peat=no-repeat,horiz=0,vertical=0" > xpath="//flow/block[4]/@background"/> + <eval > expected="color=#0000ff,url=../../resources/images/bgimg300dpi.jpg,re >peat=repeat-x,horiz=0,vertical=10440" > xpath="//flow/block[5]/@background"/> + <eval > expected="color=#0000ff,url=../../resources/images/bgimg300dpi.jpg,re >peat=repeat-y,horiz=47940,vertical=0" > xpath="//flow/block[6]/@background"/> </checks> > </testcase> > > Modified: > xmlgraphics/fop/trunk/test/layoutengine/testcases/background-image3.x >ml URL: > http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/test/layoutengine >/testcases/background-image3.xml?rev=264120&r1=264119&r2=264120&view=d >iff > ===================================================================== >========= --- > xmlgraphics/fop/trunk/test/layoutengine/testcases/background-image3.x >ml (original) +++ > xmlgraphics/fop/trunk/test/layoutengine/testcases/background-image3.x >ml Mon Aug 29 05:03:27 2005 @@ -44,5 +44,7 @@ > </fo:root> > </fo> > <checks> > + <eval expected="color=#ffff00" > xpath="//flow/block[1]/@background"/> + <eval > expected="color=null,url=../../resources/images/bgimg300dpi.jpg,repea >t=no-repeat,horiz=136960,vertical=-8640" > xpath="//flow/block[1]/block[1]/block[1]/@background"/> </checks> > </testcase> > > Modified: > xmlgraphics/fop/trunk/test/layoutengine/testcases/external-graphic3.x >ml URL: > http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/test/layoutengine >/testcases/external-graphic3.xml?rev=264120&r1=264119&r2=264120&view=d >iff > ===================================================================== >========= --- > xmlgraphics/fop/trunk/test/layoutengine/testcases/external-graphic3.x >ml (original) +++ > xmlgraphics/fop/trunk/test/layoutengine/testcases/external-graphic3.x >ml Mon Aug 29 05:03:27 2005 @@ -40,7 +40,7 @@ > </fo> > <checks> > <eval expected="10000 10000 10000 10000" > xpath="//flow/block[1]/lineArea/viewport/@bap"/> - <eval > expected="color=#ffffff,repeat=0,horiz=0,vertical=0" > xpath="//flow/block[1]/lineArea/viewport/@background"/> + <eval > expected="color=#ffffff" > xpath="//flow/block[1]/lineArea/viewport/@background"/> <eval > expected="(solid,#000000,5000)" > xpath="//flow/block[1]/lineArea/viewport/@border-before"/> <eval > expected="(solid,#000000,5000)" > xpath="//flow/block[1]/lineArea/viewport/@border-after"/> <eval > expected="(solid,#000000,5000)" > xpath="//flow/block[1]/lineArea/viewport/@border-start"/> > > Modified: xmlgraphics/fop/trunk/test/layoutengine/testcases/ifo3.xml > URL: > http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/test/layoutengine >/testcases/ifo3.xml?rev=264120&r1=264119&r2=264120&view=diff > ===================================================================== >========= --- > xmlgraphics/fop/trunk/test/layoutengine/testcases/ifo3.xml (original) > +++ xmlgraphics/fop/trunk/test/layoutengine/testcases/ifo3.xml Mon > Aug 29 05:03:27 2005 @@ -46,7 +46,7 @@ > </fo> > <checks> > <eval expected="10000 10000 10000 10000" > xpath="//flow/block[1]/lineArea/viewport/@bap"/> - <eval > expected="color=#ffffff,repeat=0,horiz=0,vertical=0" > xpath="//flow/block[1]/lineArea/viewport/@background"/> + <eval > expected="color=#ffffff" > xpath="//flow/block[1]/lineArea/viewport/@background"/> <eval > expected="(solid,#000000,5000)" > xpath="//flow/block[1]/lineArea/viewport/@border-before"/> <eval > expected="(solid,#000000,5000)" > xpath="//flow/block[1]/lineArea/viewport/@border-after"/> <eval > expected="(solid,#000000,5000)" > xpath="//flow/block[1]/lineArea/viewport/@border-start"/> > > Modified: > xmlgraphics/fop/trunk/test/layoutengine/testcases/indent2.xml URL: > http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/test/layoutengine >/testcases/indent2.xml?rev=264120&r1=264119&r2=264120&view=diff > ===================================================================== >========= --- > xmlgraphics/fop/trunk/test/layoutengine/testcases/indent2.xml > (original) +++ > xmlgraphics/fop/trunk/test/layoutengine/testcases/indent2.xml Mon Aug > 29 05:03:27 2005 @@ -61,5 +61,16 @@ > </fo:root> > </fo> > <checks> > + <eval expected="20000" > xpath="//flow/block[1]/lineArea[1]/@start-indent"/> + <true > xpath="boolean(not(//flow/block[1]/lineArea[2]/@start-indent))"/> + > <true > xpath="boolean(not(//flow/block[1]/lineArea[10]/@start-indent))"/> + > <eval expected="20000" > xpath="//flow/block[2]/lineArea[1]/@start-indent"/> + <true > xpath="boolean(not(//flow/block[2]/lineArea[2]/@start-indent))"/> + > <true > xpath="boolean(not(//flow/block[2]/lineArea[10]/@start-indent))"/> + > + <eval expected="20000" > xpath="//flow/block[3]/child::*[1]/@start-indent"/> + <eval > expected="20000" > xpath="//flow/block[3]/child::*[2]/lineArea[1]/@start-indent"/> + > <eval expected="20000" > xpath="//flow/block[3]/child::*[3]/@start-indent"/> + <true > xpath="boolean(not(//flow/block[3]/child::*[4]/@start-indent))"/> > </checks> > </testcase> > > Modified: > xmlgraphics/fop/trunk/test/layoutengine/testcases/inline-block1.xml > URL: > http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/test/layoutengine >/testcases/inline-block1.xml?rev=264120&r1=264119&r2=264120&view=diff > ===================================================================== >========= --- > xmlgraphics/fop/trunk/test/layoutengine/testcases/inline-block1.xml > (original) +++ > xmlgraphics/fop/trunk/test/layoutengine/testcases/inline-block1.xml > Mon Aug 29 05:03:27 2005 @@ -71,19 +71,19 @@ > <true > xpath="not(boolean(//flow/block/lineArea[1]/child::*[1]/@background)) >"/> > > <true > xpath="boolean(//flow/block/lineArea[2]/inlineparent[1])"/> - > <eval expected="color=#d3d3d3,repeat=0,horiz=0,vertical=0" > xpath="//flow/block/lineArea[2]/child::*[1]/@background"/> + <eval > expected="color=#d3d3d3" > xpath="//flow/block/lineArea[2]/child::*[1]/@background"/> > > <true > xpath="boolean(//flow/block/lineArea[3]/inlineblockparent[1])"/> - > <eval expected="color=#d3d3d3,repeat=0,horiz=0,vertical=0" > xpath="//flow/block/lineArea[3]/child::*[1]/@background"/> + <eval > expected="color=#d3d3d3" > xpath="//flow/block/lineArea[3]/child::*[1]/@background"/> <true > xpath="not(boolean(//flow/block/lineArea[3]/inlineblockparent[1]/bloc >k/@background))"/> > > <true > xpath="boolean(//flow/block/lineArea[4]/inlineblockparent[1])"/> - > <eval expected="color=#d3d3d3,repeat=0,horiz=0,vertical=0" > xpath="//flow/block/lineArea[4]/child::*[1]/@background"/> + <eval > expected="color=#d3d3d3" > xpath="//flow/block/lineArea[4]/child::*[1]/@background"/> <true > xpath="not(boolean(//flow/block/lineArea[4]/inlineblockparent[1]/bloc >k/@background))"/> > > <eval expected="inlineparent" > xpath="local-name(//flow/block/lineArea[5]/child::*[1])"/> <eval > expected="text" > xpath="local-name(//flow/block/lineArea[5]/child::*[2])"/> - <eval > expected="color=#d3d3d3,repeat=0,horiz=0,vertical=0" > xpath="//flow/block/lineArea[5]/child::*[1]/@background"/> + <eval > expected="color=#d3d3d3" > xpath="//flow/block/lineArea[5]/child::*[1]/@background"/> > > <true > xpath="not(boolean(//flow/block/lineArea[6]/child::*[1]/@background)) >"/> > > > Modified: > xmlgraphics/fop/trunk/test/layoutengine/testcases/page-master4.xml > URL: > http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/test/layoutengine >/testcases/page-master4.xml?rev=264120&r1=264119&r2=264120&view=diff > ===================================================================== >========= --- > xmlgraphics/fop/trunk/test/layoutengine/testcases/page-master4.xml > (original) +++ > xmlgraphics/fop/trunk/test/layoutengine/testcases/page-master4.xml > Mon Aug 29 05:03:27 2005 @@ -64,25 +64,25 @@ > > <eval expected="20000" xpath="//regionBefore/@bpda"/> > <eval expected="300000" xpath="//regionBefore/@ipda"/> > - <eval expected="color=#ffcccc,repeat=0,horiz=0,vertical=0" > xpath="//regionBefore/../@background"/> + <eval > expected="color=#ffcccc" xpath="//regionBefore/../@background"/> > > <eval expected="20000" xpath="//regionAfter/@bpda"/> > <eval expected="340000" xpath="//regionAfter/@ipda"/> > <!-- 360pt due to precendence --> > - <eval expected="color=#cccccc,repeat=0,horiz=0,vertical=0" > xpath="//regionAfter/../@background"/> + <eval > expected="color=#cccccc" xpath="//regionAfter/../@background"/> > > <eval expected="320000" xpath="//regionStart/@bpda"/> > <eval expected="20000" xpath="//regionStart/@ipda"/> > - <eval expected="color=#ccffcc,repeat=0,horiz=0,vertical=0" > xpath="//regionStart/../@background"/> + <eval > expected="color=#ccffcc" xpath="//regionStart/../@background"/> > > <eval expected="20000" xpath="//regionEnd/@bpda"/> > <eval expected="320000" xpath="//regionEnd/@ipda"/> > <!-- bpd and ipd flipped due to reference-orientation --> > - <eval expected="color=#ccccff,repeat=0,horiz=0,vertical=0" > xpath="//regionEnd/../@background"/> + <eval > expected="color=#ccccff" xpath="//regionEnd/../@background"/> > > <eval expected="280000" xpath="//regionBody/@bpda"/> > <eval expected="280000" xpath="//regionBody/@ipda"/> > - <eval expected="color=#ffffcc,repeat=0,horiz=0,vertical=0" > xpath="//regionBody/../@background"/> + <eval > expected="color=#ffffcc" xpath="//regionBody/../@background"/> > > </checks> > </testcase> > > Modified: > xmlgraphics/fop/trunk/test/layoutengine/testcases/table-border-separa >te3.xml URL: > http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/test/layoutengine >/testcases/table-border-separate3.xml?rev=264120&r1=264119&r2=264120&v >iew=diff > ===================================================================== >========= --- > xmlgraphics/fop/trunk/test/layoutengine/testcases/table-border-separa >te3.xml (original) +++ > xmlgraphics/fop/trunk/test/layoutengine/testcases/table-border-separa >te3.xml Mon Aug 29 05:03:27 2005 @@ -65,11 +65,11 @@ > </fo:root> > </fo> > <checks> > - <eval expected="color=#ffff00,repeat=0,horiz=0,vertical=0" > xpath="//flow/block[1]/block[1]/@background"/> + <eval > expected="color=#ffff00" > xpath="//flow/block[1]/block[1]/@background"/> <eval expected="5000 > 5000 5000 5000" xpath="//flow/block[1]/block[1]/@bap"/> <eval > expected="cell2" xpath="//flow/block[1]/block[2]/block[1]/lineArea"/> > > - <eval expected="color=#ffff00,repeat=0,horiz=0,vertical=0" > xpath="//flow/block[1]/block[3]/@background"/> + <eval > expected="color=#ffff00" > xpath="//flow/block[1]/block[3]/@background"/> <eval expected="5000 > 5000 5000 5000" xpath="//flow/block[1]/block[3]/@bap"/> <eval > expected="cell4" xpath="//flow/block[1]/block[4]/block[1]/lineArea"/> > > > Modified: > xmlgraphics/fop/trunk/test/layoutengine/testcases/table-cell1.xml > URL: > http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/test/layoutengine >/testcases/table-cell1.xml?rev=264120&r1=264119&r2=264120&view=diff > ===================================================================== >========= --- > xmlgraphics/fop/trunk/test/layoutengine/testcases/table-cell1.xml > (original) +++ > xmlgraphics/fop/trunk/test/layoutengine/testcases/table-cell1.xml Mon > Aug 29 05:03:27 2005 @@ -128,14 +128,14 @@ > <eval expected="14400" > xpath="//flow/block[1]/block[2]/block[1]/@bpd"/> > > <!-- cell 4: height="20pt" --> > - <eval expected="color=#ffff00,repeat=0,horiz=0,vertical=0" > xpath="//flow/block[1]/block[4]/@background"/> + <eval > expected="color=#ffff00" > xpath="//flow/block[1]/block[4]/@background"/> <eval > expected="216000" xpath="//flow/block[1]/block[4]/@ipd"/> <eval > expected="20000" xpath="//flow/block[1]/block[4]/@bpd"/> <eval > expected="216000" xpath="//flow/block[1]/block[4]/block[1]/@ipd"/> > <eval expected="14400" > xpath="//flow/block[1]/block[4]/block[1]/@bpd"/> > > <!-- cell 6: block-progression-dimension="20pt" --> > - <eval expected="color=#ffa500,repeat=0,horiz=0,vertical=0" > xpath="//flow/block[1]/block[6]/@background"/> + <eval > expected="color=#ffa500" > xpath="//flow/block[1]/block[6]/@background"/> <eval > expected="216000" xpath="//flow/block[1]/block[6]/@ipd"/> <eval > expected="20000" xpath="//flow/block[1]/block[6]/@bpd"/> <eval > expected="216000" xpath="//flow/block[1]/block[6]/block[1]/@ipd"/> > > Modified: > xmlgraphics/fop/trunk/test/layoutengine/testcases/table-hf1.xml URL: > http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/test/layoutengine >/testcases/table-hf1.xml?rev=264120&r1=264119&r2=264120&view=diff > ===================================================================== >========= --- > xmlgraphics/fop/trunk/test/layoutengine/testcases/table-hf1.xml > (original) +++ > xmlgraphics/fop/trunk/test/layoutengine/testcases/table-hf1.xml Mon > Aug 29 05:03:27 2005 @@ -80,7 +80,7 @@ > <eval expected="57600" xpath="//flow/block[1]/@bpda"/> > > <!-- header row background --> > - <eval expected="color=#ffff00,repeat=0,horiz=0,vertical=0" > xpath="//flow/block[1]/block[1]/@background"/> + <eval > expected="color=#ffff00" > xpath="//flow/block[1]/block[1]/@background"/> <eval > expected="360000" xpath="//flow/block[1]/block[1]/@ipda"/> <eval > expected="14400" xpath="//flow/block[1]/block[1]/@bpda"/> > > @@ -97,7 +97,7 @@ > <eval expected="cell4" > xpath="//flow/block[1]/block[7]/block[1]/lineArea"/> > > <!-- footer row background --> > - <eval expected="color=#ffa500,repeat=0,horiz=0,vertical=0" > xpath="//flow/block[1]/block[8]/@background"/> + <eval > expected="color=#ffa500" > xpath="//flow/block[1]/block[8]/@background"/> <eval > expected="360000" xpath="//flow/block[1]/block[8]/@ipda"/> <eval > expected="14400" xpath="//flow/block[1]/block[8]/@bpda"/> > > > Modified: > xmlgraphics/fop/trunk/test/layoutengine/testcases/table-row1.xml URL: > http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/test/layoutengine >/testcases/table-row1.xml?rev=264120&r1=264119&r2=264120&view=diff > ===================================================================== >========= --- > xmlgraphics/fop/trunk/test/layoutengine/testcases/table-row1.xml > (original) +++ > xmlgraphics/fop/trunk/test/layoutengine/testcases/table-row1.xml Mon > Aug 29 05:03:27 2005 @@ -82,7 +82,7 @@ > <!-- row 2 --> > <eval expected="360000" xpath="//flow/block[1]/block[3]/@ipd"/> > <eval expected="20000" xpath="//flow/block[1]/block[3]/@bpd"/> > <!-- background-area generated for the row --> - <eval > expected="color=#ffff00,repeat=0,horiz=0,vertical=0" > xpath="//flow/block[1]/block[3]/@background"/> + <eval > expected="color=#ffff00" > xpath="//flow/block[1]/block[3]/@background"/> <eval > expected="144000" xpath="//flow/block[1]/block[4]/@ipd"/> <eval > expected="20000" xpath="//flow/block[1]/block[4]/@bpd"/> <eval > expected="216000" xpath="//flow/block[1]/block[5]/@ipd"/> @@ -91,7 > +91,7 @@ > <!-- row 3 --> > <eval expected="360000" xpath="//flow/block[1]/block[6]/@ipd"/> > <eval expected="20000" xpath="//flow/block[1]/block[6]/@bpd"/> > <!-- background-area generated for the row --> - <eval > expected="color=#ffa500,repeat=0,horiz=0,vertical=0" > xpath="//flow/block[1]/block[6]/@background"/> + <eval > expected="color=#ffa500" > xpath="//flow/block[1]/block[6]/@background"/> <eval > expected="144000" xpath="//flow/block[1]/block[7]/@ipd"/> <eval > expected="20000" xpath="//flow/block[1]/block[7]/@bpd"/> <eval > expected="216000" xpath="//flow/block[1]/block[8]/@ipd"/> > > Modified: > xmlgraphics/fop/trunk/test/layoutengine/testcases/table1.xml URL: > http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/test/layoutengine >/testcases/table1.xml?rev=264120&r1=264119&r2=264120&view=diff > ===================================================================== >========= --- > xmlgraphics/fop/trunk/test/layoutengine/testcases/table1.xml > (original) +++ > xmlgraphics/fop/trunk/test/layoutengine/testcases/table1.xml Mon Aug > 29 05:03:27 2005 @@ -80,7 +80,7 @@ > <eval expected="216000" > xpath="//flow/block[1]/block[2]/block[1]/@ipd"/> <eval > expected="14400" xpath="//flow/block[1]/block[2]/block[1]/@bpd"/> > <eval expected="cell2" > xpath="//flow/block[1]/block[2]/block[1]/lineArea"/> - <eval > expected="color=#ffff00,repeat=0,horiz=0,vertical=0" > xpath="//flow/block[1]/block[2]/@background"/> + <eval > expected="color=#ffff00" > xpath="//flow/block[1]/block[2]/@background"/> > > <!-- cell 3 --> > <true xpath="//flow/block[1]/block[3]/@is-reference-area"/> > @@ -91,7 +91,7 @@ > <eval expected="144000" > xpath="//flow/block[1]/block[3]/block[1]/@ipd"/> <eval > expected="14400" xpath="//flow/block[1]/block[3]/block[1]/@bpd"/> > <eval expected="cell3" > xpath="//flow/block[1]/block[3]/block[1]/lineArea"/> - <eval > expected="color=#ffa500,repeat=0,horiz=0,vertical=0" > xpath="//flow/block[1]/block[3]/@background"/> + <eval > expected="color=#ffa500" > xpath="//flow/block[1]/block[3]/@background"/> > > <!-- cell 4 --> > <true xpath="//flow/block[1]/block[4]/@is-reference-area"/> > > Modified: > xmlgraphics/fop/trunk/test/layoutengine/testcases/table2.xml URL: > http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/test/layoutengine >/testcases/table2.xml?rev=264120&r1=264119&r2=264120&view=diff > ===================================================================== >========= --- > xmlgraphics/fop/trunk/test/layoutengine/testcases/table2.xml > (original) +++ > xmlgraphics/fop/trunk/test/layoutengine/testcases/table2.xml Mon Aug > 29 05:03:27 2005 @@ -93,7 +93,7 @@ > <eval expected="144000" > xpath="//flow/block[3]/block[2]/block[1]/@ipd"/> <eval > expected="14400" xpath="//flow/block[3]/block[2]/block[1]/@bpd"/> > <eval expected="cell2" > xpath="//flow/block[3]/block[2]/block[1]/lineArea"/> - <eval > expected="color=#ffff00,repeat=0,horiz=0,vertical=0" > xpath="//flow/block[3]/block[2]/@background"/> + <eval > expected="color=#ffff00" > xpath="//flow/block[3]/block[2]/@background"/> > > <!-- cell 3 --> > <true xpath="//flow/block[3]/block[3]/@is-reference-area"/> > @@ -104,7 +104,7 @@ > <eval expected="144000" > xpath="//flow/block[3]/block[3]/block[1]/@ipd"/> <eval > expected="14400" xpath="//flow/block[3]/block[3]/block[1]/@bpd"/> > <eval expected="cell3" > xpath="//flow/block[3]/block[3]/block[1]/lineArea"/> - <eval > expected="color=#ffa500,repeat=0,horiz=0,vertical=0" > xpath="//flow/block[3]/block[3]/@background"/> + <eval > expected="color=#ffa500" > xpath="//flow/block[3]/block[3]/@background"/> > > <!-- cell 4 --> > <true xpath="//flow/block[3]/block[4]/@is-reference-area"/> > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: > [EMAIL PROTECTED] For additional > commands, e-mail: [EMAIL PROTECTED]
