summaryrefslogtreecommitdiff
path: root/Build/source/texk/dvipdfm-x/cid.c
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/texk/dvipdfm-x/cid.c')
-rw-r--r--Build/source/texk/dvipdfm-x/cid.c40
1 files changed, 24 insertions, 16 deletions
diff --git a/Build/source/texk/dvipdfm-x/cid.c b/Build/source/texk/dvipdfm-x/cid.c
index ad8c8bbfedb..5e11cc7262e 100644
--- a/Build/source/texk/dvipdfm-x/cid.c
+++ b/Build/source/texk/dvipdfm-x/cid.c
@@ -1,6 +1,6 @@
/* This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
- Copyright (C) 2002-2016 by Jin-Hwan Cho and Shunsaku Hirata,
+ Copyright (C) 2002-2018 by Jin-Hwan Cho and Shunsaku Hirata,
the dvipdfmx project team.
This program is free software; you can redistribute it and/or modify
@@ -62,15 +62,22 @@ static struct {
/* Heighest Supplement values supported by PDF-1.0, 1.1, ...; see
* also http://partners.adobe.com/public/developer/font/index.html#ckf
*/
- int supplement[16];
+ int supplement[21];
} CIDFont_stdcc_def[] = {
- {"Adobe", "UCS", {-1, -1, 0, 0, 0, 0, 0, 0}},
- {"Adobe", "GB1", {-1, -1, 0, 2, 4, 4, 4, 4}},
- {"Adobe", "CNS1", {-1, -1, 0, 0, 3, 4, 4, 4}},
- {"Adobe", "Japan1", {-1, -1, 2, 2, 4, 5, 6, 6}},
- {"Adobe", "Korea1", {-1, -1, 1, 1, 2, 2, 2, 2}},
- {"Adobe", "Identity", {-1, -1, 0, 0, 0, 0, 0, 0}},
- {NULL, NULL, { 0, 0, 0, 0, 0, 0, 0, 0}}
+ {"Adobe", "UCS", {-1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0}},
+ {"Adobe", "GB1", {-1, -1, 0, 2, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+ 4, 4, 4, 4, 4}},
+ {"Adobe", "CNS1", {-1, -1, 0, 0, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+ 4, 4, 4, 4, 4}},
+ {"Adobe", "Japan1", {-1, -1, 2, 2, 4, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+ 6, 6, 6, 6, 6}},
+ {"Adobe", "Korea1", {-1, -1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2}},
+ {"Adobe", "Identity", {-1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0}},
+ {NULL, NULL, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0}}
};
#define UCS_CC 0
#define ACC_START 1
@@ -711,10 +718,10 @@ static CIDSysInfo *
get_cidsysinfo (const char *map_name, fontmap_opt *fmap_opt)
{
CIDSysInfo *csi = NULL;
- int pdf_ver;
+ int sup_idx;
int i, csi_idx = -1, n, m;
- pdf_ver = pdf_get_version();
+ sup_idx = pdf_get_version() - 10;
if (!fmap_opt || !fmap_opt->charcoll)
return NULL;
@@ -733,7 +740,7 @@ get_cidsysinfo (const char *map_name, fontmap_opt *fmap_opt)
if (strlen(fmap_opt->charcoll) > n) {
csi->supplement = (int) strtoul(&(fmap_opt->charcoll[n]), NULL, 10);
} else { /* Use heighest supported value for current output PDF version. */
- csi->supplement = CIDFont_stdcc_def[csi_idx].supplement[pdf_ver];
+ csi->supplement = CIDFont_stdcc_def[csi_idx].supplement[sup_idx];
}
break;
}
@@ -785,11 +792,12 @@ get_cidsysinfo (const char *map_name, fontmap_opt *fmap_opt)
}
if (csi && csi_idx >= 0) {
- if (csi->supplement > CIDFont_stdcc_def[csi_idx].supplement[pdf_ver]
+ if (csi->supplement > CIDFont_stdcc_def[csi_idx].supplement[sup_idx]
&& (fmap_opt->flags & FONTMAP_OPT_NOEMBED)) {
- WARN("%s: Heighest supplement number supported in PDF-1.%d for %s-%s is %d.",
- CIDFONT_DEBUG_STR, pdf_ver, csi->registry, csi->ordering,
- CIDFont_stdcc_def[csi_idx].supplement[pdf_ver]);
+ WARN("%s: Heighest supplement number supported in PDF-%d.%d for %s-%s is %d.",
+ CIDFONT_DEBUG_STR, pdf_get_version_major(), pdf_get_version_minor(),
+ csi->registry, csi->ordering,
+ CIDFont_stdcc_def[csi_idx].supplement[sup_idx]);
WARN("%s: Some character may not shown without embedded font (--> %s).",
CIDFONT_DEBUG_STR, map_name);
}