dvipdfmx: Reduce TL/W32TeX diffs

Merge ChangeLog.PATCHES and ChangeLog.TL into ChangeLog

git-svn-id: svn://tug.org/texlive/trunk@27738 c570f23f-e606-0410-a88d-b1316a301751

21 files changed, 464 insertions, 590 deletions

diff --git a/Build/source/texk/dvipdfmx/ChangeLog b/Build/source/texk/dvipdfmx/ChangeLog
index 49cc3d4aa1b..c4792f6c793 100644
--- a/Build/source/texk/dvipdfmx/ChangeLog
+++ b/Build/source/texk/dvipdfmx/ChangeLog
@@ -1,11 +1,94 @@
-$Header: /home/cvsroot/dvipdfmx/ChangeLog,v 1.290 2011/03/11 03:15:31 chofchof Exp $
+2012-09-19  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
-ChangeLog: Changes for DVIPDFMx
-===============================
+	* ChangeLog.PATCHES, ChangeLog.TL (removed): Now merged ...
+	* ChangeLog: ... into this.
+
+2012-08-31  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Reduce TL/W32TeX diffs.
+	* cidtype0.c, cidtype2.c, cmap_write.c, mpost.c, truetype.c,
+	tt_cmap.c, tt_gsub.c, tt_post.c: Cast function args to avoid
+	WIN32 (MSVC) warnings.
+	* pdfobj.c (pdf_out_xchar): Reformulate to avoid MSVC warnings.
+	* xbb.c (show_usage): Correctly report .bb or .xbb as default.
+	Always use binary mode for output file.
+
+2012-08-26  Akira Kakuto <kakuto@fuk.kindai.ac.jp>
+
+	* src/tt_table.c (tt_read_hhea_table),
+	src/tt_post.c (read_v2_post_names),
+	src/cc_tmap.c (otf_load_Unicode_CMap): typos.
+
+2012-08-23  Khaled Hosny  <khaledhosny@eglug.org>
+
+	* src/Makefile.am: Remove mention of non-existent files.
+
+2012-08-21  Akira Kakuto <kakuto@fuk.kindai.ac.jp>
+
+	* src/tt_post.c (read_v2_post_names): support large truetype fonts
+	which are strictly speaking out of spec, idx > 32767.
+	* src/dvipdfmx.c: support monocase file system.
+
+2012-08-21  keiichirou shikano <k16.shikano@gmail.com>
+
+	* src/cff.c, src/cff.h. src/type1.c: fix type1 SEAC bug.
+
+2012-08-21  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* src/dpxfile.c: Drop tests for __TDS_VERSION__.
+	* configure.ac: Drop definition of __TDS_VERSION__.
+
+2012-08-20  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Flatten, i.e., remove dvipdfmx-20120420/.
+	* Makefile.am (-EXTRA_DIST): Drop  $(DVIPDFMX_TREE){,-PATCHES}.
+	* configure.ac: Drop DVIPDFMX_TREE.
+	* version.ac (removed): Obsolete.
+
+2012-08-20  Khaled Hosny  <khaledhosny@eglug.org>
+
+	* src/dvipdfmx.c, src/mem.c, src/mem.h, src/xbb.c, src/dvipdfmx.c,
+	src/mem.c, src/mem.h, src/xbb.c: Remove memory debugging code.
+
+2012-08-18  Khaled Hosny  <khaledhosny@eglug.org>
+
+	Move contents of dvipdfmx-20120420 to the top directory
+	* Makefile.am, configure.ac, data/Makefile.am, man/Makefile.am,
+	src/Makefile.am: Adapted.
+	* configure.in, m4/cho-kpse.m4, m4/cho-libs.m4, m4/maw-time.m4:
+	Removed.
+
+2012-05-21  Norbert Preining  <preining@logic.at>
+
+	* patch-05-cid-x_map (new): add entries for rml-jis and gbm-jis
+
+2012-05-06  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
+
+	* patch-04-pdftex_map (new): Fix a typo in fontmap.c.
+	* fontmap.c: Allow pdftex.map without PS name.
+
+2012-04-27  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* patch-03-trivial (new): Reduce differences between dvipdfmx
+	and xdvipdfmx:
+	* cid.c, cidtype[02].c, truetype.c, tt_cmap.c, type1c.c:
+	Trivial modifications.
+
+2012-04-25  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* patch-02-MEM_DEBUG (new): Try to avoid mem_debug_check warning.
+	* spc_pdfm.c (spc_handler_pdfm_stream_with_type): Free fullname.
+	* mem.c: Increase MEM_LINE, avoid C99-ism, add tex-k@tug.org.
+
+2012-04-21  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* patch-01-texlive (new): Indicate this the TeX Live version.
+	* dvipdfmx.c (show_version): Print "modified for TeX Live,".
 
 2012-04-20  Norbert Preining  <preining@logic.at>
 
-	* DVIPDFMx-20120420 release
+	Imported snapshot 20120420.
+	* version.ac, man/dvipdfm.1: Adapted.
 
 2012-04-20  Alexander Grahn  <A.Grahn@hzdr.de>
 
@@ -36,6 +119,10 @@ ChangeLog: Changes for DVIPDFMx
 
 	* dvi.c, pdfdev.c: Support for (e-)(u)pTeX dtou direction.
 
+2011-12-06  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Makefile.am: Replace ${prefix}/texmf => $(datarootdir)/texmf.
+
 2011-11-05  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
 
 	* dvi.c, spc-pdfm.c, tfm.c and vf.c: remove incompatible lines
@@ -54,8 +141,17 @@ ChangeLog: Changes for DVIPDFMx
 
 2011-06-15  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
+	* version.ac: New file defining the dvipdfmx version.
+	* configure.ac: Adapt. (AC_TYPE_UINT32_T) Portability fix for AIX.
 	* dpxcrypt.c: Use headers as in configure test for uint32_t.
 
+2011-06-15  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* patch-02-exec_spawn (new): Bug fix for exec_spawn() from
+	Akira Kakuto  <kakuto@fuk.kindai.ac.jp> and Peter Breitenlohner.
+
+	* patch-03-uint32_t (new): Portability fix (for AIX).
+
 2011-06-06  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* dpxfile.c (exec_spawn): Do not quote execvp() arguments.
@@ -68,18 +164,45 @@ ChangeLog: Changes for DVIPDFMx
 
 	* dpxfile.c: fix a bug in exec_spawn().
 
+2011-06-03  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Makefile.am (mapdata*): Do install the map file, still needed
+	in pTeX.
+
+2011-06-01  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Makefile.am (mapdata*): Don't install the map file.
+
 2011-05-31  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* man/extractbb.1: Update extractbb manpage.
 
+2011-05-30  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* doc/Makefile.am: Use ../am/bin_links.am for $(bindir) links.
+
 2011-05-09  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* ../dvipdfmx-20110311/data/dvipdfmx.cfg: Synched from Master.
+	* patch-00-cfg: Adapted (by Karl Berry <karl@tug.org>).
 
 2011-05-03  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* man/extractbb.1: Update man/extractbb.1.
 
+2011-05-03  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Imported snapshot 20110311.
+	* configure.ac: Adapted.
+	* patch-04-dvipdfmx-20110311 (removed): Now included.
+	* patch-01-manpage (new): Update man/extractbb.1.
+
+2011-04-29  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* patch-00-cfg (new): Change dvipdfmx.cfg to use rungs instead of
+	the default ps2pdf -dSAFER, to avoid complete pstricks failure with
+	xetex.
+
 2011-03-11  Jin-Hwan Cho
 
 	* dpxcrypt.c:
@@ -90,6 +213,38 @@ ChangeLog: Changes for DVIPDFMx
 	* dpxfile.c, configure.in, man/extractbb.1:
           Applied the patches for TeX Live 2011 by Peter Breitenlohner.
 
