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

diff --git a/src/java/org/apache/fop/fonts/GlyphMapping.java b/src/java/org/apache/fop/fonts/GlyphMapping.java
index e75d9e0b610e2b630cfe1dabce379f0f3ef0c7fd..95db0ff480ee637ccd62f3de9be77bdf2666eca3 100644 (file)
--- 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) {