Author: adelmelle
Date: Fri May 2 10:28:25 2008
New Revision: 652835
URL: http://svn.apache.org/viewvc?rev=652835&view=rev
Log:
Bugzilla 42703:
Fixed a regression introduced by the fix for Bugzilla 44286
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/XMLWhiteSpaceHandler.java
xmlgraphics/fop/trunk/status.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/marker_white-space-treatment_bug42703.xml
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/XMLWhiteSpaceHandler.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/XMLWhiteSpaceHandler.java?rev=652835&r1=652834&r2=652835&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/XMLWhiteSpaceHandler.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/XMLWhiteSpaceHandler.java
Fri May 2 10:28:25 2008
@@ -116,6 +116,7 @@
if (ancestor.getNameId() == Constants.FO_BLOCK) {
currentBlock = (Block) ancestor;
+ nestedBlockStack.push(currentBlock);
}
} else if (!nestedBlockStack.isEmpty()) {
currentBlock = (Block) nestedBlockStack.peek();
@@ -206,9 +207,7 @@
/* end of block: clear the references and pop the
* nested block stack */
if (!nestedBlockStack.empty()) {
- currentBlock = (Block) nestedBlockStack.pop();
- } else {
- currentBlock = null;
+ nestedBlockStack.pop();
}
charIter = null;
}
Modified: xmlgraphics/fop/trunk/status.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/status.xml?rev=652835&r1=652834&r2=652835&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/status.xml (original)
+++ xmlgraphics/fop/trunk/status.xml Fri May 2 10:28:25 2008
@@ -57,7 +57,14 @@
<action context="Renderers" dev="AC" importance="high" type="add">
Added SVG support for AFP (GOCA).
</action -->
- <action context="Code" dev="AD" type="fix" fixed-bug="44203">
+ <action context="Code" dev="AD" type="fix" fixes-bug="42703">
+ Fixed a regression introduced by the fix for
+ <a
href="https://issues.apache.org/bugzilla/show_bug.cgi?id=44286";>Bugzilla
44286</a>.
+ </action>
+ <action context="Code" dev="AD" type="fix" fixes-bug="43591">
+ Activated min-height/max-height and min-width/max-width properties.
+ </action>
+ <action context="Code" dev="AD" type="fix" fixes-bug="44203">
Fixed a logic error in Hyphenator.java:
If the source had an associated InputStream, an
UnsupportedOperationException was
triggered.
Modified:
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/marker_white-space-treatment_bug42703.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/marker_white-space-treatment_bug42703.xml?rev=652835&r1=652834&r2=652835&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/marker_white-space-treatment_bug42703.xml
(original)
+++
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/marker_white-space-treatment_bug42703.xml
Fri May 2 10:28:25 2008
@@ -57,6 +57,33 @@
text with the marker
</fo:block>
</fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ <fo:page-sequence master-reference="all-pages">
+ <fo:static-content flow-name="xsl-region-before">
+ <fo:block color="blue" font-size="25pt">
+ <fo:block>marker1 content:
+ <fo:inline color="green"><fo:retrieve-marker
+ retrieve-class-name="marker1"
+ retrieve-boundary="page"
+ /></fo:inline>
+ </fo:block>
+ <fo:block>marker1 content:
+ <fo:inline color="green"><fo:retrieve-marker
+ retrieve-class-name="marker1"
+ retrieve-boundary="page"
+ /></fo:inline>
+ </fo:block>
+ </fo:block>
+ </fo:static-content>
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block font-size="20pt">
+ <fo:block margin-top="2cm">
+ <fo:marker marker-class-name="marker1"> Block<fo:inline> with
inline element </fo:inline>.
+ </fo:marker>
+ text with the marker
+ </fo:block>
+ </fo:block>
</fo:flow>
</fo:page-sequence>
</fo:root>
@@ -64,5 +91,7 @@
<checks>
<eval expected="4"
xpath="count((//regionBefore//inlineparent)[1]/text[1]/space)" />
<eval expected="4"
xpath="count((//regionBefore//inlineparent)[1]/text[2]/space)" />
+ <eval expected="4"
xpath="count((//regionBefore//inlineparent)[2]/text[1]/space)" />
+ <eval expected="4"
xpath="count((//regionBefore//inlineparent)[2]/text[2]/space)" />
</checks>
</testcase>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
