diff options
Diffstat (limited to 'Build/source/texk/dvipdfm-x')
| -rw-r--r-- | Build/source/texk/dvipdfm-x/ChangeLog | 11 | ||||
| -rwxr-xr-x | Build/source/texk/dvipdfm-x/configure | 22 | ||||
| -rw-r--r-- | Build/source/texk/dvipdfm-x/configure.ac | 2 | ||||
| -rw-r--r-- | Build/source/texk/dvipdfm-x/pdfobj.c | 443 | ||||
| -rw-r--r-- | Build/source/texk/dvipdfm-x/pdfobj.h | 7 | ||||
| -rw-r--r-- | Build/source/texk/dvipdfm-x/tt_cmap.c | 1394 | ||||
| -rw-r--r-- | Build/source/texk/dvipdfm-x/tt_gsub.c | 368 | ||||
| -rw-r--r-- | Build/source/texk/dvipdfm-x/tt_gsub.h | 13 |
8 files changed, 1390 insertions, 870 deletions
diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog index b6b57be5697..951d5f9e136 100644 --- a/Build/source/texk/dvipdfm-x/ChangeLog +++ b/Build/source/texk/dvipdfm-x/ChangeLog @@ -1,3 +1,14 @@ +2019-05-03 Shunsaku Hirata <shunsaku.hirata74@gmail.com> + + * pdfobj.c, pdfobj.h: Add support for ASCIIHex and ASCII85 + decode filter. Support for decoding stream data with multiple + filters applied. Remove unused function. + * tt_cmap.c, tt_gsub.[ch]: Revise ToUnicode CMap creation for + OpenType. Use GSUB for mapping unencoded glyphs to Unicode + (XeTeX support), lowering priority of CJK compatibility + ideographs. + * configure.ac: Version 20190503. + 2019-04-07 Karl Berry <karl@freefriends.org> * TeX Live 2019. diff --git a/Build/source/texk/dvipdfm-x/configure b/Build/source/texk/dvipdfm-x/configure index 5a79d45785b..7c9e2a0751d 100755 --- a/Build/source/texk/dvipdfm-x/configure +++ b/Build/source/texk/dvipdfm-x/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for dvipdfm-x (TeX Live) 20190225. +# Generated by GNU Autoconf 2.69 for dvipdfm-x (TeX Live) 20190503. # # Report bugs to <tex-k@tug.org>. # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='dvipdfm-x (TeX Live)' PACKAGE_TARNAME='dvipdfm-x--tex-live-' -PACKAGE_VERSION='20190225' -PACKAGE_STRING='dvipdfm-x (TeX Live) 20190225' +PACKAGE_VERSION='20190503' +PACKAGE_STRING='dvipdfm-x (TeX Live) 20190503' PACKAGE_BUGREPORT='tex-k@tug.org' PACKAGE_URL='' @@ -1350,7 +1350,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures dvipdfm-x (TeX Live) 20190225 to adapt to many kinds of systems. +\`configure' configures dvipdfm-x (TeX Live) 20190503 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1421,7 +1421,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of dvipdfm-x (TeX Live) 20190225:";; + short | recursive ) echo "Configuration of dvipdfm-x (TeX Live) 20190503:";; esac cat <<\_ACEOF @@ -1551,7 +1551,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -dvipdfm-x (TeX Live) configure 20190225 +dvipdfm-x (TeX Live) configure 20190503 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2390,7 +2390,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by dvipdfm-x (TeX Live) $as_me 20190225, which was +It was created by dvipdfm-x (TeX Live) $as_me 20190503, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -8077,7 +8077,7 @@ fi # Define the identity of the package. PACKAGE='dvipdfm-x--tex-live-' - VERSION='20190225' + VERSION='20190503' cat >>confdefs.h <<_ACEOF @@ -14746,7 +14746,7 @@ Usage: $0 [OPTIONS] Report bugs to <bug-libtool@gnu.org>." lt_cl_version="\ -dvipdfm-x (TeX Live) config.lt 20190225 +dvipdfm-x (TeX Live) config.lt 20190503 configured by $0, generated by GNU Autoconf 2.69. Copyright (C) 2011 Free Software Foundation, Inc. @@ -16636,7 +16636,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by dvipdfm-x (TeX Live) $as_me 20190225, which was +This file was extended by dvipdfm-x (TeX Live) $as_me 20190503, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16706,7 +16706,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -dvipdfm-x (TeX Live) config.status 20190225 +dvipdfm-x (TeX Live) config.status 20190503 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/Build/source/texk/dvipdfm-x/configure.ac b/Build/source/texk/dvipdfm-x/configure.ac index c802fa08a6e..6787c70c484 100644 --- a/Build/source/texk/dvipdfm-x/configure.ac +++ b/Build/source/texk/dvipdfm-x/configure.ac @@ -7,7 +7,7 @@ dnl This file is free software; the copyright holder dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl -AC_INIT([dvipdfm-x (TeX Live)], [20190225], [tex-k@tug.org]) +AC_INIT([dvipdfm-x (TeX Live)], [20190503], [tex-k@tug.org]) AC_PREREQ([2.65]) AC_CONFIG_SRCDIR([agl.c]) AC_CONFIG_AUX_DIR([../../build-aux]) diff --git a/Build/source/texk/dvipdfm-x/pdfobj.c b/Build/source/texk/dvipdfm-x/pdfobj.c index be799cc2290..a1acf1b5e25 100644 --- a/Build/source/texk/dvipdfm-x/pdfobj.c +++ b/Build/source/texk/dvipdfm-x/pdfobj.c @@ -1,6 +1,6 @@ /* This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks. - Copyright (C) 2007-2018 by Jin-Hwan Cho and Shunsaku Hirata, + Copyright (C) 2007-2019 by Jin-Hwan Cho and Shunsaku Hirata, the dvipdfmx project team. Copyright (C) 1998, 1999 by Mark A. Wicks <mwicks@kettering.edu> @@ -2223,48 +2223,9 @@ pdf_add_stream (pdf_obj *stream, const void *stream_data, int length) #if HAVE_ZLIB #define WBUF_SIZE 4096 -int -pdf_add_stream_flate (pdf_obj *dst, const void *data, int len) -{ - z_stream z; - Bytef wbuf[WBUF_SIZE]; - - z.zalloc = Z_NULL; z.zfree = Z_NULL; z.opaque = Z_NULL; - - z.next_in = (z_const Bytef *) data; z.avail_in = len; - z.next_out = (Bytef *) wbuf; z.avail_out = WBUF_SIZE; - - if (inflateInit(&z) != Z_OK) { - WARN("inflateInit() failed."); - return -1; - } - - for (;;) { - int status; - status = inflate(&z, Z_NO_FLUSH); - if (status == Z_STREAM_END) - break; - else if (status != Z_OK) { - WARN("inflate() failed. Broken PDF file?"); - inflateEnd(&z); - return -1; - } - - if (z.avail_out == 0) { - pdf_add_stream(dst, wbuf, WBUF_SIZE); - z.next_out = wbuf; - z.avail_out = WBUF_SIZE; - } - } - - if (WBUF_SIZE - z.avail_out > 0) - pdf_add_stream(dst, wbuf, WBUF_SIZE - z.avail_out); - - return (inflateEnd(&z) == Z_OK ? 0 : -1); -} static int -get_decode_parms (struct decode_parms *parms, pdf_obj *dict) +filter_get_DecodeParms_FlateDecode (struct decode_parms *parms, pdf_obj *dict) { pdf_obj *tmp; @@ -2278,18 +2239,25 @@ get_decode_parms (struct decode_parms *parms, pdf_obj *dict) parms->columns = 1; tmp = pdf_deref_obj(pdf_lookup_dict(dict, "Predictor")); - if (tmp) + if (tmp) { parms->predictor = pdf_number_value(tmp); + pdf_release_obj(tmp); + } tmp = pdf_deref_obj(pdf_lookup_dict(dict, "Colors")); - if (tmp) + if (tmp) { parms->colors = pdf_number_value(tmp); + pdf_release_obj(tmp); + } tmp = pdf_deref_obj(pdf_lookup_dict(dict, "BitsPerComponent")); - if (tmp) + if (tmp) { parms->bits_per_component = pdf_number_value(tmp); + pdf_release_obj(tmp); + } tmp = pdf_deref_obj(pdf_lookup_dict(dict, "Columns")); - if (tmp) + if (tmp) { parms->columns = pdf_number_value(tmp); - + pdf_release_obj(tmp); + } if (parms->bits_per_component != 1 && parms->bits_per_component != 2 && parms->bits_per_component != 4 && @@ -2354,17 +2322,19 @@ filter_row_TIFF2 (unsigned char *dst, const unsigned char *src, * Especially, calling pdf_add_stream() for each 4 bytes append is highly * inefficient. */ -static int -filter_decoded (pdf_obj *dst, const void *src, int srclen, - struct decode_parms *parms) +static pdf_obj * +filter_stream_decode_Predictor (const void *src, size_t srclen, struct decode_parms *parms) { + pdf_obj *dst; const unsigned char *p = (const unsigned char *) src; const unsigned char *endptr = p + srclen; - unsigned char *prev, *buf; - int bits_per_pixel = parms->colors * parms->bits_per_component; - int bytes_per_pixel = (bits_per_pixel + 7) / 8; - int length = (parms->columns * bits_per_pixel + 7) / 8; - int i, error = 0; + unsigned char *prev, *buf; + int bits_per_pixel = parms->colors * parms->bits_per_component; + int bytes_per_pixel = (bits_per_pixel + 7) / 8; + int length = (parms->columns * bits_per_pixel + 7) / 8; + int i, error = 0; + + dst = pdf_new_stream(0); prev = NEW(length, unsigned char); buf = NEW(length, unsigned char); @@ -2491,16 +2461,21 @@ filter_decoded (pdf_obj *dst, const void *src, int srclen, RELEASE(prev); RELEASE(buf); - return error; + if (error) { + pdf_release_obj(dst); + dst = NULL; + } + + return dst; } -static int -pdf_add_stream_flate_filtered (pdf_obj *dst, const void *data, int len, struct decode_parms *parms) +static pdf_obj * +filter_stream_decode_FlateDecode (const void *data, size_t len, struct decode_parms *parms) { - pdf_obj *tmp; - z_stream z; - Bytef wbuf[WBUF_SIZE]; - int error; + pdf_obj *dst; + pdf_obj *tmp; + z_stream z; + Bytef wbuf[WBUF_SIZE]; z.zalloc = Z_NULL; z.zfree = Z_NULL; z.opaque = Z_NULL; @@ -2509,7 +2484,7 @@ pdf_add_stream_flate_filtered (pdf_obj *dst, const void *data, int len, struct d if (inflateInit(&z) != Z_OK) { WARN("inflateInit() failed."); - return -1; + return NULL; } tmp = pdf_new_stream(0); @@ -2521,7 +2496,8 @@ pdf_add_stream_flate_filtered (pdf_obj *dst, const void *data, int len, struct d else if (status != Z_OK) { WARN("inflate() failed. Broken PDF file?"); inflateEnd(&z); - return -1; + pdf_release_obj(tmp); + return NULL; } if (z.avail_out == 0) { @@ -2534,79 +2510,310 @@ pdf_add_stream_flate_filtered (pdf_obj *dst, const void *data, int len, struct d if (WBUF_SIZE - z.avail_out > 0) pdf_add_stream(tmp, wbuf, WBUF_SIZE - z.avail_out); - error = filter_decoded(dst, pdf_stream_dataptr(tmp), pdf_stream_length(tmp), parms); + if (inflateEnd(&z) == Z_OK) { + if (parms) { + dst = filter_stream_decode_Predictor(pdf_stream_dataptr(tmp), pdf_stream_length(tmp), parms); + } else { + dst = pdf_link_obj(tmp); + } + } else { + dst = NULL; + } pdf_release_obj(tmp); - return ((!error && inflateEnd(&z) == Z_OK) ? 0 : -1); + return dst; } #endif -int -pdf_concat_stream (pdf_obj *dst, pdf_obj *src) +static pdf_obj * +filter_stream_decode_ASCIIHexDecode (const void *data, size_t len) +{ + pdf_obj *dst; + int eod, error; + const char *p = (const char *) data; + const char *endptr = p + len; + unsigned char *buf, ch; + size_t pos, n; + + buf = NEW((len+1)/2, unsigned char); + skip_white(&p, endptr); + ch = 0; n = 0; pos = 0; eod = 0; error = 0; + while (p < endptr && !error && !eod) { + char c1, val; + c1 = p[0]; + if (c1 >= 'A' && c1 <= 'F') { + val = c1 - 'A' + 10; + } else if (c1 >= 'a' && c1 <= 'f') { + val = c1 - 'a' + 10; + } else if (c1 >= '0' && c1 <= '9') { + val = c1 - '0'; + } else if (c1 == '>') { + val = 0; + eod = 1; + if ((pos % 2) == 0) + break; + } else { + error = -1; + break; + } + if (pos % 2) { + buf[n] = ch + val; + n++; + ch = 0; + } else { + ch = val << 4; + } + pos++; p++; + skip_white(&p, endptr); + } + if (error || !eod) { + WARN("Invalid ASCIIHex data seen: %s", error ? "Invalid character" : "No EOD marker"); + dst = NULL; + } else { + dst = pdf_new_stream(0); + pdf_add_stream(dst, buf, n); + } + RELEASE(buf); + + return dst; +} + +/* Percent sign is not start of comment here. + * We need this for reading Ascii85 encoded data. + */ +#define is_space(c) ((c) == ' ' || (c) == '\t' || (c) == '\f' || \ + (c) == '\r' || (c) == '\n' || (c) == '\0') +static void +skip_white_a85 (const char **p, const char *endptr) { + while (*p < endptr && (is_space(**p))) { + (*p)++; + } +} + +static pdf_obj * +filter_stream_decode_ASCII85Decode (const void *data, size_t len) +{ + pdf_obj *dst; + int eod, error; + const char *p = (const char *) data; + const char *endptr = p + len; + unsigned char *buf; + size_t n; + + buf = NEW(((len+4)/5)*4, unsigned char); + skip_white_a85(&p, endptr); + n = 0; eod = 0; error = 0; + while (p < endptr && !error && !eod) { + char q[5] = {'u', 'u', 'u', 'u', 'u'}; + int m; + char ch; + + ch = p[0]; + p++; + skip_white_a85(&p, endptr); + if (ch == 'z') { + memset(buf+n, 0, 4); + n += 4; + continue; + } else if (ch == '~') { + if (p < endptr && p[0] == '>') { + eod = 1; + p++; + } else { + error = -1; + } + break; + } + q[0] = ch; + for (m = 1; m < 5 && p < endptr; m++) { + ch = p[0]; + p++; + skip_white_a85(&p, endptr); + if (ch == '~') { + if (p < endptr && p[0] == '>') { + eod = 1; + p++; + } else { + error = -1; + } + break; + } else if (ch < '!' || ch > 'u') { + error = -1; + break; + } else { + q[m] = ch; + } + } + if (!error) { + uint32_t val = 0; + int i; + if (m <= 1) { + error = -1; + break; + } + val = 85*85*85*(q[0] - '!') + 85*85*(q[1] - '!') + + 85*(q[2] - '!') + (q[3] - '!'); + /* Check overflow */ + if (val > UINT32_MAX / 85) { + error = -1; + break; + } else { + val = 85 * val; + if (val > UINT32_MAX - (q[4] - '!')) { + error = -1; + break; + } + val += (q[4] - '!'); + } + if (!error) { + for (i = 3; i >= 0; i--) { + buf[n + i] = val & 0xff; + val /= 256; + } + n += m - 1; + } + } + } + + if (error) { + WARN("Error in reading ASCII85 data."); + dst = NULL; + } else if (!eod) { + WARN("Error in reading ASCII85 data: No EOD"); + dst = NULL; + } else { + dst = pdf_new_stream(0); + pdf_add_stream(dst, buf, n); + } + RELEASE(buf); + + return dst; +} + +static pdf_obj * +filter_stream_decode (const char *filter_name, pdf_obj *src, pdf_obj *parm) +{ + pdf_obj *dec; const char *stream_data; - int stream_length; - pdf_obj *stream_dict; - pdf_obj *filter; - int error = 0; + size_t stream_length; - if (!PDF_OBJ_STREAMTYPE(dst) || !PDF_OBJ_STREAMTYPE(src)) - ERROR("Invalid type."); + if (!filter_name) + return pdf_link_obj(src); stream_data = pdf_stream_dataptr(src); - stream_length = pdf_stream_length (src); - stream_dict = pdf_stream_dict (src); + stream_length = pdf_stream_length(src); - filter = pdf_lookup_dict(stream_dict, "Filter"); - if (!filter) - pdf_add_stream(dst, stream_data, stream_length); + if (!strcmp(filter_name, "ASCIIHexDecode")) { + dec = filter_stream_decode_ASCIIHexDecode(stream_data, stream_length); + } else if (!strcmp(filter_name, "ASCII85Decode")) { + dec = filter_stream_decode_ASCII85Decode(stream_data, stream_length); #if HAVE_ZLIB - else { - struct decode_parms parms; - int have_parms = 0; + } else if (!strcmp(filter_name, "FlateDecode")) { + struct decode_parms decode_parm; + if (parm) + filter_get_DecodeParms_FlateDecode(&decode_parm, parm); + dec = filter_stream_decode_FlateDecode(stream_data, stream_length, parm ? &decode_parm : NULL); +#endif /* HAVE_ZLIB */ + } else { + WARN("DecodeFilter \"%s\" not supported.", filter_name); + dec = NULL; + } - if (pdf_lookup_dict(stream_dict, "DecodeParms")) { - pdf_obj *tmp; + return dec; +} - /* Dictionary or array */ - tmp = pdf_deref_obj(pdf_lookup_dict(stream_dict, "DecodeParms")); - if (PDF_OBJ_ARRAYTYPE(tmp)) { - if (pdf_array_length(tmp) > 1) { - WARN("Unexpected size for DecodeParms array."); - return -1; - } - tmp = pdf_deref_obj(pdf_get_array(tmp, 0)); - } - if (!PDF_OBJ_DICTTYPE(tmp)) { - WARN("PDF dict expected for DecodeParms..."); - return -1; - } - error = get_decode_parms(&parms, tmp); - if (error) - ERROR("Invalid value(s) in DecodeParms dictionary."); - have_parms = 1; - } - if (PDF_OBJ_ARRAYTYPE(filter)) { - if (pdf_array_length(filter) > 1) { - WARN("Multiple DecodeFilter not supported."); +int +pdf_concat_stream (pdf_obj *dst, pdf_obj *src) +{ + pdf_obj *filtered; + pdf_obj *stream_dict; + pdf_obj *filter, *parms; + int error = 0; + + if (!PDF_OBJ_STREAMTYPE(dst) || !PDF_OBJ_STREAMTYPE(src)) { + WARN("Passed invalid type in pdf_concat_stream()."); + return -1; + } + + stream_dict = pdf_stream_dict(src); + + filter = pdf_lookup_dict(stream_dict, "Filter"); + if (!filter) { + pdf_add_stream(dst, pdf_stream_dataptr(src), pdf_stream_length(src)); + return 0; + } + if (pdf_lookup_dict(stream_dict, "DecodeParms")) { + /* Dictionary or array */ + parms = pdf_deref_obj(pdf_lookup_dict(stream_dict, "DecodeParms")); + if (!parms) { + WARN("Failed to deref DeocdeParms..."); + return -1; + } else if (!PDF_OBJ_ARRAYTYPE(parms) && !PDF_OBJ_DICTTYPE(parms)) { + WARN("PDF dict or array expected for DecodeParms..."); + pdf_release_obj(parms); + return -1; + } + } else { + parms = NULL; + } + if (PDF_OBJ_ARRAYTYPE(filter)) { + int i, num; + pdf_obj *prev = NULL; + + num = pdf_array_length(filter); + if (parms) { + if (!PDF_OBJ_ARRAYTYPE(parms) || pdf_array_length(parms) != num) { + WARN("Invalid DecodeParam object found."); + pdf_release_obj(parms); return -1; } - filter = pdf_get_array(filter, 0); } - if (PDF_OBJ_NAMETYPE(filter)) { - char *filter_name = pdf_name_value(filter); - if (filter_name && !strcmp(filter_name, "FlateDecode")) { - if (have_parms) - error = pdf_add_stream_flate_filtered(dst, stream_data, stream_length, &parms); - else - error = pdf_add_stream_flate(dst, stream_data, stream_length); - } else { - WARN("DecodeFilter \"%s\" not supported.", filter_name); - error = -1; + if (num == 0) { + filtered = pdf_link_obj(src); + } else { + filtered = NULL; + prev = pdf_link_obj(src); + for (i = 0; i < num && prev != NULL; i++) { + pdf_obj *tmp1, *tmp2; + + tmp1 = pdf_deref_obj(pdf_get_array(filter, i)); + if (parms) { + tmp2 = pdf_deref_obj(pdf_get_array(parms, i)); + } else { + tmp2 = NULL; + } + if (PDF_OBJ_NAMETYPE(tmp1)) { + filtered = filter_stream_decode(pdf_name_value(tmp1), prev, tmp2); + } else if (PDF_OBJ_NULLTYPE(tmp1)) { + filtered = pdf_link_obj(prev); + } else { + WARN("Unexpected object found for /Filter..."); + filtered = NULL; + } + if (prev) + pdf_release_obj(prev); + if (tmp1) + pdf_release_obj(tmp1); + if (tmp2) + pdf_release_obj(tmp2); + prev = filtered; } - } else - ERROR("Broken PDF file?"); -#endif /* HAVE_ZLIB */ + } + } else if (PDF_OBJ_NAMETYPE(filter)) { + filtered = filter_stream_decode(pdf_name_value(filter), src, parms); + } else { + WARN("Invalid value for /Filter found."); + filtered = NULL; + } + if (parms) + pdf_release_obj(parms); + if (filtered) { + pdf_add_stream(dst, pdf_stream_dataptr(filtered), pdf_stream_length(filtered)); + pdf_release_obj(filtered); + error = 0; + } else { + error = -1; } return error; diff --git a/Build/source/texk/dvipdfm-x/pdfobj.h b/Build/source/texk/dvipdfm-x/pdfobj.h index a5474a4ba90..e9c7da4d11c 100644 --- a/Build/source/texk/dvipdfm-x/pdfobj.h +++ b/Build/source/texk/dvipdfm-x/pdfobj.h @@ -1,6 +1,6 @@ /* This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks. - Copyright (C) 2007-2018 by Jin-Hwan Cho and Shunsaku Hirata, + Copyright (C) 2007-2019 by Jin-Hwan Cho and Shunsaku Hirata, the dvipdfmx project team. Copyright (C) 1998, 1999 by Mark A. Wicks <mwicks@kettering.edu> @@ -152,11 +152,6 @@ extern pdf_obj *pdf_new_stream (int flags); extern void pdf_add_stream (pdf_obj *stream, const void *stream_data_ptr, int stream_data_len); -#if HAVE_ZLIB -extern int pdf_add_stream_flate (pdf_obj *stream, - const void *stream_data_ptr, - int stream_data_len); -#endif extern int pdf_concat_stream (pdf_obj *dst, pdf_obj *src); extern pdf_obj *pdf_stream_dict (pdf_obj *stream); extern int pdf_stream_length (pdf_obj *stream); diff --git a/Build/source/texk/dvipdfm-x/tt_cmap.c b/Build/source/texk/dvipdfm-x/tt_cmap.c index 9e2736cfe93..a05adca7fc7 100644 --- a/Build/source/texk/dvipdfm-x/tt_cmap.c +++ b/Build/source/texk/dvipdfm-x/tt_cmap.c @@ -1,6 +1,6 @@ /* This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks. - Copyright (C) 2007-2018 by Jin-Hwan Cho and Shunsaku Hirata, + Copyright (C) 2002-2019 by Jin-Hwan Cho and Shunsaku Hirata, the dvipdfmx project team. This program is free software; you can redistribute it and/or modify @@ -68,11 +68,12 @@ read_cmap0 (sfnt *sfont, ULONG len) struct cmap0 *map; int i; - if (len < 256) - ERROR("invalid cmap subtable"); + if (len < 256) { + WARN("invalid format 0 TT cmap subtable"); + return NULL; + } map = NEW(1, struct cmap0); - for (i = 0; i < 256; i++) map->glyphIndexArray[i] = sfnt_get_byte(sfont); @@ -114,14 +115,14 @@ read_cmap2 (sfnt *sfont, ULONG len) struct cmap2 *map; USHORT i, n; - if (len < 512) - ERROR("invalid cmap subtable"); - - map = NEW(1, struct cmap2); + if (len < 512) { + WARN("invalid fromt2 TT cmap subtable"); + return NULL; + } + map = NEW(1, struct cmap2); for (i = 0; i < 256; i++) map->subHeaderKeys[i] = sfnt_get_ushort(sfont); - for (n = 0, i = 0; i < 256; i++) { map->subHeaderKeys[i] /= 8; if (n < map->subHeaderKeys[i]) @@ -129,7 +130,13 @@ read_cmap2 (sfnt *sfont, ULONG len) } n += 1; /* the number of subHeaders is one plus the max of subHeaderKeys */ - map->subHeaders = NEW(n, struct SubHeader); + if (len < 512 + n * 8 ) { + WARN("invalid/truncated format2 TT cmap subtable"); + RELEASE(map); + return NULL; + } + + map->subHeaders = NEW(n, struct SubHeader); for (i = 0; i < n; i++) { map->subHeaders[i].firstCode = sfnt_get_ushort(sfont); map->subHeaders[i].entryCount = sfnt_get_ushort(sfont); @@ -222,8 +229,10 @@ read_cmap4(sfnt *sfont, ULONG len) struct cmap4 *map; USHORT i, n, segCount; - if (len < 8) - ERROR("invalid cmap subtable"); + if (len < 8) { + WARN("invalid format 4 TT cmap subtable"); + return NULL; + } map = NEW(1, struct cmap4); @@ -288,19 +297,19 @@ lookup_cmap4 (struct cmap4 *map, USHORT cc) * Last segment maps 0xffff to gid 0 (?) */ i = segCount = map->segCountX2 / 2; - while (i-- > 0 && cc <= map->endCount[i]) { + while (i-- > 0 && cc <= map->endCount[i]) { if (cc >= map->startCount[i]) { if (map->idRangeOffset[i] == 0) { - gid = (cc + map->idDelta[i]) & 0xffff; + gid = (cc + map->idDelta[i]) & 0xffff; } else if (cc == 0xffff && map->idRangeOffset[i] == 0xffff) { - /* this is for protection against some old broken fonts... */ - gid = 0; + /* this is for protection against some old broken fonts... */ + gid = 0; } else { - j = map->idRangeOffset[i] - (segCount - i) * 2; - j = (cc - map->startCount[i]) + (j / 2); - gid = map->glyphIndexArray[j]; - if (gid != 0) - gid = (gid + map->idDelta[i]) & 0xffff; + j = map->idRangeOffset[i] - (segCount - i) * 2; + j = (cc - map->startCount[i]) + (j / 2); + gid = map->glyphIndexArray[j]; + if (gid != 0) + gid = (gid + map->idDelta[i]) & 0xffff; } break; } @@ -323,14 +332,15 @@ read_cmap6 (sfnt *sfont, ULONG len) struct cmap6 *map; USHORT i; - if (len < 4) - ERROR("invalid cmap subtable"); + if (len < 4) { + WARN("invalid format 6 TT cmap subtable"); + return NULL; + } map = NEW(1, struct cmap6); map->firstCode = sfnt_get_ushort(sfont); map->entryCount = sfnt_get_ushort(sfont); - map->glyphIndexArray = NEW(map->entryCount, USHORT); - + map->glyphIndexArray = NEW(map->entryCount, USHORT); for (i = 0; i < map->entryCount; i++) map->glyphIndexArray[i] = sfnt_get_ushort(sfont); @@ -390,13 +400,14 @@ read_cmap12 (sfnt *sfont, ULONG len) struct cmap12 *map; ULONG i; - if (len < 4) - ERROR("invalid cmap subtable"); + if (len < 4) { + WARN("invalid format 12 TT cmap subtable"); + return NULL; + } map = NEW(1, struct cmap12); map->nGroups = sfnt_get_ulong(sfont); map->groups = NEW(map->nGroups, struct charGroup); - for (i = 0; i < map->nGroups; i++) { map->groups[i].startCharCode = sfnt_get_ulong(sfont); map->groups[i].endCharCode = sfnt_get_ulong(sfont); @@ -427,8 +438,8 @@ lookup_cmap12 (struct cmap12 *map, ULONG cccc) cccc <= map->groups[i].endCharCode) { if (cccc >= map->groups[i].startCharCode) { gid = (USHORT) ((cccc - - map->groups[i].startCharCode + - map->groups[i].startGlyphID) & 0xffff); + map->groups[i].startCharCode + + map->groups[i].startGlyphID) & 0xffff); break; } } @@ -510,6 +521,7 @@ tt_cmap_read (sfnt *sfont, USHORT platform, USHORT encoding) WARN("Unrecognized OpenType/TrueType cmap format."); tt_cmap_release(cmap); return NULL; + break; } if (!cmap->map) { @@ -526,24 +538,25 @@ tt_cmap_release (tt_cmap *cmap) if (cmap) { if (cmap->map) { - switch(cmap->format) { + switch (cmap->format) { case 0: - release_cmap0(cmap->map); - break; + release_cmap0(cmap->map); + break; case 2: - release_cmap2(cmap->map); - break; + release_cmap2(cmap->map); + break; case 4: - release_cmap4(cmap->map); - break; + release_cmap4(cmap->map); + break; case 6: - release_cmap6(cmap->map); - break; + release_cmap6(cmap->map); + break; case 12: - release_cmap12(cmap->map); - break; + release_cmap12(cmap->map); + break; default: - ERROR("Unrecognized OpenType/TrueType cmap format."); + WARN("Unrecognized OpenType/TrueType cmap format: %d", cmap->format); + break; } } RELEASE(cmap); @@ -582,129 +595,20 @@ tt_cmap_lookup (tt_cmap *cmap, ULONG cc) gid = lookup_cmap12(cmap->map, (ULONG) cc); break; default: - ERROR("Unrecognized OpenType/TrueType cmap subtable format"); + WARN("Unrecognized OpenType/TrueType cmap subtable format: %d", cmap->format); break; } return gid; } -/* Sorry for placing this here. - * We need to rewrite TrueType font support code... - */ -#define WBUF_SIZE 1024 -static unsigned char wbuf[WBUF_SIZE]; static unsigned char srange_min[2] = {0x00, 0x00}; static unsigned char srange_max[2] = {0xff, 0xff}; static unsigned char lrange_min[4] = {0x00, 0x00, 0x00, 0x00}; static unsigned char lrange_max[4] = {0x7f, 0xff, 0xff, 0xff}; -static void -load_cmap4 (struct cmap4 *map, - unsigned char *GIDToCIDMap, - otl_gsub *gsub_vert, otl_gsub *gsub_list, - CMap *cmap, CMap *tounicode_add) -{ - USHORT c0, c1, gid, cid; - USHORT j, d, segCount; - USHORT ch; - int i; - - segCount = map->segCountX2 / 2; - for (i = segCount - 1; i >= 0 ; i--) { - c0 = map->startCount[i]; - c1 = map->endCount[i]; - d = map->idRangeOffset[i] / 2 - (segCount - i); - for (j = 0; j <= c1 - c0; j++) { - ch = c0 + j; - if (map->idRangeOffset[i] == 0) { - gid = (ch + map->idDelta[i]) & 0xffff; - } else if (c0 == 0xffff && c1 == 0xffff && - map->idRangeOffset[i] == 0xffff) { - /* this is for protection against some old broken fonts... */ - gid = 0; - } else { - gid = (map->glyphIndexArray[j+d] + map->idDelta[i]) & 0xffff; - } - if (gid != 0 && gid != 0xffff) { - if (gsub_list) - otl_gsub_apply_chain(gsub_list, &gid); - if (gsub_vert) - otl_gsub_apply(gsub_vert, &gid); - if (GIDToCIDMap) { - cid = ((GIDToCIDMap[2*gid] << 8)|GIDToCIDMap[2*gid+1]); - if (cid == 0) - WARN("GID %u does not have corresponding CID %u.", gid, cid); - } else { - cid = gid; - } - wbuf[0] = 0; - wbuf[1] = 0; - wbuf[2] = (ch >> 8) & 0xff; - wbuf[3] = ch & 0xff; - wbuf[4] = (cid >> 8) & 0xff; - wbuf[5] = cid & 0xff; - CMap_add_cidchar(cmap, wbuf, 4, cid); - if (tounicode_add) { - unsigned char *p = wbuf + 6; - size_t uc_len; - uc_len = UC_UTF16BE_encode_char(ch, &p, wbuf + WBUF_SIZE -1 ); - CMap_add_bfchar(tounicode_add, wbuf+4, 2, wbuf+6, uc_len); - } - } - } - } - - return; -} - -static void -load_cmap12 (struct cmap12 *map, - unsigned char *GIDToCIDMap, - otl_gsub *gsub_vert, otl_gsub *gsub_list, - CMap *cmap, CMap *tounicode_add) -{ - ULONG i, ch; /* LONG ? */ - USHORT gid, cid; - - for (i = 0; i < map->nGroups; i++) { - for (ch = map->groups[i].startCharCode; - ch <= map->groups[i].endCharCode; - ch++) { - int d = ch - map->groups[i].startCharCode; - gid = (USHORT) ((map->groups[i].startGlyphID + d) & 0xffff); - if (gsub_list) - otl_gsub_apply_chain(gsub_list, &gid); - if (gsub_vert) - otl_gsub_apply(gsub_vert, &gid); - if (GIDToCIDMap) { - cid = ((GIDToCIDMap[2*gid] << 8)|GIDToCIDMap[2*gid+1]); - if (cid == 0) - WARN("GID %u does not have corresponding CID %u.", gid, cid); - } else { - cid = gid; - } - wbuf[0] = (ch >> 24) & 0xff; - wbuf[1] = (ch >> 16) & 0xff; - wbuf[2] = (ch >> 8) & 0xff; - wbuf[3] = ch & 0xff; - wbuf[4] = (cid >> 8) & 0xff; - wbuf[5] = cid & 0xff; - CMap_add_cidchar(cmap, wbuf, 4, cid); - if (tounicode_add) { - unsigned char *p = wbuf + 6; - size_t uc_len; - uc_len = UC_UTF16BE_encode_char(ch, &p, wbuf + WBUF_SIZE -1 ); - CMap_add_bfchar(tounicode_add, wbuf+4, 2, wbuf+6, uc_len); - } - } - } - - return; -} - /* OpenType CIDFont: * * We don't use GID for them. OpenType cmap table is for @@ -717,78 +621,38 @@ load_cmap12 (struct cmap12 *map, #include "cff_dict.h" #include "cff.h" -static int -handle_CIDFont (sfnt *sfont, - unsigned char **GIDToCIDMap, CIDSysInfo *csi) +/* This should be moved to cff.c */ +static void +create_GIDToCIDMap (uint16_t *GIDToCIDMap, uint16_t num_glyphs, cff_font *cffont) { - cff_font *cffont; - int offset, i; - card16 num_glyphs, gid; - cff_charsets *charset; - unsigned char *map; - struct tt_maxp_table *maxp; - - ASSERT(csi); - - offset = sfnt_find_table_pos(sfont, "CFF "); - if (offset == 0) { - csi->registry = NULL; - csi->ordering = NULL; - *GIDToCIDMap = NULL; - return 0; - } + cff_charsets *charset; + uint16_t gid, i; - maxp = tt_read_maxp_table(sfont); - num_glyphs = (card16) maxp->numGlyphs; - RELEASE(maxp); - if (num_glyphs < 1) - ERROR("No glyph contained in this font..."); + ASSERT(GIDToCIDMap); - cffont = cff_open(sfont->stream, offset, 0); - if (!cffont) - ERROR("Could not open CFF font..."); + if (!cffont || !(cffont->flag & FONTTYPE_CIDFONT)) { + for (gid = 0; gid < num_glyphs; gid++) { + GIDToCIDMap[gid] = gid; + } - - if (!(cffont->flag & FONTTYPE_CIDFONT)) { - cff_close(cffont); - csi->registry = NULL; - csi->ordering = NULL; - *GIDToCIDMap = NULL; - return 0; + return; } - if (!cff_dict_known(cffont->topdict, "ROS")) { - ERROR("No CIDSystemInfo???"); - } else { - card16 reg, ord; - - reg = (card16) cff_dict_get(cffont->topdict, "ROS", 0); - ord = (card16) cff_dict_get(cffont->topdict, "ROS", 1); - - csi->registry = cff_get_string(cffont, reg); - csi->ordering = cff_get_string(cffont, ord); - csi->supplement = (int) cff_dict_get(cffont->topdict, "ROS", 2); - } + memset(GIDToCIDMap, 0, num_glyphs*sizeof(uint16_t)); cff_read_charsets(cffont); charset = cffont->charsets; - if (!charset) { - ERROR("No CFF charset data???"); - } - - map = NEW(65536 * 2, unsigned char); - memset(map, 0, 65536 * 2); + if (!charset) + return; switch (charset->format) { case 0: { s_SID *cids; /* CID... */ - + cids = charset->data.glyphs; - for (gid = 1, i = 0; - i < charset->num_entries; i++) { - map[2*gid ] = (cids[i] >> 8) & 0xff; - map[2*gid+1] = cids[i] & 0xff; - gid++; + for (gid = 1, i = 0; i < charset->num_entries; i++) { + GIDToCIDMap[gid] = cids[i]; + gid++; } } break; @@ -798,16 +662,14 @@ handle_CIDFont (sfnt *sfont, card16 cid, count; ranges = charset->data.range1; - for (gid = 1, i = 0; - i < charset->num_entries; i++) { - cid = ranges[i].first; - count = ranges[i].n_left + 1; /* card8 */ - while (count-- > 0 && - gid <= num_glyphs) { - map[2*gid ] = (cid >> 8) & 0xff; - map[2*gid + 1] = cid & 0xff; - gid++; cid++; - } + for (gid = 1, i = 0; i < charset->num_entries; i++) { + cid = ranges[i].first; + count = ranges[i].n_left + 1; /* card8 */ + while (count-- > 0 && gid <= num_glyphs) { + GIDToCIDMap[gid] = cid; + gid++; + cid++; + } } } break; @@ -817,55 +679,52 @@ handle_CIDFont (sfnt *sfont, card16 cid, count; ranges = charset->data.range2; - if (charset->num_entries == 1 && - ranges[0].first == 1) { - /* "Complete" CIDFont */ - RELEASE(map); map = NULL; + if (charset->num_entries == 1 && ranges[0].first == 1) { + /* "Complete" CIDFont */ + for (gid = 0; gid < num_glyphs; gid++) { + GIDToCIDMap[gid] = gid; + } } else { - /* Not trivial mapping */ - for (gid = 1, i = 0; - i < charset->num_entries; i++) { - cid = ranges[i].first; - count = ranges[i].n_left + 1; - while (count-- > 0 && - gid <= num_glyphs) { - map[2*gid] = (cid >> 8) & 0xff; - map[2*gid+1] = cid & 0xff; - gid++; cid++; - } - } + /* Not trivial mapping */ + for (gid = 1, i = 0; i < charset->num_entries; i++) { + cid = ranges[i].first; + count = ranges[i].n_left + 1; + while (count-- > 0 && gid <= num_glyphs) { + GIDToCIDMap[gid] = cid; + gid++; + cid++; + } + } } } break; default: - RELEASE(map); map = NULL; - ERROR("Unknown CFF charset format...: %d", charset->format); + WARN("Unknown CFF charset format...: %d", charset->format); break; } - cff_close(cffont); - *GIDToCIDMap = map; - return 1; + return; } static int is_PUA_or_presentation (unsigned int uni) { /* Some of CJK Radicals Supplement and Kangxi Radicals * are commonly double encoded, lower the priority. + * CJK Compatibility Ideographs & Supplement added. */ return ((uni >= 0x2E80 && uni <= 0x2EF3) || (uni >= 0x2F00 && uni <= 0x2FD5) || (uni >= 0xE000 && uni <= 0xF8FF) || (uni >= 0xFB00 && uni <= 0xFB4F) || + (uni >= 0xF900 && uni <= 0xFAFF) || (uni >= 0x2F800 && uni <= 0x2FA1F) || (uni >= 0xF0000 && uni <= 0xFFFFD) || (uni >= 0x100000 && uni <= 0x10FFFD)); } -static char* -sfnt_get_glyphname(struct tt_post_table *post, cff_font *cffont, USHORT gid) +static char * +lookup_glyph_name (struct tt_post_table *post, cff_font *cffont, USHORT gid) { - char* name = NULL; + char *name = NULL; if (post) name = tt_get_glyphname(post, gid); - if (!name && cffont) name = cff_get_glyphname(cffont, gid); @@ -881,94 +740,82 @@ sfnt_get_glyphname(struct tt_post_table *post, cff_font *cffont, USHORT gid) #define is_used_char2(b,c) (((b)[(c)/8]) & (1 << (7-((c)%8)))) #endif -static USHORT -handle_subst_glyphs (CMap *cmap, - CMap *cmap_add, - const char *used_glyphs, - sfnt *sfont, - cff_font *cffont) +static int32_t +handle_subst_glyphs (CMap *cmap, CMap *cmap_add, char *used_chars) { - USHORT count; - USHORT i; - struct tt_post_table *post = NULL; + int32_t count = 0; + int32_t cid; - if (!cmap_add) - post = tt_read_post_table(sfont); + for (cid = 0; cid < 65536; cid++) { + if (!is_used_char2(used_chars, cid)) + continue; + else { + unsigned char buf[256]; + int inbytesleft = 2, outbytesleft = 254; + size_t len; + unsigned char *outbuf = buf + 2; + const unsigned char *inbuf = buf; + + buf[0] = (cid >> 8) & 0xff; + buf[1] = cid & 0xff; + CMap_decode(cmap_add, &inbuf, &inbytesleft, &outbuf, &outbytesleft); + if (inbytesleft == 0) { + len = 254 - outbytesleft; + CMap_add_bfchar(cmap, buf, 2, buf + 2, len); + used_chars[cid / 8] &= ~(1 << (7 - (cid % 8))); + count++; + } + } + } - for (count = 0, i = 0; i < 8192; i++) { - int j; - int32_t len; - int inbytesleft, outbytesleft; - const unsigned char *inbuf; - unsigned char *outbuf; + return count; +} - if (used_glyphs[i] == 0) - continue; +static int32_t +add_ToUnicode_via_glyph_name (CMap *cmap, char *used_chars, USHORT num_glyphs, + uint16_t *GIDToCIDMap, + sfnt *sfont, cff_font *cffont) +{ + int32_t count = 0; + USHORT gid; + struct tt_post_table *post = NULL; - for (j = 0; j < 8; j++) { - USHORT gid = 8 * i + j; - - if (!is_used_char2(used_glyphs, gid)) - continue; - - if (!cmap_add) { -#define MAX_UNICODES 16 - /* try to look up Unicode values from the glyph name... */ - char* name; - int32_t unicodes[MAX_UNICODES]; - int unicode_count = -1; - name = sfnt_get_glyphname(post, cffont, gid); - if (name) { - unicode_count = agl_get_unicodes(name, unicodes, MAX_UNICODES); - } + post = tt_read_post_table(sfont); + if (!post && !cffont) + return count; + + for (gid = 0; gid < num_glyphs; gid++) { + uint16_t cid = GIDToCIDMap[gid]; + if (is_used_char2(used_chars, cid)) { +#define MAX_UNICODES 32 + char *name; + int32_t unicodes[MAX_UNICODES]; + int unicode_count = -1; + + name = lookup_glyph_name(post, cffont, gid); + if (name) { + unicode_count = agl_get_unicodes(name, unicodes, MAX_UNICODES); #undef MAX_UNICODES - if (unicode_count == -1) { - if(dpx_conf.verbose_level > VERBOSE_LEVEL_MIN) { - if (name) - MESG("No Unicode mapping available: GID=%u, name=%s\n", gid, name); - else - MESG("No Unicode mapping available: GID=%u\n", gid); - } - } else { - /* the Unicode characters go into wbuf[2] and following, in UTF16BE */ - /* we rely on WBUF_SIZE being more than adequate for MAX_UNICODES */ - unsigned char* p = wbuf + 2; - int k; - len = 0; + RELEASE(name); + if (unicode_count > 0) { + unsigned char *buf; + unsigned char *p, *endptr; + int k; + size_t len = 0; + + buf = NEW(unicode_count*4+2, unsigned char); + p = buf + 2; + endptr = buf + (unicode_count * 4 + 2); for (k = 0; k < unicode_count; ++k) { - len += UC_UTF16BE_encode_char(unicodes[k], &p, wbuf+WBUF_SIZE); + len += UC_UTF16BE_encode_char(unicodes[k], &p, endptr); } - wbuf[0] = (gid >> 8) & 0xff; - wbuf[1] = gid & 0xff; - CMap_add_bfchar(cmap, wbuf, 2, wbuf + 2, len); - } - RELEASE(name); - } else { - wbuf[0] = (gid >> 8) & 0xff; - wbuf[1] = gid & 0xff; - - inbuf = wbuf; - inbytesleft = 2; - outbuf = wbuf + 2; - outbytesleft = WBUF_SIZE - 2; - CMap_decode(cmap_add, &inbuf, &inbytesleft, &outbuf, &outbytesleft); - - if (inbytesleft != 0) { - WARN("CMap conversion failed..."); - } else { - len = WBUF_SIZE - 2 - outbytesleft; - CMap_add_bfchar(cmap, wbuf, 2, wbuf + 2, len); + buf[0] = (cid >> 8) & 0xff; + buf[1] = cid & 0xff; + CMap_add_bfchar(cmap, buf, 2, buf + 2, len); + used_chars[cid / 8] &= ~(1 << (7 - (cid % 8))); count++; - if (dpx_conf.verbose_level > VERBOSE_LEVEL_MIN) { - int _i; - - MESG("otf_cmap>> Additional ToUnicode mapping: <%04X> <", gid); - for (_i = 0; _i < len; _i++) { - MESG("%02X", wbuf[2 + _i]); - } - MESG(">\n"); - } + RELEASE(buf); } } } @@ -980,70 +827,11 @@ handle_subst_glyphs (CMap *cmap, return count; } -static cff_font * -prepare_CIDFont_from_sfnt(sfnt* sfont) -{ - cff_font *cffont; - unsigned offset = 0; - - if (sfont->type != SFNT_TYPE_POSTSCRIPT || - sfnt_read_table_directory(sfont, 0) < 0 || - (offset = sfnt_find_table_pos(sfont, "CFF ")) == 0) { - return NULL; - } - - cffont = cff_open(sfont->stream, offset, 0); - if (!cffont) - return NULL; - - cff_read_charsets(cffont); - return cffont; -} - -static USHORT -add_to_cmap_if_used (CMap *cmap, - cff_font *cffont, - char *used_chars, - USHORT gid, - ULONG ch) -{ - USHORT count = 0; - USHORT cid = cffont ? cff_charsets_lookup_inverse(cffont, gid) : gid; - if (is_used_char2(used_chars, cid)) { - int len; - unsigned char *p = wbuf + 2; - - count++; - - wbuf[0] = (cid >> 8) & 0xff; - wbuf[1] = (cid & 0xff); - len = UC_UTF16BE_encode_char((int32_t) ch, &p, wbuf + WBUF_SIZE); - CMap_add_bfchar(cmap, wbuf, 2, wbuf + 2, len); - - /* Skip PUA characters and alphabetic presentation forms, allowing - * handle_subst_glyphs() as it might find better mapping. Fixes the - * mapping of ligatures encoded in PUA in fonts like Linux Libertine - * and old Adobe fonts. - */ - if (!is_PUA_or_presentation(ch)) { - /* Avoid duplicate entry - * There are problem when two Unicode code is mapped to - * single glyph... - */ - used_chars[cid / 8] &= ~(1 << (7 - (cid % 8))); - } - } - - return count; -} - -static USHORT -create_ToUnicode_cmap4 (CMap *cmap, - struct cmap4 *map, - char *used_chars, - cff_font *cffont) +static void +create_inverse_cmap4 (int32_t *map_base, int32_t *map_sub, USHORT num_glyphs, + struct cmap4 *map) { - USHORT count = 0, segCount = map->segCountX2 / 2; + USHORT segCount = map->segCountX2 / 2; USHORT i, j; for (i = 0; i < segCount; i++) { @@ -1062,32 +850,33 @@ create_ToUnicode_cmap4 (CMap *cmap, } else { gid = (map->glyphIndexArray[j + d] + map->idDelta[i]) & 0xffff; } - - count += add_to_cmap_if_used(cmap, cffont, used_chars, gid, ch); + if (is_PUA_or_presentation(ch)) { + map_sub[gid] = ch; + } else { + map_base[gid] = ch; + } } } - - return count; } -static USHORT -create_ToUnicode_cmap12 (CMap *cmap, - struct cmap12 *map, - char *used_chars, - cff_font *cffont) +static void +create_inverse_cmap12 (int32_t *map_base, int32_t *map_sub, USHORT num_glyphs, + struct cmap12 *map) { - ULONG i, ch, count = 0; + ULONG i, ch; for (i = 0; i < map->nGroups; i++) { for (ch = map->groups[i].startCharCode; ch <= map->groups[i].endCharCode; ch++) { int d = ch - map->groups[i].startCharCode; USHORT gid = (USHORT) ((map->groups[i].startGlyphID + d) & 0xffff); - count += add_to_cmap_if_used(cmap, cffont, used_chars, gid, ch); + if (is_PUA_or_presentation(ch)) { + map_sub[gid] = ch; + } else { + map_base[gid] = ch; + } } } - - return count; } /* NOTE: Reverse mapping code which had been placed here is removed since: @@ -1096,60 +885,162 @@ create_ToUnicode_cmap12 (CMap *cmap, * Especially, the second one causes problems. */ static pdf_obj * -create_ToUnicode_cmap (tt_cmap *ttcmap, +create_ToUnicode_cmap (tt_cmap *ttcmap, const char *cmap_name, - CMap *cmap_add, + CMap *cmap_add, const char *used_chars, - sfnt *sfont) + sfnt *sfont) { - pdf_obj *stream = NULL; - CMap *cmap; - USHORT count = 0; - cff_font *cffont = prepare_CIDFont_from_sfnt(sfont); - char is_cidfont = cffont && (cffont->flag & FONTTYPE_CIDFONT); - - cmap = CMap_new(); - CMap_set_name (cmap, cmap_name); - CMap_set_wmode(cmap, 0); - CMap_set_type (cmap, CMAP_TYPE_TO_UNICODE); - CMap_set_CIDSysInfo(cmap, &CSI_UNICODE); - CMap_add_codespacerange(cmap, srange_min, srange_max, 2); - - /* cmap_add here stores information about all unencoded glyphs which can be - * accessed only through OT Layout GSUB table. - */ - { - char used_chars_copy[8192]; - memcpy(used_chars_copy, used_chars, 8192); + pdf_obj *stream = NULL; + int32_t *map_base = NULL, *map_sub = NULL; + USHORT gid, num_glyphs = 0; - /* For create_ToUnicode_cmap{4,12}(), cffont is for GID -> CID lookup, - * so it is only needed for CID fonts. */ - switch (ttcmap->format) { - case 4: - count = create_ToUnicode_cmap4(cmap, ttcmap->map, used_chars_copy, - is_cidfont ? cffont : NULL); - break; - case 12: - count = create_ToUnicode_cmap12(cmap, ttcmap->map, used_chars_copy, - is_cidfont ? cffont : NULL); - break; + ASSERT(ttcmap); + + /* Get num_glyphs from maxp talbe */ + { + struct tt_maxp_table *maxp; + + maxp = tt_read_maxp_table(sfont); + if (maxp) { + num_glyphs = maxp->numGlyphs; + RELEASE(maxp); } + } - /* For handle_subst_glyphs(), cffont is for GID -> glyph name lookup, so - * it is only needed for non-CID fonts. */ - count += handle_subst_glyphs(cmap, cmap_add, used_chars_copy, sfont, - is_cidfont ? NULL : cffont); + /* Initialize GID to Unicode mapping table */ + map_base = NEW(num_glyphs, int32_t); + map_sub = NEW(num_glyphs, int32_t); + for (gid = 0; gid < num_glyphs; gid++) { + map_base[gid] = -1; + map_sub [gid] = -1; } - if (count < 1) - stream = NULL; - else { - stream = CMap_create_stream(cmap); + /* Create "base" mapping from inverse mapping of OpenType cmap */ + switch (ttcmap->format) { + case 4: + create_inverse_cmap4(map_base, map_sub, num_glyphs, ttcmap->map); + break; + case 12: + create_inverse_cmap12(map_base, map_sub, num_glyphs, ttcmap->map); + break; } - CMap_release(cmap); - if (cffont) - cff_close(cffont); + /* Now create ToUnicode CMap stream */ + { + CMap *cmap; + int32_t count; + cff_font *cffont = NULL; + char is_cidfont = 0; + uint16_t *GIDToCIDMap = NULL; + char *used_chars_copy = NULL; + + if (sfont->type == SFNT_TYPE_POSTSCRIPT) { + ULONG offset; + offset = sfnt_find_table_pos(sfont, "CFF "); + cffont = cff_open(sfont->stream, offset, 0); + } + is_cidfont = cffont && (cffont->flag & FONTTYPE_CIDFONT); + + /* GIT to CID mapping info. */ + GIDToCIDMap = NEW(num_glyphs, uint16_t); + if (is_cidfont) { + create_GIDToCIDMap(GIDToCIDMap, num_glyphs, cffont); + } else { + for (gid = 0; gid < num_glyphs; gid++) { + GIDToCIDMap[gid] = gid; + } + } + cmap = CMap_new(); + CMap_set_name (cmap, cmap_name); + CMap_set_wmode(cmap, 0); + CMap_set_type (cmap, CMAP_TYPE_TO_UNICODE); + CMap_set_CIDSysInfo(cmap, &CSI_UNICODE); + CMap_add_codespacerange(cmap, srange_min, srange_max, 2); + + count = 0; + used_chars_copy = NEW(8192, char); + memcpy(used_chars_copy, used_chars, 8192); + for (gid = 0; gid < num_glyphs; gid++) { + uint16_t cid = GIDToCIDMap[gid]; + if (is_used_char2(used_chars_copy, cid)) { + int32_t ch; + unsigned char src[2], dst[4]; + unsigned char *p = dst, *endptr = dst + 4; + size_t len; + + ch = map_base[gid]; + if (UC_is_valid(ch)) { + src[0] = (cid >> 8) & 0xff; + src[1] = cid & 0xff; + len = UC_UTF16BE_encode_char(ch, &p, endptr); + CMap_add_bfchar(cmap, src, 2, dst, len); + used_chars_copy[cid / 8] &= ~(1 << (7 - (cid % 8))); + count++; + } + } + } + + /* cmap_add here stores information about all unencoded glyphs which can be + * accessed only through OT Layout GSUB table. + * This is only availabel when encoding is "unicode". + */ + if (cmap_add) { + count += handle_subst_glyphs(cmap, cmap_add, used_chars_copy); + } else { + /* Else, try gathering information from GSUB tables */ + count += otl_gsub_add_ToUnicode(cmap, used_chars_copy, + map_base, map_sub, num_glyphs, + GIDToCIDMap, sfont); + } + /* Find Unicode mapping via PostScript glyph names... */ + count += add_ToUnicode_via_glyph_name(cmap, used_chars_copy, num_glyphs, + GIDToCIDMap, sfont, is_cidfont ? NULL : cffont); + if (cffont) + cff_close(cffont); + + /* Finaly, PUA and presentation forms... */ + for (gid = 0; gid < num_glyphs; gid++) { + uint16_t cid = GIDToCIDMap[gid]; + if (is_used_char2(used_chars_copy, cid)) { + int32_t ch; + unsigned char src[2], dst[4]; + unsigned char *p = dst, *endptr = dst + 4; + size_t len; + + ch = map_sub[gid]; + if (UC_is_valid(ch)) { + src[0] = (cid >> 8) & 0xff; + src[1] = cid & 0xff; + len = UC_UTF16BE_encode_char(ch, &p, endptr); + CMap_add_bfchar(cmap, src, 2, dst, len); + used_chars_copy[cid / 8] &= ~(1 << (7 - (cid % 8))); + count++; + } + } + } + + /* Check for missing mapping */ + if (dpx_conf.verbose_level > VERBOSE_LEVEL_MIN) { + for (gid = 0; gid < num_glyphs; gid++) { + uint16_t cid = GIDToCIDMap[gid]; + if (is_used_char2(used_chars_copy, cid)) { + WARN("Unable to find ToUnicode mapping for glyph CID=%u (GID=%u)", cid, gid); + } + } + } + RELEASE(GIDToCIDMap); + RELEASE(used_chars_copy); + + if (count < 1) + stream = NULL; + else { + stream = CMap_create_stream(cmap); + } + CMap_release(cmap); + } + RELEASE(map_base); + RELEASE(map_sub); return stream; } @@ -1169,29 +1060,27 @@ static cmap_plat_enc_rec cmap_plat_encs[] = { pdf_obj * otf_create_ToUnicode_stream (const char *font_name, - int ttc_index, /* 0 for non-TTC */ + int ttc_index, /* 0 for non-TTC */ const char *basefont, const char *used_chars) { - pdf_obj *cmap_ref = NULL; - int res_id; - pdf_obj *cmap_obj = NULL; - CMap *cmap_add; - int cmap_add_id; - tt_cmap *ttcmap; - char *cmap_name, *cmap_add_name; - FILE *fp = NULL; - sfnt *sfont; - ULONG offset = 0; - int i; + pdf_obj *cmap_ref = NULL; /* returned value */ + CMap *cmap_add = NULL; + char *cmap_name; + FILE *fp = NULL; + sfnt *sfont; + ULONG offset = 0; + tt_cmap *ttcmap; + int cmap_id, cmap_add_id; + int i; cmap_name = NEW(strlen(basefont)+strlen("-UTF16")+1, char); sprintf(cmap_name, "%s-UTF16", basefont); - res_id = pdf_findresource("CMap", cmap_name); - if (res_id >= 0) { + cmap_id = pdf_findresource("CMap", cmap_name); + if (cmap_id >= 0) { RELEASE(cmap_name); - cmap_ref = pdf_get_resource_reference(res_id); + cmap_ref = pdf_get_resource_reference(cmap_id); return cmap_ref; } @@ -1212,7 +1101,10 @@ otf_create_ToUnicode_stream (const char *font_name, } if (!sfont) { - ERROR("Could not open OpenType/TrueType font file \"%s\"", font_name); + WARN("Could not open OpenType/TrueType font file \"%s\"", font_name); + RELEASE(cmap_name); + DPXFCLOSE(fp); + return NULL; } switch (sfont->type) { @@ -1222,7 +1114,11 @@ otf_create_ToUnicode_stream (const char *font_name, case SFNT_TYPE_TTC: offset = ttc_read_offset(sfont, ttc_index); if (offset == 0) { - ERROR("Invalid TTC index"); + WARN("Invalid TTC index for font: %s", font_name); + sfnt_close(sfont); + DPXFCLOSE(fp); + RELEASE(cmap_name); + return NULL; } break; default: @@ -1231,111 +1127,180 @@ otf_create_ToUnicode_stream (const char *font_name, } if (sfnt_read_table_directory(sfont, offset) < 0) { - ERROR("Could not read OpenType/TrueType table directory."); + WARN("Could not read OpenType/TrueType table directory: %s", font_name); + sfnt_close(sfont); + DPXFCLOSE(fp); + RELEASE(cmap_name); + return NULL; } - cmap_add_name = NEW(strlen(font_name)+strlen(",000-UCS32-Add")+1, char); - sprintf(cmap_add_name, "%s,%03d-UCS32-Add", font_name, ttc_index); - cmap_add_id = CMap_cache_find(cmap_add_name); - RELEASE(cmap_add_name); - if (cmap_add_id < 0) { - cmap_add = NULL; - } else { - cmap_add = CMap_cache_get(cmap_add_id); + /* cmap_add is used for storing information on ToUnicode mapping for + * unencoded glyphs which can be reached only through GSUB substitution. + * This is available only when "unicode" is specified in the encoding + * field of fontmap. We remember the inverse mapping via cmap_add in this + * case. + */ + { + char *cmap_add_name; + + cmap_add_name = NEW(strlen(font_name)+strlen(",000-UCS32-Add")+1, char); + sprintf(cmap_add_name, "%s,%03d-UCS32-Add", font_name, ttc_index); + cmap_add_id = CMap_cache_find(cmap_add_name); + RELEASE(cmap_add_name); + if (cmap_add_id < 0) { + cmap_add = NULL; + } else { + cmap_add = CMap_cache_get(cmap_add_id); + } } - CMap_set_silent(1); /* many warnings without this... */ + ttcmap = NULL; for (i = 0; i < sizeof(cmap_plat_encs) / sizeof(cmap_plat_enc_rec); ++i) { ttcmap = tt_cmap_read(sfont, cmap_plat_encs[i].platform, cmap_plat_encs[i].encoding); if (!ttcmap) continue; if (ttcmap->format == 4 || ttcmap->format == 12) { - cmap_obj = create_ToUnicode_cmap(ttcmap, cmap_name, cmap_add, used_chars, sfont); break; + } else { + tt_cmap_release(ttcmap); + ttcmap = NULL; } } -#if defined(LIBDPX) - if (cmap_obj == NULL && dpx_conf.verbose_level > VERBOSE_LEVEL_MIN) -#else - if (cmap_obj == NULL) -#endif /* LIBDPX */ - WARN("Unable to read OpenType/TrueType Unicode cmap table."); - tt_cmap_release(ttcmap); - CMap_set_silent(0); - - if (cmap_obj) { - res_id = pdf_defineresource("CMap", cmap_name, - cmap_obj, PDF_RES_FLUSH_IMMEDIATE); - cmap_ref = pdf_get_resource_reference(res_id); - } else { - cmap_ref = NULL; + if (ttcmap) { + pdf_obj *cmap_obj; + + CMap_set_silent(1); /* many warnings without this... */ + cmap_obj = create_ToUnicode_cmap(ttcmap, cmap_name, cmap_add, used_chars, sfont); + CMap_set_silent(0); + if (cmap_obj) { + cmap_id = pdf_defineresource("CMap", cmap_name, + cmap_obj, PDF_RES_FLUSH_IMMEDIATE); + cmap_ref = pdf_get_resource_reference(cmap_id); + } + tt_cmap_release(ttcmap); } - RELEASE(cmap_name); + /* Cleanup */ + RELEASE(cmap_name); sfnt_close(sfont); - if (fp) - DPXFCLOSE(fp); + DPXFCLOSE(fp); + +#ifndef LIBDPX + if (!cmap_ref) { + WARN("Creating ToUnicode CMap failed for \"%s\"", font_name); + } +#endif return cmap_ref; } -static int -load_base_CMap (const char *cmap_name, CMap *tounicode_add, int wmode, - CIDSysInfo *csi, unsigned char *GIDToCIDMap, - otl_gsub *gsub_vert, otl_gsub *gsub_list, - tt_cmap *ttcmap) -{ - int cmap_id; - cmap_id = CMap_cache_find(cmap_name); - if (cmap_id < 0) { - CMap *cmap; +/* Creating input CMaps from OT cmap table */ - cmap = CMap_new(); - CMap_set_name (cmap, cmap_name); - CMap_set_type (cmap, CMAP_TYPE_CODE_TO_CID); - CMap_set_wmode(cmap, wmode); - CMap_add_codespacerange(cmap, lrange_min, lrange_max, 4); +static void +load_cmap4 (struct cmap4 *map, uint16_t *GIDToCIDMap, USHORT num_glyphs, + otl_gsub *gsub_vert, otl_gsub *gsub_list, + CMap *cmap, int32_t *map_base, int32_t *map_sub) +{ + USHORT c0, c1, gid, cid; + USHORT j, d, segCount; + USHORT ch; + int i; + unsigned char buf[4]; - if (csi) { /* CID */ - CMap_set_CIDSysInfo(cmap, csi); - } else { - CMap_set_CIDSysInfo(cmap, &CSI_IDENTITY); + segCount = map->segCountX2 / 2; + for (i = segCount - 1; i >= 0 ; i--) { + c0 = map->startCount[i]; + c1 = map->endCount[i]; + d = map->idRangeOffset[i] / 2 - (segCount - i); + for (j = 0; j <= c1 - c0; j++) { + ch = c0 + j; + if (map->idRangeOffset[i] == 0) { + gid = (ch + map->idDelta[i]) & 0xffff; + } else if (c0 == 0xffff && c1 == 0xffff && map->idRangeOffset[i] == 0xffff) { + /* this is for protection against some old broken fonts... */ + gid = 0; + } else { + gid = (map->glyphIndexArray[j+d] + map->idDelta[i]) & 0xffff; + } + if (gid != 0 && gid != 0xffff) { + /* Apply GSUB features */ + if (gsub_list) + otl_gsub_apply_chain(gsub_list, &gid); + if (gsub_vert) + otl_gsub_apply(gsub_vert, &gid); + cid = (gid < num_glyphs) ? GIDToCIDMap[gid] : 0; + buf[0] = 0; + buf[1] = 0; + buf[2] = (ch >> 8) & 0xff; + buf[3] = ch & 0xff; + CMap_add_cidchar(cmap, buf, 4, cid); + /* For ToUnicode creation */ + if (map_base && map_sub) { + if (is_PUA_or_presentation(ch)) { + map_sub[gid] = ch; + } else { + map_base[gid] = ch; + } + } + } } + } - if (ttcmap->format == 12) { - load_cmap12(ttcmap->map, GIDToCIDMap, gsub_vert, gsub_list, - cmap, tounicode_add); - } else if (ttcmap->format == 4) { - load_cmap4(ttcmap->map, GIDToCIDMap, gsub_vert, gsub_list, - cmap, tounicode_add); - } + return; +} - cmap_id = CMap_cache_add(cmap); +static void +load_cmap12 (struct cmap12 *map, uint16_t *GIDToCIDMap, USHORT num_glyphs, + otl_gsub *gsub_vert, otl_gsub *gsub_list, + CMap *cmap, int32_t *map_base, int32_t *map_sub) +{ + ULONG i, ch; + USHORT gid, cid; + unsigned char buf[4]; + + for (i = 0; i < map->nGroups; i++) { + for (ch = map->groups[i].startCharCode; + ch <= map->groups[i].endCharCode; ch++) { + int d = ch - map->groups[i].startCharCode; + gid = (USHORT) ((map->groups[i].startGlyphID + d) & 0xffff); + if (gsub_list) + otl_gsub_apply_chain(gsub_list, &gid); + if (gsub_vert) + otl_gsub_apply(gsub_vert, &gid); + cid = (gid < num_glyphs) ? GIDToCIDMap[gid] : 0; + buf[0] = (ch >> 24) & 0xff; + buf[1] = (ch >> 16) & 0xff; + buf[2] = (ch >> 8) & 0xff; + buf[3] = ch & 0xff; + CMap_add_cidchar(cmap, buf, 4, cid); + if (map_base && map_sub) { + if (is_PUA_or_presentation(ch)) { + map_sub[gid] = ch; + } else { + map_base[gid] = ch; + } + } + } } - return cmap_id; + return; } int otf_load_Unicode_CMap (const char *map_name, int ttc_index, /* 0 for non-TTC font */ - const char *otl_tags, int wmode) + const char *otl_tags, int wmode) { - int cmap_id = -1; - /* Additional ToUncidoe mappings required by OTL GSUB substitusion */ - int tounicode_add_id = -1; - CMap *tounicode_add = NULL; - char *tounicode_add_name = NULL; - int is_cidfont = 0; - sfnt *sfont; - ULONG offset = 0; - char *cmap_name = NULL; - FILE *fp = NULL; - otl_gsub *gsub_vert = NULL, *gsub_list = NULL; - tt_cmap *ttcmap; - CIDSysInfo csi = {NULL, NULL, 0}; - unsigned char *GIDToCIDMap = NULL; + int cmap_id = -1; + char *cmap_name = NULL; + sfnt *sfont = NULL; + ULONG offset = 0; + uint16_t num_glyphs = 0; + FILE *fp = NULL; + tt_cmap *ttcmap = NULL; + CIDSysInfo csi = {NULL, NULL, 0}; + uint16_t *GIDToCIDMap = NULL; if (!map_name) return -1; @@ -1359,11 +1324,6 @@ otf_load_Unicode_CMap (const char *map_name, int ttc_index, /* 0 for non-TTC fon sprintf(cmap_name, "%s,%03d-UCS4-H", map_name, ttc_index); } } - if (dpx_conf.verbose_level > VERBOSE_LEVEL_MIN) { - MESG("\n"); - MESG("otf_cmap>> Unicode charmap for font=\"%s\" layout=\"%s\"\n", - map_name, (otl_tags ? otl_tags : "none")); - } cmap_id = CMap_cache_find(cmap_name); if (cmap_id >= 0) { RELEASE(cmap_name); @@ -1374,6 +1334,12 @@ otf_load_Unicode_CMap (const char *map_name, int ttc_index, /* 0 for non-TTC fon } /* CMap not found */ + if (dpx_conf.verbose_level > VERBOSE_LEVEL_MIN) { + MESG("\n"); + MESG("otf_cmap>> Creating Unicode charmap for font=\"%s\" layout=\"%s\"\n", + map_name, (otl_tags ? otl_tags : "none")); + } + fp = DPXFOPEN(map_name, DPX_RES_TYPE_TTFONT); if (!fp) { fp = DPXFOPEN(map_name, DPX_RES_TYPE_OTFONT); @@ -1390,13 +1356,20 @@ otf_load_Unicode_CMap (const char *map_name, int ttc_index, /* 0 for non-TTC fon } if (!sfont) { - ERROR("Could not open OpenType/TrueType/dfont font file \"%s\"", map_name); + WARN("Could not open OpenType/TrueType/dfont font file \"%s\"", map_name); + RELEASE(cmap_name); + DPXFCLOSE(fp); + return -1; } switch (sfont->type) { case SFNT_TYPE_TTC: offset = ttc_read_offset(sfont, ttc_index); if (offset == 0) { - ERROR("Invalid TTC index"); + WARN("Offset=0 returned for font=%s, TTC_index=%d", map_name, ttc_index); + RELEASE(cmap_name); + sfnt_close(sfont); + DPXFCLOSE(fp); + return -1; } break; case SFNT_TYPE_TRUETYPE: @@ -1407,41 +1380,78 @@ otf_load_Unicode_CMap (const char *map_name, int ttc_index, /* 0 for non-TTC fon offset = sfont->offset; break; default: - ERROR("Not a OpenType/TrueType/TTC font?: %s", map_name); + WARN("Not a OpenType/TrueType/TTC font?: %s", map_name); + RELEASE(cmap_name); + sfnt_close(sfont); + DPXFCLOSE(fp); + return -1; break; } - if (sfnt_read_table_directory(sfont, offset) < 0) - ERROR("Could not read OpenType/TrueType table directory."); + if (sfnt_read_table_directory(sfont, offset) < 0) { + WARN("Could not read OpenType/TrueType table directory: %s", map_name); + RELEASE(cmap_name); + sfnt_close(sfont); + DPXFCLOSE(fp); + return -1; + } + { + struct tt_maxp_table *maxp; - if (otl_tags) { - /* tounicode_add here is later refered by otf_create_ToUnicode_stream() - * for finding additional CID to Unicode mapping entries required by - * OTL gsub substitution. - */ - tounicode_add_name = NEW(strlen(map_name)+strlen(",000-UCS32-Add")+1, char); - sprintf(tounicode_add_name, "%s,%03d-UCS32-Add", map_name, ttc_index); - tounicode_add_id = CMap_cache_find(tounicode_add_name); - if (tounicode_add_id >= 0) - tounicode_add = CMap_cache_get(tounicode_add_id); - else { - tounicode_add = CMap_new(); - CMap_set_name (tounicode_add, tounicode_add_name); - CMap_set_type (tounicode_add, CMAP_TYPE_TO_UNICODE); - CMap_set_wmode(tounicode_add, 0); - CMap_add_codespacerange(tounicode_add, srange_min, srange_max, 2); - CMap_set_CIDSysInfo(tounicode_add, &CSI_UNICODE); - CMap_add_bfchar(tounicode_add, srange_min, 2, srange_max, 2); - tounicode_add_id = CMap_cache_add(tounicode_add); - } - RELEASE(tounicode_add_name); + maxp = tt_read_maxp_table(sfont); + num_glyphs = (card16) maxp->numGlyphs; + RELEASE(maxp); } + GIDToCIDMap = NEW(num_glyphs, uint16_t); + memset(GIDToCIDMap, 0, num_glyphs*sizeof(uint16_t)); if (sfont->type == SFNT_TYPE_POSTSCRIPT) { - is_cidfont = handle_CIDFont(sfont, &GIDToCIDMap, &csi); + cff_font *cffont; + card16 gid; + + offset = sfnt_find_table_pos(sfont, "CFF "); + cffont = cff_open(sfont->stream, offset, 0); + if (!cffont) { + RELEASE(cmap_name); + RELEASE(GIDToCIDMap); + sfnt_close(sfont); + DPXFCLOSE(fp); + return -1; + } + if (!(cffont->flag & FONTTYPE_CIDFONT)) { + csi.registry = strdup("Adobe"); + csi.ordering = strdup("Identity"); + csi.supplement = 0; + for (gid = 0; gid < num_glyphs; gid++) { + GIDToCIDMap[gid] = gid; + } + } else { + if (!cff_dict_known(cffont->topdict, "ROS")) { + csi.registry = strdup("Adobe"); + csi.ordering = strdup("Identity"); + csi.supplement = 0; + } else { + card16 reg, ord; + + reg = (card16) cff_dict_get(cffont->topdict, "ROS", 0); + ord = (card16) cff_dict_get(cffont->topdict, "ROS", 1); + csi.registry = cff_get_string(cffont, reg); + csi.ordering = cff_get_string(cffont, ord); + csi.supplement = (int) cff_dict_get(cffont->topdict, "ROS", 2); + } + create_GIDToCIDMap(GIDToCIDMap, num_glyphs, cffont); + } + cff_close(cffont); } else { - is_cidfont = 0; + uint16_t gid; + + csi.registry = strdup("Adobe"); + csi.ordering = strdup("Identity"); + csi.supplement = 0; + for (gid = 0; gid < num_glyphs; gid++) { + GIDToCIDMap[gid] = gid; + } } ttcmap = tt_cmap_read(sfont, 3, 10); /* Microsoft UCS4 */ @@ -1449,63 +1459,120 @@ otf_load_Unicode_CMap (const char *map_name, int ttc_index, /* 0 for non-TTC fon ttcmap = tt_cmap_read(sfont, 3, 1); /* Microsoft UCS2 */ if (!ttcmap) { ttcmap = tt_cmap_read(sfont, 0, 3); /* Unicode 2.0 or later */ -#if defined(LIBDPX) - if (!ttcmap && dpx_conf.verbose_level > VERBOSE_LEVEL_MIN) { -#else - if (!ttcmap) { -#endif /* LIBDPX */ - ERROR("Unable to read OpenType/TrueType Unicode cmap table."); - } } } - if (wmode == 1) { - gsub_vert = otl_gsub_new(); - if (otl_gsub_add_feat(gsub_vert, "*", "*", "vrt2", sfont) < 0) { - if (otl_gsub_add_feat(gsub_vert, "*", "*", "vert", sfont) < 0) { - WARN("GSUB feature vrt2/vert not found."); - otl_gsub_release(gsub_vert); - gsub_vert = NULL; + + if (ttcmap) { + CMap *cmap = NULL; + int32_t *map_base, *map_sub; + otl_gsub *gsub_vert = NULL; + otl_gsub *gsub_list = NULL; + uint32_t gid; + + if (wmode == 1) { + gsub_vert = otl_gsub_new(); + if (otl_gsub_add_feat(gsub_vert, "*", "*", "vrt2", sfont) < 0) { + if (otl_gsub_add_feat(gsub_vert, "*", "*", "vert", sfont) < 0) { + WARN("GSUB feature vrt2/vert not found."); + otl_gsub_release(gsub_vert); + gsub_vert = NULL; + } else { + otl_gsub_select(gsub_vert, "*", "*", "vert"); + } } else { - otl_gsub_select(gsub_vert, "*", "*", "vert"); + otl_gsub_select(gsub_vert, "*", "*", "vrt2"); } } else { - otl_gsub_select(gsub_vert, "*", "*", "vrt2"); + gsub_vert = NULL; } - } else { - gsub_vert = NULL; - } - if (otl_tags) { - gsub_list = otl_gsub_new(); - if (otl_gsub_add_feat_list(gsub_list, otl_tags, sfont) < 0) { - WARN("Readin GSUB feature table(s) failed for \"%s\"", otl_tags); + if (otl_tags) { + gsub_list = otl_gsub_new(); + if (otl_gsub_add_feat_list(gsub_list, otl_tags, sfont) < 0) { + WARN("Reading GSUB feature table(s) failed for \"%s\"", otl_tags); + } else { + otl_gsub_set_chain(gsub_list, otl_tags); + } } else { - otl_gsub_set_chain(gsub_list, otl_tags); + gsub_list = NULL; } - } else { - gsub_list = NULL; - } - cmap_id = load_base_CMap(cmap_name, tounicode_add, wmode, - (is_cidfont ? &csi : NULL), GIDToCIDMap, - gsub_vert, gsub_list, ttcmap); - if (cmap_id < 0) - ERROR("Failed to read OpenType/TrueType cmap table."); - if (gsub_vert) - otl_gsub_release(gsub_vert); - gsub_vert = NULL; - if (gsub_list) - otl_gsub_release(gsub_list); - gsub_list = NULL; + cmap = CMap_new(); + CMap_set_name(cmap, cmap_name); + CMap_set_type(cmap, CMAP_TYPE_CODE_TO_CID); + CMap_set_wmode(cmap, wmode); + CMap_add_codespacerange(cmap, lrange_min, lrange_max, 4); + CMap_set_CIDSysInfo(cmap, &csi); + map_base = NEW(num_glyphs, int32_t); + map_sub = NEW(num_glyphs, int32_t); + for (gid = 0; gid < num_glyphs; gid++) { + map_base[gid] = -1; + map_sub[gid] = -1; + } + switch (ttcmap->format) { + case 12: + load_cmap12(ttcmap->map, GIDToCIDMap, num_glyphs, + gsub_vert, gsub_list, + cmap, map_base, map_sub); + break; + case 4: + load_cmap4(ttcmap->map, GIDToCIDMap, num_glyphs, + gsub_vert, gsub_list, + cmap, map_base, map_sub); + break; + } + if (gsub_vert) + otl_gsub_release(gsub_vert); + if (gsub_list) + otl_gsub_release(gsub_list); + tt_cmap_release(ttcmap); + + if (otl_tags) { + CMap *tounicode = NULL; + char *tounicode_name; + int tounicode_id; + + tounicode_name = NEW(strlen(map_name)+strlen(",000-UCS32-Add")+1, char); + sprintf(tounicode_name, "%s,%03d-UCS32-Add", map_name, ttc_index); + tounicode_id = CMap_cache_find(tounicode_name); + if (tounicode_id >= 0) + tounicode = CMap_cache_get(tounicode_id); + else { + tounicode = CMap_new(); + CMap_set_name (tounicode, tounicode_name); + CMap_set_type (tounicode, CMAP_TYPE_TO_UNICODE); + CMap_set_wmode(tounicode, 0); + CMap_add_codespacerange(tounicode, srange_min, srange_max, 2); + CMap_set_CIDSysInfo(tounicode, &CSI_UNICODE); + CMap_add_bfchar(tounicode, srange_min, 2, srange_max, 2); + tounicode_id = CMap_cache_add(tounicode); + } + RELEASE(tounicode_name); + + for (gid = 0; gid < num_glyphs; gid++) { + uint16_t cid = GIDToCIDMap[gid]; + unsigned char src[2], dst[4]; + if (cid > 0) { + int32_t ch = UC_is_valid(map_base[gid]) ? map_base[gid] : map_sub[gid]; + if (UC_is_valid(ch)) { + unsigned char *p = dst; + unsigned char *endptr = dst + 4; + size_t len; + src[0] = (cid >> 8) & 0xff; + src[1] = cid & 0xff; + len = UC_UTF16BE_encode_char(ch, &p, endptr); + CMap_add_bfchar(tounicode, src, 2, dst, len); + } + } + } + } + cmap_id = CMap_cache_add(cmap); + } RELEASE(cmap_name); - if (GIDToCIDMap) - RELEASE(GIDToCIDMap); - if (is_cidfont) { - if (csi.registry) - RELEASE(csi.registry); - if (csi.ordering) - RELEASE(csi.ordering); - } - tt_cmap_release(ttcmap); + RELEASE(GIDToCIDMap); + if (csi.registry) + RELEASE(csi.registry); + if (csi.ordering) + RELEASE(csi.ordering); sfnt_close(sfont); DPXFCLOSE(fp); @@ -1515,14 +1582,11 @@ otf_load_Unicode_CMap (const char *map_name, int ttc_index, /* 0 for non-TTC fon int otf_try_load_GID_to_CID_map (const char *map_name, int ttc_index, int wmode) { - int cmap_id = -1; - sfnt *sfont; - ULONG offset = 0; - char *cmap_name = NULL; - FILE *fp = NULL; - CIDSysInfo csi = {NULL, NULL, 0}; - int is_cidfont = 0; - unsigned char *GIDToCIDMap = NULL; + int cmap_id = -1; + sfnt *sfont = NULL; + ULONG offset = 0; + char *cmap_name = NULL; + FILE *fp = NULL; if (!map_name) return -1; @@ -1559,13 +1623,20 @@ otf_try_load_GID_to_CID_map (const char *map_name, int ttc_index, int wmode) } if (!sfont) { - ERROR("Could not open OpenType/TrueType/dfont font file \"%s\"", map_name); + WARN("Could not open OpenType/TrueType/dfont font file \"%s\"", map_name); + RELEASE(cmap_name); + DPXFCLOSE(fp); + return -1; } switch (sfont->type) { case SFNT_TYPE_TTC: offset = ttc_read_offset(sfont, ttc_index); if (offset == 0) { - ERROR("Invalid TTC index"); + WARN("Invalid TTC index for font \"%s\": %d", map_name, ttc_index); + sfnt_close(sfont); + DPXFCLOSE(fp); + RELEASE(cmap_name); + return -1; } break; case SFNT_TYPE_TRUETYPE: @@ -1576,12 +1647,20 @@ otf_try_load_GID_to_CID_map (const char *map_name, int ttc_index, int wmode) offset = sfont->offset; break; default: - ERROR("Not a OpenType/TrueType/TTC font?: %s", map_name); - break; + WARN("Not a OpenType/TrueType/TTC font?: %s", map_name); + sfnt_close(sfont); + DPXFCLOSE(fp); + RELEASE(cmap_name); + return -1; } - if (sfnt_read_table_directory(sfont, offset) < 0) - ERROR("Could not read OpenType/TrueType table directory."); + if (sfnt_read_table_directory(sfont, offset) < 0) { + WARN("Could not read OpenType/TrueType table directory: %s", map_name); + sfnt_close(sfont); + DPXFCLOSE(fp); + RELEASE(cmap_name); + return -1; + } if (sfont->type != SFNT_TYPE_POSTSCRIPT) { RELEASE(cmap_name); sfnt_close(sfont); @@ -1590,41 +1669,70 @@ otf_try_load_GID_to_CID_map (const char *map_name, int ttc_index, int wmode) } /* Read GID-to-CID mapping if CFF OpenType is found. */ - is_cidfont = handle_CIDFont(sfont, &GIDToCIDMap, &csi); - if (is_cidfont) { - if (GIDToCIDMap) { - CMap *cmap; - int32_t gid; - const unsigned char csrange[4] = {0x00, 0x00, 0xff, 0xff}; + if (sfont->type == SFNT_TYPE_POSTSCRIPT) { + cff_font *cffont; + struct tt_maxp_table *maxp; + const unsigned char csrange[4] = {0x00, 0x00, 0xff, 0xff}; + uint16_t num_glyphs = 0; + + maxp = tt_read_maxp_table(sfont); + num_glyphs = (card16) maxp->numGlyphs; + RELEASE(maxp); + + offset = sfnt_find_table_pos(sfont, "CFF "); + cffont = cff_open(sfont->stream, offset, 0); + if (cffont && cffont->flag & FONTTYPE_CIDFONT) { + CMap *cmap; + uint16_t gid; + uint16_t *GIDToCIDMap = NULL; + CIDSysInfo csi = {NULL, NULL, 0}; + + if (!cff_dict_known(cffont->topdict, "ROS")) { + csi.registry = strdup("Adobe"); + csi.ordering = strdup("Identity"); + csi.supplement = 0; + } else { + card16 reg, ord; + reg = (card16) cff_dict_get(cffont->topdict, "ROS", 0); + ord = (card16) cff_dict_get(cffont->topdict, "ROS", 1); + csi.registry = cff_get_string(cffont, reg); + csi.ordering = cff_get_string(cffont, ord); + csi.supplement = (int) cff_dict_get(cffont->topdict, "ROS", 2); + } + GIDToCIDMap = NEW(num_glyphs, uint16_t); + memset(GIDToCIDMap, 0, num_glyphs*sizeof(uint16_t)); + create_GIDToCIDMap(GIDToCIDMap, num_glyphs, cffont); cmap = CMap_new(); CMap_set_name (cmap, cmap_name); CMap_set_type (cmap, CMAP_TYPE_CODE_TO_CID); CMap_set_wmode(cmap, wmode); CMap_add_codespacerange(cmap, &csrange[0], &csrange[2], 2); CMap_set_CIDSysInfo(cmap, &csi); - - for (gid = 0; gid < 65536; gid++) { - unsigned char src[2]; + for (gid = 0; gid < num_glyphs; gid++) { + unsigned char src[2], dst[2]; src[0] = (gid >> 8) & 0xff; src[1] = gid & 0xff; - CMap_add_bfchar(cmap, src, 2, &GIDToCIDMap[gid*2], 2); + dst[0] = (GIDToCIDMap[gid] >> 8) & 0xff; + dst[1] = GIDToCIDMap[gid] & 0xff; + CMap_add_bfchar(cmap, src, 2, dst, 2); } cmap_id = CMap_cache_add(cmap); if (dpx_conf.verbose_level > VERBOSE_LEVEL_MIN) { MESG("\n"); MESG("otf_cmap>> Creating GID-to-CID mapping for font=\"%s\"\n", map_name); } + RELEASE(GIDToCIDMap); + if (csi.registry) + RELEASE(csi.registry); + if (csi.ordering) + RELEASE(csi.ordering); } - /* Identity mapping for null GIDToCIDMap */ + if (cffont) + cff_close(cffont); } + RELEASE(cmap_name); - if (GIDToCIDMap) - RELEASE(GIDToCIDMap); - if (csi.registry) - RELEASE(csi.registry); - if (csi.ordering) - RELEASE(csi.ordering); sfnt_close(sfont); DPXFCLOSE(fp); diff --git a/Build/source/texk/dvipdfm-x/tt_gsub.c b/Build/source/texk/dvipdfm-x/tt_gsub.c index 0ae31330749..d88d729e7d1 100644 --- a/Build/source/texk/dvipdfm-x/tt_gsub.c +++ b/Build/source/texk/dvipdfm-x/tt_gsub.c @@ -1,6 +1,6 @@ /* This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks. - Copyright (C) 2002-2018 by Jin-Hwan Cho and Shunsaku Hirata, + Copyright (C) 2002-2019 by Jin-Hwan Cho and Shunsaku Hirata, the dvipdfmx project team. This program is free software; you can redistribute it and/or modify @@ -977,10 +977,11 @@ otl_gsub_read_feat (struct otl_gsub_tab *gsub, sfnt *sfont) sfnt_seek_set(sfont, offset); clt_read_feature_table(&feature_table, sfont); +#if 0 if (feature_table.FeatureParams != 0) { ERROR("unrecognized FeatureParams"); } - +#endif /* Lookup table */ for (i = 0; i < feature_table.LookupListIndex.count; i++) { struct clt_lookup_table lookup_table; @@ -1680,98 +1681,303 @@ otl_gsub_apply_chain (otl_gsub *gsub_list, USHORT *gid) { return retval; } -#if 0 +#if 1 +#include "unicode.h" + +#ifndef is_used_char2 +#define is_used_char2(b,c) (((b)[(c)/8]) & (1 << (7-((c)%8)))) +#endif + +static int +add_glyph_if_valid (CMap *cmap, char *used_chars, + int32_t *map_base, int32_t *map_sub, USHORT num_glyphs, + uint16_t *GIDToCIDMap, USHORT gid, USHORT gid_sub) +{ + int count = 0; + unsigned char src[2], dst[4]; + unsigned char *p = dst, *endptr = dst + 4; + size_t len; + uint16_t cid_sub; + + if (gid_sub >= num_glyphs || gid >= num_glyphs) + return 0; + + cid_sub = GIDToCIDMap[gid_sub]; + if (is_used_char2(used_chars, cid_sub)) { + int32_t ch = map_base[gid]; + if (UC_is_valid(ch)) { + src[0] = (cid_sub >> 8) & 0xff; + src[1] = cid_sub & 0xff; + len = UC_UTF16BE_encode_char(ch, &p, endptr); + CMap_add_bfchar(cmap, src, 2, dst, len); + used_chars[cid_sub / 8] &= ~(1 << (7 - (cid_sub % 8))); + count = 1; + } else { + ch = map_sub[gid]; + if (UC_is_valid(ch)) { + src[0] = (cid_sub >> 8) & 0xff; + src[1] = cid_sub & 0xff; + len = UC_UTF16BE_encode_char(ch, &p, endptr); + CMap_add_bfchar(cmap, src, 2, dst, len); + used_chars[cid_sub / 8] &= ~(1 << (7 - (cid_sub % 8))); + count = 1; + } + } + } + return count; +} + static int -otl_gsub_dump_single (struct otl_gsub_subtab *subtab) +add_ToUnicode_single (CMap *cmap, char *used_chars, + struct otl_gsub_subtab *subtab, + int32_t *map_base, int32_t *map_sub, USHORT num_glyphs, + uint16_t *GIDToCIDMap) { - int gid, idx; + int count = 0; + USHORT i, idx, gid; + USHORT gid_sub; ASSERT(subtab); if (subtab->SubstFormat == 1) { struct otl_gsub_single1 *data; + struct clt_coverage *cov; data = (subtab->table).single1; - for (gid = 0; gid < 0x10000; gid++) { - idx = clt_lookup_coverage(&data->coverage, gid); - if (idx >= 0) { - fprintf(stdout, "substitute \\%u by \\%u;\n", - (USHORT) gid, (USHORT) (gid + data->DeltaGlyphID)); + cov = &data->coverage; + switch (cov->format) { + case 1: /* list */ + for (idx = 0; idx < cov->count; idx++) { + gid = cov->list[idx]; + gid_sub = gid + data->DeltaGlyphID; + count += add_glyph_if_valid(cmap, used_chars, + map_base, map_sub, num_glyphs, + GIDToCIDMap, gid, gid_sub); } + break; + case 2: /* range */ + for (i = 0; i < cov->count; i++) { + for (gid = cov->range[i].Start; + gid <= cov->range[i].End && gid < num_glyphs; gid++) { + idx = cov->range[i].StartCoverageIndex + gid - cov->range[i].Start; + gid_sub = gid + data->DeltaGlyphID; + count += add_glyph_if_valid(cmap, used_chars, + map_base, map_sub, num_glyphs, + GIDToCIDMap, gid, gid_sub); + } + } + break; } } else if (subtab->SubstFormat == 2) { struct otl_gsub_single2 *data; + struct clt_coverage *cov; data = (subtab->table).single2; - for (gid = 0; gid < 0x10000; gid++) { - idx = clt_lookup_coverage(&data->coverage, gid); - if (idx >= 0 && - idx < data->GlyphCount) { - fprintf(stdout, "substitute \\%u by \\%u;\n", - (USHORT) gid, (data->Substitute)[idx]); + cov = &data->coverage; + switch (cov->format) { + case 1: /* list */ + for (idx = 0; idx < cov->count; idx++) { + gid = cov->list[idx]; + if (idx >= 0 && idx < data->GlyphCount) { + gid_sub = (data->Substitute)[idx]; + count += add_glyph_if_valid(cmap, used_chars, + map_base, map_sub, num_glyphs, + GIDToCIDMap, gid, gid_sub); + } } + break; + case 2: /* range */ + for (i = 0; i < cov->count; i++) { + for (gid = cov->range[i].Start; + gid <= cov->range[i].End && gid < num_glyphs; gid++) { + idx = cov->range[i].StartCoverageIndex + gid - cov->range[i].Start; + if (idx >= 0 && idx < data->GlyphCount) { + gid_sub = (data->Substitute)[idx]; + count += add_glyph_if_valid(cmap, used_chars, + map_base, map_sub, num_glyphs, + GIDToCIDMap, gid, gid_sub); + } + } + } + break; } } - return 0; + return count; } -static int -otl_gsub_dump_alternate (struct otl_gsub_subtab *subtab) +static int32_t +add_alternate1_inverse_map (CMap *cmap, char *used_chars, + int32_t *map_base, int32_t *map_sub, USHORT num_glyphs, + uint16_t *GIDToCIDMap, USHORT gid, int idx, + struct otl_gsub_alternate1 *data) +{ + int32_t count = 0; + + if (idx >= 0 && idx < data->AlternateSetCount) { + struct otl_gsub_altset *altset; + USHORT i; + + altset = &(data->AlternateSet[idx]); + if (altset->GlyphCount == 0) + return count; + for (i = 0; i < altset->GlyphCount; i++) { + USHORT gid_alt = altset->Alternate[i]; + count += add_glyph_if_valid(cmap, used_chars, + map_base, map_sub, num_glyphs, + GIDToCIDMap, gid, gid_alt); + } + } + return count; +} + +static int32_t +add_ToUnicode_alternate (CMap *cmap, char *used_chars, + struct otl_gsub_subtab *subtab, + int32_t *map_base, int32_t *map_sub, USHORT num_glyphs, + uint16_t *GIDToCIDMap) { - int gid, idx; + int32_t count = 0; + USHORT i, gid, idx; ASSERT(subtab); if (subtab->SubstFormat == 1) { struct otl_gsub_alternate1 *data; - + struct clt_coverage *cov; data = subtab->table.alternate1; - for (gid = 0; gid < 0x10000; gid++) { - idx = clt_lookup_coverage(&data->coverage, gid); - if (idx >= 0 && idx < data->AlternateSetCount) { - struct otl_gsub_altset *altset; - USHORT i; - altset = &(data->AlternateSet[idx]); - if (altset->GlyphCount == 0) - continue; - fprintf(stdout, "substitute \\%u from [", (USHORT) gid); - for (i = 0; i < altset->GlyphCount; i++) { - fprintf(stdout, " \\%u", altset->Alternate[i]); + cov = &data->coverage; + switch (cov->format) { + case 1: /* list */ + for (idx = 0; idx < cov->count; idx++) { + gid = cov->list[idx]; + if (gid < num_glyphs) { + count += add_alternate1_inverse_map(cmap, used_chars, + map_base, map_sub, num_glyphs, + GIDToCIDMap, gid, idx, data); } - fprintf(stdout, " ];\n"); } + break; + case 2: /* range */ + for (i = 0; i < cov->count; i++) { + for (gid = cov->range[i].Start; + gid <= cov->range[i].End && gid < num_glyphs; gid++) { + idx = cov->range[i].StartCoverageIndex + gid - cov->range[i].Start; + count += add_alternate1_inverse_map(cmap, used_chars, + map_base, map_sub, num_glyphs, + GIDToCIDMap, gid, idx, data); + } + } + break; } } + return count; +} - return 0; +static int32_t +add_ligature1_inverse_map (CMap *cmap, char *used_chars, + int32_t *map_base, int32_t *map_sub, USHORT num_glyphs, + uint16_t *GIDToCIDMap, USHORT gid_1, int idx, + struct otl_gsub_ligature1 *data) +{ + int32_t count = 0; + + if (idx >= 0 && idx < data->LigSetCount) { + struct otl_gsub_ligset *ligset; + USHORT i, j; + + ligset = &(data->LigatureSet[idx]); + for (j = 0; j < ligset->LigatureCount; j++) { + USHORT gid_sub = ligset->Ligature[j].LigGlyph; + if (gid_sub < num_glyphs) { + uint16_t cid = GIDToCIDMap[gid_sub]; + if (is_used_char2(used_chars, cid)) { + int32_t ch, *ucv; + USHORT comp_count = ligset->Ligature[j].CompCount; + int fail_count = 0; + + ucv = NEW(comp_count, int32_t); + ch = UC_is_valid(map_base[gid_1]) ? map_base[gid_1] : map_sub[gid_1]; + ucv[0] = ch; + fail_count += UC_is_valid(ch) ? 0 : 1; + for (i = 0; i < ligset->Ligature[j].CompCount - 1; i++) { + USHORT gid = ligset->Ligature[j].Component[i]; + if (gid < num_glyphs) { + ch = UC_is_valid(map_base[gid]) ? map_base[gid] : map_sub[gid]; + ucv[i+1] = ch; + fail_count += UC_is_valid(ch) ? 0 : 1; + } else { + fail_count += 1; + } + } + if (fail_count == 0) { + unsigned char src[2], *dst; + unsigned char *p, *endptr; + size_t len = 0; + + src[0] = (cid >> 8) & 0xff; + src[1] = cid & 0xff; + dst = NEW(comp_count*4, unsigned char); + p = dst; + endptr = dst + comp_count * 4; + for (i = 0; i < comp_count; i++) { + len += UC_UTF16BE_encode_char(ucv[i], &p, endptr); + } + CMap_add_bfchar(cmap, src, 2, dst, len); + used_chars[cid / 8] &= ~(1 << (7 - (cid % 8))); + count++; + RELEASE(dst); + } + RELEASE(ucv); + } + } + } + } + + return count; } -static int -otl_gsub_dump_ligature (struct otl_gsub_subtab *subtab) +static int32_t +add_ToUnicode_ligature (CMap *cmap, char *used_chars, + struct otl_gsub_subtab *subtab, + int32_t *map_base, int32_t *map_sub, USHORT num_glyphs, + uint16_t *GIDToCIDMap) { - int gid, idx; + int32_t count = 0; + USHORT i, idx, gid; ASSERT(subtab); if (subtab->SubstFormat == 1) { struct otl_gsub_ligature1 *data; + struct clt_coverage *cov; data = subtab->table.ligature1; - for (gid = 0; gid < 0x10000; gid++) { - idx = clt_lookup_coverage(&data->coverage, gid); - if (idx >= 0 && idx < data->LigSetCount) { - struct otl_gsub_ligset *ligset; - USHORT i, j; - ligset = &(data->LigatureSet[idx]); - for (j = 0; j < ligset->LigatureCount; j++) { - fprintf(stdout, "substitute \\%u", (USHORT) gid); - for (i = 0; i < ligset->Ligature[j].CompCount - 1; i++) { - fprintf(stdout, " \\%u", ligset->Ligature[j].Component[i]); + cov = &data->coverage; + switch (cov->format) { + case 1: /* list */ + for (idx = 0; idx < cov->count; idx++) { + gid = cov->list[idx]; + if (gid < num_glyphs) { + count += add_ligature1_inverse_map(cmap, used_chars, + map_base, map_sub, num_glyphs, + GIDToCIDMap, gid, idx, data); + } + } + break; + case 2: /* range */ + for (i = 0; i < cov->count; i++) { + for (gid = cov->range[i].Start; + gid <= cov->range[i].End && gid < num_glyphs; gid++) { + idx = cov->range[i].StartCoverageIndex + gid - cov->range[i].Start; + if (gid < num_glyphs) { + count += add_ligature1_inverse_map(cmap, used_chars, + map_base, map_sub, num_glyphs, + GIDToCIDMap, gid, idx, data); } - fprintf(stdout, " by \\%u;\n", ligset->Ligature[j].LigGlyph); } } + break; } } @@ -1779,48 +1985,44 @@ otl_gsub_dump_ligature (struct otl_gsub_subtab *subtab) } int -otl_gsub_dump (otl_gsub *gsub_list, - const char *script, const char *language, const char *feature) +otl_gsub_add_ToUnicode (CMap *cmap, char *used_chars, + int32_t *map_base, int32_t *map_sub, USHORT num_glyphs, + uint16_t *GIDToCIDMap, sfnt *sfont) { - int error = -1; + int count = 0; + otl_gsub *gsub_list; struct otl_gsub_tab *gsub; struct otl_gsub_subtab *subtab; - int sel, i, j; - - if (!gsub_list) - return -1; - - sel = gsub_list->select; - error = otl_gsub_select(gsub_list, script, language, feature); - if (error < 0) { - ERROR("GSUB feature %s.%s.%s not found.", script, language, feature); - } + int i, j; - i = gsub_list->select; - if (i < 0 || i >= gsub_list->num_gsubs) { - ERROR("GSUB not selected..."); - return -1; - } - gsub = &(gsub_list->gsubs[i]); + gsub_list = otl_gsub_new(); + otl_gsub_add_feat(gsub_list, "*", "*", "*", sfont); - for (j = 0; - !error && - j < gsub->num_subtables; j++) { - subtab = &(gsub->subtables[j]); - switch ((int) subtab->LookupType){ - case OTL_GSUB_TYPE_SINGLE: - error = otl_gsub_dump_single(subtab); - break; - case OTL_GSUB_TYPE_ALTERNATE: - error = otl_gsub_dump_alternate(subtab); - break; - case OTL_GSUB_TYPE_LIGATURE: - error = otl_gsub_dump_ligature(subtab); - break; + for (i = 0; i < gsub_list->num_gsubs; i++) { + gsub = &(gsub_list->gsubs[i]); + for (j = 0; j < gsub->num_subtables; j++) { + subtab = &(gsub->subtables[j]); + switch ((int) subtab->LookupType){ + case OTL_GSUB_TYPE_SINGLE: + count += add_ToUnicode_single(cmap, used_chars, subtab, + map_base, map_sub, num_glyphs, + GIDToCIDMap); + break; + case OTL_GSUB_TYPE_ALTERNATE: + count += add_ToUnicode_alternate(cmap, used_chars, subtab, + map_base, map_sub, num_glyphs, + GIDToCIDMap); + break; + case OTL_GSUB_TYPE_LIGATURE: + count += add_ToUnicode_ligature(cmap, used_chars, subtab, + map_base, map_sub, num_glyphs, + GIDToCIDMap); + break; + } } } - gsub_list->select = sel; + otl_gsub_release(gsub_list); - return error; + return count; } #endif diff --git a/Build/source/texk/dvipdfm-x/tt_gsub.h b/Build/source/texk/dvipdfm-x/tt_gsub.h index 2fd85ee8a5d..718ff8213b5 100644 --- a/Build/source/texk/dvipdfm-x/tt_gsub.h +++ b/Build/source/texk/dvipdfm-x/tt_gsub.h @@ -1,6 +1,6 @@ /* This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks. - Copyright (C) 2002-2018 by Jin-Hwan Cho and Shunsaku Hirata, + Copyright (C) 2002-2019 by Jin-Hwan Cho and Shunsaku Hirata, the dvipdfmx project team. This program is free software; you can redistribute it and/or modify @@ -23,6 +23,7 @@ #include "sfnt.h" #include "otl_opt.h" +#include "cmap.h" typedef struct otl_gsub otl_gsub; @@ -59,11 +60,7 @@ extern int otl_gsub_add_feat_list (otl_gsub *gsub_list, extern int otl_gsub_set_chain (otl_gsub *gsub_list, const char *otl_tags); extern int otl_gsub_apply_chain (otl_gsub *gsub_list, USHORT *gid); -#if 0 -extern int otl_gsub_dump (otl_gsub *gsub_list, - const char *script, - const char *language, - const char *feature); -#endif - +extern int otl_gsub_add_ToUnicode (CMap *cmap, char *used_chars, + int32_t *map_base, int32_t *map_sub, USHORT num_glyphs, + uint16_t *GIDToCIDMap, sfnt *sfont); #endif /* _TT_GSUB_H_ */ |