summaryrefslogtreecommitdiff
path: root/Build/source/texk/dvipdfm-x/cff.h
diff options
context:
space:
mode:
authorKhaled Hosny <khaledhosny@eglug.org>2014-07-25 13:56:38 +0000
committerKhaled Hosny <khaledhosny@eglug.org>2014-07-25 13:56:38 +0000
commit796176898c849ec72156930daa2ea150b68c48a3 (patch)
treedf9ae1a767183ead147947882f8895cf07f2417a /Build/source/texk/dvipdfm-x/cff.h
parent31053cc388d6f0b348b297a3a0b950e8d707916a (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/cff.h')
-rw-r--r--Build/source/texk/dvipdfm-x/cff.h21
1 files changed, 0 insertions, 21 deletions
diff --git a/Build/source/texk/dvipdfm-x/cff.h b/Build/source/texk/dvipdfm-x/cff.h
index dc9145beb0d..41c4c06887b 100644
--- a/Build/source/texk/dvipdfm-x/cff.h
+++ b/Build/source/texk/dvipdfm-x/cff.h
@@ -24,10 +24,6 @@
#include "mfileio.h"
#include "cff_types.h"
-#ifdef XETEX
-#include "sfnt.h"
-#endif
-
/* Flag */
#define FONTTYPE_CIDFONT (1 << 0)
#define FONTTYPE_FONT (1 << 1)
@@ -75,12 +71,7 @@ typedef struct
*/
cff_index *_string;
-#ifdef XETEX
- unsigned short *ft_to_gid;
- sfnt *sfont;
-#else
FILE *stream;
-#endif
int filter; /* not used, ASCII Hex filter if needed */
@@ -88,19 +79,11 @@ typedef struct
int flag; /* Flag: see above */
} cff_font;
-#ifdef XETEX
-extern cff_font *cff_open (sfnt *sfont, long offset, int idx);
-#define cff_seek_set(c, p) sfnt_seek_set (((c)->sfont), ((c)->offset) + (p));
-#define cff_read_data(d, l, c) sfnt_read(d, l, (c)->sfont)
-#define cff_tell(c) (c)->sfont->loc
-#define cff_seek(c, p) sfnt_seek_set((c)->sfont, p)
-#else
extern cff_font *cff_open (FILE *file, long offset, int idx);
#define cff_seek_set(c, p) seek_absolute (((c)->stream), ((c)->offset) + (p));
#define cff_read_data(d, l, c) fread(d, 1, l, (c)->stream)
#define cff_tell(c) ftell((c)->stream)
#define cff_seek(c, p) seek_absolute((c)->stream, p)
-#endif
extern void cff_close (cff_font *cff);
@@ -152,10 +135,6 @@ extern long cff_read_fdarray (cff_font *cff);
/* Private DICT(s) */
extern long cff_read_private (cff_font *cff);
-#ifdef XETEX
-extern unsigned short* cff_get_ft_to_gid(cff_font *cff);
-#endif
-
/* String */
extern int cff_match_string (cff_font *cff, const char *str, s_SID sid);
extern char *cff_get_string (cff_font *cff, s_SID id);