Author: vhennebert
Date: Fri Feb 8 20:25:31 2013
New Revision: 1444217
URL: http://svn.apache.org/r1444217
Log:
FOP-2148: make page-position="only" work
Added:
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/page-position_only_elastic.xml
(with props)
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/page-position_only_simple.xml
(with props)
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/page-position_only_too-small.xml
(with props)
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageBreaker.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageProvider.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageBreaker.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageBreaker.java?rev=1444217&r1=1444216&r2=1444217&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageBreaker.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageBreaker.java
Fri Feb 8 20:25:31 2013
@@ -298,7 +298,8 @@ public class PageBreaker extends Abstrac
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) {
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageProvider.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageProvider.java?rev=1444217&r1=1444216&r2=1444217&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageProvider.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageProvider.java
Fri Feb 8 20:25:31 2013
@@ -339,4 +339,14 @@ public class PageProvider implements Con
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;
+ }
+
}
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java?rev=1444217&r1=1444216&r2=1444217&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
Fri Feb 8 20:25:31 2013
@@ -210,4 +210,13 @@ public class PageSequenceLayoutManager e
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);
+ }
+
}
Added:
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/page-position_only_elastic.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/page-position_only_elastic.xml?rev=1444217&view=auto
==============================================================================
---
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/page-position_only_elastic.xml
(added)
+++
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/page-position_only_elastic.xml
Fri Feb 8 20:25:31 2013
@@ -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>
Propchange:
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/page-position_only_elastic.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/page-position_only_elastic.xml
------------------------------------------------------------------------------
svn:keywords = Revision Id
Added:
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/page-position_only_simple.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/page-position_only_simple.xml?rev=1444217&view=auto
==============================================================================
---
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/page-position_only_simple.xml
(added)
+++
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/page-position_only_simple.xml
Fri Feb 8 20:25:31 2013
@@ -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>
Propchange:
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/page-position_only_simple.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/page-position_only_simple.xml
------------------------------------------------------------------------------
svn:keywords = Revision Id
Added:
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/page-position_only_too-small.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/page-position_only_too-small.xml?rev=1444217&view=auto
==============================================================================
---
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/page-position_only_too-small.xml
(added)
+++
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/page-position_only_too-small.xml
Fri Feb 8 20:25:31 2013
@@ -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>
Propchange:
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/page-position_only_too-small.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/page-position_only_too-small.xml
------------------------------------------------------------------------------
svn:keywords = Revision Id
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
