From 796176898c849ec72156930daa2ea150b68c48a3 Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Fri, 25 Jul 2014 13:56:38 +0000 Subject: Remove most of font related #ifdef XETEX MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Almost all of this is not needed now since XeTeX’s native fonts are always passed by file name and face index now, so we can use original dvipdfmx direct file based code instead of using a FreeType font face. Has the side effect of fixing: https://sourceforge.net/p/xetex/bugs/97/ git-svn-id: svn://tug.org/texlive/trunk@34718 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/dvipdfm-x/cid.c | 26 -------------------------- 1 file changed, 26 deletions(-) (limited to 'Build/source/texk/dvipdfm-x/cid.c') diff --git a/Build/source/texk/dvipdfm-x/cid.c b/Build/source/texk/dvipdfm-x/cid.c index 35a562394a0..4d80097df1e 100644 --- a/Build/source/texk/dvipdfm-x/cid.c +++ b/Build/source/texk/dvipdfm-x/cid.c @@ -136,11 +136,6 @@ CIDFont_new (void) font->fontname = NULL; font->ident = NULL; -#ifdef XETEX - font->ft_face = NULL; - font->ft_to_gid = NULL; -#endif - /* * CIDFont */ @@ -209,15 +204,6 @@ CIDFont_release (CIDFont *font) } } -#ifdef XETEX -unsigned short * -CIDFont_get_ft_to_gid(CIDFont *font) -{ - ASSERT(font); - return font->ft_to_gid; -} -#endif - char * CIDFont_get_fontname (CIDFont *font) { @@ -248,15 +234,6 @@ CIDFont_get_opt_index (CIDFont *font) return opt_index; } -#ifdef XETEX -FT_Face -CIDFont_get_ft_face(CIDFont *font) -{ - ASSERT(font); - return font->ft_face; -} -#endif - int CIDFont_get_subtype (CIDFont *font) { @@ -649,9 +626,6 @@ CIDFont_cache_find (const char *map_name, if (font_id == __cache->num) { font = CIDFont_new(); -#ifdef XETEX - font->ft_face = fmap_opt->ft_face; -#endif if (CIDFont_type0_open(font, map_name, cmap_csi, opt) < 0 && CIDFont_type2_open(font, map_name, cmap_csi, opt) < 0 && CIDFont_type0_t1open(font, map_name, cmap_csi, opt) < 0 && -- cgit v1.2.3