Tweak page-break-* shorthands; keeps now working properly

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

2 files changed, 23 insertions, 18 deletions

diff --git a/test/fotree/testcases/page-break_shorthand-expansion.fo b/test/fotree/testcases/page-break_shorthand-expansion.fo
index 5643e6bd8..71743c208 100644
--- a/test/fotree/testcases/page-break_shorthand-expansion.fo
+++ b/test/fotree/testcases/page-break_shorthand-expansion.fo
@@ -25,55 +25,55 @@
       <fo:flow flow-name="xsl-region-body">
         <fo:block page-break-before="avoid">
           <test:assert property="break-before" expected="AUTO" />
-          <test:assert property="keep-with-previous" expected="ALWAYS" />
+          <test:assert property="keep-with-previous.within-page" expected="ALWAYS" />
           Block 1: testing page-break-before="avoid"
         </fo:block>
         <fo:block page-break-before="always">
           <test:assert property="break-before" expected="PAGE" />
-          <test:assert property="keep-with-previous" expected="AUTO" />
+          <test:assert property="keep-with-previous.within-page" expected="AUTO" />
           Block 2: testing page-break-before="always"
         </fo:block>
         <fo:block page-break-before="left">
-          <test:assert property="break-before" expected="EVEN-PAGE" />
-          <test:assert property="keep-with-previous" expected="AUTO" />
+          <test:assert property="break-before" expected="EVEN_PAGE" />
+          <test:assert property="keep-with-previous.within-page" expected="AUTO" />
           Block 3: testing page-break-before="left"
         </fo:block>
         <fo:block page-break-before="right">
-          <test:assert property="break-before" expected="ODD-PAGE" />
-          <test:assert property="keep-with-previous" expected="AUTO" />
+          <test:assert property="break-before" expected="ODD_PAGE" />
+          <test:assert property="keep-with-previous.within-page" expected="AUTO" />
           Block 4: testing page-break-before="right"
         </fo:block>
         <fo:block page-break-after="avoid">
           <test:assert property="break-after" expected="AUTO" />
-          <test:assert property="keep-with-next" expected="ALWAYS" />
+          <test:assert property="keep-with-next.within-page" expected="ALWAYS" />
           Block 5: testing page-break-after="avoid"
         </fo:block>
         <fo:block page-break-after="always">
           <test:assert property="break-after" expected="PAGE" />
-          <test:assert property="keep-with-next" expected="AUTO" />
+          <test:assert property="keep-with-next.within-page" expected="AUTO" />
           Block 6: testing page-break-after="always"
         </fo:block>
         <fo:block page-break-after="left">
-          <test:assert property="break-after" expected="EVEN-PAGE" />
-          <test:assert property="keep-with-next" expected="AUTO" />
+          <test:assert property="break-after" expected="EVEN_PAGE" />
+          <test:assert property="keep-with-next.within-page" expected="AUTO" />
           Block 7: testing page-break-after="left"
         </fo:block>
         <fo:block page-break-after="right">
-          <test:assert property="break-after" expected="ODD-PAGE" />
-          <test:assert property="keep-with-next" expected="AUTO" />
+          <test:assert property="break-after" expected="ODD_PAGE" />
+          <test:assert property="keep-with-next.within-page" expected="AUTO" />
           Block 8: testing page-break-after="right"
         </fo:block>
         <fo:block page-break-inside="avoid">
-          <test:assert property="keep-together" expected="ALWAYS" />
+          <test:assert property="keep-together.within-page" expected="ALWAYS" />
           Block 9: testing page-break-inside="avoid"
         </fo:block>
         <fo:block page-break-before="left" page-break-inside="avoid"
                   page-break-after="right">
-          <test:assert property="break-before" expected="EVEN-PAGE" />
-          <test:assert property="keep-with-previous" expected="AUTO" />
-          <test:assert property="break-after" expected="ODD-PAGE" />
-          <test:assert property="keep-with-next" expected="AUTO" />
-          <test:assert property="keep-together" expected="ALWAYS" />
+          <test:assert property="break-before" expected="EVEN_PAGE" />
+          <test:assert property="keep-with-previous.within-page" expected="AUTO" />
+          <test:assert property="break-after" expected="ODD_PAGE" />
+          <test:assert property="keep-with-next.within-page" expected="AUTO" />
+          <test:assert property="keep-together.within-page" expected="ALWAYS" />
          Block 10: testing page-break-before="left", page-break-inside="avoid"
           and page-break-after="right"
         </fo:block>
diff --git a/test/java/org/apache/fop/fotreetest/ext/AssertElement.java b/test/java/org/apache/fop/fotreetest/ext/AssertElement.java
index 0dfb4d41b..0a40b7604 100644
--- a/test/java/org/apache/fop/fotreetest/ext/AssertElement.java
+++ b/test/java/org/apache/fop/fotreetest/ext/AssertElement.java
@@ -23,6 +23,7 @@ import org.apache.fop.apps.FOPException;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FOPropertyMapping;
 import org.apache.fop.fo.PropertyList;
+import org.apache.fop.fo.properties.KeepProperty;
 import org.apache.fop.fo.properties.LengthPairProperty;
 import org.apache.fop.fo.properties.LengthRangeProperty;
 import org.apache.fop.fo.properties.Property;
@@ -79,6 +80,10 @@ public class AssertElement extends TestObj {
                 if (lrp != null) {
                     prop = lrp.getComponent(FOPropertyMapping.getSubPropertyId(component));
                 }
+                KeepProperty kp = mainProp.getKeep();
+                if (kp != null) {
+                    prop = kp.getComponent(FOPropertyMapping.getSubPropertyId(component));
+                }
             }
             String s = String.valueOf(prop);
             String expected = attlist.getValue("expected");