texlive[63601] Build/source/texk/dvipdfm-x: dvipdfmx: support some

[commits+kakuto at tug.org]

Revision: 63601
          http://tug.org/svn/texlive?view=revision&revision=63601
Author:   kakuto
Date:     2022-06-15 07:15:38 +0200 (Wed, 15 Jun 2022)
Log Message:
-----------
dvipdfmx: support some TrueType fonts in macOS which use 0-4 cmap (from Clerk Ma)

Modified Paths:
--------------
    trunk/Build/source/texk/dvipdfm-x/ChangeLog
    trunk/Build/source/texk/dvipdfm-x/cidtype2.c
    trunk/Build/source/texk/dvipdfm-x/tt_cmap.c

Modified: trunk/Build/source/texk/dvipdfm-x/ChangeLog
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/ChangeLog	2022-06-14 23:49:52 UTC (rev 63600)
+++ trunk/Build/source/texk/dvipdfm-x/ChangeLog	2022-06-15 05:15:38 UTC (rev 63601)
@@ -1,3 +1,8 @@
+2022-06-15  Clerk Ma  <maqiyuan130324 at vip.qq.com>
+
+	* cidtype2.c, tt_cmap.c: Support some TrueType fonts in macOS
+	which use 0-4 cmap.
+
 2022-06-13  Akira Kakuto  <kakuto at jcom.zaq.ne.jp>
 
 	* pdfximage.c: Fix a bug due to an uninitialized variable

Modified: trunk/Build/source/texk/dvipdfm-x/cidtype2.c
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/cidtype2.c	2022-06-14 23:49:52 UTC (rev 63600)
+++ trunk/Build/source/texk/dvipdfm-x/cidtype2.c	2022-06-15 05:15:38 UTC (rev 63601)
@@ -147,7 +147,7 @@
  */
 
 #define WIN_UCS_INDEX_MAX   1
-#define KNOWN_ENCODINGS_MAX 9
+#define KNOWN_ENCODINGS_MAX 10
 static struct
 {
   unsigned short  platform;
@@ -164,6 +164,7 @@
   {TT_MAC, TT_MAC_TRADITIONAL_CHINESE, {"B5pc",     NULL}},
   {TT_MAC, TT_MAC_SIMPLIFIED_CHINESE,  {"GBpc-EUC", NULL}},
   {TT_MAC, TT_MAC_KOREAN,   {"KSCpc-EUC", NULL}},
+  {0, 4,  {"UCSms-UCS4", "UCSms-UCS2", "UCS4", "UCS2", NULL}},
   {0, 0, {NULL}}
 };
 

Modified: trunk/Build/source/texk/dvipdfm-x/tt_cmap.c
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/tt_cmap.c	2022-06-14 23:49:52 UTC (rev 63600)
+++ trunk/Build/source/texk/dvipdfm-x/tt_cmap.c	2022-06-15 05:15:38 UTC (rev 63601)
@@ -1059,6 +1059,7 @@
 static cmap_plat_enc_rec cmap_plat_encs[] = {
     { 3, 10 },
     { 0, 3 },
+    { 0, 4 },
     { 0, 0 },
     { 3, 1 },
     { 0, 1 }
@@ -1480,6 +1481,9 @@
     ttcmap = tt_cmap_read(sfont, 3, 1); /* Microsoft UCS2 */
     if (!ttcmap) {
       ttcmap = tt_cmap_read(sfont, 0, 3); /* Unicode 2.0 or later */
+      if (!ttcmap) {
+        ttcmap = tt_cmap_read(sfont, 0, 4);
+      }
     }
   }