Fix issue with subsetting fonts and form fields editing

DEVSIX-437

Author: pavel-alay

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

@@ -5,8 +5,8 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
-
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -18,12 +18,9 @@
  */
 class TrueTypeFontSubset {
 
-    static final String tableNamesSimple[] = {"cvt ", "fpgm", "glyf", "head",
-            "hhea", "hmtx", "loca", "maxp", "prep"};
-    static final String tableNamesCmap[] = {"cmap", "cvt ", "fpgm", "glyf", "head",
-            "hhea", "hmtx", "loca", "maxp", "prep"};
-    static final String tableNamesExtra[] = {"OS/2", "cmap", "cvt ", "fpgm", "glyf", "head",
-            "hhea", "hmtx", "loca", "maxp", "name, prep"};
+    static final String[] tableNamesSimple = {"cvt ", "fpgm", "glyf", "head", "hhea", "hmtx", "loca", "maxp", "prep"};
+    static final String[] tableNamesCmap = {"cmap", "OS/2"};
+    static final String[] tableNamesExtra = {"cmap", "OS/2", "name"};
     static final int entrySelectors[] = {0,0,1,1,2,2,2,2,3,3,3,3,3,3,3,3,4,4,4,4,4};
     static final int TABLE_CHECKSUM = 0;
     static final int TABLE_OFFSET = 1;
@@ -106,15 +103,12 @@ byte[] process() throws java.io.IOException {
     protected void assembleFont() throws java.io.IOException {
         int[] tableLocation;
         int fullFontSize = 0;
-        String[] tableNames;
+        List<String> tableNames = new ArrayList<>();
+        Collections.addAll(tableNames, tableNamesSimple);
         if (includeExtras) {
-            tableNames = tableNamesExtra;
-        } else {
-            if (includeCmap) {
-                tableNames = tableNamesCmap;
-            } else {
-                tableNames = tableNamesSimple;
-            }
+            Collections.addAll(tableNames, tableNamesExtra);
+        } else if (includeCmap) {
+            Collections.addAll(tableNames, tableNamesCmap);
         }
         int tablesUsed = 2;
         for (String name : tableNames) {

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

@@ -285,7 +285,7 @@ public GlyphLine createGlyphLine(String content) {
         //TODO different with type0 and type2 could be removed after simplifying longTag
         if (cidFontType == CidFontType0) {
             int len = content.length();
-            if (isIdentity()) {
+            if (cmapEncoding.isDirect()) {
                 for (int k = 0; k < len; ++k) {
                     Glyph glyph = fontProgram.getGlyphByCode((int) content.charAt(k));
                     if (glyph != null) {
@@ -397,11 +397,6 @@ protected PdfDictionary getFontDescriptor(String fontName) {
         return fontDescriptor;
     }
 
-    public boolean isIdentity() {
-        //TODO strange property
-        return cmapEncoding.isDirect();
-    }
-
     @Override
     public void flush() {
         if (newFont) {
@@ -410,7 +405,7 @@ public void flush() {
         super.flush();
     }
 
-    @Override //TODO
+    @Override //TODO remove
     protected void addFontStream(PdfDictionary fontDescriptor) {
     }
 
@@ -522,7 +517,7 @@ protected PdfDictionary getCidFontType2(TrueTypeFont ttf, PdfDictionary fontDesc
         PdfDictionary cidInfo = new PdfDictionary();
         cidInfo.put(PdfName.Registry, new PdfString(cmapEncoding.getRegistry()));
         cidInfo.put(PdfName.Ordering, new PdfString(cmapEncoding.getOrdering()));
-        cidInfo.put(PdfName.Supplement, new PdfNumber(cmapEncoding.getSupplement()));//0
+        cidInfo.put(PdfName.Supplement, new PdfNumber(cmapEncoding.getSupplement()));
         cidFont.put(PdfName.CIDSystemInfo, cidInfo);
         if (!vertical) {
             cidFont.put(PdfName.DW, new PdfNumber(FontProgram.DEFAULT_WIDTH));