diff --git a/core/fpdfapi/cmaps/CNS1/cmaps_cns1.cpp b/core/fpdfapi/cmaps/CNS1/cmaps_cns1.cpp
index bb57381..7d39fd9 100644
--- a/core/fpdfapi/cmaps/CNS1/cmaps_cns1.cpp
+++ b/core/fpdfapi/cmaps/CNS1/cmaps_cns1.cpp
@@ -12,34 +12,34 @@
 #include "core/fpdfapi/page/cpdf_pagemodule.h"
 
 static const FXCMAP_CMap g_FXCMAP_CNS1_cmaps[] = {
-    {"B5pc-H", FXCMAP_CMap::Range, g_FXCMAP_B5pc_H_0, 247, FXCMAP_CMap::None,
-     nullptr, 0, 0},
-    {"B5pc-V", FXCMAP_CMap::Range, g_FXCMAP_B5pc_V_0, 12, FXCMAP_CMap::None,
-     nullptr, 0, -1},
-    {"HKscs-B5-H", FXCMAP_CMap::Range, g_FXCMAP_HKscs_B5_H_5, 1210,
-     FXCMAP_CMap::None, nullptr, 0, 0},
-    {"HKscs-B5-V", FXCMAP_CMap::Range, g_FXCMAP_HKscs_B5_V_5, 13,
-     FXCMAP_CMap::None, nullptr, 0, -1},
-    {"ETen-B5-H", FXCMAP_CMap::Range, g_FXCMAP_ETen_B5_H_0, 254,
-     FXCMAP_CMap::None, nullptr, 0, 0},
-    {"ETen-B5-V", FXCMAP_CMap::Range, g_FXCMAP_ETen_B5_V_0, 13,
-     FXCMAP_CMap::None, nullptr, 0, -1},
-    {"ETenms-B5-H", FXCMAP_CMap::Range, g_FXCMAP_ETenms_B5_H_0, 1,
-     FXCMAP_CMap::None, nullptr, 0, -2},
-    {"ETenms-B5-V", FXCMAP_CMap::Range, g_FXCMAP_ETenms_B5_V_0, 18,
-     FXCMAP_CMap::None, nullptr, 0, -1},
-    {"CNS-EUC-H", FXCMAP_CMap::Range, g_FXCMAP_CNS_EUC_H_0, 157,
-     FXCMAP_CMap::Range, g_FXCMAP_CNS_EUC_H_0_DWord, 238, 0},
-    {"CNS-EUC-V", FXCMAP_CMap::Range, g_FXCMAP_CNS_EUC_V_0, 180,
-     FXCMAP_CMap::Range, g_FXCMAP_CNS_EUC_V_0_DWord, 261, 0},
-    {"UniCNS-UCS2-H", FXCMAP_CMap::Range, g_FXCMAP_UniCNS_UCS2_H_3, 16418,
-     FXCMAP_CMap::None, nullptr, 0, 0},
-    {"UniCNS-UCS2-V", FXCMAP_CMap::Range, g_FXCMAP_UniCNS_UCS2_V_3, 13,
-     FXCMAP_CMap::None, nullptr, 0, -1},
-    {"UniCNS-UTF16-H", FXCMAP_CMap::Single, g_FXCMAP_UniCNS_UTF16_H_0, 14557,
-     FXCMAP_CMap::None, nullptr, 0, 0},
-    {"UniCNS-UTF16-V", FXCMAP_CMap::Range, g_FXCMAP_UniCNS_UCS2_V_3, 13,
-     FXCMAP_CMap::None, nullptr, 0, -1},
+    {"B5pc-H", g_FXCMAP_B5pc_H_0, nullptr, 247, 0, FXCMAP_CMap::Range,
+     FXCMAP_CMap::None, 0},
+    {"B5pc-V", g_FXCMAP_B5pc_V_0, nullptr, 12, 0, FXCMAP_CMap::Range,
+     FXCMAP_CMap::None, -1},
+    {"HKscs-B5-H", g_FXCMAP_HKscs_B5_H_5, nullptr, 1210, 0, FXCMAP_CMap::Range,
+     FXCMAP_CMap::None, 0},
+    {"HKscs-B5-V", g_FXCMAP_HKscs_B5_V_5, nullptr, 13, 0, FXCMAP_CMap::Range,
+     FXCMAP_CMap::None, -1},
+    {"ETen-B5-H", g_FXCMAP_ETen_B5_H_0, nullptr, 254, 0, FXCMAP_CMap::Range,
+     FXCMAP_CMap::None, 0},
+    {"ETen-B5-V", g_FXCMAP_ETen_B5_V_0, nullptr, 13, 0, FXCMAP_CMap::Range,
+     FXCMAP_CMap::None, -1},
+    {"ETenms-B5-H", g_FXCMAP_ETenms_B5_H_0, nullptr, 1, 0, FXCMAP_CMap::Range,
+     FXCMAP_CMap::None, -2},
+    {"ETenms-B5-V", g_FXCMAP_ETenms_B5_V_0, nullptr, 18, 0, FXCMAP_CMap::Range,
+     FXCMAP_CMap::None, -1},
+    {"CNS-EUC-H", g_FXCMAP_CNS_EUC_H_0, g_FXCMAP_CNS_EUC_H_0_DWord, 157, 238,
+     FXCMAP_CMap::Range, FXCMAP_CMap::Range, 0},
+    {"CNS-EUC-V", g_FXCMAP_CNS_EUC_V_0, g_FXCMAP_CNS_EUC_V_0_DWord, 180, 261,
+     FXCMAP_CMap::Range, FXCMAP_CMap::Range, 0},
+    {"UniCNS-UCS2-H", g_FXCMAP_UniCNS_UCS2_H_3, nullptr, 16418, 0,
+     FXCMAP_CMap::Range, FXCMAP_CMap::None, 0},
+    {"UniCNS-UCS2-V", g_FXCMAP_UniCNS_UCS2_V_3, nullptr, 13, 0,
+     FXCMAP_CMap::Range, FXCMAP_CMap::None, -1},
+    {"UniCNS-UTF16-H", g_FXCMAP_UniCNS_UTF16_H_0, nullptr, 14557, 0,
+     FXCMAP_CMap::Single, FXCMAP_CMap::None, 0},
+    {"UniCNS-UTF16-V", g_FXCMAP_UniCNS_UCS2_V_3, nullptr, 13, 0,
+     FXCMAP_CMap::Range, FXCMAP_CMap::None, -1},
 };
 
 void CPDF_ModuleMgr::LoadEmbeddedCNS1CMaps() {
diff --git a/core/fpdfapi/cmaps/GB1/cmaps_gb1.cpp b/core/fpdfapi/cmaps/GB1/cmaps_gb1.cpp
index a91da32..f0e5992 100644
--- a/core/fpdfapi/cmaps/GB1/cmaps_gb1.cpp
+++ b/core/fpdfapi/cmaps/GB1/cmaps_gb1.cpp
@@ -12,34 +12,34 @@
 #include "core/fpdfapi/page/cpdf_pagemodule.h"
 
 static const FXCMAP_CMap g_FXCMAP_GB1_cmaps[] = {
-    {"GB-EUC-H", FXCMAP_CMap::Range, g_FXCMAP_GB_EUC_H_0, 90, FXCMAP_CMap::None,
-     nullptr, 0, 0},
-    {"GB-EUC-V", FXCMAP_CMap::Range, g_FXCMAP_GB_EUC_V_0, 20, FXCMAP_CMap::None,
-     nullptr, 0, -1},
-    {"GBpc-EUC-H", FXCMAP_CMap::Range, g_FXCMAP_GBpc_EUC_H_0, 91,
-     FXCMAP_CMap::None, nullptr, 0, 0},
-    {"GBpc-EUC-V", FXCMAP_CMap::Range, g_FXCMAP_GBpc_EUC_V_0, 20,
-     FXCMAP_CMap::None, nullptr, 0, -1},
-    {"GBK-EUC-H", FXCMAP_CMap::Range, g_FXCMAP_GBK_EUC_H_2, 4071,
-     FXCMAP_CMap::None, nullptr, 0, 0},
-    {"GBK-EUC-V", FXCMAP_CMap::Range, g_FXCMAP_GBK_EUC_V_2, 20,
-     FXCMAP_CMap::None, nullptr, 0, -1},
-    {"GBKp-EUC-H", FXCMAP_CMap::Range, g_FXCMAP_GBKp_EUC_H_2, 4070,
-     FXCMAP_CMap::None, nullptr, 0, -2},
-    {"GBKp-EUC-V", FXCMAP_CMap::Range, g_FXCMAP_GBKp_EUC_V_2, 20,
-     FXCMAP_CMap::None, nullptr, 0, -1},
-    {"GBK2K-H", FXCMAP_CMap::Range, g_FXCMAP_GBK2K_H_5, 4071,
-     FXCMAP_CMap::Single, g_FXCMAP_GBK2K_H_5_DWord, 1017, -4},
-    {"GBK2K-V", FXCMAP_CMap::Range, g_FXCMAP_GBK2K_V_5, 41, FXCMAP_CMap::None,
-     nullptr, 0, -1},
-    {"UniGB-UCS2-H", FXCMAP_CMap::Range, g_FXCMAP_UniGB_UCS2_H_4, 13825,
-     FXCMAP_CMap::None, nullptr, 0, 0},
-    {"UniGB-UCS2-V", FXCMAP_CMap::Range, g_FXCMAP_UniGB_UCS2_V_4, 24,
-     FXCMAP_CMap::None, nullptr, 0, -1},
-    {"UniGB-UTF16-H", FXCMAP_CMap::Range, g_FXCMAP_UniGB_UCS2_H_4, 13825,
-     FXCMAP_CMap::None, nullptr, 0, 0},
-    {"UniGB-UTF16-V", FXCMAP_CMap::Range, g_FXCMAP_UniGB_UCS2_V_4, 24,
-     FXCMAP_CMap::None, nullptr, 0, -1},
+    {"GB-EUC-H", g_FXCMAP_GB_EUC_H_0, nullptr, 90, 0, FXCMAP_CMap::Range,
+     FXCMAP_CMap::None, 0},
+    {"GB-EUC-V", g_FXCMAP_GB_EUC_V_0, nullptr, 20, 0, FXCMAP_CMap::Range,
+     FXCMAP_CMap::None, -1},
+    {"GBpc-EUC-H", g_FXCMAP_GBpc_EUC_H_0, nullptr, 91, 0, FXCMAP_CMap::Range,
+     FXCMAP_CMap::None, 0},
+    {"GBpc-EUC-V", g_FXCMAP_GBpc_EUC_V_0, nullptr, 20, 0, FXCMAP_CMap::Range,
+     FXCMAP_CMap::None, -1},
+    {"GBK-EUC-H", g_FXCMAP_GBK_EUC_H_2, nullptr, 4071, 0, FXCMAP_CMap::Range,
+     FXCMAP_CMap::None, 0},
+    {"GBK-EUC-V", g_FXCMAP_GBK_EUC_V_2, nullptr, 20, 0, FXCMAP_CMap::Range,
+     FXCMAP_CMap::None, -1},
+    {"GBKp-EUC-H", g_FXCMAP_GBKp_EUC_H_2, nullptr, 4070, 0, FXCMAP_CMap::Range,
+     FXCMAP_CMap::None, -2},
+    {"GBKp-EUC-V", g_FXCMAP_GBKp_EUC_V_2, nullptr, 20, 0, FXCMAP_CMap::Range,
+     FXCMAP_CMap::None, -1},
+    {"GBK2K-H", g_FXCMAP_GBK2K_H_5, g_FXCMAP_GBK2K_H_5_DWord, 4071, 1017,
+     FXCMAP_CMap::Range, FXCMAP_CMap::Single, -4},
+    {"GBK2K-V", g_FXCMAP_GBK2K_V_5, nullptr, 41, 0, FXCMAP_CMap::Range,
+     FXCMAP_CMap::None, -1},
+    {"UniGB-UCS2-H", g_FXCMAP_UniGB_UCS2_H_4, nullptr, 13825, 0,
+     FXCMAP_CMap::Range, FXCMAP_CMap::None, 0},
+    {"UniGB-UCS2-V", g_FXCMAP_UniGB_UCS2_V_4, nullptr, 24, 0,
+     FXCMAP_CMap::Range, FXCMAP_CMap::None, -1},
+    {"UniGB-UTF16-H", g_FXCMAP_UniGB_UCS2_H_4, nullptr, 13825, 0,
+     FXCMAP_CMap::Range, FXCMAP_CMap::None, 0},
+    {"UniGB-UTF16-V", g_FXCMAP_UniGB_UCS2_V_4, nullptr, 24, 0,
+     FXCMAP_CMap::Range, FXCMAP_CMap::None, -1},
 };
 
 void CPDF_ModuleMgr::LoadEmbeddedGB1CMaps() {
diff --git a/core/fpdfapi/cmaps/Japan1/cmaps_japan1.cpp b/core/fpdfapi/cmaps/Japan1/cmaps_japan1.cpp
index 17611e7..603f238 100644
--- a/core/fpdfapi/cmaps/Japan1/cmaps_japan1.cpp
+++ b/core/fpdfapi/cmaps/Japan1/cmaps_japan1.cpp
@@ -12,46 +12,46 @@
 #include "core/fpdfapi/page/cpdf_pagemodule.h"
 
 static const FXCMAP_CMap g_FXCMAP_Japan1_cmaps[] = {
-    {"83pv-RKSJ-H", FXCMAP_CMap::Range, g_FXCMAP_83pv_RKSJ_H_1, 222,
-     FXCMAP_CMap::None, nullptr, 0, 0},
-    {"90ms-RKSJ-H", FXCMAP_CMap::Range, g_FXCMAP_90ms_RKSJ_H_2, 171,
-     FXCMAP_CMap::None, nullptr, 0, 0},
-    {"90ms-RKSJ-V", FXCMAP_CMap::Range, g_FXCMAP_90ms_RKSJ_V_2, 78,
-     FXCMAP_CMap::None, nullptr, 0, -1},
-    {"90msp-RKSJ-H", FXCMAP_CMap::Range, g_FXCMAP_90msp_RKSJ_H_2, 170,
-     FXCMAP_CMap::None, nullptr, 0, -2},
-    {"90msp-RKSJ-V", FXCMAP_CMap::Range, g_FXCMAP_90msp_RKSJ_V_2, 78,
-     FXCMAP_CMap::None, nullptr, 0, -1},
-    {"90pv-RKSJ-H", FXCMAP_CMap::Range, g_FXCMAP_90pv_RKSJ_H_1, 263,
-     FXCMAP_CMap::None, nullptr, 0, 0},
-    {"Add-RKSJ-H", FXCMAP_CMap::Range, g_FXCMAP_Add_RKSJ_H_1, 635,
-     FXCMAP_CMap::None, nullptr, 0, 0},
-    {"Add-RKSJ-V", FXCMAP_CMap::Range, g_FXCMAP_Add_RKSJ_V_1, 57,
-     FXCMAP_CMap::None, nullptr, 0, -1},
-    {"EUC-H", FXCMAP_CMap::Range, g_FXCMAP_EUC_H_1, 120, FXCMAP_CMap::None,
-     nullptr, 0, 0},
-    {"EUC-V", FXCMAP_CMap::Range, g_FXCMAP_EUC_V_1, 27, FXCMAP_CMap::None,
-     nullptr, 0, -1},
-    {"Ext-RKSJ-H", FXCMAP_CMap::Range, g_FXCMAP_Ext_RKSJ_H_2, 665,
-     FXCMAP_CMap::None, nullptr, 0, -4},
-    {"Ext-RKSJ-V", FXCMAP_CMap::Range, g_FXCMAP_Ext_RKSJ_V_2, 39,
-     FXCMAP_CMap::None, nullptr, 0, -1},
-    {"H", FXCMAP_CMap::Range, g_FXCMAP_H_1, 118, FXCMAP_CMap::None, nullptr, 0,
+    {"83pv-RKSJ-H", g_FXCMAP_83pv_RKSJ_H_1, nullptr, 222, 0, FXCMAP_CMap::Range,
+     FXCMAP_CMap::None, 0},
+    {"90ms-RKSJ-H", g_FXCMAP_90ms_RKSJ_H_2, nullptr, 171, 0, FXCMAP_CMap::Range,
+     FXCMAP_CMap::None, 0},
+    {"90ms-RKSJ-V", g_FXCMAP_90ms_RKSJ_V_2, nullptr, 78, 0, FXCMAP_CMap::Range,
+     FXCMAP_CMap::None, -1},
+    {"90msp-RKSJ-H", g_FXCMAP_90msp_RKSJ_H_2, nullptr, 170, 0,
+     FXCMAP_CMap::Range, FXCMAP_CMap::None, -2},
+    {"90msp-RKSJ-V", g_FXCMAP_90msp_RKSJ_V_2, nullptr, 78, 0,
+     FXCMAP_CMap::Range, FXCMAP_CMap::None, -1},
+    {"90pv-RKSJ-H", g_FXCMAP_90pv_RKSJ_H_1, nullptr, 263, 0, FXCMAP_CMap::Range,
+     FXCMAP_CMap::None, 0},
+    {"Add-RKSJ-H", g_FXCMAP_Add_RKSJ_H_1, nullptr, 635, 0, FXCMAP_CMap::Range,
+     FXCMAP_CMap::None, 0},
+    {"Add-RKSJ-V", g_FXCMAP_Add_RKSJ_V_1, nullptr, 57, 0, FXCMAP_CMap::Range,
+     FXCMAP_CMap::None, -1},
+    {"EUC-H", g_FXCMAP_EUC_H_1, nullptr, 120, 0, FXCMAP_CMap::Range,
+     FXCMAP_CMap::None, 0},
+    {"EUC-V", g_FXCMAP_EUC_V_1, nullptr, 27, 0, FXCMAP_CMap::Range,
+     FXCMAP_CMap::None, -1},
+    {"Ext-RKSJ-H", g_FXCMAP_Ext_RKSJ_H_2, nullptr, 665, 0, FXCMAP_CMap::Range,
+     FXCMAP_CMap::None, -4},
+    {"Ext-RKSJ-V", g_FXCMAP_Ext_RKSJ_V_2, nullptr, 39, 0, FXCMAP_CMap::Range,
+     FXCMAP_CMap::None, -1},
+    {"H", g_FXCMAP_H_1, nullptr, 118, 0, FXCMAP_CMap::Range, FXCMAP_CMap::None,
      0},
-    {"V", FXCMAP_CMap::Range, g_FXCMAP_V_1, 27, FXCMAP_CMap::None, nullptr, 0,
+    {"V", g_FXCMAP_V_1, nullptr, 27, 0, FXCMAP_CMap::Range, FXCMAP_CMap::None,
      -1},
-    {"UniJIS-UCS2-H", FXCMAP_CMap::Single, g_FXCMAP_UniJIS_UCS2_H_4, 9772,
-     FXCMAP_CMap::None, nullptr, 0, 0},
-    {"UniJIS-UCS2-V", FXCMAP_CMap::Single, g_FXCMAP_UniJIS_UCS2_V_4, 251,
-     FXCMAP_CMap::None, nullptr, 0, -1},
-    {"UniJIS-UCS2-HW-H", FXCMAP_CMap::Range, g_FXCMAP_UniJIS_UCS2_HW_H_4, 4,
-     FXCMAP_CMap::None, nullptr, 0, -2},
-    {"UniJIS-UCS2-HW-V", FXCMAP_CMap::Range, g_FXCMAP_UniJIS_UCS2_HW_V_4, 199,
-     FXCMAP_CMap::None, nullptr, 0, -1},
-    {"UniJIS-UTF16-H", FXCMAP_CMap::Single, g_FXCMAP_UniJIS_UCS2_H_4, 9772,
-     FXCMAP_CMap::None, nullptr, 0, 0},
-    {"UniJIS-UTF16-V", FXCMAP_CMap::Single, g_FXCMAP_UniJIS_UCS2_V_4, 251,
-     FXCMAP_CMap::None, nullptr, 0, -1},
+    {"UniJIS-UCS2-H", g_FXCMAP_UniJIS_UCS2_H_4, nullptr, 9772, 0,
+     FXCMAP_CMap::Single, FXCMAP_CMap::None, 0},
+    {"UniJIS-UCS2-V", g_FXCMAP_UniJIS_UCS2_V_4, nullptr, 251, 0,
+     FXCMAP_CMap::Single, FXCMAP_CMap::None, -1},
+    {"UniJIS-UCS2-HW-H", g_FXCMAP_UniJIS_UCS2_HW_H_4, nullptr, 4, 0,
+     FXCMAP_CMap::Range, FXCMAP_CMap::None, -2},
+    {"UniJIS-UCS2-HW-V", g_FXCMAP_UniJIS_UCS2_HW_V_4, nullptr, 199, 0,
+     FXCMAP_CMap::Range, FXCMAP_CMap::None, -1},
+    {"UniJIS-UTF16-H", g_FXCMAP_UniJIS_UCS2_H_4, nullptr, 9772, 0,
+     FXCMAP_CMap::Single, FXCMAP_CMap::None, 0},
+    {"UniJIS-UTF16-V", g_FXCMAP_UniJIS_UCS2_V_4, nullptr, 251, 0,
+     FXCMAP_CMap::Single, FXCMAP_CMap::None, -1},
 };
 
 void CPDF_ModuleMgr::LoadEmbeddedJapan1CMaps() {
diff --git a/core/fpdfapi/cmaps/Korea1/cmaps_korea1.cpp b/core/fpdfapi/cmaps/Korea1/cmaps_korea1.cpp
index 690ce2a..938344a 100644
--- a/core/fpdfapi/cmaps/Korea1/cmaps_korea1.cpp
+++ b/core/fpdfapi/cmaps/Korea1/cmaps_korea1.cpp
@@ -12,28 +12,28 @@
 #include "core/fpdfapi/page/cpdf_pagemodule.h"
 
 static const FXCMAP_CMap g_FXCMAP_Korea1_cmaps[] = {
-    {"KSC-EUC-H", FXCMAP_CMap::Range, g_FXCMAP_KSC_EUC_H_0, 467,
-     FXCMAP_CMap::None, nullptr, 0, 0},
-    {"KSC-EUC-V", FXCMAP_CMap::Range, g_FXCMAP_KSC_EUC_V_0, 16,
-     FXCMAP_CMap::None, nullptr, 0, -1},
-    {"KSCms-UHC-H", FXCMAP_CMap::Range, g_FXCMAP_KSCms_UHC_H_1, 675,
-     FXCMAP_CMap::None, nullptr, 0, -2},
-    {"KSCms-UHC-V", FXCMAP_CMap::Range, g_FXCMAP_KSCms_UHC_V_1, 16,
-     FXCMAP_CMap::None, nullptr, 0, -1},
-    {"KSCms-UHC-HW-H", FXCMAP_CMap::Range, g_FXCMAP_KSCms_UHC_HW_H_1, 675,
-     FXCMAP_CMap::None, nullptr, 0, 0},
-    {"KSCms-UHC-HW-V", FXCMAP_CMap::Range, g_FXCMAP_KSCms_UHC_HW_V_1, 16,
-     FXCMAP_CMap::None, nullptr, 0, -1},
-    {"KSCpc-EUC-H", FXCMAP_CMap::Range, g_FXCMAP_KSCpc_EUC_H_0, 509,
-     FXCMAP_CMap::None, nullptr, 0, -6},
-    {"UniKS-UCS2-H", FXCMAP_CMap::Range, g_FXCMAP_UniKS_UCS2_H_1, 8394,
-     FXCMAP_CMap::None, nullptr, 0, 0},
-    {"UniKS-UCS2-V", FXCMAP_CMap::Range, g_FXCMAP_UniKS_UCS2_V_1, 18,
-     FXCMAP_CMap::None, nullptr, 0, -1},
-    {"UniKS-UTF16-H", FXCMAP_CMap::Single, g_FXCMAP_UniKS_UTF16_H_0, 158,
-     FXCMAP_CMap::None, nullptr, 0, -2},
-    {"UniKS-UTF16-V", FXCMAP_CMap::Range, g_FXCMAP_UniKS_UCS2_V_1, 18,
-     FXCMAP_CMap::None, nullptr, 0, -1},
+    {"KSC-EUC-H", g_FXCMAP_KSC_EUC_H_0, nullptr, 467, 0, FXCMAP_CMap::Range,
+     FXCMAP_CMap::None, 0},
+    {"KSC-EUC-V", g_FXCMAP_KSC_EUC_V_0, nullptr, 16, 0, FXCMAP_CMap::Range,
+     FXCMAP_CMap::None, -1},
+    {"KSCms-UHC-H", g_FXCMAP_KSCms_UHC_H_1, nullptr, 675, 0, FXCMAP_CMap::Range,
+     FXCMAP_CMap::None, -2},
+    {"KSCms-UHC-V", g_FXCMAP_KSCms_UHC_V_1, nullptr, 16, 0, FXCMAP_CMap::Range,
+     FXCMAP_CMap::None, -1},
+    {"KSCms-UHC-HW-H", g_FXCMAP_KSCms_UHC_HW_H_1, nullptr, 675, 0,
+     FXCMAP_CMap::Range, FXCMAP_CMap::None, 0},
+    {"KSCms-UHC-HW-V", g_FXCMAP_KSCms_UHC_HW_V_1, nullptr, 16, 0,
+     FXCMAP_CMap::Range, FXCMAP_CMap::None, -1},
+    {"KSCpc-EUC-H", g_FXCMAP_KSCpc_EUC_H_0, nullptr, 509, 0, FXCMAP_CMap::Range,
+     FXCMAP_CMap::None, -6},
+    {"UniKS-UCS2-H", g_FXCMAP_UniKS_UCS2_H_1, nullptr, 8394, 0,
+     FXCMAP_CMap::Range, FXCMAP_CMap::None, 0},
+    {"UniKS-UCS2-V", g_FXCMAP_UniKS_UCS2_V_1, nullptr, 18, 0,
+     FXCMAP_CMap::Range, FXCMAP_CMap::None, -1},
+    {"UniKS-UTF16-H", g_FXCMAP_UniKS_UTF16_H_0, nullptr, 158, 0,
+     FXCMAP_CMap::Single, FXCMAP_CMap::None, -2},
+    {"UniKS-UTF16-V", g_FXCMAP_UniKS_UCS2_V_1, nullptr, 18, 0,
+     FXCMAP_CMap::Range, FXCMAP_CMap::None, -1},
 };
 
 void CPDF_ModuleMgr::LoadEmbeddedKorea1CMaps() {
diff --git a/core/fpdfapi/cmaps/cmap_int.h b/core/fpdfapi/cmaps/cmap_int.h
index 15e1531..464a341 100644
--- a/core/fpdfapi/cmaps/cmap_int.h
+++ b/core/fpdfapi/cmaps/cmap_int.h
@@ -11,15 +11,15 @@
 #include "core/fxcrt/fx_system.h"
 
 struct FXCMAP_CMap {
-  enum MapType { None, Single, Range };
+  enum MapType : uint8_t { None, Single, Range };
 
   const char* m_Name;
-  MapType m_WordMapType;
   const uint16_t* m_pWordMap;
-  uint16_t m_WordCount;
-  MapType m_DWordMapType;
   const uint16_t* m_pDWordMap;
+  uint16_t m_WordCount;
   uint16_t m_DWordCount;
+  MapType m_WordMapType;
+  MapType m_DWordMapType;
   int8_t m_UseOffset;
 };