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 vh...@apache.org on 2008/03/14 13:22:45 UTC
svn commit: r637076 - in /xmlgraphics/fop/trunk: ./
src/java/org/apache/fop/layoutmgr/ test/layoutengine/standard-testcases/
Author: vhennebert
Date: Fri Mar 14 05:22:44 2008
New Revision: 637076
URL: http://svn.apache.org/viewvc?rev=637076&view=rev
Log:
Reverting changes of rev. 637057. I applied the changes to the 0.95 branch instead so that they make their way into the 0.95 release. I will merge them back to the Trunk via svnmerge
Removed:
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block-level_break-after_bug44412.xml
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/LayoutContext.java
xmlgraphics/fop/trunk/status.xml
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java?rev=637076&r1=637075&r2=637076&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java Fri Mar 14 05:22:44 2008
@@ -386,9 +386,6 @@
}
addKnuthElementsForBorderPaddingAfter(returnList, true);
addKnuthElementsForSpaceAfter(returnList, alignment);
-
- //All child content is processed. Only break-after can occur now, so...
- context.clearPendingMarks();
addKnuthElementsForBreakAfter(returnList, context);
setFinished(true);
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java?rev=637076&r1=637075&r2=637076&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java Fri Mar 14 05:22:44 2008
@@ -393,9 +393,6 @@
addKnuthElementsForBorderPaddingAfter(returnList, true);
addKnuthElementsForSpaceAfter(returnList, alignment);
-
- //All child content is processed. Only break-after can occur now, so...
- context.clearPendingMarks();
if (forcedBreakAfterLast == null) {
addKnuthElementsForBreakAfter(returnList, context);
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/LayoutContext.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/LayoutContext.java?rev=637076&r1=637075&r2=637076&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/LayoutContext.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/LayoutContext.java Fri Mar 14 05:22:44 2008
@@ -285,8 +285,12 @@
* Clears all pending marks on the LayoutContext.
*/
public void clearPendingMarks() {
- this.pendingBeforeMarks = null;
- this.pendingAfterMarks = null;
+ if (this.pendingBeforeMarks != null) {
+ this.pendingBeforeMarks.clear();
+ }
+ if (this.pendingAfterMarks != null) {
+ this.pendingAfterMarks.clear();
+ }
}
/**
Modified: xmlgraphics/fop/trunk/status.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/status.xml?rev=637076&r1=637075&r2=637076&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/status.xml (original)
+++ xmlgraphics/fop/trunk/status.xml Fri Mar 14 05:22:44 2008
@@ -52,17 +52,13 @@
</contexts>
<changes>
- <release version="FOP Trunk" date="TBD">
+ <!--release version="FOP Trunk" date="TBD"-->
<!-- change reverted, to be added back later
<action context="Renderers" dev="AC" importance="high" type="add">
Added SVG support for AFP (GOCA).
</action>
-->
- <action context="Layout" dev="JM" type="fix" fixes-bug="44412">
- Bugfix: When there was a forced break after a block with (conditional) borders the
- border-after wasn't painted.
- </action>
- </release>
+ <!--/release-->
<release version="0.95beta" date="17 March 2008">
<notes>
<section>
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org