Modified: xmlgraphics/fop/branches/Temp_URI_Unification/test/layoutengine/standard-testcases/leader-alignment.xml URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/test/layoutengine/standard-testcases/leader-alignment.xml?rev=1343285&r1=1343284&r2=1343285&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_URI_Unification/test/layoutengine/standard-testcases/leader-alignment.xml (original) +++ xmlgraphics/fop/branches/Temp_URI_Unification/test/layoutengine/standard-testcases/leader-alignment.xml Mon May 28 15:30:46 2012 @@ -31,11 +31,11 @@ </fo:layout-master-set> <fo:page-sequence master-reference="normal" white-space-collapse="true"> <fo:flow flow-name="xsl-region-body"> - <fo:block margin="0pt" padding-left="10mm"> - margin="0pt" padding-left="10mm" + <fo:block margin="0pt" padding-start="10mm"> + margin="0pt" padding-start="10mm" </fo:block> - <fo:block padding-left="10mm"> - padding-left="10mm" + <fo:block padding-start="10mm"> + padding-start="10mm" </fo:block> <fo:block> <fo:leader leader-length.minimum="12pt" @@ -43,13 +43,13 @@ leader-length.maximum="100%" leader-pattern="dots" leader-alignment="page"/> leader-alignment="page" </fo:block> - <fo:block margin="0pt" padding-left="10mm"> + <fo:block margin="0pt" padding-start="10mm"> <fo:leader leader-length.minimum="12pt" leader-length.optimum="80pt" leader-length.maximum="100%" leader-pattern="dots" leader-alignment="page"/> leader-alignment="page" </fo:block> - <fo:block margin="0pt" padding-left="5mm"> + <fo:block margin="0pt" padding-start="5mm"> <fo:leader leader-length.minimum="12pt" leader-length.optimum="80pt" leader-length.maximum="100%" leader-pattern="dots" leader-alignment="reference-area"/> @@ -64,5 +64,79 @@ </fo:root> </fo> <checks> + <eval expected="331654" xpath="//flow/block[1]/@ipd"/> + <eval expected="28346" xpath="//flow/block[1]/@padding-start"/> + <eval expected="28346" xpath="//flow/block[1]/@start-indent"/> + <eval expected="331654" xpath="//flow/block[1]/lineArea/@ipd"/> + <eval expected="140542" xpath="//flow/block[1]/lineArea/@end-indent"/> + <eval expected="1" xpath="count(//flow/block[1]/lineArea/*)"/> + <eval expected="text" xpath="local-name(//flow/block[1]/lineArea/*[position()=1])"/> + <eval expected="191112" xpath="//flow/block[1]/lineArea/text/@ipd"/> + + <eval expected="360000" xpath="//flow/block[2]/@ipd"/> + <eval expected="28346" xpath="//flow/block[2]/@padding-start"/> + <eval expected="-28346" xpath="//flow/block[2]/@space-start"/> + <eval expected="360000" xpath="//flow/block[2]/lineArea/@ipd"/> + <eval expected="241104" xpath="//flow/block[2]/lineArea/@end-indent"/> + <eval expected="1" xpath="count(//flow/block[2]/lineArea/*)"/> + <eval expected="text" xpath="local-name(//flow/block[2]/lineArea/*[position()=1])"/> + <eval expected="118896" xpath="//flow/block[2]/lineArea/text/@ipd"/> + + <eval expected="360000" xpath="//flow/block[3]/@ipd"/> + <true xpath="//flow/block[3]/@padding-start = 'false'"/> + <true xpath="//flow/block[3]/@space-start = 'false'"/> + <true xpath="//flow/block[3]/@start-indent = 'false'"/> + <true xpath="//flow/block[3]/@end-indent = 'false'"/> + <eval expected="360000" xpath="//flow/block[3]/lineArea/@ipd"/> + <eval expected="145084" xpath="//flow/block[3]/lineArea/@end-indent"/> + <eval expected="2" xpath="count(//flow/block[3]/lineArea/*)"/> + <eval expected="inlineparent" xpath="local-name(//flow/block[3]/lineArea/*[position()=1])"/> + <eval expected="text" xpath="local-name(//flow/block[3]/lineArea/*[position()=2])"/> + <eval expected="80000" xpath="//flow/block[3]/lineArea/inlineparent/@ipd"/> + <eval expected="134916" xpath="//flow/block[3]/lineArea/text/@ipd"/> + + <eval expected="331654" xpath="//flow/block[4]/@ipd"/> + <eval expected="28346" xpath="//flow/block[4]/@padding-start"/> + <eval expected="28346" xpath="//flow/block[4]/@start-indent"/> + <true xpath="//flow/block[4]/@space-start = 'false'"/> + <true xpath="//flow/block[4]/@end-indent = 'false'"/> + <eval expected="331654" xpath="//flow/block[4]/lineArea/@ipd"/> + <eval expected="116738" xpath="//flow/block[4]/lineArea/@end-indent"/> + <eval expected="2" xpath="count(//flow/block[4]/lineArea/*)"/> + <eval expected="inlineparent" xpath="local-name(//flow/block[4]/lineArea/*[position()=1])"/> + <eval expected="text" xpath="local-name(//flow/block[4]/lineArea/*[position()=2])"/> + <eval expected="80000" xpath="//flow/block[4]/lineArea/inlineparent/@ipd"/> + <eval expected="134916" xpath="//flow/block[4]/lineArea/text/@ipd"/> + + <eval expected="345827" xpath="//flow/block[5]/@ipd"/> + <eval expected="14173" xpath="//flow/block[5]/@padding-start"/> + <eval expected="14173" xpath="//flow/block[5]/@start-indent"/> + <true xpath="//flow/block[5]/@space-start = 'false'"/> + <true xpath="//flow/block[5]/@end-indent = 'false'"/> + <eval expected="4" xpath="count(//flow/block[5]/lineArea)"/> + <eval expected="345827" xpath="//flow/block[5]/lineArea[1]/@ipd"/> + <eval expected="78903" xpath="//flow/block[5]/lineArea[1]/@end-indent"/> + <eval expected="2" xpath="count(//flow/block[5]/lineArea[1]/*)"/> + <eval expected="inlineparent" xpath="local-name(//flow/block[5]/lineArea[1]/*[position()=1])"/> + <eval expected="text" xpath="local-name(//flow/block[5]/lineArea[1]/*[position()=2])"/> + <eval expected="80000" xpath="//flow/block[5]/lineArea[1]/inlineparent/@ipd"/> + <eval expected="186924" xpath="//flow/block[5]/lineArea[1]/text/@ipd"/> + <eval expected="345827" xpath="//flow/block[5]/lineArea[2]/@ipd"/> + <eval expected="34215" xpath="//flow/block[5]/lineArea[2]/@end-indent"/> + <eval expected="2" xpath="count(//flow/block[5]/lineArea[2]/*)"/> + <eval expected="inlineparent" xpath="local-name(//flow/block[5]/lineArea[2]/*[position()=1])"/> + <eval expected="text" xpath="local-name(//flow/block[5]/lineArea[2]/*[position()=2])"/> + <eval expected="80000" xpath="//flow/block[5]/lineArea[2]/inlineparent/@ipd"/> + <eval expected="231612" xpath="//flow/block[5]/lineArea[2]/text/@ipd"/> + <eval expected="345827" xpath="//flow/block[5]/lineArea[3]/@ipd"/> + <eval expected="15371" xpath="//flow/block[5]/lineArea[3]/@end-indent"/> + <eval expected="1" xpath="count(//flow/block[5]/lineArea[3]/*)"/> + <eval expected="text" xpath="local-name(//flow/block[5]/lineArea[3]/*[position()=1])"/> + <eval expected="330456" xpath="//flow/block[5]/lineArea[3]/text/@ipd"/> + <eval expected="345827" xpath="//flow/block[5]/lineArea[4]/@ipd"/> + <eval expected="192419" xpath="//flow/block[5]/lineArea[4]/@end-indent"/> + <eval expected="1" xpath="count(//flow/block[5]/lineArea[4]/*)"/> + <eval expected="text" xpath="local-name(//flow/block[5]/lineArea[4]/*[position()=1])"/> + <eval expected="153408" xpath="//flow/block[5]/lineArea[4]/text/@ipd"/> </checks> </testcase>
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_0_writing-mode_rl_region-body_margin_relative.xml URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_0_writing-mode_rl_region-body_margin_relative.xml?rev=1343285&r1=1343284&r2=1343285&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_URI_Unification/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_0_writing-mode_rl_region-body_margin_relative.xml (original) +++ xmlgraphics/fop/branches/Temp_URI_Unification/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_0_writing-mode_rl_region-body_margin_relative.xml Mon May 28 15:30:46 2012 @@ -19,12 +19,10 @@ <testcase> <info> <p> - This test checks relative margin on region (region-body). + This test checks relative margin on regions when writing mode is right to left, + with reference orientation 0. </p> </info> - <variables> - <img>../../resources/images/bgimg300dpi.jpg</img> - </variables> <fo> <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"; xmlns:svg="http://www.w3.org/2000/svg";> <fo:layout-master-set> @@ -32,8 +30,8 @@ <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:region-start extent="10%" background-color="red" /> + <fo:region-end extent="5%" background-color="orange" /> </fo:simple-page-master> </fo:layout-master-set> <fo:page-sequence master-reference="normal" white-space-collapse="true"> @@ -60,7 +58,7 @@ <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 + and start and 5% margin on regions end 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. </fo:block> @@ -76,23 +74,23 @@ <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"/> + <eval expected="[1.0 0.0 0.0 1.0 10800.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="21600" 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="10800" xpath="//page/regionViewport[2]/regionStart/@ipd"/> + <eval expected="183600 54000 21600 270000" xpath="//page/regionViewport[2]/@rect"/> + <eval expected="21600" xpath="//page/regionViewport[2]/regionStart/@ipd"/> <eval expected="270000" xpath="//page/regionViewport[2]/regionStart/@bpd"/> - <eval expected="[-1.0 0.0 0.0 1.0 205200.0 54000.0]" xpath="//page/regionViewport[2]/regionStart/@ctm"/> + <eval expected="[1.0 0.0 0.0 1.0 183600.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="10800" 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="21600" xpath="//page/regionViewport[3]/regionEnd/@ipd"/> + <eval expected="10800 54000 10800 270000" xpath="//page/regionViewport[3]/@rect"/> + <eval expected="10800" xpath="//page/regionViewport[3]/regionEnd/@ipd"/> <eval expected="270000" xpath="//page/regionViewport[3]/regionEnd/@bpd"/> - <eval expected="[-1.0 0.0 0.0 1.0 32400.0 54000.0]" xpath="//page/regionViewport[3]/regionEnd/@ctm"/> + <eval expected="[1.0 0.0 0.0 1.0 10800.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"/> @@ -100,14 +98,14 @@ <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"/> + <eval expected="[1.0 0.0 0.0 1.0 10800.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="21600 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 194400.0 54000.0]" xpath="//page/regionViewport[5]/regionBody/@ctm"/> + <eval expected="[1.0 0.0 0.0 1.0 21600.0 54000.0]" xpath="//page/regionViewport[5]/regionBody/@ctm"/> </checks> </testcase> Modified: xmlgraphics/fop/branches/Temp_URI_Unification/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_180_writing-mode_rl_region-body_margin_relative.xml URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_180_writing-mode_rl_region-body_margin_relative.xml?rev=1343285&r1=1343284&r2=1343285&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_URI_Unification/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_180_writing-mode_rl_region-body_margin_relative.xml (original) +++ xmlgraphics/fop/branches/Temp_URI_Unification/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_180_writing-mode_rl_region-body_margin_relative.xml Mon May 28 15:30:46 2012 @@ -19,12 +19,10 @@ <testcase> <info> <p> - This test checks relative margin on region (region-body). + This test checks relative margin on regions when writing mode is right to left, + with reference orientation 180. </p> </info> - <variables> - <img>../../resources/images/bgimg300dpi.jpg</img> - </variables> <fo> <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"; xmlns:svg="http://www.w3.org/2000/svg";> <fo:layout-master-set> @@ -32,8 +30,8 @@ <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:region-start extent="10%" background-color="red" /> + <fo:region-end extent="5%" background-color="orange" /> </fo:simple-page-master> </fo:layout-master-set> <fo:page-sequence master-reference="normal" white-space-collapse="true"> @@ -60,9 +58,9 @@ <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 - 180 degrees and a rl writing-mode. + and start and 5% margin on regions end and after. Corresponding margins are set + on the region body. The page size is 5in x 3in with the page reference rotated + by 180 degrees and a rl writing-mode. </fo:block> </fo:flow> </fo:page-sequence> @@ -76,23 +74,23 @@ <eval expected="10800 306000 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 10800.0 342000.0]" xpath="//page/regionViewport[1]/regionBefore/@ctm"/> + <eval expected="[-1.0 -0.0 0.0 -1.0 205200.0 342000.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="21600" xpath="//page/regionViewport[2]/@ipd"/> <eval expected="270000" xpath="//page/regionViewport[2]/@bpd"/> - <eval expected="10800 36000 10800 270000" xpath="//page/regionViewport[2]/@rect"/> - <eval expected="10800" xpath="//page/regionViewport[2]/regionStart/@ipd"/> + <eval expected="10800 36000 21600 270000" xpath="//page/regionViewport[2]/@rect"/> + <eval expected="21600" xpath="//page/regionViewport[2]/regionStart/@ipd"/> <eval expected="270000" xpath="//page/regionViewport[2]/regionStart/@bpd"/> - <eval expected="[1.0 0.0 0.0 -1.0 10800.0 306000.0]" xpath="//page/regionViewport[2]/regionStart/@ctm"/> + <eval expected="[-1.0 -0.0 0.0 -1.0 32400.0 306000.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="10800" xpath="//page/regionViewport[3]/@ipd"/> <eval expected="270000" xpath="//page/regionViewport[3]/@bpd"/> - <eval expected="183600 36000 21600 270000" xpath="//page/regionViewport[3]/@rect"/> - <eval expected="21600" xpath="//page/regionViewport[3]/regionEnd/@ipd"/> + <eval expected="194400 36000 10800 270000" xpath="//page/regionViewport[3]/@rect"/> + <eval expected="10800" xpath="//page/regionViewport[3]/regionEnd/@ipd"/> <eval expected="270000" xpath="//page/regionViewport[3]/regionEnd/@bpd"/> - <eval expected="[1.0 0.0 0.0 -1.0 183600.0 306000.0]" xpath="//page/regionViewport[3]/regionEnd/@ctm"/> + <eval expected="[-1.0 -0.0 0.0 -1.0 205200.0 306000.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"/> @@ -100,14 +98,14 @@ <eval expected="10800 18000 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 10800.0 36000.0]" xpath="//page/regionViewport[4]/regionAfter/@ctm"/> + <eval expected="[-1.0 -0.0 0.0 -1.0 205200.0 36000.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="21600 36000 162000 270000" xpath="//page/regionViewport[5]/@rect"/> + <eval expected="32400 36000 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 21600.0 306000.0]" xpath="//page/regionViewport[5]/regionBody/@ctm"/> + <eval expected="[-1.0 -0.0 0.0 -1.0 194400.0 306000.0]" xpath="//page/regionViewport[5]/regionBody/@ctm"/> </checks> </testcase> Modified: xmlgraphics/fop/branches/Temp_URI_Unification/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_270_writing-mode_rl_region-body_margin_relative.xml URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_270_writing-mode_rl_region-body_margin_relative.xml?rev=1343285&r1=1343284&r2=1343285&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_URI_Unification/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_270_writing-mode_rl_region-body_margin_relative.xml (original) +++ xmlgraphics/fop/branches/Temp_URI_Unification/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_270_writing-mode_rl_region-body_margin_relative.xml Mon May 28 15:30:46 2012 @@ -19,21 +19,19 @@ <testcase> <info> <p> - This test checks relative margin on region (region-body). + This test checks relative margin on regions when writing mode is right to left, + with reference orientation 270. </p> </info> - <variables> - <img>../../resources/images/bgimg300dpi.jpg</img> - </variables> <fo> <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"; xmlns:svg="http://www.w3.org/2000/svg";> <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="3in" page-height="5in" margin="5%" reference-orientation="270" writing-mode="rl"> + <fo:simple-page-master master-name="normal" page-width="5in" page-height="3in" margin="5%" reference-orientation="270" 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:region-start extent="10%" background-color="red" /> + <fo:region-end extent="5%" background-color="orange" /> </fo:simple-page-master> </fo:layout-master-set> <fo:page-sequence master-reference="normal" white-space-collapse="true"> @@ -60,9 +58,9 @@ <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 - 270 degrees and a rl writing-mode. + and start and 5% margin on regions end and after. Corresponding margins are set + on the region body. The page size is 5in x 3in with the page reference rotated + by 270 degrees and a rl writing-mode. </fo:block> </fo:flow> </fo:page-sequence> @@ -71,43 +69,43 @@ <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="183600 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 205200.0 342000.0]" xpath="//page/regionViewport[1]/regionBefore/@ctm"/> + <eval expected="194400" xpath="//page/regionViewport[1]/@ipd"/> + <eval expected="36000" xpath="//page/regionViewport[1]/@bpd"/> + <eval expected="306000 10800 36000 194400" 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="[0.0 1.0 -1.0 0.0 342000.0 10800.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="21600 324000 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 183600.0 342000.0]" xpath="//page/regionViewport[2]/regionStart/@ctm"/> + <eval expected="21600" xpath="//page/regionViewport[2]/@ipd"/> + <eval expected="270000" xpath="//page/regionViewport[2]/@bpd"/> + <eval expected="36000 183600 270000 21600" xpath="//page/regionViewport[2]/@rect"/> + <eval expected="21600" xpath="//page/regionViewport[2]/regionStart/@ipd"/> + <eval expected="270000" xpath="//page/regionViewport[2]/regionStart/@bpd"/> + <eval expected="[0.0 1.0 -1.0 0.0 306000.0 183600.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="21600 18000 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 183600.0 54000.0]" xpath="//page/regionViewport[3]/regionEnd/@ctm"/> + <eval expected="10800" xpath="//page/regionViewport[3]/@ipd"/> + <eval expected="270000" xpath="//page/regionViewport[3]/@bpd"/> + <eval expected="36000 10800 270000 10800" xpath="//page/regionViewport[3]/@rect"/> + <eval expected="10800" xpath="//page/regionViewport[3]/regionEnd/@ipd"/> + <eval expected="270000" xpath="//page/regionViewport[3]/regionEnd/@bpd"/> + <eval expected="[0.0 1.0 -1.0 0.0 306000.0 10800.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="10800 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 21600.0 342000.0]" xpath="//page/regionViewport[4]/regionAfter/@ctm"/> + <eval expected="194400" xpath="//page/regionViewport[4]/@ipd"/> + <eval expected="18000" xpath="//page/regionViewport[4]/@bpd"/> + <eval expected="18000 10800 18000 194400" 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="[0.0 1.0 -1.0 0.0 36000.0 10800.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="21600 54000 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 183600.0 324000.0]" xpath="//page/regionViewport[5]/regionBody/@ctm"/> + <eval expected="162000" xpath="//page/regionViewport[5]/@ipd"/> + <eval expected="270000" xpath="//page/regionViewport[5]/@bpd"/> + <eval expected="36000 21600 270000 162000" 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="[0.0 1.0 -1.0 0.0 306000.0 21600.0]" xpath="//page/regionViewport[5]/regionBody/@ctm"/> </checks> </testcase> Modified: xmlgraphics/fop/branches/Temp_URI_Unification/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_90_writing-mode_rl_region-body_margin_relative.xml URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_90_writing-mode_rl_region-body_margin_relative.xml?rev=1343285&r1=1343284&r2=1343285&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_URI_Unification/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_90_writing-mode_rl_region-body_margin_relative.xml (original) +++ xmlgraphics/fop/branches/Temp_URI_Unification/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_90_writing-mode_rl_region-body_margin_relative.xml Mon May 28 15:30:46 2012 @@ -19,21 +19,19 @@ <testcase> <info> <p> - This test checks relative margin on region (region-body). + This test checks relative margin on regions when writing mode is right to left, + with reference orientation 90. </p> </info> - <variables> - <img>../../resources/images/bgimg300dpi.jpg</img> - </variables> <fo> <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"; xmlns:svg="http://www.w3.org/2000/svg";> <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="3in" page-height="5in" margin="5%" reference-orientation="90" writing-mode="rl"> + <fo:simple-page-master master-name="normal" page-width="5in" page-height="3in" 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:region-start extent="10%" background-color="red" /> + <fo:region-end extent="5%" background-color="orange" /> </fo:simple-page-master> </fo:layout-master-set> <fo:page-sequence master-reference="normal" white-space-collapse="true"> @@ -60,9 +58,9 @@ <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. + and start and 5% margin on regions end 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> @@ -71,43 +69,43 @@ <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"/> + <eval expected="194400" xpath="//page/regionViewport[1]/@ipd"/> + <eval expected="36000" xpath="//page/regionViewport[1]/@bpd"/> + <eval expected="18000 10800 36000 194400" 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="[0.0 -1.0 1.0 0.0 18000.0 205200.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"/> + <eval expected="21600" xpath="//page/regionViewport[2]/@ipd"/> + <eval expected="270000" xpath="//page/regionViewport[2]/@bpd"/> + <eval expected="54000 10800 270000 21600" xpath="//page/regionViewport[2]/@rect"/> + <eval expected="21600" xpath="//page/regionViewport[2]/regionStart/@ipd"/> + <eval expected="270000" xpath="//page/regionViewport[2]/regionStart/@bpd"/> + <eval expected="[0.0 -1.0 1.0 0.0 54000.0 32400.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"/> + <eval expected="10800" xpath="//page/regionViewport[3]/@ipd"/> + <eval expected="270000" xpath="//page/regionViewport[3]/@bpd"/> + <eval expected="54000 194400 270000 10800" xpath="//page/regionViewport[3]/@rect"/> + <eval expected="10800" xpath="//page/regionViewport[3]/regionEnd/@ipd"/> + <eval expected="270000" xpath="//page/regionViewport[3]/regionEnd/@bpd"/> + <eval expected="[0.0 -1.0 1.0 0.0 54000.0 205200.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"/> + <eval expected="194400" xpath="//page/regionViewport[4]/@ipd"/> + <eval expected="18000" xpath="//page/regionViewport[4]/@bpd"/> + <eval expected="324000 10800 18000 194400" 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="[0.0 -1.0 1.0 0.0 324000.0 205200.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"/> + <eval expected="162000" xpath="//page/regionViewport[5]/@ipd"/> + <eval expected="270000" xpath="//page/regionViewport[5]/@bpd"/> + <eval expected="54000 32400 270000 162000" 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="[0.0 -1.0 1.0 0.0 54000.0 194400.0]" xpath="//page/regionViewport[5]/regionBody/@ctm"/> </checks> </testcase> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