+2011-03-09  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Imported snapshot 20110309.
+	* configure.ac: Adapted.
+	* patch-01-dpxfile, patch-02-manpage, patch-03-sys_wait_h
+	(removed): Now all in the distributed snapshot.
+
+2011-03-08  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* configure.ac: Check for sys/wait.h, in order to define
+	HAVE_SYS_WAIT_H (required for src/dpxfile.c).
+
+2011-03-08  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* patch-03-sys_wait_h (new): Check for sys/wait.h, in order to
+	define HAVE_SYS_WAIT_H (required for src/dpxfile.c).
+
+2011-03-07  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* patch-01-dpxfile (new): Use concat3() instead of concatn().
+	Avoid compiler warnings: add const's; cast `unsigned char' to
+	`unsigned short' for printing.
+
+	* patch-02-manpage (new): Add ebb to NAME; better formatting.
+
+2011-03-07  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Makefile.am, configure.ac: Proxy build system for TeX Live,
+	using the dvipdfmx-20110305 distribution tree.
+	* dvipdfmx-20110305-PATCHES: New directory with patches applied
+	to the dvipdfmx-20110305 distribution.
+
 2011-03-07  Matthias Franz
 
 	* dvi.c, dvi.h, dvipdfmx.c, pdfencrypt.c, pdfencrypt.h, spc_pdfm.c:
@@ -104,12 +259,53 @@ ChangeLog: Changes for DVIPDFMx
           Applied the secutiry patch written by Akira Kakuto
           (suggested by Karl Berry).
 
+2011-02-28  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* src/pngimage.c (create_cspace_ICCBased): Avoid libpng-1.5.x
+	compiler warning.
+
+2011-02-15  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* src/Makefile.am [WIN32]: Add dvipdfmx.exe, ebb.exe, and
+	extractbb.exe wrappers for MinGW.
+
+2010-02-11  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* man: New directory with manual pages (from Master).
+	man/dvipdft.1 needs to be updated and man/dvipdfm.1 replaced by
+	man/dvipdfmx.1 (with a link to dvipdfm.1).
+	* Makefile.am, configure.ac: Adapted.
+
+	* man/extractbb.1, man/dvipdfm.1, dvipdft.1: Formatting.
+
+2010-12-30  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* src/dvipdfmx.c: Check for argv[0] with .exe via strcasecmp().
+
+2010-12-29  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* configure.ac, src/Makefile.am: Ignore shell script for WIN32.
+
 2010-10-11  Matthias Franz
 
 	* dvipdfmx.cfg:
           Added quotes around command line parameters %i and %o
           (suggested by Karl Berry).
 
+2010-06-10  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Avoid using "%hu" with fscanf/sscanf, for older Solaris.
+	* src/pdfobj.c (pdf_open, check_for_pdf_version): Declare minor
+	as unsigned int for use with "%u".
+
+2010-06-08  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Solaris9 doesn't support "%hhu".
+	* src/dpxfile.c (dpx_file_apply_filter):
+	Use (unsigned short) version with "%hu".
+	* src/pdfobj.c (pdf_open, check_for_pdf_version): Declare minor
+	as unsigned short for use with "%hu".
+
 2010-05-29  Matthias Franz
 
 	* dpxfile.c, dpxfile.h, pdfobj.c, pdfximage.c:
@@ -127,6 +323,10 @@ ChangeLog: Changes for DVIPDFMx
 	* dvipdfmx.cfg:
           Generate PDF 1.5 as default (suggested by Karl Berry).
 
+2010-03-29  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* configure.ac: Remove AC_TYPE_SIZE_T, now part of KPSE_COMMON.
+
 2010-03-28 Jin-Hwan Cho
 
 	* dvi.c, dvi.h, dvipdfmx.c, spc_pdfm.c:
@@ -146,6 +346,17 @@ ChangeLog: Changes for DVIPDFMx
 	* pngimage.c:
           Made PNG code work with libpng14, as suggested by Karl Berry.
 
+2010-02-22  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* src/pngimage.c (check_for_png): Replace png_check_sig() by
+	png_sig_cmp() for libpng-1.4.
+	From Hanno Boeck <hanno@hboeck,de>.
+
+2010-02-20  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* src/sfnt.h: #define CHAR as SFNT_CHAR to avoid conflict with
+	CHAR from <winnt.h>.
+
 2010-02-07 Matthias Franz
 
 	* type1.c:
@@ -176,6 +387,10 @@ ChangeLog: Changes for DVIPDFMx
           Added man page for extractbb in new directory man. This
           addresses Debian bug #512357 and a request by Karl Berry.
 
+2009-11-07  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* configure.ac, src/dpxfile.c: Require recent kpathsea version.
+
 2009-10-10  Jin-Hwan Cho
 
 	* dvipdfmx.c, xbb.c:
@@ -205,17 +420,147 @@ ChangeLog: Changes for DVIPDFMx
           does _not_ replace an existing value for the same key has
           been introduced, but there is no short name for it yet.
 
+2009-09-02  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Avoid more maximal compiler warnings:
+	* src/pst_obj.c (pst_new_mark, pst_release_obj, pst_parse_null):
+	Instead of casting a const string to non-const, make a copy and
+	later free the copy.
+
+2009-08-31  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Avoid almost all maximal compiler warnings:
+	src/agl.c (agl_load_listfile),
+	src/cid.c (CIDFont_base_open),
+	src/cff_types.h (cff_dict_entry),
+	src/cff_dict.c (add_dict, cff_dict_add),
+	src/dpxutil.[ch] (read_c_escchar, read_c_litstrc,
+	parse_c_string, parse_c_ident, parse_float_decimal),
+	src/dvi.c (dvi_do_special, read_length, scan_special),
+	src/dvipdfmx.c (read_length, select_paper, select_pages,
+	do_args, read_config_file),
+	src/fontmap.c (skip_blank, parse_string_value,
+	parse_integer_value, fontmap_parse_mapdef_dpm,
+	fontmap_parse_mapdef_dps, pdf_read_fontmap_line,
+	is_pdfm_mapline, pdf_load_fontmap_file),
+	src/mpost.[ch] (mps_scan_bbox, skip_prolog, do_mpost_bind_def,
+	mp_parse_body, mps_exec_inline, mps_include_page, mps_do_page),
+	src/otl_conf.c (parse_uc_coverage, parse_substrule, parse_block),
+	src/otl_opt.c (parse_expr, otl_parse_optstring),
+	src/pdfdev.c (handle_multibyte_string, pdf_dev_set_string),
+	src/pdfdoc.c (name_dict, pdf_doc_init_names),
+	src/pdfencoding.c (load_encoding_file),
+	src/pdfobj.c (find_xref, parse_trailer, pdf_read_object,
+	read_objstm, pdf_get_object),
+	src/pdfparse.[ch] (save, skip_line, skip_white, parse_number,
+	parse_unsigned, parse_gen_ident, parse_ident, parse_val_ident,
+	parse_opt_ident, parse_pdf_number, pn_getc, parse_pdf_name,
+	parse_pdf_boolean, parse_pdf_null, ps_getescc,
+	parse_pdf_literal_string, parse_pdf_hex_string,
+	parse_pdf_string, parse_pdf_tainted_dict, parse_pdf_dict,
+	parse_pdf_array, parse_pdf_stream, parse_pdf_reference,
+	try_pdf_reference, parse_pdf_object),
+	src/spc_color.c (skip_blank, spc_color_check_special,
+	spc_color_setup_handler),
+	spc_dvips.c (parse_filename, spc_dvips_check_special,
+	spc_dvips_setup_handler),
+	src/spc_html.c (parse_key_val, read_html_tag, atopt,
+	spc_html__img_empty, cvt_a_to_tmatrix, spc_html_check_special,
+	spc_html_setup_handler),
+	src/spc_misc.c (spc_handler_postscriptbox,
+	spc_misc_check_special, spc_misc_setup_handler),
+	src/spc_pdfm.c (my_parse_pdf_dict, spc_pdfm_check_special,
+	spc_pdfm_setup_handler),
+	src/spc_tpic.c (skip_blank, spc_tpic_check_special,
+	spc_tpic_setup_handler),
+	src/spc_util.c (skip_blank),
+	src/specials.c (init_special, print_error),
+	src/specials.h (spc_arg), src/subfont.c (read_sfd_record):
+	Rewrite all parsing routines to operate on const strings.
+	Constify start/end pointer args and local vars.
+	Constify struct member strings.  Drop or adjust casts.
+	Cast a few non-const start pointers to 'const char **'.
+	Use a few non-const local vars, not to modify const strings.
+
+2009-08-30  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Avoid some more maximal compiler warnings.
+
+	* src/tt_post.[ch] (tt_post_table): Constify struct member
+	strings and drop casts.
+	(macglyphorder): Declare 'const char**' not 'const char*const*'.
+
+	* src/truetype.c (selectglyph): Use additional const string local
+	var and drop cast.
+
+	* src/dpxcrypt.[ch] (transform, MD5_write): Constify args.
+	* src/pdfencrypt.c (compute_user_password): Drop cast.
+
+	* src/fontmap.c (chop_sfd_name): Drop useless cast.
+	(substr): Constify string arg and local var.
+	(strip_options): Constify local var and drop cast.
+
+	* src/cmap_write.c (CMap_create_stream): Constify cast.
+	* src/pdfcolor.c (str2iccSig, iccp_check_colorspace,
+	iccp_get_rendering_intent, iccp_unpack_header,
+	iccp_get_checksum): Constify local vars and casts.
+	* src/pdfencoding.[ch] (pdf_encoding_new_encoding,
+	pdf_encoding_findresource): Constify args.
+	* src/pdfobj.c (pdf_out): Constify cast.
+	* src/specials.c (spc_exec_special): Drop useless casts.
+
+	* src/pdfdoc.c (pdf_doc_add_goto): Constify local vars.
+
 2009-08-30  Matthias Franz
 
 	* dvipdfmx.cfg:
           Turned on optimization of PDF destinations by default.
 
+2009-08-28  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Avoid some more compiler warnings.
+
+	* src/pdfobj.c (parse_xref_stream): Drop inner declaration of
+	size and use size_obj, not to shadow previous local (diff type).
+	Rename local index=>index_obj, not to shadow string function.
+
 2009-08-27  Matthias Franz
 
 	* truetype.c, type1.c, type1c.c:
           Changed precision in font widths arrays from 1.0 to 0.1.
           (Applies only to Type 1, Type 1C and TrueType, not PK fonts.)
 
+2009-08-27  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Avoid some more maximal compiler warnings.
+
+	* src/cff.[ch] (cff_get_sid, cff_add_string): Constify string arg.
+	* src/cidtype2.c (find_tocode_cmap), src/cmap.c (CMap_decode_char),
+	src/dpxfile.c (dpx_create_temp_file, dpx_file_apply_filter):
+	Constify local vars and drop casts.
+	* src/dpxutil.c (get_hash): Constify cast.
+	* src/pdfnames.c (cmp_key), src/t1_char.c (stem_compare),
+	tt_glyf.c (glyf_cmp): Constify local vars and adjust casts.
+	* src/t1_load.[ch] (t1_get_standard_glyph): Constify return
+	type and drop cast.
+	* src/type1.c (pdf_font_load_type1): Constify local vars.
+	* src/cidtype0.c (CIDFont_type0_t1cdofont,
+	CIDFont_type0_t1dofont): Drop casts.
+
+2009-08-26  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Avoid some maximal compiler warnings.
+
+	* src/mfileio.c (os_error),
+	src/pdfencoding.c (pdf_encoding_complete):
+	ANSI C function definitions, i.e., '()'=>'(void)'.
+
+	* src/agl.c (skip_capital, skip_modifier): Constify string args.
+	(is_smallcap, agl_name_convert_unicode, put_unicode_glyph,
+	agl_sput_UTF16BE, agl_get_unicodes): Constify local strings
+	and drop casts.
+	* src/xbb.c (extensions): Constify global strings.
+
 2009-08-23  Matthias Franz
 
 	* epdf.c, pdfdoc.c, pdfdoc.h, pdfximage.c, pdfximage.h, xbb.c:
@@ -237,6 +582,10 @@ ChangeLog: Changes for DVIPDFMx
 	* tt_post.c:
           Fixed the crashing bug with Mona font found by Alexis Ballier.
 
+2009-07-17  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* src/pdfximage.h: add prototype for pdf_ximage_get_subtype.
+
 2009-07-08  Jin-Hwan Cho
 
 	* dvipdfmx.c:
@@ -249,12 +598,40 @@ ChangeLog: Changes for DVIPDFMx
           to resolve the conflict with bmpsize package in dvipdfm
           emulation mode; reported by Heiko Oberdiek.
 
+2009-06-20  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Makefile.am (AM_CFLAGS): enable compiler warnings.
+	* src/pdfobj.c (pdf_file_new): declare as static.
+
+2009-06-05  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* configure.ac: replace '--enable-tetex-build' by
+	'--enable-texlive-build' (automatic if configured as part of the
+	TeXLive tree).
+
+2009-06-04  Karl Berry  <karl@tug.org>
+
+	* src/Makefile.am (dist_bin_SCRIPTS): dvipdft.
+	* src/dvipdft: revised script from Matthias to replace
+	version in dvipdfm.
+
+2009-05-27  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Adapt to TL2009 build system.
+
 2009-05-22  Jin-Hwan Cho
 
 	* generic/pgf-doc-diff.version2cvs, generic/pgf-generic-diff.version2cvs:
           Removed the patches for the CVS version of pgf,
           because they are applied to the main stream.
 
+2009-05-15  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* pdfdoc.c (pdf_doc_get_page): Avoid C99isms
+	(variable declaration not at the beginning of a block).
+
+	From  Vladimir Volovich <vvv@vsu.ru>
+
 2009-05-10  Matthias Franz
 
 	* epdf.c:
@@ -393,11 +770,6 @@ ChangeLog: Changes for DVIPDFMx
 	  of filename check in dvipdfmx.c (now uses <libgen.h>), new
 	  version numbering for xbb (same as dvipdfmx version)
 
-2009-03-15  Jin-Hwan Cho
-
-	* data/Makefile.am, data/Makefile.in, data/EUC-UCS2:
-          Revive the cmap EUC-UCS2; suggested by Nobuyuki Tsuchimura.
-
 2009-03-16  Matthias Franz
 
 	* pdfdev.c, pdfdraw.c, spc_html.c, spc_pdfm.c, spc_tpic.c:
@@ -408,6 +780,17 @@ ChangeLog: Changes for DVIPDFMx
 
           pdf_doc_add_page_content(work_buffer, len);  /* op: q cm *
 
+2009-03-16  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* src/cff.c, src/dpxutil.c, src/mem.c, src/pdfencoding.c,
+	src/pdfencrypt.c: Must include Kpathsea headers (via `system.h')
+	before including `mem.h'.
+
+2009-03-15  Jin-Hwan Cho
+
+	* data/Makefile.am, data/Makefile.in, data/EUC-UCS2:
+          Revive the cmap EUC-UCS2; suggested by Nobuyuki Tsuchimura.
+
 2009-03-12  Matthias Franz
 
 	* dvipdfmx.c:
@@ -765,6 +1148,19 @@ ChangeLog: Changes for DVIPDFMx
 	  (all contributed by Peter Breitenlohner <peb at mppmu.mpg.de>
 	  via Karl Berry)
 
+2008-04-06  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* configure.in: respect library dependencies.
+
+2008-03-04  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Makefile.am: added `ACLOCAL_AMFLAGS -I m4'
+	* configure.in: moved macro definitions ...
+	* m4/maw-time.m4 (new): ... to here
+	* acinclude.m4 (removed): moved macro definitions ...
+	* m4/maw-kpse.m4, maw-libs.m4 (both new): ... to here; these
+	files are the same as in ../xdvipdfmx.
+
 2008-03-01  Matthias Franz
 
 	* dvipdfmx.def:
