summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/source/texk/dvipdfm-x/ChangeLog7
-rw-r--r--Build/source/texk/dvipdfm-x/tt_cmap.c6
2 files changed, 11 insertions, 2 deletions
diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog
index 2c27ca96c7e..e6562b818e1 100644
--- a/Build/source/texk/dvipdfm-x/ChangeLog
+++ b/Build/source/texk/dvipdfm-x/ChangeLog
@@ -1,3 +1,10 @@
+2019-02-25 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
+
+ * tt_cmap.c (is_PUA_or_presentation):
+ Skip also CJK Radicals Supplement, to lower the priority for
+ double encoded glyphs. This does not break tounicode entries
+ for glyphs which are only encoded in this region.
+
2019-02-25 Shunsaku Hirata <shunsaku.hirata74@gmail.com>
* tt_post.c: Since OpenType ver. 1.7, PostScript glyph names
diff --git a/Build/source/texk/dvipdfm-x/tt_cmap.c b/Build/source/texk/dvipdfm-x/tt_cmap.c
index 32ffc1a8dba..9e2736cfe93 100644
--- a/Build/source/texk/dvipdfm-x/tt_cmap.c
+++ b/Build/source/texk/dvipdfm-x/tt_cmap.c
@@ -850,8 +850,10 @@ handle_CIDFont (sfnt *sfont,
static int is_PUA_or_presentation (unsigned int uni)
{
- /* KANGXI RADICALs are commonly double encoded. */
- return ((uni >= 0x2F00 && uni <= 0x2FD5) ||
+ /* Some of CJK Radicals Supplement and Kangxi Radicals
+ * are commonly double encoded, lower the priority.
+ */
+ return ((uni >= 0x2E80 && uni <= 0x2EF3) || (uni >= 0x2F00 && uni <= 0x2FD5) ||
(uni >= 0xE000 && uni <= 0xF8FF) || (uni >= 0xFB00 && uni <= 0xFB4F) ||
(uni >= 0xF0000 && uni <= 0xFFFFD) || (uni >= 0x100000 && uni <= 0x10FFFD));
}