### Eclipse Workspace Patch 1.0
#P fopsvn
Index: src/java/org/apache/fop/afp/fonts/AbstractOutlineFont.java
===================================================================
--- src/java/org/apache/fop/afp/fonts/AbstractOutlineFont.java	(revision 1537397)
+++ src/java/org/apache/fop/afp/fonts/AbstractOutlineFont.java	(working copy)
@@ -20,6 +20,7 @@
 package org.apache.fop.afp.fonts;
 
 import org.apache.fop.afp.AFPEventProducer;
+import org.apache.fop.fonts.Typeface;
 
 /**
  * A font defined as a set of lines and curves as opposed to a bitmap font. An
@@ -176,7 +177,13 @@
      * @return the mapped character
      */
     public char mapChar(char c) {
-        return charSet.mapChar(c);
+        char d = charSet.mapChar(c);
+        if (d != 0) {
+            return d;
+        } else {
+            warnMissingGlyph(c);
+            return Typeface.NOT_FOUND;
+        }
     }
 
     /** {@inheritDoc} */
Index: src/java/org/apache/fop/afp/fonts/CharacterSet.java
===================================================================
--- src/java/org/apache/fop/afp/fonts/CharacterSet.java	(revision 1537397)
+++ src/java/org/apache/fop/afp/fonts/CharacterSet.java	(working copy)
@@ -32,6 +32,7 @@
 import org.apache.fop.afp.fonts.CharactersetEncoder.EncodedChars;
 import org.apache.fop.afp.util.AFPResourceAccessor;
 import org.apache.fop.afp.util.StringUtils;
+import org.apache.fop.fonts.Typeface;
 
 /**
  * The IBM Font Object Content Architecture (FOCA) supports presentation
@@ -348,7 +349,10 @@
      */
     public char mapChar(char c) {
         //TODO This is not strictly correct but we'll let it be for the moment
-        return c;
+        if (this.encoder.canEncode(c)) {
+            return c;
+        }
+        return 0;
     }
 
     /**