diff options
author | Khaled Hosny <khaledhosny@eglug.org> | 2014-07-25 13:56:38 +0000 |
---|---|---|
committer | Khaled Hosny <khaledhosny@eglug.org> | 2014-07-25 13:56:38 +0000 |
commit | 796176898c849ec72156930daa2ea150b68c48a3 (patch) | |
tree | df9ae1a767183ead147947882f8895cf07f2417a /Build/source/texk/dvipdfm-x/pdffont.c | |
parent | 31053cc388d6f0b348b297a3a0b950e8d707916a (diff) |
Remove most of font related #ifdef XETEX
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
Diffstat (limited to 'Build/source/texk/dvipdfm-x/pdffont.c')
-rw-r--r-- | Build/source/texk/dvipdfm-x/pdffont.c | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/Build/source/texk/dvipdfm-x/pdffont.c b/Build/source/texk/dvipdfm-x/pdffont.c index 570e0663301..e25a1ccc9e9 100644 --- a/Build/source/texk/dvipdfm-x/pdffont.c +++ b/Build/source/texk/dvipdfm-x/pdffont.c @@ -106,11 +106,6 @@ pdf_font_make_uniqueTag (char *tag) struct pdf_font { -#ifdef XETEX - FT_Face ft_face; - unsigned short *ft_to_gid; -#endif - char *ident; int subtype; @@ -153,10 +148,6 @@ pdf_init_font_struct (pdf_font *font) { ASSERT(font); -#ifdef XETEX - font->ft_face = NULL; -#endif - font->ident = NULL; font->map_name = NULL; font->subtype = -1; @@ -676,11 +667,6 @@ pdf_font_findresource (const char *tex_name, font = GET_FONT(font_id); pdf_init_font_struct(font); -#ifdef XETEX - font->ft_to_gid = Type0Font_get_ft_to_gid(type0_id); - font->ft_face = mrec->opt.ft_face; -#endif - font->font_id = type0_id; font->subtype = PDF_FONT_FONTTYPE_TYPE0; font->encoding_id = cmap_id; @@ -758,10 +744,6 @@ pdf_font_findresource (const char *tex_name, pdf_init_font_struct(font); -#ifdef XETEX - font->ft_face = mrec ? mrec->opt.ft_face : NULL; -#endif - font->point_size = font_scale; font->encoding_id = encoding_id; font->ident = NEW(strlen(fontname) + 1, char); @@ -805,28 +787,6 @@ pdf_font_is_in_use (pdf_font *font) return ((font->reference) ? 1 : 0); } -#ifdef XETEX -FT_Face -pdf_font_get_ft_face (pdf_font *font) -{ - ASSERT(font); - - return font->ft_face; -} - -unsigned short * -pdf_get_font_ft_to_gid (int font_id) -{ - pdf_font *font; - - CHECK_ID(font_id); - - font = GET_FONT(font_id); - - return font->ft_to_gid; -} -#endif - int pdf_font_get_index (pdf_font *font) { |