Fixed a problem where a block containing only a nbsp was not rendered at all

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@357034 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 59 insertions, 0 deletions

diff --git a/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java b/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java
index f6de2e939..3e40dc31f 100644
--- a/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java
@@ -942,6 +942,16 @@ public class TextLayoutManager extends LeafNodeLayoutManager {
             }
         }
         
+        // TODO
+        // Add zero width box to avoid any nbspace to be removed
+        // at the end of a paragraph.
+        // This is kind of a hack and should be removed once the
+        // whole line building and white space handling is revisited.
+        if (textArray[ai.iStartIndex] == NBSPACE) {
+            spaceElements.add
+                (new KnuthInlineBox(0, null,
+                                    notifyPos(new LeafPosition(this, -1)), false));
+        }
         return spaceElements;
     }
 
diff --git a/status.xml b/status.xml
index b8092d0f2..07cb722d3 100644
--- a/status.xml
+++ b/status.xml
@@ -27,6 +27,10 @@
 
   <changes>
     <release version="FOP Trunk">
+      <action context="Code" dev="MM" type="fix">
+        Fixed a bug where an empty line, i.e. a block containing only a &amp;nbsp;,
+        was not rendered at all.
+      </action>
       <action context="Code" dev="JM" type="fix">
         Fixed a bug where the area for a finished cell that is broken over pages was 
         created once for each row it was spanned over instead of only once.
diff --git a/test/layoutengine/standard-testcases/block_white-space_2.xml b/test/layoutengine/standard-testcases/block_white-space_2.xml
new file mode 100755
index 000000000..28fba5721
--- /dev/null
+++ b/test/layoutengine/standard-testcases/block_white-space_2.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 2005 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- $Id$ -->
+<testcase>
+  <info>
+    <p>
+      This test checks an empty block
+    </p>
+  </info>
+  <fo>
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+      <fo:layout-master-set>
+        <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+          <fo:region-body/>
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fo:page-sequence master-reference="normal" white-space-collapse="true">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block background-color="silver">before empty line</fo:block>
+          <fo:block background-color="red">&#160;</fo:block>
+          <fo:block background-color="silver">after empty line</fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="11100" xpath="//flow/block[1]/lineArea/@bpd"/>
+    <eval expected="11100" xpath="//flow/block[2]/lineArea/@bpd"/>
+    <eval expected="11100" xpath="//flow/block[3]/lineArea/@bpd"/>
+  </checks>
+</testcase>