You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by je...@apache.org on 2005/12/08 11:15:45 UTC
svn commit: r355063 - in /xmlgraphics/fop/trunk:
src/java/org/apache/fop/layoutmgr/ test/layoutengine/
test/layoutengine/standard-testcases/
Author: jeremias
Date: Thu Dec 8 02:15:33 2005
New Revision: 355063
URL: http://svn.apache.org/viewcvs?rev=355063&view=rev
Log:
Looks like the 2-column situation has to be handled differently than the 3-column approach.
The 4-column example shows that my current approach is not good enough and needs to be revisited.
Added:
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/region-body_column-count_balance_2col.xml (with props)
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/region-body_column-count_balance_4col.xml (with props)
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BalancingColumnBreakingAlgorithm.java
xmlgraphics/fop/trunk/test/layoutengine/disabled-testcases.xml
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BalancingColumnBreakingAlgorithm.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BalancingColumnBreakingAlgorithm.java?rev=355063&r1=355062&r2=355063&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BalancingColumnBreakingAlgorithm.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BalancingColumnBreakingAlgorithm.java Thu Dec 8 02:15:33 2005
@@ -76,12 +76,18 @@
log.trace("balance=" + balance);
}
double absBalance = Math.abs(balance);
+ dem = absBalance;
//Step 1: This does the rough balancing
- if (balance <= 0) {
- dem = absBalance;
+ if (columnCount > 2) {
+ if (balance > 0) {
+ //shorter parts are less desired than longer ones
+ dem = dem * 1.2f;
+ }
} else {
- //shorter parts are less desired than longer ones
- dem = absBalance * 1.2f;
+ if (balance < 0) {
+ //shorter parts are less desired than longer ones
+ dem = dem * 1.2f;
+ }
}
//Step 2: This helps keep the trailing parts shorter than the previous ones
dem += (avgRestLen) / 1000f;
Modified: xmlgraphics/fop/trunk/test/layoutengine/disabled-testcases.xml
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/test/layoutengine/disabled-testcases.xml?rev=355063&r1=355062&r2=355063&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/disabled-testcases.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/disabled-testcases.xml Thu Dec 8 02:15:33 2005
@@ -233,6 +233,12 @@
multi-column documents.</description>
</testcase>
<testcase>
+ <name>Column Balancing problems</name>
+ <file>region-body_column-count_balance_4col.xml</file>
+ <description>Situation in a 4-column document where the column balancing doesn't work and even causes some
+ content to disappear.</description>
+ </testcase>
+ <testcase>
<name>No background-images on table-body</name>
<file>table-body_background-image.xml</file>
<description>The backgrounds of table-body, table-header,
Added: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/region-body_column-count_balance_2col.xml
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/region-body_column-count_balance_2col.xml?rev=355063&view=auto
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/region-body_column-count_balance_2col.xml (added)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/region-body_column-count_balance_2col.xml Thu Dec 8 02:15:33 2005
@@ -0,0 +1,71 @@
+<?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 column balancing with 2 columns.
+ </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>line11</fo:block>
+ <fo:block>line12</fo:block>
+ <fo:block>line13</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="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span[1]/@bpd"/>
+ <eval expected="57600" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span[2]/@bpd"/>
+ <eval expected="57600" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span[2]/flow[1]/@bpd"/>
+ <eval expected="57600" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span[2]/flow[2]/@bpd"/>
+
+ <eval expected="43200" xpath="//pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span[1]/@bpd"/>
+ <eval expected="43200" xpath="//pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span[1]/flow[1]/@bpd"/>
+ <eval expected="28800" xpath="//pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span[1]/flow[2]/@bpd"/>
+ <eval expected="14400" xpath="//pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span[2]/@bpd"/>
+ </checks>
+</testcase>
Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/region-body_column-count_balance_2col.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/region-body_column-count_balance_2col.xml
------------------------------------------------------------------------------
svn:keywords = Id
Added: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/region-body_column-count_balance_4col.xml
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/region-body_column-count_balance_4col.xml?rev=355063&view=auto
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/region-body_column-count_balance_4col.xml (added)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/region-body_column-count_balance_4col.xml Thu Dec 8 02:15:33 2005
@@ -0,0 +1,86 @@
+<?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 column balancing with 4 columns.
+ </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="4" 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>line11</fo:block>
+ <fo:block>line12</fo:block>
+ <fo:block>line13</fo:block>
+ <fo:block>line14</fo:block>
+ <fo:block>line15</fo:block>
+ <fo:block>line16</fo:block>
+ <fo:block>line17</fo:block>
+ <fo:block>line18</fo:block>
+ <fo:block>line19</fo:block>
+ <fo:block>line20</fo:block>
+ <fo:block>line21</fo:block>
+ <fo:block>line22</fo:block>
+ <fo:block>line23</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="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span[1]/@bpd"/>
+ <eval expected="57600" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span[2]/@bpd"/>
+ <eval expected="57600" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span[2]/flow[1]/@bpd"/>
+ <eval expected="57600" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span[2]/flow[2]/@bpd"/>
+ <eval expected="57600" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span[2]/flow[3]/@bpd"/>
+ <eval expected="57600" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span[2]/flow[4]/@bpd"/>
+
+ <true xpath="sum(//pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/@bpd) <= //pageViewport[@nr=2]/page/regionViewport/regionBody/@bpd"/>
+ <eval expected="28800" xpath="//pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span[1]/@bpd"/>
+ <eval expected="28800" xpath="//pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span[1]/flow[1]/@bpd"/>
+ <eval expected="28800" xpath="//pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span[1]/flow[2]/@bpd"/>
+ <eval expected="28800" xpath="//pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span[1]/flow[3]/@bpd"/>
+ <eval expected="14400" xpath="//pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span[1]/flow[4]/@bpd"/>
+ <eval expected="14400" xpath="//pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span[2]/@bpd"/>
+ </checks>
+</testcase>
Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/region-body_column-count_balance_4col.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/region-body_column-count_balance_4col.xml
------------------------------------------------------------------------------
svn:keywords = Id
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org