diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/documentation/content/xdocs/compliance.ihtml | 8 | ||||
| -rw-r--r-- | src/java/org/apache/fop/fo/FOPropertyMapping.java | 14 |
2 files changed, 13 insertions, 9 deletions
diff --git a/src/documentation/content/xdocs/compliance.ihtml b/src/documentation/content/xdocs/compliance.ihtml index a704ee791..181f1fe1d 100644 --- a/src/documentation/content/xdocs/compliance.ihtml +++ b/src/documentation/content/xdocs/compliance.ihtml @@ -3995,7 +3995,7 @@ <td class="no">no</td> - <td class="no">no</td> + <td class="yes">yes</td> <td align="center"> </td> </tr> @@ -4014,7 +4014,7 @@ <td class="no">no</td> - <td class="no">no</td> + <td class="yes">yes</td> <td align="center"> </td> </tr> @@ -4033,7 +4033,7 @@ <td class="no">no</td> - <td class="no">no</td> + <td class="yes">yes</td> <td align="center"> </td> </tr> @@ -4052,7 +4052,7 @@ <td class="no">no</td> - <td class="no">no</td> + <td class="yes">yes</td> <td align="center"> </td> </tr> diff --git a/src/java/org/apache/fop/fo/FOPropertyMapping.java b/src/java/org/apache/fop/fo/FOPropertyMapping.java index 5d4185d68..3d1a46709 100644 --- a/src/java/org/apache/fop/fo/FOPropertyMapping.java +++ b/src/java/org/apache/fop/fo/FOPropertyMapping.java @@ -1423,27 +1423,31 @@ public final class FOPropertyMapping implements Constants { addPropertyMaker("inline-progression-dimension", m); // max-height - m = new ToBeImplementedProperty.Maker(PR_MAX_HEIGHT); + m = new LengthProperty.Maker(PR_MAX_HEIGHT); m.setInherited(false); m.setDefault("0pt"); + m.setPercentBase(LengthBase.CONTAINING_BLOCK_HEIGHT); addPropertyMaker("max-height", m); // max-width - m = new ToBeImplementedProperty.Maker(PR_MAX_WIDTH); + m = new LengthProperty.Maker(PR_MAX_WIDTH); m.setInherited(false); m.setDefault("none"); + m.setPercentBase(LengthBase.CONTAINING_BLOCK_WIDTH); addPropertyMaker("max-width", m); // min-height - m = new ToBeImplementedProperty.Maker(PR_MIN_HEIGHT); + m = new LengthProperty.Maker(PR_MIN_HEIGHT); m.setInherited(false); m.setDefault("0pt"); + m.setPercentBase(LengthBase.CONTAINING_BLOCK_HEIGHT); addPropertyMaker("min-height", m); // min-width - m = new ToBeImplementedProperty.Maker(PR_MIN_WIDTH); + m = new LengthProperty.Maker(PR_MIN_WIDTH); m.setInherited(false); - m.setDefault(""); + m.setDefault(""); //UA dependent + m.setPercentBase(LengthBase.CONTAINING_BLOCK_WIDTH); addPropertyMaker("min-width", m); // scaling |