FOP-2148: make page-position="only" work

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

diff --git a/src/java/org/apache/fop/layoutmgr/PageBreaker.java b/src/java/org/apache/fop/layoutmgr/PageBreaker.java
index 309f4e32fd6b5ed28a0e26b79e42410fe8604504..6a10fa22ff931ff216321921ab8904c77c38da5b 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/PageBreaker.java
+++ b/src/java/org/apache/fop/layoutmgr/PageBreaker.java
@@ -298,7 +298,8 @@ public class PageBreaker extends AbstractBreaker {
             return;
         }
 
-        boolean lastPageMasterDefined = pslm.getPageSequence().hasPagePositionLast();
+        boolean lastPageMasterDefined = pslm.getPageSequence().hasPagePositionLast()
+                || pslm.getPageSequence().hasPagePositionOnly() && pslm.isOnFirstPage(partCount - 1);
         if (!hasMoreContent()) {
             //last part is reached
             if (lastPageMasterDefined) {

diff --git a/src/java/org/apache/fop/layoutmgr/PageProvider.java b/src/java/org/apache/fop/layoutmgr/PageProvider.java
index 8117d547de1d66249d1735cee5056a304c193ed2..1cb6251d91eb1406ee91d63e2b8dd9c1d0cb157d 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/PageProvider.java
+++ b/src/java/org/apache/fop/layoutmgr/PageProvider.java
@@ -339,4 +339,14 @@ public class PageProvider implements Constants {
         return page;
     }
 
+    /**
+     * Indicates whether the column/page at the given index is on the first page of the page sequence.
+     *
+     * @return {@code true} if the given part is on the first page of the sequence
+     */
+    boolean isOnFirstPage(int partIndex) {
+        Column column = getColumn(partIndex);
+        return startPageOfCurrentElementList + column.pageIndex == startPageOfPageSequence;
+    }
+
 }

diff --git a/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java b/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
index 577f172ebf873626e00ec4f034d7025ba97c787a..b5e21aa63c405c7f656e66a8df003174e2eac3bc 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
@@ -210,4 +210,13 @@ public class PageSequenceLayoutManager extends AbstractPageSequenceLayoutManager
         return forcedLastPageNum;
     }
 
+    /**
+     * Indicates whether the column/page at the given index is on the first page of this page sequence.
+     *
+     * @return {@code true} if the given part is on the first page of the sequence
+     */
+    boolean isOnFirstPage(int partIndex) {
+        return pageProvider.isOnFirstPage(partIndex);
+    }
+
 }

diff --git a/test/layoutengine/standard-testcases/page-position_only_elastic.xml b/test/layoutengine/standard-testcases/page-position_only_elastic.xml
new file mode 100644 (file)
index 0000000..bc6cd3f
--- /dev/null
+++ b/test/layoutengine/standard-testcases/page-position_only_elastic.xml
@@ -0,0 +1,61 @@
+<?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$ -->
+<testcase>
+  <info>
+    <p>There is a possibility to lay out this document on two pages by stretching the elastic 
+      spaces. The best layout though is a one-page layout, and despite the presence of the two-page 
+      possibility, the page-master for page-position="only" must still be chosen.</p>
+  </info>
+  <fo>
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="8pt" line-height="10pt">
+      <fo:layout-master-set>
+        <fo:simple-page-master master-name="default" page-height="120pt" page-width="220pt" 
+          margin="10pt">
+          <fo:region-body/>
+        </fo:simple-page-master>
+        <fo:simple-page-master master-name="only" page-height="120pt" page-width="220pt" 
+          margin="10pt">
+          <fo:region-body background-color="#E0E0E0"/>
+        </fo:simple-page-master>
+        <fo:page-sequence-master master-name="with-only">
+          <fo:repeatable-page-master-alternatives>
+            <fo:conditional-page-master-reference master-reference="only" page-position="only"/>
+            <fo:conditional-page-master-reference master-reference="default"/>
+          </fo:repeatable-page-master-alternatives>
+        </fo:page-sequence-master>
+      </fo:layout-master-set>
+
+      <fo:page-sequence master-reference="with-only">
+        <fo:flow flow-name="xsl-region-body" text-align="justify" space-after.minimum="5pt" 
+          space-after.optimum="10pt" space-after.maximum="30pt">
+          <fo:block space-after="inherit">Only page</fo:block>
+          <fo:block space-after="inherit">Only page</fo:block>
+          <fo:block space-after="inherit">Only page</fo:block>
+          <fo:block space-after="inherit">Only page</fo:block>
+          <fo:block space-after="inherit">Only page</fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="1" xpath="count(//pageSequence[1]/pageViewport)"/>
+    <eval expected="only"    xpath="//pageSequence[1]/pageViewport/@simple-page-master-name"/>
+  </checks>
+</testcase>

