summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2013-10-01 11:07:43 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2013-10-01 11:07:43 +0000
commit6eb2ddd9bea7ebbf783ffc2b4948e07218437255 (patch)
treecb98ca18fb4e1af2b30f4aed094c15b1a29e98af
parent508eb38cd382a3545f29854b0855375399c08631 (diff)
dvipdfm-x: Reduce dvipdfmx/xdvipdfmx diffs
git-svn-id: svn://tug.org/texlive/trunk@31804 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/dvipdfm-x/ChangeLog16
-rw-r--r--Build/source/texk/dvipdfm-x/Makefile.am16
-rw-r--r--Build/source/texk/dvipdfm-x/Makefile.in179
-rw-r--r--Build/source/texk/dvipdfm-x/aclocal.m41
-rwxr-xr-xBuild/source/texk/dvipdfm-x/configure148
-rw-r--r--Build/source/texk/dvipdfm-x/configure.ac5
-rw-r--r--Build/source/texk/dvipdfm-x/epdf.c6
-rw-r--r--Build/source/texk/dvipdfm-x/pdfdraw.c2
-rw-r--r--Build/source/texk/dvipdfm-x/pdfobj.c2
-rw-r--r--Build/source/texk/dvipdfm-x/pdfximage.c2
-rw-r--r--Build/source/texk/dvipdfm-x/spc_color.c6
-rw-r--r--Build/source/texk/dvipdfm-x/spc_dvips.c28
-rw-r--r--Build/source/texk/dvipdfm-x/spc_pdfm.c48
-rw-r--r--Build/source/texk/dvipdfm-x/specials.c4
14 files changed, 71 insertions, 392 deletions
diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog
index 9da366361d4..2f51b1142c0 100644
--- a/Build/source/texk/dvipdfm-x/ChangeLog
+++ b/Build/source/texk/dvipdfm-x/ChangeLog
@@ -1,7 +1,21 @@
+2013-09-30 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * configure.ac: Drop the useless KPSE_LT_HACK.
+ Drop the redundant AC_HEADER_STDC and check for mkstemp.
+
+2013-09-26 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * epdf.c, pdfdraw.c, pdfobj.c, pdfximage.c, spc_color.c,
+ spc_color.c, specials.c: These files are now identical for dvipdfmx
+ and xdvipdfmx and are part of libutil.a.
+ * Makefile.am: Adapted.
+
+ * spc_pdfm.c: Reduced dvipdfmx/xdvipdfmx diffs.
+
2013-09-26 Peter Breitenlohner <peb@mppmu.mpg.de>
* bmpimage.c, dpxfile.c, pdfparse.c, spc_html.c, spc_tpic.c:
- These files are now identical for dvipdfmx and xdvipdfmx, now
+ These files are now identical for dvipdfmx and xdvipdfmx and are
part of libutil.a.
* Makefile.am: Adapted.
diff --git a/Build/source/texk/dvipdfm-x/Makefile.am b/Build/source/texk/dvipdfm-x/Makefile.am
index 38186062385..007a076b288 100644
--- a/Build/source/texk/dvipdfm-x/Makefile.am
+++ b/Build/source/texk/dvipdfm-x/Makefile.am
@@ -54,6 +54,7 @@ libutil_a_SOURCES = \
dvi.h \
dvicodes.h \
dvipdfmx.h \
+ epdf.c \
epdf.h \
error.c \
error.h \
@@ -74,6 +75,7 @@ libutil_a_SOURCES = \
pdfcolor.h \
pdfdev.h \
pdfdoc.h \
+ pdfdraw.c \
pdfdraw.h \
pdfencrypt.c \
pdfencrypt.h \
@@ -81,11 +83,13 @@ libutil_a_SOURCES = \
pdfencoding.h \
pdflimits.h \
pdfnames.h \
+ pdfobj.c \
pdfobj.h \
pdfparse.c \
pdfparse.h \
pdfresource.c \
pdfresource.h \
+ pdfximage.c \
pdfximage.h \
pkfont.h \
pngimage.c \
@@ -94,7 +98,9 @@ libutil_a_SOURCES = \
pst.h \
pst_obj.c \
pst_obj.h \
+ spc_color.c \
spc_color.h \
+ spc_dvips.c \
spc_dvips.h \
spc_html.c \
spc_html.h \
@@ -105,6 +111,8 @@ libutil_a_SOURCES = \
spc_tpic.h \
spc_util.h \
spc_util.c \
+ spc_xtx.h \
+ specials.c \
specials.h \
subfont.c \
subfont.h \
@@ -141,27 +149,19 @@ dvipdfmx_SOURCES = \
cmap_read.c \
dvi.c \
dvipdfmx.c \
- epdf.c \
fontmap.c \
fontmap.h \
mpost.c \
pdfdev.c \
pdfdoc.c \
- pdfdraw.c \
pdffont.c \
pdffont.h \
pdfnames.c \
- pdfobj.c \
- pdfximage.c \
pkfont.c \
sfnt.c \
sfnt.h \
- spc_color.c \
- spc_dvips.c \
spc_pdfm.c \
spc_xtx.c \
- spc_xtx.h \
- specials.c \
t1_char.c \
t1_load.c \
truetype.c \
diff --git a/Build/source/texk/dvipdfm-x/Makefile.in b/Build/source/texk/dvipdfm-x/Makefile.in
index 38c76c7ec35..48beb03f7b0 100644
--- a/Build/source/texk/dvipdfm-x/Makefile.in
+++ b/Build/source/texk/dvipdfm-x/Makefile.in
@@ -121,7 +121,6 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
$(top_srcdir)/../../m4/kpse-libpaper.m4 \
$(top_srcdir)/../../m4/kpse-libpng-flags.m4 \
- $(top_srcdir)/../../m4/kpse-lt-hack.m4 \
$(top_srcdir)/../../m4/kpse-warnings.m4 \
$(top_srcdir)/../../m4/kpse-win32.m4 \
$(top_srcdir)/../../m4/kpse-zlib-flags.m4 \
@@ -149,15 +148,17 @@ libutil_a_LIBADD =
am_libutil_a_OBJECTS = agl.$(OBJEXT) bmpimage.$(OBJEXT) \
cidtype0.$(OBJEXT) cmap_write.$(OBJEXT) cs_type2.$(OBJEXT) \
dpxconf.$(OBJEXT) dpxcrypt.$(OBJEXT) dpxfile.$(OBJEXT) \
- dpxutil.$(OBJEXT) error.$(OBJEXT) jpegimage.$(OBJEXT) \
- mem.$(OBJEXT) mfileio.$(OBJEXT) numbers.$(OBJEXT) \
- otl_conf.$(OBJEXT) otl_opt.$(OBJEXT) pdfcolor.$(OBJEXT) \
- pdfencrypt.$(OBJEXT) pdfencoding.$(OBJEXT) pdfparse.$(OBJEXT) \
- pdfresource.$(OBJEXT) pngimage.$(OBJEXT) pst.$(OBJEXT) \
- pst_obj.$(OBJEXT) spc_html.$(OBJEXT) spc_misc.$(OBJEXT) \
- spc_tpic.$(OBJEXT) spc_util.$(OBJEXT) subfont.$(OBJEXT) \
- tfm.$(OBJEXT) type1c.$(OBJEXT) unicode.$(OBJEXT) vf.$(OBJEXT) \
- xbb.$(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) 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)
@@ -175,16 +176,14 @@ am__v_lt_0 = --silent
am__v_lt_1 =
am_dvipdfmx_OBJECTS = cff.$(OBJEXT) cff_dict.$(OBJEXT) cid.$(OBJEXT) \
cidtype2.$(OBJEXT) cmap.$(OBJEXT) cmap_read.$(OBJEXT) \
- dvi.$(OBJEXT) dvipdfmx.$(OBJEXT) epdf.$(OBJEXT) \
- fontmap.$(OBJEXT) mpost.$(OBJEXT) pdfdev.$(OBJEXT) \
- pdfdoc.$(OBJEXT) pdfdraw.$(OBJEXT) pdffont.$(OBJEXT) \
- pdfnames.$(OBJEXT) pdfobj.$(OBJEXT) pdfximage.$(OBJEXT) \
- pkfont.$(OBJEXT) sfnt.$(OBJEXT) spc_color.$(OBJEXT) \
- spc_dvips.$(OBJEXT) spc_pdfm.$(OBJEXT) spc_xtx.$(OBJEXT) \
- specials.$(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)
+ 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)
dvipdfmx_OBJECTS = $(am_dvipdfmx_OBJECTS)
am__DEPENDENCIES_1 =
dvipdfmx_DEPENDENCIES = libutil.a $(am__DEPENDENCIES_1) \
@@ -194,20 +193,17 @@ am__objects_1 = xdvipdfmx-cff.$(OBJEXT) xdvipdfmx-cff_dict.$(OBJEXT) \
xdvipdfmx-cid.$(OBJEXT) xdvipdfmx-cidtype2.$(OBJEXT) \
xdvipdfmx-cmap.$(OBJEXT) xdvipdfmx-cmap_read.$(OBJEXT) \
xdvipdfmx-dvi.$(OBJEXT) xdvipdfmx-dvipdfmx.$(OBJEXT) \
- xdvipdfmx-epdf.$(OBJEXT) xdvipdfmx-fontmap.$(OBJEXT) \
- xdvipdfmx-mpost.$(OBJEXT) xdvipdfmx-pdfdev.$(OBJEXT) \
- xdvipdfmx-pdfdoc.$(OBJEXT) xdvipdfmx-pdfdraw.$(OBJEXT) \
+ xdvipdfmx-fontmap.$(OBJEXT) xdvipdfmx-mpost.$(OBJEXT) \
+ xdvipdfmx-pdfdev.$(OBJEXT) xdvipdfmx-pdfdoc.$(OBJEXT) \
xdvipdfmx-pdffont.$(OBJEXT) xdvipdfmx-pdfnames.$(OBJEXT) \
- xdvipdfmx-pdfobj.$(OBJEXT) xdvipdfmx-pdfximage.$(OBJEXT) \
xdvipdfmx-pkfont.$(OBJEXT) xdvipdfmx-sfnt.$(OBJEXT) \
- xdvipdfmx-spc_color.$(OBJEXT) xdvipdfmx-spc_dvips.$(OBJEXT) \
xdvipdfmx-spc_pdfm.$(OBJEXT) xdvipdfmx-spc_xtx.$(OBJEXT) \
- xdvipdfmx-specials.$(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-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)
nodist_xdvipdfmx_OBJECTS = $(am__objects_1)
xdvipdfmx_OBJECTS = $(nodist_xdvipdfmx_OBJECTS)
am__DEPENDENCIES_2 = libutil.a $(am__DEPENDENCIES_1) \
@@ -673,6 +669,7 @@ libutil_a_SOURCES = \
dvi.h \
dvicodes.h \
dvipdfmx.h \
+ epdf.c \
epdf.h \
error.c \
error.h \
@@ -693,6 +690,7 @@ libutil_a_SOURCES = \
pdfcolor.h \
pdfdev.h \
pdfdoc.h \
+ pdfdraw.c \
pdfdraw.h \
pdfencrypt.c \
pdfencrypt.h \
@@ -700,11 +698,13 @@ libutil_a_SOURCES = \
pdfencoding.h \
pdflimits.h \
pdfnames.h \
+ pdfobj.c \
pdfobj.h \
pdfparse.c \
pdfparse.h \
pdfresource.c \
pdfresource.h \
+ pdfximage.c \
pdfximage.h \
pkfont.h \
pngimage.c \
@@ -713,7 +713,9 @@ libutil_a_SOURCES = \
pst.h \
pst_obj.c \
pst_obj.h \
+ spc_color.c \
spc_color.h \
+ spc_dvips.c \
spc_dvips.h \
spc_html.c \
spc_html.h \
@@ -724,6 +726,8 @@ libutil_a_SOURCES = \
spc_tpic.h \
spc_util.h \
spc_util.c \
+ spc_xtx.h \
+ specials.c \
specials.h \
subfont.c \
subfont.h \
@@ -760,27 +764,19 @@ dvipdfmx_SOURCES = \
cmap_read.c \
dvi.c \
dvipdfmx.c \
- epdf.c \
fontmap.c \
fontmap.h \
mpost.c \
pdfdev.c \
pdfdoc.c \
- pdfdraw.c \
pdffont.c \
pdffont.h \
pdfnames.c \
- pdfobj.c \
- pdfximage.c \
pkfont.c \
sfnt.c \
sfnt.h \
- spc_color.c \
- spc_dvips.c \
spc_pdfm.c \
spc_xtx.c \
- spc_xtx.h \
- specials.c \
t1_char.c \
t1_load.c \
truetype.c \
@@ -1082,23 +1078,16 @@ distclean-compile:
@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@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdvipdfmx-dvipdfmx.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdvipdfmx-epdf.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdvipdfmx-fontmap.Po@am__quote@
@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-pdfdraw.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-pdfobj.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdvipdfmx-pdfximage.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_color.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdvipdfmx-spc_dvips.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-specials.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@
@@ -1261,20 +1250,6 @@ xdvipdfmx-dvipdfmx.obj: dvipdfmx.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-dvipdfmx.obj `if test -f 'dvipdfmx.c'; then $(CYGPATH_W) 'dvipdfmx.c'; else $(CYGPATH_W) '$(srcdir)/dvipdfmx.c'; fi`
-xdvipdfmx-epdf.o: epdf.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xdvipdfmx-epdf.o -MD -MP -MF $(DEPDIR)/xdvipdfmx-epdf.Tpo -c -o xdvipdfmx-epdf.o `test -f 'epdf.c' || echo '$(srcdir)/'`epdf.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xdvipdfmx-epdf.Tpo $(DEPDIR)/xdvipdfmx-epdf.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='epdf.c' object='xdvipdfmx-epdf.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-epdf.o `test -f 'epdf.c' || echo '$(srcdir)/'`epdf.c
-
-xdvipdfmx-epdf.obj: epdf.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xdvipdfmx-epdf.obj -MD -MP -MF $(DEPDIR)/xdvipdfmx-epdf.Tpo -c -o xdvipdfmx-epdf.obj `if test -f 'epdf.c'; then $(CYGPATH_W) 'epdf.c'; else $(CYGPATH_W) '$(srcdir)/epdf.c'; fi`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xdvipdfmx-epdf.Tpo $(DEPDIR)/xdvipdfmx-epdf.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='epdf.c' object='xdvipdfmx-epdf.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-epdf.obj `if test -f 'epdf.c'; then $(CYGPATH_W) 'epdf.c'; else $(CYGPATH_W) '$(srcdir)/epdf.c'; fi`
-
xdvipdfmx-fontmap.o: fontmap.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xdvipdfmx-fontmap.o -MD -MP -MF $(DEPDIR)/xdvipdfmx-fontmap.Tpo -c -o xdvipdfmx-fontmap.o `test -f 'fontmap.c' || echo '$(srcdir)/'`fontmap.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xdvipdfmx-fontmap.Tpo $(DEPDIR)/xdvipdfmx-fontmap.Po
@@ -1331,20 +1306,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-pdfdraw.o: pdfdraw.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xdvipdfmx-pdfdraw.o -MD -MP -MF $(DEPDIR)/xdvipdfmx-pdfdraw.Tpo -c -o xdvipdfmx-pdfdraw.o `test -f 'pdfdraw.c' || echo '$(srcdir)/'`pdfdraw.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xdvipdfmx-pdfdraw.Tpo $(DEPDIR)/xdvipdfmx-pdfdraw.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pdfdraw.c' object='xdvipdfmx-pdfdraw.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-pdfdraw.o `test -f 'pdfdraw.c' || echo '$(srcdir)/'`pdfdraw.c
-
-xdvipdfmx-pdfdraw.obj: pdfdraw.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xdvipdfmx-pdfdraw.obj -MD -MP -MF $(DEPDIR)/xdvipdfmx-pdfdraw.Tpo -c -o xdvipdfmx-pdfdraw.obj `if test -f 'pdfdraw.c'; then $(CYGPATH_W) 'pdfdraw.c'; else $(CYGPATH_W) '$(srcdir)/pdfdraw.c'; fi`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xdvipdfmx-pdfdraw.Tpo $(DEPDIR)/xdvipdfmx-pdfdraw.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pdfdraw.c' object='xdvipdfmx-pdfdraw.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-pdfdraw.obj `if test -f 'pdfdraw.c'; then $(CYGPATH_W) 'pdfdraw.c'; else $(CYGPATH_W) '$(srcdir)/pdfdraw.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
@@ -1373,34 +1334,6 @@ xdvipdfmx-pdfnames.obj: pdfnames.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-pdfnames.obj `if test -f 'pdfnames.c'; then $(CYGPATH_W) 'pdfnames.c'; else $(CYGPATH_W) '$(srcdir)/pdfnames.c'; fi`
-xdvipdfmx-pdfobj.o: pdfobj.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xdvipdfmx-pdfobj.o -MD -MP -MF $(DEPDIR)/xdvipdfmx-pdfobj.Tpo -c -o xdvipdfmx-pdfobj.o `test -f 'pdfobj.c' || echo '$(srcdir)/'`pdfobj.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xdvipdfmx-pdfobj.Tpo $(DEPDIR)/xdvipdfmx-pdfobj.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pdfobj.c' object='xdvipdfmx-pdfobj.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-pdfobj.o `test -f 'pdfobj.c' || echo '$(srcdir)/'`pdfobj.c
-
-xdvipdfmx-pdfobj.obj: pdfobj.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xdvipdfmx-pdfobj.obj -MD -MP -MF $(DEPDIR)/xdvipdfmx-pdfobj.Tpo -c -o xdvipdfmx-pdfobj.obj `if test -f 'pdfobj.c'; then $(CYGPATH_W) 'pdfobj.c'; else $(CYGPATH_W) '$(srcdir)/pdfobj.c'; fi`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xdvipdfmx-pdfobj.Tpo $(DEPDIR)/xdvipdfmx-pdfobj.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pdfobj.c' object='xdvipdfmx-pdfobj.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-pdfobj.obj `if test -f 'pdfobj.c'; then $(CYGPATH_W) 'pdfobj.c'; else $(CYGPATH_W) '$(srcdir)/pdfobj.c'; fi`
-
-xdvipdfmx-pdfximage.o: pdfximage.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xdvipdfmx-pdfximage.o -MD -MP -MF $(DEPDIR)/xdvipdfmx-pdfximage.Tpo -c -o xdvipdfmx-pdfximage.o `test -f 'pdfximage.c' || echo '$(srcdir)/'`pdfximage.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xdvipdfmx-pdfximage.Tpo $(DEPDIR)/xdvipdfmx-pdfximage.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pdfximage.c' object='xdvipdfmx-pdfximage.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-pdfximage.o `test -f 'pdfximage.c' || echo '$(srcdir)/'`pdfximage.c
-
-xdvipdfmx-pdfximage.obj: pdfximage.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xdvipdfmx-pdfximage.obj -MD -MP -MF $(DEPDIR)/xdvipdfmx-pdfximage.Tpo -c -o xdvipdfmx-pdfximage.obj `if test -f 'pdfximage.c'; then $(CYGPATH_W) 'pdfximage.c'; else $(CYGPATH_W) '$(srcdir)/pdfximage.c'; fi`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xdvipdfmx-pdfximage.Tpo $(DEPDIR)/xdvipdfmx-pdfximage.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pdfximage.c' object='xdvipdfmx-pdfximage.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-pdfximage.obj `if test -f 'pdfximage.c'; then $(CYGPATH_W) 'pdfximage.c'; else $(CYGPATH_W) '$(srcdir)/pdfximage.c'; fi`
-
xdvipdfmx-pkfont.o: pkfont.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xdvipdfmx-pkfont.o -MD -MP -MF $(DEPDIR)/xdvipdfmx-pkfont.Tpo -c -o xdvipdfmx-pkfont.o `test -f 'pkfont.c' || echo '$(srcdir)/'`pkfont.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xdvipdfmx-pkfont.Tpo $(DEPDIR)/xdvipdfmx-pkfont.Po
@@ -1429,34 +1362,6 @@ xdvipdfmx-sfnt.obj: sfnt.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-sfnt.obj `if test -f 'sfnt.c'; then $(CYGPATH_W) 'sfnt.c'; else $(CYGPATH_W) '$(srcdir)/sfnt.c'; fi`
-xdvipdfmx-spc_color.o: spc_color.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xdvipdfmx-spc_color.o -MD -MP -MF $(DEPDIR)/xdvipdfmx-spc_color.Tpo -c -o xdvipdfmx-spc_color.o `test -f 'spc_color.c' || echo '$(srcdir)/'`spc_color.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xdvipdfmx-spc_color.Tpo $(DEPDIR)/xdvipdfmx-spc_color.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='spc_color.c' object='xdvipdfmx-spc_color.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-spc_color.o `test -f 'spc_color.c' || echo '$(srcdir)/'`spc_color.c
-
-xdvipdfmx-spc_color.obj: spc_color.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xdvipdfmx-spc_color.obj -MD -MP -MF $(DEPDIR)/xdvipdfmx-spc_color.Tpo -c -o xdvipdfmx-spc_color.obj `if test -f 'spc_color.c'; then $(CYGPATH_W) 'spc_color.c'; else $(CYGPATH_W) '$(srcdir)/spc_color.c'; fi`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xdvipdfmx-spc_color.Tpo $(DEPDIR)/xdvipdfmx-spc_color.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='spc_color.c' object='xdvipdfmx-spc_color.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-spc_color.obj `if test -f 'spc_color.c'; then $(CYGPATH_W) 'spc_color.c'; else $(CYGPATH_W) '$(srcdir)/spc_color.c'; fi`
-
-xdvipdfmx-spc_dvips.o: spc_dvips.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xdvipdfmx-spc_dvips.o -MD -MP -MF $(DEPDIR)/xdvipdfmx-spc_dvips.Tpo -c -o xdvipdfmx-spc_dvips.o `test -f 'spc_dvips.c' || echo '$(srcdir)/'`spc_dvips.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xdvipdfmx-spc_dvips.Tpo $(DEPDIR)/xdvipdfmx-spc_dvips.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='spc_dvips.c' object='xdvipdfmx-spc_dvips.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-spc_dvips.o `test -f 'spc_dvips.c' || echo '$(srcdir)/'`spc_dvips.c
-
-xdvipdfmx-spc_dvips.obj: spc_dvips.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xdvipdfmx-spc_dvips.obj -MD -MP -MF $(DEPDIR)/xdvipdfmx-spc_dvips.Tpo -c -o xdvipdfmx-spc_dvips.obj `if test -f 'spc_dvips.c'; then $(CYGPATH_W) 'spc_dvips.c'; else $(CYGPATH_W) '$(srcdir)/spc_dvips.c'; fi`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xdvipdfmx-spc_dvips.Tpo $(DEPDIR)/xdvipdfmx-spc_dvips.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='spc_dvips.c' object='xdvipdfmx-spc_dvips.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-spc_dvips.obj `if test -f 'spc_dvips.c'; then $(CYGPATH_W) 'spc_dvips.c'; else $(CYGPATH_W) '$(srcdir)/spc_dvips.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
@@ -1485,20 +1390,6 @@ xdvipdfmx-spc_xtx.obj: spc_xtx.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-spc_xtx.obj `if test -f 'spc_xtx.c'; then $(CYGPATH_W) 'spc_xtx.c'; else $(CYGPATH_W) '$(srcdir)/spc_xtx.c'; fi`
-xdvipdfmx-specials.o: specials.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xdvipdfmx-specials.o -MD -MP -MF $(DEPDIR)/xdvipdfmx-specials.Tpo -c -o xdvipdfmx-specials.o `test -f 'specials.c' || echo '$(srcdir)/'`specials.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xdvipdfmx-specials.Tpo $(DEPDIR)/xdvipdfmx-specials.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='specials.c' object='xdvipdfmx-specials.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-specials.o `test -f 'specials.c' || echo '$(srcdir)/'`specials.c
-
-xdvipdfmx-specials.obj: specials.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xdvipdfmx-specials.obj -MD -MP -MF $(DEPDIR)/xdvipdfmx-specials.Tpo -c -o xdvipdfmx-specials.obj `if test -f 'specials.c'; then $(CYGPATH_W) 'specials.c'; else $(CYGPATH_W) '$(srcdir)/specials.c'; fi`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xdvipdfmx-specials.Tpo $(DEPDIR)/xdvipdfmx-specials.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='specials.c' object='xdvipdfmx-specials.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-specials.obj `if test -f 'specials.c'; then $(CYGPATH_W) 'specials.c'; else $(CYGPATH_W) '$(srcdir)/specials.c'; fi`
-
xdvipdfmx-t1_char.o: t1_char.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xdvipdfmx-t1_char.o -MD -MP -MF $(DEPDIR)/xdvipdfmx-t1_char.Tpo -c -o xdvipdfmx-t1_char.o `test -f 't1_char.c' || echo '$(srcdir)/'`t1_char.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xdvipdfmx-t1_char.Tpo $(DEPDIR)/xdvipdfmx-t1_char.Po
diff --git a/Build/source/texk/dvipdfm-x/aclocal.m4 b/Build/source/texk/dvipdfm-x/aclocal.m4
index a0babfe9e96..c1337a226aa 100644
--- a/Build/source/texk/dvipdfm-x/aclocal.m4
+++ b/Build/source/texk/dvipdfm-x/aclocal.m4
@@ -1225,7 +1225,6 @@ m4_include([../../m4/kpse-freetype2-flags.m4])
m4_include([../../m4/kpse-kpathsea-flags.m4])
m4_include([../../m4/kpse-libpaper.m4])
m4_include([../../m4/kpse-libpng-flags.m4])
-m4_include([../../m4/kpse-lt-hack.m4])
m4_include([../../m4/kpse-warnings.m4])
m4_include([../../m4/kpse-win32.m4])
m4_include([../../m4/kpse-zlib-flags.m4])
diff --git a/Build/source/texk/dvipdfm-x/configure b/Build/source/texk/dvipdfm-x/configure
index 1c916481e4a..4224a903c4b 100755
--- a/Build/source/texk/dvipdfm-x/configure
+++ b/Build/source/texk/dvipdfm-x/configure
@@ -798,7 +798,6 @@ enable_libtool_lock
enable_largefile
enable_dvipdfmx
enable_xdvipdfmx
-enable_libtool_hack
with_system_kpathsea
with_kpathsea_includes
with_kpathsea_libdir
@@ -1458,7 +1457,6 @@ Optional Features:
--disable-largefile omit support for large files
--disable-dvipdfmx do not build the dvipdfmx program
--disable-xdvipdfmx do not build the xdvipdfmx program
- --enable-libtool-hack ignore libtool dependency_libs
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@@ -13220,128 +13218,6 @@ test "x$enable_dvipdfm_x:$enable_xdvipdfmx" = xyes:yes && need_freetype2=yes
ac_config_headers="$ac_config_headers config.h"
-# Check whether --enable-libtool-hack was given.
-if test "${enable_libtool_hack+set}" = set; then :
- enableval=$enable_libtool_hack;
-fi
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if ${ac_cv_header_stdc+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_header_stdc=yes
-else
- ac_cv_header_stdc=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
- # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "memchr" >/dev/null 2>&1; then :
-
-else
- ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
- # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "free" >/dev/null 2>&1; then :
-
-else
- ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
- # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
- if test "$cross_compiling" = yes; then :
- :
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
- (('a' <= (c) && (c) <= 'i') \
- || ('j' <= (c) && (c) <= 'r') \
- || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
- int i;
- for (i = 0; i < 256; i++)
- if (XOR (islower (i), ISLOWER (i))
- || toupper (i) != TOUPPER (i))
- return 2;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
-else
- ac_cv_header_stdc=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
-
-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
-
-fi
-
for ac_header in unistd.h stdint.h inttypes.h sys/types.h sys/wait.h
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -13418,7 +13294,7 @@ test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in
esac
-for ac_func in open close getenv mkstemp basename
+for ac_func in open close getenv basename
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -14704,7 +14580,6 @@ fi
RM='$RM'
ofile='$ofile'
-enable_libtool_hack='$enable_libtool_hack'
_LTEOF
@@ -15344,16 +15219,6 @@ fi
(rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
chmod +x "$ofile"
-## KPSE_LT_HACK: Prevent libtool from linking dependency_libs
-if test "x$enable_libtool_hack" = xyes; then
- $SED '/# Convert "-framework/i\
- ## KPSE_LT_HACK: ignore dependency_libs\
- test "X$installed" = Xyes && dependency_libs=\
-' "$ofile" >"$cfgfile"
- mv "$cfgfile" "$ofile" ||
- (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
- chmod +x "$ofile"
-fi
as_fn_exit 0
_LTEOF
@@ -17072,7 +16937,6 @@ fi
RM='$RM'
ofile='$ofile'
-enable_libtool_hack='$enable_libtool_hack'
ac_aux_dir='$ac_aux_dir'
@@ -18442,16 +18306,6 @@ fi
(rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
chmod +x "$ofile"
-## KPSE_LT_HACK: Prevent libtool from linking dependency_libs
-if test "x$enable_libtool_hack" = xyes; then
- $SED '/# Convert "-framework/i\
- ## KPSE_LT_HACK: ignore dependency_libs\
- test "X$installed" = Xyes && dependency_libs=\
-' "$ofile" >"$cfgfile"
- mv "$cfgfile" "$ofile" ||
- (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
- chmod +x "$ofile"
-fi
;;
esac
diff --git a/Build/source/texk/dvipdfm-x/configure.ac b/Build/source/texk/dvipdfm-x/configure.ac
index c935980131b..af92b839442 100644
--- a/Build/source/texk/dvipdfm-x/configure.ac
+++ b/Build/source/texk/dvipdfm-x/configure.ac
@@ -19,15 +19,12 @@ m4_include([ac/dvipdfm-x.ac])
AC_CONFIG_HEADERS([config.h])
-KPSE_LT_HACK
-
dnl Checks for header files.
-AC_HEADER_STDC
AC_CHECK_HEADERS([unistd.h stdint.h inttypes.h sys/types.h sys/wait.h])
dnl Checks for library functions.
AC_FUNC_MEMCMP
-AC_CHECK_FUNCS([open close getenv mkstemp basename])
+AC_CHECK_FUNCS([open close getenv basename])
dnl Checks for typedefs, structures, and compiler characteristics.
AC_STRUCT_TM
diff --git a/Build/source/texk/dvipdfm-x/epdf.c b/Build/source/texk/dvipdfm-x/epdf.c
index 43d2f46cdac..5cb4cea509b 100644
--- a/Build/source/texk/dvipdfm-x/epdf.c
+++ b/Build/source/texk/dvipdfm-x/epdf.c
@@ -45,16 +45,13 @@
#include "pdfdev.h"
#include "pdfdoc.h"
-#ifdef XETEX
#include "pdfdraw.h"
#include "pdfparse.h"
-#endif
#include "pdfximage.h"
#include "epdf.h"
-#ifdef XETEX
#if HAVE_ZLIB
#include <zlib.h>
static int add_stream_flate (pdf_obj *dst, const void *data, long len);
@@ -395,7 +392,6 @@ pdf_get_page_content (pdf_obj* page)
return contents;
}
-#endif
int
pdf_include_page (pdf_ximage *ximage, FILE *image_file, const char *filename)
@@ -560,7 +556,6 @@ pdf_include_page (pdf_ximage *ximage, FILE *image_file, const char *filename)
}
}
-#ifdef XETEX
typedef enum {
OP_SETCOLOR = 1,
OP_CLOSEandCLIP = 2,
@@ -971,4 +966,3 @@ concat_stream (pdf_obj *dst, pdf_obj *src)
return -1;
}
-#endif
diff --git a/Build/source/texk/dvipdfm-x/pdfdraw.c b/Build/source/texk/dvipdfm-x/pdfdraw.c
index 7f3da5708d5..9bbd18d5c03 100644
--- a/Build/source/texk/dvipdfm-x/pdfdraw.c
+++ b/Build/source/texk/dvipdfm-x/pdfdraw.c
@@ -1615,7 +1615,6 @@ pdf_dev_curveto (double x0, double y0,
return pdf_path__curveto(cpa, cpt, &p0, &p1, &p2);
}
-#ifdef XETEX
int
pdf_dev_vcurveto (double x0, double y0,
double x1, double y1)
@@ -1647,7 +1646,6 @@ pdf_dev_ycurveto (double x0, double y0,
return pdf_path__curveto(cpa, cpt, &p0, &p1, &p1);
}
-#endif
int
pdf_dev_rcurveto (double x0, double y0,
diff --git a/Build/source/texk/dvipdfm-x/pdfobj.c b/Build/source/texk/dvipdfm-x/pdfobj.c
index 849d06cb8b8..3eeb6176536 100644
--- a/Build/source/texk/dvipdfm-x/pdfobj.c
+++ b/Build/source/texk/dvipdfm-x/pdfobj.c
@@ -2894,14 +2894,12 @@ pdf_file_get_version (pdf_file *pf)
return pf->version;
}
-#ifdef XETEX
pdf_obj *
pdf_file_get_trailer (pdf_file *pf)
{
ASSERT(pf);
return pdf_link_obj(pf->trailer);
}
-#endif
pdf_obj *
pdf_file_get_catalog (pdf_file *pf)
diff --git a/Build/source/texk/dvipdfm-x/pdfximage.c b/Build/source/texk/dvipdfm-x/pdfximage.c
index 3a7af901913..0559e9676b0 100644
--- a/Build/source/texk/dvipdfm-x/pdfximage.c
+++ b/Build/source/texk/dvipdfm-x/pdfximage.c
@@ -862,12 +862,10 @@ void set_distiller_template (char *s)
return;
}
-#ifdef XETEX
char *get_distiller_template (void)
{
return _opts.cmdtmpl;
}
-#endif
static int
ps_include_page (pdf_ximage *ximage, const char *filename)
diff --git a/Build/source/texk/dvipdfm-x/spc_color.c b/Build/source/texk/dvipdfm-x/spc_color.c
index 3b9be38bbba..02288149f5a 100644
--- a/Build/source/texk/dvipdfm-x/spc_color.c
+++ b/Build/source/texk/dvipdfm-x/spc_color.c
@@ -80,14 +80,8 @@ spc_handler_color_default (struct spc_env *spe, struct spc_arg *args)
error = spc_util_read_colorspec(spe, &colorspec, args, 1);
if (!error) {
-#ifdef XETEX
- pdf_color_set_default(&colorspec);
- pdf_color_clear_stack(); /* the default color is saved on color_stack */
- pdf_color_push(&colorspec, &colorspec);
-#else
pdf_color_clear_stack();
pdf_color_set(&colorspec, &colorspec);
-#endif
}
return error;
diff --git a/Build/source/texk/dvipdfm-x/spc_dvips.c b/Build/source/texk/dvipdfm-x/spc_dvips.c
index 7732610add6..b4e901ec681 100644
--- a/Build/source/texk/dvipdfm-x/spc_dvips.c
+++ b/Build/source/texk/dvipdfm-x/spc_dvips.c
@@ -34,10 +34,8 @@
#include "dpxfile.h"
-#ifdef XETEX
#include "dvi.h"
#include "dvicodes.h"
-#endif
#include "pdfparse.h"
@@ -54,18 +52,15 @@
#include "spc_util.h"
#include "spc_dvips.h"
-#ifdef XETEX
#include "mfileio.h"
#include "spc_xtx.h"
#include "epdf.h"
-#endif
static int block_pending = 0;
static double pending_x = 0.0;
static double pending_y = 0.0;
static int position_set = 0;
-#ifdef XETEX
static char** ps_headers = 0;
static int num_ps_headers = 0;
@@ -98,7 +93,6 @@ spc_handler_ps_header (struct spc_env *spe, struct spc_arg *args)
args->curptr = args->endptr;
return 0;
}
-#endif
static char *
parse_filename (const char **pp, const char *endptr)
@@ -287,7 +281,6 @@ spc_handler_ps_literal (struct spc_env *spe, struct spc_arg *args)
return error;
}
-#ifdef XETEX
static char *global_defs = 0;
static char *page_defs = 0;
static char *temporary_defs = 0;
@@ -822,7 +815,6 @@ spc_handler_ps_tricksobj (struct spc_env *spe, struct spc_arg *args)
args->curptr = args->endptr;
return error;
}
-#endif
static int
spc_handler_ps_default (struct spc_env *spe, struct spc_arg *args)
@@ -864,26 +856,21 @@ spc_handler_ps_default (struct spc_env *spe, struct spc_arg *args)
}
static struct spc_handler dvips_handlers[] = {
-#ifdef XETEX
{"header", spc_handler_ps_header},
-#endif
{"PSfile", spc_handler_ps_file},
{"psfile", spc_handler_ps_file},
{"ps: plotfile ", spc_handler_ps_plotfile},
{"PS: plotfile ", spc_handler_ps_plotfile},
{"PS:", spc_handler_ps_literal},
{"ps:", spc_handler_ps_literal},
-#ifdef XETEX
{"PST:", spc_handler_ps_trickscmd},
{"pst:", spc_handler_ps_tricksobj},
-#endif
{"\" ", spc_handler_ps_default}
};
int
spc_dvips_at_begin_document (void)
{
-#ifdef XETEX
FILE* fp;
/* This, together with \pscharpath support code, must be moved to xtex.pro header. */
@@ -896,7 +883,6 @@ spc_dvips_at_begin_document (void)
fp = fopen(global_defs, "wb");
fprintf(fp, "tx@Dict begin /STV {} def end\n");
fclose(fp);
-#endif
return 0;
}
@@ -904,7 +890,6 @@ spc_dvips_at_begin_document (void)
int
spc_dvips_at_end_document (void)
{
-#ifdef XETEX
if (ps_headers) {
while (num_ps_headers > 0)
RELEASE(ps_headers[--num_ps_headers]);
@@ -913,7 +898,6 @@ spc_dvips_at_end_document (void)
}
dpx_delete_temp_file(global_defs, true);
dpx_delete_temp_file(page_defs, true);
-#endif
return 0;
}
@@ -921,14 +905,12 @@ spc_dvips_at_end_document (void)
int
spc_dvips_at_begin_page (void)
{
-#ifdef XETEX
if (page_defs) {
dpx_delete_temp_file(page_defs, true);
page_defs = 0;
}
put_stack_depth = -1;
-#endif
return 0;
}
@@ -937,12 +919,10 @@ int
spc_dvips_at_end_page (void)
{
mps_eop_cleanup();
-#ifdef XETEX
if (!temporary_defs) {
dpx_delete_temp_file(temporary_defs, true);
temporary_defs = 0;
}
-#endif
return 0;
}
@@ -1009,14 +989,8 @@ spc_dvips_setup_handler (struct spc_handler *handle,
for (i = 0;
i < sizeof(dvips_handlers) / sizeof(struct spc_handler); i++) {
-#ifdef XETEX
- /* FIXME: keylen < strlen(dvips_handlers[i].key ?? */
- if (keylen <= strlen(dvips_handlers[i].key) &&
- !strncmp(key, dvips_handlers[i].key, strlen(dvips_handlers[i].key))) {
-#else
if (keylen == strlen(dvips_handlers[i].key) &&
!strncmp(key, dvips_handlers[i].key, keylen)) {
-#endif
skip_white(&args->curptr, args->endptr);
@@ -1032,7 +1006,6 @@ spc_dvips_setup_handler (struct spc_handler *handle,
return -1;
}
-#ifdef XETEX
#ifdef __EMX__
#define GS_CALCULATOR "gsos2 -q -dNOPAUSE -dBATCH -sDEVICE=nullpage -f "
#elif defined(WIN32)
@@ -1097,4 +1070,3 @@ int calculate_PS (char *string, int length, double *res1, double *res2, double *
dpx_delete_temp_file(formula, true);
return 0;
}
-#endif
diff --git a/Build/source/texk/dvipdfm-x/spc_pdfm.c b/Build/source/texk/dvipdfm-x/spc_pdfm.c
index 560ab15117c..5d8d827d072 100644
--- a/Build/source/texk/dvipdfm-x/spc_pdfm.c
+++ b/Build/source/texk/dvipdfm-x/spc_pdfm.c
@@ -419,7 +419,6 @@ reencodestring (CMap *cmap, pdf_obj *instring)
return 0;
}
-#ifdef XETEX
/* tables/values used in UTF-8 interpretation -
code is based on ConvertUTF.[ch] sample code
published by the Unicode consortium */
@@ -510,7 +509,6 @@ maybe_reencode_utf8(pdf_obj *instring)
return 0;
}
-#endif
static int
needreencode (pdf_obj *kp, pdf_obj *vp, struct tounicode *cd)
@@ -540,8 +538,6 @@ needreencode (pdf_obj *kp, pdf_obj *vp, struct tounicode *cd)
return r;
}
-static int modstrings (pdf_obj *key, pdf_obj *value, void *pdata);
-
static int
modstrings (pdf_obj *kp, pdf_obj *vp, void *dp)
{
@@ -550,33 +546,16 @@ modstrings (pdf_obj *kp, pdf_obj *vp, void *dp)
ASSERT( pdf_obj_typeof(kp) == PDF_NAME );
-#ifndef XETEX
- if (!cd || cd->cmap_id < 0 || !cd->taintkeys)
- return -1;
-#endif
-
switch (pdf_obj_typeof(vp)) {
case PDF_STRING:
- {
- CMap *cmap;
-
-#ifdef XETEX
- if (cd && cd->cmap_id >= 0 && cd->taintkeys)
-#endif
- {
- cmap = CMap_cache_get(cd->cmap_id);
- if (needreencode(kp, vp, cd)) {
- r = reencodestring(cmap, vp);
- }
- }
-#ifdef XETEX
- else {
- r = maybe_reencode_utf8(vp);
- }
-#endif
- if (r < 0) /* error occured... */
- WARN("Failed to convert input string to UTF16...");
- }
+ if (cd && cd->cmap_id >= 0 && cd->taintkeys) {
+ CMap *cmap = CMap_cache_get(cd->cmap_id);
+ if (needreencode(kp, vp, cd))
+ r = reencodestring(cmap, vp);
+ } else if (is_xetex)
+ r = maybe_reencode_utf8(vp);
+ if (r < 0) /* error occured... */
+ WARN("Failed to convert input string to UTF16...");
break;
case PDF_DICT:
r = pdf_foreach_dict(vp, modstrings, dp);
@@ -594,12 +573,9 @@ my_parse_pdf_dict (const char **pp, const char *endptr, struct tounicode *cd)
{
pdf_obj *dict;
-#ifdef XETEX
-/* disable this test, as we do utf8 reencoding with no cmap */
-#else
- if (cd->cmap_id < 0)
+/* disable this test for xdvipdfmx, as we do utf8 reencoding with no cmap */
+ if (!is_xetex && cd->cmap_id < 0)
return parse_pdf_dict(pp, endptr, NULL);
-#endif
/* :( */
if (cd && cd->unescape_backslash)
@@ -1150,12 +1126,10 @@ spc_handler_pdfm_dest (struct spc_env *spe, struct spc_arg *args)
return -1;
}
-#ifdef XETEX
#ifdef ENABLE_TOUNICODE
- if (maybe_reencode_utf8(name) < 0)
+ if (is_xetex && maybe_reencode_utf8(name) < 0)
WARN("Failed to convert input string to UTF16...");
#endif
-#endif
array = parse_pdf_object(&args->curptr, args->endptr, NULL);
if (!array) {
diff --git a/Build/source/texk/dvipdfm-x/specials.c b/Build/source/texk/dvipdfm-x/specials.c
index 0c0f2fd5f67..66e2c37fff8 100644
--- a/Build/source/texk/dvipdfm-x/specials.c
+++ b/Build/source/texk/dvipdfm-x/specials.c
@@ -49,9 +49,7 @@
#include "spc_misc.h"
#include "spc_color.h"
#include "spc_dvips.h"
-#ifdef XETEX
#include "spc_xtx.h"
-#endif
#include "specials.h"
@@ -379,7 +377,6 @@ static struct {
spc_pdfm_setup_handler
},
-#ifdef XETEX
{"x:",
NULL,
NULL,
@@ -388,7 +385,6 @@ static struct {
spc_xtx_check_special,
spc_xtx_setup_handler
},
-#endif
{"ps:",
spc_dvips_at_begin_document,