Author: jeremias
Date: Wed Dec 7 01:01:26 2005
New Revision: 354752
URL: http://svn.apache.org/viewcvs?rev=354752&view=rev
Log:
Bugzilla #37813:
Fixed a bug that occurred if the first block was span="all". A page break was
inserted in this situation, the first span was calculated as if it were
span="none".
Code added to remove empty span areas. This is a lot easier and cleaner than
trying not to instantiate the first span right from the beginning.
Added:
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/region-body_column-count_bug37813.xml
(with props)
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/MainReference.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AbstractBreaker.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
xmlgraphics/fop/trunk/status.xml
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/MainReference.java
URL:
http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/MainReference.java?rev=354752&r1=354751&r2=354752&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/MainReference.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/MainReference.java Wed
Dec 7 01:01:26 2005
@@ -51,6 +51,10 @@
* @return the created span area.
*/
public Span createSpan(boolean spanAll) {
+ if (spanAreas.size() > 0 && getCurrentSpan().getBPD() == 0) {
+ //Remove the current one if it is empty
+ spanAreas.remove(spanAreas.size() - 1);
+ }
RegionViewport rv = parent.getRegionViewport();
int ipdWidth = (int) parent.getIPD()
- rv.getBorderAndPaddingWidthStart() -
rv.getBorderAndPaddingWidthEnd();
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AbstractBreaker.java
URL:
http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AbstractBreaker.java?rev=354752&r1=354751&r2=354752&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AbstractBreaker.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AbstractBreaker.java
Wed Dec 7 01:01:26 2005
@@ -439,6 +439,7 @@
BlockSequence blockList;
if ((returnedList = getNextKnuthElements(childLC, alignment)) != null)
{
if (returnedList.size() == 0) {
+ nextSequenceStartsOn = handleSpanChange(childLC,
nextSequenceStartsOn);
return nextSequenceStartsOn;
}
blockList = new BlockSequence(nextSequenceStartsOn);
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
URL:
http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java?rev=354752&r1=354751&r2=354752&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
Wed Dec 7 01:01:26 2005
@@ -29,6 +29,7 @@
import org.apache.fop.area.PageViewport;
import org.apache.fop.area.LineArea;
import org.apache.fop.area.Resolvable;
+import org.apache.fop.area.Span;
import org.apache.fop.fo.Constants;
import org.apache.fop.fo.flow.Marker;
@@ -326,7 +327,9 @@
+ ", new start position: " + newStartPos);
//Handle page break right here to avoid any side-effects
- handleBreakTrait(EN_PAGE);
+ if (newStartPos > 0) {
+ handleBreakTrait(EN_PAGE);
+ }
pageBreakHandled = true;
//Update so the available BPD is reported correctly
pvProvider.setStartOfNextElementList(currentPageNum,
Modified: xmlgraphics/fop/trunk/status.xml
URL:
http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/status.xml?rev=354752&r1=354751&r2=354752&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/status.xml (original)
+++ xmlgraphics/fop/trunk/status.xml Wed Dec 7 01:01:26 2005
@@ -27,6 +27,10 @@
<changes>
<release version="FOP Trunk">
+ <action context="Code" dev="JM" type="fix" fixes-bug="37813">
+ Bugfix: A span="all" on the first block cause a subsequent page break
and the first block
+ didn't span all columns.
+ </action>
<action context="Code" dev="JM" type="fix">
Bugfix: Self-created OutputStreams in PNG Renderer were not properly
closed.
</action>
Added:
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/region-body_column-count_bug37813.xml
URL:
http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/region-body_column-count_bug37813.xml?rev=354752&view=auto
==============================================================================
---
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/region-body_column-count_bug37813.xml
(added)
+++
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/region-body_column-count_bug37813.xml
Wed Dec 7 01:01:26 2005
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2005 The Apache Software Foundation
+
+ Licensed 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>
+ This test checks multi-column documents. Checks a problem described in
Bugzilla #37813.
+ A page break is performed after the first block which spans.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format";>
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="320pt"
page-height="5in">
+ <fo:region-body column-count="3" column-gap="10pt"/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block span="all">
+ <fo:block>This line is spanned over all columns.</fo:block>
+ </fo:block>
+ <fo:block>
+ <fo:block>line1</fo:block>
+ <fo:block>line2</fo:block>
+ <fo:block>line3</fo:block>
+ <fo:block>line4</fo:block>
+ <fo:block>line5</fo:block>
+ <fo:block>line6</fo:block>
+ </fo:block>
+ <fo:block span="all">
+ <fo:block>This line is spanned over all columns.</fo:block>
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="1" xpath="count(//pageViewport)"/>
+ <eval expected="14400" xpath="//span[1]/@bpd"/>
+ <eval expected="28800" xpath="//span[2]/@bpd"/>
+ <eval expected="14400" xpath="//span[3]/@bpd"/>
+ </checks>
+</testcase>
Propchange:
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/region-body_column-count_bug37813.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/region-body_column-count_bug37813.xml
------------------------------------------------------------------------------
svn:keywords = Id
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
