PdfFont#containsGlyph(int) refactoring

#containsGlyph used to save junk glyphs.

DEVSIX-1043

Author: pavel-alay

kernel/src/main/java/com/itextpdf/kernel/font/PdfFont.java

@@ -142,6 +142,16 @@ public boolean containsGlyph(int unicode) {
         }
     }
 
+    /**
+     * Check whether font contains glyph with specified unicode.
+     *
+     * @param text a java unicode string
+     * @param from start index. one or two char may be used.
+     * @return true if font contains glyph, represented with the unicode code point,
+     * otherwise false.
+     */
+    public abstract boolean containsGlyph(String text, int from);
+
     public abstract GlyphLine createGlyphLine(String content);
 
     /**
@@ -167,8 +177,6 @@ public boolean containsGlyph(int unicode) {
      */
     public abstract int appendAnyGlyph(String text, int from, List<Glyph> glyphs);
 
-    public abstract boolean containsGlyph(String text, int from);
-
     /**
      * Converts the text into bytes to be placed in the document.
      * The conversion is done according to the font and the encoding and the characters

kernel/src/main/java/com/itextpdf/kernel/font/PdfTrueTypeFont.java

@@ -117,17 +117,19 @@ public Glyph getGlyph(int unicode) {
 
     @Override
     public boolean containsGlyph(String text, int from) {
-        //TODO TrueType what if font is specific?
-        int ch = text.charAt(from);
+        return containsGlyph((int) text.charAt(from));
+    }
+
+    @Override
+    public boolean containsGlyph(int unicode) {
         if (fontEncoding.isFontSpecific()) {
-            return fontProgram.getGlyphByCode(ch) != null;
+            return fontProgram.getGlyphByCode(unicode) != null;
         } else {
-            return fontEncoding.canEncode(ch)
-                    && getFontProgram().getGlyph(fontEncoding.getUnicodeDifference(ch)) != null;
+            return fontEncoding.canEncode(unicode)
+                    && getFontProgram().getGlyph(fontEncoding.getUnicodeDifference(unicode)) != null;
         }
     }
 
-
     @Override
     public void flush() {
         //TODO make subtype class member and simplify this method

kernel/src/main/java/com/itextpdf/kernel/font/PdfType0Font.java

@@ -245,18 +245,28 @@ public boolean containsGlyph(String text, int from) {
                 return containsUnicodeGlyph(text, from);
             }
         } else {
-            throw new PdfException("font.has.no.suitable.cmap");
+            throw new PdfException("Invalid CID font type: " + cidFontType);
         }
     }
 
-    private boolean containsUnicodeGlyph(String text, int from) {
-        int ch;
-        if (TextUtil.isSurrogatePair(text, from)) {
-            ch = TextUtil.convertToUtf32(text, from);
+    @Override
+    public boolean containsGlyph(int unicode) {
+        if (cidFontType == CID_FONT_TYPE_0) {
+            if (cmapEncoding.isDirect()) {
+                return fontProgram.getGlyphByCode(unicode) != null;
+            } else {
+                return getFontProgram().getGlyph(unicode) != null;
+            }
+        } else if (cidFontType == CID_FONT_TYPE_2) {
+            if (fontProgram.isFontSpecific()) {
+                byte[] b = PdfEncodings.convertToBytes((char) unicode, "symboltt");
+                return b.length > 0 && fontProgram.getGlyph(b[0] & 0xff) != null;
+            } else {
+                return getFontProgram().getGlyph(unicode) != null;
+            }
         } else {
-            ch = text.charAt(from);
+            throw new PdfException("Invalid CID font type: " + cidFontType);
         }
-        return getFontProgram().getGlyph(ch) != null;
     }
 
     @Override
@@ -758,6 +768,16 @@ protected void addRangeUni(TrueTypeFont ttf, Map<Integer, int[]> longTag, boolea
         }
     }
 
+    private boolean containsUnicodeGlyph(String text, int from) {
+        int ch;
+        if (TextUtil.isSurrogatePair(text, from)) {
+            ch = TextUtil.convertToUtf32(text, from);
+        } else {
+            ch = text.charAt(from);
+        }
+        return getFontProgram().getGlyph(ch) != null;
+    }
+
     private static String getOrdering(PdfDictionary cidFont) {
         PdfDictionary cidinfo = cidFont.getAsDictionary(PdfName.CIDSystemInfo);
         if (cidinfo == null)

kernel/src/main/java/com/itextpdf/kernel/font/PdfType1Font.java

@@ -129,12 +129,16 @@ public Glyph getGlyph(int unicode) {
 
     @Override
     public boolean containsGlyph(String text, int from) {
-        int ch = text.charAt(from);
-        if (fontEncoding.canEncode(ch)) {
+        return containsGlyph((int) text.charAt(from));
+    }
+
+    @Override
+    public boolean containsGlyph(int unicode) {
+        if (fontEncoding.canEncode(unicode)) {
             if (fontEncoding.isFontSpecific()) {
-                return getFontProgram().getGlyphByCode(ch) != null;
+                return getFontProgram().getGlyphByCode(unicode) != null;
             } else {
-                return getFontProgram().getGlyph(fontEncoding.getUnicodeDifference(ch)) != null;
+                return getFontProgram().getGlyph(fontEncoding.getUnicodeDifference(unicode)) != null;
             }
         } else {
             return false;

kernel/src/main/java/com/itextpdf/kernel/font/PdfType3Font.java

@@ -204,11 +204,14 @@ public Glyph getGlyph(int unicode) {
 
     @Override
     public boolean containsGlyph(String text, int from) {
-        int ch = text.charAt(from);
-        return (fontEncoding.canEncode(ch) || ch < 33)
-                && getFontProgram().getGlyph(fontEncoding.getUnicodeDifference(ch)) != null;
+        return containsGlyph((int) text.charAt(from));
     }
 
+    @Override
+    public boolean containsGlyph(int unicode) {
+        return (fontEncoding.canEncode(unicode) || unicode < 33)
+                && getFontProgram().getGlyph(fontEncoding.getUnicodeDifference(unicode)) != null;
+    }
 
     @Override
     protected PdfDictionary getFontDescriptor(String fontName) {