Added enum "none" as a legitimate value for max-height/min-height (behavior to be checked)

Added small testcase to check the correspondence mapping.


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

2 files changed, 59 insertions, 0 deletions

diff --git a/src/java/org/apache/fop/fo/FOPropertyMapping.java b/src/java/org/apache/fop/fo/FOPropertyMapping.java
index 3d1a46709..6d136535b 100644
--- a/src/java/org/apache/fop/fo/FOPropertyMapping.java
+++ b/src/java/org/apache/fop/fo/FOPropertyMapping.java
@@ -1424,6 +1424,7 @@ public final class FOPropertyMapping implements Constants {
 
         // 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 @@ public final class FOPropertyMapping implements Constants {
 
         // 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);
diff --git a/test/fotree/testcases/ipd_bpd_corresponding.fo b/test/fotree/testcases/ipd_bpd_corresponding.fo
new file mode 100644
index 000000000..e5232507f
--- /dev/null
+++ b/test/fotree/testcases/ipd_bpd_corresponding.fo
@@ -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>