diff options
| -rw-r--r-- | src/java/org/apache/fop/fo/XMLWhiteSpaceHandler.java | 5 | ||||
| -rw-r--r-- | status.xml | 9 | ||||
| -rw-r--r-- | test/layoutengine/standard-testcases/marker_white-space-treatment_bug42703.xml | 29 |
3 files changed, 39 insertions, 4 deletions
diff --git a/src/java/org/apache/fop/fo/XMLWhiteSpaceHandler.java b/src/java/org/apache/fop/fo/XMLWhiteSpaceHandler.java index bfebf6233..557a1778e 100644 --- a/src/java/org/apache/fop/fo/XMLWhiteSpaceHandler.java +++ b/src/java/org/apache/fop/fo/XMLWhiteSpaceHandler.java @@ -116,6 +116,7 @@ public class XMLWhiteSpaceHandler { if (ancestor.getNameId() == Constants.FO_BLOCK) { currentBlock = (Block) ancestor; + nestedBlockStack.push(currentBlock); } } else if (!nestedBlockStack.isEmpty()) { currentBlock = (Block) nestedBlockStack.peek(); @@ -206,9 +207,7 @@ public class XMLWhiteSpaceHandler { /* 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; } diff --git a/status.xml b/status.xml index ca4768446..fa3ee3c44 100644 --- a/status.xml +++ b/status.xml @@ -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. diff --git a/test/layoutengine/standard-testcases/marker_white-space-treatment_bug42703.xml b/test/layoutengine/standard-testcases/marker_white-space-treatment_bug42703.xml index 0eb80f982..50ef57bb2 100644 --- a/test/layoutengine/standard-testcases/marker_white-space-treatment_bug42703.xml +++ b/test/layoutengine/standard-testcases/marker_white-space-treatment_bug42703.xml @@ -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> |