determine page and text position for glyph warning, #21

Author: Intelligent2013

fop-core/src/main/java/org/apache/fop/fonts/MultiByteFont.java

@@ -677,7 +677,7 @@ private GlyphSequence mapCharsToGlyphs(CharSequence cs, List associations) {
             notifyMapOperation();
             gi = findGlyphIndex(cc);
             if (gi == SingleByteEncoding.NOT_FOUND_CODE_POINT) {
-                warnMissingGlyph((char) cc);
+                warnMissingGlyph((char) cc, cs);
                 gi = giMissing;
             }
             cb.put(cc);

fop-core/src/main/java/org/apache/fop/fonts/Typeface.java

@@ -48,6 +48,8 @@ public abstract class Typeface implements FontMetrics {
      */
     private long charMapOps;
 
+    private CharSequence cs;
+
     /** An optional event listener that receives events such as missing glyphs etc. */
     protected FontEventListener eventListener;
 
@@ -136,7 +138,11 @@ protected void warnMissingGlyph(char c) {
         if (warnedChars.size() < 8 && !warnedChars.contains(ch)) {
             warnedChars.add(ch);
             if (this.eventListener != null) {
-                this.eventListener.glyphNotAvailable(this, c, getFontName());
+                String suffix = getFontName();
+                if (cs != null && cs.length() > 1) {
+                    suffix += "\". Found in the character sequence \"" + cs;
+                }
+                this.eventListener.glyphNotAvailable(this, c, suffix);
             } else {
                 if (warnedChars.size() == 8) {
                     log.warn("Many requested glyphs are not available in font "
@@ -151,6 +157,12 @@ protected void warnMissingGlyph(char c) {
         }
     }
 
+    protected void warnMissingGlyph(char c, CharSequence cs) {
+        this.cs = cs;
+        warnMissingGlyph(c);
+    }
+
+
     /** {@inheritDoc} */
     public String toString() {
         StringBuffer sbuf = new StringBuffer(super.toString());