Corrected issue with zero width spaces being given a non zero width

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

diff --git a/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java b/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java
index 93196d8ab344117fb525c4cfb2bea5a950b4c0bd..2a61ca188f7b500880a931d90834083428008570 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java
@@ -695,7 +695,7 @@ public class TextLayoutManager extends LeafNodeLayoutManager {
                 iThisStart = (short) (iNextStart + 1);
             } else if (CharUtilities.isFixedWidthSpace(ch) || CharUtilities.isZeroWidthSpace(ch)) {
                 // create the AreaInfo object
-                MinOptMax ipd = new MinOptMax(font.getCharWidth(ch));
+                MinOptMax ipd = new MinOptMax(CharUtilities.isZeroWidthSpace(ch) ? 0 : font.getCharWidth(ch));
                 ai = new AreaInfo(iNextStart, (short) (iNextStart + 1),
                         (short) 0, (short) 0,
                         ipd, false, true, breakOpportunity); 

diff --git a/test/layoutengine/standard-testcases/block_uax14_linebreaking.xml b/test/layoutengine/standard-testcases/block_uax14_linebreaking.xml
index ea6e3ddcdf6caa6c767b8815423c778725bf711f..715a9364ae4007f3b3621ffe22de7beaf15e51ef 100755 (executable)
--- a/test/layoutengine/standard-testcases/block_uax14_linebreaking.xml
+++ b/test/layoutengine/standard-testcases/block_uax14_linebreaking.xml
@@ -191,9 +191,8 @@
       <eval expected="93380" xpath="//flow/block[27]/lineArea[2]/text/@ipd"/>
       <eval expected="132860" xpath="//flow/block[27]/lineArea[3]/text/@ipd"/>
 
-      <eval expected="3" xpath="count(//flow/block[29]/lineArea)"/>
-      <eval expected="21670" xpath="//flow/block[29]/lineArea[1]/text/@ipd"/>
-      <eval expected="145630" xpath="//flow/block[29]/lineArea[2]/text/@ipd"/>
-      <eval expected="53360" xpath="//flow/block[29]/lineArea[3]/text/@ipd"/>
+      <eval expected="2" xpath="count(//flow/block[29]/lineArea)"/>
+      <eval expected="147840" xpath="//flow/block[29]/lineArea[1]/text/@ipd"/>
+      <eval expected="47800" xpath="//flow/block[29]/lineArea[2]/text/@ipd"/>
   </checks>
 </testcase>