diff --git a/Build/source/texk/dvipdfmx/ChangeLog.PATCHES b/Build/source/texk/dvipdfmx/ChangeLog.PATCHES
deleted file mode 100644
index a3f68887592..00000000000
--- a/Build/source/texk/dvipdfmx/ChangeLog.PATCHES
+++ /dev/null
@@ -1,116 +0,0 @@
-2012-05-21  Norbert Preining  <preining@logic.at>
-
-	* patch-05-cid-x_map (new): add entries for rml-jis and gbm-jis
-
-2012-05-06  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
-
-	* patch-04-pdftex_map (new): Fix a typo in fontmap.c.
-	* fontmap.c: Allow pdftex.map without PS name.
-
-2012-04-27  Peter Breitenlohner  <peb@mppmu.mpg.de>
-
-	* patch-03-trivial (new): Reduce differences between dvipdfmx
-	and xdvipdfmx:
-	* cid.c, cidtype[02].c, truetype.c, tt_cmap.c, type1c.c:
-	Trivial modifications.
-
-2012-04-25  Peter Breitenlohner  <peb@mppmu.mpg.de>
-
-	* patch-02-MEM_DEBUG (new): Try to avoid mem_debug_check warning.
-	* spc_pdfm.c (spc_handler_pdfm_stream_with_type): Free fullname.
-	* mem.c: Increase MEM_LINE, avoid C99-ism, add tex-k@tug.org.
-
-2012-04-21  Peter Breitenlohner  <peb@mppmu.mpg.de>
-
-	* patch-01-texlive (new): Indicate this the TeX Live version.
-	* dvipdfmx.c (show_version): Print "modified for TeX Live,".
-
-2012-04-20  Norbert Preining  <preining@logic.at>
-
-	Created snapshot 20120420.
-	* remove all patches but patch-00-cfg and include them in
-	proper dvipdfmx, add also the changelogs there.
-
-2012-03-29  Peter Breitenlohner  <peb@mppmu.mpg.de>
-
-	* patch-08-extern (new): Remove extern decls from *.c files.
-	* dpxfile.c: Drop obsolete comment that mkstemp may not be
-	declared in stdlib.h.
-	* spc_color.c: Drop 'extern' from function definition.
-	* error.h: ANSI C prototype for error_cleanup().
-	* error.c: Drop extern decl, now in error.h.
-	* dvipdfmx.c: Add '#include "error.h"' and drop extern decl.
-
-2012-03-05  Peter Breitenlohner  <peb@mppmu.mpg.de>
-
-	* patch-07-surrogates (new): Handle UTP-16 surrogates for UCS-4
-	supplementary planes.  Based on patch from Tanaka Takuji-san.
-
-2012-01-17  Hironori Kitagawa  <h_kitagawa2001@yahoo.co.jp>
-
-	* patch-06-dtou (new): Support for (e-)(u)pTeX dtou direction.
-
-2011-11-05  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
-
-	* patch-04-uptex: remove incompatible lines and erase #ifdef upTeX.
-
-2011-10-18  Peter Breitenlohner  <peb@mppmu.mpg.de>
-
-	* patch-05-typo (new): Fix typo "featre" -> "feature".
-
-2011-09-07  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
-
-	* patch-04-uptex (new): (e-)upTeX support.
-
-2011-06-15  Peter Breitenlohner  <peb@mppmu.mpg.de>
-
-	* patch-02-exec_spawn (new): Bug fix for exec_spawn() from
-	Akira Kakuto  <kakuto@fuk.kindai.ac.jp> and Peter Breitenlohner.
-
-	* patch-03-uint32_t (new): Portability fix (for AIX).
-
-2011-05-31  Peter Breitenlohner  <peb@mppmu.mpg.de>
-
-	* patch-01-manpage: Adapted to modified extractbb manpage.
-
-2011-05-09  Peter Breitenlohner  <peb@mppmu.mpg.de>
-
-	* ../dvipdfmx-20110311/data/dvipdfmx.cfg: Synched from Master.
-	* patch-00-cfg: Adapted (by Karl Berry <karl@tug.org>).
-
-2011-05-03  Peter Breitenlohner  <peb@mppmu.mpg.de>
-
-	Imported snapshot 20110311.
-	* patch-04-dvipdfmx-20110311 (removed): Now included.
-	* patch-01-manpage (new): Update man/extractbb.1.
-
-2011-04-29  Peter Breitenlohner  <peb@mppmu.mpg.de>
-
-	* patch-00-cfg (new): Change dvipdfmx.cfg to use rungs instead of
-	the default ps2pdf -dSAFER, to avoid complete pstricks failure with
-	xetex.
-
-2011-03-11  Peter Breitenlohner  <peb@mppmu.mpg.de>
-
-	* patch-04-dvipdfmx-20110311 (new): From upstream.
-
-2011-03-09  Peter Breitenlohner  <peb@mppmu.mpg.de>
-
-	Imported snapshot 20110309.
-	* patch-01-dpxfile, patch-02-manpage, patch-03-sys_wait_h
-	(removed): Now all in the distributed snapshot.
-
-2011-03-08  Peter Breitenlohner  <peb@mppmu.mpg.de>
-
-	* patch-03-sys_wait_h (new): Check for sys/wait.h, in order to
-	define HAVE_SYS_WAIT_H (required for src/dpxfile.c).
-
-2011-03-07  Peter Breitenlohner  <peb@mppmu.mpg.de>
-
-	Imported snapshot 20110305.
-
-	* patch-01-dpxfile (new): Use concat3() instead of concatn().
-	Avoid compiler warnings: add const's; cast `unsigned char' to
-	`unsigned short' for printing.
-
-	* patch-02-manpage (new): Add ebb to NAME; better formatting.
diff --git a/Build/source/texk/dvipdfmx/ChangeLog.TL b/Build/source/texk/dvipdfmx/ChangeLog.TL
deleted file mode 100644
index df8a1f6f2b0..00000000000
--- a/Build/source/texk/dvipdfmx/ChangeLog.TL
+++ /dev/null
@@ -1,346 +0,0 @@
-2012-08-26  Akira Kakuto <kakuto@fuk.kindai.ac.jp>
-
-	* src/tt_table.c (tt_read_hhea_table),
-	src/tt_post.c (read_v2_post_names),
-	src/cc_tmap.c (otf_load_Unicode_CMap): typos.
-
-2012-08-23  Khaled Hosny  <khaledhosny@eglug.org>
-
-	* src/Makefile.am: Remove mention of non-existent files.
-
-2012-08-21  Akira Kakuto <kakuto@fuk.kindai.ac.jp>
-
-	* src/tt_post.c (read_v2_post_names): support large truetype fonts
-	which are strictly speaking out of spec, idx > 32767.
-	* src/dvipdfmx.c: support monocase file system.
-
-2012-08-21  keiichirou shikano <k16.shikano@gmail.com>
-
-	* src/cff.c, src/cff.h. src/type1.c: fix type1 SEAC bug.
-
-2012-08-20  Khaled Hosny  <khaledhosny@eglug.org>
-
-	* src/dvipdfmx.c, src/mem.c, src/mem.h, src/xbb.c, src/dvipdfmx.c,
-	src/mem.c, src/mem.h, src/xbb.c: Remove memory debugging code.
-
-2012-08-18  Khaled Hosny  <khaledhosny@eglug.org>
-
-	Move contents of dvipdfmx-20120420 to the top directory
-	* Makefile.am, configure.ac, data/Makefile.am, man/Makefile.am,
-	src/Makefile.am: Adapted.
-	* configure.in, m4/cho-kpse.m4, m4/cho-libs.m4, m4/maw-time.m4:
-	Removed.
-
-2012-04-20  Norbert Preining  <preining@logic.at>
-
-	Imported snapshot 20120420.
-	* version.ac, man/dvipdfm.1: Adapted.
-
-2011-12-06  Peter Breitenlohner  <peb@mppmu.mpg.de>
-
-	* Makefile.am: Replace ${prefix}/texmf => $(datarootdir)/texmf.
-
-2011-11-05  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
-
-	* dvi.c, spc-pdfm.c, tfm.c and vf.c: remove incompatible lines
-	with the non-upTeX case and erase #ifdef upTeX.
-
-2011-09-07  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
-
-	* dvi.c, spc-pdfm.c, tfm.c and vf.c: apply patches by Takuji Tanaka
-	in order to support (e)-upTeX. The (e)-upTeX support is enabled by
-	defining upTeX. In the case -DupTeX, the dvipdfmx must be compatible
-	with the old one, which can be obtained without -DupTeX.
-
-2011-06-15  Peter Breitenlohner  <peb@mppmu.mpg.de>
-
-	* version.ac: New file defining the dvipdfmx version.
-	* configure.ac: Adapt. (AC_TYPE_UINT32_T) Portability fix for AIX.
-	* dpxcrypt.c: Use headers as in configure test for uint32_t.
-
-2011-06-06  Peter Breitenlohner  <peb@mppmu.mpg.de>
-
-	* dpxfile.c (exec_spawn): Do not quote execvp() arguments.
-
-2011-06-03  Peter Breitenlohner  <peb@mppmu.mpg.de>
-
-	* dpxfile.c (exec_spawn): Exit if execvp() fails, some clean up.
-
-2011-06-03  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
-
-	* dpxfile.c: fix a bug in exec_spawn().
-
-2011-06-03  Peter Breitenlohner  <peb@mppmu.mpg.de>
-
-	* Makefile.am (mapdata*): Do install the map file, still needed
-	in pTeX.
-
-2011-06-01  Peter Breitenlohner  <peb@mppmu.mpg.de>
-
-	* Makefile.am (mapdata*): Don't install the map file.
-
-2011-05-30  Peter Breitenlohner  <peb@mppmu.mpg.de>
-
-	* doc/Makefile.am: Use ../am/bin_links.am for $(bindir) links.
-
-2011-05-03  Peter Breitenlohner  <peb@mppmu.mpg.de>
-
-	Imported snapshot 20110311.
-	* configure.ac: Adapted.
-
-2011-03-09  Peter Breitenlohner  <peb@mppmu.mpg.de>
-
-	Imported snapshot 20110309.
-	* configure.ac: Adapted.
-
-2011-03-08  Peter Breitenlohner  <peb@mppmu.mpg.de>
-
-	* configure.ac: Check for sys/wait.h, in order to define
-	HAVE_SYS_WAIT_H (required for src/dpxfile.c).
-
-2011-03-07  Peter Breitenlohner  <peb@mppmu.mpg.de>
-
-	* Makefile.am, configure.ac: Proxy build system for TeX Live,
-	using the dvipdfmx-20110305 distribution tree.
-	* dvipdfmx-20110305-PATCHES: New directory with patches applied
-	to the dvipdfmx-20110305 distribution.
-
-2011-02-28  Peter Breitenlohner  <peb@mppmu.mpg.de>
-
-	* src/pngimage.c (create_cspace_ICCBased): Avoid libpng-1.5.x
-	compiler warning.
-
-2011-02-15  Peter Breitenlohner  <peb@mppmu.mpg.de>
-
-	* src/Makefile.am [WIN32]: Add dvipdfmx.exe, ebb.exe, and
-	extractbb.exe wrappers for MinGW.
-
-2010-02-11  Peter Breitenlohner  <peb@mppmu.mpg.de>
-
-	* man: New directory with manual pages (from Master).
-	man/dvipdft.1 needs to be updated and man/dvipdfm.1 replaced by
-	man/dvipdfmx.1 (with a link to dvipdfm.1).
-	* Makefile.am, configure.ac: Adapted.
-
-	* man/extractbb.1, man/dvipdfm.1, dvipdft.1: Formatting.
-
-2010-12-30  Peter Breitenlohner  <peb@mppmu.mpg.de>
-
-	* src/dvipdfmx.c: Check for argv[0] with .exe via strcasecmp().
-
-2010-12-29  Peter Breitenlohner  <peb@mppmu.mpg.de>
-
-	* configure.ac, src/Makefile.am: Ignore shell script for WIN32.
-
-2010-06-10  Peter Breitenlohner  <peb@mppmu.mpg.de>
-
-	Avoid using "%hu" with fscanf/sscanf, for older Solaris.
-	* src/pdfobj.c (pdf_open, check_for_pdf_version): Declare minor
-	as unsigned int for use with "%u".
-
-2010-06-08  Peter Breitenlohner  <peb@mppmu.mpg.de>
-
-	Solaris9 doesn't support "%hhu".
-	* src/dpxfile.c (dpx_file_apply_filter):
-	Use (unsigned short) version with "%hu".
-	* src/pdfobj.c (pdf_open, check_for_pdf_version): Declare minor
-	as unsigned short for use with "%hu".
-
-2010-03-29  Peter Breitenlohner  <peb@mppmu.mpg.de>
-
-	* configure.ac: Remove AC_TYPE_SIZE_T, now part of KPSE_COMMON.
-
-2010-02-22  Peter Breitenlohner  <peb@mppmu.mpg.de>
-
-	* src/pngimage.c (check_for_png): Replace png_check_sig() by
-	png_sig_cmp() for libpng-1.4.
-	From Hanno Boeck <hanno@hboeck,de>.
-
-2010-02-20  Peter Breitenlohner  <peb@mppmu.mpg.de>
-
-	* src/sfnt.h: #define CHAR as SFNT_CHAR to avoid conflict with
-	CHAR from <winnt.h>.
-
-2009-11-07  Peter Breitenlohner  <peb@mppmu.mpg.de>
-
-	* configure.ac, src/dpxfile.c: Require recent kpathsea version.
-
-2009-09-02  Peter Breitenlohner  <peb@mppmu.mpg.de>
-
-	Avoid more maximal compiler warnings:
-	* src/pst_obj.c (pst_new_mark, pst_release_obj, pst_parse_null):
-	Instead of casting a const string to non-const, make a copy and
-	later free the copy.
-
-2009-08-31  Peter Breitenlohner  <peb@mppmu.mpg.de>
-
-	Avoid almost all maximal compiler warnings:
-	src/agl.c (agl_load_listfile),
-	src/cid.c (CIDFont_base_open),
-	src/cff_types.h (cff_dict_entry),
-	src/cff_dict.c (add_dict, cff_dict_add),
-	src/dpxutil.[ch] (read_c_escchar, read_c_litstrc,
-	parse_c_string, parse_c_ident, parse_float_decimal),
-	src/dvi.c (dvi_do_special, read_length, scan_special),
-	src/dvipdfmx.c (read_length, select_paper, select_pages,
-	do_args, read_config_file),
-	src/fontmap.c (skip_blank, parse_string_value,
-	parse_integer_value, fontmap_parse_mapdef_dpm,
-	fontmap_parse_mapdef_dps, pdf_read_fontmap_line,
-	is_pdfm_mapline, pdf_load_fontmap_file),
-	src/mpost.[ch] (mps_scan_bbox, skip_prolog, do_mpost_bind_def,
-	mp_parse_body, mps_exec_inline, mps_include_page, mps_do_page),
-	src/otl_conf.c (parse_uc_coverage, parse_substrule, parse_block),
-	src/otl_opt.c (parse_expr, otl_parse_optstring),
-	src/pdfdev.c (handle_multibyte_string, pdf_dev_set_string),
-	src/pdfdoc.c (name_dict, pdf_doc_init_names),
-	src/pdfencoding.c (load_encoding_file),
-	src/pdfobj.c (find_xref, parse_trailer, pdf_read_object,
-	read_objstm, pdf_get_object),
-	src/pdfparse.[ch] (save, skip_line, skip_white, parse_number,
-	parse_unsigned, parse_gen_ident, parse_ident, parse_val_ident,
-	parse_opt_ident, parse_pdf_number, pn_getc, parse_pdf_name,
-	parse_pdf_boolean, parse_pdf_null, ps_getescc,
-	parse_pdf_literal_string, parse_pdf_hex_string,
-	parse_pdf_string, parse_pdf_tainted_dict, parse_pdf_dict,
-	parse_pdf_array, parse_pdf_stream, parse_pdf_reference,
-	try_pdf_reference, parse_pdf_object),
-	src/spc_color.c (skip_blank, spc_color_check_special,
-	spc_color_setup_handler),
-	spc_dvips.c (parse_filename, spc_dvips_check_special,
-	spc_dvips_setup_handler),
-	src/spc_html.c (parse_key_val, read_html_tag, atopt,
-	spc_html__img_empty, cvt_a_to_tmatrix, spc_html_check_special,
-	spc_html_setup_handler),
-	src/spc_misc.c (spc_handler_postscriptbox,
-	spc_misc_check_special, spc_misc_setup_handler),
-	src/spc_pdfm.c (my_parse_pdf_dict, spc_pdfm_check_special,
-	spc_pdfm_setup_handler),
-	src/spc_tpic.c (skip_blank, spc_tpic_check_special,
-	spc_tpic_setup_handler),
-	src/spc_util.c (skip_blank),
-	src/specials.c (init_special, print_error),
-	src/specials.h (spc_arg), src/subfont.c (read_sfd_record):
-	Rewrite all parsing routines to operate on const strings.
-	Constify start/end pointer args and local vars.
-	Constify struct member strings.  Drop or adjust casts.
-	Cast a few non-const start pointers to 'const char **'.
-	Use a few non-const local vars, not to modify const strings.
-
-2009-08-30  Peter Breitenlohner  <peb@mppmu.mpg.de>
-
-	Avoid some more maximal compiler warnings.
-
-	* src/tt_post.[ch] (tt_post_table): Constify struct member
-	strings and drop casts.
-	(macglyphorder): Declare 'const char**' not 'const char*const*'.
-
-	* src/truetype.c (selectglyph): Use additional const string local
-	var and drop cast.
-
-	* src/dpxcrypt.[ch] (transform, MD5_write): Constify args.
-	* src/pdfencrypt.c (compute_user_password): Drop cast.
-
-	* src/fontmap.c (chop_sfd_name): Drop useless cast.
-	(substr): Constify string arg and local var.
-	(strip_options): Constify local var and drop cast.
-
-	* src/cmap_write.c (CMap_create_stream): Constify cast.
-	* src/pdfcolor.c (str2iccSig, iccp_check_colorspace,
-	iccp_get_rendering_intent, iccp_unpack_header,
-	iccp_get_checksum): Constify local vars and casts.
-	* src/pdfencoding.[ch] (pdf_encoding_new_encoding,
-	pdf_encoding_findresource): Constify args.
-	* src/pdfobj.c (pdf_out): Constify cast.
-	* src/specials.c (spc_exec_special): Drop useless casts.
-
-	* src/pdfdoc.c (pdf_doc_add_goto): Constify local vars.
-
-2009-08-28  Peter Breitenlohner  <peb@mppmu.mpg.de>
-
-	Avoid some more compiler warnings.
-
-	* src/pdfobj.c (parse_xref_stream): Drop inner declaration of
-	size and use size_obj, not to shadow previous local (diff type).
-	Rename local index=>index_obj, not to shadow string function.
-
-2009-08-27  Peter Breitenlohner  <peb@mppmu.mpg.de>
-
-	Avoid some more maximal compiler warnings.
-
-	* src/cff.[ch] (cff_get_sid, cff_add_string): Constify string arg.
-	* src/cidtype2.c (find_tocode_cmap), src/cmap.c (CMap_decode_char),
-	src/dpxfile.c (dpx_create_temp_file, dpx_file_apply_filter):
-	Constify local vars and drop casts.
-	* src/dpxutil.c (get_hash): Constify cast.
-	* src/pdfnames.c (cmp_key), src/t1_char.c (stem_compare),
-	tt_glyf.c (glyf_cmp): Constify local vars and adjust casts.
-	* src/t1_load.[ch] (t1_get_standard_glyph): Constify return
-	type and drop cast.
-	* src/type1.c (pdf_font_load_type1): Constify local vars.
-	* src/cidtype0.c (CIDFont_type0_t1cdofont,
-	CIDFont_type0_t1dofont): Drop casts.
-
-2009-08-26  Peter Breitenlohner  <peb@mppmu.mpg.de>
-
-	Avoid some maximal compiler warnings.
-
-	* src/mfileio.c (os_error),
-	src/pdfencoding.c (pdf_encoding_complete):
-	ANSI C function definitions, i.e., '()'=>'(void)'.
-
-	* src/agl.c (skip_capital, skip_modifier): Constify string args.
-	(is_smallcap, agl_name_convert_unicode, put_unicode_glyph,
-	agl_sput_UTF16BE, agl_get_unicodes): Constify local strings
-	and drop casts.
-	* src/xbb.c (extensions): Constify global strings.
-
-2009-07-17  Peter Breitenlohner  <peb@mppmu.mpg.de>
-
-	* src/pdfximage.h: add prototype for pdf_ximage_get_subtype.
-
-2009-06-20  Peter Breitenlohner  <peb@mppmu.mpg.de>
-
-	* Makefile.am (AM_CFLAGS): enable compiler warnings.
-	* src/pdfobj.c (pdf_file_new): declare as static.
-
-2009-06-05  Peter Breitenlohner  <peb@mppmu.mpg.de>
-
-	* configure.ac: replace '--enable-tetex-build' by
-	'--enable-texlive-build' (automatic if configured as part of the
-	TeXLive tree).
-
-2009-06-04  Karl Berry  <karl@tug.org>
-
-	* src/Makefile.am (dist_bin_SCRIPTS): dvipdft.
-	* src/dvipdft: revised script from Matthias to replace
-	version in dvipdfm.
-
-2009-05-27  Peter Breitenlohner  <peb@mppmu.mpg.de>
-
-	Adapt to TL2009 build system.
-
-2009-05-15  Peter Breitenlohner  <peb@mppmu.mpg.de>
-
-	* pdfdoc.c (pdf_doc_get_page): Avoid C99isms
-	(variable declaration not at the beginning of a block).
-
-	From  Vladimir Volovich <vvv@vsu.ru>
-
-2009-03-16  Peter Breitenlohner  <peb@mppmu.mpg.de>
-	* src/cff.c, src/dpxutil.c, src/mem.c, src/pdfencoding.c,
-	src/pdfencrypt.c: Must include Kpathsea headers (via `system.h')
-	before including `mem.h'.
-
-2008-04-06  Peter Breitenlohner  <peb@mppmu.mpg.de>
-
-	* configure.in: respect library dependencies.
-
-2008-03-04  Peter Breitenlohner  <peb@mppmu.mpg.de>
-
-	* Makefile.am: added `ACLOCAL_AMFLAGS -I m4'
-	* configure.in: moved macro definitions ...
-	* m4/maw-time.m4 (new): ... to here
-	* acinclude.m4 (removed): moved macro definitions ...
-	* m4/maw-kpse.m4, maw-libs.m4 (both new): ... to here; these
-	files are the same as in ../xdvipdfmx.
diff --git a/Build/source/texk/dvipdfmx/Makefile.am b/Build/source/texk/dvipdfmx/Makefile.am
index e0f62c211dc..d35b6600319 100644
--- a/Build/source/texk/dvipdfmx/Makefile.am
+++ b/Build/source/texk/dvipdfmx/Makefile.am
@@ -15,12 +15,3 @@ config.force: $(ZLIB_DEPEND) $(LIBPNG_DEPEND) $(KPATHSEA_DEPEND)
 
 DISTCLEANFILES = config.force
 
