Fix CJK font generation

Author: pavel-alay

io/src/main/java/com/itextpdf/io/font/CidFont.java

@@ -84,15 +84,15 @@ private void initializeCidFontProperties(Map<String, Object> fontDesc) {
             IntHashtable metrics = (IntHashtable) fontDesc.get("W");
             CMapCidUni cid2Uni = FontCache.getCid2UniCmap(uniMap);
             avgWidth = 0;
-            for (int cid : metrics.getKeys()) {
+            for (int cid : cid2Uni.getCids()) {
                 int uni = cid2Uni.lookup(cid);
-                if (uni != 0) {
-                    Glyph glyph = new Glyph(cid, metrics.get(cid), uni);
-                    avgWidth += glyph.getWidth();
-                    codeToGlyph.put(cid, glyph);
-                    unicodeToGlyph.put(uni, glyph);
-                }
+                int width = metrics.containsKey(cid) ? metrics.get(cid) : DEFAULT_WIDTH;
+                Glyph glyph = new Glyph(cid, width, uni);
+                avgWidth += glyph.getWidth();
+                codeToGlyph.put(cid, glyph);
+                unicodeToGlyph.put(uni, glyph);
             }
+            fixSpaceIssue();
             if (codeToGlyph.size() != 0) {
                 avgWidth /= codeToGlyph.size();
             }

io/src/main/java/com/itextpdf/io/font/FontProgram.java

@@ -100,7 +100,7 @@ public boolean hasKernPairs() {
     /**
      * Gets the kerning between two glyphs.
      *
-     * @param first the first unicode value
+     * @param first  the first unicode value
      * @param second the second unicode value
      * @return the kerning to be applied
      */
@@ -111,7 +111,7 @@ public int getKerning(int first, int second) {
     /**
      * Gets the kerning between two glyphs.
      *
-     * @param first the first glyph
+     * @param first  the first glyph
      * @param second the second glyph
      * @return the kerning to be applied
      */
@@ -230,12 +230,19 @@ protected void setFontFamily(String fontFamily) {
         fontNames.setFamilyName(fontFamily);
     }
 
-    protected  void checkFilePath(String path){
-        if(path != null) {
+    protected void checkFilePath(String path) {
+        if (path != null) {
             File f = new File(path);
             if (!FontConstants.BUILTIN_FONTS_14.contains(path) && (!f.exists() || !f.isFile())) {
                 throw new IOException(IOException.FontFile1NotFound).setMessageParams(path);
             }
         }
     }
+
+    protected void fixSpaceIssue() {
+        Glyph space = unicodeToGlyph.get(32);
+        if (space != null) {
+            codeToGlyph.put(space.getCode(), space);
+        }
+    }
 }

io/src/main/java/com/itextpdf/io/font/TrueTypeFont.java

@@ -278,12 +278,7 @@ private void initializeFontProperties() throws java.io.IOException {
             codeToGlyph.put(index, glyph);
             avgWidth += glyph.getWidth();
         }
-
-        Glyph space = unicodeToGlyph.get(32);
-        if (space != null) {
-            codeToGlyph.put(space.getCode(), space);
-        }
-
+        fixSpaceIssue();
         for (int index = 0; index < glyphWidths.length; index++) {
             if (codeToGlyph.containsKey(index)) {
                 continue;

io/src/main/java/com/itextpdf/io/font/cmap/CMapCidUni.java

@@ -27,4 +27,8 @@ void addChar(String mark, CMapObject code) {
     public int lookup(int character) {
         return map.get(character);
     }
+
+    public int[] getCids(){
+        return map.getKeys();
+    }
 }