aboutsummaryrefslogtreecommitdiffstats
path: root/src/java/org/apache/fop/fonts
diff options
context:
space:
mode:
authorLuis Bernardo <lbernardo@apache.org>2014-10-17 09:18:56 +0000
committerLuis Bernardo <lbernardo@apache.org>2014-10-17 09:18:56 +0000
commit076140699aa680a015a0d675376b32cb39ddc8fb (patch)
tree73fc592f18bfc151dd5bacdc4269ed5efea94663 /src/java/org/apache/fop/fonts
parent63a386555a5166fd0ac08a4251f499ca9987c8b6 (diff)
downloadxmlgraphics-fop-076140699aa680a015a0d675376b32cb39ddc8fb.tar.gz
xmlgraphics-fop-076140699aa680a015a0d675376b32cb39ddc8fb.zip
FOP-2417: Exception caused by letter space handling in Chinese sentence
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1632522 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/java/org/apache/fop/fonts')
-rw-r--r--src/java/org/apache/fop/fonts/GlyphMapping.java6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/java/org/apache/fop/fonts/GlyphMapping.java b/src/java/org/apache/fop/fonts/GlyphMapping.java
index e75d9e0b6..95db0ff48 100644
--- a/src/java/org/apache/fop/fonts/GlyphMapping.java
+++ b/src/java/org/apache/fop/fonts/GlyphMapping.java
@@ -278,10 +278,8 @@ public class GlyphMapping {
wordIPD = wordIPD.plus(letterSpaceIPD.mult(letterSpaces));
// create and return the AreaInfo object
- return new GlyphMapping(startIndex, endIndex, 0,
- letterSpaces, wordIPD,
- endsWithHyphen,
- false, breakOpportunityChar != 0, font, level, null);
+ return new GlyphMapping(startIndex, endIndex, 0, letterSpaces, wordIPD, endsWithHyphen, false,
+ (breakOpportunityChar != 0) && !isSpace(breakOpportunityChar), font, level, null);
}
private static void addToLetterAdjust(MinOptMax[] letterSpaceAdjustArray, int index, int width) {