jeremias    2005/02/17 01:19:11

  Modified:    test/layoutengine/testcases page-master1.xml
  Added:       test/layoutengine/testcases page-master3.xml
  Log:
  updated page-master tests.
  
  Revision  Changes    Path
  1.3       +4 -21     xml-fop/test/layoutengine/testcases/page-master1.xml
  
  Index: page-master1.xml
  ===================================================================
  RCS file: /home/cvs/xml-fop/test/layoutengine/testcases/page-master1.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- page-master1.xml  24 Jan 2005 14:05:44 -0000      1.2
  +++ page-master1.xml  17 Feb 2005 09:19:10 -0000      1.3
  @@ -25,19 +25,15 @@
       <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="master1" page-width="5in" 
page-height="5in" margin-left="10pt" margin-top="20pt" margin-right="30pt" 
margin-bottom="40pt">
  -          <fo:region-body margin="0pt" background-color="lightgreen"/>
  +          <fo:region-body background-color="lightgreen"/>
           </fo:simple-page-master>
           <fo:simple-page-master master-name="master2" page-width="5in" 
page-height="5in" margin="20pt">
  -          <fo:region-body margin="0pt" background-color="lightgreen"/>
  +          <fo:region-body background-color="lightgreen"/>
           </fo:simple-page-master>
           <fo:simple-page-master master-name="master3" page-width="5in" 
page-height="5in" margin="20pt 10pt">
  -          <fo:region-body margin="0pt" background-color="lightgreen"/>
  +          <fo:region-body background-color="lightgreen"/>
           </fo:simple-page-master>
           <fo:simple-page-master master-name="master4" page-width="5in" 
page-height="5in" margin="20pt 10pt 30pt">
  -          <fo:region-body margin="0pt" background-color="lightgreen"/>
  -        </fo:simple-page-master>
  -        <fo:simple-page-master master-name="master5" page-width="5in" 
page-height="5in" margin="20pt 10pt 30pt">
  -          <!-- same as previous but with margin="0pt" omitted, so 
start-indent is inherited -->
             <fo:region-body background-color="lightgreen"/>
           </fo:simple-page-master>
         </fo:layout-master-set>
  @@ -61,11 +57,6 @@
             <fo:block>testing margin shorthands (with 3 values)</fo:block>
           </fo:flow>
         </fo:page-sequence>
  -      <fo:page-sequence master-reference="master5" 
white-space-collapse="true">
  -        <fo:flow flow-name="xsl-region-body">
  -          <fo:block>testing margin shorthands (with 3 values), no margin on 
region-body to test start|end-indent inheritance</fo:block>
  -        </fo:flow>
  -      </fo:page-sequence>
       </fo:root>
     </fo>
     <checks>
  @@ -111,13 +102,5 @@
       <eval expected="340000" 
xpath="//pageViewport[4]/page/regionViewport/regionBody/mainReference/span/flow/block/@ipda"/>
       <eval expected="340000" 
xpath="//pageViewport[4]/page/regionViewport/regionBody/mainReference/span/flow/block/@ipd"/>
   
  -    <eval expected="0 0 360000 360000" xpath="//pageViewport[5]/@bounds"/>
  -    <eval expected="20000 20000 320000 310000" 
xpath="//pageViewport[5]/page/regionViewport/@rect"/>
  -    <eval expected="320000" 
xpath="//pageViewport[5]/page/regionViewport/@ipda"/>
  -    <eval expected="320000" 
xpath="//pageViewport[5]/page/regionViewport/@ipd"/>
  -    <eval expected="310000" 
xpath="//pageViewport[5]/page/regionViewport/@bpda"/>
  -    <eval expected="310000" 
xpath="//pageViewport[5]/page/regionViewport/@bpd"/>
  -    <eval expected="320000" 
xpath="//pageViewport[5]/page/regionViewport/regionBody/mainReference/span/flow/block/@ipda"/>
  -    <eval expected="320000" 
