diff options
author | Khaled Hosny <khaledhosny@eglug.org> | 2014-07-25 13:56:32 +0000 |
---|---|---|
committer | Khaled Hosny <khaledhosny@eglug.org> | 2014-07-25 13:56:32 +0000 |
commit | 31053cc388d6f0b348b297a3a0b950e8d707916a (patch) | |
tree | ae93721619df1a0a9c1b422e7d702d46c5aa7f1d /Build/source/texk/dvipdfm-x/tt_cmap.c | |
parent | c953c51fc011990ac2c82ef8b88f7acf33781d2d (diff) |
Revert "Support CID-keyed OpenType fonts in xdvipdfmx (from Jiang Jiang)"
This reverts commit bf7b0213f14c179b2df004cf6ee134a4b8ae4f99.
git-svn-id: svn://tug.org/texlive/trunk@34717 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvipdfm-x/tt_cmap.c')
-rw-r--r-- | Build/source/texk/dvipdfm-x/tt_cmap.c | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/Build/source/texk/dvipdfm-x/tt_cmap.c b/Build/source/texk/dvipdfm-x/tt_cmap.c index a2e8e21f679..aa49979be6c 100644 --- a/Build/source/texk/dvipdfm-x/tt_cmap.c +++ b/Build/source/texk/dvipdfm-x/tt_cmap.c @@ -55,10 +55,6 @@ #include "tt_cmap.h" -#ifdef XETEX -#include FT_CID_H -#endif - #define VERBOSE_LEVEL_MIN 0 static int verbose = 0; void @@ -951,16 +947,6 @@ handle_subst_glyphs (CMap *cmap, return count; } -unsigned int -gid_to_cid(sfnt *sfont, USHORT gid) -{ - unsigned int cid = 0; -#ifdef XETEX - FT_Get_CID_From_Glyph_Index(sfont->ft_face, gid, &cid); -#endif - return cid ? cid : gid; -} - static pdf_obj * create_ToUnicode_cmap4 (struct cmap4 *map, const char *cmap_name, CMap *cmap_add, @@ -999,11 +985,10 @@ create_ToUnicode_cmap4 (struct cmap4 *map, map->idDelta[i]) & 0xffff; } if (is_used_char2(used_glyphs_copy, gid)) { - unsigned int cid = gid_to_cid(sfont, gid); count++; - wbuf[0] = (cid >> 8) & 0xff; - wbuf[1] = (cid & 0xff); + wbuf[0] = (gid >> 8) & 0xff; + wbuf[1] = (gid & 0xff); wbuf[2] = (ch >> 8) & 0xff; wbuf[3] = ch & 0xff; @@ -1072,10 +1057,9 @@ create_ToUnicode_cmap12 (struct cmap12 *map, d = ch - map->groups[i].startCharCode; gid = (USHORT) ((map->groups[i].startGlyphID + d) & 0xffff); if (is_used_char2(used_glyphs_copy, gid)) { - unsigned int cid = gid_to_cid(sfont, gid); count++; - wbuf[0] = (cid >> 8) & 0xff; - wbuf[1] = (cid & 0xff); + wbuf[0] = (gid >> 8) & 0xff; + wbuf[1] = (gid & 0xff); len = UC_sput_UTF16BE((long)ch, &p, wbuf+WBUF_SIZE); CMap_add_bfchar(cmap, wbuf, 2, wbuf+2, len); |