aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/java/org/apache/fop/fonts/Font.java4
-rw-r--r--src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/java/org/apache/fop/fonts/Font.java b/src/java/org/apache/fop/fonts/Font.java
index e8a81a0ea..b8e7fa9c8 100644
--- a/src/java/org/apache/fop/fonts/Font.java
+++ b/src/java/org/apache/fop/fonts/Font.java
@@ -284,8 +284,12 @@ public class Font {
width = 0;
} else if (c == '\u202F') {
width = getCharWidth(' ') / 2;
+ } else if (c == '\u2060') {
+ width = 0;
} else if (c == '\u3000') {
width = getCharWidth(' ') * 2;
+ } else if (c == '\ufeff') {
+ width = 0;
} else {
//Will be internally replaced by "#" if not found
width = getWidth(mapChar(c));
diff --git a/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java b/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java
index 2a61ca188..93196d8ab 100644
--- 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(CharUtilities.isZeroWidthSpace(ch) ? 0 : font.getCharWidth(ch));
+ MinOptMax ipd = new MinOptMax(font.getCharWidth(ch));
ai = new AreaInfo(iNextStart, (short) (iNextStart + 1),
(short) 0, (short) 0,
ipd, false, true, breakOpportunity);