Author: vhennebert
Date: Tue Feb 23 16:13:59 2010
New Revision: 915406
URL: http://svn.apache.org/viewvc?rev=915406&view=rev
Log:
Bugfix: definition of a special page-master for the last page was interfering
with changing IPD code
Added:
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/flow_changing-ipd_last-page.xml
(with props)
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AbstractBreaker.java
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AbstractBreaker.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AbstractBreaker.java?rev=915406&r1=915405&r2=915406&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AbstractBreaker.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AbstractBreaker.java
Tue Feb 23 16:13:59 2010
@@ -435,7 +435,7 @@
}
log.trace("IPD changes after page " + optimalPageCount + "
at index "
+ optimalBreak.position);
- doPhase3(alg, optimalPageCount, blockList, effectiveList);
+ addAreas(alg, optimalPageCount, blockList, effectiveList);
blockLists.clear();
blockListIndex = -1;
Added:
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/flow_changing-ipd_last-page.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/flow_changing-ipd_last-page.xml?rev=915406&view=auto
==============================================================================
---
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/flow_changing-ipd_last-page.xml
(added)
+++
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/flow_changing-ipd_last-page.xml
Tue Feb 23 16:13:59 2010
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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 that the definition of a special page-master for the
last page does not
+ interfere with the changing IPD code.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format";>
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="narrow"
+ page-height="220pt" page-width="320pt" margin="10pt">
+ <fo:region-body margin-top="40pt" background-color="#F0F0F0"/>
+ </fo:simple-page-master>
+ <fo:simple-page-master master-name="wide"
+ page-height="220pt" page-width="420pt" margin="10pt">
+ <fo:region-body background-color="#F0F0F0"/>
+ </fo:simple-page-master>
+ <fo:page-sequence-master master-name="pages">
+ <fo:repeatable-page-master-alternatives>
+ <fo:conditional-page-master-reference page-position="last"
master-reference="wide"/>
+ <fo:conditional-page-master-reference page-position="first"
master-reference="narrow"/>
+ <fo:conditional-page-master-reference page-position="rest"
master-reference="wide"/>
+ </fo:repeatable-page-master-alternatives>
+ </fo:page-sequence-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="pages" font-size="8pt"
line-height="10pt">
+ <fo:flow flow-name="xsl-region-body" text-align="justify">
+ <fo:block space-after="140pt">First block</fo:block>
+ <fo:block id="surrounding">
+ <fo:block id="before">Block before the page break.</fo:block>
+ <fo:block id="after">Block after the page break.</fo:block>
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="Block before the page break."
xpath="//pageViewport[1]//flow/block[2]//text"/>
+ <eval expected="Block after the page break."
xpath="//pageViewport[2]//flow/block[1]//text"/>
+ </checks>
+</testcase>
Propchange:
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/flow_changing-ipd_last-page.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/flow_changing-ipd_last-page.xml
------------------------------------------------------------------------------
svn:keywords = Revision Id
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
