Author: jeremias
Date: Tue Feb 12 00:23:04 2008
New Revision: 620723
URL: http://svn.apache.org/viewvc?rev=620723&view=rev
Log:
Bugzilla #44393:
Recognize the newly used EN_AUTO constant for break values. Other LMs generate
a -1 value for this case.
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageBreaker.java
xmlgraphics/fop/trunk/test/layoutengine/disabled-testcases.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/region-body_column-count_bug37468.xml
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=620723&r1=620722&r2=620723&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
Tue Feb 12 00:23:04 2008
@@ -470,7 +470,9 @@
} 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
Modified: xmlgraphics/fop/trunk/test/layoutengine/disabled-testcases.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/disabled-testcases.xml?rev=620723&r1=620722&r2=620723&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/disabled-testcases.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/disabled-testcases.xml Tue Feb 12
00:23:04 2008
@@ -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>
Modified:
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/region-body_column-count_bug37468.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/region-body_column-count_bug37468.xml?rev=620723&r1=620722&r2=620723&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/region-body_column-count_bug37468.xml
(original)
+++
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/region-body_column-count_bug37468.xml
Tue Feb 12 00:23:04 2008
@@ -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>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
