189 files changed, 145 insertions, 882 deletions

diff --git a/Build/source/texk/dvipdfmx/ChangeLog b/Build/source/texk/dvipdfmx/ChangeLog
index 4450feeac51..4be2fe7ab25 100644
--- a/Build/source/texk/dvipdfmx/ChangeLog
+++ b/Build/source/texk/dvipdfmx/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-20  Norbert Preining  <preining@logic.at>
+
+	Imported snapshot 20110420.
+	This snapshot is actually the current state of the SVN repository.
+
 2011-12-06  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Makefile.am: Replace ${prefix}/texmf => $(datarootdir)/texmf.
diff --git a/Build/source/texk/dvipdfmx/configure b/Build/source/texk/dvipdfmx/configure
index 12f9ad2cb60..6b677d41e37 100755
--- a/Build/source/texk/dvipdfmx/configure
+++ b/Build/source/texk/dvipdfmx/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for dvipdfmx 20110311.
+# Generated by GNU Autoconf 2.68 for dvipdfmx 20120420.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -570,12 +570,12 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='dvipdfmx'
 PACKAGE_TARNAME='dvipdfmx'
-PACKAGE_VERSION='20110311'
-PACKAGE_STRING='dvipdfmx 20110311'
+PACKAGE_VERSION='20120420'
+PACKAGE_STRING='dvipdfmx 20120420'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
-ac_unique_file="dvipdfmx-20110311/src/dvipdfmx.c"
+ac_unique_file="dvipdfmx-20120420/src/dvipdfmx.c"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
@@ -1318,7 +1318,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures dvipdfmx 20110311 to adapt to many kinds of systems.
+\`configure' configures dvipdfmx 20120420 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1388,7 +1388,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of dvipdfmx 20110311:";;
+     short | recursive ) echo "Configuration of dvipdfmx 20120420:";;
    esac
   cat <<\_ACEOF
 
@@ -1506,7 +1506,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-dvipdfmx configure 20110311
+dvipdfmx configure 20120420
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2263,7 +2263,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by dvipdfmx $as_me 20110311, which was
+It was created by dvipdfmx $as_me 20120420, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -7647,7 +7647,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='dvipdfmx'
- VERSION='20110311'
+ VERSION='20120420'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -14040,7 +14040,7 @@ Usage: $0 [OPTIONS]
 Report bugs to <bug-libtool@gnu.org>."
 
 lt_cl_version="\
-dvipdfmx config.lt 20110311
+dvipdfmx config.lt 20120420
 configured by $0, generated by GNU Autoconf 2.68.
 
 Copyright (C) 2011 Free Software Foundation, Inc.
@@ -15382,7 +15382,7 @@ fi
 $as_echo "#define __TDS_VERSION__ 0x200406L" >>confdefs.h
 
 
-DVIPDFMX_TREE=dvipdfmx-20110311
+DVIPDFMX_TREE=dvipdfmx-20120420
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for native WIN32 or MINGW32" >&5
@@ -15986,7 +15986,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by dvipdfmx $as_me 20110311, which was
+This file was extended by dvipdfmx $as_me 20120420, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -16052,7 +16052,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-dvipdfmx config.status 20110311
+dvipdfmx config.status 20120420
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/TL-Changes b/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/TL-Changes
deleted file mode 100644
index 2c71fb0a2d4..00000000000
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/TL-Changes
+++ /dev/null
@@ -1,11 +0,0 @@
-Changes applied to the dvipdfmx-20110311 tree as obtained from:
-	http://project.ktug.or.kr/dvipdfmx/snapshot/latest/dvipdfmx-20110311.tar.gz
-
-Removed:
-	NEWS
-	compile
-	depcomp
-	install-sh
-	missing
-	mkinstalldirs
-
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/patch-01-manpage b/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/patch-01-manpage
deleted file mode 100644
index ca7db940c17..00000000000
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/patch-01-manpage
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -ur dvipdfmx-20110311.orig/man/extractbb.1 dvipdfmx-20110311/man/extractbb.1
---- dvipdfmx-20110311.orig/man/extractbb.1	2011-03-09 08:45:17.000000000 +0100
-+++ dvipdfmx-20110311/man/extractbb.1	2011-05-28 02:47:23.000000000 +0200
-@@ -1,4 +1,4 @@
--.TH "EXTRACTBB" "1" "30 August 2009" "20090708" "DVIPDFMx"
-+.TH "EXTRACTBB" "1" "6 May 2011" "20110311" "DVIPDFMx"
- .PP 
- .SH "NAME" 
- extractbb, ebb \- extract bounding box information from graphics files
-@@ -59,9 +59,22 @@
- Write output in dvipdfm's ``bb'' format.
- .TP
- .B -x
--Write output in dvipdfmx's ``xbb'' format (default).
-+Write output in dvipdfmx's ``xbb'' format (default), which is the same
-+as that used by pdfTeX.
- .PD
- .PP
-+.SH "OUTPUT FORMATS"
-+.PP
-+Here are more details about the bb and xbb formats:
-+.PP
-+The original ebb (from dvipdfm) ignored density information in bitmap
-+images, and generated bounding boxes with 100px = 72bp = 1in.
-+Unfortunately, screenshots (especially) tend to look bad with this
-+approach.
-+.PP
-+So, extractbb (from dvipdfmx) uses density information if present.
-+Otherwise, it generates bounding box with 100px = 100bp.  This is what
-+pdfTeX does.
- .SH "BUGS"
- .PP
- There is currently no way to specify which bounding box is taken
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/patch-02-exec_spawn b/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/patch-02-exec_spawn
deleted file mode 100644
index e49c44b0ef4..00000000000
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/patch-02-exec_spawn
+++ /dev/null
@@ -1,129 +0,0 @@
-diff -ur dvipdfmx-20110311.orig/src/dpxfile.c dvipdfmx-20110311/src/dpxfile.c
---- dvipdfmx-20110311.orig/src/dpxfile.c	2011-03-11 04:10:51.000000000 +0100
-+++ dvipdfmx-20110311/src/dpxfile.c	2011-06-06 09:50:11.000000000 +0200
-@@ -154,10 +154,14 @@
- {
-   char **cmdv, **qv;
-   char *p, *pp;
--  char buf[512];
--  int  i, ret;
-+  char buf[1024];
-+  int  i, ret = -1;
- 
--  if (!cmd || !*cmd)
-+  if (!cmd)
-+    return -1;
-+  while (*cmd == ' ' || *cmd == '\t')
-+    cmd++;
-+  if (*cmd == '\0')
-     return -1;
-   i = 0;
-   p = cmd;
-@@ -166,19 +170,16 @@
-       i++;
-     p++;
-   }
--  cmdv = (char **) xmalloc (sizeof (char *) * (i+2));
-+  cmdv = xcalloc (i + 2, sizeof (char *));
-   p = cmd;
-   qv = cmdv;
--  while (*p == ' ' || *p == '\t')
--    p++;
-   while (*p) {
-     pp = buf;
-     if (*p == '"') {
-       p++;
-       while (*p != '"') {
-         if (*p == '\0') {
--          free (cmdv);
--          return -1;
-+          goto done;
-         }
-         *pp++ = *p++;
-       }
-@@ -187,40 +188,41 @@
-       p++;
-       while (*p != '\'') {
-         if (*p == '\0') {
--          free (cmdv);
--          return -1;
-+          goto done;
-         }
-         *pp++ = *p++;
-       }
-       p++;
-     } else {
--      while (*p != ' ' && *p != '\t' && *p)
--#ifdef WIN32
-+      while (*p != ' ' && *p != '\t' && *p) {
-         if (*p == '\'') {
--          *pp++ = '\"';
-+          p++;
-+          while (*p != '\'') {
-+             if (*p == '\0') {
-+                 goto done;
-+             }
-+             *pp++ = *p++;
-+          }
-           p++;
-         } else {
-           *pp++ = *p++;
-         }
--#else
--        *pp++ = *p++;
--#endif
-+      }
-     }
-     *pp = '\0';
--    if ((pp = strchr (buf, ' ')) || (pp = strchr (buf, '\t'))) {
- #ifdef WIN32
-+    if (strchr (buf, ' ') || strchr (buf, '\t'))
-       *qv = concat3 ("\"", buf, "\"");
--#else
--      *qv = concat3 ("'", buf, "'");
-+    else
- #endif
--    } else {
--      *qv = concat (buf, "");
--    }
-+      *qv = xstrdup (buf);
-+/*
-+    fprintf(stderr,"\n%s", *qv);
-+*/
-     while (*p == ' ' || *p == '\t')
-       p++;
-     qv++;
-   }
--  *qv = NULL;
- #ifdef WIN32
-   ret = spawnvp (_P_WAIT, *cmdv, (const char* const*) cmdv);
- #else
-@@ -229,7 +231,7 @@
-     ret = -1;
-   else if (i == 0) {
-     if (execvp (*cmdv, cmdv))
--      ret = -1;
-+      _exit (-1);
-   } else {
-     if (wait (&ret) == i) {
-       ret = (WIFEXITED (ret) ? WEXITSTATUS (ret) : -1);
-@@ -238,14 +240,13 @@
-     }
-   }
- #endif
-+done:
-   qv = cmdv;
--  if (qv) {
--    while (*qv) {
--      free (*qv);
--      qv++;
--    }
--    free (cmdv);
-+  while (*qv) {
-+    free (*qv);
-+    qv++;
-   }
-+  free (cmdv);
-   return ret;
- }
- 
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/patch-03-uint32_t b/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/patch-03-uint32_t
deleted file mode 100644
index 0827d040027..00000000000
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/patch-03-uint32_t
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -ur dvipdfmx-20110311.orig/configure.in dvipdfmx-20110311/configure.in
---- dvipdfmx-20110311.orig/configure.in	2011-03-11 04:14:28.000000000 +0100
-+++ dvipdfmx-20110311/configure.in	2011-07-13 10:10:18.000000000 +0200
-@@ -95,6 +95,7 @@
- AC_STRUCT_TM
- AC_STRUCT_TIMEZONE
- AC_C_BIGENDIAN
-+AC_TYPE_UINT32_T
- 
- AC_CHECK_SIZEOF(char)
- AC_CHECK_SIZEOF(short)
-diff -ur dvipdfmx-20110311.orig/src/dpxcrypt.c dvipdfmx-20110311/src/dpxcrypt.c
---- dvipdfmx-20110311.orig/src/dpxcrypt.c	2011-03-11 04:12:23.000000000 +0100
-+++ dvipdfmx-20110311/src/dpxcrypt.c	2011-06-15 19:16:14.000000000 +0200
-@@ -24,8 +24,16 @@
- #include "config.h"
- #endif
- 
--#include <stdint.h>
-+#ifdef HAVE_SYS_TYPES_H
-+# include <sys/types.h>
-+#endif
- #include <string.h>
-+#ifdef HAVE_INTTYPES_H
-+# include <inttypes.h>
-+#endif
-+#ifdef HAVE_STDINT_H
-+# include <stdint.h>
-+#endif
- 
- #include "dpxcrypt.h"
- 
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/patch-04-uptex b/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/patch-04-uptex
deleted file mode 100644
index 82651fe8fcc..00000000000
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/patch-04-uptex
+++ /dev/null
@@ -1,258 +0,0 @@
-diff -ur dvipdfmx-20110311.orig/src/dvi.c dvipdfmx-20110311/src/dvi.c
---- dvipdfmx-20110311.orig/src/dvi.c	2011-03-09 08:43:18.000000000 +0100
-+++ dvipdfmx-20110311/src/dvi.c	2011-11-05 14:58:04.000000000 +0100
-@@ -58,6 +58,10 @@
- #define TEX_FONTS_ALLOC_SIZE 16u
- #define VF_NESTING_MAX       16u
- 
-+/* UTF-32 over U+FFFF -> UTF-16 surrogate pair */
-+#define UTF32toUTF16HS(x)  (0xd800 + (((x-0x10000) >> 10) & 0x3ff))
-+#define UTF32toUTF16LS(x)  (0xdc00 + (  x                 & 0x3ff))
-+
- /* Interal Variables */
- static FILE          *dvi_file  = NULL;
- 
-@@ -734,7 +738,7 @@
- {
-   struct loaded_font *font;
-   spt_t               width, height, depth;
--  unsigned char       wbuf[2];
-+  unsigned char       wbuf[4];
- 
-   if (current_font < 0) {
-     ERROR("No font selected!");
-@@ -753,7 +757,14 @@
- 
-   switch (font->type) {
-   case  PHYSICAL:
--    if (ch > 255) { /* _FIXME_ */
-+    if (ch > 65535) { /* _FIXME_ */
-+      wbuf[0] = (UTF32toUTF16HS(ch) >> 8) & 0xff;
-+      wbuf[1] =  UTF32toUTF16HS(ch)       & 0xff;
-+      wbuf[2] = (UTF32toUTF16LS(ch) >> 8) & 0xff;
-+      wbuf[3] =  UTF32toUTF16LS(ch)       & 0xff;
-+      pdf_dev_set_string(dvi_state.h, -dvi_state.v, wbuf, 4,
-+			 width, font->font_id, 2);
-+    } else if (ch > 255) { /* _FIXME_ */
-       wbuf[0] = (ch >> 8) & 0xff;
-       wbuf[1] =  ch & 0xff;
-       pdf_dev_set_string(dvi_state.h, -dvi_state.v, wbuf, 2,
-@@ -805,7 +816,7 @@
- {
-   struct loaded_font *font;
-   spt_t               width, height, depth;
--  unsigned char       wbuf[2];
-+  unsigned char       wbuf[4];
- 
-   if (current_font < 0) {
-     ERROR("No font selected!");
-@@ -821,7 +832,14 @@
-     /* Treat a single character as a one byte string and use the
-      * string routine.
-      */
--    if (ch > 255) { /* _FIXME_ */
-+    if (ch > 65535) { /* _FIXME_ */
-+      wbuf[0] = (UTF32toUTF16HS(ch) >> 8) & 0xff;
-+      wbuf[1] =  UTF32toUTF16HS(ch)       & 0xff;
-+      wbuf[2] = (UTF32toUTF16LS(ch) >> 8) & 0xff;
-+      wbuf[3] =  UTF32toUTF16LS(ch)       & 0xff;
-+      pdf_dev_set_string(dvi_state.h, -dvi_state.v, wbuf, 4,
-+			 width, font->font_id, 2);
-+    } else if (ch > 255) { /* _FIXME_ */
-       wbuf[0] = (ch >> 8) & 0xff;
-       wbuf[1] =  ch & 0xff;
-       pdf_dev_set_string(dvi_state.h, -dvi_state.v, wbuf, 2,
-@@ -899,6 +917,12 @@
- }
- 
- static void
-+do_set3 (void)
-+{
-+  dvi_set(get_unsigned_triple(dvi_file));
-+}
-+
-+static void
- do_setrule (void)
- {
-   SIGNED_QUAD  width, height;
-@@ -935,6 +959,12 @@
-   dvi_put(get_unsigned_pair(dvi_file));
- }
- 
-+static void
-+do_put3 (void)
-+{
-+  dvi_put(get_unsigned_triple(dvi_file));
-+}
-+
- void
- dvi_push (void) 
- {
-@@ -1414,8 +1444,9 @@
-     switch (opcode) {
-     case SET1: do_set1(); break;
-     case SET2: do_set2(); break;
--    case SET3: case SET4:
--      ERROR("Multibyte (>16 bits) character not supported!");
-+    case SET3: do_set3(); break;
-+    case SET4:
-+      ERROR("Multibyte (>24 bits) character not supported!");
-       break;
- 
-     case SET_RULE:
-@@ -1424,8 +1455,9 @@
- 
-     case PUT1: do_put1(); break;
-     case PUT2: do_put2(); break;
--    case PUT3: case PUT4:
--      ERROR ("Multibyte character (>16 bits) not supported!");
-+    case PUT3: do_put3(); break;
-+    case PUT4:
-+      ERROR ("Multibyte character (>24 bits) not supported!");
-       break;
- 
-     case PUT_RULE:
-diff -ur dvipdfmx-20110311.orig/src/tfm.c dvipdfmx-20110311/src/tfm.c
---- dvipdfmx-20110311.orig/src/tfm.c	2011-03-05 05:44:49.000000000 +0100
-+++ dvipdfmx-20110311/src/tfm.c	2011-11-05 14:58:04.000000000 +0100
-@@ -55,6 +55,12 @@
- #define IS_JFM(i) ((i) == JFM_ID || (i) == JFMV_ID)
- #endif /* !WITHOUT_ASCII_PTEX */
- 
-+#if !defined(WITHOUT_ASCII_PTEX)
-+#define CHARACTER_INDEX(i)  ((i>0xFFFFul ? 0x10000ul : i))
-+#else
-+#define CHARACTER_INDEX(i)  ((i))
-+#endif
-+
- /*
-  * TFM Record structure:
-  * Multiple TFM's may be read in at once.
-@@ -162,7 +168,7 @@
- struct coverage
- {
-   long           first_char;
--  unsigned short num_chars;
-+  long           num_chars;
- };
- 
- /*
-@@ -208,7 +214,7 @@
- {
-   if (charcode >= map->coverage.first_char &&
-       charcode <= map->coverage.first_char + map->coverage.num_chars)
--    return map->indices[charcode - map->coverage.first_char];
-+    return map->indices[CHARACTER_INDEX(charcode - map->coverage.first_char)];
-   else
-     return -1;
- 
-@@ -224,7 +230,7 @@
- 	 charcode >= map->coverages[idx].first_char; idx--) {
-     if (charcode <=
- 	map->coverages[idx].first_char + map->coverages[idx].num_chars)
--      return map->indices[idx];
-+      return map->indices[CHARACTER_INDEX(idx)];
-   }
- 
-   return -1;
-@@ -479,12 +485,13 @@
-     fm->charmap.type = MAPTYPE_CHAR;
-     fm->charmap.data = map = NEW(1, struct char_map);
-     map->coverage.first_char = 0;
--    map->coverage.num_chars  = 0xFFFFu;
--    map->indices    = NEW(0x10000L, unsigned short);
-+    map->coverage.num_chars  = 0x10FFFFu;
-+    map->indices    = NEW(0x10001ul, unsigned short);
- 
-     for (code = 0; code <= 0xFFFFu; code++) {
-       map->indices[code] = tfm->chartypes[code];
-     }
-+    map->indices[0x10000ul] = tfm->chartypes[0];
-   } else {
-     struct range_map *map;
- 
-@@ -493,7 +500,7 @@
-     map->num_coverages = 1;
-     map->coverages     = NEW(map->num_coverages, struct coverage);
-     map->coverages[0].first_char = 0;
--    map->coverages[0].num_chars  = 0xFFFFu;
-+    map->coverages[0].num_chars  = 0x10FFFFu;
-     map->indices = NEW(1, unsigned short);
-     map->indices[0] = 0; /* Only default type used. */
-   }
-@@ -784,7 +791,7 @@
-     jfm_do_char_type_array(tfm_file, &tfm);
-     jfm_make_charmap(fm, &tfm);
-     fm->firstchar = 0;
--    fm->lastchar  = 0xFFFFl;
-+    fm->lastchar  = 0x10FFFFl;
-     fm->fontdir   = (tfm.id == JFMV_ID) ? FONT_DIR_VERT : FONT_DIR_HORIZ;
-     fm->source    = SOURCE_TYPE_JFM;
-   }
-diff -ur dvipdfmx-20110311.orig/src/vf.c dvipdfmx-20110311/src/vf.c
---- dvipdfmx-20110311.orig/src/vf.c	2011-03-05 05:44:49.000000000 +0100
-+++ dvipdfmx-20110311/src/vf.c	2011-11-05 14:58:04.000000000 +0100
-@@ -238,11 +238,11 @@
- 	ch = get_unsigned_quad (vf_file);
- 	/* Skip over TFM width since we already know it */
- 	get_unsigned_quad (vf_file);
--	if (ch < 65536L) 
-+	if (ch < 0x1000000L) 
- 	  read_a_char_def (vf_file, thisfont, pkt_len, ch);
- 	else {
- 	  fprintf (stderr, "char=%ld\n", ch);
--	  ERROR ("Long character (>16 bits) in VF file.\nI can't handle long characters!\n");
-+	  ERROR ("Long character (>24 bits) in VF file.\nI can't handle long characters!\n");
- 	}
- 	break;
-       }
-@@ -455,6 +455,12 @@
-   return;
- }
- 
-+static void vf_set3(unsigned char **start, unsigned char *end) 
-+{
-+  vf_set (unsigned_triple(start, end));
-+  return;
-+}
-+
- static void vf_putrule(unsigned char **start, unsigned char *end, spt_t ptsize)
- {
-   SIGNED_QUAD width, height;
-@@ -491,6 +497,12 @@
-   return;
- }
- 
-+static void vf_put3(unsigned char **start, unsigned char *end)
-+{
-+  dvi_put (unsigned_triple(start, end));
-+  return;
-+}
-+
- static void vf_push(void)
- {
-   dvi_push();
-@@ -851,8 +863,10 @@
- 	  vf_set2(&start, end);
- 	  break;
- 	case SET3:
-+	  vf_set3(&start, end);
-+	  break;
- 	case SET4:
--	  ERROR ("Multibyte (>16 bits) character in VF packet.\nI can't handle this!");
-+	  ERROR ("Multibyte (>24 bits) character in VF packet.\nI can't handle this!");
- 	  break;
- 	case SET_RULE:
- 	  vf_setrule(&start, end, ptsize);
-@@ -864,8 +878,10 @@
- 	  vf_put2(&start, end);
- 	  break;
- 	case PUT3:
-+	  vf_put3(&start, end);
-+	  break;
- 	case PUT4:
--	  ERROR ("Multibyte (>16 bits) character in VF packet.\nI can't handle this!");
-+	  ERROR ("Multibyte (>24 bits) character in VF packet.\nI can't handle this!");
- 	  break;
- 	case PUT_RULE:
- 	  vf_putrule(&start, end, ptsize);
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/patch-05-typo b/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/patch-05-typo
deleted file mode 100644
index afea413af3d..00000000000
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/patch-05-typo
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ur dvipdfmx-20110311.orig/src/tt_cmap.c dvipdfmx-20110311/src/tt_cmap.c
---- dvipdfmx-20110311.orig/src/tt_cmap.c	2011-03-05 05:44:49.000000000 +0100
-+++ dvipdfmx-20110311/src/tt_cmap.c	2011-10-18 21:14:30.000000000 +0200
-@@ -1558,10 +1558,10 @@
-       rv = otl_gsub_select(gsub_list, script, language, feature);
-       if (rv < 0) {
- 	if (flag == 'p') {
--	  WARN("No GSUB featre %s.%s.%s loaded...",
-+	  WARN("No GSUB feature %s.%s.%s loaded...",
- 	       script, language, feature);
- 	} else if (flag == 'r') {
--	  ERROR("No GSUB featre %s.%s.%s loaded...",
-+	  ERROR("No GSUB feature %s.%s.%s loaded...",
- 		script, language, feature);
- 	}
-       } else {
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/patch-06-dtou b/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/patch-06-dtou
deleted file mode 100644
index de03c7c134f..00000000000
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/patch-06-dtou
+++ /dev/null
@@ -1,268 +0,0 @@
-diff -ur dvipdfmx-20110311.orig/src/dvi.c dvipdfmx-20110311/src/dvi.c
---- dvipdfmx-20110311.orig/src/dvi.c	2011-11-05 14:58:04.000000000 +0100
-+++ dvipdfmx-20110311/src/dvi.c	2012-01-17 19:27:40.000000000 +0100
-@@ -654,19 +654,25 @@
- 
- void dvi_right (SIGNED_QUAD x)
- {
--  if (!dvi_state.d) {
--    dvi_state.h += x;
--  } else {
--    dvi_state.v += x;
-+  switch (dvi_state.d) {
-+  case 0:
-+    dvi_state.h += x; break;
-+  case 1:
-+    dvi_state.v += x; break;
-+  case 3:
-+    dvi_state.v -= x; break;
-   }
- }
- 
- void dvi_down (SIGNED_QUAD y)
- {
--  if (!dvi_state.d) {
--    dvi_state.v += y;
--  } else {
--    dvi_state.h -= y;
-+  switch (dvi_state.d) {
-+  case 0:
-+    dvi_state.v += y; break;
-+  case 1:
-+    dvi_state.h -= y; break;
-+  case 3:
-+    dvi_state.h += y; break;
-   }
- }
- 
-@@ -721,10 +727,13 @@
-     }
-     dvi_pop();
-   }
--  if (!dvi_state.d) {
--    dvi_state.h += width;
--  } else {
--    dvi_state.v += width;
-+  switch (dvi_state.d) {
-+  case 0:
-+    dvi_state.h += width; break;
-+  case 1:
-+    dvi_state.v += width; break;
-+  case 3:
-+    dvi_state.v -= width; break;
-   }
- }
- 
-@@ -803,11 +812,13 @@
-     vf_set_char(ch, font->font_id); /* push/pop invoked */
-     break;
-   }
--
--  if (!dvi_state.d) {
--    dvi_state.h += width;
--  } else {
--    dvi_state.v += width;
-+  switch (dvi_state.d) {
-+  case 0:
-+    dvi_state.h += width; break;
-+  case 1:
-+    dvi_state.v += width; break;
-+  case 3:
-+    dvi_state.v -= width; break;
-   }
- }
- 
-@@ -890,17 +901,24 @@
- {
-   do_moveto(dvi_state.h, dvi_state.v);
- 
--  if (!dvi_state.d) {
-+  switch (dvi_state.d) {
-+  case 0:
-     pdf_dev_set_rule(dvi_state.h, -dvi_state.v,  width, height);
--  } else { /* right ? */
-+    break;
-+  case 1:
-     pdf_dev_set_rule(dvi_state.h, -dvi_state.v - width, height, width);
-+    break;
-+  case 3: 
-+    pdf_dev_set_rule(dvi_state.h - height, -dvi_state.v , height, width);
-+    break;
-   }
- }
- 
- void
--dvi_dir (UNSIGNED_BYTE dir)
-+dvi_dir (UNSIGNED_BYTE dir) /* how? */
- {
--  dvi_state.d = dir ? 1 : 0;
-+  fprintf(stderr, "  > dvi_dir %d\n", dir);
-+  dvi_state.d = dir;
-   pdf_dev_set_dirmode(dvi_state.d); /* 0: horizontal, 1: vertical */
- }
- 
-@@ -1385,7 +1403,7 @@
- static void
- do_dir (void)
- {
--  dvi_state.d = get_unsigned_byte(dvi_file) ? 1 : 0;
-+  dvi_state.d = get_unsigned_byte(dvi_file);
-   pdf_dev_set_dirmode(dvi_state.d); /* 0: horizontal, 1: vertical */
- }
- 
-diff -ur dvipdfmx-20110311.orig/src/pdfdev.c dvipdfmx-20110311/src/pdfdev.c
---- dvipdfmx-20110311.orig/src/pdfdev.c	2011-03-06 04:14:14.000000000 +0100
-+++ dvipdfmx-20110311/src/pdfdev.c	2012-01-17 19:27:40.000000000 +0100
-@@ -332,19 +332,23 @@
-  * is vertical font. While ASCII pTeX manages current writing direction
-  * and font's WMode separately.
-  *
-- * 00/11 WMODE_HH/VV  h(v) font, h(v) direction.
-- * 01    WMODE_HV    -90 deg. rotated
-- * 10    WMODE_VH    +90 deg. rotated
-- *
-+ * 000/101 WMODE_HH/VV  h(v) font, h(v) direction.
-+ * 001    WMODE_HV    -90 deg. rotated  
-+ * 100    WMODE_VH    +90 deg. rotated
-+ * 011    WMODE_HD    +90 deg. rotated
-+ * 111    WMODE_VD    180 deg. rotated
-+
-  * In MetaPost PostScript file processing (mp_mode = 1), only HH/VV mode
-  * is applied.
-  */
- #define TEXT_WMODE_HH 0
- #define TEXT_WMODE_HV 1
--#define TEXT_WMODE_VH 2
--#define TEXT_WMODE_VV 3
-+#define TEXT_WMODE_VH 4
-+#define TEXT_WMODE_VV 5
-+#define TEXT_WMODE_HD 3
-+#define TEXT_WMODE_VD 7
- 
--#define ANGLE_CHANGES(m1,m2) ((abs((m1)-(m2)) % 3) == 0 ? 0 : 1)
-+#define ANGLE_CHANGES(m1,m2) ((abs((m1)-(m2)) % 5) == 0 ? 0 : 1)
- #define ROTATE_TEXT(m)       ((m) != TEXT_WMODE_HH && (m) != TEXT_WMODE_VV)
- 
- static struct {
-@@ -526,6 +530,16 @@
-     tm.a =  1.0; tm.b =  -slant;
-     tm.c =  0.0; tm.d =   extend;
-     break;
-+  case TEXT_WMODE_HD:
-+    /* Horizontal font */
-+    tm.a =  0.0;    tm.b = extend;
-+    tm.c = -1.0;    tm.d = slant ;
-+    break;
-+  case TEXT_WMODE_VD:
-+    /* Vertical font */
-+    tm.a = -1.0; tm.b =   slant;
-+    tm.c =  0.0; tm.d =  -extend;
-+    break;
-   }
-   tm.e = xpos * dev_unit.dvi2pts;
-   tm.f = ypos * dev_unit.dvi2pts;
-@@ -730,6 +744,39 @@
-     format_buffer[len++] = ' ';
-     len += dev_sprint_bp(format_buffer+len, desired_dely, &error_dely);
-     break;
-+  case TEXT_WMODE_HD:
-+    /* Horizontal font in down-to-up mode: rot = +90
-+     *
-+     *                          | s/e  -1|
-+     * d_user = d x -I_hv = d x |        |
-+     *                          | 1/e   0|
-+     */
-+    desired_delx = -(spt_t)(-(dely + delx*slant)/extend);
-+    desired_dely = -delx;
-+
-+    format_buffer[len++] = ' ';
-+    len += dev_sprint_bp(format_buffer+len, desired_delx, &error_dely);
-+    format_buffer[len++] = ' ';
-+    len += dev_sprint_bp(format_buffer+len, desired_dely, &error_delx);
-+    error_delx = -error_delx;
-+    error_dely = -error_dely;
-+   break;
-+  case TEXT_WMODE_VD:
-+    /* Vertical font in down-to-up mode: rot = 180
-+     *                          |-1 -s/e|
-+     * d_user = d x -I_vv = d x |       |
-+     *                          | 0 -1/e|
-+     */
-+    desired_delx = -delx;
-+    desired_dely = -(spt_t)((dely + delx*slant)/extend);
-+
-+    format_buffer[len++] = ' ';
-+    len += dev_sprint_bp(format_buffer+len, desired_delx, &error_delx);
-+    format_buffer[len++] = ' ';
-+    len += dev_sprint_bp(format_buffer+len, desired_dely, &error_dely);
-+    error_delx = -error_delx;
-+    error_dely = -error_dely;
-+    break;
-   }
-   pdf_doc_add_page_content(format_buffer, len);  /* op: */
-   /*
-@@ -798,11 +845,11 @@
- 
-   vert_font  = font->wmode ? 1 : 0;
-   if (dev_param.autorotate) {
--    vert_dir = text_state.dir_mode ? 1 : 0;
-+    vert_dir = text_state.dir_mode;
-   } else {
-     vert_dir = vert_font;
-   }
--  text_rotate = (vert_font << 1)|vert_dir;
-+  text_rotate = (vert_font << 2)|vert_dir;
- 
-   if (font->slant  != text_state.matrix.slant  ||
-       font->extend != text_state.matrix.extend ||
-@@ -1085,14 +1132,18 @@
-    * (in 1000 units per em) but dvipdfmx does not take into account of this...
-    */
- 
--  if (text_state.dir_mode) {
-+  if (text_state.dir_mode==0) {
-+    /* Left-to-right */
-+    delh = text_xorigin + text_state.offset - xpos;
-+    delv = ypos - text_yorigin;
-+  } else if (text_state.dir_mode==1) {
-     /* Top-to-bottom */
-     delh = ypos - text_yorigin + text_state.offset;
-     delv = xpos - text_xorigin;
-   } else {
--    /* Left-to-right */
--    delh = text_xorigin + text_state.offset - xpos;
--    delv = ypos - text_yorigin;
-+    /* Bottom-to-top */
-+    delh = ypos + text_yorigin + text_state.offset;
-+    delv = xpos + text_xorigin;
-   }
- 
-   /* White-space more than 3em is not considered as a part of single text.
-@@ -1615,11 +1666,11 @@
- 
-   vert_font = (font && font->wmode) ? 1 : 0;
-   if (dev_param.autorotate) {
--    vert_dir = text_dir ? 1 : 0;
-+    vert_dir = text_dir;
-   } else {
-     vert_dir = vert_font;
-   }
--  text_rotate = (vert_font << 1)|vert_dir;
-+  text_rotate = (vert_font << 2)|vert_dir;
- 
-   if (font &&
-       ANGLE_CHANGES(text_rotate, text_state.matrix.rotate)) {
-@@ -1640,11 +1691,11 @@
- 
-   vert_font = (font && font->wmode) ? 1 : 0;
-   if (auto_rotate) {
--    vert_dir = text_state.dir_mode ? 1 : 0;
-+    vert_dir = text_state.dir_mode;
-   } else {
-     vert_dir = vert_font;
-   }
--  text_rotate = (vert_font << 1)|vert_dir;
-+  text_rotate = (vert_font << 2)|vert_dir;
- 
-   if (ANGLE_CHANGES(text_rotate, text_state.matrix.rotate)) {
-     text_state.force_reset = 1;
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/patch-07-surrogates b/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/patch-07-surrogates
deleted file mode 100644
index 22c547b19aa..00000000000
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/patch-07-surrogates
+++ /dev/null
@@ -1,44 +0,0 @@
-	Handle UTP-16 surrogates for UCS-4 supplementary planes.
-
-diff -ur dvipdfmx-20110311.orig/src/pdfdev.c dvipdfmx-20110311/src/pdfdev.c
---- dvipdfmx-20110311.orig/src/pdfdev.c	2012-01-17 19:27:40.000000000 +0100
-+++ dvipdfmx-20110311/src/pdfdev.c	2012-03-05 13:44:30.000000000 +0100
-@@ -960,17 +960,32 @@
-       }
-       length *= 4;
-     } else if (ctype == 2) {
-+      int len = 0;
-+
-       if (length * 2 >= FORMAT_BUF_SIZE) {
-         WARN("Too long string...");
-         return -1;
-       }
--      for (i = 0; i < length; i += 2) {
--        sbuf1[i*2  ] = font->ucs_group;
--        sbuf1[i*2+1] = font->ucs_plane;
--        sbuf1[i*2+2] = p[i];
--        sbuf1[i*2+3] = p[i+1];
-+      for (i = 0; i < length; i += 2, len += 4) {
-+        sbuf1[len  ] = font->ucs_group;
-+        if ((p[i] & 0xf8) == 0xd8) {
-+          int c;
-+          /* Check for valid surrogate pair.  */ 
-+          if ((p[i] & 0xfc) != 0xd8 || i + 2 >= length || (p[i+2] & 0xfc) != 0xdc) {
-+            WARN("Invalid surrogate p[%d]=%02X...", i, p[i]);
-+            return -1;
-+          }
-+          c = (((p[i] & 0x03) << 10) | (p[i+1] << 2) | (p[i+2] & 0x03)) + 0x100;
-+          sbuf1[len+1] = (c >> 8) & 0xff;
-+          sbuf1[len+2] = c & 0xff;
-+          i += 2;
-+        } else {
-+          sbuf1[len+1] = font->ucs_plane;
-+          sbuf1[len+2] = p[i];
-+        }
-+        sbuf1[len+3] = p[i+1];
-       }
--      length *= 2;
-+      length = len;
-     }
-     p = sbuf1;
-   } else if (ctype == 1 && font->mapc >= 0) {
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/patch-08-extern b/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/patch-08-extern
deleted file mode 100644
index b5087a90e7f..00000000000
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/patch-08-extern
+++ /dev/null
@@ -1,67 +0,0 @@
-	Remove extern decls from *.c files.
-
-diff -ur dvipdfmx-20110311.orig/src/dpxfile.c dvipdfmx-20110311/src/dpxfile.c
---- dvipdfmx-20110311.orig/src/dpxfile.c	2011-06-06 09:50:11.000000000 +0200
-+++ dvipdfmx-20110311/src/dpxfile.c	2012-03-29 11:39:16.000000000 +0200
-@@ -744,13 +744,8 @@
- 
- #ifdef  HAVE_MKSTEMP
- #  include <stdlib.h>
--/* extern int mkstemp(const char *); */
- #endif
- 
--/* Please fix: GCC warning
-- *   warning: implicit declaration of function `mkstemp'
-- * mkstemp may not be declared in stdlib.h. 
-- */
- char *
- dpx_create_temp_file (void)
- {
-diff -ur dvipdfmx-20110311.orig/src/dvipdfmx.c dvipdfmx-20110311/src/dvipdfmx.c
---- dvipdfmx-20110311.orig/src/dvipdfmx.c	2011-03-08 03:08:35.000000000 +0100
-+++ dvipdfmx-20110311/src/dvipdfmx.c	2012-03-29 11:46:06.000000000 +0200
-@@ -59,7 +59,7 @@
- #include "dvipdfmx.h"
- #include "xbb.h"
- 
--extern void error_cleanup (void);
-+#include "error.h"
- 
- int compat_mode = 0;     /* 0 = dvipdfmx, 1 = dvipdfm */
- 
-diff -ur dvipdfmx-20110311.orig/src/error.c dvipdfmx-20110311/src/error.c
---- dvipdfmx-20110311.orig/src/error.c	2011-03-05 05:44:49.000000000 +0100
-+++ dvipdfmx-20110311/src/error.c	2012-03-29 11:46:14.000000000 +0200
-@@ -73,8 +73,6 @@
-   }
- }
- 
--extern void error_cleanup (void);
--
- void
- ERROR (const char *fmt, ...)
- {
-diff -ur dvipdfmx-20110311.orig/src/error.h dvipdfmx-20110311/src/error.h
---- dvipdfmx-20110311.orig/src/error.h	2011-03-05 05:44:49.000000000 +0100
-+++ dvipdfmx-20110311/src/error.h	2012-03-29 11:45:20.000000000 +0200
-@@ -27,7 +27,7 @@
- 
- #include "system.h"
- 
--extern void error_cleanup();
-+extern void error_cleanup (void);
- 
- #define FATAL_ERROR -1
- #define NO_ERROR 0
-diff -ur dvipdfmx-20110311.orig/src/spc_color.c dvipdfmx-20110311/src/spc_color.c
---- dvipdfmx-20110311.orig/src/spc_color.c	2011-03-06 04:14:15.000000000 +0100
-+++ dvipdfmx-20110311/src/spc_color.c	2012-03-29 11:37:55.000000000 +0200
-@@ -140,7 +140,7 @@
-   return  r;
- }
- 
--extern int
-+int
- spc_color_setup_handler (struct spc_handler *sph,
- 			 struct spc_env *spe, struct spc_arg *ap)
- {
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/ChangeLog b/Build/source/texk/dvipdfmx/dvipdfmx-20120420-patches/ChangeLog
index 6a6bb5806a1..0d9c4196edb 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/ChangeLog
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420-patches/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-20  Norbert Preining  <preining@logic.at>
+
+	* 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.
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20120420-patches/TL-Changes b/Build/source/texk/dvipdfmx/dvipdfmx-20120420-patches/TL-Changes
new file mode 100644
index 00000000000..08e54933b6a
--- /dev/null
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420-patches/TL-Changes
@@ -0,0 +1,14 @@
+Changes applied to the dvipdfmx-20110420 tree as obtained from the
+the subversion source of TL.
+
+#Changes applied to the dvipdfmx-20110311 tree as obtained from:
+#	http://project.ktug.or.kr/dvipdfmx/snapshot/latest/dvipdfmx-20110311.tar.gz
+
+Removed:
+	NEWS
+	compile
+	depcomp
+	install-sh
+	missing
+	mkinstalldirs
+
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/patch-00-cfg b/Build/source/texk/dvipdfmx/dvipdfmx-20120420-patches/patch-00-cfg
index 855796014ee..4568ca22a54 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/patch-00-cfg
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420-patches/patch-00-cfg
@@ -1,6 +1,6 @@
-diff -ur dvipdfmx-20110311.orig/data/dvipdfmx.cfg dvipdfmx-20110311/data/dvipdfmx.cfg
---- dvipdfmx-20110311.orig/data/dvipdfmx.cfg	2010-10-12 02:01:29.000000000 +0200
-+++ dvipdfmx-20110311/data/dvipdfmx.cfg	2011-04-29 00:31:34.000000000 +0200
+diff -ur dvipdfmx-20120420.orig/data/dvipdfmx.cfg dvipdfmx-20120420/data/dvipdfmx.cfg
+--- dvipdfmx-20120420.orig/data/dvipdfmx.cfg	2010-10-12 02:01:29.000000000 +0200
++++ dvipdfmx-20120420/data/dvipdfmx.cfg	2011-04-29 00:31:34.000000000 +0200
 @@ -137,14 +137,23 @@
  %% than A0, and their llx=lly=0, you can use "-dEPSCrop" instead of
  %% "-sPAPERSIZE=a0"
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/AUTHORS b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/AUTHORS
index ecfe010de6a..15236a4825a 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/AUTHORS
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/AUTHORS
@@ -2,3 +2,4 @@ Authors of DVIPDFMx:
 
 Jin-Hwan Cho, Matthias Franz, and Shunsaku Hirata,
 the DVIPDFMx project team <dvipdfmx@project.ktug.or.kr>.
+
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/COPYING b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/COPYING
index 60549be514a..60549be514a 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/COPYING
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/COPYING
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/ChangeLog b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/ChangeLog
index 6388029be5d..b79a235a309 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/ChangeLog
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/ChangeLog
@@ -3,6 +3,83 @@ $Header: /home/cvsroot/dvipdfmx/ChangeLog,v 1.290 2011/03/11 03:15:31 chofchof E
 ChangeLog: Changes for DVIPDFMx
 ===============================
 
+2012-04-20  Norbert Preining  <preining@logic.at>
+
+	* DVIPDFMx-20120420 release
+
+2012-04-20  Alexander Grahn  <A.Grahn@hzdr.de>
+
+	* src/spc_pdfm.c: use kpse to find media
+
+2012-04-20  Norbert Preining  <preining@logic.at>
+
+	* src/dvipdfmx.c: add a new directive "i" for reading subsidiary
+	config files
+	* data/dvipdfmx.cfg: document the new directive
+
+2012-03-29  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* 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>
+
+	* pdfdev.c: 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>
+
+	* dvi.c, pdfdev.c:: Support for (e-)(u)pTeX dtou direction.
+
+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-10-18  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* tt_cmap.c: Fix typo "featre" -> "feature".
+
+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>
+
+	* 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-05-31  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* man/extractbb.1: Update extractbb manpage.
+
+2011-05-09  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* ../dvipdfmx-20110311/data/dvipdfmx.cfg: Synched from Master.
+
+2011-05-03  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* man/extractbb.1: Update man/extractbb.1.
+
 2011-03-11  Jin-Hwan Cho
 
 	* dpxcrypt.c:
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/INSTALL b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/INSTALL
index b42a17ac464..b42a17ac464 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/INSTALL
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/INSTALL
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/Makefile.am b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/Makefile.am
index 313d39cf382..313d39cf382 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/Makefile.am
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/Makefile.am
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/Makefile.in b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/Makefile.in
index f8469e144e7..f8469e144e7 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/Makefile.in
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/Makefile.in
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/README b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/README
index 71026f02ce3..71026f02ce3 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/README
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/README
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/aclocal.m4 b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/aclocal.m4
index 644ba8adfe9..644ba8adfe9 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/aclocal.m4
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/aclocal.m4
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/config.h.in b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/config.h.in
index 5fdf53a141c..5fdf53a141c 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/config.h.in
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/config.h.in
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/configure b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/configure
index fbb1408381a..e83b1fa9e74 100755
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/configure
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/configure
@@ -2321,7 +2321,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=dvipdfmx
- VERSION=20110311
+ VERSION=20120420
 
 
 cat >>confdefs.h <<_ACEOF
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/configure.in b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/configure.in
index 6b91ec6c025..14a814ecf00 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/configure.in
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/configure.in
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(src/dvipdfmx.c)
-AM_INIT_AUTOMAKE(dvipdfmx, 20110311)
+AM_INIT_AUTOMAKE(dvipdfmx, 20120420)
 AM_CONFIG_HEADER(config.h)
 AM_MAINTAINER_MODE
 
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/data/EUC-UCS2 b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/data/EUC-UCS2
index d7a91685ad5..d7a91685ad5 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/data/EUC-UCS2
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/data/EUC-UCS2
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/data/Makefile.am b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/data/Makefile.am
index ac25e3869d6..ac25e3869d6 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/data/Makefile.am
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/data/Makefile.am
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/data/Makefile.in b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/data/Makefile.in
index 7ceaee2b97a..7ceaee2b97a 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/data/Makefile.in
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/data/Makefile.in
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/data/cid-x.map b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/data/cid-x.map
index d2969113d7f..d2969113d7f 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/data/cid-x.map
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/data/cid-x.map
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/data/dvipdfmx.cfg b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/data/dvipdfmx.cfg
index 49c471d330e..53c96b8e3cc 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/data/dvipdfmx.cfg
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/data/dvipdfmx.cfg
@@ -198,3 +198,6 @@ f  pdftex.map
 
 %% Put additonal fontmap files here (usually for Type0 fonts)
 f  cid-x.map
+
+%% Include other config files
+%i <filename>
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/data/glyphlist.txt b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/data/glyphlist.txt
index 0304ffc6674..0304ffc6674 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/data/glyphlist.txt
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/data/glyphlist.txt
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/data/pdfglyphlist.txt b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/data/pdfglyphlist.txt
index 25596f152dd..25596f152dd 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/data/pdfglyphlist.txt
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/data/pdfglyphlist.txt
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/m4/cho-kpse.m4 b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/m4/cho-kpse.m4
index 9668fa21d85..9668fa21d85 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/m4/cho-kpse.m4
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/m4/cho-kpse.m4
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/m4/cho-libs.m4 b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/m4/cho-libs.m4
index 3687a0bb9f5..3687a0bb9f5 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/m4/cho-libs.m4
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/m4/cho-libs.m4
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/m4/maw-time.m4 b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/m4/maw-time.m4
index 69a6b191353..69a6b191353 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/m4/maw-time.m4
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/m4/maw-time.m4
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/man/Makefile.am b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/man/Makefile.am
index 6de89890d41..6de89890d41 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/man/Makefile.am
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/man/Makefile.am
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/man/Makefile.in b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/man/Makefile.in
index a804951d10f..a804951d10f 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/man/Makefile.in
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/man/Makefile.in
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/man/extractbb.1 b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/man/extractbb.1
index 82c9715e681..34b6d348580 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/man/extractbb.1
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/man/extractbb.1
@@ -1,4 +1,4 @@
-.TH "EXTRACTBB" "1" "6 May 2011" "20110311" "DVIPDFMx"
+.TH "EXTRACTBB" "1" "20 April 2012" "20120420" "DVIPDFMx"
 .PP 
 .SH "NAME" 
 extractbb, ebb \- extract bounding box information from graphics files
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/Makefile.am b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/Makefile.am
index e47e0fb4e60..e47e0fb4e60 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/Makefile.am
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/Makefile.am
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/Makefile.in b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/Makefile.in
index 48b07a5ac2c..48b07a5ac2c 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/Makefile.in
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/Makefile.in
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/agl.c b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/agl.c
index fd5ae35085f..fd5ae35085f 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/agl.c
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/agl.c
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/agl.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/agl.h
index da7f52ca40d..da7f52ca40d 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/agl.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/agl.h
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/bmpimage.c b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/bmpimage.c
index c6db08be73a..c6db08be73a 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/bmpimage.c
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/bmpimage.c
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/bmpimage.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/bmpimage.h
index 7dbe6beb798..7dbe6beb798 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/bmpimage.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/bmpimage.h
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/cff.c b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/cff.c
index 515b1e110ec..515b1e110ec 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/cff.c
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/cff.c
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/cff.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/cff.h
index d15de03115a..d15de03115a 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/cff.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/cff.h
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/cff_dict.c b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/cff_dict.c
index 19b1a25f8f2..19b1a25f8f2 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/cff_dict.c
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/cff_dict.c
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/cff_dict.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/cff_dict.h
index 7a8d1f888b7..7a8d1f888b7 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/cff_dict.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/cff_dict.h
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/cff_limits.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/cff_limits.h
index 3bfd88a80ca..3bfd88a80ca 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/cff_limits.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/cff_limits.h
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/cff_stdstr.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/cff_stdstr.h
index 2c3e2ba7a39..2c3e2ba7a39 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/cff_stdstr.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/cff_stdstr.h
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/cff_types.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/cff_types.h
index 388dc5b77d3..388dc5b77d3 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/cff_types.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/cff_types.h
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/cid.c b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/cid.c
index 72828782dc5..72828782dc5 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/cid.c
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/cid.c
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/cid.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/cid.h
index 257bbe3dce1..257bbe3dce1 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/cid.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/cid.h
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/cid_basefont.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/cid_basefont.h
index 4b87320950f..4b87320950f 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/cid_basefont.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/cid_basefont.h
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/cid_p.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/cid_p.h
index f6952abd231..f6952abd231 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/cid_p.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/cid_p.h
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/cidtype0.c b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/cidtype0.c
index a76929fac90..a76929fac90 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/cidtype0.c
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/cidtype0.c
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/cidtype0.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/cidtype0.h
index 6358d55112d..6358d55112d 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/cidtype0.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/cidtype0.h
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/cidtype2.c b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/cidtype2.c
index 91cf66db27f..91cf66db27f 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/cidtype2.c
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/cidtype2.c
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/cidtype2.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/cidtype2.h
index 24c555954d1..24c555954d1 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/cidtype2.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/cidtype2.h
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/cmap.c b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/cmap.c
index 9ab66aece8a..9ab66aece8a 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/cmap.c
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/cmap.c
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/cmap.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/cmap.h
index 579361eb5f1..579361eb5f1 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/cmap.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/cmap.h
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/cmap_p.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/cmap_p.h
index 32d4250dafe..32d4250dafe 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/cmap_p.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/cmap_p.h
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/cmap_read.c b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/cmap_read.c
index 7830350d926..7830350d926 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/cmap_read.c
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/cmap_read.c
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/cmap_read.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/cmap_read.h
index 7e334e2263a..7e334e2263a 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/cmap_read.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/cmap_read.h
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/cmap_write.c b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/cmap_write.c
index eb900512a11..eb900512a11 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/cmap_write.c
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/cmap_write.c
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/cmap_write.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/cmap_write.h
index fcb95e0ec95..fcb95e0ec95 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/cmap_write.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/cmap_write.h
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/cs_type2.c b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/cs_type2.c
index 5c7e3d56867..5c7e3d56867 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/cs_type2.c
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/cs_type2.c
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/cs_type2.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/cs_type2.h
index ab489159873..ab489159873 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/cs_type2.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/cs_type2.h
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/dpxconf.c b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/dpxconf.c
index 5b8670310d6..5b8670310d6 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/dpxconf.c
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/dpxconf.c
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/dpxconf.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/dpxconf.h
index 63a73ddef4f..63a73ddef4f 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/dpxconf.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/dpxconf.h
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/dpxcrypt.c b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/dpxcrypt.c
index b58829db9e4..b58829db9e4 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/dpxcrypt.c
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/dpxcrypt.c
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/dpxcrypt.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/dpxcrypt.h
index edbf7d1c8cc..edbf7d1c8cc 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/dpxcrypt.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/dpxcrypt.h
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/dpxfile.c b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/dpxfile.c
index 9547202a997..9547202a997 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/dpxfile.c
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/dpxfile.c
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/dpxfile.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/dpxfile.h
index 7dfd36aa1c6..7dfd36aa1c6 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/dpxfile.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/dpxfile.h
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/dpxutil.c b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/dpxutil.c
index 8f3b45b8664..8f3b45b8664 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/dpxutil.c
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/dpxutil.c
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/dpxutil.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/dpxutil.h
index 8b20a791f69..8b20a791f69 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/dpxutil.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/dpxutil.h
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/dvi.c b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/dvi.c
index 13b84e6d683..13b84e6d683 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/dvi.c
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/dvi.c
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/dvi.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/dvi.h
index e18e8b02388..e18e8b02388 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/dvi.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/dvi.h
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/dvicodes.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/dvicodes.h
index 2203fb2e7cf..2203fb2e7cf 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/dvicodes.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/dvicodes.h
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/dvipdfmx.c b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/dvipdfmx.c
index 923cf172fc8..65d427271cc 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/dvipdfmx.c
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/dvipdfmx.c
@@ -102,6 +102,9 @@ static char   landscape_mode    = 0;
 char *dvi_filename = NULL, *pdf_filename = NULL;
 
 static void
+read_config_file (const char *config);
+
+static void
 set_default_pdf_filename(void)
 {
   const char *dvi_base;
@@ -131,7 +134,7 @@ show_version (void)
 {
   fprintf(stdout, "\nThis is %s-%s by the DVIPDFMx project team,\n", PACKAGE, VERSION);
   fprintf(stdout, "an extended version of dvipdfm-0.13.2c developed by Mark A. Wicks.\n");
-  fprintf(stdout, "\nCopyright (C) 2002-2011 by the DVIPDFMx project team\n");
+  fprintf(stdout, "\nCopyright (C) 2002-2012 by the DVIPDFMx project team\n");
   fprintf(stdout, "\nThis is free software; you can redistribute it and/or modify\n");
   fprintf(stdout, "it under the terms of the GNU General Public License as published by\n");
   fprintf(stdout, "the Free Software Foundation; either version 2 of the License, or\n");
@@ -562,6 +565,11 @@ do_args (int argc, char *argv[])
       case 'E':
         compat_mode = 1;
         break;
+      case 'i':
+        CHECK_ARG(1, "subsidiary config file");
+        read_config_file(argv[1]);
+        POP_ARG();
+        break;
       case 'e':
 	if (compat_mode) {
 	  WARN("dvipdfm \"-e\" option not supported.");
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/dvipdfmx.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/dvipdfmx.h
index c2c03b0df1c..c2c03b0df1c 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/dvipdfmx.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/dvipdfmx.h
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/epdf.c b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/epdf.c
index aa2d8bf80f2..aa2d8bf80f2 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/epdf.c
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/epdf.c
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/epdf.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/epdf.h
index 849589f3ebe..849589f3ebe 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/epdf.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/epdf.h
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/error.c b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/error.c
index ae0640c3786..ae0640c3786 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/error.c
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/error.c
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/error.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/error.h
index 87309953230..87309953230 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/error.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/error.h
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/fontmap.c b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/fontmap.c
index 722b3d1581c..722b3d1581c 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/fontmap.c
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/fontmap.c
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/fontmap.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/fontmap.h
index 2445373dca0..2445373dca0 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/fontmap.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/fontmap.h
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/jpegimage.c b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/jpegimage.c
index 6a4fdf20b32..6a4fdf20b32 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/jpegimage.c
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/jpegimage.c
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/jpegimage.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/jpegimage.h
index 4b1e57c1e2c..4b1e57c1e2c 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/jpegimage.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/jpegimage.h
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/mem.c b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/mem.c
index 078bc2fa619..078bc2fa619 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/mem.c
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/mem.c
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/mem.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/mem.h
index 852a011e168..852a011e168 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/mem.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/mem.h
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/mfileio.c b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/mfileio.c
index bec5020fa06..bec5020fa06 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/mfileio.c
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/mfileio.c
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/mfileio.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/mfileio.h
index e31fef23244..e31fef23244 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/mfileio.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/mfileio.h
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/mpost.c b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/mpost.c
index 2422687e3eb..2422687e3eb 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/mpost.c
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/mpost.c
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/mpost.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/mpost.h
index 49b9bbd9817..49b9bbd9817 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/mpost.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/mpost.h
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/numbers.c b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/numbers.c
index 4b1a56524d3..4b1a56524d3 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/numbers.c
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/numbers.c
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/numbers.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/numbers.h
index 485794cd5be..485794cd5be 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/numbers.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/numbers.h
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/otl_conf.c b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/otl_conf.c
index a439e821543..a439e821543 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/otl_conf.c
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/otl_conf.c
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/otl_conf.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/otl_conf.h
index bf63303ae42..bf63303ae42 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/otl_conf.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/otl_conf.h
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/otl_opt.c b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/otl_opt.c
index 1ef8e48152c..1ef8e48152c 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/otl_opt.c
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/otl_opt.c
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/otl_opt.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/otl_opt.h
index b3442dfc101..b3442dfc101 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/otl_opt.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/otl_opt.h
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/pdfcolor.c b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/pdfcolor.c
index 270a5da7e3a..270a5da7e3a 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/pdfcolor.c
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/pdfcolor.c
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/pdfcolor.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/pdfcolor.h
index 6cbc8eeadce..6cbc8eeadce 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/pdfcolor.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/pdfcolor.h
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/pdfdev.c b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/pdfdev.c
index ff7a83e728f..ff7a83e728f 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/pdfdev.c
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/pdfdev.c
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/pdfdev.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/pdfdev.h
index 895236858ea..895236858ea 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/pdfdev.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/pdfdev.h
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/pdfdoc.c b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/pdfdoc.c
index a452728eb95..a452728eb95 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/pdfdoc.c
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/pdfdoc.c
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/pdfdoc.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/pdfdoc.h
index e6d06ed648b..e6d06ed648b 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/pdfdoc.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/pdfdoc.h
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/pdfdraw.c b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/pdfdraw.c
index b3e16963420..b3e16963420 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/pdfdraw.c
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/pdfdraw.c
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/pdfdraw.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/pdfdraw.h
index 8e9ee9c0ce7..8e9ee9c0ce7 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/pdfdraw.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/pdfdraw.h
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/pdfencoding.c b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/pdfencoding.c
index 9e72b2276f0..9e72b2276f0 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/pdfencoding.c
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/pdfencoding.c
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/pdfencoding.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/pdfencoding.h
index abc62b2bf6c..abc62b2bf6c 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/pdfencoding.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/pdfencoding.h
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/pdfencrypt.c b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/pdfencrypt.c
index 534711ba41a..534711ba41a 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/pdfencrypt.c
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/pdfencrypt.c
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/pdfencrypt.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/pdfencrypt.h
index 7e3ae60a3a4..7e3ae60a3a4 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/pdfencrypt.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/pdfencrypt.h
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/pdffont.c b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/pdffont.c
index e7a056ff0fa..e7a056ff0fa 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/pdffont.c
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/pdffont.c
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/pdffont.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/pdffont.h
index 168d06b94f5..168d06b94f5 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/pdffont.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/pdffont.h
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/pdflimits.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/pdflimits.h
index f3871dea24a..f3871dea24a 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/pdflimits.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/pdflimits.h
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/pdfnames.c b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/pdfnames.c
index fd3312f351a..fd3312f351a 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/pdfnames.c
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/pdfnames.c
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/pdfnames.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/pdfnames.h
index 4eaaffbb3f1..4eaaffbb3f1 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/pdfnames.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/pdfnames.h
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/pdfobj.c b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/pdfobj.c
index 2ce7f90b210..2ce7f90b210 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/pdfobj.c
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/pdfobj.c
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/pdfobj.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/pdfobj.h
index 3afe6c91d21..3afe6c91d21 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/pdfobj.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/pdfobj.h
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/pdfparse.c b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/pdfparse.c
index c0c139085a0..c0c139085a0 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/pdfparse.c
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/pdfparse.c
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/pdfparse.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/pdfparse.h
index 01106a1977c..01106a1977c 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/pdfparse.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/pdfparse.h
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/pdfresource.c b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/pdfresource.c
index e55a9737aa6..e55a9737aa6 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/pdfresource.c
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/pdfresource.c
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/pdfresource.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/pdfresource.h
index 199d22d1665..199d22d1665 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/pdfresource.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/pdfresource.h
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/pdfximage.c b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/pdfximage.c
index f9692c690f6..f9692c690f6 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/pdfximage.c
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/pdfximage.c
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/pdfximage.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/pdfximage.h
index 1df84c54284..1df84c54284 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/pdfximage.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/pdfximage.h
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/pkfont.c b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/pkfont.c
index 803ca0183eb..803ca0183eb 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/pkfont.c
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/pkfont.c
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/pkfont.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/pkfont.h
index 9e5b9f87bb3..9e5b9f87bb3 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/pkfont.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/pkfont.h
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/pngimage.c b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/pngimage.c
index 12932be9f39..12932be9f39 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/pngimage.c
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/pngimage.c
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/pngimage.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/pngimage.h
index 4bb33726ab5..4bb33726ab5 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/pngimage.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/pngimage.h
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/pst.c b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/pst.c
index 430396d1c5d..430396d1c5d 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/pst.c
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/pst.c
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/pst.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/pst.h
index 4108b827919..4108b827919 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/pst.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/pst.h
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/pst_obj.c b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/pst_obj.c
index 8b82d8d4ecb..8b82d8d4ecb 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/pst_obj.c
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/pst_obj.c
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/pst_obj.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/pst_obj.h
index cfa0c849302..cfa0c849302 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/pst_obj.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/pst_obj.h
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/sfnt.c b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/sfnt.c
index a1e8a4c6057..a1e8a4c6057 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/sfnt.c
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/sfnt.c
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/sfnt.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/sfnt.h
index 6529df35def..6529df35def 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/sfnt.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/sfnt.h
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/spc_color.c b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/spc_color.c
index 76f41757b66..76f41757b66 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/spc_color.c
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/spc_color.c
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/spc_color.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/spc_color.h
index 206b7e2f452..206b7e2f452 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/spc_color.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/spc_color.h
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/spc_dvips.c b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/spc_dvips.c
index f99ec14b5af..f99ec14b5af 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/spc_dvips.c
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/spc_dvips.c
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/spc_dvips.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/spc_dvips.h
index 009e85fcdf7..009e85fcdf7 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/spc_dvips.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/spc_dvips.h
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/spc_html.c b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/spc_html.c
index 185125187cc..185125187cc 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/spc_html.c
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/spc_html.c
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/spc_html.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/spc_html.h
index a6097f57de4..a6097f57de4 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/spc_html.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/spc_html.h
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/spc_misc.c b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/spc_misc.c
index 196d942d015..196d942d015 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/spc_misc.c
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/spc_misc.c
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/spc_misc.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/spc_misc.h
index 1dbd3a1d2be..1dbd3a1d2be 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/spc_misc.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/spc_misc.h
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/spc_pdfm.c b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/spc_pdfm.c
index fac8ca255a9..a44db04bc86 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/spc_pdfm.c
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/spc_pdfm.c
@@ -1364,7 +1364,7 @@ spc_handler_pdfm_stream_with_type (struct spc_env *spe, struct spc_arg *args, in
 {
   pdf_obj *fstream;
   long     nb_read;
-  char    *ident, *instring;
+  char    *ident, *instring, *fullname;
   pdf_obj *tmp;
   FILE    *fp;
 
@@ -1400,11 +1400,19 @@ spc_handler_pdfm_stream_with_type (struct spc_env *spe, struct spc_arg *args, in
       RELEASE(ident);
       return  -1;
     }
-    fp = DPXFOPEN(instring, DPX_RES_TYPE_BINARY);
+    fullname = kpse_find_pict(instring);
+    if (!fullname) {
+      spc_warn(spe, "File \"%s\" not found.", instring);
+      pdf_release_obj(tmp);
+      RELEASE(ident);
+      return  -1;
+    }
+    fp = DPXFOPEN(fullname, DPX_RES_TYPE_BINARY);
     if (!fp) {
       spc_warn(spe, "Could not open file: %s", instring);
       pdf_release_obj(tmp);
       RELEASE(ident);
+      RELEASE(fullname);
       return -1;
     }
     fstream = pdf_new_stream(STREAM_COMPRESS);
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/spc_pdfm.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/spc_pdfm.h
index 18468d56760..18468d56760 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/spc_pdfm.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/spc_pdfm.h
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/spc_tpic.c b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/spc_tpic.c
index e23c2194286..e23c2194286 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/spc_tpic.c
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/spc_tpic.c
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/spc_tpic.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/spc_tpic.h
index 28154c4303e..28154c4303e 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/spc_tpic.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/spc_tpic.h
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/spc_util.c b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/spc_util.c
index a6826e2ff44..a6826e2ff44 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/spc_util.c
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/spc_util.c
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/spc_util.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/spc_util.h
index e27c369415f..e27c369415f 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/spc_util.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/spc_util.h
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/specials.c b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/specials.c
index d042ab63644..d042ab63644 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/specials.c
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/specials.c
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/specials.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/specials.h
index 98f9b8d05ef..98f9b8d05ef 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/specials.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/specials.h
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/subfont.c b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/subfont.c
index 091b551a022..091b551a022 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/subfont.c
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/subfont.c
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/subfont.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/subfont.h
index 1d90c21ef65..1d90c21ef65 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/subfont.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/subfont.h
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/system.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/system.h
index 2b65ce372da..2b65ce372da 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/system.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/system.h
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/t1_char.c b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/t1_char.c
index c76338d3d21..c76338d3d21 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/t1_char.c
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/t1_char.c
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/t1_char.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/t1_char.h
index 5240a3a39cc..5240a3a39cc 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/t1_char.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/t1_char.h
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/t1_load.c b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/t1_load.c
index 2ba439bdaa7..2ba439bdaa7 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/t1_load.c
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/t1_load.c
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/t1_load.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/t1_load.h
index 95683612fbf..95683612fbf 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/t1_load.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/t1_load.h
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/tfm.c b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/tfm.c
index dd5387b1cb4..dd5387b1cb4 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/tfm.c
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/tfm.c
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/tfm.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/tfm.h
index 0f32734bc78..0f32734bc78 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/tfm.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/tfm.h
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/truetype.c b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/truetype.c
index 9ba07b0993d..9ba07b0993d 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/truetype.c
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/truetype.c
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/truetype.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/truetype.h
index d16b6860cfa..d16b6860cfa 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/truetype.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/truetype.h
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/tt_aux.c b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/tt_aux.c
index 14dc36e01f4..14dc36e01f4 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/tt_aux.c
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/tt_aux.c
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/tt_aux.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/tt_aux.h
index e20212c35e1..e20212c35e1 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/tt_aux.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/tt_aux.h
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/tt_cmap.c b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/tt_cmap.c
index 7b4d5bee947..7b4d5bee947 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/tt_cmap.c
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/tt_cmap.c
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/tt_cmap.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/tt_cmap.h
index e6e3ff3157e..e6e3ff3157e 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/tt_cmap.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/tt_cmap.h
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/tt_glyf.c b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/tt_glyf.c
index 5ec107a787d..5ec107a787d 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/tt_glyf.c
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/tt_glyf.c
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/tt_glyf.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/tt_glyf.h
index 41e2aa23c75..41e2aa23c75 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/tt_glyf.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/tt_glyf.h
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/tt_gsub.c b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/tt_gsub.c
index f981bfa60ff..f981bfa60ff 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/tt_gsub.c
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/tt_gsub.c
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/tt_gsub.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/tt_gsub.h
index 2c2d3a43a4e..2c2d3a43a4e 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/tt_gsub.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/tt_gsub.h
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/tt_post.c b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/tt_post.c
index 418854e3861..418854e3861 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/tt_post.c
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/tt_post.c
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/tt_post.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/tt_post.h
index afb5c080e08..afb5c080e08 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/tt_post.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/tt_post.h
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/tt_table.c b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/tt_table.c
index 418c1e956ff..418c1e956ff 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/tt_table.c
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/tt_table.c
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/tt_table.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/tt_table.h
index 7db97123fff..7db97123fff 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/tt_table.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/tt_table.h
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/type0.c b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/type0.c
index f0090508a03..f0090508a03 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/type0.c
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/type0.c
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/type0.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/type0.h
index 0a769f2eda6..0a769f2eda6 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/type0.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/type0.h
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/type1.c b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/type1.c
index 6cb7babad63..6cb7babad63 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/type1.c
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/type1.c
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/type1.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/type1.h
index d6ade0c55fe..d6ade0c55fe 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/type1.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/type1.h
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/type1c.c b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/type1c.c
index 081f0a4870b..081f0a4870b 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/type1c.c
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/type1c.c
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/type1c.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/type1c.h
index 25186d8c9c0..25186d8c9c0 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/type1c.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/type1c.h
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/unicode.c b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/unicode.c
index 90edd566f6b..90edd566f6b 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/unicode.c
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/unicode.c
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/unicode.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/unicode.h
index c5573f4429b..c5573f4429b 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/unicode.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/unicode.h
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/vf.c b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/vf.c
index d2a6e178207..d2a6e178207 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/vf.c
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/vf.c
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/vf.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/vf.h
index 18e36bc1a3e..18e36bc1a3e 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/vf.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/vf.h
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/xbb.c b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/xbb.c
index 2dba6550497..2dba6550497 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/xbb.c
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/xbb.c
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/xbb.h b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/xbb.h
index 9e139736d2c..9e139736d2c 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/xbb.h
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/src/xbb.h
diff --git a/Build/source/texk/dvipdfmx/man/dvipdfm.1 b/Build/source/texk/dvipdfmx/man/dvipdfm.1
index eb12d084068..b72633f76ae 100644
--- a/Build/source/texk/dvipdfmx/man/dvipdfm.1
+++ b/Build/source/texk/dvipdfmx/man/dvipdfm.1
@@ -10,7 +10,7 @@
 .sp
 .fi
 ..
-.TH "DVIPDFM" "1" "28 April 2011" "20110311" "DVIPDFMx"
+.TH "DVIPDFM" "1" "28 April 2011" "20120420" "DVIPDFMx"
 .SH NAME
 dvipdfm \- produce PDF files directly from DVI files
 
diff --git a/Build/source/texk/dvipdfmx/version.ac b/Build/source/texk/dvipdfmx/version.ac
index 8ae01365ae5..d4bdfae37be 100644
--- a/Build/source/texk/dvipdfmx/version.ac
+++ b/Build/source/texk/dvipdfmx/version.ac
@@ -8,4 +8,4 @@ dnl
 dnl --------------------------------------------------------
 dnl
 dnl  m4-include this file to define the current dvipdfmx version
-m4_define([dvipdfmx_version], [20110311])
+m4_define([dvipdfmx_version], [20120420])