diff options
| -rw-r--r-- | src/java/org/apache/fop/layoutmgr/PageBreaker.java | 4 | ||||
| -rw-r--r-- | test/layoutengine/disabled-testcases.xml | 6 | ||||
| -rw-r--r-- | test/layoutengine/standard-testcases/region-body_column-count_bug37468.xml | 4 |
3 files changed, 5 insertions, 9 deletions
diff --git a/src/java/org/apache/fop/layoutmgr/PageBreaker.java b/src/java/org/apache/fop/layoutmgr/PageBreaker.java index cfc4b55bf..cf830a7ec 100644 --- a/src/java/org/apache/fop/layoutmgr/PageBreaker.java +++ b/src/java/org/apache/fop/layoutmgr/PageBreaker.java @@ -470,7 +470,9 @@ public class PageBreaker extends AbstractBreaker { } else if (breakVal == Constants.EN_NONE) { curPage.getPageViewport().createSpan(false); return; - } else if (breakVal == Constants.EN_COLUMN || breakVal <= 0) { + } else if (breakVal == Constants.EN_COLUMN + || breakVal <= 0 + || breakVal == Constants.EN_AUTO) { PageViewport pv = curPage.getPageViewport(); //Check if previous page was spanned diff --git a/test/layoutengine/disabled-testcases.xml b/test/layoutengine/disabled-testcases.xml index feecd3a6f..15ac8aa48 100644 --- a/test/layoutengine/disabled-testcases.xml +++ b/test/layoutengine/disabled-testcases.xml @@ -305,10 +305,4 @@ <description>A soft hyphen should be a preferred as break compared to a normal hyphenation point but is not.</description> </testcase> - <testcase> - <name>Wrong fo.Constants values used for break classes</name> - <file>region-body_column-count_bug37468.xml</file> - <description>Bugzilla #44393: the Constants.EN_AUTO break class isn't properly recognized by - PageBreaker.</description> - </testcase> </disabled-testcases> diff --git a/test/layoutengine/standard-testcases/region-body_column-count_bug37468.xml b/test/layoutengine/standard-testcases/region-body_column-count_bug37468.xml index 3bde6f331..37835e37b 100644 --- a/test/layoutengine/standard-testcases/region-body_column-count_bug37468.xml +++ b/test/layoutengine/standard-testcases/region-body_column-count_bug37468.xml @@ -34,8 +34,8 @@ <fo:page-sequence master-reference="normal"> <fo:flow flow-name="xsl-region-body"> <fo:table table-layout="fixed" width="100%" border-collapse="separate"> - <fo:table-column/> - <fo:table-column/> + <fo:table-column column-width="proportional-column-width(1)"/> + <fo:table-column column-width="proportional-column-width(1)"/> <fo:table-body> <fo:table-row> <fo:table-cell> |