summaryrefslogtreecommitdiff
path: root/Build/source
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2013-09-26 12:47:55 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2013-09-26 12:47:55 +0000
commitfbcbe9b36240e101914f4b687e609ef5e03b3747 (patch)
tree91f8770ddd48fbceea91bc905b18e1b3c3b4804f /Build/source
parent8dc34f4a2fe697d0f38addfc64b096d3f864c0e8 (diff)
dvipdfm-x: Reduced dvipdfmx/xdvipdfmx diffs
git-svn-id: svn://tug.org/texlive/trunk@31776 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
-rw-r--r--Build/source/texk/dvipdfm-x/ChangeLog10
-rw-r--r--Build/source/texk/dvipdfm-x/Makefile.am10
-rw-r--r--Build/source/texk/dvipdfm-x/Makefile.in146
-rw-r--r--Build/source/texk/dvipdfm-x/bmpimage.c4
-rw-r--r--Build/source/texk/dvipdfm-x/cff_dict.c9
-rw-r--r--Build/source/texk/dvipdfm-x/dpxfile.c26
-rw-r--r--Build/source/texk/dvipdfm-x/pdfdraw.c8
-rw-r--r--Build/source/texk/dvipdfm-x/pdfobj.c136
-rw-r--r--Build/source/texk/dvipdfm-x/pdfobj.h3
-rw-r--r--Build/source/texk/dvipdfm-x/pdfparse.c50
-rw-r--r--Build/source/texk/dvipdfm-x/pdfximage.c8
-rw-r--r--Build/source/texk/dvipdfm-x/pdfximage.h1
-rw-r--r--Build/source/texk/dvipdfm-x/spc_html.c7
-rw-r--r--Build/source/texk/dvipdfm-x/spc_tpic.c22
-rw-r--r--Build/source/texk/dvipdfm-x/tt_table.c11
-rw-r--r--Build/source/texk/dvipdfm-x/type1.c4
16 files changed, 66 insertions, 389 deletions
diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog
index 1bdc2eaa974..9da366361d4 100644
--- a/Build/source/texk/dvipdfm-x/ChangeLog
+++ b/Build/source/texk/dvipdfm-x/ChangeLog
@@ -1,3 +1,13 @@
+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
+ part of libutil.a.
+ * Makefile.am: Adapted.
+
+ * cff_dict.c, pdfdraw.c, pdfobj.[ch], pdfximage.[ch],
+ tt_table.c, type1.c: Reduced dvipdfmx/xdvipdfmx diffs.
+
2013-09-25 Peter Breitenlohner <peb@mppmu.mpg.de>
* pdfnames.c: Fix (x)dvipdfm-bkm.test (notjump).
diff --git a/Build/source/texk/dvipdfm-x/Makefile.am b/Build/source/texk/dvipdfm-x/Makefile.am
index 1ef5bb8cdd9..38186062385 100644
--- a/Build/source/texk/dvipdfm-x/Makefile.am
+++ b/Build/source/texk/dvipdfm-x/Makefile.am
@@ -26,6 +26,7 @@ AM_CFLAGS = $(WARNING_CFLAGS)
libutil_a_SOURCES = \
agl.c \
agl.h \
+ bmpimage.c \
bmpimage.h \
cff_dict.h \
cff_limits.h \
@@ -46,6 +47,7 @@ libutil_a_SOURCES = \
dpxconf.h \
dpxcrypt.c \
dpxcrypt.h \
+ dpxfile.c \
dpxfile.h \
dpxutil.c \
dpxutil.h \
@@ -80,6 +82,7 @@ libutil_a_SOURCES = \
pdflimits.h \
pdfnames.h \
pdfobj.h \
+ pdfparse.c \
pdfparse.h \
pdfresource.c \
pdfresource.h \
@@ -93,10 +96,12 @@ libutil_a_SOURCES = \
pst_obj.h \
spc_color.h \
spc_dvips.h \
+ spc_html.c \
spc_html.h \
spc_misc.c \
spc_misc.h \
spc_pdfm.h \
+ spc_tpic.c \
spc_tpic.h \
spc_util.h \
spc_util.c \
@@ -125,7 +130,6 @@ libutil_a_SOURCES = \
xbb.c
dvipdfmx_SOURCES = \
- bmpimage.c \
cff.c \
cff.h \
cff_dict.c \
@@ -135,7 +139,6 @@ dvipdfmx_SOURCES = \
cidtype2.c \
cmap.c \
cmap_read.c \
- dpxfile.c \
dvi.c \
dvipdfmx.c \
epdf.c \
@@ -149,16 +152,13 @@ dvipdfmx_SOURCES = \
pdffont.h \
pdfnames.c \
pdfobj.c \
- pdfparse.c \
pdfximage.c \
pkfont.c \
sfnt.c \
sfnt.h \
spc_color.c \
spc_dvips.c \
- spc_html.c \
spc_pdfm.c \
- spc_tpic.c \
spc_xtx.c \
spc_xtx.h \
specials.c \
diff --git a/Build/source/texk/dvipdfm-x/Makefile.in b/Build/source/texk/dvipdfm-x/Makefile.in
index 6f4df171086..38c76c7ec35 100644
--- a/Build/source/texk/dvipdfm-x/Makefile.in
+++ b/Build/source/texk/dvipdfm-x/Makefile.in
@@ -146,16 +146,18 @@ am__v_AR_0 = @echo " AR " $@;
am__v_AR_1 =
libutil_a_AR = $(AR) $(ARFLAGS)
libutil_a_LIBADD =
-am_libutil_a_OBJECTS = agl.$(OBJEXT) cidtype0.$(OBJEXT) \
- cmap_write.$(OBJEXT) cs_type2.$(OBJEXT) dpxconf.$(OBJEXT) \
- dpxcrypt.$(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) \
+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_misc.$(OBJEXT) spc_util.$(OBJEXT) \
- subfont.$(OBJEXT) tfm.$(OBJEXT) type1c.$(OBJEXT) \
- unicode.$(OBJEXT) vf.$(OBJEXT) xbb.$(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)
libutil_a_OBJECTS = $(am_libutil_a_OBJECTS)
@DVIPDFMX_TRUE@am__EXEEXT_1 = dvipdfmx$(EXEEXT)
@XDVIPDFMX_TRUE@am__EXEEXT_2 = xdvipdfmx$(EXEEXT)
@@ -171,16 +173,14 @@ 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 = bmpimage.$(OBJEXT) cff.$(OBJEXT) \
- cff_dict.$(OBJEXT) cid.$(OBJEXT) cidtype2.$(OBJEXT) \
- cmap.$(OBJEXT) cmap_read.$(OBJEXT) dpxfile.$(OBJEXT) \
+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) pdfparse.$(OBJEXT) \
- pdfximage.$(OBJEXT) pkfont.$(OBJEXT) sfnt.$(OBJEXT) \
- spc_color.$(OBJEXT) spc_dvips.$(OBJEXT) spc_html.$(OBJEXT) \
- spc_pdfm.$(OBJEXT) spc_tpic.$(OBJEXT) spc_xtx.$(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) \
@@ -190,27 +190,24 @@ am__DEPENDENCIES_1 =
dvipdfmx_DEPENDENCIES = libutil.a $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
-am__objects_1 = xdvipdfmx-bmpimage.$(OBJEXT) xdvipdfmx-cff.$(OBJEXT) \
- xdvipdfmx-cff_dict.$(OBJEXT) xdvipdfmx-cid.$(OBJEXT) \
- xdvipdfmx-cidtype2.$(OBJEXT) xdvipdfmx-cmap.$(OBJEXT) \
- xdvipdfmx-cmap_read.$(OBJEXT) xdvipdfmx-dpxfile.$(OBJEXT) \
+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-pdffont.$(OBJEXT) xdvipdfmx-pdfnames.$(OBJEXT) \
- xdvipdfmx-pdfobj.$(OBJEXT) xdvipdfmx-pdfparse.$(OBJEXT) \
- xdvipdfmx-pdfximage.$(OBJEXT) xdvipdfmx-pkfont.$(OBJEXT) \
- xdvipdfmx-sfnt.$(OBJEXT) xdvipdfmx-spc_color.$(OBJEXT) \
- xdvipdfmx-spc_dvips.$(OBJEXT) xdvipdfmx-spc_html.$(OBJEXT) \
- xdvipdfmx-spc_pdfm.$(OBJEXT) xdvipdfmx-spc_tpic.$(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-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)
nodist_xdvipdfmx_OBJECTS = $(am__objects_1)
xdvipdfmx_OBJECTS = $(nodist_xdvipdfmx_OBJECTS)
am__DEPENDENCIES_2 = libutil.a $(am__DEPENDENCIES_1) \
@@ -648,6 +645,7 @@ AM_CFLAGS = $(WARNING_CFLAGS)
libutil_a_SOURCES = \
agl.c \
agl.h \
+ bmpimage.c \
bmpimage.h \
cff_dict.h \
cff_limits.h \
@@ -668,6 +666,7 @@ libutil_a_SOURCES = \
dpxconf.h \
dpxcrypt.c \
dpxcrypt.h \
+ dpxfile.c \
dpxfile.h \
dpxutil.c \
dpxutil.h \
@@ -702,6 +701,7 @@ libutil_a_SOURCES = \
pdflimits.h \
pdfnames.h \
pdfobj.h \
+ pdfparse.c \
pdfparse.h \
pdfresource.c \
pdfresource.h \
@@ -715,10 +715,12 @@ libutil_a_SOURCES = \
pst_obj.h \
spc_color.h \
spc_dvips.h \
+ spc_html.c \
spc_html.h \
spc_misc.c \
spc_misc.h \
spc_pdfm.h \
+ spc_tpic.c \
spc_tpic.h \
spc_util.h \
spc_util.c \
@@ -747,7 +749,6 @@ libutil_a_SOURCES = \
xbb.c
dvipdfmx_SOURCES = \
- bmpimage.c \
cff.c \
cff.h \
cff_dict.c \
@@ -757,7 +758,6 @@ dvipdfmx_SOURCES = \
cidtype2.c \
cmap.c \
cmap_read.c \
- dpxfile.c \
dvi.c \
dvipdfmx.c \
epdf.c \
@@ -771,16 +771,13 @@ dvipdfmx_SOURCES = \
pdffont.h \
pdfnames.c \
pdfobj.c \
- pdfparse.c \
pdfximage.c \
pkfont.c \
sfnt.c \
sfnt.h \
spc_color.c \
spc_dvips.c \
- spc_html.c \
spc_pdfm.c \
- spc_tpic.c \
spc_xtx.c \
spc_xtx.h \
specials.c \
@@ -1077,14 +1074,12 @@ 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-bmpimage.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-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-dpxfile.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@
@@ -1096,15 +1091,12 @@ distclean-compile:
@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-pdfparse.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_html.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_tpic.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@
@@ -1157,20 +1149,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-bmpimage.o: bmpimage.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xdvipdfmx-bmpimage.o -MD -MP -MF $(DEPDIR)/xdvipdfmx-bmpimage.Tpo -c -o xdvipdfmx-bmpimage.o `test -f 'bmpimage.c' || echo '$(srcdir)/'`bmpimage.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xdvipdfmx-bmpimage.Tpo $(DEPDIR)/xdvipdfmx-bmpimage.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='bmpimage.c' object='xdvipdfmx-bmpimage.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-bmpimage.o `test -f 'bmpimage.c' || echo '$(srcdir)/'`bmpimage.c
-
-xdvipdfmx-bmpimage.obj: bmpimage.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xdvipdfmx-bmpimage.obj -MD -MP -MF $(DEPDIR)/xdvipdfmx-bmpimage.Tpo -c -o xdvipdfmx-bmpimage.obj `if test -f 'bmpimage.c'; then $(CYGPATH_W) 'bmpimage.c'; else $(CYGPATH_W) '$(srcdir)/bmpimage.c'; fi`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xdvipdfmx-bmpimage.Tpo $(DEPDIR)/xdvipdfmx-bmpimage.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='bmpimage.c' object='xdvipdfmx-bmpimage.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-bmpimage.obj `if test -f 'bmpimage.c'; then $(CYGPATH_W) 'bmpimage.c'; else $(CYGPATH_W) '$(srcdir)/bmpimage.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
@@ -1255,20 +1233,6 @@ xdvipdfmx-cmap_read.obj: cmap_read.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-cmap_read.obj `if test -f 'cmap_read.c'; then $(CYGPATH_W) 'cmap_read.c'; else $(CYGPATH_W) '$(srcdir)/cmap_read.c'; fi`
-xdvipdfmx-dpxfile.o: dpxfile.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xdvipdfmx-dpxfile.o -MD -MP -MF $(DEPDIR)/xdvipdfmx-dpxfile.Tpo -c -o xdvipdfmx-dpxfile.o `test -f 'dpxfile.c' || echo '$(srcdir)/'`dpxfile.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xdvipdfmx-dpxfile.Tpo $(DEPDIR)/xdvipdfmx-dpxfile.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dpxfile.c' object='xdvipdfmx-dpxfile.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-dpxfile.o `test -f 'dpxfile.c' || echo '$(srcdir)/'`dpxfile.c
-
-xdvipdfmx-dpxfile.obj: dpxfile.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xdvipdfmx-dpxfile.obj -MD -MP -MF $(DEPDIR)/xdvipdfmx-dpxfile.Tpo -c -o xdvipdfmx-dpxfile.obj `if test -f 'dpxfile.c'; then $(CYGPATH_W) 'dpxfile.c'; else $(CYGPATH_W) '$(srcdir)/dpxfile.c'; fi`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xdvipdfmx-dpxfile.Tpo $(DEPDIR)/xdvipdfmx-dpxfile.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dpxfile.c' object='xdvipdfmx-dpxfile.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-dpxfile.obj `if test -f 'dpxfile.c'; then $(CYGPATH_W) 'dpxfile.c'; else $(CYGPATH_W) '$(srcdir)/dpxfile.c'; fi`
-
xdvipdfmx-dvi.o: dvi.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xdvipdfmx-dvi.o -MD -MP -MF $(DEPDIR)/xdvipdfmx-dvi.Tpo -c -o xdvipdfmx-dvi.o `test -f 'dvi.c' || echo '$(srcdir)/'`dvi.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xdvipdfmx-dvi.Tpo $(DEPDIR)/xdvipdfmx-dvi.Po
@@ -1423,20 +1387,6 @@ xdvipdfmx-pdfobj.obj: pdfobj.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-pdfobj.obj `if test -f 'pdfobj.c'; then $(CYGPATH_W) 'pdfobj.c'; else $(CYGPATH_W) '$(srcdir)/pdfobj.c'; fi`
-xdvipdfmx-pdfparse.o: pdfparse.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xdvipdfmx-pdfparse.o -MD -MP -MF $(DEPDIR)/xdvipdfmx-pdfparse.Tpo -c -o xdvipdfmx-pdfparse.o `test -f 'pdfparse.c' || echo '$(srcdir)/'`pdfparse.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xdvipdfmx-pdfparse.Tpo $(DEPDIR)/xdvipdfmx-pdfparse.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pdfparse.c' object='xdvipdfmx-pdfparse.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-pdfparse.o `test -f 'pdfparse.c' || echo '$(srcdir)/'`pdfparse.c
-
-xdvipdfmx-pdfparse.obj: pdfparse.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xdvipdfmx-pdfparse.obj -MD -MP -MF $(DEPDIR)/xdvipdfmx-pdfparse.Tpo -c -o xdvipdfmx-pdfparse.obj `if test -f 'pdfparse.c'; then $(CYGPATH_W) 'pdfparse.c'; else $(CYGPATH_W) '$(srcdir)/pdfparse.c'; fi`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xdvipdfmx-pdfparse.Tpo $(DEPDIR)/xdvipdfmx-pdfparse.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pdfparse.c' object='xdvipdfmx-pdfparse.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-pdfparse.obj `if test -f 'pdfparse.c'; then $(CYGPATH_W) 'pdfparse.c'; else $(CYGPATH_W) '$(srcdir)/pdfparse.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
@@ -1507,20 +1457,6 @@ xdvipdfmx-spc_dvips.obj: spc_dvips.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_dvips.obj `if test -f 'spc_dvips.c'; then $(CYGPATH_W) 'spc_dvips.c'; else $(CYGPATH_W) '$(srcdir)/spc_dvips.c'; fi`
-xdvipdfmx-spc_html.o: spc_html.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xdvipdfmx-spc_html.o -MD -MP -MF $(DEPDIR)/xdvipdfmx-spc_html.Tpo -c -o xdvipdfmx-spc_html.o `test -f 'spc_html.c' || echo '$(srcdir)/'`spc_html.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xdvipdfmx-spc_html.Tpo $(DEPDIR)/xdvipdfmx-spc_html.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='spc_html.c' object='xdvipdfmx-spc_html.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_html.o `test -f 'spc_html.c' || echo '$(srcdir)/'`spc_html.c
-
-xdvipdfmx-spc_html.obj: spc_html.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xdvipdfmx-spc_html.obj -MD -MP -MF $(DEPDIR)/xdvipdfmx-spc_html.Tpo -c -o xdvipdfmx-spc_html.obj `if test -f 'spc_html.c'; then $(CYGPATH_W) 'spc_html.c'; else $(CYGPATH_W) '$(srcdir)/spc_html.c'; fi`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xdvipdfmx-spc_html.Tpo $(DEPDIR)/xdvipdfmx-spc_html.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='spc_html.c' object='xdvipdfmx-spc_html.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_html.obj `if test -f 'spc_html.c'; then $(CYGPATH_W) 'spc_html.c'; else $(CYGPATH_W) '$(srcdir)/spc_html.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
@@ -1535,20 +1471,6 @@ xdvipdfmx-spc_pdfm.obj: spc_pdfm.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_pdfm.obj `if test -f 'spc_pdfm.c'; then $(CYGPATH_W) 'spc_pdfm.c'; else $(CYGPATH_W) '$(srcdir)/spc_pdfm.c'; fi`
-xdvipdfmx-spc_tpic.o: spc_tpic.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xdvipdfmx-spc_tpic.o -MD -MP -MF $(DEPDIR)/xdvipdfmx-spc_tpic.Tpo -c -o xdvipdfmx-spc_tpic.o `test -f 'spc_tpic.c' || echo '$(srcdir)/'`spc_tpic.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xdvipdfmx-spc_tpic.Tpo $(DEPDIR)/xdvipdfmx-spc_tpic.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='spc_tpic.c' object='xdvipdfmx-spc_tpic.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_tpic.o `test -f 'spc_tpic.c' || echo '$(srcdir)/'`spc_tpic.c
-
-xdvipdfmx-spc_tpic.obj: spc_tpic.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xdvipdfmx-spc_tpic.obj -MD -MP -MF $(DEPDIR)/xdvipdfmx-spc_tpic.Tpo -c -o xdvipdfmx-spc_tpic.obj `if test -f 'spc_tpic.c'; then $(CYGPATH_W) 'spc_tpic.c'; else $(CYGPATH_W) '$(srcdir)/spc_tpic.c'; fi`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xdvipdfmx-spc_tpic.Tpo $(DEPDIR)/xdvipdfmx-spc_tpic.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='spc_tpic.c' object='xdvipdfmx-spc_tpic.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_tpic.obj `if test -f 'spc_tpic.c'; then $(CYGPATH_W) 'spc_tpic.c'; else $(CYGPATH_W) '$(srcdir)/spc_tpic.c'; fi`
-
xdvipdfmx-spc_xtx.o: spc_xtx.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xdvipdfmx-spc_xtx.o -MD -MP -MF $(DEPDIR)/xdvipdfmx-spc_xtx.Tpo -c -o xdvipdfmx-spc_xtx.o `test -f 'spc_xtx.c' || echo '$(srcdir)/'`spc_xtx.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xdvipdfmx-spc_xtx.Tpo $(DEPDIR)/xdvipdfmx-spc_xtx.Po
diff --git a/Build/source/texk/dvipdfm-x/bmpimage.c b/Build/source/texk/dvipdfm-x/bmpimage.c
index 993084f35fd..18369bba9a9 100644
--- a/Build/source/texk/dvipdfm-x/bmpimage.c
+++ b/Build/source/texk/dvipdfm-x/bmpimage.c
@@ -83,9 +83,7 @@ bmp_include_image (pdf_ximage *ximage, FILE *fp)
unsigned short bit_count; /* Bits per pix */
int num_palette, flip;
int i;
-#ifdef XETEX
unsigned long biXPelsPerMeter, biYPelsPerMeter;
-#endif
pdf_ximage_init_image_info(&info);
@@ -144,13 +142,11 @@ bmp_include_image (pdf_ximage *ximage, FILE *fp)
p += 2;
bit_count = USHORT_LE(p); p += 2;
compression = ULONG_LE(p); p += 4;
-#ifdef XETEX
/* ignore biSizeImage */ p += 4;
biXPelsPerMeter = ULONG_LE(p); p += 4;
biYPelsPerMeter = ULONG_LE(p); p += 4;
info.xdensity = 72.0 / (biXPelsPerMeter * 0.0254);
info.ydensity = 72.0 / (biYPelsPerMeter * 0.0254);
-#endif
if (info.height < 0) {
info.height = -info.height;
flip = 0;
diff --git a/Build/source/texk/dvipdfm-x/cff_dict.c b/Build/source/texk/dvipdfm-x/cff_dict.c
index aa2f07d0786..f167e194293 100644
--- a/Build/source/texk/dvipdfm-x/cff_dict.c
+++ b/Build/source/texk/dvipdfm-x/cff_dict.c
@@ -305,11 +305,6 @@ static void add_dict (cff_dict *dict,
if (dict_operator[id].opname == NULL || argtype < 0) {
*status = CFF_ERROR_PARSE_ERROR;
return;
-#ifndef XETEX
- } else if (stack_top < 1) {
- *status = CFF_ERROR_STACK_UNDERFLOW;
- return;
-#endif
}
if (dict->count >= dict->max) {
@@ -323,24 +318,20 @@ static void add_dict (cff_dict *dict,
argtype == CFF_TYPE_BOOLEAN ||
argtype == CFF_TYPE_SID ||
argtype == CFF_TYPE_OFFSET) {
-#ifdef XETEX
/* check for underflow here, as exactly one operand is expected */
if (stack_top < 1) {
*status = CFF_ERROR_STACK_UNDERFLOW;
return;
}
-#endif
stack_top--;
(dict->entries)[dict->count].count = 1;
(dict->entries)[dict->count].values = NEW(1, double);
(dict->entries)[dict->count].values[0] = arg_stack[stack_top];
dict->count += 1;
} else {
-#ifdef XETEX
/* just ignore operator if there were no operands provided;
don't treat this as underflow (e.g. StemSnapV in TemporaLGCUni-Italic.otf) */
if (stack_top > 0)
-#endif
{
(dict->entries)[dict->count].count = stack_top;
(dict->entries)[dict->count].values = NEW(stack_top, double);
diff --git a/Build/source/texk/dvipdfm-x/dpxfile.c b/Build/source/texk/dvipdfm-x/dpxfile.c
index 995eaa8858b..ea956e034ca 100644
--- a/Build/source/texk/dvipdfm-x/dpxfile.c
+++ b/Build/source/texk/dvipdfm-x/dpxfile.c
@@ -750,14 +750,14 @@ dpx_find_dfont_file (const char *filename)
static const char *
dpx_get_tmpdir (void)
{
-# ifdef WIN32
+#ifdef WIN32
# define __TMPDIR "."
-# else /* WIN32 */
+#else /* WIN32 */
# define __TMPDIR "/tmp"
#endif /* WIN32 */
const char *_tmpd;
-# ifdef HAVE_GETENV
+#ifdef HAVE_GETENV
_tmpd = getenv("TMPDIR");
# ifdef WIN32
if (!_tmpd)
@@ -767,9 +767,9 @@ dpx_get_tmpdir (void)
# endif /* WIN32 */
if (!_tmpd)
_tmpd = __TMPDIR;
-# else /* HAVE_GETENV */
+#else /* HAVE_GETENV */
_tmpd = __TMPDIR;
-# endif /* HAVE_GETENV */
+#endif /* HAVE_GETENV */
return _tmpd;
}
@@ -777,13 +777,12 @@ dpx_get_tmpdir (void)
# include <stdlib.h>
#endif
-#ifdef XETEX
char *
dpx_create_temp_file (void)
{
char *tmp = NULL;
-#if defined(MIKTEX)
+#if defined(MIKTEX)
{
tmp = NEW(_MAX_PATH + 1, char);
miktex_create_temp_file_name(tmp); /* FIXME_FIXME */
@@ -799,11 +798,11 @@ dpx_create_temp_file (void)
strcat(tmp, TEMPLATE);
_fd = mkstemp(tmp);
if (_fd != -1)
-#ifdef WIN32
+# ifdef WIN32
_close(_fd);
-#else
+# else
close(_fd);
-#endif /* WIN32 */
+# endif /* WIN32 */
else {
RELEASE(tmp);
tmp = NULL;
@@ -833,16 +832,11 @@ dpx_create_temp_file (void)
return tmp;
}
-#endif /* XETEX */
char *
dpx_create_fix_temp_file (const char *filename)
{
-#ifdef XETEX
-#define PREFIX "xdvipdfmx."
-#else
-#define PREFIX "dvipdfmx."
-#endif
+#define PREFIX "dvipdfm-x."
static const char *dir = NULL;
static char *cwd = NULL;
char *ret, *s;
diff --git a/Build/source/texk/dvipdfm-x/pdfdraw.c b/Build/source/texk/dvipdfm-x/pdfdraw.c
index 64e4cb5e028..7f3da5708d5 100644
--- a/Build/source/texk/dvipdfm-x/pdfdraw.c
+++ b/Build/source/texk/dvipdfm-x/pdfdraw.c
@@ -1598,9 +1598,9 @@ pdf_dev_rlineto (double x, double y)
}
int
-pdf_dev_curveto (double x0, double y0,
- double x1, double y1,
- double x2, double y2)
+pdf_dev_curveto (double x0, double y0,
+ double x1, double y1,
+ double x2, double y2)
{
m_stack *gss = &gs_stack;
pdf_gstate *gs = m_stack_top(gss);
@@ -1617,7 +1617,7 @@ pdf_dev_curveto (double x0, double y0,
#ifdef XETEX
int
-pdf_dev_vcurveto (double x0, double y0,
+pdf_dev_vcurveto (double x0, double y0,
double x1, double y1)
{
m_stack *gss = &gs_stack;
diff --git a/Build/source/texk/dvipdfm-x/pdfobj.c b/Build/source/texk/dvipdfm-x/pdfobj.c
index 207a48d2a67..849d06cb8b8 100644
--- a/Build/source/texk/dvipdfm-x/pdfobj.c
+++ b/Build/source/texk/dvipdfm-x/pdfobj.c
@@ -777,19 +777,6 @@ write_boolean (pdf_boolean *data, FILE *file)
}
}
-#ifdef XETEX
-void
-pdf_set_boolean (pdf_obj *object, char value)
-{
- pdf_boolean *data;
-
- TYPECHECK(object, PDF_BOOLEAN);
-
- data = object->data;
- data->value = value;
-}
-#endif
-
char
pdf_boolean_value (pdf_obj *object)
{
@@ -1109,30 +1096,6 @@ release_name (pdf_name *data)
RELEASE(data);
}
-#ifdef XETEX
-void
-pdf_set_name (pdf_obj *object, const char *name)
-{
- pdf_name *data;
- unsigned length;
-
- TYPECHECK(object, PDF_NAME);
-
- length = strlen(name);
- data = object->data;
- if (data->name != NULL) {
- RELEASE(data->name);
- }
- if (length != 0) {
- data->name = NEW(length+1, char);
- memcpy(data->name, name, length);
- data->name[length] = 0;
- } else {
- data->name = NULL;
- }
-}
-#endif
-
char *
pdf_name_value (pdf_obj *object)
{
@@ -2149,105 +2112,6 @@ pdf_release_obj (pdf_obj *object)
}
}
-#ifdef XETEX
-/* Copy object data without changing object label. */
-void
-pdf_copy_object (pdf_obj *dst, pdf_obj *src)
-{
- if (!dst || !src)
- return;
-
- switch (dst->type) {
- case PDF_BOOLEAN: release_boolean(dst->data); break;
- case PDF_NULL: release_null(dst->data); break;
- case PDF_NUMBER: release_number(dst->data); break;
- case PDF_STRING: release_string(dst->data); break;
- case PDF_NAME: release_name(dst->data); break;
- case PDF_ARRAY: release_array(dst->data); break;
- case PDF_DICT: release_dict(dst->data); break;
- case PDF_STREAM: release_stream(dst->data); break;
- case PDF_INDIRECT: release_indirect(dst->data); break;
- }
-
- dst->type = src->type;
- switch (src->type) {
- case PDF_BOOLEAN:
- dst->data = NEW(1, pdf_boolean);
- pdf_set_boolean(dst, pdf_boolean_value(src));
- break;
- case PDF_NULL:
- dst->data = NULL;
- break;
- case PDF_NUMBER:
- dst->data = NEW(1, pdf_number);
- pdf_set_number(dst, pdf_number_value(src));
- break;
- case PDF_STRING:
- dst->data = NEW(1, pdf_string);
- pdf_set_string(dst,
- pdf_string_value(src),
- pdf_string_length(src));
- break;
- case PDF_NAME:
- dst->data = NEW(1, pdf_name);
- pdf_set_name(dst, pdf_name_value(src));
- break;
- case PDF_ARRAY:
- {
- pdf_array *data;
- unsigned long i;
-
- dst->data = data = NEW(1, pdf_array);
- data->size = 0;
- data->max = 0;
- data->values = NULL;
- for (i = 0; i < pdf_array_length(src); i++) {
- pdf_add_array(dst, pdf_link_obj(pdf_get_array(src, i)));
- }
- }
- break;
- case PDF_DICT:
- {
- pdf_dict *data;
-
- dst->data = data = NEW(1, pdf_dict);
- data->key = NULL;
- data->value = NULL;
- data->next = NULL;
- pdf_merge_dict(dst, src);
- }
- break;
- case PDF_STREAM:
- {
- pdf_stream *data;
-
- dst->data = data = NEW(1, pdf_stream);
- data->dict = pdf_new_dict();
- data->_flags = ((pdf_stream *)src->data)->_flags;
- data->stream_length = 0;
- data->max_length = 0;
-
- pdf_add_stream(dst, pdf_stream_dataptr(src), pdf_stream_length(src));
- pdf_merge_dict(data->dict, pdf_stream_dict(src));
- }
- break;
- case PDF_INDIRECT:
- {
- pdf_indirect *data;
-
- dst->data = data = NEW(1, pdf_indirect);
- data->pf = ((pdf_indirect *) (src->data))->pf;
- data->obj = ((pdf_indirect *) (src->data))->obj;
- data->label = ((pdf_indirect *) (src->data))->label;
- data->generation = ((pdf_indirect *) (src->data))->generation;
- }
- break;
- }
-
- return;
-}
-#endif
-
static int
backup_line (FILE *pdf_input_file)
{
diff --git a/Build/source/texk/dvipdfm-x/pdfobj.h b/Build/source/texk/dvipdfm-x/pdfobj.h
index 5afbd3c9ced..24ba834909f 100644
--- a/Build/source/texk/dvipdfm-x/pdfobj.h
+++ b/Build/source/texk/dvipdfm-x/pdfobj.h
@@ -86,7 +86,6 @@ extern pdf_obj *pdf_new_undefined (void);
extern pdf_obj *pdf_new_null (void);
extern pdf_obj *pdf_new_boolean (char value);
-extern void pdf_set_boolean (pdf_obj *object, char value);
extern char pdf_boolean_value (pdf_obj *object);
extern pdf_obj *pdf_new_number (double value);
@@ -100,7 +99,6 @@ extern unsigned pdf_string_length (pdf_obj *object);
/* Name does not include the / */
extern pdf_obj *pdf_new_name (const char *name);
-extern void pdf_set_name (pdf_obj *object, const char *name);
extern char *pdf_name_value (pdf_obj *object);
extern pdf_obj *pdf_new_array (void);
@@ -199,6 +197,5 @@ extern pdf_obj *pdf_import_object (pdf_obj *object);
extern int pdfobj_escape_str (char *buffer, int size, const unsigned char *s, int len);
extern pdf_obj *pdf_new_indirect (pdf_file *pf, unsigned long label, unsigned short generation);
-extern void pdf_copy_object (pdf_obj *dst, pdf_obj *src);
#endif /* _PDFOBJ_H_ */
diff --git a/Build/source/texk/dvipdfm-x/pdfparse.c b/Build/source/texk/dvipdfm-x/pdfparse.c
index ff08adb9b0c..c05d37ed454 100644
--- a/Build/source/texk/dvipdfm-x/pdfparse.c
+++ b/Build/source/texk/dvipdfm-x/pdfparse.c
@@ -812,19 +812,6 @@ parse_pdf_stream (const char **pp, const char *endptr, pdf_obj *dict, pdf_file *
(p[0] == '\r' && p[1] == '\n')) {
p += 2;
}
-#ifdef XETEX
-#ifndef PDF_PARSE_STRICT
- else {
- /* TeX translate end-of-line marker to a single space. */
- if (parser_state.tainted) {
- if (p < endptr && p[0] == ' ') {
- p++;
- }
- }
- }
- /* The end-of-line marker not mandatory? */
-#endif /* !PDF_PARSE_STRICT */
-#endif
/* Stream length */
{
@@ -841,33 +828,6 @@ parse_pdf_stream (const char **pp, const char *endptr, pdf_obj *dict, pdf_file *
}
pdf_release_obj(tmp2);
}
-#ifdef XETEX
-#ifndef PDF_PARSE_STRICT
- else if (p + 9 <= endptr)
- {
- /*
- * This was added to allow TeX users to write PDF stream object
- * directly in their TeX source. This violates PDF spec.
- */
- const char *q;
-
- stream_length = -1;
- for (q = endptr - 1; q >= p + 8; q--) {
- if (q[0] != 'm')
- continue;
- else {
- if (!memcmp(q - 8, "endstrea", 8)) {
- /* The end-of-line marker is not skipped here. There are
- * no way to decide if it is a part of the stream or not.
- */
- stream_length = ((long) (q - p)) - 8;
- break;
- }
- }
- }
- }
-#endif /* !PDF_PARSE_STRICT */
-#endif
else {
return NULL;
}
@@ -905,20 +865,10 @@ parse_pdf_stream (const char **pp, const char *endptr, pdf_obj *dict, pdf_file *
* after the data and before endstream; this marker is not included
* in the stream length.
* [PDF Reference, 6th ed., version 1.7, pp. 61] */
-#if defined (PDF_PARSE_STRICT) || !defined (XETEX)
if (p < endptr && p[0] == '\r')
p++;
if (p < endptr && p[0] == '\n')
p++;
-#else /* !PDF_PARSE_STRICT && XETEX */
- /*
- * This may skip data starting with '%' and terminated by a
- * '\r' or '\n' or '\r\n'. The PDF syntax rule should not be
- * applied to the content of the stream data.
- * TeX may have converted end-of-line to single white space.
- */
- skip_white(&p, endptr);
-#endif /* !PDF_PARSE_STRICT && XETEX */
if (p + 9 > endptr ||
memcmp(p, "endstream", 9)) {
diff --git a/Build/source/texk/dvipdfm-x/pdfximage.c b/Build/source/texk/dvipdfm-x/pdfximage.c
index 1288516c454..3a7af901913 100644
--- a/Build/source/texk/dvipdfm-x/pdfximage.c
+++ b/Build/source/texk/dvipdfm-x/pdfximage.c
@@ -488,14 +488,6 @@ pdf_ximage_init_image_info (ximage_info *info)
info->xdensity = info->ydensity = 1.0;
}
-#ifdef XETEX
-char *
-pdf_ximage_get_ident (pdf_ximage *I)
-{
- return I->ident;
-}
-#endif
-
void
pdf_ximage_set_image (pdf_ximage *I, void *image_info, pdf_obj *resource)
{
diff --git a/Build/source/texk/dvipdfm-x/pdfximage.h b/Build/source/texk/dvipdfm-x/pdfximage.h
index dc8d5911487..e197db8bfcb 100644
--- a/Build/source/texk/dvipdfm-x/pdfximage.h
+++ b/Build/source/texk/dvipdfm-x/pdfximage.h
@@ -70,7 +70,6 @@ extern int pdf_ximage_defineresource (const char *ident, int subtype,
/* Called by pngimage, jpegimage, epdf, mpost, etc. */
extern void pdf_ximage_init_image_info (ximage_info *info);
extern void pdf_ximage_init_form_info (xform_info *info);
-extern char *pdf_ximage_get_ident (pdf_ximage *ximage);
extern void pdf_ximage_set_image (pdf_ximage *ximage, void *info, pdf_obj *resource);
extern void pdf_ximage_set_form (pdf_ximage *ximage, void *info, pdf_obj *resource);
extern long pdf_ximage_get_page (pdf_ximage *I);
diff --git a/Build/source/texk/dvipdfm-x/spc_html.c b/Build/source/texk/dvipdfm-x/spc_html.c
index 8b27656b900..779f3ffb0d7 100644
--- a/Build/source/texk/dvipdfm-x/spc_html.c
+++ b/Build/source/texk/dvipdfm-x/spc_html.c
@@ -672,16 +672,9 @@ spc_html__img_empty (struct spc_env *spe, pdf_obj *attr, struct spc_html_ *sd)
}
#endif /* ENABLE_HTML_SVG_OPACITY */
-#ifdef XETEX
- pdf_dev_concat(&M);
-
- pdf_ximage_scale_image(id, &M1, &r, &ti);
- pdf_dev_concat(&M1);
-#else
pdf_ximage_scale_image(id, &M1, &r, &ti);
pdf_concatmatrix(&M, &M1);
pdf_dev_concat(&M);
-#endif
pdf_dev_rectclip(r.llx, r.lly, r.urx - r.llx, r.ury - r.lly);
diff --git a/Build/source/texk/dvipdfm-x/spc_tpic.c b/Build/source/texk/dvipdfm-x/spc_tpic.c
index 6fdf50eb0ed..3da276d9f0e 100644
--- a/Build/source/texk/dvipdfm-x/spc_tpic.c
+++ b/Build/source/texk/dvipdfm-x/spc_tpic.c
@@ -226,27 +226,6 @@ set_styles (struct spc_tpic_ *tp,
double g, a;
int f_ais;
-#ifdef XETEX
- switch (tp->mode.fill) {
- case TPIC_MODE__FILL_SOLID:
- g = 1.0 - tp->fill_color;
- a = 0.0;
- break;
- case TPIC_MODE__FILL_SHAPE:
- case TPIC_MODE__FILL_OPACITY:
- if (tp->fill_color > 0.0) {
- a = tp->fill_color;
- g = 0.0;
- } else {
- a = 0.0;
- g = 1.0;
- }
- break;
- default:
- g = 0.5;
- a = 0.0;
- }
-#else
if (tp->mode.fill == TPIC_MODE__FILL_SOLID || !tp->fill_color) {
g = 1.0 - tp->fill_color;
a = 0.0;
@@ -254,7 +233,6 @@ set_styles (struct spc_tpic_ *tp,
g = 0.0;
a = tp->fill_color;
}
-#endif
f_ais = (tp->mode.fill == TPIC_MODE__FILL_SHAPE) ? 1 : 0;
diff --git a/Build/source/texk/dvipdfm-x/tt_table.c b/Build/source/texk/dvipdfm-x/tt_table.c
index a07af72cecb..22bf583a9a9 100644
--- a/Build/source/texk/dvipdfm-x/tt_table.c
+++ b/Build/source/texk/dvipdfm-x/tt_table.c
@@ -350,11 +350,10 @@ tt_read_os2__table (sfnt *sfont)
struct tt_os2__table *table = NULL;
int i;
+ table = NEW(1, struct tt_os2__table);
+
if (sfnt_find_table_pos(sfont, "OS/2") > 0) {
sfnt_locate_table(sfont, "OS/2");
-
- table = NEW(1, struct tt_os2__table);
-
table->version = sfnt_get_ushort(sfont);
table->xAvgCharWidth = sfnt_get_short(sfont);
table->usWeightClass = sfnt_get_ushort(sfont);
@@ -407,10 +406,7 @@ tt_read_os2__table (sfnt *sfont)
}
}
}
- }
-#ifndef XETEX
- else {
- table = NEW(1, struct tt_os2__table);
+ } else {
/* used in add_CIDVMetrics() of cidtype0.c */
table->sTypoAscender = 880;
@@ -426,7 +422,6 @@ tt_read_os2__table (sfnt *sfont)
table->panose[i] = 0; /* All Any */
}
}
-#endif
return table;
}
diff --git a/Build/source/texk/dvipdfm-x/type1.c b/Build/source/texk/dvipdfm-x/type1.c
index 67627c8c4bc..110bf7ffc6c 100644
--- a/Build/source/texk/dvipdfm-x/type1.c
+++ b/Build/source/texk/dvipdfm-x/type1.c
@@ -381,12 +381,8 @@ write_fontfile (pdf_font *font, cff_font *cffont, long num_glyphs)
if (!cff_dict_known(cffont->topdict, "Encoding"))
cff_dict_add(cffont->topdict, "Encoding", 1);
private_size = cff_dict_pack((cffont->private)[0], wbuf, WBUF_SIZE);
-#ifdef XETEX
- if (private_size > 0 && !cff_dict_known(cffont->topdict, "Private"))
-#else
/* Private dict is required (but may have size 0) */
if (!cff_dict_known(cffont->topdict, "Private"))
-#endif
cff_dict_add(cffont->topdict, "Private", 2);
topdict->offset[1] = cff_dict_pack(cffont->topdict, wbuf, WBUF_SIZE) + 1;