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 ad...@apache.org on 2008/05/01 11:52:24 UTC
svn commit: r652465 - in /xmlgraphics/fop/trunk:
src/java/org/apache/fop/fo/FOPropertyMapping.java
test/fotree/testcases/ipd_bpd_corresponding.fo
Author: adelmelle
Date: Thu May 1 02:52:24 2008
New Revision: 652465
URL: http://svn.apache.org/viewvc?rev=652465&view=rev
Log:
Added enum "none" as a legitimate value for max-height/min-height (behavior to be checked)
Added small testcase to check the correspondence mapping.
Added:
xmlgraphics/fop/trunk/test/fotree/testcases/ipd_bpd_corresponding.fo (with props)
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOPropertyMapping.java
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOPropertyMapping.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOPropertyMapping.java?rev=652465&r1=652464&r2=652465&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOPropertyMapping.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOPropertyMapping.java Thu May 1 02:52:24 2008
@@ -1424,6 +1424,7 @@
// max-height
m = new LengthProperty.Maker(PR_MAX_HEIGHT);
+ m.addEnum("NONE", getEnumProperty(EN_NONE, "NONE"));
m.setInherited(false);
m.setDefault("0pt");
m.setPercentBase(LengthBase.CONTAINING_BLOCK_HEIGHT);
@@ -1431,6 +1432,7 @@
// max-width
m = new LengthProperty.Maker(PR_MAX_WIDTH);
+ m.addEnum("NONE", getEnumProperty(EN_NONE, "NONE"));
m.setInherited(false);
m.setDefault("none");
m.setPercentBase(LengthBase.CONTAINING_BLOCK_WIDTH);
Added: xmlgraphics/fop/trunk/test/fotree/testcases/ipd_bpd_corresponding.fo
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/fotree/testcases/ipd_bpd_corresponding.fo?rev=652465&view=auto
==============================================================================
--- xmlgraphics/fop/trunk/test/fotree/testcases/ipd_bpd_corresponding.fo (added)
+++ xmlgraphics/fop/trunk/test/fotree/testcases/ipd_bpd_corresponding.fo Thu May 1 02:52:24 2008
@@ -0,0 +1,57 @@
+<?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 $ -->
+<!-- This test verifies the correspondence mapping: height/width -> bpd/ipd -->
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:test="http://xmlgraphics.apache.org/fop/test">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="A4" page-height="29.7cm" page-width="21cm" margin="2cm">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="A4">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block-container height="360pt" min-height="120pt" max-height="720pt"
+ width="360pt" min-width="120pt" max-width="504pt">
+ <test:assert property="block-progression-dimension.minimum" expected="120000mpt" />
+ <test:assert property="block-progression-dimension.optimum" expected="360000mpt" />
+ <test:assert property="block-progression-dimension.maximum" expected="720000mpt" />
+ <test:assert property="inline-progression-dimension.minimum" expected="120000mpt" />
+ <test:assert property="inline-progression-dimension.optimum" expected="360000mpt" />
+ <test:assert property="inline-progression-dimension.maximum" expected="504000mpt" />
+
+ <fo:block>
+ <fo:block>Hello World!</fo:block>
+ </fo:block>
+ </fo:block-container>
+ <fo:block-container writing-mode="tb-rl"
+ height="360pt" min-height="120pt" max-height="720pt"
+ width="360pt" min-width="120pt" max-width="504pt">
+ <test:assert property="inline-progression-dimension.minimum" expected="120000mpt" />
+ <test:assert property="inline-progression-dimension.optimum" expected="360000mpt" />
+ <test:assert property="inline-progression-dimension.maximum" expected="720000mpt" />
+ <test:assert property="block-progression-dimension.minimum" expected="120000mpt" />
+ <test:assert property="block-progression-dimension.optimum" expected="360000mpt" />
+ <test:assert property="block-progression-dimension.maximum" expected="504000mpt" />
+
+ <fo:block>
+ <fo:block>Hello World!</fo:block>
+ </fo:block>
+ </fo:block-container>
+ </fo:flow>
+ </fo:page-sequence>
+</fo:root>
Propchange: xmlgraphics/fop/trunk/test/fotree/testcases/ipd_bpd_corresponding.fo
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/test/fotree/testcases/ipd_bpd_corresponding.fo
------------------------------------------------------------------------------
svn:keywords = Id
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org