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

diff --git a/src/java/org/apache/fop/fo/properties/IndentPropertyMaker.java b/src/java/org/apache/fop/fo/properties/IndentPropertyMaker.java
index cd04c0ebf14f141543a288bc75f989736bc49ea6..fe029370c8f623f8ad974fcc2ec7719b599e76ef 100644 (file)
--- 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());