Added support for block-progression-dimension="auto"

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_InlineContainer@1535417 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/java/org/apache/fop/layoutmgr/inline/InlineContainerLayoutManager.java b/src/java/org/apache/fop/layoutmgr/inline/InlineContainerLayoutManager.java
index fb342bd8e501c6b8b69669771a545d5753c784f9..107461c0a8910bd371245d570517c9e6f131aa7a 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/inline/InlineContainerLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/inline/InlineContainerLayoutManager.java
@@ -35,6 +35,7 @@ import org.apache.fop.fonts.Font;
 import org.apache.fop.fonts.FontInfo;
 import org.apache.fop.fonts.FontTriplet;
 import org.apache.fop.layoutmgr.AbstractLayoutManager;
+import org.apache.fop.layoutmgr.ElementListUtils;
 import org.apache.fop.layoutmgr.InlineKnuthSequence;
 import org.apache.fop.layoutmgr.KnuthPossPosIter;
 import org.apache.fop.layoutmgr.KnuthSequence;
@@ -74,12 +75,11 @@ public class InlineContainerLayoutManager extends AbstractLayoutManager implemen
 
     @Override
     public List<KnuthSequence> getNextKnuthElements(LayoutContext context, int alignment) {
-        InlineContainer ic = (InlineContainer) fobj;
         determineIPD(context);
-        contentAreaBPD = getLength(ic.getBlockProgressionDimension());
         LayoutContext childLC = LayoutContext.offspringOf(context); // TODO copyOf?
         childLC.setRefIPD(contentAreaIPD);
         childElements = getChildKnuthElements(childLC, alignment); // TODO which alignment?
+        determineBPD();
         AlignmentContext alignmentContext = makeAlignmentContext(context); // TODO correct?
         Position position = new Position(this, 0);
         KnuthSequence knuthSequence = new InlineKnuthSequence();
@@ -103,12 +103,14 @@ public class InlineContainerLayoutManager extends AbstractLayoutManager implemen
         }
     }
 
-    private int getLength(LengthRangeProperty property) {
-        Property optimum = property.getOptimum(this); // TODO percent base context
+    private void determineBPD() {
+        LengthRangeProperty bpd = ((InlineContainer) fobj).getBlockProgressionDimension();
+        Property optimum = bpd.getOptimum(this); // TODO percent base context
         if (optimum.isAuto()) {
-            throw new UnsupportedOperationException("auto dimension not supported");
+            contentAreaBPD = ElementListUtils.calcContentLength(childElements);
+        } else {
+            contentAreaBPD = optimum.getLength().getValue(this); // TODO percent base context
         }
-        return optimum.getLength().getValue(this); // TODO percent base context
     }
 
     private List<ListElement> getChildKnuthElements(LayoutContext layoutContext, int alignment) {

diff --git a/test/layoutengine/standard-testcases/inline-container_bpd.xml b/test/layoutengine/standard-testcases/inline-container_bpd.xml
new file mode 100644 (file)
index 0000000..0a9d874
--- /dev/null
+++ b/test/layoutengine/standard-testcases/inline-container_bpd.xml
@@ -0,0 +1,46 @@
+<?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>
+      Checks that inline-progression-dimension on fo:inline-container is properly handled.
+    </p>
+  </info>
+  <fo>
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="8pt" line-height="10pt">
+      <fo:layout-master-set>
+        <fo:simple-page-master master-name="page"
+          page-height="220pt" page-width="320pt" margin="10pt">
+          <fo:region-body/>
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fo:page-sequence master-reference="page">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block>Before: <fo:inline-container width="60pt">
+              <fo:block>This text inside inline-container should fit on four lines.</fo:block>
+            </fo:inline-container> After.</fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+
+  <checks>
+    <eval expected="40000" xpath="//viewport/@bpd"/>
+  </checks>
+</testcase>