Merged revisions 654783,654849,654869,654946,654982,655085,655093,655275,655281,655285,655309,655349,655370 via svnmerge from

https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk

........
  r654783 | vhennebert | 2008-05-09 13:30:40 +0100 (Fri, 09 May 2008) | 3 lines
  
  Checkstyle and minor typo fixes
  Set svn:keywords and svn:eol-style properties on new files
........
  r654849 | acumiskey | 2008-05-09 16:14:37 +0100 (Fri, 09 May 2008) | 1 line
  
  Unwanted list self concatenation :).
........
  r654869 | acumiskey | 2008-05-09 17:13:47 +0100 (Fri, 09 May 2008) | 1 line
  
  Moved the instantiation of the FontManager to the constructor along with all the other aggregated objects.
........
  r654946 | adelmelle | 2008-05-09 22:40:14 +0100 (Fri, 09 May 2008) | 6 lines
  
  Bugzilla 44794:
  Added support for page-number-citation and page-number-citation-last of fo:inline.
  Corrected behavior for page-number-citation-last of fo:block - forward references properly resolved.
  
  (+ support for page-number-citation-last on list-related FOs)
........
  r654982 | acumiskey | 2008-05-10 00:47:28 +0100 (Sat, 10 May 2008) | 1 line
  
  Checkstyle cleanup and javadoc
........
  r655085 | adelmelle | 2008-05-10 14:44:09 +0100 (Sat, 10 May 2008) | 5 lines
  
  Tweaks:
  -> remove split in CommonFont: font-size is resolved early, so no need anymore for CachedCommonFont
  -> allow disabling the PropertyCache via a system property (just in case...)
........
  r655093 | adelmelle | 2008-05-10 15:23:56 +0100 (Sat, 10 May 2008) | 1 line
  
  Correction: set default to true...
........
  r655275 | maxberger | 2008-05-11 08:30:55 +0100 (Sun, 11 May 2008) | 1 line
  
  made sure warning for missing glyphs is emitted in all cases
........
  r655281 | maxberger | 2008-05-11 10:01:31 +0100 (Sun, 11 May 2008) | 1 line
  
  Support character-by-character font-selection strategy on fo:character element
........
  r655285 | maxberger | 2008-05-11 10:17:07 +0100 (Sun, 11 May 2008) | 1 line
  
  Forgot to update testcases
........
  r655309 | adelmelle | 2008-05-11 13:22:22 +0100 (Sun, 11 May 2008) | 3 lines
  
  Make the LM clean up on end-of-layout, if possible.
  Added clearChildNodes() method to FObj to release the reference to the FO's children.
........
  r655349 | spepping | 2008-05-11 19:05:51 +0100 (Sun, 11 May 2008) | 2 lines
  
  The spec requires rounding, not truncating
........
  r655370 | adelmelle | 2008-05-11 22:03:41 +0100 (Sun, 11 May 2008) | 1 line
  
  Avoid creation of unnecessary dummy areas.
........


git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_AFPGOCAResources@655445 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 2 insertions, 29 deletions

diff --git a/src/java/org/apache/fop/fonts/SingleByteFont.java b/src/java/org/apache/fop/fonts/SingleByteFont.java
index feb1b440c..f1b7b1b48 100644
--- a/src/java/org/apache/fop/fonts/SingleByteFont.java
+++ b/src/java/org/apache/fop/fonts/SingleByteFont.java
@@ -21,21 +21,15 @@ package org.apache.fop.fonts;
 
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import org.apache.xmlgraphics.fonts.Glyphs;
-
 /**
  * Generic SingleByte font
  */
 public class SingleByteFont extends CustomFont {
 
-    /** Code point that is used if no code point for a specific character has been found. */
-    public static final char NOT_FOUND = '#';
-
     /** logger */
     private  static Log log = LogFactory.getLog(SingleByteFont.class);
 
@@ -43,8 +37,6 @@ public class SingleByteFont extends CustomFont {
 
     private int[] width = null;
 
-    private Set warnedChars;
-
     private Map unencodedCharacters;
     //Map<Character, UnencodedCharacter>
     private List additionalEncodings;
@@ -115,27 +107,8 @@ public class SingleByteFont extends CustomFont {
         if (d != SingleByteEncoding.NOT_FOUND_CODE_POINT) {
             return d;
         }
-        
-        //Give up, character is not available
-        Character ch = new Character(c);
-        if (warnedChars == null) {
-            warnedChars = new java.util.HashSet();
-        }
-        if (warnedChars.size() < 8 && !warnedChars.contains(ch)) {
-            warnedChars.add(ch);
-            if (this.eventListener != null) {
-                this.eventListener.glyphNotAvailable(this, c, getFontName());
-            } else {
-                if (warnedChars.size() == 8) {
-                    log.warn("Many requested glyphs are not available in font " + getFontName());
-                } else {
-                    log.warn("Glyph " + (int)c + " (0x" + Integer.toHexString(c) 
-                            + ", " + Glyphs.charToGlyphName(c)
-                            + ") not available in font " + getFontName());
-                }
-            }
-        }
-        return NOT_FOUND;
+        this.warnMissingGlyph(c);
+        return Typeface.NOT_FOUND;
     }
 
     private char mapUnencodedChar(char ch) {