-EXTRA_DIST = \
-	ChangeLog.PATCHES \
-	ChangeLog.TL \
-	data
-
-# in case of an SVN repository
-dist-hook:
-	rm -rf `find $(distdir) -name .svn`
-
diff --git a/Build/source/texk/dvipdfmx/Makefile.in b/Build/source/texk/dvipdfmx/Makefile.in
index 6bcae86126b..0a763da9a70 100644
--- a/Build/source/texk/dvipdfmx/Makefile.in
+++ b/Build/source/texk/dvipdfmx/Makefile.in
@@ -279,11 +279,6 @@ top_srcdir = @top_srcdir@
 ACLOCAL_AMFLAGS = -I ../../m4
 SUBDIRS = src man data
 DISTCLEANFILES = config.force
-EXTRA_DIST = \
-	ChangeLog.PATCHES \
-	ChangeLog.TL \
-	data
-
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
@@ -540,9 +535,6 @@ distdir: $(DISTFILES)
 	      || exit 1; \
 	  fi; \
 	done
-	$(MAKE) $(AM_MAKEFLAGS) \
-	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
-	  dist-hook
 	-test -n "$(am__skip_mode_fix)" \
 	|| find "$(distdir)" -type d ! -perm -755 \
 		-exec chmod u+rwx,go+rx {} \; -o \
