Apply the provided cmap for CIDFont

Also move FontAsian resources handling logic out of FontCache.

DEVSIX-3555, DEVSIX-3938

Author: vitali-pr

font-asian/src/main/resources/com/itextpdf/io/font/cmap/cjk_registry.properties

@@ -2,7 +2,7 @@ Adobe_Japan1=78-EUC-H 78-EUC-V 78-H 78-RKSJ-H 78-RKSJ-V 78-V 78ms-RKSJ-H 78ms-RK
 Adobe_Korea1=Adobe-Korea1-0 Adobe-Korea1-1 Adobe-Korea1-2 KSC-EUC-H KSC-EUC-V KSC-H KSC-Johab-H KSC-Johab-V KSC-V KSCms-UHC-H KSCms-UHC-HW-H KSCms-UHC-HW-V KSCms-UHC-V KSCpc-EUC-H KSCpc-EUC-V UniKS-UCS2-H UniKS-UCS2-V UniKS-UTF16-H UniKS-UTF16-V UniKS-UTF32-H UniKS-UTF32-V UniKS-UTF8-H UniKS-UTF8-V
 Adobe_GB1=Adobe-GB1-0 Adobe-GB1-1 Adobe-GB1-2 Adobe-GB1-3 Adobe-GB1-4 Adobe-GB1-5 GB-EUC-H GB-EUC-V GB-H GB-V GBK-EUC-H GBK-EUC-V GBK2K-H GBK2K-V GBKp-EUC-H GBKp-EUC-V GBpc-EUC-H GBpc-EUC-V GBT-EUC-H GBT-EUC-V GBT-H GBT-V GBTpc-EUC-H GBTpc-EUC-V UniGB-UCS2-H UniGB-UCS2-V UniGB-UTF16-H UniGB-UTF16-V UniGB-UTF32-H UniGB-UTF32-V UniGB-UTF8-H UniGB-UTF8-V
 Adobe_CNS1=Adobe-CNS1-0 Adobe-CNS1-1 Adobe-CNS1-2 Adobe-CNS1-3 Adobe-CNS1-4 Adobe-CNS1-5 Adobe-CNS1-6 B5-H B5-V B5pc-H B5pc-V CNS-EUC-H CNS-EUC-V CNS1-H CNS1-V CNS2-H CNS2-V ETen-B5-H ETen-B5-V ETenms-B5-H ETenms-B5-V ETHK-B5-H ETHK-B5-V HKdla-B5-H HKdla-B5-V HKdlb-B5-H HKdlb-B5-V HKgccs-B5-H HKgccs-B5-V HKm314-B5-H HKm314-B5-V HKm471-B5-H HKm471-B5-V HKscs-B5-H HKscs-B5-V UniCNS-UCS2-H UniCNS-UCS2-V UniCNS-UTF16-H UniCNS-UTF16-V UniCNS-UTF32-H UniCNS-UTF32-V UniCNS-UTF8-H UniCNS-UTF8-V
-Adobe_Japan1_Uni=UniJIS-UTF16-H UniJIS-UTF16-V
+Adobe_Japan1_Uni=UniJIS-UTF16-H UniJIS-UTF16-V UniJIS-UCS2-H UniJIS-UCS2-HW-H UniJIS2004-UTF16-H
 Adobe_Korea1_Uni=UniKS-UTF16-H UniKS-UTF16-V
 Adobe_GB1_Uni=UniGB-UTF16-H UniGB-UTF16-V
 Adobe_CNS1_Uni=UniCNS-UTF16-H UniCNS-UTF16-V

io/pom.xml

@@ -15,6 +15,12 @@
       <artifactId>commons</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>com.itextpdf</groupId>
+      <artifactId>font-asian</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>com.itextpdf</groupId>
       <artifactId>pdftest</artifactId>

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

@@ -77,7 +77,7 @@ public CMapEncoding(String cmap, String uniMap) {
             isDirect = true;
             this.codeSpaceRanges = IDENTITY_H_V_CODESPACE_RANGES;
         } else {
-            cid2Code = FontCache.getCidToCodepointCmap(cmap);
+            cid2Code = CjkResourceLoader.getCidToCodepointCmap(cmap);
             code2Cid = CMapEncoding.getCodeToCidCmap(cmap, cid2Code);
             this.codeSpaceRanges = cid2Code.getCodeSpaceRanges();
         }
