Author: jeremias
Date: Fri Oct 24 06:42:59 2008
New Revision: 707631
URL: http://svn.apache.org/viewvc?rev=707631&view=rev
Log:
Fixed a problem where the BPD or a block area could be wrong if there is a
nested, absolutely positioned area (for example a block-container).
Added:
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block-container_area-bpd.xml
(with props)
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Block.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
xmlgraphics/fop/trunk/status.xml
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Block.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Block.java?rev=707631&r1=707630&r2=707631&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Block.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Block.java Fri Oct 24
06:42:59 2008
@@ -79,7 +79,7 @@
* @param autoHeight increase the height of the block.
*/
public void addBlock(Block block, boolean autoHeight) {
- if (autoHeight && allowBPDUpdate) {
+ if (autoHeight && allowBPDUpdate && block.isStacked()) {
bpd += block.getAllocBPD();
}
addChildArea(block);
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java?rev=707631&r1=707630&r2=707631&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
Fri Oct 24 06:42:59 2008
@@ -26,6 +26,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+
import org.apache.fop.area.Area;
import org.apache.fop.area.Block;
import org.apache.fop.fo.flow.ListItem;
@@ -537,14 +538,6 @@
label.addAreas(labelIter, lc);
}
- // reset the area bpd after adding the label areas and before adding
the body areas
- int savedBPD = 0;
- if (labelFirstIndex <= labelLastIndex
- && bodyFirstIndex <= bodyLastIndex) {
- savedBPD = curBlockArea.getBPD();
- curBlockArea.setBPD(0);
- }
-
// add body areas
if (bodyFirstIndex <= bodyLastIndex) {
KnuthPossPosIter bodyIter = new KnuthPossPosIter(bodyList,
@@ -559,9 +552,13 @@
}
// after adding body areas, set the maximum area bpd
- if (curBlockArea.getBPD() < savedBPD) {
- curBlockArea.setBPD(savedBPD);
+ int childCount = curBlockArea.getChildAreas().size();
+ assert childCount >= 1 && childCount <= 2;
+ int itemBPD =
((Block)curBlockArea.getChildAreas().get(0)).getAllocBPD();
+ if (childCount == 2) {
+ itemBPD = Math.max(itemBPD,
((Block)curBlockArea.getChildAreas().get(1)).getAllocBPD());
}
+ curBlockArea.setBPD(itemBPD);
addMarkersToPage(false, isFirst(firstPos), isLast(lastPos));
Modified: xmlgraphics/fop/trunk/status.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/status.xml?rev=707631&r1=707630&r2=707631&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/status.xml (original)
+++ xmlgraphics/fop/trunk/status.xml Fri Oct 24 06:42:59 2008
@@ -53,6 +53,10 @@
<changes>
<release version="FOP Trunk" date="TBD">
+ <action context="Layout" dev="JM" type="fix">
+ Fixed a problem where the BPD or a block area could be wrong if there
is a nested,
+ absolutely positioned area (for example a block-container).
+ </action>
<action context="Layout" dev="AD" type="fix" fixes-bug="40798">
Bugzilla 40798: A conditional-page-master-reference with
page-position="last" qualifies
for a first page, if it is also the last. Additionally: also added
support for
Added:
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block-container_area-bpd.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block-container_area-bpd.xml?rev=707631&view=auto
==============================================================================
---
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block-container_area-bpd.xml
(added)
+++
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block-container_area-bpd.xml
Fri Oct 24 06:42:59 2008
@@ -0,0 +1,59 @@
+<?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 bpd values on block-containers.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format";>
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in"
page-height="5in">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>Testing area BPDs...</fo:block>
+ <fo:block-container id="bc1" absolute-position="absolute"
top="0.15cm" left="0.25cm">
+ <fo:block>
+ <fo:inline background-color="grey">bc1</fo:inline>
+ </fo:block>
+ </fo:block-container>
+ <fo:block background-color="orange">
+ <fo:block color="red" background-color="yellow">Below
+ <fo:block-container id="bc2" absolute-position="absolute"
top="0.35cm" left="0.25cm">
+ <fo:block>
+ <fo:inline background-color="grey">Above</fo:inline>
+ </fo:block>
+ </fo:block-container>
+ </fo:block>
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="28800" xpath="//flow/@bpd"/>
+ <eval expected="14400" xpath="//[EMAIL PROTECTED]'bc1']/@bpd"/>
+ <eval expected="14400" xpath="//[EMAIL PROTECTED]'bc2']/@bpd"/>
+ <eval expected="14400" xpath="//[EMAIL PROTECTED]'bc2']/../@bpd"/>
+ </checks>
+</testcase>
Propchange:
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block-container_area-bpd.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block-container_area-bpd.xml
------------------------------------------------------------------------------
svn:keywords = Id
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
