You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by je...@apache.org on 2005/08/21 16:09:31 UTC
svn commit: r234203 - in /xmlgraphics/fop/trunk:
src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java
test/layoutengine/testcases/block-container-abs1.xml
Author: jeremias
Date: Sun Aug 21 07:09:25 2005
New Revision: 234203
URL: http://svn.apache.org/viewcvs?rev=234203&view=rev
Log:
Show and fix a bug where bottom/right positioning of block-containers didn't work properly when the block-container is nested in a block.
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java
xmlgraphics/fop/trunk/test/layoutengine/testcases/block-container-abs1.xml
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java?rev=234203&r1=234202&r2=234203&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java Sun Aug 21 07:09:25 2005
@@ -302,6 +302,7 @@
// curLM is a ?
//childLC.setStackLimit(MinOptMax.subtract(context
// .getStackLimit(), stackSize));
+ childLC.setStackLimit(context.getStackLimit());
childLC.setRefIPD(referenceIPD);
}
Modified: xmlgraphics/fop/trunk/test/layoutengine/testcases/block-container-abs1.xml
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/test/layoutengine/testcases/block-container-abs1.xml?rev=234203&r1=234202&r2=234203&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/testcases/block-container-abs1.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/testcases/block-container-abs1.xml Sun Aug 21 07:09:25 2005
@@ -43,6 +43,9 @@
This is some background-text.
This is some background-text.
This is some background-text.
+ <fo:block-container left="100pt" top="100pt" right="100pt" bottom="100pt" absolute-position="absolute" background-color="orange" color="black">
+ <fo:block background-color="yellow">absolutely positioned right/bottom (inside a block)</fo:block>
+ </fo:block-container>
This is some background-text.
This is some background-text.
This is some background-text.
@@ -66,7 +69,7 @@
<eval expected="216000" xpath="/areaTree/pageSequence/pageViewport/page[1]/regionViewport/regionBody/mainReference/span/flow/block[1]/block[1]/block[1]/@ipda"/>
<!-- *** second block-container *** -->
- <true xpath="/areaTree/pageSequence/pageViewport/page[1]/regionViewport/regionBody/mainReference/span/flow/block[1]/@is-viewport-area"/>
+ <true xpath="/areaTree/pageSequence/pageViewport/page[1]/regionViewport/regionBody/mainReference/span/flow/block[2]/@is-viewport-area"/>
<eval expected="absolute" xpath="/areaTree/pageSequence/pageViewport/page[1]/regionViewport/regionBody/mainReference/span/flow/block[2]/@positioning"/>
<eval expected="340000" xpath="/areaTree/pageSequence/pageViewport/page[1]/regionViewport/regionBody/mainReference/span/flow/block[2]/@ipd"/>
<eval expected="340000" xpath="/areaTree/pageSequence/pageViewport/page[1]/regionViewport/regionBody/mainReference/span/flow/block[2]/@ipda"/>
@@ -77,5 +80,16 @@
<!-- -> containing block (skipping dummy block)-->
<eval expected="340000" xpath="/areaTree/pageSequence/pageViewport/page[1]/regionViewport/regionBody/mainReference/span/flow/block[2]/block[1]/block[1]/@ipd"/>
<eval expected="340000" xpath="/areaTree/pageSequence/pageViewport/page[1]/regionViewport/regionBody/mainReference/span/flow/block[2]/block[1]/block[1]/@ipda"/>
+
+ <!-- *** third block-container *** -->
+ <true xpath="//flow/block[3]/block[1]/@is-viewport-area"/>
+ <eval expected="absolute" xpath="//flow/block[3]/block[1]/@positioning"/>
+ <eval expected="160000" xpath="//flow/block[3]/block[1]/@ipd"/>
+ <eval expected="160000" xpath="//flow/block[3]/block[1]/@ipda"/>
+ <eval expected="160000" xpath="//flow/block[3]/block[1]/@bpd"/>
+ <eval expected="160000" xpath="//flow/block[3]/block[1]/@bpda"/>
+ <eval expected="100000" xpath="//flow/block[3]/block[1]/@left-position"/>
+ <eval expected="100000" xpath="//flow/block[3]/block[1]/@top-position"/>
+
</checks>
</testcase>
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org