@@ -197,7 +197,7 @@ public List<byte[]> getCodeSpaceRanges() {
 
     private static CMapCodepointToCid getCodeToCidCmap(String cmap, CMapCidToCodepoint cid2Code) {
         try {
-            return FontCache.getCodepointToCidCmap(cmap);
+            return CjkResourceLoader.getCodepointToCidCmap(cmap);
         } catch (com.itextpdf.io.exceptions.IOException ex) {
             // if not found, fall back to reversing
             return new CMapCodepointToCid(cid2Code);

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

@@ -23,7 +23,6 @@ This file is part of the iText (R) project.
 package com.itextpdf.io.font;
 
 import com.itextpdf.io.exceptions.IOException;
-import com.itextpdf.io.font.cmap.CMapCidUni;
 import com.itextpdf.io.font.cmap.CMapUniCid;
 import com.itextpdf.io.font.otf.Glyph;
 import com.itextpdf.io.util.IntHashtable;
@@ -35,27 +34,20 @@ This file is part of the iText (R) project.
 
 public class CidFont extends FontProgram {
 
-
     private String fontName;
 	private int pdfFontFlags;
     private Set<String> compatibleCmaps;
 
-    CidFont(String fontName, Set<String> cmaps) {
+    CidFont(String fontName, String cmap, Set<String> compatibleCmaps) {
         this.fontName = fontName;
-        compatibleCmaps = cmaps;
+        this.compatibleCmaps = compatibleCmaps;
         fontNames = new FontNames();
         initializeCidFontNameAndStyle(fontName);
         Map<String, Object> fontDesc = CidFontProperties.getAllFonts().get(fontNames.getFontName());
         if (fontDesc == null) {
             throw new IOException("There is no such predefined font: {0}").setMessageParams(fontName);
         }
-        initializeCidFontProperties(fontDesc);
-    }
-
-    CidFont(String fontName, Set<String> cmaps, Map<String, Object> fontDescription) {
-        initializeCidFontNameAndStyle(fontName);
-        initializeCidFontProperties(fontDescription);
-        compatibleCmaps = cmaps;
+        initializeCidFontProperties(fontDesc, cmap);
     }
 
     public boolean compatibleWith(String cmap) {
@@ -97,7 +89,7 @@ private void initializeCidFontNameAndStyle(String fontName) {
         fontNames.setFullName(new String[][]{new String[]{"", "", "", fontNames.getFontName()}});
     }
 
-    private void initializeCidFontProperties(Map<String, Object> fontDesc) {
+    private void initializeCidFontProperties(Map<String, Object> fontDesc, String cmap) {
         fontIdentification.setPanose((String) fontDesc.get("Panose"));
         fontMetrics.setItalicAngle(Integer.parseInt((String) fontDesc.get("ItalicAngle")));
         fontMetrics.setCapHeight(Integer.parseInt((String) fontDesc.get("CapHeight")));
@@ -113,10 +105,10 @@ private void initializeCidFontProperties(Map<String, Object> fontDesc) {
         int ury = Integer.parseInt(tk.nextToken());
         fontMetrics.updateBbox(llx, lly, urx, ury);
         registry = (String) fontDesc.get("Registry");
-        String uniMap = getCompatibleUniMap(registry);
+        String uniMap = getCompatibleUniMap(registry, cmap);
         if (uniMap != null) {
             IntHashtable metrics = (IntHashtable) fontDesc.get("W");
-            CMapUniCid uni2cid = FontCache.getUni2CidCmap(uniMap);
+            CMapUniCid uni2cid = CjkResourceLoader.getUni2CidCmap(uniMap);
             avgWidth = 0;
             for (int cp: uni2cid.getCodePoints()) {
                 int cid = uni2cid.lookup(cp);
@@ -133,14 +125,22 @@ private void initializeCidFontProperties(Map<String, Object> fontDesc) {
         }
     }
 
-    private static String getCompatibleUniMap(String registry) {
+    private static String getCompatibleUniMap(String registry, String cmap) {
+        Set<String> compatibleUniMaps = CidFontProperties.getRegistryNames().get(registry + "_Uni");
+        // 'cmap != null &&' part here is for autoport
+        if (cmap != null && compatibleUniMaps.contains(cmap)) {
+            return cmap;
+        }
+
         String uniMap = "";
-        for (String name : CidFontProperties.getRegistryNames().get(registry + "_Uni")) {
+        for (String name : compatibleUniMaps) {
             uniMap = name;
             if (name.endsWith("H")) {
+                uniMap = name;
                 break;
             }
         }
+
         return uniMap;
     }
 }

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

@@ -28,7 +28,7 @@ This file is part of the iText (R) project.
 
 import java.io.InputStream;
 import java.util.HashMap;
-import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
@@ -94,7 +94,7 @@ private static void loadRegistry() throws java.io.IOException {
         for (Object key : p.keySet()) {
             String value = p.getProperty((String)key);
             String[] sp = value.split(" ");
-            Set<String> hs = new HashSet<String>();
+            Set<String> hs = new LinkedHashSet<String>();
             for (String s : sp) {
                 if (s.length() > 0)
                     hs.add(s);