jeremias    2005/02/21 01:25:29

  Modified:    test/layoutengine disabled-testcases.txt
  Added:       test/layoutengine/testcases page-number1.xml
                        page-number2.xml
  Log:
  Test cases illustrating Glen's page-number fix. There's still a problem 
because of the bogus areas, though.
  
  Revision  Changes    Path
  1.1                  xml-fop/test/layoutengine/testcases/page-number1.xml
  
  Index: page-number1.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-number1.xml,v 1.1 2005/02/21 09:25:28 jeremias Exp $ -->
  <testcase>
    <info>
      <p>
        This test checks do:page-number.
      </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="1in">
            <fo:region-body/>
          </fo:simple-page-master>
        </fo:layout-master-set>
        <fo:page-sequence master-reference="master1" 
white-space-collapse="true">
          <fo:flow flow-name="xsl-region-body">
            <fo:block>page: <fo:page-number/></fo:block>
            <fo:block>page: <fo:page-number/></fo:block>
            <fo:block>page: <fo:page-number/></fo:block>
            <fo:block>page: <fo:page-number/></fo:block>
            <fo:block>page: <fo:page-number/></fo:block>
            <fo:block>page: <fo:page-number/></fo:block>
            <fo:block>page: <fo:page-number/></fo:block>
          </fo:flow>
        </fo:page-sequence>
        <fo:page-sequence master-reference="master1" 
white-space-collapse="true">
          <fo:flow flow-name="xsl-region-body">
            <fo:block>page: <fo:page-number/></fo:block>
            <fo:block>page: <fo:page-number/></fo:block>
            <fo:block>page: <fo:page-number/></fo:block>
            <fo:block>page: <fo:page-number/></fo:block>
            <fo:block>page: <fo:page-number/></fo:block>
            <fo:block>page: <fo:page-number/></fo:block>
            <fo:block>page: <fo:page-number/></fo:block>
          </fo:flow>
        </fo:page-sequence>
      </fo:root>
    </fo>
    <checks>
      <eval expected="page: 1" 
xpath="//pageViewport[1]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/lineArea"/>
      <eval expected="page: 1" 
xpath="//pageViewport[1]/page/regionViewport/regionBody/mainReference/span/flow/block[2]/lineArea"/>
  
      <eval expected="page: 2" 
xpath="//pageViewport[2]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/lineArea"/>
      <eval expected="page: 2" 
xpath="//pageViewport[2]/page/regionViewport/regionBody/mainReference/span/flow/block[2]/lineArea"/>
  
      <eval expected="page: 3" 
xpath="//pageViewport[3]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/lineArea"/>
      <eval expected="page: 3" 
xpath="//pageViewport[3]/page/regionViewport/regionBody/mainReference/span/flow/block[2]/lineArea"/>
  
      <eval expected="page: 4" 
xpath="//pageViewport[4]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/lineArea"/>
      <eval expected="page: 4" 
xpath="//pageViewport[4]/page/regionViewport/regionBody/mainReference/span/flow/block[2]/lineArea"/>
    </checks>
  </testcase>
  
  
  
  1.1                  xml-fop/test/layoutengine/testcases/page-number2.xml
  
  Index: page-number2.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-number2.xml,v 1.1 2005/02/21 09:25:28 jeremias Exp $ -->
  <testcase>
    <info>
      <p>
        This test checks do:page-number.
      </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="1in">
            <fo:region-body/>
          </fo:simple-page-master>
        </fo:layout-master-set>
        <fo:page-sequence master-reference="master1" 
white-space-collapse="true">
          <fo:flow flow-name="xsl-region-body">
            <fo:block>page: <fo:page-number/></fo:block>
            <fo:block>page: <fo:page-number/></fo:block>
            <fo:block>page: <fo:page-number/></fo:block>
            <fo:block>page: <fo:page-number/></fo:block>
            <fo:block>page: <fo:page-number/></fo:block>
            <fo:block>page: <fo:page-number/></fo:block>
            <fo:block>page: <fo:page-number/></fo:block>
          </fo:flow>
        </fo:page-sequence>
        <fo:page-sequence master-reference="master1" 
white-space-collapse="true" initial-page-number="11">
          <fo:flow flow-name="xsl-region-body">
            <fo:block>page: <fo:page-number/></fo:block>
            <fo:block>page: <fo:page-number/></fo:block>
            <fo:block>page: <fo:page-number/></fo:block>
            <fo:block>page: <fo:page-number/></fo:block>
            <fo:block>page: <fo:page-number/></fo:block>
            <fo:block>page: <fo:page-number/></fo:block>
            <fo:block>page: <fo:page-number/></fo:block>
          </fo:flow>
        </fo:page-sequence>
      </fo:root>
    </fo>
    <checks>
      <eval expected="page: 1" 
xpath="//pageViewport[1]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/lineArea"/>
      <eval expected="page: 1" 
xpath="//pageViewport[1]/page/regionViewport/regionBody/mainReference/span/flow/block[2]/lineArea"/>
  
      <eval expected="page: 2" 
xpath="//pageViewport[2]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/lineArea"/>
      <eval expected="page: 2" 
xpath="//pageViewport[2]/page/regionViewport/regionBody/mainReference/span/flow/block[2]/lineArea"/>
  
      <eval expected="page: 11" 
xpath="//pageViewport[3]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/lineArea"/>
      <eval expected="page: 11" 
xpath="//pageViewport[3]/page/regionViewport/regionBody/mainReference/span/flow/block[2]/lineArea"/>
  
      <eval expected="page: 12" 
xpath="//pageViewport[4]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/lineArea"/>
      <eval expected="page: 12" 
xpath="//pageViewport[4]/page/regionViewport/regionBody/mainReference/span/flow/block[2]/lineArea"/>
    </checks>
  </testcase>
  
  
  
  1.18      +2 -0      xml-fop/test/layoutengine/disabled-testcases.txt
  
  Index: disabled-testcases.txt
  ===================================================================
  RCS file: /home/cvs/xml-fop/test/layoutengine/disabled-testcases.txt,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- disabled-testcases.txt    20 Feb 2005 19:52:18 -0000      1.17
  +++ disabled-testcases.txt    21 Feb 2005 09:25:29 -0000      1.18
  @@ -2,6 +2,8 @@
   breaks2.xml
   markers5b.xml
   normal-breaking4.xml
  +page-number1.xml
  +page-number2.xml
   table-cell3a.xml
   table-fixed2.xml
   table-hf4.xml
  \ No newline at end of file
  
  
  

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

Reply via email to