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/09/05 10:10:22 UTC
svn commit: r278690 [3/3] - in /xmlgraphics/fop/trunk:
src/java/org/apache/fop/area/ src/java/org/apache/fop/fo/flow/
src/java/org/apache/fop/fo/pagination/
src/java/org/apache/fop/layoutmgr/inline/ src/java/org/apache/fop/render/
src/java/org/apache/f...
Added: xmlgraphics/fop/trunk/test/layoutengine/testcases/simple-page-master_reference-orientation_90_writing-mode_rl_region-body_margin_relative.xml
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/test/layoutengine/testcases/simple-page-master_reference-orientation_90_writing-mode_rl_region-body_margin_relative.xml?rev=278690&view=auto
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/testcases/simple-page-master_reference-orientation_90_writing-mode_rl_region-body_margin_relative.xml (added)
+++ xmlgraphics/fop/trunk/test/layoutengine/testcases/simple-page-master_reference-orientation_90_writing-mode_rl_region-body_margin_relative.xml Mon Sep 5 01:09:42 2005
@@ -0,0 +1,112 @@
+<?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 relative margin on region (region-body).
+ </p>
+ </info>
+ <variables>
+ <img>../../resources/images/bgimg300dpi.jpg</img>
+ </variables>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="3in" page-height="5in" margin="5%" reference-orientation="90" writing-mode="rl">
+ <fo:region-body margin-top="10%" margin-bottom="5%" margin-left="10%" margin-right="5%" background-color="yellow" />
+ <fo:region-before extent="10%" background-color="blue" precedence="true" />
+ <fo:region-after extent="5%" background-color="green" precedence="true" />
+ <fo:region-start extent="5%" background-color="red" />
+ <fo:region-end extent="10%" background-color="orange" />
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:static-content flow-name="xsl-region-before">
+ <fo:block>
+ r e g i o n b e f o r e
+ </fo:block>
+ </fo:static-content>
+ <fo:static-content flow-name="xsl-region-after">
+ <fo:block>
+ r e g i o n a f t e r
+ </fo:block>
+ </fo:static-content>
+ <fo:static-content flow-name="xsl-region-start">
+ <fo:block>
+ r e g i o n s t a r t
+ </fo:block>
+ </fo:static-content>
+ <fo:static-content flow-name="xsl-region-end">
+ <fo:block>
+ r e g i o n e n d
+ </fo:block>
+ </fo:static-content>
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>
+ Demonstrates relative 5% margin on the page master, 10% margin on regions before
+ and end and 5% margin on regions start and after. Corresponding margins are set
+ on the region body. The page size is 5in x 3in with the page reference rotated by
+ 90 degrees and a rl writing-mode.
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <!-- region before -->
+ <eval expected="color=#0000ff" xpath="//page/regionViewport[1]/@background"/>
+ <eval expected="324000" xpath="//page/regionViewport[1]/@ipd"/>
+ <eval expected="21600" xpath="//page/regionViewport[1]/@bpd"/>
+ <eval expected="10800 18000 21600 324000" xpath="//page/regionViewport[1]/@rect"/>
+ <eval expected="324000" xpath="//page/regionViewport[1]/regionBefore/@ipd"/>
+ <eval expected="21600" xpath="//page/regionViewport[1]/regionBefore/@bpd"/>
+ <eval expected="[0.0 1.0 1.0 0.0 10800.0 18000.0]" xpath="//page/regionViewport[1]/regionBefore/@ctm"/>
+ <!-- region start -->
+ <eval expected="color=#ff0000" xpath="//page/regionViewport[2]/@background"/>
+ <eval expected="18000" xpath="//page/regionViewport[2]/@ipd"/>
+ <eval expected="162000" xpath="//page/regionViewport[2]/@bpd"/>
+ <eval expected="32400 18000 162000 18000" xpath="//page/regionViewport[2]/@rect"/>
+ <eval expected="18000" xpath="//page/regionViewport[2]/regionStart/@ipd"/>
+ <eval expected="162000" xpath="//page/regionViewport[2]/regionStart/@bpd"/>
+ <eval expected="[0.0 1.0 1.0 0.0 32400.0 18000.0]" xpath="//page/regionViewport[2]/regionStart/@ctm"/>
+ <!-- region end -->
+ <eval expected="color=#ffa500" xpath="//page/regionViewport[3]/@background"/>
+ <eval expected="36000" xpath="//page/regionViewport[3]/@ipd"/>
+ <eval expected="162000" xpath="//page/regionViewport[3]/@bpd"/>
+ <eval expected="32400 306000 162000 36000" xpath="//page/regionViewport[3]/@rect"/>
+ <eval expected="36000" xpath="//page/regionViewport[3]/regionEnd/@ipd"/>
+ <eval expected="162000" xpath="//page/regionViewport[3]/regionEnd/@bpd"/>
+ <eval expected="[0.0 1.0 1.0 0.0 32400.0 306000.0]" xpath="//page/regionViewport[3]/regionEnd/@ctm"/>
+ <!-- region after -->
+ <eval expected="color=#008000" xpath="//page/regionViewport[4]/@background"/>
+ <eval expected="324000" xpath="//page/regionViewport[4]/@ipd"/>
+ <eval expected="10800" xpath="//page/regionViewport[4]/@bpd"/>
+ <eval expected="194400 18000 10800 324000" xpath="//page/regionViewport[4]/@rect"/>
+ <eval expected="324000" xpath="//page/regionViewport[4]/regionAfter/@ipd"/>
+ <eval expected="10800" xpath="//page/regionViewport[4]/regionAfter/@bpd"/>
+ <eval expected="[0.0 1.0 1.0 0.0 194400.0 18000.0]" xpath="//page/regionViewport[4]/regionAfter/@ctm"/>
+ <!-- region body -->
+ <eval expected="color=#ffff00" xpath="//page/regionViewport[5]/@background"/>
+ <eval expected="270000" xpath="//page/regionViewport[5]/@ipd"/>
+ <eval expected="162000" xpath="//page/regionViewport[5]/@bpd"/>
+ <eval expected="32400 36000 162000 270000" xpath="//page/regionViewport[5]/@rect"/>
+ <eval expected="270000" xpath="//page/regionViewport[5]/regionBody/@ipd"/>
+ <eval expected="162000" xpath="//page/regionViewport[5]/regionBody/@bpd"/>
+ <eval expected="[0.0 1.0 1.0 0.0 32400.0 36000.0]" xpath="//page/regionViewport[5]/regionBody/@ctm"/>
+ </checks>
+</testcase>
Propchange: xmlgraphics/fop/trunk/test/layoutengine/testcases/simple-page-master_reference-orientation_90_writing-mode_rl_region-body_margin_relative.xml
------------------------------------------------------------------------------
svn:keywords = Id
Added: xmlgraphics/fop/trunk/test/layoutengine/testcases/simple-page-master_writing-mode_rl_region-body_writing-mode-lr.xml
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/test/layoutengine/testcases/simple-page-master_writing-mode_rl_region-body_writing-mode-lr.xml?rev=278690&view=auto
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/testcases/simple-page-master_writing-mode_rl_region-body_writing-mode-lr.xml (added)
+++ xmlgraphics/fop/trunk/test/layoutengine/testcases/simple-page-master_writing-mode_rl_region-body_writing-mode-lr.xml Mon Sep 5 01:09:42 2005
@@ -0,0 +1,113 @@
+<?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 relative margin on region (region-body).
+ </p>
+ </info>
+ <variables>
+ <img>../../resources/images/bgimg300dpi.jpg</img>
+ </variables>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="3in" page-height="5in" margin="5%" reference-orientation="0" writing-mode="rl">
+ <fo:region-body margin-top="10%" margin-bottom="5%" margin-left="10%" margin-right="5%" background-color="yellow" writing-mode="lr"/>
+ <fo:region-before extent="10%" background-color="blue" precedence="true" />
+ <fo:region-after extent="5%" background-color="green" precedence="true" />
+ <fo:region-start extent="5%" background-color="red" writing-mode="tb"/>
+ <fo:region-end extent="10%" background-color="orange" writing-mode="tb"/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:static-content flow-name="xsl-region-before">
+ <fo:block>
+ r e g i o n b e f o r e
+ </fo:block>
+ </fo:static-content>
+ <fo:static-content flow-name="xsl-region-after">
+ <fo:block>
+ r e g i o n a f t e r
+ </fo:block>
+ </fo:static-content>
+ <fo:static-content flow-name="xsl-region-start">
+ <fo:block>
+ r e g i o n s t a r t top - bottom
+ </fo:block>
+ </fo:static-content>
+ <fo:static-content flow-name="xsl-region-end">
+ <fo:block>
+ r e g i o n e n d top - bottom
+ </fo:block>
+ </fo:static-content>
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>
+ Demonstrates relative 5% margin on the page master, 10% margin on regions before
+ and end and 5% margin on regions start and after. Corresponding margins are set
+ on the region body. The page size is 5in x 3in with the page reference not rotated
+ and a rl writing-mode on the page master, a normal writing mode on the region-body
+ and tb writing mode on start and end regions.
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <!-- region before -->
+ <eval expected="color=#0000ff" xpath="//page/regionViewport[1]/@background"/>
+ <eval expected="194400" xpath="//page/regionViewport[1]/@ipd"/>
+ <eval expected="36000" xpath="//page/regionViewport[1]/@bpd"/>
+ <eval expected="10800 18000 194400 36000" xpath="//page/regionViewport[1]/@rect"/>
+ <eval expected="194400" xpath="//page/regionViewport[1]/regionBefore/@ipd"/>
+ <eval expected="36000" xpath="//page/regionViewport[1]/regionBefore/@bpd"/>
+ <eval expected="[-1.0 0.0 0.0 1.0 205200.0 18000.0]" xpath="//page/regionViewport[1]/regionBefore/@ctm"/>
+ <!-- region start -->
+ <eval expected="color=#ff0000" xpath="//page/regionViewport[2]/@background"/>
+ <eval expected="10800" xpath="//page/regionViewport[2]/@ipd"/>
+ <eval expected="270000" xpath="//page/regionViewport[2]/@bpd"/>
+ <eval expected="194400 54000 10800 270000" xpath="//page/regionViewport[2]/@rect"/>
+ <eval expected="270000" xpath="//page/regionViewport[2]/regionStart/@ipd"/>
+ <eval expected="10800" xpath="//page/regionViewport[2]/regionStart/@bpd"/>
+ <eval expected="[0.0 1.0 -1.0 0.0 205200.0 54000.0]" xpath="//page/regionViewport[2]/regionStart/@ctm"/>
+ <!-- region end -->
+ <eval expected="color=#ffa500" xpath="//page/regionViewport[3]/@background"/>
+ <eval expected="21600" xpath="//page/regionViewport[3]/@ipd"/>
+ <eval expected="270000" xpath="//page/regionViewport[3]/@bpd"/>
+ <eval expected="10800 54000 21600 270000" xpath="//page/regionViewport[3]/@rect"/>
+ <eval expected="270000" xpath="//page/regionViewport[3]/regionEnd/@ipd"/>
+ <eval expected="21600" xpath="//page/regionViewport[3]/regionEnd/@bpd"/>
+ <eval expected="[0.0 1.0 -1.0 0.0 32400.0 54000.0]" xpath="//page/regionViewport[3]/regionEnd/@ctm"/>
+ <!-- region after -->
+ <eval expected="color=#008000" xpath="//page/regionViewport[4]/@background"/>
+ <eval expected="194400" xpath="//page/regionViewport[4]/@ipd"/>
+ <eval expected="18000" xpath="//page/regionViewport[4]/@bpd"/>
+ <eval expected="10800 324000 194400 18000" xpath="//page/regionViewport[4]/@rect"/>
+ <eval expected="194400" xpath="//page/regionViewport[4]/regionAfter/@ipd"/>
+ <eval expected="18000" xpath="//page/regionViewport[4]/regionAfter/@bpd"/>
+ <eval expected="[-1.0 0.0 0.0 1.0 205200.0 324000.0]" xpath="//page/regionViewport[4]/regionAfter/@ctm"/>
+ <!-- region body -->
+ <eval expected="color=#ffff00" xpath="//page/regionViewport[5]/@background"/>
+ <eval expected="162000" xpath="//page/regionViewport[5]/@ipd"/>
+ <eval expected="270000" xpath="//page/regionViewport[5]/@bpd"/>
+ <eval expected="32400 54000 162000 270000" xpath="//page/regionViewport[5]/@rect"/>
+ <eval expected="162000" xpath="//page/regionViewport[5]/regionBody/@ipd"/>
+ <eval expected="270000" xpath="//page/regionViewport[5]/regionBody/@bpd"/>
+ <eval expected="[1.0 0.0 0.0 1.0 32400.0 54000.0]" xpath="//page/regionViewport[5]/regionBody/@ctm"/>
+ </checks>
+</testcase>
Propchange: xmlgraphics/fop/trunk/test/layoutengine/testcases/simple-page-master_writing-mode_rl_region-body_writing-mode-lr.xml
------------------------------------------------------------------------------
svn:keywords = Id
Modified: xmlgraphics/fop/trunk/test/layoutengine/testcases/table-cell_background-image.xml
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/test/layoutengine/testcases/table-cell_background-image.xml?rev=278690&r1=278689&r2=278690&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/testcases/table-cell_background-image.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/testcases/table-cell_background-image.xml Mon Sep 5 01:09:42 2005
@@ -39,20 +39,20 @@
<fo:table-column />
<fo:table-body>
<fo:table-row>
- <fo:table-cell margin="0pt" padding="5pt" height="1in" background-color="blue"
+ <fo:table-cell margin="0pt" padding="5pt 10pt 20pt 15pt" height="1in" background-color="blue"
background-image="##img"
background-position-horizontal="right"
background-repeat="no-repeat">
<fo:block>image in top right corner</fo:block>
</fo:table-cell>
- <fo:table-cell margin="0pt" padding="5pt" height="1in" background-color="green"
+ <fo:table-cell margin="0pt" padding="5pt 10pt 20pt 15pt" height="1in" background-color="green"
background-image="##img"
background-position-horizontal="right"
background-position-vertical="center"
background-repeat="no-repeat">
<fo:block>image in center right</fo:block>
</fo:table-cell>
- <fo:table-cell margin="0pt" padding="5pt" height="1in" background-color="yellow"
+ <fo:table-cell margin="0pt" padding="5pt 10pt 20pt 15pt" height="1in" background-color="yellow"
background-image="##img"
background-position-horizontal="right"
background-position-vertical="bottom"
@@ -61,20 +61,20 @@
</fo:table-cell>
</fo:table-row>
<fo:table-row>
- <fo:table-cell margin="0pt" padding="5pt" height="1in" background-color="yellow"
+ <fo:table-cell margin="0pt" padding="5pt 10pt 20pt 15pt" height="1in" background-color="yellow"
background-image="##img"
background-position-horizontal="center"
background-repeat="no-repeat">
<fo:block>image in top center</fo:block>
</fo:table-cell>
- <fo:table-cell margin="0pt" padding="5pt" height="1in" background-color="blue"
+ <fo:table-cell margin="0pt" padding="5pt 10pt 20pt 15pt" height="1in" background-color="blue"
background-image="##img"
background-position-horizontal="center"
background-position-vertical="center"
background-repeat="no-repeat">
<fo:block>image in center</fo:block>
</fo:table-cell>
- <fo:table-cell margin="0pt" padding="5pt" height="1in" background-color="green"
+ <fo:table-cell margin="0pt" padding="5pt 10pt 20pt 15pt" height="1in" background-color="green"
background-image="##img"
background-position-horizontal="center"
background-position-vertical="bottom"
@@ -83,18 +83,18 @@
</fo:table-cell>
</fo:table-row>
<fo:table-row>
- <fo:table-cell margin="0pt" padding="5pt" height="1in" background-color="green"
+ <fo:table-cell margin="0pt" padding="5pt 10pt 20pt 15pt" height="1in" background-color="green"
background-image="##img"
background-repeat="no-repeat">
<fo:block>image in top left</fo:block>
</fo:table-cell>
- <fo:table-cell margin="0pt" padding="5pt" height="1in" background-color="yellow"
+ <fo:table-cell margin="0pt" padding="5pt 10pt 20pt 15pt" height="1in" background-color="yellow"
background-image="##img"
background-position-vertical="center"
background-repeat="no-repeat">
<fo:block>image in center left</fo:block>
</fo:table-cell>
- <fo:table-cell margin="0pt" padding="5pt" height="1in" background-color="blue"
+ <fo:table-cell margin="0pt" padding="5pt 10pt 20pt 15pt" height="1in" background-color="blue"
background-image="##img"
background-position-vertical="bottom"
background-repeat="no-repeat">
@@ -111,20 +111,20 @@
<!-- first cell in row 1 -->
<eval expected="color=#0000ff,url=../../resources/images/box1.png,repeat=no-repeat,horiz=69991,vertical=0" xpath="//flow/block/block[1]/@background"/>
<!-- second cell in row 1 -->
- <eval expected="color=#008000,url=../../resources/images/box1.png,repeat=no-repeat,horiz=69991,vertical=20995" xpath="//flow/block/block[2]/@background"/>
+ <eval expected="color=#008000,url=../../resources/images/box1.png,repeat=no-repeat,horiz=69991,vertical=28495" xpath="//flow/block/block[2]/@background"/>
<!-- third cell in row 1 -->
- <eval expected="color=#ffff00,url=../../resources/images/box1.png,repeat=no-repeat,horiz=69991,vertical=41991" xpath="//flow/block/block[3]/@background"/>
+ <eval expected="color=#ffff00,url=../../resources/images/box1.png,repeat=no-repeat,horiz=69991,vertical=56991" xpath="//flow/block/block[3]/@background"/>
<!-- first cell in row 2 -->
<eval expected="color=#ffff00,url=../../resources/images/box1.png,repeat=no-repeat,horiz=34995,vertical=0" xpath="//flow/block/block[4]/@background"/>
<!-- second cell in row 2 -->
- <eval expected="color=#0000ff,url=../../resources/images/box1.png,repeat=no-repeat,horiz=34995,vertical=20995" xpath="//flow/block/block[5]/@background"/>
+ <eval expected="color=#0000ff,url=../../resources/images/box1.png,repeat=no-repeat,horiz=34995,vertical=28495" xpath="//flow/block/block[5]/@background"/>
<!-- third cell in row 2 -->
- <eval expected="color=#008000,url=../../resources/images/box1.png,repeat=no-repeat,horiz=34995,vertical=41991" xpath="//flow/block/block[6]/@background"/>
+ <eval expected="color=#008000,url=../../resources/images/box1.png,repeat=no-repeat,horiz=34995,vertical=56991" xpath="//flow/block/block[6]/@background"/>
<!-- first cell in row 3 -->
<eval expected="color=#008000,url=../../resources/images/box1.png,repeat=no-repeat,horiz=0,vertical=0" xpath="//flow/block/block[7]/@background"/>
<!-- second cell in row 3 -->
- <eval expected="color=#ffff00,url=../../resources/images/box1.png,repeat=no-repeat,horiz=0,vertical=20995" xpath="//flow/block/block[8]/@background"/>
+ <eval expected="color=#ffff00,url=../../resources/images/box1.png,repeat=no-repeat,horiz=0,vertical=28495" xpath="//flow/block/block[8]/@background"/>
<!-- third cell in row 3 -->
- <eval expected="color=#0000ff,url=../../resources/images/box1.png,repeat=no-repeat,horiz=0,vertical=41991" xpath="//flow/block/block[9]/@background"/>
+ <eval expected="color=#0000ff,url=../../resources/images/box1.png,repeat=no-repeat,horiz=0,vertical=56991" xpath="//flow/block/block[9]/@background"/>
</checks>
-</testcase>
+</testcase>
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org