summaryrefslogtreecommitdiff
path: root/Build/source/texk/dvipdfm-x
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
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')
-rw-r--r--Build/source/texk/dvipdfm-x/ChangeLog12
-rw-r--r--Build/source/texk/dvipdfm-x/Makefile.am46
-rw-r--r--Build/source/texk/dvipdfm-x/Makefile.in334
-rw-r--r--Build/source/texk/dvipdfm-x/cff.c104
-rw-r--r--Build/source/texk/dvipdfm-x/cff.h21
-rw-r--r--Build/source/texk/dvipdfm-x/cid.c26
-rw-r--r--Build/source/texk/dvipdfm-x/cid.h9
-rw-r--r--Build/source/texk/dvipdfm-x/cid_p.h4
-rw-r--r--Build/source/texk/dvipdfm-x/cidtype0.c45
-rw-r--r--Build/source/texk/dvipdfm-x/cidtype2.c20
-rw-r--r--Build/source/texk/dvipdfm-x/pdfdev.c26
-rw-r--r--Build/source/texk/dvipdfm-x/pdffont.c40
-rw-r--r--Build/source/texk/dvipdfm-x/pdffont.h7
-rw-r--r--Build/source/texk/dvipdfm-x/sfnt.c119
-rw-r--r--Build/source/texk/dvipdfm-x/sfnt.h34
-rw-r--r--Build/source/texk/dvipdfm-x/t1_load.c15
-rw-r--r--Build/source/texk/dvipdfm-x/truetype.c10
-rw-r--r--Build/source/texk/dvipdfm-x/tt_aux.c8
-rw-r--r--Build/source/texk/dvipdfm-x/tt_cmap.c44
-rw-r--r--Build/source/texk/dvipdfm-x/tt_cmap.h3
-rw-r--r--Build/source/texk/dvipdfm-x/tt_glyf.c16
-rw-r--r--Build/source/texk/dvipdfm-x/tt_gsub.c12
-rw-r--r--Build/source/texk/dvipdfm-x/tt_post.c8
-rw-r--r--Build/source/texk/dvipdfm-x/tt_post.h1
-rw-r--r--Build/source/texk/dvipdfm-x/tt_table.c15
-rw-r--r--Build/source/texk/dvipdfm-x/type0.c14
-rw-r--r--Build/source/texk/dvipdfm-x/type0.h2
-rw-r--r--Build/source/texk/dvipdfm-x/type1c.c25
28 files changed, 138 insertions, 882 deletions
diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog
index cca422e00d7..91839dd9b30 100644
--- a/Build/source/texk/dvipdfm-x/ChangeLog
+++ b/Build/source/texk/dvipdfm-x/ChangeLog
@@ -1,3 +1,15 @@
+2014-07-24 Khaled Hosny <khaledhosny@eglug.org>
+
+ * cff.c. cff.h, cid.c, cid.h, cid_p.h, cidtype0.c, cidtype2.c,
+ pdffont.c, pdffont.h, sfnt.c, sfnt.h, t1_load.c, truetype.c, tt_aux.c,
+ tt_cmap.c, tt_cmap.h, tt_glyf.c, tt_gsub.c, tt_post.c, tt_post.h,
+ tt_table.c, type0.c, type1c.c: These files are now identical for
+ dvipdfmx and xdvipdfmx and are part of libutil.a.
+ * type0.h (Type0Font_get_ft_to_gid): Removed.
+ * Makefile.am: Adapted.
+
+ * pdfdev.c: Reduced dvipdfmx/xdvipdfmx diffs.
+
2014-07-22 Khaled Hosny <khaledhosny@eglug.org>
* src/dvi.c, src/dvicodes.h: Support DVI-IVD inspired text reflection
diff --git a/Build/source/texk/dvipdfm-x/Makefile.am b/Build/source/texk/dvipdfm-x/Makefile.am
index 89690e2e04c..f651383e9af 100644
--- a/Build/source/texk/dvipdfm-x/Makefile.am
+++ b/Build/source/texk/dvipdfm-x/Makefile.am
@@ -26,12 +26,19 @@ libutil_a_SOURCES = \
agl.h \
bmpimage.c \
bmpimage.h \
+ cff.c \
+ cff.h \
cff_dict.h \
cff_limits.h \
cff_stdstr.h \
cff_types.h \
cid_basefont.h \
+ cid.c \
+ cid.h \
+ cid_p.h \
+ cidtype0.c \
cidtype0.h \
+ cidtype2.c \
cidtype2.h \
cmap.h \
cmap_p.h \
@@ -78,6 +85,8 @@ libutil_a_SOURCES = \
pdfencrypt.h \
pdfencoding.c \
pdfencoding.h \
+ pdffont.c \
+ pdffont.h \
pdflimits.h \
pdfnames.h \
pdfobj.c \
@@ -95,6 +104,8 @@ libutil_a_SOURCES = \
pst.h \
pst_obj.c \
pst_obj.h \
+ sfnt.c \
+ sfnt.h \
spc_color.c \
spc_color.h \
spc_dvips.c \
@@ -115,17 +126,28 @@ libutil_a_SOURCES = \
subfont.h \
system.h \
t1_char.h \
+ t1_load.c \
t1_load.h \
tfm.c \
tfm.h \
+ truetype.c \
truetype.h \
+ tt_aux.c \
tt_aux.h \
+ tt_cmap.c \
+ tt_cmap.h \
+ tt_glyf.c \
tt_glyf.h \
+ tt_gsub.c \
tt_gsub.h \
+ tt_post.c \
tt_post.h \
+ tt_table.c \
tt_table.h \
+ type0.c \
type0.h \
type1.h \
+ type1c.c \
type1c.h \
unicode.c \
unicode.h \
@@ -134,14 +156,7 @@ libutil_a_SOURCES = \
xbb.c
dvipdfmx_SOURCES = \
- cff.c \
- cff.h \
cff_dict.c \
- cid.c \
- cid.h \
- cid_p.h \
- cidtype0.c \
- cidtype2.c \
cmap.c \
cmap_read.c \
dvi.c \
@@ -151,27 +166,12 @@ dvipdfmx_SOURCES = \
mpost.c \
pdfdev.c \
pdfdoc.c \
- pdffont.c \
- pdffont.h \
pdfnames.c \
pkfont.c \
- sfnt.c \
- sfnt.h \
spc_pdfm.c \
spc_xtx.c \
t1_char.c \
- t1_load.c \
- truetype.c \
- tt_aux.c \
- tt_cmap.c \
- tt_cmap.h \
- tt_glyf.c \
- tt_gsub.c \
- tt_post.c \
- tt_table.c \
- type0.c \
- type1.c \
- type1c.c
+ type1.c
nodist_xdvipdfmx_SOURCES = $(dvipdfmx_SOURCES)
diff --git a/Build/source/texk/dvipdfm-x/Makefile.in b/Build/source/texk/dvipdfm-x/Makefile.in
index 5aed7fb7a1c..ad0708f4611 100644
--- a/Build/source/texk/dvipdfm-x/Makefile.in
+++ b/Build/source/texk/dvipdfm-x/Makefile.in
@@ -146,19 +146,24 @@ am__v_AR_0 = @echo " AR " $@;
am__v_AR_1 =
libutil_a_AR = $(AR) $(ARFLAGS)
libutil_a_LIBADD =
-am_libutil_a_OBJECTS = agl.$(OBJEXT) bmpimage.$(OBJEXT) \
+am_libutil_a_OBJECTS = agl.$(OBJEXT) bmpimage.$(OBJEXT) cff.$(OBJEXT) \
+ cid.$(OBJEXT) cidtype0.$(OBJEXT) cidtype2.$(OBJEXT) \
cmap_write.$(OBJEXT) cs_type2.$(OBJEXT) dpxconf.$(OBJEXT) \
dpxcrypt.$(OBJEXT) dpxfile.$(OBJEXT) dpxutil.$(OBJEXT) \
epdf.$(OBJEXT) error.$(OBJEXT) jpegimage.$(OBJEXT) \
mem.$(OBJEXT) mfileio.$(OBJEXT) numbers.$(OBJEXT) \
otl_conf.$(OBJEXT) otl_opt.$(OBJEXT) pdfcolor.$(OBJEXT) \
pdfdraw.$(OBJEXT) pdfencrypt.$(OBJEXT) pdfencoding.$(OBJEXT) \
- pdfobj.$(OBJEXT) pdfparse.$(OBJEXT) pdfresource.$(OBJEXT) \
- pdfximage.$(OBJEXT) pngimage.$(OBJEXT) pst.$(OBJEXT) \
- pst_obj.$(OBJEXT) spc_color.$(OBJEXT) spc_dvips.$(OBJEXT) \
- spc_html.$(OBJEXT) spc_misc.$(OBJEXT) spc_tpic.$(OBJEXT) \
- spc_util.$(OBJEXT) specials.$(OBJEXT) subfont.$(OBJEXT) \
- tfm.$(OBJEXT) unicode.$(OBJEXT) vf.$(OBJEXT) xbb.$(OBJEXT)
+ pdffont.$(OBJEXT) pdfobj.$(OBJEXT) pdfparse.$(OBJEXT) \
+ pdfresource.$(OBJEXT) pdfximage.$(OBJEXT) pngimage.$(OBJEXT) \
+ pst.$(OBJEXT) pst_obj.$(OBJEXT) sfnt.$(OBJEXT) \
+ spc_color.$(OBJEXT) spc_dvips.$(OBJEXT) spc_html.$(OBJEXT) \
+ spc_misc.$(OBJEXT) spc_tpic.$(OBJEXT) spc_util.$(OBJEXT) \
+ specials.$(OBJEXT) subfont.$(OBJEXT) t1_load.$(OBJEXT) \
+ tfm.$(OBJEXT) truetype.$(OBJEXT) tt_aux.$(OBJEXT) \
+ tt_cmap.$(OBJEXT) tt_glyf.$(OBJEXT) tt_gsub.$(OBJEXT) \
+ tt_post.$(OBJEXT) tt_table.$(OBJEXT) type0.$(OBJEXT) \
+ type1c.$(OBJEXT) unicode.$(OBJEXT) vf.$(OBJEXT) xbb.$(OBJEXT)
libutil_a_OBJECTS = $(am_libutil_a_OBJECTS)
@DVIPDFMX_TRUE@am__EXEEXT_1 = dvipdfmx$(EXEEXT)
@XDVIPDFMX_TRUE@am__EXEEXT_2 = xdvipdfmx$(EXEEXT)
@@ -174,38 +179,25 @@ AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent
am__v_lt_1 =
-am_dvipdfmx_OBJECTS = cff.$(OBJEXT) cff_dict.$(OBJEXT) cid.$(OBJEXT) \
- cidtype0.$(OBJEXT) cidtype2.$(OBJEXT) cmap.$(OBJEXT) \
+am_dvipdfmx_OBJECTS = cff_dict.$(OBJEXT) cmap.$(OBJEXT) \
cmap_read.$(OBJEXT) dvi.$(OBJEXT) dvipdfmx.$(OBJEXT) \
fontmap.$(OBJEXT) mpost.$(OBJEXT) pdfdev.$(OBJEXT) \
- pdfdoc.$(OBJEXT) pdffont.$(OBJEXT) pdfnames.$(OBJEXT) \
- pkfont.$(OBJEXT) sfnt.$(OBJEXT) spc_pdfm.$(OBJEXT) \
- spc_xtx.$(OBJEXT) t1_char.$(OBJEXT) t1_load.$(OBJEXT) \
- truetype.$(OBJEXT) tt_aux.$(OBJEXT) tt_cmap.$(OBJEXT) \
- tt_glyf.$(OBJEXT) tt_gsub.$(OBJEXT) tt_post.$(OBJEXT) \
- tt_table.$(OBJEXT) type0.$(OBJEXT) type1.$(OBJEXT) \
- type1c.$(OBJEXT)
+ pdfdoc.$(OBJEXT) pdfnames.$(OBJEXT) pkfont.$(OBJEXT) \
+ spc_pdfm.$(OBJEXT) spc_xtx.$(OBJEXT) t1_char.$(OBJEXT) \
+ type1.$(OBJEXT)
dvipdfmx_OBJECTS = $(am_dvipdfmx_OBJECTS)
am__DEPENDENCIES_1 =
dvipdfmx_DEPENDENCIES = libutil.a $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
-am__objects_1 = xdvipdfmx-cff.$(OBJEXT) xdvipdfmx-cff_dict.$(OBJEXT) \
- xdvipdfmx-cid.$(OBJEXT) xdvipdfmx-cidtype0.$(OBJEXT) \
- xdvipdfmx-cidtype2.$(OBJEXT) xdvipdfmx-cmap.$(OBJEXT) \
+am__objects_1 = xdvipdfmx-cff_dict.$(OBJEXT) xdvipdfmx-cmap.$(OBJEXT) \
xdvipdfmx-cmap_read.$(OBJEXT) xdvipdfmx-dvi.$(OBJEXT) \
xdvipdfmx-dvipdfmx.$(OBJEXT) xdvipdfmx-fontmap.$(OBJEXT) \
xdvipdfmx-mpost.$(OBJEXT) xdvipdfmx-pdfdev.$(OBJEXT) \
- xdvipdfmx-pdfdoc.$(OBJEXT) xdvipdfmx-pdffont.$(OBJEXT) \
- xdvipdfmx-pdfnames.$(OBJEXT) xdvipdfmx-pkfont.$(OBJEXT) \
- xdvipdfmx-sfnt.$(OBJEXT) xdvipdfmx-spc_pdfm.$(OBJEXT) \
+ xdvipdfmx-pdfdoc.$(OBJEXT) xdvipdfmx-pdfnames.$(OBJEXT) \
+ xdvipdfmx-pkfont.$(OBJEXT) xdvipdfmx-spc_pdfm.$(OBJEXT) \
xdvipdfmx-spc_xtx.$(OBJEXT) xdvipdfmx-t1_char.$(OBJEXT) \
- xdvipdfmx-t1_load.$(OBJEXT) xdvipdfmx-truetype.$(OBJEXT) \
- xdvipdfmx-tt_aux.$(OBJEXT) xdvipdfmx-tt_cmap.$(OBJEXT) \
- xdvipdfmx-tt_glyf.$(OBJEXT) xdvipdfmx-tt_gsub.$(OBJEXT) \
- xdvipdfmx-tt_post.$(OBJEXT) xdvipdfmx-tt_table.$(OBJEXT) \
- xdvipdfmx-type0.$(OBJEXT) xdvipdfmx-type1.$(OBJEXT) \
- xdvipdfmx-type1c.$(OBJEXT)
+ xdvipdfmx-type1.$(OBJEXT)
nodist_xdvipdfmx_OBJECTS = $(am__objects_1)
xdvipdfmx_OBJECTS = $(nodist_xdvipdfmx_OBJECTS)
am__DEPENDENCIES_2 = libutil.a $(am__DEPENDENCIES_1) \
@@ -645,12 +637,19 @@ libutil_a_SOURCES = \
agl.h \
bmpimage.c \
bmpimage.h \
+ cff.c \
+ cff.h \
cff_dict.h \
cff_limits.h \
cff_stdstr.h \
cff_types.h \
cid_basefont.h \
+ cid.c \
+ cid.h \
+ cid_p.h \
+ cidtype0.c \
cidtype0.h \
+ cidtype2.c \
cidtype2.h \
cmap.h \
cmap_p.h \
@@ -697,6 +696,8 @@ libutil_a_SOURCES = \
pdfencrypt.h \
pdfencoding.c \
pdfencoding.h \
+ pdffont.c \
+ pdffont.h \
pdflimits.h \
pdfnames.h \
pdfobj.c \
@@ -714,6 +715,8 @@ libutil_a_SOURCES = \
pst.h \
pst_obj.c \
pst_obj.h \
+ sfnt.c \
+ sfnt.h \
spc_color.c \
spc_color.h \
spc_dvips.c \
@@ -734,17 +737,28 @@ libutil_a_SOURCES = \
subfont.h \
system.h \
t1_char.h \
+ t1_load.c \
t1_load.h \
tfm.c \
tfm.h \
+ truetype.c \
truetype.h \
+ tt_aux.c \
tt_aux.h \
+ tt_cmap.c \
+ tt_cmap.h \
+ tt_glyf.c \
tt_glyf.h \
+ tt_gsub.c \
tt_gsub.h \
+ tt_post.c \
tt_post.h \
+ tt_table.c \
tt_table.h \
+ type0.c \
type0.h \
type1.h \
+ type1c.c \
type1c.h \
unicode.c \
unicode.h \
@@ -753,14 +767,7 @@ libutil_a_SOURCES = \
xbb.c
dvipdfmx_SOURCES = \
- cff.c \
- cff.h \
cff_dict.c \
- cid.c \
- cid.h \
- cid_p.h \
- cidtype0.c \
- cidtype2.c \
cmap.c \
cmap_read.c \
dvi.c \
@@ -770,27 +777,12 @@ dvipdfmx_SOURCES = \
mpost.c \
pdfdev.c \
pdfdoc.c \
- pdffont.c \
- pdffont.h \
pdfnames.c \
pkfont.c \
- sfnt.c \
- sfnt.h \
spc_pdfm.c \
spc_xtx.c \
t1_char.c \
- t1_load.c \
- truetype.c \
- tt_aux.c \
- tt_cmap.c \
- tt_cmap.h \
- tt_glyf.c \
- tt_gsub.c \
- tt_post.c \
- tt_table.c \
- type0.c \
- type1.c \
- type1c.c
+ type1.c
nodist_xdvipdfmx_SOURCES = $(dvipdfmx_SOURCES)
dvipdfmx_LDADD = libutil.a $(KPATHSEA_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS) $(LIBPAPER_LIBS)
@@ -1069,11 +1061,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unicode.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vf.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbb.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdvipdfmx-cff.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdvipdfmx-cff_dict.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdvipdfmx-cid.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdvipdfmx-cidtype0.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdvipdfmx-cidtype2.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdvipdfmx-cmap.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdvipdfmx-cmap_read.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdvipdfmx-dvi.Po@am__quote@
@@ -1082,24 +1070,12 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdvipdfmx-mpost.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdvipdfmx-pdfdev.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdvipdfmx-pdfdoc.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdvipdfmx-pdffont.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdvipdfmx-pdfnames.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdvipdfmx-pkfont.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdvipdfmx-sfnt.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdvipdfmx-spc_pdfm.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdvipdfmx-spc_xtx.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdvipdfmx-t1_char.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdvipdfmx-t1_load.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdvipdfmx-truetype.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdvipdfmx-tt_aux.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdvipdfmx-tt_cmap.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdvipdfmx-tt_glyf.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdvipdfmx-tt_gsub.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdvipdfmx-tt_post.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdvipdfmx-tt_table.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdvipdfmx-type0.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdvipdfmx-type1.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdvipdfmx-type1c.Po@am__quote@
.c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@@ -1139,20 +1115,6 @@ call_dvipdfmx-callexe.obj: callexe.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(call_dvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o call_dvipdfmx-callexe.obj `if test -f 'callexe.c'; then $(CYGPATH_W) 'callexe.c'; else $(CYGPATH_W) '$(srcdir)/callexe.c'; fi`
-xdvipdfmx-cff.o: cff.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xdvipdfmx-cff.o -MD -MP -MF $(DEPDIR)/xdvipdfmx-cff.Tpo -c -o xdvipdfmx-cff.o `test -f 'cff.c' || echo '$(srcdir)/'`cff.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xdvipdfmx-cff.Tpo $(DEPDIR)/xdvipdfmx-cff.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='cff.c' object='xdvipdfmx-cff.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xdvipdfmx-cff.o `test -f 'cff.c' || echo '$(srcdir)/'`cff.c
-
-xdvipdfmx-cff.obj: cff.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xdvipdfmx-cff.obj -MD -MP -MF $(DEPDIR)/xdvipdfmx-cff.Tpo -c -o xdvipdfmx-cff.obj `if test -f 'cff.c'; then $(CYGPATH_W) 'cff.c'; else $(CYGPATH_W) '$(srcdir)/cff.c'; fi`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xdvipdfmx-cff.Tpo $(DEPDIR)/xdvipdfmx-cff.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='cff.c' object='xdvipdfmx-cff.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xdvipdfmx-cff.obj `if test -f 'cff.c'; then $(CYGPATH_W) 'cff.c'; else $(CYGPATH_W) '$(srcdir)/cff.c'; fi`
-
xdvipdfmx-cff_dict.o: cff_dict.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xdvipdfmx-cff_dict.o -MD -MP -MF $(DEPDIR)/xdvipdfmx-cff_dict.Tpo -c -o xdvipdfmx-cff_dict.o `test -f 'cff_dict.c' || echo '$(srcdir)/'`cff_dict.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xdvipdfmx-cff_dict.Tpo $(DEPDIR)/xdvipdfmx-cff_dict.Po
@@ -1167,48 +1129,6 @@ xdvipdfmx-cff_dict.obj: cff_dict.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xdvipdfmx-cff_dict.obj `if test -f 'cff_dict.c'; then $(CYGPATH_W) 'cff_dict.c'; else $(CYGPATH_W) '$(srcdir)/cff_dict.c'; fi`
-xdvipdfmx-cid.o: cid.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xdvipdfmx-cid.o -MD -MP -MF $(DEPDIR)/xdvipdfmx-cid.Tpo -c -o xdvipdfmx-cid.o `test -f 'cid.c' || echo '$(srcdir)/'`cid.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xdvipdfmx-cid.Tpo $(DEPDIR)/xdvipdfmx-cid.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='cid.c' object='xdvipdfmx-cid.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xdvipdfmx-cid.o `test -f 'cid.c' || echo '$(srcdir)/'`cid.c
-
-xdvipdfmx-cid.obj: cid.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xdvipdfmx-cid.obj -MD -MP -MF $(DEPDIR)/xdvipdfmx-cid.Tpo -c -o xdvipdfmx-cid.obj `if test -f 'cid.c'; then $(CYGPATH_W) 'cid.c'; else $(CYGPATH_W) '$(srcdir)/cid.c'; fi`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xdvipdfmx-cid.Tpo $(DEPDIR)/xdvipdfmx-cid.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='cid.c' object='xdvipdfmx-cid.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xdvipdfmx-cid.obj `if test -f 'cid.c'; then $(CYGPATH_W) 'cid.c'; else $(CYGPATH_W) '$(srcdir)/cid.c'; fi`
-
-xdvipdfmx-cidtype0.o: cidtype0.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xdvipdfmx-cidtype0.o -MD -MP -MF $(DEPDIR)/xdvipdfmx-cidtype0.Tpo -c -o xdvipdfmx-cidtype0.o `test -f 'cidtype0.c' || echo '$(srcdir)/'`cidtype0.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xdvipdfmx-cidtype0.Tpo $(DEPDIR)/xdvipdfmx-cidtype0.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='cidtype0.c' object='xdvipdfmx-cidtype0.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xdvipdfmx-cidtype0.o `test -f 'cidtype0.c' || echo '$(srcdir)/'`cidtype0.c
-
-xdvipdfmx-cidtype0.obj: cidtype0.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xdvipdfmx-cidtype0.obj -MD -MP -MF $(DEPDIR)/xdvipdfmx-cidtype0.Tpo -c -o xdvipdfmx-cidtype0.obj `if test -f 'cidtype0.c'; then $(CYGPATH_W) 'cidtype0.c'; else $(CYGPATH_W) '$(srcdir)/cidtype0.c'; fi`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xdvipdfmx-cidtype0.Tpo $(DEPDIR)/xdvipdfmx-cidtype0.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='cidtype0.c' object='xdvipdfmx-cidtype0.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xdvipdfmx-cidtype0.obj `if test -f 'cidtype0.c'; then $(CYGPATH_W) 'cidtype0.c'; else $(CYGPATH_W) '$(srcdir)/cidtype0.c'; fi`
-
-xdvipdfmx-cidtype2.o: cidtype2.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xdvipdfmx-cidtype2.o -MD -MP -MF $(DEPDIR)/xdvipdfmx-cidtype2.Tpo -c -o xdvipdfmx-cidtype2.o `test -f 'cidtype2.c' || echo '$(srcdir)/'`cidtype2.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xdvipdfmx-cidtype2.Tpo $(DEPDIR)/xdvipdfmx-cidtype2.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='cidtype2.c' object='xdvipdfmx-cidtype2.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xdvipdfmx-cidtype2.o `test -f 'cidtype2.c' || echo '$(srcdir)/'`cidtype2.c
-
-xdvipdfmx-cidtype2.obj: cidtype2.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xdvipdfmx-cidtype2.obj -MD -MP -MF $(DEPDIR)/xdvipdfmx-cidtype2.Tpo -c -o xdvipdfmx-cidtype2.obj `if test -f 'cidtype2.c'; then $(CYGPATH_W) 'cidtype2.c'; else $(CYGPATH_W) '$(srcdir)/cidtype2.c'; fi`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xdvipdfmx-cidtype2.Tpo $(DEPDIR)/xdvipdfmx-cidtype2.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='cidtype2.c' object='xdvipdfmx-cidtype2.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xdvipdfmx-cidtype2.obj `if test -f 'cidtype2.c'; then $(CYGPATH_W) 'cidtype2.c'; else $(CYGPATH_W) '$(srcdir)/cidtype2.c'; fi`
-
xdvipdfmx-cmap.o: cmap.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xdvipdfmx-cmap.o -MD -MP -MF $(DEPDIR)/xdvipdfmx-cmap.Tpo -c -o xdvipdfmx-cmap.o `test -f 'cmap.c' || echo '$(srcdir)/'`cmap.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xdvipdfmx-cmap.Tpo $(DEPDIR)/xdvipdfmx-cmap.Po
@@ -1321,20 +1241,6 @@ xdvipdfmx-pdfdoc.obj: pdfdoc.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xdvipdfmx-pdfdoc.obj `if test -f 'pdfdoc.c'; then $(CYGPATH_W) 'pdfdoc.c'; else $(CYGPATH_W) '$(srcdir)/pdfdoc.c'; fi`
-xdvipdfmx-pdffont.o: pdffont.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xdvipdfmx-pdffont.o -MD -MP -MF $(DEPDIR)/xdvipdfmx-pdffont.Tpo -c -o xdvipdfmx-pdffont.o `test -f 'pdffont.c' || echo '$(srcdir)/'`pdffont.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xdvipdfmx-pdffont.Tpo $(DEPDIR)/xdvipdfmx-pdffont.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pdffont.c' object='xdvipdfmx-pdffont.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xdvipdfmx-pdffont.o `test -f 'pdffont.c' || echo '$(srcdir)/'`pdffont.c
-
-xdvipdfmx-pdffont.obj: pdffont.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xdvipdfmx-pdffont.obj -MD -MP -MF $(DEPDIR)/xdvipdfmx-pdffont.Tpo -c -o xdvipdfmx-pdffont.obj `if test -f 'pdffont.c'; then $(CYGPATH_W) 'pdffont.c'; else $(CYGPATH_W) '$(srcdir)/pdffont.c'; fi`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xdvipdfmx-pdffont.Tpo $(DEPDIR)/xdvipdfmx-pdffont.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pdffont.c' object='xdvipdfmx-pdffont.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xdvipdfmx-pdffont.obj `if test -f 'pdffont.c'; then $(CYGPATH_W) 'pdffont.c'; else $(CYGPATH_W) '$(srcdir)/pdffont.c'; fi`
-
xdvipdfmx-pdfnames.o: pdfnames.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xdvipdfmx-pdfnames.o -MD -MP -MF $(DEPDIR)/xdvipdfmx-pdfnames.Tpo -c -o xdvipdfmx-pdfnames.o `test -f 'pdfnames.c' || echo '$(srcdir)/'`pdfnames.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xdvipdfmx-pdfnames.Tpo $(DEPDIR)/xdvipdfmx-pdfnames.Po
@@ -1363,20 +1269,6 @@ xdvipdfmx-pkfont.obj: pkfont.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xdvipdfmx-pkfont.obj `if test -f 'pkfont.c'; then $(CYGPATH_W) 'pkfont.c'; else $(CYGPATH_W) '$(srcdir)/pkfont.c'; fi`
-xdvipdfmx-sfnt.o: sfnt.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xdvipdfmx-sfnt.o -MD -MP -MF $(DEPDIR)/xdvipdfmx-sfnt.Tpo -c -o xdvipdfmx-sfnt.o `test -f 'sfnt.c' || echo '$(srcdir)/'`sfnt.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xdvipdfmx-sfnt.Tpo $(DEPDIR)/xdvipdfmx-sfnt.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='sfnt.c' object='xdvipdfmx-sfnt.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xdvipdfmx-sfnt.o `test -f 'sfnt.c' || echo '$(srcdir)/'`sfnt.c
-
-xdvipdfmx-sfnt.obj: sfnt.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xdvipdfmx-sfnt.obj -MD -MP -MF $(DEPDIR)/xdvipdfmx-sfnt.Tpo -c -o xdvipdfmx-sfnt.obj `if test -f 'sfnt.c'; then $(CYGPATH_W) 'sfnt.c'; else $(CYGPATH_W) '$(srcdir)/sfnt.c'; fi`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xdvipdfmx-sfnt.Tpo $(DEPDIR)/xdvipdfmx-sfnt.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='sfnt.c' object='xdvipdfmx-sfnt.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xdvipdfmx-sfnt.obj `if test -f 'sfnt.c'; then $(CYGPATH_W) 'sfnt.c'; else $(CYGPATH_W) '$(srcdir)/sfnt.c'; fi`
-
xdvipdfmx-spc_pdfm.o: spc_pdfm.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xdvipdfmx-spc_pdfm.o -MD -MP -MF $(DEPDIR)/xdvipdfmx-spc_pdfm.Tpo -c -o xdvipdfmx-spc_pdfm.o `test -f 'spc_pdfm.c' || echo '$(srcdir)/'`spc_pdfm.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xdvipdfmx-spc_pdfm.Tpo $(DEPDIR)/xdvipdfmx-spc_pdfm.Po
@@ -1419,132 +1311,6 @@ xdvipdfmx-t1_char.obj: t1_char.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xdvipdfmx-t1_char.obj `if test -f 't1_char.c'; then $(CYGPATH_W) 't1_char.c'; else $(CYGPATH_W) '$(srcdir)/t1_char.c'; fi`
-xdvipdfmx-t1_load.o: t1_load.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xdvipdfmx-t1_load.o -MD -MP -MF $(DEPDIR)/xdvipdfmx-t1_load.Tpo -c -o xdvipdfmx-t1_load.o `test -f 't1_load.c' || echo '$(srcdir)/'`t1_load.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xdvipdfmx-t1_load.Tpo $(DEPDIR)/xdvipdfmx-t1_load.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='t1_load.c' object='xdvipdfmx-t1_load.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xdvipdfmx-t1_load.o `test -f 't1_load.c' || echo '$(srcdir)/'`t1_load.c
-
-xdvipdfmx-t1_load.obj: t1_load.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xdvipdfmx-t1_load.obj -MD -MP -MF $(DEPDIR)/xdvipdfmx-t1_load.Tpo -c -o xdvipdfmx-t1_load.obj `if test -f 't1_load.c'; then $(CYGPATH_W) 't1_load.c'; else $(CYGPATH_W) '$(srcdir)/t1_load.c'; fi`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xdvipdfmx-t1_load.Tpo $(DEPDIR)/xdvipdfmx-t1_load.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='t1_load.c' object='xdvipdfmx-t1_load.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xdvipdfmx-t1_load.obj `if test -f 't1_load.c'; then $(CYGPATH_W) 't1_load.c'; else $(CYGPATH_W) '$(srcdir)/t1_load.c'; fi`
-
-xdvipdfmx-truetype.o: truetype.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xdvipdfmx-truetype.o -MD -MP -MF $(DEPDIR)/xdvipdfmx-truetype.Tpo -c -o xdvipdfmx-truetype.o `test -f 'truetype.c' || echo '$(srcdir)/'`truetype.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xdvipdfmx-truetype.Tpo $(DEPDIR)/xdvipdfmx-truetype.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='truetype.c' object='xdvipdfmx-truetype.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xdvipdfmx-truetype.o `test -f 'truetype.c' || echo '$(srcdir)/'`truetype.c
-
-xdvipdfmx-truetype.obj: truetype.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xdvipdfmx-truetype.obj -MD -MP -MF $(DEPDIR)/xdvipdfmx-truetype.Tpo -c -o xdvipdfmx-truetype.obj `if test -f 'truetype.c'; then $(CYGPATH_W) 'truetype.c'; else $(CYGPATH_W) '$(srcdir)/truetype.c'; fi`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xdvipdfmx-truetype.Tpo $(DEPDIR)/xdvipdfmx-truetype.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='truetype.c' object='xdvipdfmx-truetype.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xdvipdfmx-truetype.obj `if test -f 'truetype.c'; then $(CYGPATH_W) 'truetype.c'; else $(CYGPATH_W) '$(srcdir)/truetype.c'; fi`
-
-xdvipdfmx-tt_aux.o: tt_aux.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xdvipdfmx-tt_aux.o -MD -MP -MF $(DEPDIR)/xdvipdfmx-tt_aux.Tpo -c -o xdvipdfmx-tt_aux.o `test -f 'tt_aux.c' || echo '$(srcdir)/'`tt_aux.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xdvipdfmx-tt_aux.Tpo $(DEPDIR)/xdvipdfmx-tt_aux.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tt_aux.c' object='xdvipdfmx-tt_aux.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xdvipdfmx-tt_aux.o `test -f 'tt_aux.c' || echo '$(srcdir)/'`tt_aux.c
-
-xdvipdfmx-tt_aux.obj: tt_aux.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xdvipdfmx-tt_aux.obj -MD -MP -MF $(DEPDIR)/xdvipdfmx-tt_aux.Tpo -c -o xdvipdfmx-tt_aux.obj `if test -f 'tt_aux.c'; then $(CYGPATH_W) 'tt_aux.c'; else $(CYGPATH_W) '$(srcdir)/tt_aux.c'; fi`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xdvipdfmx-tt_aux.Tpo $(DEPDIR)/xdvipdfmx-tt_aux.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tt_aux.c' object='xdvipdfmx-tt_aux.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xdvipdfmx-tt_aux.obj `if test -f 'tt_aux.c'; then $(CYGPATH_W) 'tt_aux.c'; else $(CYGPATH_W) '$(srcdir)/tt_aux.c'; fi`
-
-xdvipdfmx-tt_cmap.o: tt_cmap.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xdvipdfmx-tt_cmap.o -MD -MP -MF $(DEPDIR)/xdvipdfmx-tt_cmap.Tpo -c -o xdvipdfmx-tt_cmap.o `test -f 'tt_cmap.c' || echo '$(srcdir)/'`tt_cmap.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xdvipdfmx-tt_cmap.Tpo $(DEPDIR)/xdvipdfmx-tt_cmap.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tt_cmap.c' object='xdvipdfmx-tt_cmap.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xdvipdfmx-tt_cmap.o `test -f 'tt_cmap.c' || echo '$(srcdir)/'`tt_cmap.c
-
-xdvipdfmx-tt_cmap.obj: tt_cmap.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xdvipdfmx-tt_cmap.obj -MD -MP -MF $(DEPDIR)/xdvipdfmx-tt_cmap.Tpo -c -o xdvipdfmx-tt_cmap.obj `if test -f 'tt_cmap.c'; then $(CYGPATH_W) 'tt_cmap.c'; else $(CYGPATH_W) '$(srcdir)/tt_cmap.c'; fi`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xdvipdfmx-tt_cmap.Tpo $(DEPDIR)/xdvipdfmx-tt_cmap.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tt_cmap.c' object='xdvipdfmx-tt_cmap.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xdvipdfmx-tt_cmap.obj `if test -f 'tt_cmap.c'; then $(CYGPATH_W) 'tt_cmap.c'; else $(CYGPATH_W) '$(srcdir)/tt_cmap.c'; fi`
-
-xdvipdfmx-tt_glyf.o: tt_glyf.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xdvipdfmx-tt_glyf.o -MD -MP -MF $(DEPDIR)/xdvipdfmx-tt_glyf.Tpo -c -o xdvipdfmx-tt_glyf.o `test -f 'tt_glyf.c' || echo '$(srcdir)/'`tt_glyf.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xdvipdfmx-tt_glyf.Tpo $(DEPDIR)/xdvipdfmx-tt_glyf.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tt_glyf.c' object='xdvipdfmx-tt_glyf.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xdvipdfmx-tt_glyf.o `test -f 'tt_glyf.c' || echo '$(srcdir)/'`tt_glyf.c
-
-xdvipdfmx-tt_glyf.obj: tt_glyf.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xdvipdfmx-tt_glyf.obj -MD -MP -MF $(DEPDIR)/xdvipdfmx-tt_glyf.Tpo -c -o xdvipdfmx-tt_glyf.obj `if test -f 'tt_glyf.c'; then $(CYGPATH_W) 'tt_glyf.c'; else $(CYGPATH_W) '$(srcdir)/tt_glyf.c'; fi`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xdvipdfmx-tt_glyf.Tpo $(DEPDIR)/xdvipdfmx-tt_glyf.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tt_glyf.c' object='xdvipdfmx-tt_glyf.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xdvipdfmx-tt_glyf.obj `if test -f 'tt_glyf.c'; then $(CYGPATH_W) 'tt_glyf.c'; else $(CYGPATH_W) '$(srcdir)/tt_glyf.c'; fi`
-
-xdvipdfmx-tt_gsub.o: tt_gsub.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xdvipdfmx-tt_gsub.o -MD -MP -MF $(DEPDIR)/xdvipdfmx-tt_gsub.Tpo -c -o xdvipdfmx-tt_gsub.o `test -f 'tt_gsub.c' || echo '$(srcdir)/'`tt_gsub.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xdvipdfmx-tt_gsub.Tpo $(DEPDIR)/xdvipdfmx-tt_gsub.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tt_gsub.c' object='xdvipdfmx-tt_gsub.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xdvipdfmx-tt_gsub.o `test -f 'tt_gsub.c' || echo '$(srcdir)/'`tt_gsub.c
-
-xdvipdfmx-tt_gsub.obj: tt_gsub.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xdvipdfmx-tt_gsub.obj -MD -MP -MF $(DEPDIR)/xdvipdfmx-tt_gsub.Tpo -c -o xdvipdfmx-tt_gsub.obj `if test -f 'tt_gsub.c'; then $(CYGPATH_W) 'tt_gsub.c'; else $(CYGPATH_W) '$(srcdir)/tt_gsub.c'; fi`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xdvipdfmx-tt_gsub.Tpo $(DEPDIR)/xdvipdfmx-tt_gsub.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tt_gsub.c' object='xdvipdfmx-tt_gsub.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xdvipdfmx-tt_gsub.obj `if test -f 'tt_gsub.c'; then $(CYGPATH_W) 'tt_gsub.c'; else $(CYGPATH_W) '$(srcdir)/tt_gsub.c'; fi`
-
-xdvipdfmx-tt_post.o: tt_post.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xdvipdfmx-tt_post.o -MD -MP -MF $(DEPDIR)/xdvipdfmx-tt_post.Tpo -c -o xdvipdfmx-tt_post.o `test -f 'tt_post.c' || echo '$(srcdir)/'`tt_post.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xdvipdfmx-tt_post.Tpo $(DEPDIR)/xdvipdfmx-tt_post.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tt_post.c' object='xdvipdfmx-tt_post.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xdvipdfmx-tt_post.o `test -f 'tt_post.c' || echo '$(srcdir)/'`tt_post.c
-
-xdvipdfmx-tt_post.obj: tt_post.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xdvipdfmx-tt_post.obj -MD -MP -MF $(DEPDIR)/xdvipdfmx-tt_post.Tpo -c -o xdvipdfmx-tt_post.obj `if test -f 'tt_post.c'; then $(CYGPATH_W) 'tt_post.c'; else $(CYGPATH_W) '$(srcdir)/tt_post.c'; fi`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xdvipdfmx-tt_post.Tpo $(DEPDIR)/xdvipdfmx-tt_post.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tt_post.c' object='xdvipdfmx-tt_post.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xdvipdfmx-tt_post.obj `if test -f 'tt_post.c'; then $(CYGPATH_W) 'tt_post.c'; else $(CYGPATH_W) '$(srcdir)/tt_post.c'; fi`
-
-xdvipdfmx-tt_table.o: tt_table.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xdvipdfmx-tt_table.o -MD -MP -MF $(DEPDIR)/xdvipdfmx-tt_table.Tpo -c -o xdvipdfmx-tt_table.o `test -f 'tt_table.c' || echo '$(srcdir)/'`tt_table.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xdvipdfmx-tt_table.Tpo $(DEPDIR)/xdvipdfmx-tt_table.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tt_table.c' object='xdvipdfmx-tt_table.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xdvipdfmx-tt_table.o `test -f 'tt_table.c' || echo '$(srcdir)/'`tt_table.c
-
-xdvipdfmx-tt_table.obj: tt_table.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xdvipdfmx-tt_table.obj -MD -MP -MF $(DEPDIR)/xdvipdfmx-tt_table.Tpo -c -o xdvipdfmx-tt_table.obj `if test -f 'tt_table.c'; then $(CYGPATH_W) 'tt_table.c'; else $(CYGPATH_W) '$(srcdir)/tt_table.c'; fi`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xdvipdfmx-tt_table.Tpo $(DEPDIR)/xdvipdfmx-tt_table.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tt_table.c' object='xdvipdfmx-tt_table.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xdvipdfmx-tt_table.obj `if test -f 'tt_table.c'; then $(CYGPATH_W) 'tt_table.c'; else $(CYGPATH_W) '$(srcdir)/tt_table.c'; fi`
-
-xdvipdfmx-type0.o: type0.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xdvipdfmx-type0.o -MD -MP -MF $(DEPDIR)/xdvipdfmx-type0.Tpo -c -o xdvipdfmx-type0.o `test -f 'type0.c' || echo '$(srcdir)/'`type0.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xdvipdfmx-type0.Tpo $(DEPDIR)/xdvipdfmx-type0.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='type0.c' object='xdvipdfmx-type0.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xdvipdfmx-type0.o `test -f 'type0.c' || echo '$(srcdir)/'`type0.c
-
-xdvipdfmx-type0.obj: type0.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xdvipdfmx-type0.obj -MD -MP -MF $(DEPDIR)/xdvipdfmx-type0.Tpo -c -o xdvipdfmx-type0.obj `if test -f 'type0.c'; then $(CYGPATH_W) 'type0.c'; else $(CYGPATH_W) '$(srcdir)/type0.c'; fi`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xdvipdfmx-type0.Tpo $(DEPDIR)/xdvipdfmx-type0.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='type0.c' object='xdvipdfmx-type0.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xdvipdfmx-type0.obj `if test -f 'type0.c'; then $(CYGPATH_W) 'type0.c'; else $(CYGPATH_W) '$(srcdir)/type0.c'; fi`
-
xdvipdfmx-type1.o: type1.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xdvipdfmx-type1.o -MD -MP -MF $(DEPDIR)/xdvipdfmx-type1.Tpo -c -o xdvipdfmx-type1.o `test -f 'type1.c' || echo '$(srcdir)/'`type1.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xdvipdfmx-type1.Tpo $(DEPDIR)/xdvipdfmx-type1.Po
@@ -1559,20 +1325,6 @@ xdvipdfmx-type1.obj: type1.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xdvipdfmx-type1.obj `if test -f 'type1.c'; then $(CYGPATH_W) 'type1.c'; else $(CYGPATH_W) '$(srcdir)/type1.c'; fi`
-xdvipdfmx-type1c.o: type1c.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xdvipdfmx-type1c.o -MD -MP -MF $(DEPDIR)/xdvipdfmx-type1c.Tpo -c -o xdvipdfmx-type1c.o `test -f 'type1c.c' || echo '$(srcdir)/'`type1c.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xdvipdfmx-type1c.Tpo $(DEPDIR)/xdvipdfmx-type1c.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='type1c.c' object='xdvipdfmx-type1c.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xdvipdfmx-type1c.o `test -f 'type1c.c' || echo '$(srcdir)/'`type1c.c
-
-xdvipdfmx-type1c.obj: type1c.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xdvipdfmx-type1c.obj -MD -MP -MF $(DEPDIR)/xdvipdfmx-type1c.Tpo -c -o xdvipdfmx-type1c.obj `if test -f 'type1c.c'; then $(CYGPATH_W) 'type1c.c'; else $(CYGPATH_W) '$(srcdir)/type1c.c'; fi`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xdvipdfmx-type1c.Tpo $(DEPDIR)/xdvipdfmx-type1c.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='type1c.c' object='xdvipdfmx-type1c.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xdvipdfmx-type1c.obj `if test -f 'type1c.c'; then $(CYGPATH_W) 'type1c.c'; else $(CYGPATH_W) '$(srcdir)/type1c.c'; fi`
-
mostlyclean-libtool:
-rm -f *.lo
diff --git a/Build/source/texk/dvipdfm-x/cff.c b/Build/source/texk/dvipdfm-x/cff.c
index 7a54e3fecfd..52aaab47528 100644
--- a/Build/source/texk/dvipdfm-x/cff.c
+++ b/Build/source/texk/dvipdfm-x/cff.c
@@ -40,24 +40,12 @@
#define CFF_DEBUG 5
#define CFF_DEBUG_STR "CFF"
-#ifdef XETEX
-#define SFNT_OR_FILE sfnt
-#define SFONT_OR_STREAM sfont
-#define get_card8(s) sfnt_get_byte((s))
-#define get_card16(s) sfnt_get_ushort((s))
-#else
-#define SFNT_OR_FILE FILE
-#define SFONT_OR_STREAM stream
-#define get_card8(s) get_unsigned_byte((s))
-#define get_card16(s) get_unsigned_pair((s))
-#endif
-
-static unsigned long get_unsigned (SFNT_OR_FILE *SFONT_OR_STREAM, int n)
+static unsigned long get_unsigned (FILE *stream, int n)
{
unsigned long v = 0;
while (n-- > 0)
- v = v*0x100u + get_card8(SFONT_OR_STREAM);
+ v = v*0x100u + get_unsigned_byte(stream);
return v;
}
@@ -67,7 +55,7 @@ static unsigned long get_unsigned (SFNT_OR_FILE *SFONT_OR_STREAM, int n)
/*
* Read Header, Name INDEX, Top DICT INDEX, and String INDEX.
*/
-cff_font *cff_open(SFNT_OR_FILE *SFONT_OR_STREAM, long offset, int n)
+cff_font *cff_open(FILE *stream, long offset, int n)
{
cff_font *cff;
cff_index *idx;
@@ -76,7 +64,7 @@ cff_font *cff_open(SFNT_OR_FILE *SFONT_OR_STREAM, long offset, int n)
cff->fontname = NULL;
cff->index = n;
- cff->SFONT_OR_STREAM = SFONT_OR_STREAM;
+ cff->stream = stream;
cff->offset = offset;
cff->filter = 0; /* not used */
cff->flag = 0;
@@ -96,10 +84,10 @@ cff_font *cff_open(SFNT_OR_FILE *SFONT_OR_STREAM, long offset, int n)
cff->_string = NULL;
cff_seek_set(cff, 0);
- cff->header.major = get_card8(cff->SFONT_OR_STREAM);
- cff->header.minor = get_card8(cff->SFONT_OR_STREAM);
- cff->header.hdr_size = get_card8(cff->SFONT_OR_STREAM);
- cff->header.offsize = get_card8(cff->SFONT_OR_STREAM);
+ cff->header.major = get_unsigned_byte(cff->stream);
+ cff->header.minor = get_unsigned_byte(cff->stream);
+ cff->header.hdr_size = get_unsigned_byte(cff->stream);
+ cff->header.offsize = get_unsigned_byte(cff->stream);
if (cff->header.offsize < 1 ||
cff->header.offsize > 4)
ERROR("invalid offsize data");
@@ -153,16 +141,12 @@ cff_font *cff_open(SFNT_OR_FILE *SFONT_OR_STREAM, long offset, int n)
cff->string = cff_get_index(cff);
/* offset to GSubr */
-#ifdef XETEX
- cff->gsubr_offset = cff->sfont->loc - offset;
-#else
cff->gsubr_offset = tell_position(cff->stream) - offset;
-#endif
/* Number of glyphs */
offset = (long) cff_dict_get(cff->topdict, "CharStrings", 0);
cff_seek_set(cff, offset);
- cff->num_glyphs = get_card16(cff->SFONT_OR_STREAM);
+ cff->num_glyphs = get_unsigned_pair(cff->stream);
/* Check for font type */
if (cff_dict_known(cff->topdict, "ROS")) {
@@ -199,10 +183,6 @@ cff_font *cff_open(SFNT_OR_FILE *SFONT_OR_STREAM, long offset, int n)
cff_seek_set(cff, cff->gsubr_offset); /* seek back to GSubr */
-#ifdef XETEX
- cff->ft_to_gid = NULL;
-#endif
-
return cff;
}
@@ -242,11 +222,6 @@ cff_close (cff_font *cff)
if (cff->_string)
cff_release_index(cff->_string);
-#ifdef XETEX
- if (cff->ft_to_gid)
- RELEASE(cff->ft_to_gid);
-#endif
-
RELEASE(cff);
}
@@ -319,15 +294,15 @@ cff_get_index_header (cff_font *cff)
idx = NEW(1, cff_index);
- idx->count = count = get_card16(cff->SFONT_OR_STREAM);
+ idx->count = count = get_unsigned_pair(cff->stream);
if (count > 0) {
- idx->offsize = get_card8(cff->SFONT_OR_STREAM);
+ idx->offsize = get_unsigned_byte(cff->stream);
if (idx->offsize < 1 || idx->offsize > 4)
ERROR("invalid offsize data");
idx->offset = NEW(count+1, l_offset);
for (i=0;i<count+1;i++) {
- (idx->offset)[i] = get_offset(cff->SFONT_OR_STREAM, idx->offsize);
+ (idx->offset)[i] = get_offset(cff->stream, idx->offsize);
}
if (idx->offset[0] != 1)
@@ -352,15 +327,15 @@ cff_get_index (cff_font *cff)
idx = NEW(1, cff_index);
- idx->count = count = get_card16(cff->SFONT_OR_STREAM);
+ idx->count = count = get_unsigned_pair(cff->stream);
if (count > 0) {
- idx->offsize = get_card8(cff->SFONT_OR_STREAM);
+ idx->offsize = get_unsigned_byte(cff->stream);
if (idx->offsize < 1 || idx->offsize > 4)
ERROR("invalid offsize data");
idx->offset = NEW(count + 1, l_offset);
for (i = 0 ; i < count + 1; i++) {
- idx->offset[i] = get_offset(cff->SFONT_OR_STREAM, idx->offsize);
+ idx->offset[i] = get_offset(cff->stream, idx->offsize);
}
if (idx->offset[0] != 1)
@@ -670,27 +645,27 @@ long cff_read_encoding (cff_font *cff)
cff_seek_set(cff, offset);
cff->encoding = encoding = NEW(1, cff_encoding);
- encoding->format = get_card8(cff->SFONT_OR_STREAM);
+ encoding->format = get_unsigned_byte(cff->stream);
length = 1;
switch (encoding->format & (~0x80)) {
case 0:
- encoding->num_entries = get_card8(cff->SFONT_OR_STREAM);
+ encoding->num_entries = get_unsigned_byte(cff->stream);
(encoding->data).codes = NEW(encoding->num_entries, card8);
for (i=0;i<(encoding->num_entries);i++) {
- (encoding->data).codes[i] = get_card8(cff->SFONT_OR_STREAM);
+ (encoding->data).codes[i] = get_unsigned_byte(cff->stream);
}
length += encoding->num_entries + 1;
break;
case 1:
{
cff_range1 *ranges;
- encoding->num_entries = get_card8(cff->SFONT_OR_STREAM);
+ encoding->num_entries = get_unsigned_byte(cff->stream);
encoding->data.range1 = ranges
= NEW(encoding->num_entries, cff_range1);
for (i=0;i<(encoding->num_entries);i++) {
- ranges[i].first = get_card8(cff->SFONT_OR_STREAM);
- ranges[i].n_left = get_card8(cff->SFONT_OR_STREAM);
+ ranges[i].first = get_unsigned_byte(cff->stream);
+ ranges[i].n_left = get_unsigned_byte(cff->stream);
}
length += (encoding->num_entries) * 2 + 1;
}
@@ -704,11 +679,11 @@ long cff_read_encoding (cff_font *cff)
/* Supplementary data */
if ((encoding->format) & 0x80) {
cff_map *map;
- encoding->num_supps = get_card8(cff->SFONT_OR_STREAM);
+ encoding->num_supps = get_unsigned_byte(cff->stream);
encoding->supp = map = NEW(encoding->num_supps, cff_map);
for (i=0;i<(encoding->num_supps);i++) {
- map[i].code = get_card8(cff->SFONT_OR_STREAM);
- map[i].glyph = get_card16(cff->SFONT_OR_STREAM); /* SID */
+ map[i].code = get_unsigned_byte(cff->stream);
+ map[i].glyph = get_unsigned_pair(cff->stream); /* SID */
}
length += (encoding->num_supps) * 3 + 1;
} else {
@@ -886,7 +861,7 @@ long cff_read_charsets (cff_font *cff)
cff_seek_set(cff, offset);
cff->charsets = charset = NEW(1, cff_charsets);
- charset->format = get_card8(cff->SFONT_OR_STREAM);
+ charset->format = get_unsigned_byte(cff->stream);
charset->num_entries = 0;
count = cff->num_glyphs - 1;
@@ -899,7 +874,7 @@ long cff_read_charsets (cff_font *cff)
charset->data.glyphs = NEW(charset->num_entries, s_SID);
length += (charset->num_entries) * 2;
for (i=0;i<(charset->num_entries);i++) {
- charset->data.glyphs[i] = get_card16(cff->SFONT_OR_STREAM);
+ charset->data.glyphs[i] = get_unsigned_pair(cff->stream);
}
count = 0;
break;
@@ -908,8 +883,8 @@ long cff_read_charsets (cff_font *cff)
cff_range1 *ranges = NULL;
while (count > 0 && charset->num_entries < cff->num_glyphs) {
ranges = RENEW(ranges, charset->num_entries + 1, cff_range1);
- ranges[charset->num_entries].first = get_card16(cff->SFONT_OR_STREAM);
- ranges[charset->num_entries].n_left = get_card8(cff->SFONT_OR_STREAM);
+ ranges[charset->num_entries].first = get_unsigned_pair(cff->stream);
+ ranges[charset->num_entries].n_left = get_unsigned_byte(cff->stream);
count -= ranges[charset->num_entries].n_left + 1; /* no-overrap */
charset->num_entries += 1;
charset->data.range1 = ranges;
@@ -922,8 +897,8 @@ long cff_read_charsets (cff_font *cff)
cff_range2 *ranges = NULL;
while (count > 0 && charset->num_entries < cff->num_glyphs) {
ranges = RENEW(ranges, charset->num_entries + 1, cff_range2);
- ranges[charset->num_entries].first = get_card16(cff->SFONT_OR_STREAM);
- ranges[charset->num_entries].n_left = get_card16(cff->SFONT_OR_STREAM);
+ ranges[charset->num_entries].first = get_unsigned_pair(cff->stream);
+ ranges[charset->num_entries].n_left = get_unsigned_pair(cff->stream);
count -= ranges[charset->num_entries].n_left + 1; /* non-overrapping */
charset->num_entries += 1;
}
@@ -1216,7 +1191,7 @@ long cff_read_fdselect (cff_font *cff)
offset = (long) cff_dict_get(cff->topdict, "FDSelect", 0);
cff_seek_set(cff, offset);
cff->fdselect = fdsel = NEW(1, cff_fdselect);
- fdsel->format = get_card8(cff->SFONT_OR_STREAM);
+ fdsel->format = get_unsigned_byte(cff->stream);
length = 1;
@@ -1225,22 +1200,22 @@ long cff_read_fdselect (cff_font *cff)
fdsel->num_entries = cff->num_glyphs;
(fdsel->data).fds = NEW(fdsel->num_entries, card8);
for (i=0;i<(fdsel->num_entries);i++) {
- (fdsel->data).fds[i] = get_card8(cff->SFONT_OR_STREAM);
+ (fdsel->data).fds[i] = get_unsigned_byte(cff->stream);
}
length += fdsel->num_entries;
break;
case 3:
{
cff_range3 *ranges;
- fdsel->num_entries = get_card16(cff->SFONT_OR_STREAM);
+ fdsel->num_entries = get_unsigned_pair(cff->stream);
fdsel->data.ranges = ranges = NEW(fdsel->num_entries, cff_range3);
for (i=0;i<(fdsel->num_entries);i++) {
- ranges[i].first = get_card16(cff->SFONT_OR_STREAM);
- ranges[i].fd = get_card8(cff->SFONT_OR_STREAM);
+ ranges[i].first = get_unsigned_pair(cff->stream);
+ ranges[i].fd = get_unsigned_byte(cff->stream);
}
if (ranges[0].first != 0)
ERROR("Range not starting with 0.");
- if (cff->num_glyphs != get_card16(cff->SFONT_OR_STREAM))
+ if (cff->num_glyphs != get_unsigned_pair(cff->stream))
ERROR("Sentinel value mismatched with number of glyphs.");
length += (fdsel->num_entries) * 3 + 4;
}
@@ -1494,10 +1469,3 @@ long cff_read_private (cff_font *cff)
return len;
}
-
-#ifdef XETEX
-unsigned short* cff_get_ft_to_gid(cff_font *cff)
-{
- return cff->ft_to_gid;
-}
-#endif
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);
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 &&
diff --git a/Build/source/texk/dvipdfm-x/cid.h b/Build/source/texk/dvipdfm-x/cid.h
index 8b7dbe4e72b..79b18749071 100644
--- a/Build/source/texk/dvipdfm-x/cid.h
+++ b/Build/source/texk/dvipdfm-x/cid.h
@@ -21,11 +21,6 @@
#ifndef _CID_H_
#define _CID_H_
-#ifdef XETEX
-#include "ft2build.h"
-#include FT_FREETYPE_H
-#endif
-
/* CIDFont types */
#define CIDFONT_TYPE0 1
#define CIDFONT_TYPE2 2
@@ -66,10 +61,6 @@ extern char *CIDFont_get_fontname (CIDFont *font);
extern char *CIDFont_get_ident (CIDFont *font); /* FIXME */
extern int CIDFont_get_opt_index (CIDFont *font); /* FIXME */
-#ifdef XETEX
-extern FT_Face CIDFont_get_ft_face (CIDFont *font);
-extern unsigned short *CIDFont_get_ft_to_gid(CIDFont *font);
-#endif
extern int CIDFont_get_flag (CIDFont *font, int mask);
diff --git a/Build/source/texk/dvipdfm-x/cid_p.h b/Build/source/texk/dvipdfm-x/cid_p.h
index b5e5e353529..80d2133d0c3 100644
--- a/Build/source/texk/dvipdfm-x/cid_p.h
+++ b/Build/source/texk/dvipdfm-x/cid_p.h
@@ -49,10 +49,6 @@ struct CIDFont
char *ident; /* Map record entry */
char *name; /* Fontname or filename */
char *fontname; /* PostScript font name */
-#ifdef XETEX
- FT_Face ft_face;
- unsigned short *ft_to_gid;
-#endif
/*
* CIDFont Specific
*/
diff --git a/Build/source/texk/dvipdfm-x/cidtype0.c b/Build/source/texk/dvipdfm-x/cidtype0.c
index 4fbb7401f50..f8e67471369 100644
--- a/Build/source/texk/dvipdfm-x/cidtype0.c
+++ b/Build/source/texk/dvipdfm-x/cidtype0.c
@@ -509,14 +509,10 @@ CIDFont_type0_dofont (CIDFont *font)
if (!used_chars)
ERROR("Unexpected error: Font not actually used???");
-#ifdef XETEX
- sfont = sfnt_open(font->ft_face, SFNT_TYPE_POSTSCRIPT);
-#else
fp = DPXFOPEN(font->ident, DPX_RES_TYPE_OTFONT);
if (!fp)
ERROR("Could not open OpenType font file: %s", font->ident);
sfont = sfnt_open(fp);
-#endif
if (!sfont)
ERROR("Could not open OpenType font file: %s", font->ident);
@@ -527,11 +523,7 @@ CIDFont_type0_dofont (CIDFont *font)
if (offset == 0)
ERROR("Not a CFF/OpenType font (2)?");
-#ifdef XETEX
- cffont = cff_open(sfont, offset, font->options->index);
-#else
cffont = cff_open(fp, offset, font->options->index);
-#endif
if (!cffont)
ERROR("Could not open CFF font.");
if (!(cffont->flag & FONTTYPE_CIDFONT))
@@ -734,11 +726,6 @@ CIDFont_type0_open (CIDFont *font, const char *name,
ASSERT(font);
-#ifdef XETEX
- sfont = sfnt_open(font->ft_face, SFNT_TYPE_POSTSCRIPT);
- if (!sfont)
- return -1;
-#else
fp = DPXFOPEN(name, DPX_RES_TYPE_OTFONT);
if (!fp)
return -1;
@@ -747,18 +734,13 @@ CIDFont_type0_open (CIDFont *font, const char *name,
if (!sfont) {
ERROR("Not a CFF/OpenType font (3)?");
}
-#endif
if (sfont->type != SFNT_TYPE_POSTSCRIPT ||
sfnt_read_table_directory(sfont, 0) < 0 ||
(offset = sfnt_find_table_pos(sfont, "CFF ")) == 0) {
ERROR("Not a CFF/OpenType font (4)?");
}
-#ifdef XETEX
- cffont = cff_open(sfont, offset, opt->index);
-#else
cffont = cff_open(sfont->stream, offset, opt->index);
-#endif
if (!cffont) {
ERROR("Cannot read CFF font data");
}
@@ -912,15 +894,11 @@ CIDFont_type0_t1cdofont (CIDFont *font)
if (!used_chars)
ERROR("Unexpected error: Font not actually used???");
-#ifdef XETEX
- sfont = sfnt_open(font->ft_face, SFNT_TYPE_POSTSCRIPT);
-#else
fp = DPXFOPEN(font->ident, DPX_RES_TYPE_OTFONT);
if (!fp)
ERROR("Could not open OpenType font file: %s", font->ident);
sfont = sfnt_open(fp);
-#endif
if (!sfont)
ERROR("Could not open OpenType font file: %s", font->ident);
@@ -931,11 +909,7 @@ CIDFont_type0_t1cdofont (CIDFont *font)
if (offset == 0)
ERROR("Not a CFF/OpenType font (6)?");
-#ifdef XETEX
- cffont = cff_open(sfont, offset, font->options->index);
-#else
cffont = cff_open(fp, offset, font->options->index);
-#endif
if (!cffont)
ERROR("Could not open CFF font.");
if (cffont->flag & FONTTYPE_CIDFONT)
@@ -1168,17 +1142,11 @@ CIDFont_type0_t1copen (CIDFont *font, const char *name,
ASSERT(font);
-#ifdef XETEX
- sfont = sfnt_open(font->ft_face, SFNT_TYPE_POSTSCRIPT);
- if (!sfont)
- return -1;
-#else
fp = DPXFOPEN(name, DPX_RES_TYPE_OTFONT);
if (!fp)
return -1;
sfont = sfnt_open(fp);
-#endif
if (!sfont) {
ERROR("Not a CFF/OpenType font (7)?");
}
@@ -1188,11 +1156,7 @@ CIDFont_type0_t1copen (CIDFont *font, const char *name,
ERROR("Not a CFF/OpenType font (8)?");
}
-#ifdef XETEX
- cffont = cff_open(sfont, offset, opt->index);
-#else
cffont = cff_open(fp, offset, opt->index);
-#endif
if (!cffont) {
ERROR("Cannot read CFF font data");
}
@@ -1551,11 +1515,6 @@ CIDFont_type0_t1open (CIDFont *font, const char *name,
strcpy(fontname, shortname);
RELEASE(shortname);
-#ifdef XETEX
- font->ft_to_gid = cff_get_ft_to_gid(cffont);
- cffont->ft_to_gid = NULL;
-#endif
-
cff_close(cffont);
if (opt->style != FONT_STYLE_NONE) {
@@ -2082,9 +2041,5 @@ CIDFont_type0_t1dofont (CIDFont *font)
void
CIDFont_type0_release(CIDFont *font)
{
-#ifdef XETEX
- if (font->ft_to_gid)
- RELEASE(font->ft_to_gid);
-#endif
return;
}
diff --git a/Build/source/texk/dvipdfm-x/cidtype2.c b/Build/source/texk/dvipdfm-x/cidtype2.c
index 85ee66dcdca..278ce18ea9f 100644
--- a/Build/source/texk/dvipdfm-x/cidtype2.c
+++ b/Build/source/texk/dvipdfm-x/cidtype2.c
@@ -542,9 +542,6 @@ CIDFont_type2_dofont (CIDFont *font)
return;
}
-#ifdef XETEX
- sfont = sfnt_open(font->ft_face, SFNT_TYPE_TTC | SFNT_TYPE_TRUETYPE);
-#else
fp = DPXFOPEN(font->ident, DPX_RES_TYPE_TTFONT);
if (!fp) {
fp = DPXFOPEN(font->ident, DPX_RES_TYPE_DFONT);
@@ -553,7 +550,6 @@ CIDFont_type2_dofont (CIDFont *font)
} else {
sfont = sfnt_open(fp);
}
-#endif
if (!sfont) {
ERROR("Could not open TTF file: %s", font->ident);
@@ -566,13 +562,8 @@ CIDFont_type2_dofont (CIDFont *font)
ERROR("Invalid TTC index in %s.", font->ident);
break;
case SFNT_TYPE_TRUETYPE:
-#ifdef XETEX
- /* disable the check here becuase sfnt_open() does not distinguish dfont
- * from regular trutype */
-#else
if (font->options->index > 0)
ERROR("Found TrueType font file while expecting TTC file (%s).", font->ident);
-#endif
offset = 0;
break;
case SFNT_TYPE_DFONT:
@@ -947,11 +938,6 @@ CIDFont_type2_open (CIDFont *font, const char *name,
ASSERT(font && opt);
-#ifdef XETEX
- sfont = sfnt_open(font->ft_face, SFNT_TYPE_TTC | SFNT_TYPE_TRUETYPE);
- if (!sfont)
- return -1;
-#else
fp = DPXFOPEN(name, DPX_RES_TYPE_TTFONT);
if (!fp) {
fp = DPXFOPEN(name, DPX_RES_TYPE_DFONT);
@@ -965,20 +951,14 @@ CIDFont_type2_open (CIDFont *font, const char *name,
DPXFCLOSE(fp);
return -1;
}
-#endif
switch (sfont->type) {
case SFNT_TYPE_TTC:
offset = ttc_read_offset(sfont, opt->index);
break;
case SFNT_TYPE_TRUETYPE:
-#ifdef XETEX
- /* disable the check here becuase sfnt_open() does not distinguish dfont
- * from regular trutype */
-#else
if (opt->index > 0)
ERROR("Invalid TTC index (not TTC font): %s", name);
-#endif
offset = 0;
break;
case SFNT_TYPE_DFONT:
diff --git a/Build/source/texk/dvipdfm-x/pdfdev.c b/Build/source/texk/dvipdfm-x/pdfdev.c
index 54f1a9aa457..7d27b913fe9 100644
--- a/Build/source/texk/dvipdfm-x/pdfdev.c
+++ b/Build/source/texk/dvipdfm-x/pdfdev.c
@@ -455,9 +455,6 @@ struct dev_font {
*/
int font_id;
int enc_id;
-#ifdef XETEX
- unsigned short *ft_to_gid;
-#endif
/* if >= 0, index of a dev_font that really has the resource and used_chars */
int real_font_index;
@@ -957,26 +954,6 @@ handle_multibyte_string (struct dev_font *font,
p = *str_ptr;
length = *str_len;
-#ifdef XETEX
- if (ctype == -1) { /* freetype glyph indexes */
- if (font->ft_to_gid) {
- /* convert freetype glyph indexes to physical GID */
- const unsigned char *inbuf = p;
- unsigned char *outbuf = sbuf0;
- for (i = 0; i < length; i += 2) {
- unsigned int gid;
- gid = *inbuf++ << 8;
- gid += *inbuf++;
- gid = font->ft_to_gid[gid];
- *outbuf++ = gid >> 8;
- *outbuf++ = gid & 0xff;
- }
- p = sbuf0;
- length = outbuf - sbuf0;
- }
- }
- else
-#endif
/* _FIXME_ */
if (font->is_unicode) { /* UCS-4 */
if (ctype == 1) {
@@ -1529,9 +1506,6 @@ pdf_dev_locate_font (const char *font_name, spt_t ptsize)
font->wmode = pdf_get_font_wmode (font->font_id);
font->enc_id = pdf_get_font_encoding(font->font_id);
-#ifdef XETEX
- font->ft_to_gid = pdf_get_font_ft_to_gid(font->font_id);
-#endif
font->resource = NULL; /* Don't ref obj until font is actually used. */
font->used_chars = NULL;
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)
{
diff --git a/Build/source/texk/dvipdfm-x/pdffont.h b/Build/source/texk/dvipdfm-x/pdffont.h
index 6d3ea72b56f..a833fe89dc1 100644
--- a/Build/source/texk/dvipdfm-x/pdffont.h
+++ b/Build/source/texk/dvipdfm-x/pdffont.h
@@ -69,17 +69,10 @@ extern char *pdf_get_font_fontname (int font_id); /* without unique tag */
#endif /* 0 */
extern int pdf_get_font_encoding (int font_id);
extern int pdf_get_font_wmode (int font_id);
-#ifdef XETEX
-extern unsigned short *pdf_get_font_ft_to_gid (int font_id);
-#endif
/* Each font drivers use the followings. */
extern int pdf_font_is_in_use (pdf_font *font);
-#ifdef XETEX
-extern FT_Face pdf_font_get_ft_face (pdf_font *font);
-#endif
-
extern char *pdf_font_get_ident (pdf_font *font);
extern char *pdf_font_get_mapname (pdf_font *font);
extern char *pdf_font_get_fontname (pdf_font *font); /* without unique tag */
diff --git a/Build/source/texk/dvipdfm-x/sfnt.c b/Build/source/texk/dvipdfm-x/sfnt.c
index 28b6b76baa1..5ede43de387 100644
--- a/Build/source/texk/dvipdfm-x/sfnt.c
+++ b/Build/source/texk/dvipdfm-x/sfnt.c
@@ -34,78 +34,6 @@
#include "sfnt.h"
-#ifdef XETEX
-UNSIGNED_BYTE
-ft_unsigned_byte(sfnt* f)
-{
- unsigned char byte;
- unsigned long length = 1;
-
- if (FT_Load_Sfnt_Table(f->ft_face, 0, f->loc, &byte, &length) != 0)
- ERROR("sfnt: Freetype failure...");
- f->loc += 1;
-
- return byte;
-}
-
-SIGNED_BYTE
-ft_signed_byte(sfnt* f)
-{
- int b = ft_unsigned_byte(f);
- if (b >= 0x80)
- b -= 0x100;
- return (SIGNED_BYTE)b;
-}
-
-UNSIGNED_PAIR
-ft_unsigned_pair(sfnt* f)
-{
- unsigned char buf[2];
- unsigned long length = 2;
-
- if (FT_Load_Sfnt_Table(f->ft_face, 0, f->loc, buf, &length) != 0)
- ERROR("sfnt: Freetype failure...");
- f->loc += 2;
-
- return (UNSIGNED_PAIR)((unsigned)buf[0] << 8) + buf[1];
-}
-
-SIGNED_PAIR
-ft_signed_pair(sfnt* f)
-{
- int p = ft_unsigned_pair(f);
- if (p >= 0x8000U)
- p -= 0x10000U;
-
- return (SIGNED_PAIR)p;
-}
-
-UNSIGNED_QUAD
-ft_unsigned_quad(sfnt* f)
-{
- unsigned char buf[4];
- unsigned long length = 4;
-
- if (FT_Load_Sfnt_Table(f->ft_face, 0, f->loc, buf, &length) != 0)
- ERROR("sfnt: Freetype failure...");
- f->loc += 4;
-
- return ((unsigned long)buf[0] << 24) + ((unsigned long)buf[1] << 16)
- + ((unsigned long)buf[2] << 8) + (unsigned long)buf[3];
-}
-
-unsigned long
-ft_read(void* buf, unsigned long len, sfnt* f)
-{
- unsigned long length = len;
- if (FT_Load_Sfnt_Table(f->ft_face, 0, f->loc, buf, &length) != 0)
- ERROR("sfnt: Freetype failure...");
- f->loc += len;
-
- return length;
-}
-#endif
-
/*
* type:
* `true' (0x74727565): TrueType (Mac)
@@ -120,44 +48,6 @@ ft_read(void* buf, unsigned long len, sfnt* f)
#define SFNT_POSTSCRIPT 0x4f54544fUL
#define SFNT_TTC 0x74746366UL
-#ifdef XETEX
-sfnt *
-sfnt_open (FT_Face face, int accept_types)
-{
- sfnt *sfont;
- ULONG type;
-
- if (!face || !FT_IS_SFNT(face))
- return NULL;
-
- sfont = NEW(1, sfnt);
- sfont->ft_face = face;
- sfont->type = 0;
- sfont->loc = 0;
- sfont->offset = 0;
-
- type = sfnt_get_ulong(sfont);
-
- if (type == SFNT_TRUETYPE || type == SFNT_MAC_TRUE) {
- sfont->type = SFNT_TYPE_TRUETYPE;
- } else if (type == SFNT_OPENTYPE) {
- sfont->type = SFNT_TYPE_OPENTYPE;
- } else if (type == SFNT_POSTSCRIPT) {
- sfont->type = SFNT_TYPE_POSTSCRIPT;
- } else if (type == SFNT_TTC) {
- sfont->type = SFNT_TYPE_TTC;
- }
-
- if ((sfont->type & accept_types) == 0) {
- RELEASE(sfont);
- return NULL;
- }
-
- sfont->directory = NULL;
-
- return sfont;
-}
-#else /* not XETEX */
sfnt *
sfnt_open (FILE *fp)
{
@@ -248,7 +138,6 @@ dfont_open (FILE *fp, int index)
return sfont;
}
-#endif
static void
release_directory (struct sfnt_table_directory *td)
@@ -476,11 +365,7 @@ sfnt_read_table_directory (sfnt *sfont, ULONG offset)
sfont->directory = td = NEW (1, struct sfnt_table_directory);
-#ifdef XETEX
- ASSERT(sfont->ft_face);
-#else
ASSERT(sfont->stream);
-#endif
sfnt_seek_set(sfont, offset);
@@ -606,11 +491,7 @@ sfnt_create_FontFile_stream (sfnt *sfont)
offset += length;
}
if (!td->tables[i].data) {
-#ifdef XETEX
- if (!sfont->ft_face)
-#else
if (!sfont->stream)
-#endif
{
pdf_release_obj(stream);
ERROR("Font file not opened or already closed...");
diff --git a/Build/source/texk/dvipdfm-x/sfnt.h b/Build/source/texk/dvipdfm-x/sfnt.h
index b6de8760ad1..69271a229cd 100644
--- a/Build/source/texk/dvipdfm-x/sfnt.h
+++ b/Build/source/texk/dvipdfm-x/sfnt.h
@@ -25,12 +25,6 @@
#include "numbers.h"
#include "pdfobj.h"
-#ifdef XETEX
-#include "ft2build.h"
-#include FT_FREETYPE_H
-#include FT_TRUETYPE_TABLES_H
-#endif
-
/* Acoid conflict with CHAR from <winnt.h>. */
#define CHAR SFNT_CHAR
@@ -82,12 +76,7 @@ typedef struct
{
int type;
struct sfnt_table_directory *directory;
-#ifdef XETEX
- FT_Face ft_face;
- long loc;
-#else
FILE *stream;
-#endif
ULONG offset;
} sfnt;
@@ -95,24 +84,6 @@ typedef struct
#define fixed(a) ((double)((a)%0x10000L)/(double)(0x10000L) + \
(a)/0x10000L - (((a)/0x10000L > 0x7fffL) ? 0x10000L : 0))
-#ifdef XETEX
-UNSIGNED_BYTE ft_unsigned_byte(sfnt* f);
-SIGNED_BYTE ft_signed_byte(sfnt* f);
-UNSIGNED_PAIR ft_unsigned_pair(sfnt* f);
-SIGNED_PAIR ft_signed_pair(sfnt* f);
-UNSIGNED_QUAD ft_unsigned_quad(sfnt* f);
-unsigned long ft_read(void* buf, unsigned long len, sfnt* f);
-
-#define sfnt_get_byte(s) ((BYTE) ft_unsigned_byte(s))
-#define sfnt_get_char(s) ((CHAR) ft_signed_byte (s))
-#define sfnt_get_ushort(s) ((USHORT) ft_unsigned_pair(s))
-#define sfnt_get_short(s) ((SHORT) ft_signed_pair (s))
-#define sfnt_get_ulong(s) ((ULONG) ft_unsigned_quad(s))
-#define sfnt_get_long(s) ((LONG) ft_signed_quad (s))
-
-#define sfnt_seek_set(s,o) (s)->loc = (o)
-#define sfnt_read(b,l,s) ft_read((b), (l), (s))
-#else
/* get_***_*** from numbers.h */
#define sfnt_get_byte(s) ((BYTE) get_unsigned_byte((s)->stream))
#define sfnt_get_char(s) ((CHAR) get_signed_byte ((s)->stream))
@@ -123,7 +94,6 @@ unsigned long ft_read(void* buf, unsigned long len, sfnt* f);
#define sfnt_seek_set(s,o) seek_absolute((s)->stream, (o))
#define sfnt_read(b,l,s) fread((b), 1, (l), (s)->stream)
-#endif
extern int put_big_endian (void *s, LONG q, int n);
@@ -132,12 +102,8 @@ extern int put_big_endian (void *s, LONG q, int n);
#define sfnt_put_ulong(s,v) put_big_endian((s), v, 4);
#define sfnt_put_long(s,v) put_big_endian((s), v, 4);
-#ifdef XETEX
-extern sfnt *sfnt_open (FT_Face face, int accept_types);
-#else
extern sfnt *sfnt_open (FILE *fp);
extern sfnt *dfont_open (FILE *fp, int index);
-#endif
extern void sfnt_close (sfnt *sfont);
/* table directory */
diff --git a/Build/source/texk/dvipdfm-x/t1_load.c b/Build/source/texk/dvipdfm-x/t1_load.c
index b54df5462b4..d6c73578a01 100644
--- a/Build/source/texk/dvipdfm-x/t1_load.c
+++ b/Build/source/texk/dvipdfm-x/t1_load.c
@@ -634,10 +634,6 @@ parse_charstrings (cff_font *font,
charset->data.glyphs = NEW(count-1, s_SID);
memset(charset->data.glyphs, 0, sizeof(s_SID)*(count-1));
-#ifdef XETEX
- font->ft_to_gid = NEW(count, unsigned short);
-#endif
-
offset = 0;
have_notdef = 0; /* .notdef must be at gid = 0 in CFF */
@@ -675,9 +671,6 @@ parse_charstrings (cff_font *font,
RELEASE_TOK(tok);
return -1;
}
-#ifdef XETEX
- font->ft_to_gid[i] = gid;
-#endif
if (gid > 0)
charset->data.glyphs[gid-1] = cff_add_string(font, glyph_name, 0);
@@ -1131,11 +1124,7 @@ t1_get_fontname (FILE *fp, char *fontname)
static void
init_cff_font (cff_font *cff)
{
-#ifdef XETEX
- cff->sfont = NULL;
-#else
cff->stream = NULL;
-#endif
cff->filter = 0;
cff->fontname = NULL;
cff->index = 0;
@@ -1164,10 +1153,6 @@ init_cff_font (cff_font *cff)
cff->num_glyphs = 0;
cff->num_fds = 1;
cff->_string = cff_new_index(0);
-
-#ifdef XETEX
- cff->ft_to_gid = NULL;
-#endif
}
cff_font *
diff --git a/Build/source/texk/dvipdfm-x/truetype.c b/Build/source/texk/dvipdfm-x/truetype.c
index abb8dc21cc0..715b1d05077 100644
--- a/Build/source/texk/dvipdfm-x/truetype.c
+++ b/Build/source/texk/dvipdfm-x/truetype.c
@@ -75,11 +75,6 @@ pdf_font_open_truetype (pdf_font *font)
ASSERT( ident );
-#ifdef XETEX
- sfont = sfnt_open(pdf_font_get_ft_face(font), SFNT_TYPE_TTC | SFNT_TYPE_TRUETYPE);
- if (!sfont)
- return -1;
-#else
fp = DPXFOPEN(ident, DPX_RES_TYPE_TTFONT);
if (!fp) {
fp = DPXFOPEN(ident, DPX_RES_TYPE_DFONT);
@@ -88,7 +83,6 @@ pdf_font_open_truetype (pdf_font *font)
} else {
sfont = sfnt_open(fp);
}
-#endif
if (!sfont) {
WARN("Could not open TrueType font: %s", ident);
@@ -897,9 +891,6 @@ pdf_font_load_truetype (pdf_font *font)
verbose = pdf_font_get_verbose();
-#ifdef XETEX
- sfont = sfnt_open(pdf_font_get_ft_face(font), SFNT_TYPE_TTC | SFNT_TYPE_TRUETYPE);
-#else
fp = DPXFOPEN(ident, DPX_RES_TYPE_TTFONT);
if (!fp) {
fp = DPXFOPEN(ident, DPX_RES_TYPE_DFONT);
@@ -908,7 +899,6 @@ pdf_font_load_truetype (pdf_font *font)
} else {
sfont = sfnt_open(fp);
}
-#endif
if (!sfont) {
ERROR("Unable to open TrueType/dfont file: %s", ident);
diff --git a/Build/source/texk/dvipdfm-x/tt_aux.c b/Build/source/texk/dvipdfm-x/tt_aux.c
index a7663f0ec19..aba3b0cb108 100644
--- a/Build/source/texk/dvipdfm-x/tt_aux.c
+++ b/Build/source/texk/dvipdfm-x/tt_aux.c
@@ -45,13 +45,7 @@ ULONG ttc_read_offset (sfnt *sfont, int ttc_idx)
{
ULONG offset = 0, num_dirs = 0;
- if (sfont == NULL ||
-#ifdef XETEX
- sfont->ft_face == NULL
-#else
- sfont->stream == NULL
-#endif
- )
+ if (sfont == NULL || sfont->stream == NULL)
ERROR("file not opened");
if (sfont->type != SFNT_TYPE_TTC)
diff --git a/Build/source/texk/dvipdfm-x/tt_cmap.c b/Build/source/texk/dvipdfm-x/tt_cmap.c
index aa49979be6c..718e8586ae6 100644
--- a/Build/source/texk/dvipdfm-x/tt_cmap.c
+++ b/Build/source/texk/dvipdfm-x/tt_cmap.c
@@ -41,6 +41,7 @@
#include "tt_aux.h"
#include "tt_gsub.h"
+#include "tt_post.h"
#include "unicode.h"
#include "agl.h"
@@ -728,11 +729,7 @@ handle_CIDFont (sfnt *sfont,
if (num_glyphs < 1)
ERROR("No glyph contained in this font...");
-#ifdef XETEX
- cffont = cff_open(sfont, offset, 0);
-#else
cffont = cff_open(sfont->stream, offset, 0);
-#endif
if (!cffont)
ERROR("Could not open CFF font...");
@@ -837,13 +834,11 @@ handle_CIDFont (sfnt *sfont,
return 1;
}
-#ifdef XETEX
static int is_PUA_or_presentation (unsigned int uni)
{
return ((uni >= 0xE000 && uni <= 0xF8FF) || (uni >= 0xFB00 && uni <= 0xFB4F) ||
(uni >= 0xF0000 && uni <= 0xFFFFD) || (uni >= 0x100000 && uni <= 0x10FFFD));
}
-#endif
/*
* Substituted glyphs:
@@ -878,21 +873,21 @@ handle_subst_glyphs (CMap *cmap,
continue;
if (!cmap_add) {
-#ifdef XETEX
- if (FT_HAS_GLYPH_NAMES(sfont->ft_face)) {
+ struct tt_post_table *post;
+ post = tt_read_post_table(sfont);
+
+ if (post) {
/* JK: try to look up Unicode values from the glyph name... */
#define MAX_UNICODES 16
-#define MAX_NAME 256
- static char name[MAX_NAME] = "(none)";
+ char* name;
long unicodes[MAX_UNICODES];
int unicode_count = -1;
- FT_Error err = FT_Get_Glyph_Name(sfont->ft_face, gid, name, MAX_NAME);
- if (!err) {
+ name = tt_get_glyphname(post, gid);
+ if (name) {
unicode_count = agl_get_unicodes(name, unicodes, MAX_UNICODES);
}
#undef MAX_UNICODES
-#undef MAX_NAME
- if (unicode_count == -1) {
+ if (unicode_count == -1 && name) {
MESG("No Unicode mapping available: GID=%u, name=%s\n", gid, name);
} else {
/* the Unicode characters go into wbuf[2] and following, in UTF16BE */
@@ -907,10 +902,9 @@ handle_subst_glyphs (CMap *cmap,
wbuf[1] = gid & 0xff;
CMap_add_bfchar(cmap, wbuf, 2, wbuf + 2, len);
}
+ RELEASE(name);
+ tt_release_post_table(post);
}
-#else
- WARN("No Unicode mapping available: GID=%u", gid);
-#endif
} else {
wbuf[0] = (gid >> 8) & 0xff;
wbuf[1] = gid & 0xff;
@@ -995,14 +989,12 @@ create_ToUnicode_cmap4 (struct cmap4 *map,
CMap_add_bfchar(cmap, wbuf, 2, wbuf+2, 2);
-#ifdef XETEX
/* 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))
-#endif
/* Avoid duplicate entry
* There are problem when two Unicode code is mapped to
* single glyph...
@@ -1064,14 +1056,12 @@ create_ToUnicode_cmap12 (struct cmap12 *map,
CMap_add_bfchar(cmap, wbuf, 2, wbuf+2, len);
-#ifdef XETEX
/* 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))
-#endif
/* Avoid duplicate entry
* There are problem when two Unicode code is mapped to
* single glyph...
@@ -1110,9 +1100,6 @@ 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 */
-#ifdef XETEX
- FT_Face face,
-#endif
const char *used_glyphs)
{
pdf_obj *cmap_ref = NULL;
@@ -1154,9 +1141,6 @@ otf_create_ToUnicode_stream (const char *font_name,
MESG("otf_cmap>> Creating ToUnicode CMap for \"%s\"...\n", font_name);
}
-#ifdef XETEX
- sfont = sfnt_open(face, -1);
-#else
fp = DPXFOPEN(font_name, DPX_RES_TYPE_TTFONT);
if (!fp) {
fp = DPXFOPEN(font_name, DPX_RES_TYPE_OTFONT);
@@ -1168,7 +1152,6 @@ otf_create_ToUnicode_stream (const char *font_name,
}
sfont = sfnt_open(fp);
-#endif
if (!sfont) {
ERROR("Could not open OpenType/TrueType font file \"%s\"", font_name);
@@ -1720,10 +1703,6 @@ otf_load_Unicode_CMap (const char *map_name, int ttc_index, /* 0 for non-TTC fon
return -1; /* Sorry for this... */
}
-#ifdef XETEX
- fprintf(stderr, "otf_load_Unicode_CMap(%s, %d)\n", map_name, ttc_index);
- sfont = NULL; /* FIXME */
-#else
fp = DPXFOPEN(map_name, DPX_RES_TYPE_TTFONT);
if (!fp) {
fp = DPXFOPEN(map_name, DPX_RES_TYPE_OTFONT);
@@ -1735,7 +1714,6 @@ otf_load_Unicode_CMap (const char *map_name, int ttc_index, /* 0 for non-TTC fon
} else {
sfont = sfnt_open(fp);
}
-#endif
if (!sfont) {
ERROR("Could not open OpenType/TrueType/dfont font file \"%s\"", map_name);
diff --git a/Build/source/texk/dvipdfm-x/tt_cmap.h b/Build/source/texk/dvipdfm-x/tt_cmap.h
index 195dbde751d..7aefdbf0ffc 100644
--- a/Build/source/texk/dvipdfm-x/tt_cmap.h
+++ b/Build/source/texk/dvipdfm-x/tt_cmap.h
@@ -68,9 +68,6 @@ extern void tt_cmap_release (tt_cmap *cmap);
/* Indirect reference */
extern pdf_obj *otf_create_ToUnicode_stream (const char *map_name,
int ttc_index,
-#ifdef XETEX
- FT_Face face,
-#endif
const char *used_glyphs);
/* CMap ID */
extern int otf_load_Unicode_CMap (const char *map_name,
diff --git a/Build/source/texk/dvipdfm-x/tt_glyf.c b/Build/source/texk/dvipdfm-x/tt_glyf.c
index 34b532e8b7d..89aec5dae7e 100644
--- a/Build/source/texk/dvipdfm-x/tt_glyf.c
+++ b/Build/source/texk/dvipdfm-x/tt_glyf.c
@@ -215,13 +215,7 @@ tt_build_tables (sfnt *sfont, struct tt_glyphs *g)
ASSERT(g);
- if (sfont == NULL ||
-#ifdef XETEX
- sfont->ft_face == NULL
-#else
- sfont->stream == NULL
-#endif
- )
+ if (sfont == NULL || sfont->stream == NULL)
ERROR("File not opened.");
if (sfont->type != SFNT_TYPE_TRUETYPE &&
@@ -529,13 +523,7 @@ tt_get_metrics (sfnt *sfont, struct tt_glyphs *g)
ASSERT(g);
- if (sfont == NULL ||
-#ifdef XETEX
- sfont->ft_face == NULL
-#else
- sfont->stream == NULL
-#endif
- )
+ if (sfont == NULL || sfont->stream == NULL)
ERROR("File not opened.");
if (sfont->type != SFNT_TYPE_TRUETYPE &&
diff --git a/Build/source/texk/dvipdfm-x/tt_gsub.c b/Build/source/texk/dvipdfm-x/tt_gsub.c
index a248419f1bd..347c3b25163 100644
--- a/Build/source/texk/dvipdfm-x/tt_gsub.c
+++ b/Build/source/texk/dvipdfm-x/tt_gsub.c
@@ -505,11 +505,7 @@ otl_gsub_read_single (struct otl_gsub_subtab *subtab, sfnt *sfont)
ASSERT(subtab && sfont);
-#ifdef XETEX
- offset = sfont->loc;
-#else
offset = tell_position(sfont->stream);
-#endif
subtab->LookupType = OTL_GSUB_TYPE_SINGLE;
subtab->SubstFormat = sfnt_get_ushort(sfont);
@@ -568,11 +564,7 @@ otl_gsub_read_alternate (struct otl_gsub_subtab *subtab, sfnt *sfont)
ASSERT(subtab && sfont);
-#ifdef XETEX
- offset = sfont->loc;
-#else
offset = tell_position(sfont->stream);
-#endif
subtab->LookupType = OTL_GSUB_TYPE_ALTERNATE;
subtab->SubstFormat = sfnt_get_ushort(sfont); /* Must be 1 */
@@ -639,11 +631,7 @@ otl_gsub_read_ligature (struct otl_gsub_subtab *subtab, sfnt *sfont)
ASSERT(subtab && sfont);
-#ifdef XETEX
- offset = sfont->loc;
-#else
offset = tell_position(sfont->stream);
-#endif
subtab->LookupType = OTL_GSUB_TYPE_LIGATURE;
subtab->SubstFormat = sfnt_get_ushort(sfont); /* Must be 1 */
diff --git a/Build/source/texk/dvipdfm-x/tt_post.c b/Build/source/texk/dvipdfm-x/tt_post.c
index 9b122412091..8c7c165606d 100644
--- a/Build/source/texk/dvipdfm-x/tt_post.c
+++ b/Build/source/texk/dvipdfm-x/tt_post.c
@@ -171,6 +171,14 @@ tt_lookup_post_table (struct tt_post_table *post, const char *glyphname)
return 0;
}
+char*
+tt_get_glyphname (struct tt_post_table *post, USHORT gid)
+{
+ if (gid < post->count)
+ return xstrdup(post->glyphNamePtr[gid]);
+ return NULL;
+}
+
void
tt_release_post_table (struct tt_post_table *post)
{
diff --git a/Build/source/texk/dvipdfm-x/tt_post.h b/Build/source/texk/dvipdfm-x/tt_post.h
index b9ab91bba6a..1369f868ee1 100644
--- a/Build/source/texk/dvipdfm-x/tt_post.h
+++ b/Build/source/texk/dvipdfm-x/tt_post.h
@@ -47,5 +47,6 @@ extern struct tt_post_table *tt_read_post_table (sfnt *sfont);
extern void tt_release_post_table (struct tt_post_table *post);
extern USHORT tt_lookup_post_table (struct tt_post_table *post, const char *glyphname);
+extern char* tt_get_glyphname (struct tt_post_table *post, USHORT gid);
#endif /* _TT_POST_H_ */
diff --git a/Build/source/texk/dvipdfm-x/tt_table.c b/Build/source/texk/dvipdfm-x/tt_table.c
index 0fa1ad77b71..65470c9fdb2 100644
--- a/Build/source/texk/dvipdfm-x/tt_table.c
+++ b/Build/source/texk/dvipdfm-x/tt_table.c
@@ -476,19 +476,6 @@ tt_get_ps_fontname (sfnt *sfont, char *dest, USHORT destlen)
{
USHORT namelen = 0;
-#ifdef XETEX
-
- const char* name = FT_Get_Postscript_Name(sfont->ft_face);
- namelen = strlen(name);
- if (namelen > destlen - 1) {
- strncpy(dest, name, destlen - 1);
- dest[destlen] = 0;
- }
- else
- strcpy(dest, name);
-
-#else
-
/* First try Mac-Roman PS name and then Win-Unicode PS name */
if ((namelen = tt_get_name(sfont, dest, destlen, 1, 0, 0, 6)) != 0 ||
(namelen = tt_get_name(sfont, dest, destlen, 3, 1, 0x409u, 6)) != 0 ||
@@ -509,7 +496,5 @@ tt_get_ps_fontname (sfnt *sfont, char *dest, USHORT destlen)
namelen = tt_get_name(sfont, dest, destlen, 1, 0, 0, 1);
}
-#endif
-
return namelen;
}
diff --git a/Build/source/texk/dvipdfm-x/type0.c b/Build/source/texk/dvipdfm-x/type0.c
index 3238b0949d7..ec195772c08 100644
--- a/Build/source/texk/dvipdfm-x/type0.c
+++ b/Build/source/texk/dvipdfm-x/type0.c
@@ -199,18 +199,12 @@ add_ToUnicode (Type0Font *font)
/* PLEASE FIX THIS */
tounicode = otf_create_ToUnicode_stream(CIDFont_get_ident(cidfont),
CIDFont_get_opt_index(cidfont),
-#ifdef XETEX
- CIDFont_get_ft_face(cidfont),
-#endif
Type0Font_get_usedchars(font));
break;
default:
if (CIDFont_get_flag(cidfont, CIDFONT_FLAG_TYPE1C)) { /* FIXME */
tounicode = otf_create_ToUnicode_stream(CIDFont_get_ident(cidfont),
CIDFont_get_opt_index(cidfont),
-#ifdef XETEX
- CIDFont_get_ft_face(cidfont),
-#endif
Type0Font_get_usedchars(font));
} else if (CIDFont_get_flag(cidfont, CIDFONT_FLAG_TYPE1)) { /* FIXME */
/* Font loader will create ToUnicode and set. */
@@ -365,14 +359,6 @@ Type0Font_cache_get (int id)
return &__cache.fonts[id];
}
-#ifdef XETEX
-unsigned short*
-Type0Font_get_ft_to_gid(int id)
-{
- return CIDFont_get_ft_to_gid(Type0Font_cache_get(id)->descendant);
-}
-#endif
-
int
Type0Font_cache_find (const char *map_name, int cmap_id, fontmap_opt *fmap_opt)
{
diff --git a/Build/source/texk/dvipdfm-x/type0.h b/Build/source/texk/dvipdfm-x/type0.h
index 6b8fa1d1c39..817f65d9afd 100644
--- a/Build/source/texk/dvipdfm-x/type0.h
+++ b/Build/source/texk/dvipdfm-x/type0.h
@@ -44,8 +44,6 @@ extern void Type0Font_set_ToUnicode (Type0Font *font, pdf_obj *cmap_ref);
extern int pdf_font_findfont0 (const char *font_name,
int cmap_id, fontmap_opt *fmap_opt);
-extern unsigned short *Type0Font_get_ft_to_gid(int id);
-
/******************************** CACHE ********************************/
extern void Type0Font_cache_init (void);
diff --git a/Build/source/texk/dvipdfm-x/type1c.c b/Build/source/texk/dvipdfm-x/type1c.c
index 23dc7b68d4c..0f71630a005 100644
--- a/Build/source/texk/dvipdfm-x/type1c.c
+++ b/Build/source/texk/dvipdfm-x/type1c.c
@@ -68,9 +68,7 @@ int
pdf_font_open_type1c (pdf_font *font)
{
char *fontname;
-#ifndef XETEX
char *ident;
-#endif
FILE *fp = NULL;
sfnt *sfont;
cff_font *cffont;
@@ -80,23 +78,14 @@ pdf_font_open_type1c (pdf_font *font)
ASSERT(font);
-#ifndef XETEX
- ident =
-#endif
- pdf_font_get_ident (font);
+ ident = pdf_font_get_ident (font);
encoding_id = pdf_font_get_encoding(font);
-#ifdef XETEX
- sfont = sfnt_open(pdf_font_get_ft_face(font), SFNT_TYPE_POSTSCRIPT);
- if (!sfont)
- return -1;
-#else
fp = DPXFOPEN(ident, DPX_RES_TYPE_OTFONT);
if (!fp)
return -1;
sfont = sfnt_open(fp);
-#endif
if (!sfont ||
sfont->type != SFNT_TYPE_POSTSCRIPT ||
sfnt_read_table_directory(sfont, 0) < 0) {
@@ -108,11 +97,7 @@ pdf_font_open_type1c (pdf_font *font)
ERROR("No \"CFF \" table found; not a CFF/OpenType font (10)?");
}
-#ifdef XETEX
- cffont = cff_open(sfont, offset, 0);
-#else
cffont = cff_open(sfont->stream, offset, 0);
-#endif
if (!cffont) {
ERROR("Could not read CFF font data");
}
@@ -291,16 +276,12 @@ pdf_font_load_type1c (pdf_font *font)
descriptor = pdf_font_get_descriptor(font);
encoding_id = pdf_font_get_encoding (font);
-#ifdef XETEX
- sfont = sfnt_open(pdf_font_get_ft_face(font), SFNT_TYPE_POSTSCRIPT);
-#else
fp = DPXFOPEN(ident, DPX_RES_TYPE_OTFONT);
if (!fp) {
ERROR("Could not open OpenType font: %s", ident);
}
sfont = sfnt_open(fp);
-#endif
if (!sfont) {
ERROR("Could not open OpenType font: %s", ident);
}
@@ -312,11 +293,7 @@ pdf_font_load_type1c (pdf_font *font)
ERROR("Not a CFF/OpenType font (11)?");
}
-#ifdef XETEX
- cffont = cff_open(sfont, offset, 0);
-#else
cffont = cff_open(fp, offset, 0);
-#endif
if (!cffont) {
ERROR("Could not open CFF font.");
}