diff --git a/test/layoutengine/standard-testcases/page-position_only_simple.xml b/test/layoutengine/standard-testcases/page-position_only_simple.xml
new file mode 100644 (file)
index 0000000..2bf3c79
--- /dev/null
+++ b/test/layoutengine/standard-testcases/page-position_only_simple.xml
@@ -0,0 +1,77 @@
+<?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$ -->
+<testcase>
+  <info>
+    <p>Basic test for page-position="only".</p>
+  </info>
+  <fo>
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="8pt" line-height="10pt">
+      <fo:layout-master-set>
+        <fo:simple-page-master master-name="default" page-height="120pt" page-width="220pt" 
+          margin="10pt">
+          <fo:region-body/>
+        </fo:simple-page-master>
+        <fo:simple-page-master master-name="only" page-height="120pt" page-width="220pt" 
+          margin="10pt">
+          <fo:region-body background-color="#E0E0E0"/>
+        </fo:simple-page-master>
+        <fo:page-sequence-master master-name="with-only">
+          <fo:repeatable-page-master-alternatives>
+            <fo:conditional-page-master-reference master-reference="only" page-position="only"/>
+            <fo:conditional-page-master-reference master-reference="default"/>
+          </fo:repeatable-page-master-alternatives>
+        </fo:page-sequence-master>
+      </fo:layout-master-set>
+
+      <fo:page-sequence master-reference="with-only">
+        <fo:flow flow-name="xsl-region-body" text-align="justify">
+          <fo:block>Only page</fo:block>
+          <fo:block>Only page</fo:block>
+          <fo:block>Only page</fo:block>
+          <fo:block>Only page</fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+
+      <fo:page-sequence master-reference="with-only">
+        <fo:flow flow-name="xsl-region-body" text-align="justify">
+          <fo:block>Two pages</fo:block>
+          <fo:block>Two pages</fo:block>
+          <fo:block>Two pages</fo:block>
+          <fo:block>Two pages</fo:block>
+          <fo:block>Two pages</fo:block>
+          <fo:block>Two pages</fo:block>
+          <fo:block>Two pages</fo:block>
+          <fo:block>Two pages</fo:block>
+          <fo:block>Two pages</fo:block>
+          <fo:block>Two pages</fo:block>
+          <fo:block>Two pages</fo:block>
+          <fo:block>Two pages</fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="1" xpath="count(//pageSequence[1]/pageViewport)"/>
+    <eval expected="only"    xpath="//pageSequence[1]/pageViewport/@simple-page-master-name"/>
+    <eval expected="2" xpath="count(//pageSequence[2]/pageViewport)"/>
+    <eval expected="default" xpath="//pageSequence[2]/pageViewport[1]/@simple-page-master-name"/>
+    <eval expected="default" xpath="//pageSequence[2]/pageViewport[2]/@simple-page-master-name"/>
+  </checks>
+</testcase>

diff --git a/test/layoutengine/standard-testcases/page-position_only_too-small.xml b/test/layoutengine/standard-testcases/page-position_only_too-small.xml
new file mode 100644 (file)
index 0000000..589c3a2
--- /dev/null
+++ b/test/layoutengine/standard-testcases/page-position_only_too-small.xml
@@ -0,0 +1,58 @@
+<?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$ -->
+<testcase>
+  <info>
+    <p>When the page-master for page-position="only" cannot accommodate the content, two default 
+      pages must be used instead.</p>
+  </info>
+  <fo>
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="8pt" line-height="10pt">
+      <fo:layout-master-set>
+        <fo:simple-page-master master-name="default" page-height="120pt" page-width="220pt" 
+          margin="10pt">
+          <fo:region-body/>
+        </fo:simple-page-master>
+        <fo:simple-page-master master-name="only" page-height="120pt" page-width="220pt" 
+          margin="10pt">
+          <fo:region-body background-color="#E0E0E0" margin-top="40pt" margin-bottom="40pt"/>
+        </fo:simple-page-master>
+        <fo:page-sequence-master master-name="with-only">
+          <fo:repeatable-page-master-alternatives>
+            <fo:conditional-page-master-reference master-reference="only" page-position="only"/>
+            <fo:conditional-page-master-reference master-reference="default"/>
+          </fo:repeatable-page-master-alternatives>
+        </fo:page-sequence-master>
+      </fo:layout-master-set>
+
+      <fo:page-sequence master-reference="with-only">
+        <fo:flow flow-name="xsl-region-body" text-align="justify">
+          <fo:block>Too big for only page</fo:block>
+          <fo:block>Too big for only page</fo:block>
+          <fo:block>Too big for only page</fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="2" xpath="count(//pageSequence[1]/pageViewport)"/>
+    <eval expected="default" xpath="//pageSequence[1]/pageViewport[1]/@simple-page-master-name"/>
+    <eval expected="default" xpath="//pageSequence[1]/pageViewport[2]/@simple-page-master-name"/>
+  </checks>
+</testcase>