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 vh...@apache.org on 2013/10/24 17:36:13 UTC
svn commit: r1535417 - in /xmlgraphics/fop/branches/Temp_InlineContainer:
src/java/org/apache/fop/layoutmgr/inline/InlineContainerLayoutManager.java
test/layoutengine/standard-testcases/inline-container_bpd.xml
Author: vhennebert
Date: Thu Oct 24 15:36:12 2013
New Revision: 1535417
URL: http://svn.apache.org/r1535417
Log:
Added support for block-progression-dimension="auto"
Added:
xmlgraphics/fop/branches/Temp_InlineContainer/test/layoutengine/standard-testcases/inline-container_bpd.xml (with props)
Modified:
xmlgraphics/fop/branches/Temp_InlineContainer/src/java/org/apache/fop/layoutmgr/inline/InlineContainerLayoutManager.java
Modified: xmlgraphics/fop/branches/Temp_InlineContainer/src/java/org/apache/fop/layoutmgr/inline/InlineContainerLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/src/java/org/apache/fop/layoutmgr/inline/InlineContainerLayoutManager.java?rev=1535417&r1=1535416&r2=1535417&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/src/java/org/apache/fop/layoutmgr/inline/InlineContainerLayoutManager.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/src/java/org/apache/fop/layoutmgr/inline/InlineContainerLayoutManager.java Thu Oct 24 15:36:12 2013
@@ -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 InlineContainerLayoutManage
@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 InlineContainerLayoutManage
}
}
- 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) {
Added: xmlgraphics/fop/branches/Temp_InlineContainer/test/layoutengine/standard-testcases/inline-container_bpd.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/layoutengine/standard-testcases/inline-container_bpd.xml?rev=1535417&view=auto
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/layoutengine/standard-testcases/inline-container_bpd.xml (added)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/layoutengine/standard-testcases/inline-container_bpd.xml Thu Oct 24 15:36:12 2013
@@ -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>
Propchange: xmlgraphics/fop/branches/Temp_InlineContainer/test/layoutengine/standard-testcases/inline-container_bpd.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/branches/Temp_InlineContainer/test/layoutengine/standard-testcases/inline-container_bpd.xml
------------------------------------------------------------------------------
svn:keywords = Revision Id
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org