From 73b502a2dc801586499419081382fb69317fd043 Mon Sep 17 00:00:00 2001 From: Jeremias Maerki Date: Mon, 19 Dec 2005 09:50:15 +0000 Subject: Fix for width checks. They didn't take start-indent and end-indent into account. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@357674 13f79535-47bb-0310-9956-ffa450edef68 --- src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java | 3 ++- src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java b/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java index 7f9967dbe..e39500bef 100644 --- a/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java @@ -226,7 +226,8 @@ public class BlockContainerLayoutManager extends BlockStackingLayoutManager absoluteCTM = CTM.getCTMandRelDims(getBlockContainerFO().getReferenceOrientation(), getBlockContainerFO().getWritingMode(), rect, relDims); - if (rect.getWidth() > context.getRefIPD()) { + int availableIPD = referenceIPD - getIPIndents(); + if (rect.getWidth() > availableIPD) { log.warn(FONode.decorateWithContextInfo( "The extent in inline-progression-direction (width) of a block-container is" + " bigger than the available space (" diff --git a/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java b/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java index 630d31b6d..5bfab332e 100644 --- a/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java @@ -171,7 +171,8 @@ public class TableLayoutManager extends BlockStackingLayoutManager updateContentAreaIPDwithOverconstrainedAdjust(); } - if (getContentAreaIPD() > context.getRefIPD()) { + int availableIPD = referenceIPD - getIPIndents(); + if (getContentAreaIPD() > availableIPD) { log.warn(FONode.decorateWithContextInfo( "The extent in inline-progression-direction (width) of a table is" + " bigger than the available space (" -- cgit v1.2.3