@@ -781,19 +773,18 @@ uninstall-am:
 	all all-am all-local am--refresh check check-am clean \
 	clean-cscope clean-generic clean-libtool cscope cscopelist \
 	cscopelist-recursive ctags ctags-recursive dist dist-all \
-	dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar dist-tarZ \
-	dist-xz dist-zip distcheck distclean distclean-generic \
-	distclean-hdr distclean-libtool distclean-tags distcleancheck \
-	distdir distuninstallcheck dvi dvi-am html html-am info \
-	info-am install install-am install-data install-data-am \
-	install-dvi install-dvi-am install-exec install-exec-am \
-	install-html install-html-am install-info install-info-am \
-	install-man install-pdf install-pdf-am install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am
+	dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ dist-xz \
+	dist-zip distcheck distclean distclean-generic distclean-hdr \
+	distclean-libtool distclean-tags distcleancheck distdir \
+	distuninstallcheck dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am tags tags-recursive uninstall uninstall-am
 
 
 all-local: config.force
@@ -802,10 +793,6 @@ config.force: $(ZLIB_DEPEND) $(LIBPNG_DEPEND) $(KPATHSEA_DEPEND)
 	echo timestamp >config.force
 	$(SHELL) ./config.status --recheck
 
-# in case of an SVN repository
-dist-hook:
-	rm -rf `find $(distdir) -name .svn`
-
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/Build/source/texk/dvipdfmx/config.h.in b/Build/source/texk/dvipdfmx/config.h.in
index 9397e93402d..fe46987f5a5 100644
--- a/Build/source/texk/dvipdfmx/config.h.in
+++ b/Build/source/texk/dvipdfmx/config.h.in
@@ -262,9 +262,6 @@
    #define below would cause a syntax error. */
 #undef _UINT64_T
 
