From da7ce04812f24833fd981a3b62cffcbcdcfde755 Mon Sep 17 00:00:00 2001 From: Finn Bock Date: Wed, 22 Sep 2004 19:19:36 +0000 Subject: [PATCH] Calculate the [start|end]-indent in the first 2 cases in 5.3.2. The last case (no absolute margin specified) still needs more work. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197964 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/fop/fo/properties/IndentPropertyMaker.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/java/org/apache/fop/fo/properties/IndentPropertyMaker.java b/src/java/org/apache/fop/fo/properties/IndentPropertyMaker.java index cd04c0ebf..fe029370c 100644 --- a/src/java/org/apache/fop/fo/properties/IndentPropertyMaker.java +++ b/src/java/org/apache/fop/fo/properties/IndentPropertyMaker.java @@ -77,12 +77,11 @@ public class IndentPropertyMaker extends CorrespondingPropertyMaker { // Calculate the values as described in 5.3.2. try { Numeric v = new FixedLength(0); - /* - if (!propertyList.getFObj().generatesInlineAreas()) { - String propName = FOPropertyMapping.getPropertyName(this.propId); - v = v.add(propertyList.getInherited(propName).getNumeric()); + if (!propertyList.getFObj().generatesReferenceAreas()) { + // The inherited_value_of([start|end]-indent) + v = NumericOp.addition(v, propertyList.getInherited(this.baseMaker.propId).getNumeric()); } - */ + // The corresponding absolute margin-[right|left}. v = NumericOp.addition(v, propertyList.get(propertyList.getWritingMode(lr_tb, rl_tb, tb_rl)).getNumeric()); v = NumericOp.addition(v, getCorresponding(paddingCorresponding, propertyList).getNumeric()); v = NumericOp.addition(v, getCorresponding(borderWidthCorresponding, propertyList).getNumeric()); -- 2.39.5