Author: jeremias
Date: Thu Dec 8 00:51:14 2005
New Revision: 355042
URL: http://svn.apache.org/viewcvs?rev=355042&view=rev
Log:
Bugzilla #37828:
Bugfix for column balancing with large amounts of text.
Added:
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/region-body_column-count_bug37828.xml
(with props)
Modified:
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/layoutmgr/PageSequenceLayoutManager.java
URL:
http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java?rev=355042&r1=355041&r2=355042&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
Thu Dec 8 00:51:14 2005
@@ -349,6 +349,8 @@
AbstractBreaker.log.debug("restart: iOptPageCount= " +
iOptPageCount
+ " pageBreaks.size()= " +
algRestart.getPageBreaks().size());
if (iOptPageCount >
getCurrentPV().getBodyRegion().getColumnCount()) {
+ AbstractBreaker.log.warn(
+ "Breaking algorithm produced more columns than are
available.");
/* reenable when everything works
throw new IllegalStateException(
"Breaking algorithm must not produce more columns
than available.");
@@ -787,7 +789,7 @@
PageViewport pv = getPageViewport(
false, pageIndex, RELTO_CURRENT_ELEMENT_LIST);
while (idx < partCount) {
- if ((idx < partCount - 1) && (colIndex >=
pv.getCurrentSpan().getColumnCount())) {
+ if ((colIndex >= pv.getCurrentSpan().getColumnCount())) {
colIndex = 0;
pageIndex++;
pv = getPageViewport(
Modified: xmlgraphics/fop/trunk/status.xml
URL:
http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/status.xml?rev=355042&r1=355041&r2=355042&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/status.xml (original)
+++ xmlgraphics/fop/trunk/status.xml Thu Dec 8 00:51:14 2005
@@ -27,6 +27,16 @@
<changes>
<release version="FOP Trunk">
+ <action context="Code" dev="JM" type="fix" fixes-bug="37828">
+ Bugfix: Column balancing produced strange break decisions in certain
multi-column
+ documents with large amounts of text.
+ </action>
+ <action context="Code" dev="JM" type="add">
+ Added an alternative set of rules for calculating text indents which
tries to mimic
+ the behaviour of many commercial FO implementations that chose to
break the rules
+ in the FO specification in order to better meet the natural
expectations of
+ inexperienced FO users.
+ </action>
<action context="Code" dev="JM" type="fix" fixes-bug="37815" due-to="Tom
Craddock">
Bugfix: The combination of content-width="scale-to-fit" and
content-height="100%"
did not work as expected due to a datatype conversion bug.
Added:
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/region-body_column-count_bug37828.xml
URL:
http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/region-body_column-count_bug37828.xml?rev=355042&view=auto
==============================================================================
---
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/region-body_column-count_bug37828.xml
(added)
+++
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/region-body_column-count_bug37828.xml
Thu Dec 8 00:51:14 2005
@@ -0,0 +1,69 @@
+<?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 #37828.
+ A problem with column balancing and large amounts of text.
+ </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="1in">
+ <fo:region-body column-count="2" 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>line7</fo:block>
+ <fo:block>line8</fo:block>
+ <fo:block>line9</fo:block>
+ <fo:block>line10</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="2" xpath="count(//pageViewport)"/>
+
+ <eval expected="14400" xpath="//[EMAIL
PROTECTED]/page/regionViewport/regionBody/mainReference/span[1]/@bpd"/>
+ <eval expected="57600" xpath="//[EMAIL
PROTECTED]/page/regionViewport/regionBody/mainReference/span[2]/@bpd"/>
+ <eval expected="57600" xpath="//[EMAIL
PROTECTED]/page/regionViewport/regionBody/mainReference/span[2]/flow[1]/@bpd"/>
+ <eval expected="57600" xpath="//[EMAIL
PROTECTED]/page/regionViewport/regionBody/mainReference/span[2]/flow[2]/@bpd"/>
+
+ <eval expected="14400" xpath="//[EMAIL
PROTECTED]/page/regionViewport/regionBody/mainReference/span[1]/@bpd"/>
+ <eval expected="14400" xpath="//[EMAIL
PROTECTED]/page/regionViewport/regionBody/mainReference/span[1]/flow[1]/@bpd"/>
+ <eval expected="14400" xpath="//[EMAIL
PROTECTED]/page/regionViewport/regionBody/mainReference/span[1]/flow[2]/@bpd"/>
+ <eval expected="14400" xpath="//[EMAIL
PROTECTED]/page/regionViewport/regionBody/mainReference/span[2]/@bpd"/>
+ </checks>
+</testcase>
Propchange:
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/region-body_column-count_bug37828.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/region-body_column-count_bug37828.xml
------------------------------------------------------------------------------
svn:keywords = Id
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
