Default for border-[before|after]-width.conditionality set to discard as

per spec 7.7.9.

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

diff --git a/src/java/org/apache/fop/fo/FOPropertyMapping.java b/src/java/org/apache/fop/fo/FOPropertyMapping.java
index 872f841f885b5106bd5786a6dcc406bb5fb555bc..097500fff7f1dc6ae634371b8b51f828f411d535 100644 (file)
--- a/src/java/org/apache/fop/fo/FOPropertyMapping.java
+++ b/src/java/org/apache/fop/fo/FOPropertyMapping.java
@@ -734,7 +734,7 @@ public class FOPropertyMapping implements Constants {
         // border-before-width
         m  = new CondLengthProperty.Maker(PR_BORDER_BEFORE_WIDTH);
         m.useGeneric(genericCondBorderWidth);
-        m.getSubpropMaker(CP_CONDITIONALITY).setDefault("retain");
+        m.getSubpropMaker(CP_CONDITIONALITY).setDefault("discard");
         corr = new CorrespondingPropertyMaker(m);
         corr.setCorresponding(PR_BORDER_TOP_WIDTH, PR_BORDER_TOP_WIDTH,
                 PR_BORDER_RIGHT_WIDTH);
@@ -764,7 +764,7 @@ public class FOPropertyMapping implements Constants {
         // border-after-width
         m  = new CondLengthProperty.Maker(PR_BORDER_AFTER_WIDTH);
         m.useGeneric(genericCondBorderWidth);
-        m.getSubpropMaker(CP_CONDITIONALITY).setDefault("retain");
+        m.getSubpropMaker(CP_CONDITIONALITY).setDefault("discard");
         corr = new CorrespondingPropertyMaker(m);
         corr.setCorresponding(PR_BORDER_BOTTOM_WIDTH, PR_BORDER_BOTTOM_WIDTH,
                 PR_BORDER_LEFT_WIDTH);