xpath="//pageViewport[5]/page/regionViewport/regionBody/mainReference/span/flow/block/@ipd"/>
     </checks>
   </testcase>
  
  
  
  1.1                  xml-fop/test/layoutengine/testcases/page-master3.xml
  
  Index: page-master3.xml
  ===================================================================
  <?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: page-master3.xml,v 1.1 2005/02/17 09:19:10 jeremias Exp $ -->
  <testcase>
    <info>
      <p>
        This test checks page-masters (reference orientation).
      </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="master1" page-width="5in" 
page-height="5in" margin-left="10pt" margin-top="20pt" margin-right="30pt" 
margin-bottom="40pt" background-color="rgb(100%, 90%, 90%)">
            <fo:region-body background-color="rgb(100%, 80%, 80%)" 
margin-top="20pt"/>
            <fo:region-before background-color="lightgray" extent="20pt"/>
          </fo:simple-page-master>
          <fo:simple-page-master master-name="master2" page-width="5in" 
page-height="5in" margin-left="10pt" margin-top="20pt" margin-right="30pt" 
margin-bottom="40pt" background-color="rgb(100%, 90%, 90%)" 
reference-orientation="90">
            <fo:region-body background-color="rgb(100%, 80%, 80%)" 
margin-top="20pt"/>
            <fo:region-before background-color="lightgray" extent="20pt" 
margin-left="50pt"/>
          </fo:simple-page-master>
        </fo:layout-master-set>
        <fo:page-sequence master-reference="master1" 
white-space-collapse="true">
          <fo:static-content flow-name="xsl-region-before">
            <fo:block>region-before</fo:block>
          </fo:static-content>
          <fo:flow flow-name="xsl-region-body">
            <fo:block>testing margins</fo:block>
          </fo:flow>
        </fo:page-sequence>
        <fo:page-sequence master-reference="master2" 
white-space-collapse="true">
          <fo:static-content flow-name="xsl-region-before">
            <fo:block>region-before</fo:block>
          </fo:static-content>
          <fo:flow flow-name="xsl-region-body">
            <fo:block>testing margin with reference-orientation="90"</fo:block>
          </fo:flow>
        </fo:page-sequence>
      </fo:root>
    </fo>
    <checks>
      <eval expected="10000 20000 320000 20000" 
xpath="//pageViewport[1]/page/regionViewport[1]/@rect"/>
      <eval expected="320000" 
xpath="//pageViewport[1]/page/regionViewport[1]/regionBefore/@ipda"/>
      <eval expected="20000" 
xpath="//pageViewport[1]/page/regionViewport[1]/regionBefore/@bpda"/>
      <eval expected="320000" 
xpath="//pageViewport[1]/page/regionViewport[1]/regionBefore/block[1]/@ipda"/>
      <eval expected="14400" 
xpath="//pageViewport[1]/page/regionViewport[1]/regionBefore/block[1]/@bpda"/>
      <eval expected="10000 40000 320000 280000" 
xpath="//pageViewport[1]/page/regionViewport[2]/@rect"/>
      <eval expected="320000" 
xpath="//pageViewport[1]/page/regionViewport[2]/regionBody/@ipda"/>
      <eval expected="280000" 
xpath="//pageViewport[1]/page/regionViewport[2]/regionBody/@bpda"/>
  
      <eval expected="10000 20000 20000 300000" 
xpath="//pageViewport[2]/page/regionViewport[1]/@rect"/>
      <eval expected="300000" 
xpath="//pageViewport[2]/page/regionViewport[1]/regionBefore/@ipda"/>
      <eval expected="20000" 
xpath="//pageViewport[2]/page/regionViewport[1]/regionBefore/@bpda"/>
      <eval expected="300000" 
xpath="//pageViewport[2]/page/regionViewport[1]/regionBefore/block[1]/@ipda"/>
      <eval expected="14400" 
xpath="//pageViewport[2]/page/regionViewport[1]/regionBefore/block[1]/@bpda"/>
      <eval expected="30000 20000 300000 300000" 
xpath="//pageViewport[2]/page/regionViewport[2]/@rect"/>
      <eval expected="300000" 
xpath="//pageViewport[2]/page/regionViewport[2]/regionBody/@ipda"/>
      <eval expected="300000" 
xpath="//pageViewport[2]/page/regionViewport[2]/regionBody/@bpda"/>
    </checks>
  </testcase>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to