You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by je...@apache.org on 2005/08/04 12:10:47 UTC
svn commit: r227338 [1/2] -
/xmlgraphics/fop/trunk/test/layoutengine/testcases/
Author: jeremias
Date: Thu Aug 4 03:10:14 2005
New Revision: 227338
URL: http://svn.apache.org/viewcvs?rev=227338&view=rev
Log:
Setting svn:eol-style and svn:keywords where necessary. Need to lookup why these are missing only on some.
Modified:
xmlgraphics/fop/trunk/test/layoutengine/testcases/external-graphic3.xml (contents, props changed)
xmlgraphics/fop/trunk/test/layoutengine/testcases/id1.xml (contents, props changed)
xmlgraphics/fop/trunk/test/layoutengine/testcases/id2.xml (contents, props changed)
xmlgraphics/fop/trunk/test/layoutengine/testcases/ifo1.xml (contents, props changed)
xmlgraphics/fop/trunk/test/layoutengine/testcases/ifo3.xml (contents, props changed)
xmlgraphics/fop/trunk/test/layoutengine/testcases/letter-spacing1.xml (contents, props changed)
xmlgraphics/fop/trunk/test/layoutengine/testcases/letter-spacing2.xml (contents, props changed)
xmlgraphics/fop/trunk/test/layoutengine/testcases/letter-spacing3.xml (contents, props changed)
xmlgraphics/fop/trunk/test/layoutengine/testcases/line-layout2.xml (contents, props changed)
xmlgraphics/fop/trunk/test/layoutengine/testcases/list4.xml (contents, props changed)
xmlgraphics/fop/trunk/test/layoutengine/testcases/list4a.xml (contents, props changed)
xmlgraphics/fop/trunk/test/layoutengine/testcases/multi-column1a.xml (contents, props changed)
xmlgraphics/fop/trunk/test/layoutengine/testcases/multi-column2a.xml (contents, props changed)
xmlgraphics/fop/trunk/test/layoutengine/testcases/multi-column3.xml (contents, props changed)
xmlgraphics/fop/trunk/test/layoutengine/testcases/page-number-citation2.xml (contents, props changed)
xmlgraphics/fop/trunk/test/layoutengine/testcases/page-number-citation3.xml (contents, props changed)
xmlgraphics/fop/trunk/test/layoutengine/testcases/table-body4.xml (contents, props changed)
xmlgraphics/fop/trunk/test/layoutengine/testcases/table-cell7.xml (contents, props changed)
xmlgraphics/fop/trunk/test/layoutengine/testcases/table-column4.xml (contents, props changed)
xmlgraphics/fop/trunk/test/layoutengine/testcases/word-spacing1.xml (contents, props changed)
xmlgraphics/fop/trunk/test/layoutengine/testcases/word-spacing2.xml (contents, props changed)
xmlgraphics/fop/trunk/test/layoutengine/testcases/word-spacing3.xml (contents, props changed)
xmlgraphics/fop/trunk/test/layoutengine/testcases/word-spacing4.xml (contents, props changed)
xmlgraphics/fop/trunk/test/layoutengine/testcases/wrapper1.xml (contents, props changed)
xmlgraphics/fop/trunk/test/layoutengine/testcases/wrapper2.xml (contents, props changed)
Modified: xmlgraphics/fop/trunk/test/layoutengine/testcases/external-graphic3.xml
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/test/layoutengine/testcases/external-graphic3.xml?rev=227338&r1=227337&r2=227338&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/testcases/external-graphic3.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/testcases/external-graphic3.xml Thu Aug 4 03:10:14 2005
@@ -1,53 +1,53 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2005 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<!-- $Id$ -->
-<testcase>
- <info>
- <p>
- This test checks borders and the like on external-graphics.
- </p>
- </info>
- <fo>
- <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
- <fo:layout-master-set>
- <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
- <fo:region-body/>
- </fo:simple-page-master>
- </fo:layout-master-set>
- <fo:page-sequence master-reference="normal" white-space-collapse="true">
- <fo:flow flow-name="xsl-region-body">
- <fo:block background-color="orange">
- <fo:external-graphic src="../../resources/images/bgimg300dpi.jpg" border="solid 5pt" padding="5pt" background-color="white"/>
- </fo:block>
- <fo:block>EOF</fo:block>
- </fo:flow>
- </fo:page-sequence>
- </fo:root>
- </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="(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"/>
- <eval expected="(solid,#000000,5000)" xpath="//flow/block[1]/lineArea/viewport/@border-end"/>
- <eval expected="5000" xpath="//flow/block[1]/lineArea/viewport/@padding-before"/>
- <eval expected="5000" xpath="//flow/block[1]/lineArea/viewport/@padding-after"/>
- <eval expected="5000" xpath="//flow/block[1]/lineArea/viewport/@padding-start"/>
- <eval expected="5000" xpath="//flow/block[1]/lineArea/viewport/@padding-end"/>
- </checks>
-</testcase>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2005 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!-- $Id$ -->
+<testcase>
+ <info>
+ <p>
+ This test checks borders and the like on external-graphics.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block background-color="orange">
+ <fo:external-graphic src="../../resources/images/bgimg300dpi.jpg" border="solid 5pt" padding="5pt" background-color="white"/>
+ </fo:block>
+ <fo:block>EOF</fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </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="(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"/>
+ <eval expected="(solid,#000000,5000)" xpath="//flow/block[1]/lineArea/viewport/@border-end"/>
+ <eval expected="5000" xpath="//flow/block[1]/lineArea/viewport/@padding-before"/>
+ <eval expected="5000" xpath="//flow/block[1]/lineArea/viewport/@padding-after"/>
+ <eval expected="5000" xpath="//flow/block[1]/lineArea/viewport/@padding-start"/>
+ <eval expected="5000" xpath="//flow/block[1]/lineArea/viewport/@padding-end"/>
+ </checks>
+</testcase>
Propchange: xmlgraphics/fop/trunk/test/layoutengine/testcases/external-graphic3.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/test/layoutengine/testcases/external-graphic3.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: xmlgraphics/fop/trunk/test/layoutengine/testcases/id1.xml
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/test/layoutengine/testcases/id1.xml?rev=227338&r1=227337&r2=227338&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/testcases/id1.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/testcases/id1.xml Thu Aug 4 03:10:14 2005
@@ -1,101 +1,101 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2005 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<!-- $Id$ -->
-<testcase>
- <info>
- <p>
- This test checks IDs on block-level FOs.
- </p>
- <p>
- TODO:
- Test table-and-caption and table-caption once implemented.
- </p>
- <p>
- Notes:
- The following FOs cannot be tested this way:
- table-body, table-header, table-footer, table-row,
- multi-switch, multi-case, multi-toggle, multi-properties, multi-property-set,
- page-sequence.
- </p>
- </info>
- <fo>
- <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
- <fo:layout-master-set>
- <fo:simple-page-master master-name="normal" page-width="5in" page-height="2in"
- margin="20pt">
- <fo:region-body background-color="yellow"/>
- </fo:simple-page-master>
- </fo:layout-master-set>
- <fo:page-sequence id="page-sequence1" master-reference="normal" white-space-collapse="true">
- <fo:flow flow-name="xsl-region-body">
- <fo:block id="block1">block1</fo:block>
- <fo:list-block id="list1" provisional-distance-between-starts="50pt" provisional-label-separation="5pt">
- <fo:list-item id="item1">
- <fo:list-item-label id="item1-label" end-indent="label-end()">
- <fo:block>â¢</fo:block>
- </fo:list-item-label>
- <fo:list-item-body id="item1-body" start-indent="body-start()">
- <fo:block>here is text in the list item body</fo:block>
- </fo:list-item-body>
- </fo:list-item>
- </fo:list-block>
- <fo:table id="table1" table-layout="fixed" border-collapse="separate">
- <fo:table-column column-width="100%"/>
- <fo:table-header id="table-header1">
- <fo:table-row>
- <fo:table-cell>
- <fo:block>header</fo:block>
- </fo:table-cell>
- </fo:table-row>
- </fo:table-header>
- <fo:table-footer id="table-footer1">
- <fo:table-row>
- <fo:table-cell>
- <fo:block>footer</fo:block>
- </fo:table-cell>
- </fo:table-row>
- </fo:table-footer>
- <fo:table-body id="table-body1">
- <fo:table-row id="table-row1">
- <fo:table-cell id="table-cell1">
- <fo:block>body-content</fo:block>
- </fo:table-cell>
- </fo:table-row>
- </fo:table-body>
- </fo:table>
- <fo:block-container id="block-container1">
- <fo:block>block-container-content</fo:block>
- </fo:block-container>
- </fo:flow>
- </fo:page-sequence>
- </fo:root>
- </fo>
- <checks>
- <eval expected="block1" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/@prod-id"/>
-
- <eval expected="list1" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/flow/block[2]/@prod-id"/>
- <eval expected="item1" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/flow/block[2]/block[1]/@prod-id"/>
- <eval expected="item1-label" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/flow/block[2]/block[1]/block[1]/@prod-id"/>
- <eval expected="item1-body" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/flow/block[2]/block[1]/block[2]/@prod-id"/>
-
- <eval expected="table1" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/flow/block[3]/@prod-id"/>
- <!-- table-header1, table-body1, table-footer1, table-row1 don't exist in the area tree and cannot be tested. -->
- <eval expected="table-cell1" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/flow/block[3]/block[2]/@prod-id"/>
-
- <eval expected="block-container1" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/flow/block[4]/@prod-id"/>
- </checks>
-</testcase>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2005 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!-- $Id$ -->
+<testcase>
+ <info>
+ <p>
+ This test checks IDs on block-level FOs.
+ </p>
+ <p>
+ TODO:
+ Test table-and-caption and table-caption once implemented.
+ </p>
+ <p>
+ Notes:
+ The following FOs cannot be tested this way:
+ table-body, table-header, table-footer, table-row,
+ multi-switch, multi-case, multi-toggle, multi-properties, multi-property-set,
+ page-sequence.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="2in"
+ margin="20pt">
+ <fo:region-body background-color="yellow"/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence id="page-sequence1" master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block id="block1">block1</fo:block>
+ <fo:list-block id="list1" provisional-distance-between-starts="50pt" provisional-label-separation="5pt">
+ <fo:list-item id="item1">
+ <fo:list-item-label id="item1-label" end-indent="label-end()">
+ <fo:block>â¢</fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body id="item1-body" start-indent="body-start()">
+ <fo:block>here is text in the list item body</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ </fo:list-block>
+ <fo:table id="table1" table-layout="fixed" border-collapse="separate">
+ <fo:table-column column-width="100%"/>
+ <fo:table-header id="table-header1">
+ <fo:table-row>
+ <fo:table-cell>
+ <fo:block>header</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-header>
+ <fo:table-footer id="table-footer1">
+ <fo:table-row>
+ <fo:table-cell>
+ <fo:block>footer</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-footer>
+ <fo:table-body id="table-body1">
+ <fo:table-row id="table-row1">
+ <fo:table-cell id="table-cell1">
+ <fo:block>body-content</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+ <fo:block-container id="block-container1">
+ <fo:block>block-container-content</fo:block>
+ </fo:block-container>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="block1" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/@prod-id"/>
+
+ <eval expected="list1" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/flow/block[2]/@prod-id"/>
+ <eval expected="item1" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/flow/block[2]/block[1]/@prod-id"/>
+ <eval expected="item1-label" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/flow/block[2]/block[1]/block[1]/@prod-id"/>
+ <eval expected="item1-body" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/flow/block[2]/block[1]/block[2]/@prod-id"/>
+
+ <eval expected="table1" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/flow/block[3]/@prod-id"/>
+ <!-- table-header1, table-body1, table-footer1, table-row1 don't exist in the area tree and cannot be tested. -->
+ <eval expected="table-cell1" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/flow/block[3]/block[2]/@prod-id"/>
+
+ <eval expected="block-container1" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/flow/block[4]/@prod-id"/>
+ </checks>
+</testcase>
Propchange: xmlgraphics/fop/trunk/test/layoutengine/testcases/id1.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/test/layoutengine/testcases/id1.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: xmlgraphics/fop/trunk/test/layoutengine/testcases/id2.xml
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/test/layoutengine/testcases/id2.xml?rev=227338&r1=227337&r2=227338&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/testcases/id2.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/testcases/id2.xml Thu Aug 4 03:10:14 2005
@@ -1,79 +1,79 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2005 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<!-- $Id$ -->
-<testcase>
- <info>
- <p>
- This test checks IDs on inline-level FOs.
- </p>
- <p>
- TODO:
- Test inline-container, bidi-override once implemented.
- </p>
- <p>
- Notes:
- The following FOs cannot be tested this way:
- wrapper, initial-property-set.
- </p>
- </info>
- <fo>
- <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
- <fo:layout-master-set>
- <fo:simple-page-master master-name="normal" page-width="5in" page-height="20in"
- margin="20pt">
- <fo:region-body background-color="yellow"/>
- </fo:simple-page-master>
- </fo:layout-master-set>
- <fo:page-sequence id="page-sequence1" master-reference="normal" white-space-collapse="true">
- <fo:flow flow-name="xsl-region-body">
- <fo:block>text<fo:inline id="inline1">inline</fo:inline>text</fo:block>
- <fo:block>text<fo:wrapper id="wrapper1">wrapper</fo:wrapper>text</fo:block>
- <fo:block>text<!--fo:inline-container id="inline-container1"><fo:block>inline-container</fo:block></fo:inline-container-->text</fo:block>
- <fo:block>text<fo:page-number id="page-number1"/>text</fo:block>
- <fo:block>text<fo:page-number-citation id="page-number-citation1" ref-id="inline1"/>text</fo:block>
- <fo:block>text<fo:leader id="leader1" leader-pattern="dots" leader-length="2cm"/>text</fo:block>
- <fo:block>text<fo:character id="char1" character="X"/>text</fo:block>
- <fo:block>text<!--fo:bidi-override id="bidi1" direction="ltr">bidi-override</fo:bidi-override-->text</fo:block>
- <fo:block>text<fo:basic-link id="link1" internal-destination="page-number1">link</fo:basic-link>text</fo:block>
- <fo:block>text<fo:instream-foreign-object id="ifo1" content-height="12pt">
- <svg:svg viewBox="0 0 20 20">
- <svg:g style="fill:red; stroke:#000000">
- <svg:rect x="0" y="0" width="15" height="15"/>
- <svg:rect x="5" y="5" width="15" height="15"/>
- </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:flow>
- </fo:page-sequence>
- </fo:root>
- </fo>
- <checks>
- <eval expected="inline1" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/lineArea/inlineparent/@prod-id"/>
- <!-- wrapper skipped -->
- <!--eval expected="inline-container1" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/flow/block[3]/lineArea/???/@prod-id"/-->
- <eval expected="page-number1" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/flow/block[4]/lineArea/text[2]/@prod-id"/>
- <eval expected="page-number-citation1" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/flow/block[5]/lineArea/text[2]/@prod-id"/>
- <eval expected="leader1" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/flow/block[6]/lineArea/inlineparent/@prod-id"/>
- <eval expected="char1" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/flow/block[7]/lineArea/char/@prod-id"/>
- <!--eval expected="bidi1" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/flow/block[8]/lineArea/???/@prod-id"/-->
- <eval expected="link1" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/flow/block[9]/lineArea/inlineparent/@prod-id"/>
- <eval expected="ifo1" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/flow/block[10]/lineArea/viewport/@prod-id"/>
- <eval expected="ifo1" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/flow/block[10]/lineArea/viewport/foreignObject/@prod-id"/>
- <eval expected="eg1" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/flow/block[11]/lineArea/viewport/@prod-id"/>
- </checks>
-</testcase>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2005 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!-- $Id$ -->
+<testcase>
+ <info>
+ <p>
+ This test checks IDs on inline-level FOs.
+ </p>
+ <p>
+ TODO:
+ Test inline-container, bidi-override once implemented.
+ </p>
+ <p>
+ Notes:
+ The following FOs cannot be tested this way:
+ wrapper, initial-property-set.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="20in"
+ margin="20pt">
+ <fo:region-body background-color="yellow"/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence id="page-sequence1" master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>text<fo:inline id="inline1">inline</fo:inline>text</fo:block>
+ <fo:block>text<fo:wrapper id="wrapper1">wrapper</fo:wrapper>text</fo:block>
+ <fo:block>text<!--fo:inline-container id="inline-container1"><fo:block>inline-container</fo:block></fo:inline-container-->text</fo:block>
+ <fo:block>text<fo:page-number id="page-number1"/>text</fo:block>
+ <fo:block>text<fo:page-number-citation id="page-number-citation1" ref-id="inline1"/>text</fo:block>
+ <fo:block>text<fo:leader id="leader1" leader-pattern="dots" leader-length="2cm"/>text</fo:block>
+ <fo:block>text<fo:character id="char1" character="X"/>text</fo:block>
+ <fo:block>text<!--fo:bidi-override id="bidi1" direction="ltr">bidi-override</fo:bidi-override-->text</fo:block>
+ <fo:block>text<fo:basic-link id="link1" internal-destination="page-number1">link</fo:basic-link>text</fo:block>
+ <fo:block>text<fo:instream-foreign-object id="ifo1" content-height="12pt">
+ <svg:svg viewBox="0 0 20 20">
+ <svg:g style="fill:red; stroke:#000000">
+ <svg:rect x="0" y="0" width="15" height="15"/>
+ <svg:rect x="5" y="5" width="15" height="15"/>
+ </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:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="inline1" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/lineArea/inlineparent/@prod-id"/>
+ <!-- wrapper skipped -->
+ <!--eval expected="inline-container1" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/flow/block[3]/lineArea/???/@prod-id"/-->
+ <eval expected="page-number1" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/flow/block[4]/lineArea/text[2]/@prod-id"/>
+ <eval expected="page-number-citation1" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/flow/block[5]/lineArea/text[2]/@prod-id"/>
+ <eval expected="leader1" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/flow/block[6]/lineArea/inlineparent/@prod-id"/>
+ <eval expected="char1" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/flow/block[7]/lineArea/char/@prod-id"/>
+ <!--eval expected="bidi1" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/flow/block[8]/lineArea/???/@prod-id"/-->
+ <eval expected="link1" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/flow/block[9]/lineArea/inlineparent/@prod-id"/>
+ <eval expected="ifo1" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/flow/block[10]/lineArea/viewport/@prod-id"/>
+ <eval expected="ifo1" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/flow/block[10]/lineArea/viewport/foreignObject/@prod-id"/>
+ <eval expected="eg1" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/flow/block[11]/lineArea/viewport/@prod-id"/>
+ </checks>
+</testcase>
Propchange: xmlgraphics/fop/trunk/test/layoutengine/testcases/id2.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/test/layoutengine/testcases/id2.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: xmlgraphics/fop/trunk/test/layoutengine/testcases/ifo1.xml
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/test/layoutengine/testcases/ifo1.xml?rev=227338&r1=227337&r2=227338&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/testcases/ifo1.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/testcases/ifo1.xml Thu Aug 4 03:10:14 2005
@@ -1,56 +1,56 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2005 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<!-- $Id$ -->
-<testcase>
- <info>
- <p>
- This test checks the basics for instream-foreign-object.
- </p>
- </info>
- <fo>
- <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
- <fo:layout-master-set>
- <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
- <fo:region-body/>
- </fo:simple-page-master>
- </fo:layout-master-set>
- <fo:page-sequence master-reference="normal" white-space-collapse="true">
- <fo:flow flow-name="xsl-region-body">
- <fo:block>start
- <fo:instream-foreign-object content-width="20pt" content-height="20pt">
- <svg:svg viewBox="0 0 20 20">
- <svg:g style="fill:red; stroke:#000000">
- <svg:rect x="0" y="0" width="15" height="15"/>
- <svg:rect x="5" y="5" width="15" height="15"/>
- </svg:g>
- </svg:svg>
- </fo:instream-foreign-object>
- end
- </fo:block>
- </fo:flow>
- </fo:page-sequence>
- </fo:root>
- </fo>
- <checks>
- <true xpath="count(//flow/block[1]/lineArea/viewport) = 1" fail-msg="viewport area not found"/>
- <true xpath="count(//flow/block[1]/lineArea/viewport/foreignObject) = 1" fail-msg="foreign object area not found"/>
- <eval expected="20000" xpath="//flow/block[1]/lineArea/viewport/@bpd"/>
- <eval expected="20000" xpath="//flow/block[1]/lineArea/viewport/@bpda"/>
- <eval expected="20000" xpath="//flow/block[1]/lineArea/viewport/@ipd"/>
- <eval expected="20000" xpath="//flow/block[1]/lineArea/viewport/@ipda"/>
- </checks>
-</testcase>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2005 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!-- $Id$ -->
+<testcase>
+ <info>
+ <p>
+ This test checks the basics for instream-foreign-object.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>start
+ <fo:instream-foreign-object content-width="20pt" content-height="20pt">
+ <svg:svg viewBox="0 0 20 20">
+ <svg:g style="fill:red; stroke:#000000">
+ <svg:rect x="0" y="0" width="15" height="15"/>
+ <svg:rect x="5" y="5" width="15" height="15"/>
+ </svg:g>
+ </svg:svg>
+ </fo:instream-foreign-object>
+ end
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <true xpath="count(//flow/block[1]/lineArea/viewport) = 1" fail-msg="viewport area not found"/>
+ <true xpath="count(//flow/block[1]/lineArea/viewport/foreignObject) = 1" fail-msg="foreign object area not found"/>
+ <eval expected="20000" xpath="//flow/block[1]/lineArea/viewport/@bpd"/>
+ <eval expected="20000" xpath="//flow/block[1]/lineArea/viewport/@bpda"/>
+ <eval expected="20000" xpath="//flow/block[1]/lineArea/viewport/@ipd"/>
+ <eval expected="20000" xpath="//flow/block[1]/lineArea/viewport/@ipda"/>
+ </checks>
+</testcase>
Propchange: xmlgraphics/fop/trunk/test/layoutengine/testcases/ifo1.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/test/layoutengine/testcases/ifo1.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: xmlgraphics/fop/trunk/test/layoutengine/testcases/ifo3.xml
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/test/layoutengine/testcases/ifo3.xml?rev=227338&r1=227337&r2=227338&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/testcases/ifo3.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/testcases/ifo3.xml Thu Aug 4 03:10:14 2005
@@ -1,59 +1,59 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2005 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<!-- $Id$ -->
-<testcase>
- <info>
- <p>
- This test checks the borders and the like for instream-foreign-object.
- </p>
- </info>
- <fo>
- <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
- <fo:layout-master-set>
- <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
- <fo:region-body/>
- </fo:simple-page-master>
- </fo:layout-master-set>
- <fo:page-sequence master-reference="normal" white-space-collapse="true">
- <fo:flow flow-name="xsl-region-body">
- <fo:block background-color="orange">
- <fo:instream-foreign-object content-width="20pt" content-height="20pt" border="solid 5pt" padding="5pt" background-color="white">
- <svg:svg viewBox="0 0 20 20">
- <svg:g style="fill:red; stroke:#000000">
- <svg:rect x="0" y="0" width="15" height="15"/>
- <svg:rect x="5" y="5" width="15" height="15"/>
- </svg:g>
- </svg:svg>
- </fo:instream-foreign-object>
- </fo:block>
- </fo:flow>
- </fo:page-sequence>
- </fo:root>
- </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="(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"/>
- <eval expected="(solid,#000000,5000)" xpath="//flow/block[1]/lineArea/viewport/@border-end"/>
- <eval expected="5000" xpath="//flow/block[1]/lineArea/viewport/@padding-before"/>
- <eval expected="5000" xpath="//flow/block[1]/lineArea/viewport/@padding-after"/>
- <eval expected="5000" xpath="//flow/block[1]/lineArea/viewport/@padding-start"/>
- <eval expected="5000" xpath="//flow/block[1]/lineArea/viewport/@padding-end"/>
- </checks>
-</testcase>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2005 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!-- $Id$ -->
+<testcase>
+ <info>
+ <p>
+ This test checks the borders and the like for instream-foreign-object.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block background-color="orange">
+ <fo:instream-foreign-object content-width="20pt" content-height="20pt" border="solid 5pt" padding="5pt" background-color="white">
+ <svg:svg viewBox="0 0 20 20">
+ <svg:g style="fill:red; stroke:#000000">
+ <svg:rect x="0" y="0" width="15" height="15"/>
+ <svg:rect x="5" y="5" width="15" height="15"/>
+ </svg:g>
+ </svg:svg>
+ </fo:instream-foreign-object>
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </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="(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"/>
+ <eval expected="(solid,#000000,5000)" xpath="//flow/block[1]/lineArea/viewport/@border-end"/>
+ <eval expected="5000" xpath="//flow/block[1]/lineArea/viewport/@padding-before"/>
+ <eval expected="5000" xpath="//flow/block[1]/lineArea/viewport/@padding-after"/>
+ <eval expected="5000" xpath="//flow/block[1]/lineArea/viewport/@padding-start"/>
+ <eval expected="5000" xpath="//flow/block[1]/lineArea/viewport/@padding-end"/>
+ </checks>
+</testcase>
Propchange: xmlgraphics/fop/trunk/test/layoutengine/testcases/ifo3.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/test/layoutengine/testcases/ifo3.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: xmlgraphics/fop/trunk/test/layoutengine/testcases/letter-spacing1.xml
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/test/layoutengine/testcases/letter-spacing1.xml?rev=227338&r1=227337&r2=227338&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/testcases/letter-spacing1.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/testcases/letter-spacing1.xml Thu Aug 4 03:10:14 2005
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!-- $Id: letter-spacing1.xml 198408 2005-02-09 21:38:31Z jeremias $ -->
+<!-- $Id$ -->
<testcase>
<info>
<p>
Propchange: xmlgraphics/fop/trunk/test/layoutengine/testcases/letter-spacing1.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/test/layoutengine/testcases/letter-spacing1.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: xmlgraphics/fop/trunk/test/layoutengine/testcases/letter-spacing2.xml
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/test/layoutengine/testcases/letter-spacing2.xml?rev=227338&r1=227337&r2=227338&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/testcases/letter-spacing2.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/testcases/letter-spacing2.xml Thu Aug 4 03:10:14 2005
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!-- $Id: text-decoration1.xml 198408 2005-02-09 21:38:31Z jeremias $ -->
+<!-- $Id$ -->
<testcase>
<info>
<p>
Propchange: xmlgraphics/fop/trunk/test/layoutengine/testcases/letter-spacing2.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/test/layoutengine/testcases/letter-spacing2.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: xmlgraphics/fop/trunk/test/layoutengine/testcases/letter-spacing3.xml
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/test/layoutengine/testcases/letter-spacing3.xml?rev=227338&r1=227337&r2=227338&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/testcases/letter-spacing3.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/testcases/letter-spacing3.xml Thu Aug 4 03:10:14 2005
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!-- $Id: text-decoration1.xml 198408 2005-02-09 21:38:31Z jeremias $ -->
+<!-- $Id$ -->
<testcase>
<info>
<p>
Propchange: xmlgraphics/fop/trunk/test/layoutengine/testcases/letter-spacing3.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/test/layoutengine/testcases/letter-spacing3.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: xmlgraphics/fop/trunk/test/layoutengine/testcases/line-layout2.xml
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/test/layoutengine/testcases/line-layout2.xml?rev=227338&r1=227337&r2=227338&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/testcases/line-layout2.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/testcases/line-layout2.xml Thu Aug 4 03:10:14 2005
@@ -1,73 +1,73 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2005 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<!-- $Id$ -->
-<testcase>
- <info>
- <p>
- This test checks normal line layout. We test the reported heights of various text elements.
- </p>
- </info>
- <fo>
- <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
- <fo:layout-master-set>
- <fo:simple-page-master master-name="simple" page-height="5in" page-width="5in">
- <fo:region-body/>
- </fo:simple-page-master>
- </fo:layout-master-set>
- <fo:page-sequence master-reference="simple">
- <fo:flow flow-name="xsl-region-body">
- <fo:block id="first">normal text</fo:block>
- <fo:block><fo:page-number/></fo:block>
- <fo:block><fo:page-number-citation ref-id="first"/></fo:block>
- <fo:block><fo:wrapper>wrapped</fo:wrapper></fo:block>
- <fo:block><fo:inline>inlined</fo:inline></fo:block>
- <fo:block><fo:character character="x"/></fo:block>
- </fo:flow>
- </fo:page-sequence>
- </fo:root>
- </fo>
- <checks>
- <element-list category="breaker">
- <box w="14400"/>
- <penalty w="0" p="0"/>
- <box w="14400"/>
- <penalty w="0" p="0"/>
- <box w="14400"/>
- <penalty w="0" p="0"/>
- <box w="14400"/>
- <penalty w="0" p="0"/>
- <box w="14400"/>
- <penalty w="0" p="0"/>
- <box w="14400"/>
- <skip>3</skip>
- </element-list>
-
- <eval expected="14400" xpath="//flow/block[1]/lineArea/@bpd"/>
- <eval expected="14400" xpath="//flow/block[2]/lineArea/@bpd"/>
- <eval expected="14400" xpath="//flow/block[3]/lineArea/@bpd"/>
- <eval expected="14400" xpath="//flow/block[4]/lineArea/@bpd"/>
- <eval expected="14400" xpath="//flow/block[5]/lineArea/@bpd"/>
- <eval expected="14400" xpath="//flow/block[6]/lineArea/@bpd"/>
-
- <eval expected="10266" xpath="//flow/block[1]/lineArea/text/@vpos"/>
- <eval expected="10266" xpath="//flow/block[2]/lineArea/text/@vpos"/>
- <eval expected="10266" xpath="//flow/block[3]/lineArea/text/@vpos"/>
- <eval expected="10266" xpath="//flow/block[4]/lineArea/text/@vpos"/>
- <eval expected="10266" xpath="//flow/block[5]/lineArea/inlineparent/text/@vpos"/>
- <eval expected="10266" xpath="//flow/block[6]/lineArea/char/@vpos"/>
- </checks>
-</testcase>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2005 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!-- $Id$ -->
+<testcase>
+ <info>
+ <p>
+ This test checks normal line layout. We test the reported heights of various text elements.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="simple" page-height="5in" page-width="5in">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="simple">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block id="first">normal text</fo:block>
+ <fo:block><fo:page-number/></fo:block>
+ <fo:block><fo:page-number-citation ref-id="first"/></fo:block>
+ <fo:block><fo:wrapper>wrapped</fo:wrapper></fo:block>
+ <fo:block><fo:inline>inlined</fo:inline></fo:block>
+ <fo:block><fo:character character="x"/></fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <element-list category="breaker">
+ <box w="14400"/>
+ <penalty w="0" p="0"/>
+ <box w="14400"/>
+ <penalty w="0" p="0"/>
+ <box w="14400"/>
+ <penalty w="0" p="0"/>
+ <box w="14400"/>
+ <penalty w="0" p="0"/>
+ <box w="14400"/>
+ <penalty w="0" p="0"/>
+ <box w="14400"/>
+ <skip>3</skip>
+ </element-list>
+
+ <eval expected="14400" xpath="//flow/block[1]/lineArea/@bpd"/>
+ <eval expected="14400" xpath="//flow/block[2]/lineArea/@bpd"/>
+ <eval expected="14400" xpath="//flow/block[3]/lineArea/@bpd"/>
+ <eval expected="14400" xpath="//flow/block[4]/lineArea/@bpd"/>
+ <eval expected="14400" xpath="//flow/block[5]/lineArea/@bpd"/>
+ <eval expected="14400" xpath="//flow/block[6]/lineArea/@bpd"/>
+
+ <eval expected="10266" xpath="//flow/block[1]/lineArea/text/@vpos"/>
+ <eval expected="10266" xpath="//flow/block[2]/lineArea/text/@vpos"/>
+ <eval expected="10266" xpath="//flow/block[3]/lineArea/text/@vpos"/>
+ <eval expected="10266" xpath="//flow/block[4]/lineArea/text/@vpos"/>
+ <eval expected="10266" xpath="//flow/block[5]/lineArea/inlineparent/text/@vpos"/>
+ <eval expected="10266" xpath="//flow/block[6]/lineArea/char/@vpos"/>
+ </checks>
+</testcase>
Propchange: xmlgraphics/fop/trunk/test/layoutengine/testcases/line-layout2.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/test/layoutengine/testcases/line-layout2.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: xmlgraphics/fop/trunk/test/layoutengine/testcases/list4.xml
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/test/layoutengine/testcases/list4.xml?rev=227338&r1=227337&r2=227338&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/testcases/list4.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/testcases/list4.xml Thu Aug 4 03:10:14 2005
@@ -1,101 +1,101 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2005 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<!-- $Id$ -->
-<testcase>
- <info>
- <p>
- This test checks lists. Checks for the presence of space-before and space-after on list-items.
- </p>
- </info>
- <fo>
- <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
- <fo:layout-master-set>
- <fo:simple-page-master master-name="normal" page-width="5in" page-height="2in"
- margin="20pt">
- <fo:region-body background-color="yellow"/>
- </fo:simple-page-master>
- </fo:layout-master-set>
- <fo:page-sequence master-reference="normal" white-space-collapse="true">
- <fo:flow flow-name="xsl-region-body">
- <fo:block>test</fo:block>
- <fo:list-block provisional-distance-between-starts="50pt" provisional-label-separation="5pt">
- <fo:list-item space-before="1em">
- <fo:list-item-label end-indent="label-end()">
- <fo:block>â¢</fo:block>
- </fo:list-item-label>
- <fo:list-item-body start-indent="body-start()">
- <fo:block>here is text in the list item body</fo:block>
- </fo:list-item-body>
- </fo:list-item>
- <fo:list-item space-before="1em">
- <fo:list-item-label end-indent="label-end()">
- <fo:block>â¢</fo:block>
- </fo:list-item-label>
- <fo:list-item-body start-indent="body-start()">
- <fo:block>here is text in the list item body</fo:block>
- </fo:list-item-body>
- </fo:list-item>
- <fo:list-item space-before="1em" space-after="1em">
- <fo:list-item-label end-indent="label-end()">
- <fo:block>â¢</fo:block>
- </fo:list-item-label>
- <fo:list-item-body start-indent="body-start()">
- <fo:block>here is text in the list item body</fo:block>
- </fo:list-item-body>
- </fo:list-item>
- <fo:list-item space-after="1em">
- <fo:list-item-label end-indent="label-end()">
- <fo:block>â¢</fo:block>
- </fo:list-item-label>
- <fo:list-item-body start-indent="body-start()">
- <fo:block>here is text in the list item body</fo:block>
- </fo:list-item-body>
- </fo:list-item>
- <fo:list-item>
- <fo:list-item-label end-indent="label-end()">
- <fo:block>â¢</fo:block>
- </fo:list-item-label>
- <fo:list-item-body start-indent="body-start()">
- <fo:block>here is text in the list item body</fo:block>
- </fo:list-item-body>
- </fo:list-item>
- </fo:list-block>
- </fo:flow>
- </fo:page-sequence>
- </fo:root>
- </fo>
- <checks>
- <eval expected="2" xpath="count(//pageViewport)"/>
- <element-list category="breaker">
- <box w="14400"/>
- <penalty w="0" p="0"/>
- <glue w="12000"/>
- <box w="14400"/>
- <penalty w="0" p="0"/>
- <glue w="12000"/>
- <box w="14400"/>
- <penalty w="0" p="0"/>
- <glue w="12000"/>
- <box w="14400"/>
- <glue w="12000"/>
- <box w="14400"/>
- <glue w="12000"/>
- <box w="14400"/>
- <skip>3</skip>
- </element-list>
- </checks>
-</testcase>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2005 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!-- $Id$ -->
+<testcase>
+ <info>
+ <p>
+ This test checks lists. Checks for the presence of space-before and space-after on list-items.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="2in"
+ margin="20pt">
+ <fo:region-body background-color="yellow"/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>test</fo:block>
+ <fo:list-block provisional-distance-between-starts="50pt" provisional-label-separation="5pt">
+ <fo:list-item space-before="1em">
+ <fo:list-item-label end-indent="label-end()">
+ <fo:block>â¢</fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block>here is text in the list item body</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item space-before="1em">
+ <fo:list-item-label end-indent="label-end()">
+ <fo:block>â¢</fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block>here is text in the list item body</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item space-before="1em" space-after="1em">
+ <fo:list-item-label end-indent="label-end()">
+ <fo:block>â¢</fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block>here is text in the list item body</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item space-after="1em">
+ <fo:list-item-label end-indent="label-end()">
+ <fo:block>â¢</fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block>here is text in the list item body</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item>
+ <fo:list-item-label end-indent="label-end()">
+ <fo:block>â¢</fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block>here is text in the list item body</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ </fo:list-block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="2" xpath="count(//pageViewport)"/>
+ <element-list category="breaker">
+ <box w="14400"/>
+ <penalty w="0" p="0"/>
+ <glue w="12000"/>
+ <box w="14400"/>
+ <penalty w="0" p="0"/>
+ <glue w="12000"/>
+ <box w="14400"/>
+ <penalty w="0" p="0"/>
+ <glue w="12000"/>
+ <box w="14400"/>
+ <glue w="12000"/>
+ <box w="14400"/>
+ <glue w="12000"/>
+ <box w="14400"/>
+ <skip>3</skip>
+ </element-list>
+ </checks>
+</testcase>
Propchange: xmlgraphics/fop/trunk/test/layoutengine/testcases/list4.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/test/layoutengine/testcases/list4.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: xmlgraphics/fop/trunk/test/layoutengine/testcases/list4a.xml
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/test/layoutengine/testcases/list4a.xml?rev=227338&r1=227337&r2=227338&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/testcases/list4a.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/testcases/list4a.xml Thu Aug 4 03:10:14 2005
@@ -1,110 +1,110 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2005 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<!-- $Id$ -->
-<testcase>
- <info>
- <p>
- This test checks lists. Checks for the presence of space-before and space-after
- on list-items. In this case, min/opt/max don't have the same value.
- </p>
- </info>
- <fo>
- <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
- <fo:layout-master-set>
- <fo:simple-page-master master-name="normal" page-width="5in" page-height="2in"
- margin="20pt">
- <fo:region-body background-color="yellow"/>
- </fo:simple-page-master>
- </fo:layout-master-set>
- <fo:page-sequence master-reference="normal" white-space-collapse="true">
- <fo:flow flow-name="xsl-region-body">
- <fo:block>test</fo:block>
- <fo:list-block provisional-distance-between-starts="50pt" provisional-label-separation="5pt">
- <fo:list-item space-before.optimum="1em">
- <fo:list-item-label end-indent="label-end()">
- <fo:block>â¢</fo:block>
- </fo:list-item-label>
- <fo:list-item-body start-indent="body-start()">
- <fo:block>here is text in the list item body</fo:block>
- </fo:list-item-body>
- </fo:list-item>
- <fo:list-item space-before.optimum="1em">
- <fo:list-item-label end-indent="label-end()">
- <fo:block>â¢</fo:block>
- </fo:list-item-label>
- <fo:list-item-body start-indent="body-start()">
- <fo:block>here is text in the list item body</fo:block>
- </fo:list-item-body>
- </fo:list-item>
- <fo:list-item space-before.optimum="1em" space-after.optimum="1em">
- <fo:list-item-label end-indent="label-end()">
- <fo:block>â¢</fo:block>
- </fo:list-item-label>
- <fo:list-item-body start-indent="body-start()">
- <fo:block>here is text in the list item body</fo:block>
- </fo:list-item-body>
- </fo:list-item>
- <fo:list-item space-after.optimum="1em">
- <fo:list-item-label end-indent="label-end()">
- <fo:block>â¢</fo:block>
- </fo:list-item-label>
- <fo:list-item-body start-indent="body-start()">
- <fo:block>here is text in the list item body</fo:block>
- </fo:list-item-body>
- </fo:list-item>
- <fo:list-item>
- <fo:list-item-label end-indent="label-end()">
- <fo:block>â¢</fo:block>
- </fo:list-item-label>
- <fo:list-item-body start-indent="body-start()">
- <fo:block>here is text in the list item body</fo:block>
- </fo:list-item-body>
- </fo:list-item>
- </fo:list-block>
- </fo:flow>
- </fo:page-sequence>
- </fo:root>
- </fo>
- <checks>
- <eval expected="2" xpath="count(//pageViewport)"/>
-
- <!-- The following check makes sure that the content doesn't overlap the available region -->
- <true xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/@bpda <= //pageViewport[@nr=1]/page/regionViewport/regionBody/@bpda"
- fail-msg="The span content must not exceed the available space given by the region-body!"/>
- <!-- This check currently breaks because the breaker uses the minimum values (0pt)
- instead of optimum and the addAreas stage doesn't create smaller space-before/after
- spacers. -->
-
- <element-list category="breaker">
- <box w="14400"/>
- <penalty w="0" p="0"/>
- <glue w="12000"/> <!-- TODO Check shrink/stretch -->
- <box w="14400"/>
- <penalty w="0" p="0"/>
- <glue w="12000"/>
- <box w="14400"/>
- <penalty w="0" p="0"/>
- <glue w="12000"/>
- <box w="14400"/>
- <glue w="12000"/>
- <box w="14400"/>
- <glue w="12000"/>
- <box w="14400"/>
- <skip>3</skip>
- </element-list>
- </checks>
-</testcase>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2005 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!-- $Id$ -->
+<testcase>
+ <info>
+ <p>
+ This test checks lists. Checks for the presence of space-before and space-after
+ on list-items. In this case, min/opt/max don't have the same value.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="2in"
+ margin="20pt">
+ <fo:region-body background-color="yellow"/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>test</fo:block>
+ <fo:list-block provisional-distance-between-starts="50pt" provisional-label-separation="5pt">
+ <fo:list-item space-before.optimum="1em">
+ <fo:list-item-label end-indent="label-end()">
+ <fo:block>â¢</fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block>here is text in the list item body</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item space-before.optimum="1em">
+ <fo:list-item-label end-indent="label-end()">
+ <fo:block>â¢</fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block>here is text in the list item body</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item space-before.optimum="1em" space-after.optimum="1em">
+ <fo:list-item-label end-indent="label-end()">
+ <fo:block>â¢</fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block>here is text in the list item body</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item space-after.optimum="1em">
+ <fo:list-item-label end-indent="label-end()">
+ <fo:block>â¢</fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block>here is text in the list item body</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item>
+ <fo:list-item-label end-indent="label-end()">
+ <fo:block>â¢</fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block>here is text in the list item body</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ </fo:list-block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="2" xpath="count(//pageViewport)"/>
+
+ <!-- The following check makes sure that the content doesn't overlap the available region -->
+ <true xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/@bpda <= //pageViewport[@nr=1]/page/regionViewport/regionBody/@bpda"
+ fail-msg="The span content must not exceed the available space given by the region-body!"/>
+ <!-- This check currently breaks because the breaker uses the minimum values (0pt)
+ instead of optimum and the addAreas stage doesn't create smaller space-before/after
+ spacers. -->
+
+ <element-list category="breaker">
+ <box w="14400"/>
+ <penalty w="0" p="0"/>
+ <glue w="12000"/> <!-- TODO Check shrink/stretch -->
+ <box w="14400"/>
+ <penalty w="0" p="0"/>
+ <glue w="12000"/>
+ <box w="14400"/>
+ <penalty w="0" p="0"/>
+ <glue w="12000"/>
+ <box w="14400"/>
+ <glue w="12000"/>
+ <box w="14400"/>
+ <glue w="12000"/>
+ <box w="14400"/>
+ <skip>3</skip>
+ </element-list>
+ </checks>
+</testcase>
Propchange: xmlgraphics/fop/trunk/test/layoutengine/testcases/list4a.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/test/layoutengine/testcases/list4a.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: xmlgraphics/fop/trunk/test/layoutengine/testcases/multi-column1a.xml
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/test/layoutengine/testcases/multi-column1a.xml?rev=227338&r1=227337&r2=227338&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/testcases/multi-column1a.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/testcases/multi-column1a.xml Thu Aug 4 03:10:14 2005
@@ -1,98 +1,98 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2005 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<!-- $Id$ -->
-<testcase>
- <info>
- <p>
- This test checks multi-column documents. Normal multi-column document breaking over more than one page.
- </p>
- </info>
- <fo>
- <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
- <fo:layout-master-set>
- <fo:simple-page-master master-name="normal" page-width="360pt" page-height="2in">
- <fo:region-body column-count="2" column-gap="20pt"/>
- </fo:simple-page-master>
- </fo:layout-master-set>
- <fo:page-sequence master-reference="normal" white-space-collapse="true">
- <fo:flow flow-name="xsl-region-body">
- <fo:block>line1</fo:block>
- <fo:block>line2</fo:block>
- <fo:block background-color="orange">line3</fo:block>
- <fo:block>line4</fo:block>
- <fo:block>line5</fo:block>
- <fo:block>line6</fo:block>
- <fo:block>line7</fo:block>
- <fo:block>line8</fo:block>
- <fo:block>line9</fo:block>
- <fo:block>line10</fo:block>
- <fo:block>line11</fo:block>
- <fo:block>line12</fo:block>
- <fo:block>line13</fo:block>
- <fo:block>line14</fo:block>
- <fo:block>line15</fo:block>
- <fo:block>line16</fo:block>
- <fo:block>line17</fo:block>
- <fo:block>line18</fo:block>
- <fo:block>line19</fo:block>
- <fo:block>line20</fo:block>
- <fo:block>line21</fo:block>
- <fo:block>line22</fo:block>
- <fo:block>line23</fo:block>
- <fo:block>line24</fo:block>
- <fo:block>line25</fo:block>
- <fo:block>line26</fo:block>
- <fo:block>line27</fo:block>
- <fo:block>line28</fo:block>
- <fo:block>line29</fo:block>
- <fo:block>line30</fo:block>
- </fo:flow>
- </fo:page-sequence>
- </fo:root>
- </fo>
- <checks>
- <eval expected="2" xpath="count(//pageViewport)"/>
-
- <!-- *** page 1 *** -->
- <eval expected="1" xpath="count(//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span)"/>
- <!-- room for 10 lines -->
- <eval expected="10" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/@bpd div 14400"/>
-
- <!-- 2 columns -->
- <eval expected="2" xpath="count(//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/flow)"/>
- <!-- 10 lines in first column -->
- <eval expected="10" xpath="count(//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/flow[1]/block)"/>
- <eval expected="10" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/flow[1]/@bpd div 14400"/>
- <!-- 10 lines in second column -->
- <eval expected="10" xpath="count(//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/flow[2]/block)"/>
- <eval expected="10" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/flow[2]/@bpd div 14400"/>
-
- <!-- *** page 2 *** -->
- <eval expected="1" xpath="count(//pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span)"/>
- <!-- room for 10 lines -->
- <eval expected="10" xpath="//pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/@bpd div 14400"/>
-
- <!-- 2 columns -->
- <eval expected="2" xpath="count(//pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow)"/>
- <!-- 10 lines in first column -->
- <eval expected="10" xpath="count(//pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow[1]/block)"/>
- <eval expected="10" xpath="//pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow[1]/@bpd div 14400"/>
- <!-- 0 lines in second column -->
- <eval expected="0" xpath="count(//pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow[2]/block)"/>
- <eval expected="0" xpath="//pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow[2]/@bpd div 14400"/>
- </checks>
-</testcase>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2005 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!-- $Id$ -->
+<testcase>
+ <info>
+ <p>
+ This test checks multi-column documents. Normal multi-column document breaking over more than one page.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="360pt" page-height="2in">
+ <fo:region-body column-count="2" column-gap="20pt"/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>line1</fo:block>
+ <fo:block>line2</fo:block>
+ <fo:block background-color="orange">line3</fo:block>
+ <fo:block>line4</fo:block>
+ <fo:block>line5</fo:block>
+ <fo:block>line6</fo:block>
+ <fo:block>line7</fo:block>
+ <fo:block>line8</fo:block>
+ <fo:block>line9</fo:block>
+ <fo:block>line10</fo:block>
+ <fo:block>line11</fo:block>
+ <fo:block>line12</fo:block>
+ <fo:block>line13</fo:block>
+ <fo:block>line14</fo:block>
+ <fo:block>line15</fo:block>
+ <fo:block>line16</fo:block>
+ <fo:block>line17</fo:block>
+ <fo:block>line18</fo:block>
+ <fo:block>line19</fo:block>
+ <fo:block>line20</fo:block>
+ <fo:block>line21</fo:block>
+ <fo:block>line22</fo:block>
+ <fo:block>line23</fo:block>
+ <fo:block>line24</fo:block>
+ <fo:block>line25</fo:block>
+ <fo:block>line26</fo:block>
+ <fo:block>line27</fo:block>
+ <fo:block>line28</fo:block>
+ <fo:block>line29</fo:block>
+ <fo:block>line30</fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="2" xpath="count(//pageViewport)"/>
+
+ <!-- *** page 1 *** -->
+ <eval expected="1" xpath="count(//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span)"/>
+ <!-- room for 10 lines -->
+ <eval expected="10" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/@bpd div 14400"/>
+
+ <!-- 2 columns -->
+ <eval expected="2" xpath="count(//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/flow)"/>
+ <!-- 10 lines in first column -->
+ <eval expected="10" xpath="count(//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/flow[1]/block)"/>
+ <eval expected="10" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/flow[1]/@bpd div 14400"/>
+ <!-- 10 lines in second column -->
+ <eval expected="10" xpath="count(//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/flow[2]/block)"/>
+ <eval expected="10" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/flow[2]/@bpd div 14400"/>
+
+ <!-- *** page 2 *** -->
+ <eval expected="1" xpath="count(//pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span)"/>
+ <!-- room for 10 lines -->
+ <eval expected="10" xpath="//pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/@bpd div 14400"/>
+
+ <!-- 2 columns -->
+ <eval expected="2" xpath="count(//pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow)"/>
+ <!-- 10 lines in first column -->
+ <eval expected="10" xpath="count(//pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow[1]/block)"/>
+ <eval expected="10" xpath="//pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow[1]/@bpd div 14400"/>
+ <!-- 0 lines in second column -->
+ <eval expected="0" xpath="count(//pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow[2]/block)"/>
+ <eval expected="0" xpath="//pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow[2]/@bpd div 14400"/>
+ </checks>
+</testcase>
Propchange: xmlgraphics/fop/trunk/test/layoutengine/testcases/multi-column1a.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/test/layoutengine/testcases/multi-column1a.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org
Re: svn commit: r227338 [1/2] - /xmlgraphics/fop/trunk/test/layoutengine/testcases/
Posted by Jeremias Maerki <de...@greenmail.ch>.
On 04.08.2005 13:42:04 Chris Bowditch wrote:
> Jeremias Maerki wrote:
>
> > Hehe. Right mouse button on a file, select "Properties" and go the the
> > "Subversion" tab. There, you can set the properties per file. AFAIK,
> > TortoiseSVN doesn't support batch operations in this area.
>
> Yes I've found it (I was looking under the SVN sub menu before). You
> check the recursive check box when viewing a top level folder to have
> all files and sub folders processed.
D'oh, I'm using TortoiseSVN for such a long time that I didn't even see
that new checkbox being introduced.
> >
> > I've used the command-line:
> > svn propset svn:keyword "Author Date Id Revision" *.xml
> > svn propset svn:eol-style native *.xml
> > svn commit -m "blah"
> >
> > much easier.
> >
> > BTW, I didn't find out why certain files didn't carry the properties. I
> > wish there was a way to easily fix the most common properties (*.xml,
> > *.java).
>
> Isn't it just new files that don't have these properties by default. I
> guess it's up to the committers to add the properties when they create a
> new file.
Well, I added most of the test cases in there and I've never paid attention
to this. Maybe Subclipse adds this automatically or something like that.
I will pay attention next time I add a test case.
Jeremias Maerki
Re: svn commit: r227338 [1/2] - /xmlgraphics/fop/trunk/test/layoutengine/testcases/
Posted by Chris Bowditch <bo...@hotmail.com>.
Jeremias Maerki wrote:
> Hehe. Right mouse button on a file, select "Properties" and go the the
> "Subversion" tab. There, you can set the properties per file. AFAIK,
> TortoiseSVN doesn't support batch operations in this area.
Yes I've found it (I was looking under the SVN sub menu before). You
check the recursive check box when viewing a top level folder to have
all files and sub folders processed.
>
> I've used the command-line:
> svn propset svn:keyword "Author Date Id Revision" *.xml
> svn propset svn:eol-style native *.xml
> svn commit -m "blah"
>
> much easier.
>
> BTW, I didn't find out why certain files didn't carry the properties. I
> wish there was a way to easily fix the most common properties (*.xml,
> *.java).
Isn't it just new files that don't have these properties by default. I
guess it's up to the committers to add the properties when they create a
new file.
Chris
Re: svn commit: r227338 [1/2] - /xmlgraphics/fop/trunk/test/layoutengine/testcases/
Posted by Jeremias Maerki <de...@greenmail.ch>.
Hehe. Right mouse button on a file, select "Properties" and go the the
"Subversion" tab. There, you can set the properties per file. AFAIK,
TortoiseSVN doesn't support batch operations in this area.
I've used the command-line:
svn propset svn:keyword "Author Date Id Revision" *.xml
svn propset svn:eol-style native *.xml
svn commit -m "blah"
much easier.
BTW, I didn't find out why certain files didn't carry the properties. I
wish there was a way to easily fix the most common properties (*.xml,
*.java).
On 04.08.2005 12:40:23 Chris Bowditch wrote:
> jeremias@apache.org wrote:
>
> > Author: jeremias
> > Date: Thu Aug 4 03:10:14 2005
> > New Revision: 227338
> >
> > URL: http://svn.apache.org/viewcvs?rev=227338&view=rev
> > Log:
> > Setting svn:eol-style and svn:keywords where necessary. Need to lookup why these are missing only on some.
>
> You beat me to this. I tried to MSN you but you were away! How do you do
> this using Tortoise SVN ??
>
> Chris
>
>
>
Jeremias Maerki
Re: svn commit: r227338 [1/2] - /xmlgraphics/fop/trunk/test/layoutengine/testcases/
Posted by Chris Bowditch <bo...@hotmail.com>.
jeremias@apache.org wrote:
> Author: jeremias
> Date: Thu Aug 4 03:10:14 2005
> New Revision: 227338
>
> URL: http://svn.apache.org/viewcvs?rev=227338&view=rev
> Log:
> Setting svn:eol-style and svn:keywords where necessary. Need to lookup why these are missing only on some.
You beat me to this. I tried to MSN you but you were away! How do you do
this using Tortoise SVN ??
Chris