-/* Define to 0x200406L if your libkpathsea supports enc formats. */
-#undef __TDS_VERSION__
-
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const
 
diff --git a/Build/source/texk/dvipdfmx/configure b/Build/source/texk/dvipdfmx/configure
index f912083519b..ac1c0b0b5ce 100755
--- a/Build/source/texk/dvipdfmx/configure
+++ b/Build/source/texk/dvipdfmx/configure
@@ -15620,10 +15620,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-
-$as_echo "#define __TDS_VERSION__ 0x200406L" >>confdefs.h
-
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for native WIN32 or MINGW32" >&5
 $as_echo_n "checking for native WIN32 or MINGW32... " >&6; }
 if ${kpse_cv_have_win32+:} false; then :
@@ -15679,7 +15675,7 @@ else
 fi
 
 
-ac_config_files="$ac_config_files Makefile src/Makefile data/Makefile man/Makefile"
+ac_config_files="$ac_config_files Makefile data/Makefile man/Makefile src/Makefile"
 
 
 cat >confcache <<\_ACEOF
@@ -16701,9 +16697,9 @@ do
     "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-    "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
     "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
     "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
+    "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
diff --git a/Build/source/texk/dvipdfmx/configure.ac b/Build/source/texk/dvipdfmx/configure.ac
index 4a16b05200a..d5f9fcbf3c1 100644
--- a/Build/source/texk/dvipdfmx/configure.ac
+++ b/Build/source/texk/dvipdfmx/configure.ac
@@ -79,16 +79,13 @@ if test "x$enable_texlive_build" != xyes || test ! -d $srcdir/../kpathsea; then
   CHO_CHECK_LIBPAPER
 fi
 
-AC_DEFINE([__TDS_VERSION__], [0x200406L],
-	  [Define to 0x200406L if your libkpathsea supports enc formats.])
-
 KPSE_CHECK_WIN32
 AM_CONDITIONAL([WIN32], [test "x$kpse_cv_have_win32" != xno])
 
 AC_CONFIG_FILES([Makefile
-		 src/Makefile
 		 data/Makefile
 		 man/Makefile
+		 src/Makefile
 		 ])
 
 AC_OUTPUT
diff --git a/Build/source/texk/dvipdfmx/data/Makefile.am b/Build/source/texk/dvipdfmx/data/Makefile.am
index 0391e31015f..831fbe0530a 100644
--- a/Build/source/texk/dvipdfmx/data/Makefile.am
+++ b/Build/source/texk/dvipdfmx/data/Makefile.am
@@ -1,16 +1,11 @@
 configdatadir = $(datarootdir)/texmf/dvipdfmx
-dist_configdata_DATA = \
-  $(srcdir)/dvipdfmx.cfg
+dist_configdata_DATA = dvipdfmx.cfg
  
 glyphlistdatadir = $(datarootdir)/texmf-dist/fonts/map/glyphlist
-dist_glyphlistdata_DATA = \
-  $(srcdir)/glyphlist.txt \
-  $(srcdir)/pdfglyphlist.txt
+dist_glyphlistdata_DATA = glyphlist.txt pdfglyphlist.txt
 
 mapdatadir = $(datarootdir)/texmf/fonts/map/dvipdfmx
-dist_mapdata_DATA = \
-  $(srcdir)/cid-x.map
+dist_mapdata_DATA = cid-x.map
 
 cmapdatadir = $(datarootdir)/texmf/fonts/cmap/dvipdfmx
-dist_cmapdata_DATA = \
-  $(srcdir)/EUC-UCS2
+dist_cmapdata_DATA = EUC-UCS2
diff --git a/Build/source/texk/dvipdfmx/data/Makefile.in b/Build/source/texk/dvipdfmx/data/Makefile.in
index b8e2188ec96..8a40f41d2c1 100644
--- a/Build/source/texk/dvipdfmx/data/Makefile.in
+++ b/Build/source/texk/dvipdfmx/data/Makefile.in
@@ -242,22 +242,13 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 configdatadir = $(datarootdir)/texmf/dvipdfmx
-dist_configdata_DATA = \
-  $(srcdir)/dvipdfmx.cfg
-
+dist_configdata_DATA = dvipdfmx.cfg
 glyphlistdatadir = $(datarootdir)/texmf-dist/fonts/map/glyphlist
-dist_glyphlistdata_DATA = \
-  $(srcdir)/glyphlist.txt \
-  $(srcdir)/pdfglyphlist.txt
-
+dist_glyphlistdata_DATA = glyphlist.txt pdfglyphlist.txt
 mapdatadir = $(datarootdir)/texmf/fonts/map/dvipdfmx
-dist_mapdata_DATA = \
-  $(srcdir)/cid-x.map
-
+dist_mapdata_DATA = cid-x.map
 cmapdatadir = $(datarootdir)/texmf/fonts/cmap/dvipdfmx
-dist_cmapdata_DATA = \
-  $(srcdir)/EUC-UCS2
-
+dist_cmapdata_DATA = EUC-UCS2
 all: all-am
 
 .SUFFIXES:
diff --git a/Build/source/texk/dvipdfmx/src/cidtype0.c b/Build/source/texk/dvipdfmx/src/cidtype0.c
index bccc34ba25a..bcf275f6ce7 100644
--- a/Build/source/texk/dvipdfmx/src/cidtype0.c
+++ b/Build/source/texk/dvipdfmx/src/cidtype0.c
@@ -542,7 +542,7 @@ CIDFont_type0_dofont (CIDFont *font)
   cid = 0; last_cid = 0; num_glyphs = 0;
   for (cid = 0; cid <= CID_MAX; cid++) {
     if (is_used_char2(used_chars, cid)) {
-      gid = cff_charsets_lookup(cffont, cid);
+      gid = cff_charsets_lookup(cffont, (card16)cid);
       if (cid != 0 && gid == 0) {
 	WARN("Glyph for CID %u missing in font \"%s\".", (CID) cid, font->ident);
 	used_chars[cid/8] &= ~(1 << (7 - (cid % 8)));
@@ -609,7 +609,7 @@ CIDFont_type0_dofont (CIDFont *font)
   fdselect->data.ranges = NEW(num_glyphs, cff_range3);
 
   /* New CharStrings INDEX */
-  charstrings = cff_new_index(num_glyphs+1);
+  charstrings = cff_new_index((card16)(num_glyphs+1));
   max_len = 2 * CS_STR_LEN_MAX;
   charstrings->data = NEW(max_len, card8);
   charstring_len = 0;
@@ -1015,7 +1015,7 @@ CIDFont_type0_t1cdofont (CIDFont *font)
     ERROR("No valid charstring data found.");
 
   /* New CharStrings INDEX */
-  charstrings = cff_new_index(num_glyphs+1);
+  charstrings = cff_new_index((card16)(num_glyphs+1));
   max_len = 2 * CS_STR_LEN_MAX;
   charstrings->data = NEW(max_len, card8);
   charstring_len = 0;
@@ -1954,7 +1954,7 @@ CIDFont_type0_t1dofont (CIDFont *font)
     widths = NEW(num_glyphs, double);
     memset(w_stat, 0, sizeof(int)*1001);
     offset  = 0L;
-    cstring = cff_new_index(num_glyphs);
+    cstring = cff_new_index((card16)num_glyphs);
     cstring->data = NULL;
     cstring->offset[0] = 1;
     gid = 0;
diff --git a/Build/source/texk/dvipdfmx/src/cidtype2.c b/Build/source/texk/dvipdfmx/src/cidtype2.c
index 9408772533f..e679185346d 100644
--- a/Build/source/texk/dvipdfmx/src/cidtype2.c
+++ b/Build/source/texk/dvipdfmx/src/cidtype2.c
@@ -317,7 +317,7 @@ add_TTCIDVMetrics (pdf_obj *fontdict, struct tt_glyphs *g,
     if (!is_used_char2(used_chars, cid))
       continue;
     gid = (cidtogidmap) ? ((cidtogidmap[2*cid] << 8)|cidtogidmap[2*cid+1]) : cid;
-    idx = tt_get_index(g, cid);
+    idx = tt_get_index(g, (USHORT)cid);
     if (cid != 0 && idx == 0)
       continue;
     advanceHeight = PDFUNIT(g->gd[idx].advh);
@@ -699,7 +699,7 @@ CIDFont_type2_dofont (CIDFont *font)
 	if (gid == 0 && unicode_cmap) {
 	  long alt_code;
 
-	  alt_code = fix_CJK_symbols(code);
+	  alt_code = fix_CJK_symbols((unsigned short)code);
 	  if (alt_code != code) {
 	    gid = tt_cmap_lookup(ttcmap, alt_code);
 	    if (gid != 0) {
@@ -781,7 +781,7 @@ CIDFont_type2_dofont (CIDFont *font)
 	if (gid == 0 && unicode_cmap) {
 	  long alt_code;
 
-	  alt_code = fix_CJK_symbols(code);
+	  alt_code = fix_CJK_symbols((unsigned short)code);
 	  if (alt_code != code) {
 	    gid = tt_cmap_lookup(ttcmap, alt_code);
 	    if (gid != 0) {
diff --git a/Build/source/texk/dvipdfmx/src/cmap_write.c b/Build/source/texk/dvipdfmx/src/cmap_write.c
index eb900512a11..b6c834993d2 100644
--- a/Build/source/texk/dvipdfmx/src/cmap_write.c
+++ b/Build/source/texk/dvipdfmx/src/cmap_write.c
@@ -201,13 +201,13 @@ write_map (mapDef *mtab, int count,
       *(wbuf->curptr)++ = '<';
       for (j = 0; j < depth; j++)
 	sputx(codestr[j], &(wbuf->curptr), wbuf->limptr);
-      sputx(c, &(wbuf->curptr), wbuf->limptr);
+      sputx((unsigned char)c, &(wbuf->curptr), wbuf->limptr);
       *(wbuf->curptr)++ = '>';
       *(wbuf->curptr)++ = ' ';
       *(wbuf->curptr)++ = '<';
       for (j = 0; j < depth; j++)
 	sputx(codestr[j], &(wbuf->curptr), wbuf->limptr);
-      sputx(c + blocks[i].count, &(wbuf->curptr), wbuf->limptr);
+      sputx((unsigned char)(c + blocks[i].count), &(wbuf->curptr), wbuf->limptr);
       *(wbuf->curptr)++ = '>';
       *(wbuf->curptr)++ = ' ';
       *(wbuf->curptr)++ = '<';
diff --git a/Build/source/texk/dvipdfmx/src/dpxfile.c b/Build/source/texk/dvipdfmx/src/dpxfile.c
index 9547202a997..c9bd2d1a5db 100644
--- a/Build/source/texk/dvipdfmx/src/dpxfile.c
+++ b/Build/source/texk/dvipdfmx/src/dpxfile.c
@@ -303,8 +303,7 @@ dpx_foolsearch (const char  *foolname,
 
   return  fqpn;
 }
-#else /* TEXK */
-#if  defined(__TDS_VERSION__) && __TDS_VERSION__ >= 0x200406L
+#else /* !MIKTEX */
 #  define TDS11DOC "http://www.tug.org/ftp/tex/tds-1.1/tds.html#Fonts"
 static void
 insistupdate (const char      *filename,
@@ -330,7 +329,6 @@ insistupdate (const char      *filename,
   WARN(">>   %s", fir->default_path);
   WARN(">> Please read \"README\" file.");
 }
-#endif /* TDS 1.1 */
 
 static char *
 dpx_find__app__xyz (const char *filename,
@@ -472,11 +470,9 @@ dpx_find_fontmap_file (const char *filename)
   fqpn = kpse_find_file(q, kpse_fontmap_format, 0);
   if (!fqpn) {
     fqpn = dpx_find__app__xyz(q, ".map", 1);
-#if  defined(__TDS_VERSION__) && __TDS_VERSION__ >= 0x200406L
     if (fqpn)
       insistupdate(q, fqpn, PACKAGE,
                    kpse_program_text_format, kpse_fontmap_format); 
-#endif
   }
 #endif /* MIKETEX */
   RELEASE(q);
@@ -498,11 +494,9 @@ dpx_find_agl_file (const char *filename)
   fqpn = kpse_find_file(q, kpse_fontmap_format, 0);
   if (!fqpn) {
     fqpn = dpx_find__app__xyz(q, ".txt", 1);
-#if  defined(__TDS_VERSION__) && __TDS_VERSION__ >= 0x200406L
     if (fqpn)
       insistupdate(q, fqpn, PACKAGE,
                    kpse_program_text_format, kpse_fontmap_format); 
-#endif
   }
 #endif /* MIKETEX */
   RELEASE(q);
@@ -549,9 +543,7 @@ dpx_find_cmap_file (const char *filename)
     memset(_tmpbuf, 0, _MAX_PATH+1);
   }
 #else
-#if  defined(__TDS_VERSION__) && __TDS_VERSION__ >= 0x200406L  
   fqpn = kpse_find_file(filename, kpse_cmap_format, 0); 
-#endif  
 #endif
 
   /* Files found above are assumed to be CMap,
@@ -561,11 +553,9 @@ dpx_find_cmap_file (const char *filename)
     fqpn = dpx_foolsearch(fools[i], filename, 1);
     if (fqpn) {
 #ifndef  MIKTEX
-#if  defined(__TDS_VERSION__) && __TDS_VERSION__ >= 0x200406L
       insistupdate(filename, fqpn, fools[i],
                    kpse_program_text_format, kpse_cmap_format); 
 #endif
-#endif
       if (!qcheck_filetype(fqpn, DPX_RES_TYPE_CMAP)) {
         WARN("Found file \"%s\" for PostScript CMap but it doesn't look like a CMap...", fqpn);
         RELEASE(fqpn);
@@ -596,20 +586,16 @@ dpx_find_sfd_file (const char *filename)
 
   q    = ensuresuffix(filename, ".sfd");
 #ifndef  MIKTEX
-#if  defined(__TDS_VERSION__) && __TDS_VERSION__ >= 0x200406L
   fqpn = kpse_find_file(q, kpse_sfd_format, 0);
-#endif
 #endif /* !MIKTEX */
 
   for (i = 0; !fqpn && fools[i]; i++) { 
     fqpn = dpx_foolsearch(fools[i], q, 1);
 #ifndef  MIKTEX
-#if  defined(__TDS_VERSION__) && __TDS_VERSION__ >= 0x200406L
     if (fqpn)
       insistupdate(filename, fqpn, fools[i],
                    kpse_program_text_format, kpse_sfd_format); 
 #endif
-#endif
   }
   RELEASE(q);
 
@@ -634,22 +620,16 @@ dpx_find_enc_file (const char *filename)
     strcpy(fqpn, _tmpbuf);
   }
 #else
-# if defined(__TDS_VERSION__) && __TDS_VERSION__ >= 0x200406L
   fqpn = kpse_find_file(q, kpse_enc_format, 0);
-# else
-  fqpn = kpse_find_file(q, kpse_tex_ps_header_format, 0);
-# endif
 #endif /* MIKTEX */
 
   for (i = 0; !fqpn && fools[i]; i++) { 
     fqpn = dpx_foolsearch(fools[i], q, 1);
 #ifndef  MIKTEX
-#if  defined(__TDS_VERSION__) && __TDS_VERSION__ >= 0x200406L
     if (fqpn)
       insistupdate(filename, fqpn, fools[i],
                    kpse_program_text_format, kpse_enc_format); 
 #endif
-#endif
   }
   RELEASE(q);
 
@@ -695,20 +675,16 @@ dpx_find_opentype_file (const char *filename)
 
   q = ensuresuffix(filename, ".otf");
 #ifndef MIKTEX
-#if  defined(__TDS_VERSION__) && __TDS_VERSION__ >= 0x200406L
   fqpn = kpse_find_file(q, kpse_opentype_format, 0);
   if (!fqpn) {
 #endif
-#endif
     fqpn = dpx_foolsearch(PACKAGE, q, 0);
 #ifndef  MIKTEX
-#if  defined(__TDS_VERSION__) && __TDS_VERSION__ >= 0x200406L
     if (fqpn)
       insistupdate(filename, fqpn, PACKAGE,
                    kpse_program_binary_format, kpse_opentype_format); 
   }
 #endif
-#endif
   RELEASE(q);
 
   /* *We* use "opentype" for ".otf" (CFF). */
diff --git a/Build/source/texk/dvipdfmx/src/mpost.c b/Build/source/texk/dvipdfmx/src/mpost.c
index 2422687e3eb..20c412f40e2 100644
--- a/Build/source/texk/dvipdfmx/src/mpost.c
+++ b/Build/source/texk/dvipdfmx/src/mpost.c
@@ -1188,12 +1188,12 @@ do_operator (const char *token, double x_user, double y_user)
   case SETLINECAP:
     error = pop_get_numbers(values, 1);
     if (!error)
-      error = pdf_dev_setlinecap(values[0]);
+      error = pdf_dev_setlinecap((int)values[0]);
     break;
   case SETLINEJOIN:
     error = pop_get_numbers(values, 1);
     if (!error)
-      error = pdf_dev_setlinejoin(values[0]);
+      error = pdf_dev_setlinejoin((int)values[0]);
     break;
   case SETLINEWIDTH:
     error = pop_get_numbers(values, 1);
diff --git a/Build/source/texk/dvipdfmx/src/pdfencrypt.c b/Build/source/texk/dvipdfmx/src/pdfencrypt.c
index 534711ba41a..fc94d6c200e 100644
--- a/Build/source/texk/dvipdfmx/src/pdfencrypt.c
+++ b/Build/source/texk/dvipdfmx/src/pdfencrypt.c
@@ -357,6 +357,8 @@ static char *getpass (const char *prompt)
     pwd_buf[i] = getch();
     if (pwd_buf[i] == '\r')
       break;
+    fputs("*", stderr);
+    fflush(stderr);
   }
   pwd_buf[i] = '\0';
   fputs("\n", stderr);
diff --git a/Build/source/texk/dvipdfmx/src/pdfobj.c b/Build/source/texk/dvipdfmx/src/pdfobj.c
index 2ce7f90b210..42a67478006 100644
--- a/Build/source/texk/dvipdfmx/src/pdfobj.c
+++ b/Build/source/texk/dvipdfmx/src/pdfobj.c
@@ -539,12 +539,11 @@ void pdf_out_char (FILE *file, char c)
   }
 }
 
+static char xchar[] = "0123456789abcdef";
+
 #define pdf_out_xchar(f,c) do {\
-  int __tmpnum;\
-  __tmpnum = ((c) >> 4) & 0x0f;\
-  pdf_out_char((f), (((__tmpnum) >= 10) ? (__tmpnum)+'W' : (__tmpnum)+'0'));\
-  __tmpnum = (c) & 0x0f;\
-  pdf_out_char((f), (((__tmpnum) >= 10) ? (__tmpnum)+'W' : (__tmpnum)+'0'));\
+  pdf_out_char((f), xchar[((c) >> 4) & 0x0f]);\
+  pdf_out_char((f), xchar[(c) & 0x0f]);\
 } while (0)
 
 static
diff --git a/Build/source/texk/dvipdfmx/src/truetype.c b/Build/source/texk/dvipdfmx/src/truetype.c
index 9a88efc0f0b..8e29906822e 100644
--- a/Build/source/texk/dvipdfmx/src/truetype.c
+++ b/Build/source/texk/dvipdfmx/src/truetype.c
@@ -338,7 +338,7 @@ do_builtin_encoding (pdf_font *font, const char *usedchars, sfnt *sfont)
     } else {
       idx = tt_find_glyph(glyphs, gid);
       if (idx == 0)
-        idx  = tt_add_glyph(glyphs, gid, count); /* count returned. */
+        idx  = tt_add_glyph(glyphs, (USHORT)gid, (USHORT)count); /* count returned. */
     }
     cmap_table[18+code] = idx & 0xff; /* bug here */
     count++;
@@ -494,7 +494,7 @@ selectglyph (USHORT in, const char *suffix, struct glyph_mapper *gm, USHORT *out
           memcpy(t, s, strlen(s));
           error = select_gsub(s, gm);
           if (!error)
-            error = otl_gsub_apply_alt(gm->gsub, n, &in);
+            error = otl_gsub_apply_alt(gm->gsub, (USHORT)n, (USHORT *)&in);
         }
       }
     }
@@ -528,7 +528,8 @@ composeglyph (USHORT *glyphs, int n_glyphs,
   }
 
   if (!error)
-    error = otl_gsub_apply_lig(gm->gsub, glyphs, n_glyphs, gid);
+    error = otl_gsub_apply_lig(gm->gsub, (USHORT *)glyphs, (USHORT)n_glyphs,
+                               (USHORT *)gid);
 
   return  error;
 }
@@ -838,7 +839,7 @@ do_custom_encoding (pdf_font *font,
       }
       idx = tt_find_glyph(glyphs, gid);
       if (idx == 0) {
-        idx = tt_add_glyph(glyphs, gid, count); /* count returned. */
+        idx = tt_add_glyph(glyphs, (USHORT)gid, (USHORT)count); /* count returned. */
         count++;
       }
     }
diff --git a/Build/source/texk/dvipdfmx/src/tt_cmap.c b/Build/source/texk/dvipdfmx/src/tt_cmap.c
index 5c9b29fdb7c..e11423d3715 100644
--- a/Build/source/texk/dvipdfmx/src/tt_cmap.c
+++ b/Build/source/texk/dvipdfmx/src/tt_cmap.c
@@ -1399,7 +1399,7 @@ handle_assign (pdf_obj *dst, pdf_obj *src, int flag,
   }
 
   rv = otl_gsub_apply_lig(gsub_list,
-			  gid_in, n_unicodes, &lig);
+			  gid_in, (USHORT)n_unicodes, &lig);
   if (rv < 0) {
     if (flag == 'p')
       WARN("No ligature found...");
diff --git a/Build/source/texk/dvipdfmx/src/tt_gsub.c b/Build/source/texk/dvipdfmx/src/tt_gsub.c
index f981bfa60ff..d0e7b938fe9 100644
--- a/Build/source/texk/dvipdfmx/src/tt_gsub.c
+++ b/Build/source/texk/dvipdfmx/src/tt_gsub.c
@@ -1253,9 +1253,9 @@ otl_gsub_apply_ligature (struct otl_gsub_subtab *subtab,
 
       ligset = &(data->LigatureSet[idx]);
       for (j = 0; j < ligset->LigatureCount; j++) {
-        if (!glyph_seq_cmp(&gid_in[1], num_gids - 1,
+        if (!glyph_seq_cmp(&gid_in[1], (USHORT)(num_gids - 1),
                            ligset->Ligature[j].Component,
-                           ligset->Ligature[j].CompCount - 1)) {
+                           (USHORT)(ligset->Ligature[j].CompCount - 1))) {
           *gid_out = ligset->Ligature[j].LigGlyph;
           return 0; /* found */
         }
diff --git a/Build/source/texk/dvipdfmx/src/xbb.c b/Build/source/texk/dvipdfmx/src/xbb.c
index ed3d9bb0b98..b9e7969a123 100644
--- a/Build/source/texk/dvipdfmx/src/xbb.c
+++ b/Build/source/texk/dvipdfmx/src/xbb.c
@@ -66,8 +66,13 @@ static void show_usage(void)
   fprintf(stdout, "\t-v\tBe verbose\n");
   fprintf(stdout, "\t-q\tBe quiet\n");
   fprintf(stdout, "\t-O\tWrite output to stdout\n");
-  fprintf(stdout, "\t-m\tOutput .bb  file used in DVIPDFM\n");
-  fprintf(stdout, "\t-x\tOutput .xbb file used in DVIPDFMx (default)\n");
+  if(compat_mode) {
+    fprintf(stdout, "\t-m\tOutput .bb  file used in DVIPDFM (default)\n");
+    fprintf(stdout, "\t-x\tOutput .xbb file used in DVIPDFMx\n");
+  } else {
+    fprintf(stdout, "\t-m\tOutput .bb  file used in DVIPDFM\n");
+    fprintf(stdout, "\t-x\tOutput .xbb file used in DVIPDFMx (default)\n");
+  }
 }
 
 static void usage(void)
@@ -137,6 +142,9 @@ static void write_xbb(char *fname,
     }
   } else {
     fp = stdout;
+#ifdef WIN32
+    setmode(fileno(fp), _O_BINARY);
+#endif
   }
 
   if (verbose) {