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 ma...@apache.org on 2007/07/22 04:55:47 UTC
svn commit: r558455 - in /xmlgraphics/fop/trunk:
src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java
test/layoutengine/standard-testcases/block_uax14_linebreaking.xml
Author: manuel
Date: Sat Jul 21 19:55:46 2007
New Revision: 558455
URL: http://svn.apache.org/viewvc?view=rev&rev=558455
Log:
Corrected issue with zero width spaces being given a non zero width
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_uax14_linebreaking.xml
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java?view=diff&rev=558455&r1=558454&r2=558455
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java Sat Jul 21 19:55:46 2007
@@ -695,7 +695,7 @@
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);
Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_uax14_linebreaking.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_uax14_linebreaking.xml?view=diff&rev=558455&r1=558454&r2=558455
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_uax14_linebreaking.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_uax14_linebreaking.xml Sat Jul 21 19:55:46 2007
@@ -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>
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org