libs/{lua52,luajit}, texk/web2c/{luatexdir,mplibdir,xetexdir}: Minor updates

git-svn-id: svn://tug.org/texlive/trunk@33182 c570f23f-e606-0410-a88d-b1316a301751
author: Peter Breitenlohner <peb@mppmu.mpg.de> 2014-03-15 13:59:02 +0000
committer: Peter Breitenlohner <peb@mppmu.mpg.de> 2014-03-15 13:59:02 +0000
commit: 421f7efdd3d6fba193be461fba84adbdccaa2ced (patch)
tree: dd8db3f5f47211af551f45fd0b29dd0683265b8c /Build
parent: 8dbe4b451fb55cabfd1f42b4df30e13069aa6e75 (diff)
13 files changed, 362 insertions, 383 deletions
diff --git a/Build/source/libs/lua52/ChangeLog b/Build/source/libs/lua52/ChangeLog
index 97cb5ff06e8..c639f54482a 100644
--- a/Build/source/libs/lua52/ChangeLog
+++ b/Build/source/libs/lua52/ChangeLog
@@ -1,3 +1,7 @@
+2014-03-15  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Makefile.am (AM_CPPFLAGS): Define LUAI_HASHLIMIT=6 for LuaTeX.
+
 2014-03-03  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* luaerror.test (new): Shell script to test error handling.
diff --git a/Build/source/libs/lua52/Makefile.am b/Build/source/libs/lua52/Makefile.am
index e8ef2795699..7b53e991372 100644
--- a/Build/source/libs/lua52/Makefile.am
+++ b/Build/source/libs/lua52/Makefile.am
@@ -22,7 +22,7 @@ dist-hook:
 
 SUBDIRS = . include
 
-AM_CPPFLAGS = -I$(top_srcdir)/$(LUA52_TREE)/src $(LUA52_DEFINES)
+AM_CPPFLAGS = -I$(top_srcdir)/$(LUA52_TREE)/src $(LUA52_DEFINES) -DLUAI_HASHLIMIT=6
 AM_CFLAGS = $(WARNING_CFLAGS)
 
 noinst_LIBRARIES = liblua52.a
diff --git a/Build/source/libs/lua52/Makefile.in b/Build/source/libs/lua52/Makefile.in
index c7a26f2e7a3..e85871336dd 100644
--- a/Build/source/libs/lua52/Makefile.in
+++ b/Build/source/libs/lua52/Makefile.in
@@ -577,7 +577,7 @@ top_srcdir = @top_srcdir@
 ACLOCAL_AMFLAGS = -I ../../m4
 EXTRA_DIST = $(LUA52_TREE) $(LUA52_TREE)-PATCHES error.exp
 SUBDIRS = . include
-AM_CPPFLAGS = -I$(top_srcdir)/$(LUA52_TREE)/src $(LUA52_DEFINES)
+AM_CPPFLAGS = -I$(top_srcdir)/$(LUA52_TREE)/src $(LUA52_DEFINES) -DLUAI_HASHLIMIT=6
 AM_CFLAGS = $(WARNING_CFLAGS)
 noinst_LIBRARIES = liblua52.a
 nodist_liblua52_a_SOURCES = \
diff --git a/Build/source/libs/lua52/lua-5.2.3-PATCHES/patch-02-lstring b/Build/source/libs/lua52/lua-5.2.3-PATCHES/patch-02-lstring
deleted file mode 100644
index c42fb67edfa..00000000000
--- a/Build/source/libs/lua52/lua-5.2.3-PATCHES/patch-02-lstring
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur lua-5.2.3.orig/src/lstring.c lua-5.2.3/src/lstring.c 
---- lua-5.2.3.orig/src/lstring.c2014-03-06 15:04:50.376201110 +0100
-+++ lua-5.2.3/src/lstring.c2014-03-03 16:55:19.978037000 +0100
-@@ -23,7 +23,7 @@
- ** compute its hash
- */
- #if !defined(LUAI_HASHLIMIT)
--#define LUAI_HASHLIMIT		5
-+#define LUAI_HASHLIMIT		6
- #endif
- 
- 
diff --git a/Build/source/libs/lua52/lua-5.2.3/src/lstring.c b/Build/source/libs/lua52/lua-5.2.3/src/lstring.c
index f438915a50d..af96c89c183 100644
--- a/Build/source/libs/lua52/lua-5.2.3/src/lstring.c
+++ b/Build/source/libs/lua52/lua-5.2.3/src/lstring.c
@@ -23,7 +23,7 @@
 ** compute its hash
 */
 #if !defined(LUAI_HASHLIMIT)
-#define LUAI_HASHLIMIT		6
+#define LUAI_HASHLIMIT		5
 #endif
 
 
diff --git a/Build/source/libs/luajit/LuaJIT-2.0.3-PATCHES/patch-007-lib_package.c b/Build/source/libs/luajit/LuaJIT-2.0.3-PATCHES/patch-007-lib_package.c
deleted file mode 100644
index ffc5b039620..00000000000
--- a/Build/source/libs/luajit/LuaJIT-2.0.3-PATCHES/patch-007-lib_package.c
+++ /dev/null
@@ -1,65 +0,0 @@
-diff -u LuaJIT-2.0.3.orig/src/lib_package.c LuaJIT-2.0.3/src/lib_package.c
---- LuaJIT-2.0.3.orig/src/lib_package.c	2014-03-13 12:38:39.407900526 +0100
-+++ LuaJIT-2.0.3/src/lib_package.c	2014-03-13 13:01:11.283956573 +0100
-@@ -68,6 +68,9 @@
- #elif LJ_TARGET_WINDOWS
- 
- #define WIN32_LEAN_AND_MEAN
-+#ifndef WINVER
-+#define WINVER 0x0500
-+#endif
- #include <windows.h>
- 
- #ifndef GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS
-@@ -354,6 +357,29 @@
-   return 1;  /* library loaded successfully */
- }
- 
-+#define LUA_POF		"luaopen_"
-+#define LUA_OFSEP	"_"
-+#define POF		LUA_POF
-+
-+static const char *mkfuncname (lua_State *L, const char *modname) {
-+  const char *funcname;
-+  const char *mark = strchr(modname, *LUA_IGMARK);
-+  if (mark) modname = mark + 1;
-+  funcname = luaL_gsub(L, modname, ".", LUA_OFSEP);
-+  funcname = lua_pushfstring(L, POF"%s", funcname);
-+  lua_remove(L, -2);  /* remove 'gsub' result */
-+  return funcname;
-+}
-+
-+
-+int loader_C_luatex (lua_State *L, const char *name, const char *filename) {
-+  const char *funcname;
-+  funcname = mkfuncname(L, name);
-+  if (ll_loadfunc(L, filename, funcname,0) != 0)
-+    loaderror(L, filename);
-+  return 1;  /* library loaded successfully */
-+}
-+
- static int lj_cf_package_loader_croot(lua_State *L)
- {
-   const char *filename;
-@@ -373,6 +399,21 @@
-   return 1;
- }
- 
-+int loader_Call_luatex (lua_State *L, const char *name, const char *filename) {
-+  const char *funcname;
-+  int stat;
-+  if (filename == NULL) return 1;  /* root not found */
-+  funcname = mkfuncname(L, name);
-+  if ((stat = ll_loadfunc(L, filename, funcname,0)) != 0) {
-+    if (stat != PACKAGE_ERR_FUNC) loaderror(L, filename);  /* real error */
-+    lua_pushfstring(L, "\n\tno module " LUA_QS " in file " LUA_QS,
-+                       name, filename);
-+    return 1;  /* function not found */
-+  }
-+  return 1;  /* library loaded successfully */
-+}
-+
-+
- static int lj_cf_package_loader_preload(lua_State *L)
- {
-   const char *name = luaL_checkstring(L, 1);
diff --git a/Build/source/libs/luajit/LuaJIT-2.0.3/src/lib_package.c b/Build/source/libs/luajit/LuaJIT-2.0.3/src/lib_package.c
index 6f3adec85b3..0e4a8ed0641 100644
--- a/Build/source/libs/luajit/LuaJIT-2.0.3/src/lib_package.c
+++ b/Build/source/libs/luajit/LuaJIT-2.0.3/src/lib_package.c
@@ -68,9 +68,6 @@ static const char *ll_bcsym(void *lib, const char *sym)
 #elif LJ_TARGET_WINDOWS
 
 #define WIN32_LEAN_AND_MEAN
-#ifndef WINVER
-#define WINVER 0x0500
-#endif
 #include <windows.h>
 
 #ifndef GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS
diff --git a/Build/source/libs/luajit/native/Makefile.in b/Build/source/libs/luajit/native/Makefile.in
index 0fcb804df74..b0b90971f21 100644
--- a/Build/source/libs/luajit/native/Makefile.in
+++ b/Build/source/libs/luajit/native/Makefile.in
@@ -116,9 +116,8 @@ buildvm_OBJECTS = $(nodist_buildvm_OBJECTS)
 buildvm_LDADD = $(LDADD)
 nodist_minilua_OBJECTS = @LUAJIT_TREE@/src/host/minilua.$(OBJEXT)
 minilua_OBJECTS = $(nodist_minilua_OBJECTS)
-minilua_LDADD = $(LDADD)
-minilua_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(minilua_LDFLAGS) \
-	$(LDFLAGS) -o $@
+am__DEPENDENCIES_1 =
+minilua_DEPENDENCIES = $(am__DEPENDENCIES_1)
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
@@ -311,7 +310,7 @@ nodist_buildvm_SOURCES = \
 nodist_minilua_SOURCES = \
 	@LUAJIT_TREE@/src/host/minilua.c
 
-minilua_LDFLAGS = $(MATH_LIB)
+minilua_LDADD = $(MATH_LIB)
 CLEANFILES = buildvm-stamp buildvm_arch.h
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-am
@@ -398,7 +397,7 @@ buildvm$(EXEEXT): $(buildvm_OBJECTS) $(buildvm_DEPENDENCIES) $(EXTRA_buildvm_DEP
 
 minilua$(EXEEXT): $(minilua_OBJECTS) $(minilua_DEPENDENCIES) $(EXTRA_minilua_DEPENDENCIES) 
 	@rm -f minilua$(EXEEXT)
-	$(AM_V_CCLD)$(minilua_LINK) $(minilua_OBJECTS) $(minilua_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(LINK) $(minilua_OBJECTS) $(minilua_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index 9cf1d3b860c..bc37bc92b5f 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -107,8 +107,8 @@ TESTS = tangle.test $(am__EXEEXT_43) ctiedir/ctie.test \
 	$(am__append_34) $(am__append_38) $(am__append_40) \
 	$(am__append_46) $(am__append_50) $(am__append_52) \
 	$(am__append_58) $(am__append_69) $(am__append_70) \
-	$(am__append_79) $(am__append_82) $(am__append_83) \
-	$(am__append_86) libmd5/md5.test
+	$(am__append_78) $(am__append_81) $(am__append_82) \
+	$(am__append_85) libmd5/md5.test
 DIST_COMMON = $(srcdir)/am/bootstrap.am $(srcdir)/am/web.am \
 	$(srcdir)/am/cweb.am $(srcdir)/am/texmf.am \
 	$(srcdir)/mplibdir/am/mplib.am \
@@ -228,121 +228,106 @@ DIST_COMMON = $(srcdir)/am/bootstrap.am $(srcdir)/am/web.am \
 @LUATEX_TRUE@@cross_FALSE@am__append_71 = txt2zlib
 @XETEX_TRUE@am__append_72 = xetex
 @XETEX_MACOSX_TRUE@am__append_73 = -DXETEX_MAC
-@XETEX_MACOSX_FALSE@am__append_74 = -DXETEX_OTHER $(POPPLER_INCLUDES) \
-@XETEX_MACOSX_FALSE@	$(LIBPNG_INCLUDES) $(FONTCONFIG_INCLUDES)
-@XETEX_MACOSX_FALSE@am__append_75 = $(POPPLER_LIBS) $(LIBPNG_LIBS) $(FONTCONFIG_LIBS)
-@XETEX_MACOSX_FALSE@am__append_76 = $(POPPLER_DEPEND) $(LIBPNG_DEPEND)
-@XETEX_MACOSX_TRUE@am__append_77 = \
+@XETEX_MACOSX_FALSE@am__append_74 = $(FONTCONFIG_INCLUDES)
+@XETEX_MACOSX_FALSE@am__append_75 = $(FONTCONFIG_LIBS)
+@XETEX_MACOSX_TRUE@am__append_76 = \
 @XETEX_MACOSX_TRUE@	xetexdir/XeTeXFontInst_Mac.cpp \
 @XETEX_MACOSX_TRUE@	xetexdir/XeTeXFontInst_Mac.h \
 @XETEX_MACOSX_TRUE@	xetexdir/XeTeXFontMgr_Mac.mm \
 @XETEX_MACOSX_TRUE@	xetexdir/XeTeXFontMgr_Mac.h \
 @XETEX_MACOSX_TRUE@	xetexdir/XeTeX_mac.c
 
-@XETEX_MACOSX_FALSE@am__append_78 = \
+@XETEX_MACOSX_FALSE@am__append_77 = \
 @XETEX_MACOSX_FALSE@	xetexdir/XeTeXFontMgr_FC.cpp \
-@XETEX_MACOSX_FALSE@	xetexdir/XeTeXFontMgr_FC.h \
-@XETEX_MACOSX_FALSE@	xetexdir/XeTeX_pic.c \
-@XETEX_MACOSX_FALSE@	xetexdir/pdfimage.cpp \
-@XETEX_MACOSX_FALSE@	xetexdir/pdfimage.h \
-@XETEX_MACOSX_FALSE@	xetexdir/image/bmpimage.c \
-@XETEX_MACOSX_FALSE@	xetexdir/image/bmpimage.h \
-@XETEX_MACOSX_FALSE@	xetexdir/image/jpegimage.c \
-@XETEX_MACOSX_FALSE@	xetexdir/image/jpegimage.h \
-@XETEX_MACOSX_FALSE@	xetexdir/image/mfileio.c \
-@XETEX_MACOSX_FALSE@	xetexdir/image/mfileio.h \
-@XETEX_MACOSX_FALSE@	xetexdir/image/numbers.c \
-@XETEX_MACOSX_FALSE@	xetexdir/image/numbers.h \
-@XETEX_MACOSX_FALSE@	xetexdir/image/pngimage.c \
-@XETEX_MACOSX_FALSE@	xetexdir/image/pngimage.h
-
-@XETEX_TRUE@am__append_79 = $(xetex_tests)
-@OTANGLE_TRUE@am__append_80 = $(omegaware_tools)
-@OMFONTS_FALSE@@OTANGLE_TRUE@am__append_81 = $(omegaware_font_tools)
-@OTANGLE_TRUE@am__append_82 = $(OTANGLE_tests)
-@OMFONTS_FALSE@@OTANGLE_TRUE@am__append_83 = $(OMFONTS_tests)
-@OTANGLE_TRUE@am__append_84 = pltotf tftopl
-@ALEPH_TRUE@am__append_85 = aleph
-@ALEPH_TRUE@am__append_86 = $(aleph_tests)
-@TEX_SYNCTEX_TRUE@am__append_87 = -I$(srcdir)/synctexdir \
+@XETEX_MACOSX_FALSE@	xetexdir/XeTeXFontMgr_FC.h
+
+@XETEX_TRUE@am__append_78 = $(xetex_tests)
+@OTANGLE_TRUE@am__append_79 = $(omegaware_tools)
+@OMFONTS_FALSE@@OTANGLE_TRUE@am__append_80 = $(omegaware_font_tools)
+@OTANGLE_TRUE@am__append_81 = $(OTANGLE_tests)
+@OMFONTS_FALSE@@OTANGLE_TRUE@am__append_82 = $(OMFONTS_tests)
+@OTANGLE_TRUE@am__append_83 = pltotf tftopl
+@ALEPH_TRUE@am__append_84 = aleph
+@ALEPH_TRUE@am__append_85 = $(aleph_tests)
+@TEX_SYNCTEX_TRUE@am__append_86 = -I$(srcdir)/synctexdir \
 @TEX_SYNCTEX_TRUE@	$(ZLIB_INCLUDES) -D__SyncTeX__ \
 @TEX_SYNCTEX_TRUE@	-DSYNCTEX_ENGINE_H=\"synctex-tex.h\"
-@TEX_SYNCTEX_TRUE@am__append_88 = $(ZLIB_LIBS)
-@TEX_SYNCTEX_TRUE@am__append_89 = $(ZLIB_DEPEND)
-@TEX_SYNCTEX_TRUE@am__append_90 = \
+@TEX_SYNCTEX_TRUE@am__append_87 = $(ZLIB_LIBS)
+@TEX_SYNCTEX_TRUE@am__append_88 = $(ZLIB_DEPEND)
+@TEX_SYNCTEX_TRUE@am__append_89 = \
 @TEX_SYNCTEX_TRUE@	synctexdir/synctex.c \
 @TEX_SYNCTEX_TRUE@	synctexdir/synctex.h \
 @TEX_SYNCTEX_TRUE@	synctexdir/synctex-common.h \
 @TEX_SYNCTEX_TRUE@	synctexdir/synctex-tex.h
 
-@ETEX_SYNCTEX_TRUE@am__append_91 = -I$(srcdir)/synctexdir \
+@ETEX_SYNCTEX_TRUE@am__append_90 = -I$(srcdir)/synctexdir \
 @ETEX_SYNCTEX_TRUE@	$(ZLIB_INCLUDES) -D__SyncTeX__ \
 @ETEX_SYNCTEX_TRUE@	-DSYNCTEX_ENGINE_H=\"synctex-etex.h\"
-@ETEX_SYNCTEX_TRUE@am__append_92 = $(ZLIB_LIBS)
-@ETEX_SYNCTEX_TRUE@am__append_93 = $(ZLIB_DEPEND)
-@ETEX_SYNCTEX_TRUE@am__append_94 = \
+@ETEX_SYNCTEX_TRUE@am__append_91 = $(ZLIB_LIBS)
+@ETEX_SYNCTEX_TRUE@am__append_92 = $(ZLIB_DEPEND)
+@ETEX_SYNCTEX_TRUE@am__append_93 = \
 @ETEX_SYNCTEX_TRUE@	synctexdir/synctex.c \
 @ETEX_SYNCTEX_TRUE@	synctexdir/synctex.h \
 @ETEX_SYNCTEX_TRUE@	synctexdir/synctex-common.h \
 @ETEX_SYNCTEX_TRUE@	synctexdir/synctex-etex.h
 
-@PTEX_SYNCTEX_TRUE@am__append_95 = -I$(srcdir)/synctexdir \
+@PTEX_SYNCTEX_TRUE@am__append_94 = -I$(srcdir)/synctexdir \
 @PTEX_SYNCTEX_TRUE@	$(ZLIB_INCLUDES) -D__SyncTeX__ \
 @PTEX_SYNCTEX_TRUE@	-DSYNCTEX_ENGINE_H=\"synctex-ptex.h\"
-@PTEX_SYNCTEX_TRUE@am__append_96 = $(ZLIB_LIBS)
-@PTEX_SYNCTEX_TRUE@am__append_97 = $(ZLIB_DEPEND)
-@PTEX_SYNCTEX_TRUE@am__append_98 = \
+@PTEX_SYNCTEX_TRUE@am__append_95 = $(ZLIB_LIBS)
+@PTEX_SYNCTEX_TRUE@am__append_96 = $(ZLIB_DEPEND)
+@PTEX_SYNCTEX_TRUE@am__append_97 = \
 @PTEX_SYNCTEX_TRUE@	synctexdir/synctex.c \
 @PTEX_SYNCTEX_TRUE@	synctexdir/synctex.h \
 @PTEX_SYNCTEX_TRUE@	synctexdir/synctex-common.h \
 @PTEX_SYNCTEX_TRUE@	synctexdir/synctex-ptex.h
 
-@UPTEX_SYNCTEX_TRUE@am__append_99 = -I$(srcdir)/synctexdir \
+@UPTEX_SYNCTEX_TRUE@am__append_98 = -I$(srcdir)/synctexdir \
 @UPTEX_SYNCTEX_TRUE@	$(ZLIB_INCLUDES) -D__SyncTeX__ \
 @UPTEX_SYNCTEX_TRUE@	-DSYNCTEX_ENGINE_H=\"synctex-uptex.h\"
-@UPTEX_SYNCTEX_TRUE@am__append_100 = $(ZLIB_LIBS)
-@UPTEX_SYNCTEX_TRUE@am__append_101 = $(ZLIB_DEPEND)
-@UPTEX_SYNCTEX_TRUE@am__append_102 = \
+@UPTEX_SYNCTEX_TRUE@am__append_99 = $(ZLIB_LIBS)
+@UPTEX_SYNCTEX_TRUE@am__append_100 = $(ZLIB_DEPEND)
+@UPTEX_SYNCTEX_TRUE@am__append_101 = \
 @UPTEX_SYNCTEX_TRUE@	synctexdir/synctex.c \
 @UPTEX_SYNCTEX_TRUE@	synctexdir/synctex.h \
 @UPTEX_SYNCTEX_TRUE@	synctexdir/synctex-common.h \
 @UPTEX_SYNCTEX_TRUE@	synctexdir/synctex-uptex.h
 
-@EPTEX_SYNCTEX_TRUE@am__append_103 = -I$(srcdir)/synctexdir \
+@EPTEX_SYNCTEX_TRUE@am__append_102 = -I$(srcdir)/synctexdir \
 @EPTEX_SYNCTEX_TRUE@	$(ZLIB_INCLUDES) -D__SyncTeX__ \
 @EPTEX_SYNCTEX_TRUE@	-DSYNCTEX_ENGINE_H=\"synctex-eptex.h\"
-@EPTEX_SYNCTEX_TRUE@am__append_104 = $(ZLIB_LIBS)
-@EPTEX_SYNCTEX_TRUE@am__append_105 = $(ZLIB_DEPEND)
-@EPTEX_SYNCTEX_TRUE@am__append_106 = \
+@EPTEX_SYNCTEX_TRUE@am__append_103 = $(ZLIB_LIBS)
+@EPTEX_SYNCTEX_TRUE@am__append_104 = $(ZLIB_DEPEND)
+@EPTEX_SYNCTEX_TRUE@am__append_105 = \
 @EPTEX_SYNCTEX_TRUE@	synctexdir/synctex.c \
 @EPTEX_SYNCTEX_TRUE@	synctexdir/synctex.h \
 @EPTEX_SYNCTEX_TRUE@	synctexdir/synctex-common.h \
 @EPTEX_SYNCTEX_TRUE@	synctexdir/synctex-eptex.h
 
-@EUPTEX_SYNCTEX_TRUE@am__append_107 = -I$(srcdir)/synctexdir \
+@EUPTEX_SYNCTEX_TRUE@am__append_106 = -I$(srcdir)/synctexdir \
 @EUPTEX_SYNCTEX_TRUE@	$(ZLIB_INCLUDES) -D__SyncTeX__ \
 @EUPTEX_SYNCTEX_TRUE@	-DSYNCTEX_ENGINE_H=\"synctex-euptex.h\"
-@EUPTEX_SYNCTEX_TRUE@am__append_108 = $(ZLIB_LIBS)
-@EUPTEX_SYNCTEX_TRUE@am__append_109 = $(ZLIB_DEPEND)
-@EUPTEX_SYNCTEX_TRUE@am__append_110 = \
+@EUPTEX_SYNCTEX_TRUE@am__append_107 = $(ZLIB_LIBS)
+@EUPTEX_SYNCTEX_TRUE@am__append_108 = $(ZLIB_DEPEND)
+@EUPTEX_SYNCTEX_TRUE@am__append_109 = \
 @EUPTEX_SYNCTEX_TRUE@	synctexdir/synctex.c \
 @EUPTEX_SYNCTEX_TRUE@	synctexdir/synctex.h \
 @EUPTEX_SYNCTEX_TRUE@	synctexdir/synctex-common.h \
 @EUPTEX_SYNCTEX_TRUE@	synctexdir/synctex-euptex.h
 
-@PDFTEX_SYNCTEX_TRUE@am__append_111 = -I$(srcdir)/synctexdir \
+@PDFTEX_SYNCTEX_TRUE@am__append_110 = -I$(srcdir)/synctexdir \
 @PDFTEX_SYNCTEX_TRUE@	-D__SyncTeX__ \
 @PDFTEX_SYNCTEX_TRUE@	-DSYNCTEX_ENGINE_H=\"synctex-pdftex.h\"
-@PDFTEX_SYNCTEX_TRUE@am__append_112 = \
+@PDFTEX_SYNCTEX_TRUE@am__append_111 = \
 @PDFTEX_SYNCTEX_TRUE@	synctexdir/synctex.c \
 @PDFTEX_SYNCTEX_TRUE@	synctexdir/synctex.h \
 @PDFTEX_SYNCTEX_TRUE@	synctexdir/synctex-common.h \
 @PDFTEX_SYNCTEX_TRUE@	synctexdir/synctex-pdftex.h
 
-@XETEX_SYNCTEX_TRUE@am__append_113 = -I$(srcdir)/synctexdir \
+@XETEX_SYNCTEX_TRUE@am__append_112 = -I$(srcdir)/synctexdir \
 @XETEX_SYNCTEX_TRUE@	-D__SyncTeX__ \
 @XETEX_SYNCTEX_TRUE@	-DSYNCTEX_ENGINE_H=\"synctex-xetex.h\"
-@XETEX_SYNCTEX_TRUE@am__append_114 = \
+@XETEX_SYNCTEX_TRUE@am__append_113 = \
 @XETEX_SYNCTEX_TRUE@	synctexdir/synctex.c \
 @XETEX_SYNCTEX_TRUE@	synctexdir/synctex.h \
 @XETEX_SYNCTEX_TRUE@	synctexdir/synctex-common.h \
@@ -802,18 +787,21 @@ nodist_libmf_a_OBJECTS = $(am__objects_11) mf-pool.$(OBJEXT)
 libmf_a_OBJECTS = $(nodist_libmf_a_OBJECTS)
 libmplib_a_AR = $(AR) $(ARFLAGS)
 libmplib_a_LIBADD =
-am_libmplib_a_OBJECTS = mplibdir/libmplib_a-avl.$(OBJEXT)
+am_libmplib_a_OBJECTS = mplibdir/libmplib_a-avl.$(OBJEXT) \
+	mplibdir/libmplib_a-decNumber.$(OBJEXT) \
+	mplibdir/libmplib_a-decContext.$(OBJEXT)
 am__objects_12 = libmplib_a-mp.$(OBJEXT)
 am__objects_13 = libmplib_a-mpmath.$(OBJEXT)
-am__objects_14 = libmplib_a-mpmathdouble.$(OBJEXT)
-am__objects_15 = libmplib_a-psout.$(OBJEXT)
-am__objects_16 = libmplib_a-svgout.$(OBJEXT)
+am__objects_14 = libmplib_a-mpmathdecimal.$(OBJEXT)
+am__objects_15 = libmplib_a-mpmathdouble.$(OBJEXT)
+am__objects_16 = libmplib_a-mpstrings.$(OBJEXT)
 am__objects_17 = libmplib_a-pngout.$(OBJEXT)
-am__objects_18 = libmplib_a-mpstrings.$(OBJEXT)
+am__objects_18 = libmplib_a-psout.$(OBJEXT)
+am__objects_19 = libmplib_a-svgout.$(OBJEXT)
 nodist_libmplib_a_OBJECTS = libmplib_a-tfmin.$(OBJEXT) \
 	$(am__objects_12) $(am__objects_13) $(am__objects_14) \
 	$(am__objects_15) $(am__objects_16) $(am__objects_17) \
-	$(am__objects_18)
+	$(am__objects_18) $(am__objects_19)
 libmplib_a_OBJECTS = $(am_libmplib_a_OBJECTS) \
 	$(nodist_libmplib_a_OBJECTS)
 libpdftex_a_AR = $(AR) $(ARFLAGS)
@@ -830,7 +818,7 @@ am__libpdftex_a_SOURCES_DIST = pdftexdir/avl.c pdftexdir/avl.h \
 	pdftexdir/writepng.c pdftexdir/writet1.c pdftexdir/writet3.c \
 	pdftexdir/writettf.c pdftexdir/writettf.h pdftexdir/writezip.c \
 	pdftexdir/regex/regex.c pdftexdir/regex/regex.h
-@MINGW32_TRUE@am__objects_19 =  \
+@MINGW32_TRUE@am__objects_20 =  \
 @MINGW32_TRUE@	pdftexdir/regex/libpdftex_a-regex.$(OBJEXT)
 am_libpdftex_a_OBJECTS = pdftexdir/libpdftex_a-avl.$(OBJEXT) \
 	pdftexdir/libpdftex_a-avlstuff.$(OBJEXT) \
@@ -851,7 +839,7 @@ am_libpdftex_a_OBJECTS = pdftexdir/libpdftex_a-avl.$(OBJEXT) \
 	pdftexdir/libpdftex_a-writet1.$(OBJEXT) \
 	pdftexdir/libpdftex_a-writet3.$(OBJEXT) \
 	pdftexdir/libpdftex_a-writettf.$(OBJEXT) \
-	pdftexdir/libpdftex_a-writezip.$(OBJEXT) $(am__objects_19)
+	pdftexdir/libpdftex_a-writezip.$(OBJEXT) $(am__objects_20)
 libpdftex_a_OBJECTS = $(am_libpdftex_a_OBJECTS)
 libukanji_a_AR = $(AR) $(ARFLAGS)
 libukanji_a_LIBADD =
@@ -880,37 +868,37 @@ am__libxetex_a_SOURCES_DIST = xetexdir/MathTable.h \
 	xetexdir/XeTeXLayoutInterface.cpp \
 	xetexdir/XeTeXLayoutInterface.h xetexdir/XeTeXOTMath.cpp \
 	xetexdir/XeTeXOTMath.h xetexdir/XeTeX_ext.c \
-	xetexdir/XeTeX_ext.h xetexdir/XeTeXswap.h xetexdir/trans.c \
-	xetexdir/trans.h xetexdir/hz.cpp xetexdir/xetex.h \
-	xetexdir/XeTeXFontInst_Mac.cpp xetexdir/XeTeXFontInst_Mac.h \
-	xetexdir/XeTeXFontMgr_Mac.mm xetexdir/XeTeXFontMgr_Mac.h \
-	xetexdir/XeTeX_mac.c xetexdir/XeTeXFontMgr_FC.cpp \
-	xetexdir/XeTeXFontMgr_FC.h xetexdir/XeTeX_pic.c \
-	xetexdir/pdfimage.cpp xetexdir/pdfimage.h \
+	xetexdir/XeTeX_ext.h xetexdir/XeTeX_pic.c xetexdir/XeTeXswap.h \
+	xetexdir/trans.c xetexdir/trans.h xetexdir/hz.cpp \
+	xetexdir/xetex.h xetexdir/pdfimage.cpp xetexdir/pdfimage.h \
 	xetexdir/image/bmpimage.c xetexdir/image/bmpimage.h \
 	xetexdir/image/jpegimage.c xetexdir/image/jpegimage.h \
 	xetexdir/image/mfileio.c xetexdir/image/mfileio.h \
 	xetexdir/image/numbers.c xetexdir/image/numbers.h \
-	xetexdir/image/pngimage.c xetexdir/image/pngimage.h
-@XETEX_MACOSX_TRUE@am__objects_20 = xetexdir/libxetex_a-XeTeXFontInst_Mac.$(OBJEXT) \
+	xetexdir/image/pngimage.c xetexdir/image/pngimage.h \
+	xetexdir/XeTeXFontInst_Mac.cpp xetexdir/XeTeXFontInst_Mac.h \
+	xetexdir/XeTeXFontMgr_Mac.mm xetexdir/XeTeXFontMgr_Mac.h \
+	xetexdir/XeTeX_mac.c xetexdir/XeTeXFontMgr_FC.cpp \
+	xetexdir/XeTeXFontMgr_FC.h
+@XETEX_MACOSX_TRUE@am__objects_21 = xetexdir/libxetex_a-XeTeXFontInst_Mac.$(OBJEXT) \
 @XETEX_MACOSX_TRUE@	xetexdir/libxetex_a-XeTeXFontMgr_Mac.$(OBJEXT) \
 @XETEX_MACOSX_TRUE@	xetexdir/libxetex_a-XeTeX_mac.$(OBJEXT)
-@XETEX_MACOSX_FALSE@am__objects_21 = xetexdir/libxetex_a-XeTeXFontMgr_FC.$(OBJEXT) \
-@XETEX_MACOSX_FALSE@	xetexdir/libxetex_a-XeTeX_pic.$(OBJEXT) \
-@XETEX_MACOSX_FALSE@	xetexdir/libxetex_a-pdfimage.$(OBJEXT) \
-@XETEX_MACOSX_FALSE@	xetexdir/image/libxetex_a-bmpimage.$(OBJEXT) \
-@XETEX_MACOSX_FALSE@	xetexdir/image/libxetex_a-jpegimage.$(OBJEXT) \
-@XETEX_MACOSX_FALSE@	xetexdir/image/libxetex_a-mfileio.$(OBJEXT) \
-@XETEX_MACOSX_FALSE@	xetexdir/image/libxetex_a-numbers.$(OBJEXT) \
-@XETEX_MACOSX_FALSE@	xetexdir/image/libxetex_a-pngimage.$(OBJEXT)
+@XETEX_MACOSX_FALSE@am__objects_22 = xetexdir/libxetex_a-XeTeXFontMgr_FC.$(OBJEXT)
 am_libxetex_a_OBJECTS = xetexdir/libxetex_a-XeTeXFontInst.$(OBJEXT) \
 	xetexdir/libxetex_a-XeTeXFontMgr.$(OBJEXT) \
 	xetexdir/libxetex_a-XeTeXLayoutInterface.$(OBJEXT) \
 	xetexdir/libxetex_a-XeTeXOTMath.$(OBJEXT) \
 	xetexdir/libxetex_a-XeTeX_ext.$(OBJEXT) \
+	xetexdir/libxetex_a-XeTeX_pic.$(OBJEXT) \
 	xetexdir/libxetex_a-trans.$(OBJEXT) \
-	xetexdir/libxetex_a-hz.$(OBJEXT) $(am__objects_20) \
-	$(am__objects_21)
+	xetexdir/libxetex_a-hz.$(OBJEXT) \
+	xetexdir/libxetex_a-pdfimage.$(OBJEXT) \
+	xetexdir/image/libxetex_a-bmpimage.$(OBJEXT) \
+	xetexdir/image/libxetex_a-jpegimage.$(OBJEXT) \
+	xetexdir/image/libxetex_a-mfileio.$(OBJEXT) \
+	xetexdir/image/libxetex_a-numbers.$(OBJEXT) \
+	xetexdir/image/libxetex_a-pngimage.$(OBJEXT) $(am__objects_21) \
+	$(am__objects_22)
 libxetex_a_OBJECTS = $(am_libxetex_a_OBJECTS)
 am__EXEEXT_1 = bibtex$(EXEEXT) dvicopy$(EXEEXT) dvitype$(EXEEXT) \
 	gftodvi$(EXEEXT) gftopk$(EXEEXT) gftype$(EXEEXT) mft$(EXEEXT) \
@@ -974,8 +962,8 @@ PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
 dist_aleph_OBJECTS = alephdir/aleph-aleph.$(OBJEXT) \
 	alephdir/aleph-alephbis.$(OBJEXT) \
 	alephdir/aleph-alephextra.$(OBJEXT)
-am__objects_22 = aleph-alephini.$(OBJEXT) aleph-aleph0.$(OBJEXT)
-nodist_aleph_OBJECTS = $(am__objects_22) aleph-aleph-pool.$(OBJEXT)
+am__objects_23 = aleph-alephini.$(OBJEXT) aleph-aleph0.$(OBJEXT)
+nodist_aleph_OBJECTS = $(am__objects_23) aleph-aleph-pool.$(OBJEXT)
 aleph_OBJECTS = $(dist_aleph_OBJECTS) $(nodist_aleph_OBJECTS)
 am__DEPENDENCIES_1 =
 am__DEPENDENCIES_2 = $(proglib) $(am__DEPENDENCIES_1)
@@ -1024,22 +1012,22 @@ am__dist_eptex_SOURCES_DIST = eptexdir/eptexextra.c \
 	eptexdir/eptexextra.h eptexdir/eptex_version.h \
 	synctexdir/synctex.c synctexdir/synctex.h \
 	synctexdir/synctex-common.h synctexdir/synctex-eptex.h
-@EPTEX_SYNCTEX_TRUE@am__objects_23 =  \
+@EPTEX_SYNCTEX_TRUE@am__objects_24 =  \
 @EPTEX_SYNCTEX_TRUE@	synctexdir/eptex-synctex.$(OBJEXT)
 dist_eptex_OBJECTS = eptexdir/eptex-eptexextra.$(OBJEXT) \
-	$(am__objects_23)
-am__objects_24 = eptex-eptexini.$(OBJEXT) eptex-eptex0.$(OBJEXT)
-nodist_eptex_OBJECTS = $(am__objects_24) eptex-eptex-pool.$(OBJEXT)
+	$(am__objects_24)
+am__objects_25 = eptex-eptexini.$(OBJEXT) eptex-eptex0.$(OBJEXT)
+nodist_eptex_OBJECTS = $(am__objects_25) eptex-eptex-pool.$(OBJEXT)
 eptex_OBJECTS = $(dist_eptex_OBJECTS) $(nodist_eptex_OBJECTS)
 @EPTEX_SYNCTEX_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1)
 am__dist_etex_SOURCES_DIST = etexdir/etexextra.c etexdir/etexextra.h \
 	etexdir/etex_version.h synctexdir/synctex.c \
 	synctexdir/synctex.h synctexdir/synctex-common.h \
 	synctexdir/synctex-etex.h
-@ETEX_SYNCTEX_TRUE@am__objects_25 = synctexdir/etex-synctex.$(OBJEXT)
-dist_etex_OBJECTS = etexdir/etex-etexextra.$(OBJEXT) $(am__objects_25)
-am__objects_26 = etex-etexini.$(OBJEXT) etex-etex0.$(OBJEXT)
-nodist_etex_OBJECTS = $(am__objects_26) etex-etex-pool.$(OBJEXT)
+@ETEX_SYNCTEX_TRUE@am__objects_26 = synctexdir/etex-synctex.$(OBJEXT)
+dist_etex_OBJECTS = etexdir/etex-etexextra.$(OBJEXT) $(am__objects_26)
+am__objects_27 = etex-etexini.$(OBJEXT) etex-etex0.$(OBJEXT)
+nodist_etex_OBJECTS = $(am__objects_27) etex-etex-pool.$(OBJEXT)
 etex_OBJECTS = $(dist_etex_OBJECTS) $(nodist_etex_OBJECTS)
 @ETEX_SYNCTEX_TRUE@am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1)
 etex_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
@@ -1048,12 +1036,12 @@ am__dist_euptex_SOURCES_DIST = euptexdir/euptexextra.c \
 	euptexdir/euptexextra.h synctexdir/synctex.c \
 	synctexdir/synctex.h synctexdir/synctex-common.h \
 	synctexdir/synctex-euptex.h
-@EUPTEX_SYNCTEX_TRUE@am__objects_27 =  \
+@EUPTEX_SYNCTEX_TRUE@am__objects_28 =  \
 @EUPTEX_SYNCTEX_TRUE@	synctexdir/euptex-synctex.$(OBJEXT)
 dist_euptex_OBJECTS = euptexdir/euptex-euptexextra.$(OBJEXT) \
-	$(am__objects_27)
-am__objects_28 = euptex-euptexini.$(OBJEXT) euptex-euptex0.$(OBJEXT)
-nodist_euptex_OBJECTS = $(am__objects_28) euptex-euptex-pool.$(OBJEXT)
+	$(am__objects_28)
+am__objects_29 = euptex-euptexini.$(OBJEXT) euptex-euptex0.$(OBJEXT)
+nodist_euptex_OBJECTS = $(am__objects_29) euptex-euptex-pool.$(OBJEXT)
 euptex_OBJECTS = $(dist_euptex_OBJECTS) $(nodist_euptex_OBJECTS)
 @EUPTEX_SYNCTEX_TRUE@am__DEPENDENCIES_5 = $(am__DEPENDENCIES_1)
 am_gftodvi_OBJECTS =
@@ -1075,8 +1063,8 @@ inimf_DEPENDENCIES =
 nodist_initex_OBJECTS = initex-callexe.$(OBJEXT)
 initex_OBJECTS = $(nodist_initex_OBJECTS)
 initex_DEPENDENCIES =
-am__objects_29 = luatexdir/luajittex-luatex.$(OBJEXT)
-nodist_luajittex_OBJECTS = $(am__objects_29)
+am__objects_30 = luatexdir/luajittex-luatex.$(OBJEXT)
+nodist_luajittex_OBJECTS = $(am__objects_30)
 luajittex_OBJECTS = $(nodist_luajittex_OBJECTS)
 am__DEPENDENCIES_6 = libluajittex.a libjitff.a libunilib.a \
 	libluajitmisc.a libluajitsocket.a $(am__DEPENDENCIES_1) \
@@ -1087,8 +1075,8 @@ am__DEPENDENCIES_6 = libluajittex.a libjitff.a libunilib.a \
 luajittex_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(luajittex_CXXFLAGS) \
 	$(CXXFLAGS) $(luajittex_LDFLAGS) $(LDFLAGS) -o $@
-am__objects_30 = luatexdir/luatex-luatex.$(OBJEXT)
-nodist_luatex_OBJECTS = $(am__objects_30)
+am__objects_31 = luatexdir/luatex-luatex.$(OBJEXT)
+nodist_luatex_OBJECTS = $(am__objects_31)
 luatex_OBJECTS = $(nodist_luatex_OBJECTS)
 am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
 am__DEPENDENCIES_8 = libluatex.a libff.a libunilib.a libluamisc.a \
@@ -1117,8 +1105,8 @@ nodist_mft_OBJECTS = mft.$(OBJEXT)
 mft_OBJECTS = $(nodist_mft_OBJECTS)
 mft_LDADD = $(LDADD)
 mft_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1)
-am__objects_31 = mpost-mpxout.$(OBJEXT)
-nodist_mpost_OBJECTS = mpost-mpost.$(OBJEXT) $(am__objects_31)
+am__objects_32 = mpost-mpxout.$(OBJEXT)
+nodist_mpost_OBJECTS = mpost-mpost.$(OBJEXT) $(am__objects_32)
 mpost_OBJECTS = $(nodist_mpost_OBJECTS)
 nodist_odvicopy_OBJECTS = odvicopy.$(OBJEXT)
 odvicopy_OBJECTS = $(nodist_odvicopy_OBJECTS)
@@ -1162,12 +1150,12 @@ am__dist_pdftex_SOURCES_DIST = pdftexdir/pdftexextra.c \
 	pdftexdir/etex_version.h synctexdir/synctex.c \
 	synctexdir/synctex.h synctexdir/synctex-common.h \
 	synctexdir/synctex-pdftex.h
-@PDFTEX_SYNCTEX_TRUE@am__objects_32 =  \
+@PDFTEX_SYNCTEX_TRUE@am__objects_33 =  \
 @PDFTEX_SYNCTEX_TRUE@	synctexdir/pdftex-synctex.$(OBJEXT)
 dist_pdftex_OBJECTS = pdftexdir/pdftex-pdftexextra.$(OBJEXT) \
-	$(am__objects_32)
-am__objects_33 = pdftex-pdftexini.$(OBJEXT) pdftex-pdftex0.$(OBJEXT)
-nodist_pdftex_OBJECTS = $(am__objects_33) pdftex-pdftex-pool.$(OBJEXT)
+	$(am__objects_33)
+am__objects_34 = pdftex-pdftexini.$(OBJEXT) pdftex-pdftex0.$(OBJEXT)
+nodist_pdftex_OBJECTS = $(am__objects_34) pdftex-pdftex-pool.$(OBJEXT)
 pdftex_OBJECTS = $(dist_pdftex_OBJECTS) $(nodist_pdftex_OBJECTS)
 am__DEPENDENCIES_11 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) libmd5.a
@@ -1205,10 +1193,10 @@ am__dist_ptex_SOURCES_DIST = ptexdir/ptexextra.c ptexdir/ptexextra.h \
 	ptexdir/ptex_version.h synctexdir/synctex.c \
 	synctexdir/synctex.h synctexdir/synctex-common.h \
 	synctexdir/synctex-ptex.h
-@PTEX_SYNCTEX_TRUE@am__objects_34 = synctexdir/ptex-synctex.$(OBJEXT)
-dist_ptex_OBJECTS = ptexdir/ptex-ptexextra.$(OBJEXT) $(am__objects_34)
-am__objects_35 = ptex-ptexini.$(OBJEXT) ptex-ptex0.$(OBJEXT)
-nodist_ptex_OBJECTS = $(am__objects_35) ptex-ptex-pool.$(OBJEXT)
+@PTEX_SYNCTEX_TRUE@am__objects_35 = synctexdir/ptex-synctex.$(OBJEXT)
+dist_ptex_OBJECTS = ptexdir/ptex-ptexextra.$(OBJEXT) $(am__objects_35)
+am__objects_36 = ptex-ptexini.$(OBJEXT) ptex-ptex0.$(OBJEXT)
+nodist_ptex_OBJECTS = $(am__objects_36) ptex-ptex-pool.$(OBJEXT)
 ptex_OBJECTS = $(dist_ptex_OBJECTS) $(nodist_ptex_OBJECTS)
 @PTEX_SYNCTEX_TRUE@am__DEPENDENCIES_12 = $(am__DEPENDENCIES_1)
 am_ptftopl_OBJECTS =
@@ -1229,10 +1217,10 @@ tangleboot_LDADD = $(LDADD)
 am__dist_tex_SOURCES_DIST = texextra.c synctexdir/synctex.c \
 	synctexdir/synctex.h synctexdir/synctex-common.h \
 	synctexdir/synctex-tex.h
-@TEX_SYNCTEX_TRUE@am__objects_36 = synctexdir/tex-synctex.$(OBJEXT)
-dist_tex_OBJECTS = tex-texextra.$(OBJEXT) $(am__objects_36)
-am__objects_37 = tex-texini.$(OBJEXT) tex-tex0.$(OBJEXT)
-nodist_tex_OBJECTS = $(am__objects_37) tex-tex-pool.$(OBJEXT)
+@TEX_SYNCTEX_TRUE@am__objects_37 = synctexdir/tex-synctex.$(OBJEXT)
+dist_tex_OBJECTS = tex-texextra.$(OBJEXT) $(am__objects_37)
+am__objects_38 = tex-texini.$(OBJEXT) tex-tex0.$(OBJEXT)
+nodist_tex_OBJECTS = $(am__objects_38) tex-tex-pool.$(OBJEXT)
 tex_OBJECTS = $(dist_tex_OBJECTS) $(nodist_tex_OBJECTS)
 @TEX_SYNCTEX_TRUE@am__DEPENDENCIES_13 = $(am__DEPENDENCIES_1)
 tex_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
@@ -1266,12 +1254,12 @@ am__dist_uptex_SOURCES_DIST = uptexdir/uptexextra.c \
 	uptexdir/uptexextra.h uptexdir/uptex_version.h \
 	synctexdir/synctex.c synctexdir/synctex.h \
 	synctexdir/synctex-common.h synctexdir/synctex-uptex.h
-@UPTEX_SYNCTEX_TRUE@am__objects_38 =  \
+@UPTEX_SYNCTEX_TRUE@am__objects_39 =  \
 @UPTEX_SYNCTEX_TRUE@	synctexdir/uptex-synctex.$(OBJEXT)
 dist_uptex_OBJECTS = uptexdir/uptex-uptexextra.$(OBJEXT) \
-	$(am__objects_38)
-am__objects_39 = uptex-uptexini.$(OBJEXT) uptex-uptex0.$(OBJEXT)
-nodist_uptex_OBJECTS = $(am__objects_39) uptex-uptex-pool.$(OBJEXT)
+	$(am__objects_39)
+am__objects_40 = uptex-uptexini.$(OBJEXT) uptex-uptex0.$(OBJEXT)
+nodist_uptex_OBJECTS = $(am__objects_40) uptex-uptex-pool.$(OBJEXT)
 uptex_OBJECTS = $(dist_uptex_OBJECTS) $(nodist_uptex_OBJECTS)
 @UPTEX_SYNCTEX_TRUE@am__DEPENDENCIES_15 = $(am__DEPENDENCIES_1)
 am_uptftopl_OBJECTS =
@@ -1310,20 +1298,19 @@ am__dist_xetex_SOURCES_DIST = xetexdir/xetexextra.c \
 	xetexdir/xetex_version.h synctexdir/synctex.c \
 	synctexdir/synctex.h synctexdir/synctex-common.h \
 	synctexdir/synctex-xetex.h
-@XETEX_SYNCTEX_TRUE@am__objects_40 =  \
+@XETEX_SYNCTEX_TRUE@am__objects_41 =  \
 @XETEX_SYNCTEX_TRUE@	synctexdir/xetex-synctex.$(OBJEXT)
 dist_xetex_OBJECTS = xetexdir/xetex-xetexextra.$(OBJEXT) \
-	$(am__objects_40)
-am__objects_41 = xetex-xetexini.$(OBJEXT) xetex-xetex0.$(OBJEXT)
-nodist_xetex_OBJECTS = $(am__objects_41) xetex-xetex-pool.$(OBJEXT)
+	$(am__objects_41)
+am__objects_42 = xetex-xetexini.$(OBJEXT) xetex-xetex0.$(OBJEXT)
+nodist_xetex_OBJECTS = $(am__objects_42) xetex-xetex-pool.$(OBJEXT)
 xetex_OBJECTS = $(dist_xetex_OBJECTS) $(nodist_xetex_OBJECTS)
-@XETEX_MACOSX_FALSE@am__DEPENDENCIES_16 = $(am__DEPENDENCIES_1) \
-@XETEX_MACOSX_FALSE@	$(am__DEPENDENCIES_1) \
-@XETEX_MACOSX_FALSE@	$(am__DEPENDENCIES_1)
+@XETEX_MACOSX_FALSE@am__DEPENDENCIES_16 = $(am__DEPENDENCIES_1)
 am__DEPENDENCIES_17 = $(libxetex) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_16) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_16)
 xetex_DEPENDENCIES = $(am__DEPENDENCIES_17) $(am__DEPENDENCIES_2) \
 	$(am__DEPENDENCIES_1)
 xetex_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
@@ -2183,9 +2170,9 @@ EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h \
 	$(luajittex_tests) luatexdir/tests/luaimage.tex tests/1-4.jpg \
 	tests/B.pdf tests/basic.tex tests/lily-ledger-broken.png \
 	$(xetex_web_srcs) $(xetex_ch_srcs) xetexdir/xetex.defines \
-	xetexdir/unicode-char-prep.pl xetexdir/ChangeLog \
-	$(xetex_tests) xetexdir/COPYING xetexdir/NEWS \
-	xetexdir/image/README xetexdir/xewebmac.tex omegaware/README \
+	xetexdir/ChangeLog xetexdir/COPYING xetexdir/NEWS \
+	xetexdir/image/README xetexdir/unicode-char-prep.pl \
+	xetexdir/xewebmac.tex $(xetex_tests) omegaware/README \
 	omegaware/ChangeLog $(odvicopy_sources) $(odvitype_sources) \
 	omegaware/ofm2opl.web omegaware/ofm2opl.up \
 	omegaware/ofm2opl.ch omegaware/opl2ofm.web \
@@ -2259,11 +2246,11 @@ DISTCLEANFILES = $(EXTRA_LIBRARIES) CXXLD.sh tangle.c tangle.h \
 	mf-tangle $(nodist_mpost_SOURCES) mpxout-tangle mptrap.diffs \
 	ptmr.mpx tests/xptmr.mpx tests/xstory.mpx \
 	$(nodist_libmplib_a_SOURCES) mp-tangle mpmath-tangle \
-	mpmathdouble-tangle mpstrings-tangle psout-tangle \
-	svgout-tangle pngout-tangle $(nodist_etex_SOURCES) etex.web \
-	etex.ch etex-web2c etex.p etex.pool etex-tangle etrip.diffs \
-	ewprob.log ewprob.tex $(pweb_programs:=.c) \
-	$(pweb_programs:=.h) $(pweb_programs:=.p) \
+	mpmathdecimal-tangle mpmathdouble-tangle mpstrings-tangle \
+	psout-tangle svgout-tangle pngout-tangle \
+	$(nodist_etex_SOURCES) etex.web etex.ch etex-web2c etex.p \
+	etex.pool etex-tangle etrip.diffs ewprob.log ewprob.tex \
+	$(pweb_programs:=.c) $(pweb_programs:=.h) $(pweb_programs:=.p) \
 	$(pweb_programs:=-web2c) $(pweb_programs:=.web) \
 	$(nodist_ptex_SOURCES) ptex.web ptex.ch ptex-web2c ptex.p \
 	ptex.pool ptex-tangle ptests/nissya_bib.* ptests/xexampl.aux \
@@ -2418,18 +2405,18 @@ tie_CPPFLAGS = $(AM_CPPFLAGS) -DNOT_WEB2C
 initex_CPPFLAGS = -DEXEPROG=\"tex.exe\"
 nodist_initex_SOURCES = callexe.c
 initex_LDADD = 
-tex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_87)
+tex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_86)
 
 # With --enable-ipc, TeX may need to link with -lsocket.
-tex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_88)
+tex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_87)
 
 # TeX C sources
 tex_c_h = texini.c tex0.c texcoerce.h texd.h
 nodist_tex_SOURCES = $(tex_c_h) tex-pool.c
-dist_tex_SOURCES = texextra.c $(am__append_90)
+dist_tex_SOURCES = texextra.c $(am__append_89)
 
 # We must create texd.h before building the tex_OBJECTS.
-tex_prereq = texd.h $(am__append_89)
+tex_prereq = texd.h $(am__append_88)
 tex_ch_srcs = \
 	tex.web \
 	tex.ch \
@@ -2488,32 +2475,39 @@ nodist_mpost_SOURCES = mpost.c $(mpxout_c_h)
 mpxout_c_h = mpxout.c mpxout.h
 mpost_web = mplibdir/mpost.w mplibdir/mpxout.w
 mp_tests = mplibdir/dvitomp.test mplibdir/mptraptest
-libmplib_a_CPPFLAGS = $(CAIRO_INCLUDES) $(PIXMAN_INCLUDES) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) $(AM_CPPFLAGS) -I$(srcdir)/mplibdir
-libmplib_a_SOURCES = mplibdir/avl.h mplibdir/avl.c
-nodist_libmplib_a_SOURCES = tfmin.c $(mp_c_h) $(mpmath_c_h) $(mpmathdouble_c_h) $(psout_c_h) $(svgout_c_h) $(pngout_c_h) $(mpstrings_c_h)
+libmplib_a_CPPFLAGS = $(CAIRO_INCLUDES) $(PIXMAN_INCLUDES) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) \
+	$(AM_CPPFLAGS) -I$(srcdir)/mplibdir
+
+libmplib_a_SOURCES = mplibdir/avl.h mplibdir/avl.c mplibdir/decNumber.c mplibdir/decNumber.h \
+	mplibdir/decNumberLocal.h mplibdir/decContext.h mplibdir/decContext.c
+
+nodist_libmplib_a_SOURCES = tfmin.c $(mp_c_h) $(mpmath_c_h) $(mpmathdecimal_c_h) \
+	$(mpmathdouble_c_h) $(mpstrings_c_h) $(pngout_c_h) $(psout_c_h) $(svgout_c_h)
+
 mp_c_h = mp.c mplib.h mpmp.h
 mpmath_c_h = mpmath.h mpmath.c
+mpmathdecimal_c_h = mpmathdecimal.h mpmathdecimal.c
 mpmathdouble_c_h = mpmathdouble.h mpmathdouble.c
 mpstrings_c_h = mpstrings.h mpstrings.c
 psout_c_h = mppsout.h psout.c mplibps.h
 svgout_c_h = mplibsvg.h mpsvgout.h svgout.c
 pngout_c_h = mplibpng.h mppngout.h pngout.c
 libmplib_web = mplibdir/mp.w mplibdir/psout.w mplibdir/svgout.w \
-	mplibdir/pngout.w mplibdir/mpmath.w mplibdir/mpmathdouble.w \
-	mplibdir/mpstrings.w mplibdir/tfmin.w
-etex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_91)
+	mplibdir/pngout.w mplibdir/mpmath.w mplibdir/mpmathdecimal.w \
+	mplibdir/mpmathdouble.w mplibdir/mpstrings.w mplibdir/tfmin.w
+etex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_90)
 
 # With --enable-ipc, e-TeX may need to link with -lsocket.
-etex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_92)
+etex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_91)
 
 # e-TeX C sources
 etex_c_h = etexini.c etex0.c etexcoerce.h etexd.h
 nodist_etex_SOURCES = $(etex_c_h) etex-pool.c
 dist_etex_SOURCES = etexdir/etexextra.c etexdir/etexextra.h \
-	etexdir/etex_version.h $(am__append_94)
+	etexdir/etex_version.h $(am__append_93)
 
 # We must create etexd.h and etexdir/etex_version.h before building the etex_OBJECTS.
-etex_prereq = etexd.h etexdir/etex_version.h $(am__append_93)
+etex_prereq = etexd.h etexdir/etex_version.h $(am__append_92)
 etex_web_srcs = \
 	tex.web \
 	etexdir/etex.ch
@@ -2548,20 +2542,20 @@ pweb_tests = ptexdir/pbibtex.test ptexdir/pdvitype.test \
 pproglib = lib/libp.a
 libkanji_a_SOURCES = ptexdir/kanji.c ptexdir/kanji.h
 libkanji_a_CPPFLAGS = $(ptex_cppflags)
-ptex_CPPFLAGS = $(ptex_cppflags) $(am__append_95)
+ptex_CPPFLAGS = $(ptex_cppflags) $(am__append_94)
 
 # With --enable-ipc, pTeX may need to link with -lsocket.
-ptex_LDADD = $(ptex_ldadd) $(ipc_socketlibs) $(am__append_96)
+ptex_LDADD = $(ptex_ldadd) $(ipc_socketlibs) $(am__append_95)
 ptex_DEPENDENCIES = $(ptex_dependencies)
 
 # pTeX C sources
 ptex_c_h = ptexini.c ptex0.c ptexcoerce.h ptexd.h
 nodist_ptex_SOURCES = $(ptex_c_h) ptex-pool.c
 dist_ptex_SOURCES = ptexdir/ptexextra.c ptexdir/ptexextra.h \
-	ptexdir/ptex_version.h $(am__append_98)
+	ptexdir/ptex_version.h $(am__append_97)
 
 # We must create ptexd.h and ptexdir/ptex_version.h before building the ptex_OBJECTS.
-ptex_prereq = ptexd.h ptexdir/ptex_version.h $(am__append_97)
+ptex_prereq = ptexd.h ptexdir/ptex_version.h $(am__append_96)
 ptex_web_srcs = \
 	tex.web \
 	tex.ch
@@ -2595,22 +2589,22 @@ ptftopl_DEPENDENCIES = $(ptex_dependencies)
 # e-pTeX Tests
 #
 eptex_tests = eptexdir/eptriptest
-eptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) $(am__append_103)
+eptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) $(am__append_102)
 
 # With --enable-ipc, e-pTeX may need to link with -lsocket.
 eptex_LDADD = libkanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD) \
-	$(ipc_socketlibs) $(am__append_104)
+	$(ipc_socketlibs) $(am__append_103)
 eptex_DEPENDENCIES = libkanji.a $(pproglib) $(PTEXENC_DEPEND) $(default_dependencies)
 
 # e-pTeX C sources
 eptex_c_h = eptexini.c eptex0.c eptexcoerce.h eptexd.h
 nodist_eptex_SOURCES = $(eptex_c_h) eptex-pool.c
 dist_eptex_SOURCES = eptexdir/eptexextra.c eptexdir/eptexextra.h \
-	eptexdir/eptex_version.h $(am__append_106)
+	eptexdir/eptex_version.h $(am__append_105)
 
 # We must create eptexd.h and eptexdir/eptex_version.h before building the eptex_OBJECTS.
 eptex_prereq = eptexd.h etexdir/etex_version.h ptexdir/ptex_version.h \
-	eptexdir/eptex_version.h $(am__append_105)
+	eptexdir/eptex_version.h $(am__append_104)
 eptex_web_srcs = \
 	tex.web \
 	etexdir/etex.ch \
@@ -2642,21 +2636,21 @@ upweb_tests = uptexdir/upbibtex.test uptexdir/updvitype.test \
 	uptexdir/yokotate.test
 libukanji_a_SOURCES = uptexdir/kanji.c uptexdir/kanji.h uptexdir/kanji_dump.c
 libukanji_a_CPPFLAGS = $(uptex_cppflags)
-uptex_CPPFLAGS = $(uptex_cppflags) $(am__append_99)
+uptex_CPPFLAGS = $(uptex_cppflags) $(am__append_98)
 
 # With --enable-ipc, upTeX may need to link with -lsocket.
-uptex_LDADD = $(uptex_ldadd) $(ipc_socketlibs) $(am__append_100)
+uptex_LDADD = $(uptex_ldadd) $(ipc_socketlibs) $(am__append_99)
 uptex_DEPENDENCIES = $(uptex_dependencies)
 
 # upTeX C sources
 uptex_c_h = uptexini.c uptex0.c uptexcoerce.h uptexd.h
 nodist_uptex_SOURCES = $(uptex_c_h) uptex-pool.c
 dist_uptex_SOURCES = uptexdir/uptexextra.c uptexdir/uptexextra.h \
-	uptexdir/uptex_version.h $(am__append_102)
+	uptexdir/uptex_version.h $(am__append_101)
 
 # We must create uptexd.h and uptexdir/uptex_version.h before building the uptex_OBJECTS.
 uptex_prereq = uptexd.h ptexdir/ptex_version.h \
-	uptexdir/uptex_version.h $(am__append_101)
+	uptexdir/uptex_version.h $(am__append_100)
 uptex_web_srcs = \
 	tex.web \
 	tex.ch
@@ -2691,23 +2685,23 @@ uptftopl_DEPENDENCIES = $(uptex_dependencies)
 # e-upTeX Tests
 #
 euptex_tests = euptexdir/euptriptest
-euptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) $(am__append_107)
+euptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) $(am__append_106)
 
 # With --enable-ipc, e-upTeX may need to link with -lsocket.
 euptex_LDADD = libukanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD) \
-	$(ipc_socketlibs) $(am__append_108)
+	$(ipc_socketlibs) $(am__append_107)
 euptex_DEPENDENCIES = libukanji.a $(pproglib) $(PTEXENC_DEPEND) $(default_dependencies)
 
 # e-upTeX C sources
 euptex_c_h = euptexini.c euptex0.c euptexcoerce.h euptexd.h
 nodist_euptex_SOURCES = $(euptex_c_h) euptex-pool.c
 dist_euptex_SOURCES = euptexdir/euptexextra.c euptexdir/euptexextra.h \
-	$(am__append_110)
+	$(am__append_109)
 
 # We must create euptexd.h and [eu]ptexdir/[eu]ptex_version.h before building the euptex_OBJECTS.
 euptex_prereq = euptexd.h etexdir/etex_version.h \
 	ptexdir/ptex_version.h eptexdir/eptex_version.h \
-	uptexdir/uptex_version.h $(am__append_109)
+	uptexdir/uptex_version.h $(am__append_108)
 euptex_web_srcs = \
 	tex.web \
 	etexdir/etex.ch \
@@ -2759,7 +2753,7 @@ pdftex_dependencies = $(proglib) $(KPATHSEA_DEPEND) $(LIBPNG_DEPEND) \
 # Force Automake to use CXXLD for linking
 nodist_EXTRA_pdftex_SOURCES = dummy.cxx
 pdf_tangle = WEBINPUTS=.:$(srcdir)/pdftexdir AM_V_P=$(AM_V_P) $(SHELL) ./tangle-sh $@ $(TANGLE)
-pdftex_CPPFLAGS = $(pdftex_cppflags) $(am__append_111)
+pdftex_CPPFLAGS = $(pdftex_cppflags) $(am__append_110)
 pdftex_CXXFLAGS = $(WARNING_CXXFLAGS)
 
 # With --enable-ipc, pdfTeX may need to link with -lsocket.
@@ -2772,7 +2766,7 @@ pdftex_c_h = pdftexini.c pdftex0.c pdftexcoerce.h pdftexd.h
 nodist_pdftex_SOURCES = $(pdftex_c_h) pdftex-pool.c
 dist_pdftex_SOURCES = pdftexdir/pdftexextra.c pdftexdir/pdftexextra.h \
 	pdftexdir/pdftex_version.h pdftexdir/etex_version.h \
-	$(am__append_112)
+	$(am__append_111)
 pdftex_ch_srcs = \
 	pdftexdir/pdftex.web \
 	pdftexdir/tex.ch0 \
@@ -3209,16 +3203,17 @@ xe_tangle = WEBINPUTS=.:$(srcdir)/xetexdir AM_V_P=$(AM_V_P) $(SHELL) ./tangle-sh
 libxetex = libxetex.a
 xetex_cppflags = $(AM_CPPFLAGS) -I$(srcdir)/xetexdir $(ICU_INCLUDES) \
 	$(FREETYPE2_INCLUDES) $(TECKIT_INCLUDES) $(HARFBUZZ_INCLUDES) \
-	$(GRAPHITE2_INCLUDES) $(am__append_73) $(am__append_74) \
-	$(ZLIB_INCLUDES)
+	$(GRAPHITE2_INCLUDES) $(POPPLER_INCLUDES) $(LIBPNG_INCLUDES) \
+	$(ZLIB_INCLUDES) $(am__append_73) $(am__append_74)
 xetex_ldadd = $(libxetex) $(HARFBUZZ_LIBS) $(GRAPHITE2_LIBS) \
-	$(ICU_LIBS) $(TECKIT_LIBS) $(am__append_75) $(FREETYPE2_LIBS) \
-	$(ZLIB_LIBS)
+	$(ICU_LIBS) $(TECKIT_LIBS) $(POPPLER_LIBS) $(LIBPNG_LIBS) \
+	$(FREETYPE2_LIBS) $(ZLIB_LIBS) $(am__append_75)
 xetex_dependencies = $(proglib) $(KPATHSEA_DEPEND) $(ICU_DEPEND) \
 	$(TECKIT_DEPEND) $(HARFBUZZ_DEPEND) $(GRAPHITE2_DEPEND) \
-	$(am__append_76) $(FREETYPE2_DEPEND) $(ZLIB_DEPEND)
+	$(POPPLER_DEPEND) $(LIBPNG_DEPEND) $(FREETYPE2_DEPEND) \
+	$(ZLIB_DEPEND)
 @XETEX_MACOSX_TRUE@xetex_LDFLAGS = -framework ApplicationServices -framework Cocoa
-xetex_CPPFLAGS = $(xetex_cppflags) $(am__append_113)
+xetex_CPPFLAGS = $(xetex_cppflags) $(am__append_112)
 xetex_CFLAGS = # $(WARNING_CFLAGS)
 xetex_CXXFLAGS = # $(WARNING_CXXFLAGS)
 xetex_LDADD = $(xetex_ldadd) $(LDADD) $(ipc_socketlibs)
@@ -3229,7 +3224,7 @@ xetex_c_h = xetexini.c xetex0.c xetexcoerce.h xetexd.h
 nodist_xetex_SOURCES = $(xetex_c_h) xetex-pool.c
 dist_xetex_SOURCES = xetexdir/xetexextra.c xetexdir/xetexextra.h \
 	xetexdir/etex_version.h xetexdir/xetex_version.h \
-	$(am__append_114)
+	$(am__append_113)
 xetex_ch_srcs = \
 	xetexdir/xetex.web \
 	xetexdir/tex.ch0 \
@@ -3248,9 +3243,15 @@ libxetex_a_SOURCES = xetexdir/MathTable.h xetexdir/XeTeXFontInst.cpp \
 	xetexdir/XeTeXFontMgr.h xetexdir/XeTeXLayoutInterface.cpp \
 	xetexdir/XeTeXLayoutInterface.h xetexdir/XeTeXOTMath.cpp \
 	xetexdir/XeTeXOTMath.h xetexdir/XeTeX_ext.c \
-	xetexdir/XeTeX_ext.h xetexdir/XeTeXswap.h xetexdir/trans.c \
-	xetexdir/trans.h xetexdir/hz.cpp xetexdir/xetex.h \
-	$(am__append_77) $(am__append_78)
+	xetexdir/XeTeX_ext.h xetexdir/XeTeX_pic.c xetexdir/XeTeXswap.h \
+	xetexdir/trans.c xetexdir/trans.h xetexdir/hz.cpp \
+	xetexdir/xetex.h xetexdir/pdfimage.cpp xetexdir/pdfimage.h \
+	xetexdir/image/bmpimage.c xetexdir/image/bmpimage.h \
+	xetexdir/image/jpegimage.c xetexdir/image/jpegimage.h \
+	xetexdir/image/mfileio.c xetexdir/image/mfileio.h \
+	xetexdir/image/numbers.c xetexdir/image/numbers.h \
+	xetexdir/image/pngimage.c xetexdir/image/pngimage.h \
+	$(am__append_76) $(am__append_77)
 
 # We must create xetexd.h etc. before building the libxetex_a_OBJECTS.
 libxetex_prereq = xetexd.h $(xetex_dependencies)
@@ -4242,6 +4243,10 @@ libmf.a: $(libmf_a_OBJECTS) $(libmf_a_DEPENDENCIES) $(EXTRA_libmf_a_DEPENDENCIES
 	$(AM_V_at)$(RANLIB) libmf.a
 mplibdir/libmplib_a-avl.$(OBJEXT): mplibdir/$(am__dirstamp) \
 	mplibdir/$(DEPDIR)/$(am__dirstamp)
+mplibdir/libmplib_a-decNumber.$(OBJEXT): mplibdir/$(am__dirstamp) \
+	mplibdir/$(DEPDIR)/$(am__dirstamp)
+mplibdir/libmplib_a-decContext.$(OBJEXT): mplibdir/$(am__dirstamp) \
+	mplibdir/$(DEPDIR)/$(am__dirstamp)
 
 libmplib.a: $(libmplib_a_OBJECTS) $(libmplib_a_DEPENDENCIES) $(EXTRA_libmplib_a_DEPENDENCIES) 
 	$(AM_V_at)-rm -f libmplib.a
@@ -4390,20 +4395,12 @@ xetexdir/libxetex_a-XeTeXOTMath.$(OBJEXT): xetexdir/$(am__dirstamp) \
 	xetexdir/$(DEPDIR)/$(am__dirstamp)
 xetexdir/libxetex_a-XeTeX_ext.$(OBJEXT): xetexdir/$(am__dirstamp) \
 	xetexdir/$(DEPDIR)/$(am__dirstamp)
+xetexdir/libxetex_a-XeTeX_pic.$(OBJEXT): xetexdir/$(am__dirstamp) \
+	xetexdir/$(DEPDIR)/$(am__dirstamp)
 xetexdir/libxetex_a-trans.$(OBJEXT): xetexdir/$(am__dirstamp) \
 	xetexdir/$(DEPDIR)/$(am__dirstamp)
 xetexdir/libxetex_a-hz.$(OBJEXT): xetexdir/$(am__dirstamp) \
 	xetexdir/$(DEPDIR)/$(am__dirstamp)
-xetexdir/libxetex_a-XeTeXFontInst_Mac.$(OBJEXT):  \
-	xetexdir/$(am__dirstamp) xetexdir/$(DEPDIR)/$(am__dirstamp)
-xetexdir/libxetex_a-XeTeXFontMgr_Mac.$(OBJEXT):  \
-	xetexdir/$(am__dirstamp) xetexdir/$(DEPDIR)/$(am__dirstamp)
-xetexdir/libxetex_a-XeTeX_mac.$(OBJEXT): xetexdir/$(am__dirstamp) \
-	xetexdir/$(DEPDIR)/$(am__dirstamp)
-xetexdir/libxetex_a-XeTeXFontMgr_FC.$(OBJEXT):  \
-	xetexdir/$(am__dirstamp) xetexdir/$(DEPDIR)/$(am__dirstamp)
-xetexdir/libxetex_a-XeTeX_pic.$(OBJEXT): xetexdir/$(am__dirstamp) \
-	xetexdir/$(DEPDIR)/$(am__dirstamp)
 xetexdir/libxetex_a-pdfimage.$(OBJEXT): xetexdir/$(am__dirstamp) \
 	xetexdir/$(DEPDIR)/$(am__dirstamp)
 xetexdir/image/$(am__dirstamp):
@@ -4427,6 +4424,14 @@ xetexdir/image/libxetex_a-numbers.$(OBJEXT):  \
 xetexdir/image/libxetex_a-pngimage.$(OBJEXT):  \
 	xetexdir/image/$(am__dirstamp) \
 	xetexdir/image/$(DEPDIR)/$(am__dirstamp)
+xetexdir/libxetex_a-XeTeXFontInst_Mac.$(OBJEXT):  \
+	xetexdir/$(am__dirstamp) xetexdir/$(DEPDIR)/$(am__dirstamp)
+xetexdir/libxetex_a-XeTeXFontMgr_Mac.$(OBJEXT):  \
+	xetexdir/$(am__dirstamp) xetexdir/$(DEPDIR)/$(am__dirstamp)
+xetexdir/libxetex_a-XeTeX_mac.$(OBJEXT): xetexdir/$(am__dirstamp) \
+	xetexdir/$(DEPDIR)/$(am__dirstamp)
+xetexdir/libxetex_a-XeTeXFontMgr_FC.$(OBJEXT):  \
+	xetexdir/$(am__dirstamp) xetexdir/$(DEPDIR)/$(am__dirstamp)
 
 libxetex.a: $(libxetex_a_OBJECTS) $(libxetex_a_DEPENDENCIES) $(EXTRA_libxetex_a_DEPENDENCIES) 
 	$(AM_V_at)-rm -f libxetex.a
@@ -5109,6 +5114,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-writetype2.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmplib_a-mp.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmplib_a-mpmath.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmplib_a-mpmathdecimal.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmplib_a-mpmathdouble.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmplib_a-mpstrings.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmplib_a-pngout.Po@am__quote@
@@ -5379,6 +5385,8 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@mplibdir/$(DEPDIR)/libluajittex_a-lmplib.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@mplibdir/$(DEPDIR)/libluatex_a-lmplib.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@mplibdir/$(DEPDIR)/libmplib_a-avl.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@mplibdir/$(DEPDIR)/libmplib_a-decContext.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@mplibdir/$(DEPDIR)/libmplib_a-decNumber.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@pdftexdir/$(DEPDIR)/libpdftex_a-avl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@pdftexdir/$(DEPDIR)/libpdftex_a-avlstuff.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@pdftexdir/$(DEPDIR)/libpdftex_a-epdf.Po@am__quote@
@@ -10776,6 +10784,34 @@ mplibdir/libmplib_a-avl.obj: mplibdir/avl.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mplibdir/libmplib_a-avl.obj `if test -f 'mplibdir/avl.c'; then $(CYGPATH_W) 'mplibdir/avl.c'; else $(CYGPATH_W) '$(srcdir)/mplibdir/avl.c'; fi`
 
+mplibdir/libmplib_a-decNumber.o: mplibdir/decNumber.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mplibdir/libmplib_a-decNumber.o -MD -MP -MF mplibdir/$(DEPDIR)/libmplib_a-decNumber.Tpo -c -o mplibdir/libmplib_a-decNumber.o `test -f 'mplibdir/decNumber.c' || echo '$(srcdir)/'`mplibdir/decNumber.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) mplibdir/$(DEPDIR)/libmplib_a-decNumber.Tpo mplibdir/$(DEPDIR)/libmplib_a-decNumber.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='mplibdir/decNumber.c' object='mplibdir/libmplib_a-decNumber.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mplibdir/libmplib_a-decNumber.o `test -f 'mplibdir/decNumber.c' || echo '$(srcdir)/'`mplibdir/decNumber.c
+
+mplibdir/libmplib_a-decNumber.obj: mplibdir/decNumber.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mplibdir/libmplib_a-decNumber.obj -MD -MP -MF mplibdir/$(DEPDIR)/libmplib_a-decNumber.Tpo -c -o mplibdir/libmplib_a-decNumber.obj `if test -f 'mplibdir/decNumber.c'; then $(CYGPATH_W) 'mplibdir/decNumber.c'; else $(CYGPATH_W) '$(srcdir)/mplibdir/decNumber.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) mplibdir/$(DEPDIR)/libmplib_a-decNumber.Tpo mplibdir/$(DEPDIR)/libmplib_a-decNumber.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='mplibdir/decNumber.c' object='mplibdir/libmplib_a-decNumber.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mplibdir/libmplib_a-decNumber.obj `if test -f 'mplibdir/decNumber.c'; then $(CYGPATH_W) 'mplibdir/decNumber.c'; else $(CYGPATH_W) '$(srcdir)/mplibdir/decNumber.c'; fi`
+
+mplibdir/libmplib_a-decContext.o: mplibdir/decContext.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mplibdir/libmplib_a-decContext.o -MD -MP -MF mplibdir/$(DEPDIR)/libmplib_a-decContext.Tpo -c -o mplibdir/libmplib_a-decContext.o `test -f 'mplibdir/decContext.c' || echo '$(srcdir)/'`mplibdir/decContext.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) mplibdir/$(DEPDIR)/libmplib_a-decContext.Tpo mplibdir/$(DEPDIR)/libmplib_a-decContext.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='mplibdir/decContext.c' object='mplibdir/libmplib_a-decContext.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mplibdir/libmplib_a-decContext.o `test -f 'mplibdir/decContext.c' || echo '$(srcdir)/'`mplibdir/decContext.c
+
+mplibdir/libmplib_a-decContext.obj: mplibdir/decContext.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mplibdir/libmplib_a-decContext.obj -MD -MP -MF mplibdir/$(DEPDIR)/libmplib_a-decContext.Tpo -c -o mplibdir/libmplib_a-decContext.obj `if test -f 'mplibdir/decContext.c'; then $(CYGPATH_W) 'mplibdir/decContext.c'; else $(CYGPATH_W) '$(srcdir)/mplibdir/decContext.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) mplibdir/$(DEPDIR)/libmplib_a-decContext.Tpo mplibdir/$(DEPDIR)/libmplib_a-decContext.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='mplibdir/decContext.c' object='mplibdir/libmplib_a-decContext.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mplibdir/libmplib_a-decContext.obj `if test -f 'mplibdir/decContext.c'; then $(CYGPATH_W) 'mplibdir/decContext.c'; else $(CYGPATH_W) '$(srcdir)/mplibdir/decContext.c'; fi`
+
 libmplib_a-tfmin.o: tfmin.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmplib_a-tfmin.o -MD -MP -MF $(DEPDIR)/libmplib_a-tfmin.Tpo -c -o libmplib_a-tfmin.o `test -f 'tfmin.c' || echo '$(srcdir)/'`tfmin.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmplib_a-tfmin.Tpo $(DEPDIR)/libmplib_a-tfmin.Po
@@ -10818,6 +10854,20 @@ libmplib_a-mpmath.obj: mpmath.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmplib_a-mpmath.obj `if test -f 'mpmath.c'; then $(CYGPATH_W) 'mpmath.c'; else $(CYGPATH_W) '$(srcdir)/mpmath.c'; fi`
 
+libmplib_a-mpmathdecimal.o: mpmathdecimal.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmplib_a-mpmathdecimal.o -MD -MP -MF $(DEPDIR)/libmplib_a-mpmathdecimal.Tpo -c -o libmplib_a-mpmathdecimal.o `test -f 'mpmathdecimal.c' || echo '$(srcdir)/'`mpmathdecimal.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmplib_a-mpmathdecimal.Tpo $(DEPDIR)/libmplib_a-mpmathdecimal.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='mpmathdecimal.c' object='libmplib_a-mpmathdecimal.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmplib_a-mpmathdecimal.o `test -f 'mpmathdecimal.c' || echo '$(srcdir)/'`mpmathdecimal.c
+
+libmplib_a-mpmathdecimal.obj: mpmathdecimal.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmplib_a-mpmathdecimal.obj -MD -MP -MF $(DEPDIR)/libmplib_a-mpmathdecimal.Tpo -c -o libmplib_a-mpmathdecimal.obj `if test -f 'mpmathdecimal.c'; then $(CYGPATH_W) 'mpmathdecimal.c'; else $(CYGPATH_W) '$(srcdir)/mpmathdecimal.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmplib_a-mpmathdecimal.Tpo $(DEPDIR)/libmplib_a-mpmathdecimal.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='mpmathdecimal.c' object='libmplib_a-mpmathdecimal.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmplib_a-mpmathdecimal.obj `if test -f 'mpmathdecimal.c'; then $(CYGPATH_W) 'mpmathdecimal.c'; else $(CYGPATH_W) '$(srcdir)/mpmathdecimal.c'; fi`
+
 libmplib_a-mpmathdouble.o: mpmathdouble.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmplib_a-mpmathdouble.o -MD -MP -MF $(DEPDIR)/libmplib_a-mpmathdouble.Tpo -c -o libmplib_a-mpmathdouble.o `test -f 'mpmathdouble.c' || echo '$(srcdir)/'`mpmathdouble.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmplib_a-mpmathdouble.Tpo $(DEPDIR)/libmplib_a-mpmathdouble.Po
@@ -10832,6 +10882,34 @@ libmplib_a-mpmathdouble.obj: mpmathdouble.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmplib_a-mpmathdouble.obj `if test -f 'mpmathdouble.c'; then $(CYGPATH_W) 'mpmathdouble.c'; else $(CYGPATH_W) '$(srcdir)/mpmathdouble.c'; fi`
 
+libmplib_a-mpstrings.o: mpstrings.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmplib_a-mpstrings.o -MD -MP -MF $(DEPDIR)/libmplib_a-mpstrings.Tpo -c -o libmplib_a-mpstrings.o `test -f 'mpstrings.c' || echo '$(srcdir)/'`mpstrings.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmplib_a-mpstrings.Tpo $(DEPDIR)/libmplib_a-mpstrings.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='mpstrings.c' object='libmplib_a-mpstrings.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmplib_a-mpstrings.o `test -f 'mpstrings.c' || echo '$(srcdir)/'`mpstrings.c
+
+libmplib_a-mpstrings.obj: mpstrings.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmplib_a-mpstrings.obj -MD -MP -MF $(DEPDIR)/libmplib_a-mpstrings.Tpo -c -o libmplib_a-mpstrings.obj `if test -f 'mpstrings.c'; then $(CYGPATH_W) 'mpstrings.c'; else $(CYGPATH_W) '$(srcdir)/mpstrings.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmplib_a-mpstrings.Tpo $(DEPDIR)/libmplib_a-mpstrings.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='mpstrings.c' object='libmplib_a-mpstrings.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmplib_a-mpstrings.obj `if test -f 'mpstrings.c'; then $(CYGPATH_W) 'mpstrings.c'; else $(CYGPATH_W) '$(srcdir)/mpstrings.c'; fi`
+
+libmplib_a-pngout.o: pngout.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmplib_a-pngout.o -MD -MP -MF $(DEPDIR)/libmplib_a-pngout.Tpo -c -o libmplib_a-pngout.o `test -f 'pngout.c' || echo '$(srcdir)/'`pngout.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmplib_a-pngout.Tpo $(DEPDIR)/libmplib_a-pngout.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='pngout.c' object='libmplib_a-pngout.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmplib_a-pngout.o `test -f 'pngout.c' || echo '$(srcdir)/'`pngout.c
+
+libmplib_a-pngout.obj: pngout.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmplib_a-pngout.obj -MD -MP -MF $(DEPDIR)/libmplib_a-pngout.Tpo -c -o libmplib_a-pngout.obj `if test -f 'pngout.c'; then $(CYGPATH_W) 'pngout.c'; else $(CYGPATH_W) '$(srcdir)/pngout.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmplib_a-pngout.Tpo $(DEPDIR)/libmplib_a-pngout.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='pngout.c' object='libmplib_a-pngout.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmplib_a-pngout.obj `if test -f 'pngout.c'; then $(CYGPATH_W) 'pngout.c'; else $(CYGPATH_W) '$(srcdir)/pngout.c'; fi`
+
 libmplib_a-psout.o: psout.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmplib_a-psout.o -MD -MP -MF $(DEPDIR)/libmplib_a-psout.Tpo -c -o libmplib_a-psout.o `test -f 'psout.c' || echo '$(srcdir)/'`psout.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmplib_a-psout.Tpo $(DEPDIR)/libmplib_a-psout.Po
@@ -10860,34 +10938,6 @@ libmplib_a-svgout.obj: svgout.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmplib_a-svgout.obj `if test -f 'svgout.c'; then $(CYGPATH_W) 'svgout.c'; else $(CYGPATH_W) '$(srcdir)/svgout.c'; fi`
 
-libmplib_a-pngout.o: pngout.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmplib_a-pngout.o -MD -MP -MF $(DEPDIR)/libmplib_a-pngout.Tpo -c -o libmplib_a-pngout.o `test -f 'pngout.c' || echo '$(srcdir)/'`pngout.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmplib_a-pngout.Tpo $(DEPDIR)/libmplib_a-pngout.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='pngout.c' object='libmplib_a-pngout.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmplib_a-pngout.o `test -f 'pngout.c' || echo '$(srcdir)/'`pngout.c
-
-libmplib_a-pngout.obj: pngout.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmplib_a-pngout.obj -MD -MP -MF $(DEPDIR)/libmplib_a-pngout.Tpo -c -o libmplib_a-pngout.obj `if test -f 'pngout.c'; then $(CYGPATH_W) 'pngout.c'; else $(CYGPATH_W) '$(srcdir)/pngout.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmplib_a-pngout.Tpo $(DEPDIR)/libmplib_a-pngout.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='pngout.c' object='libmplib_a-pngout.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmplib_a-pngout.obj `if test -f 'pngout.c'; then $(CYGPATH_W) 'pngout.c'; else $(CYGPATH_W) '$(srcdir)/pngout.c'; fi`
-
-libmplib_a-mpstrings.o: mpstrings.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmplib_a-mpstrings.o -MD -MP -MF $(DEPDIR)/libmplib_a-mpstrings.Tpo -c -o libmplib_a-mpstrings.o `test -f 'mpstrings.c' || echo '$(srcdir)/'`mpstrings.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmplib_a-mpstrings.Tpo $(DEPDIR)/libmplib_a-mpstrings.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='mpstrings.c' object='libmplib_a-mpstrings.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmplib_a-mpstrings.o `test -f 'mpstrings.c' || echo '$(srcdir)/'`mpstrings.c
-
-libmplib_a-mpstrings.obj: mpstrings.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmplib_a-mpstrings.obj -MD -MP -MF $(DEPDIR)/libmplib_a-mpstrings.Tpo -c -o libmplib_a-mpstrings.obj `if test -f 'mpstrings.c'; then $(CYGPATH_W) 'mpstrings.c'; else $(CYGPATH_W) '$(srcdir)/mpstrings.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmplib_a-mpstrings.Tpo $(DEPDIR)/libmplib_a-mpstrings.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='mpstrings.c' object='libmplib_a-mpstrings.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmplib_a-mpstrings.obj `if test -f 'mpstrings.c'; then $(CYGPATH_W) 'mpstrings.c'; else $(CYGPATH_W) '$(srcdir)/mpstrings.c'; fi`
-
 pdftexdir/libpdftex_a-avl.o: pdftexdir/avl.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdftexdir/libpdftex_a-avl.o -MD -MP -MF pdftexdir/$(DEPDIR)/libpdftex_a-avl.Tpo -c -o pdftexdir/libpdftex_a-avl.o `test -f 'pdftexdir/avl.c' || echo '$(srcdir)/'`pdftexdir/avl.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) pdftexdir/$(DEPDIR)/libpdftex_a-avl.Tpo pdftexdir/$(DEPDIR)/libpdftex_a-avl.Po
@@ -11406,34 +11456,6 @@ xetexdir/libxetex_a-XeTeX_ext.obj: xetexdir/XeTeX_ext.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CFLAGS) $(CFLAGS) -c -o xetexdir/libxetex_a-XeTeX_ext.obj `if test -f 'xetexdir/XeTeX_ext.c'; then $(CYGPATH_W) 'xetexdir/XeTeX_ext.c'; else $(CYGPATH_W) '$(srcdir)/xetexdir/XeTeX_ext.c'; fi`
 
-xetexdir/libxetex_a-trans.o: xetexdir/trans.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CFLAGS) $(CFLAGS) -MT xetexdir/libxetex_a-trans.o -MD -MP -MF xetexdir/$(DEPDIR)/libxetex_a-trans.Tpo -c -o xetexdir/libxetex_a-trans.o `test -f 'xetexdir/trans.c' || echo '$(srcdir)/'`xetexdir/trans.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) xetexdir/$(DEPDIR)/libxetex_a-trans.Tpo xetexdir/$(DEPDIR)/libxetex_a-trans.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='xetexdir/trans.c' object='xetexdir/libxetex_a-trans.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CFLAGS) $(CFLAGS) -c -o xetexdir/libxetex_a-trans.o `test -f 'xetexdir/trans.c' || echo '$(srcdir)/'`xetexdir/trans.c
-
-xetexdir/libxetex_a-trans.obj: xetexdir/trans.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CFLAGS) $(CFLAGS) -MT xetexdir/libxetex_a-trans.obj -MD -MP -MF xetexdir/$(DEPDIR)/libxetex_a-trans.Tpo -c -o xetexdir/libxetex_a-trans.obj `if test -f 'xetexdir/trans.c'; then $(CYGPATH_W) 'xetexdir/trans.c'; else $(CYGPATH_W) '$(srcdir)/xetexdir/trans.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) xetexdir/$(DEPDIR)/libxetex_a-trans.Tpo xetexdir/$(DEPDIR)/libxetex_a-trans.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='xetexdir/trans.c' object='xetexdir/libxetex_a-trans.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CFLAGS) $(CFLAGS) -c -o xetexdir/libxetex_a-trans.obj `if test -f 'xetexdir/trans.c'; then $(CYGPATH_W) 'xetexdir/trans.c'; else $(CYGPATH_W) '$(srcdir)/xetexdir/trans.c'; fi`
-
-xetexdir/libxetex_a-XeTeX_mac.o: xetexdir/XeTeX_mac.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CFLAGS) $(CFLAGS) -MT xetexdir/libxetex_a-XeTeX_mac.o -MD -MP -MF xetexdir/$(DEPDIR)/libxetex_a-XeTeX_mac.Tpo -c -o xetexdir/libxetex_a-XeTeX_mac.o `test -f 'xetexdir/XeTeX_mac.c' || echo '$(srcdir)/'`xetexdir/XeTeX_mac.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) xetexdir/$(DEPDIR)/libxetex_a-XeTeX_mac.Tpo xetexdir/$(DEPDIR)/libxetex_a-XeTeX_mac.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='xetexdir/XeTeX_mac.c' object='xetexdir/libxetex_a-XeTeX_mac.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CFLAGS) $(CFLAGS) -c -o xetexdir/libxetex_a-XeTeX_mac.o `test -f 'xetexdir/XeTeX_mac.c' || echo '$(srcdir)/'`xetexdir/XeTeX_mac.c
-
-xetexdir/libxetex_a-XeTeX_mac.obj: xetexdir/XeTeX_mac.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CFLAGS) $(CFLAGS) -MT xetexdir/libxetex_a-XeTeX_mac.obj -MD -MP -MF xetexdir/$(DEPDIR)/libxetex_a-XeTeX_mac.Tpo -c -o xetexdir/libxetex_a-XeTeX_mac.obj `if test -f 'xetexdir/XeTeX_mac.c'; then $(CYGPATH_W) 'xetexdir/XeTeX_mac.c'; else $(CYGPATH_W) '$(srcdir)/xetexdir/XeTeX_mac.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) xetexdir/$(DEPDIR)/libxetex_a-XeTeX_mac.Tpo xetexdir/$(DEPDIR)/libxetex_a-XeTeX_mac.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='xetexdir/XeTeX_mac.c' object='xetexdir/libxetex_a-XeTeX_mac.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CFLAGS) $(CFLAGS) -c -o xetexdir/libxetex_a-XeTeX_mac.obj `if test -f 'xetexdir/XeTeX_mac.c'; then $(CYGPATH_W) 'xetexdir/XeTeX_mac.c'; else $(CYGPATH_W) '$(srcdir)/xetexdir/XeTeX_mac.c'; fi`
-
 xetexdir/libxetex_a-XeTeX_pic.o: xetexdir/XeTeX_pic.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CFLAGS) $(CFLAGS) -MT xetexdir/libxetex_a-XeTeX_pic.o -MD -MP -MF xetexdir/$(DEPDIR)/libxetex_a-XeTeX_pic.Tpo -c -o xetexdir/libxetex_a-XeTeX_pic.o `test -f 'xetexdir/XeTeX_pic.c' || echo '$(srcdir)/'`xetexdir/XeTeX_pic.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) xetexdir/$(DEPDIR)/libxetex_a-XeTeX_pic.Tpo xetexdir/$(DEPDIR)/libxetex_a-XeTeX_pic.Po
@@ -11448,6 +11470,20 @@ xetexdir/libxetex_a-XeTeX_pic.obj: xetexdir/XeTeX_pic.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CFLAGS) $(CFLAGS) -c -o xetexdir/libxetex_a-XeTeX_pic.obj `if test -f 'xetexdir/XeTeX_pic.c'; then $(CYGPATH_W) 'xetexdir/XeTeX_pic.c'; else $(CYGPATH_W) '$(srcdir)/xetexdir/XeTeX_pic.c'; fi`
 
+xetexdir/libxetex_a-trans.o: xetexdir/trans.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CFLAGS) $(CFLAGS) -MT xetexdir/libxetex_a-trans.o -MD -MP -MF xetexdir/$(DEPDIR)/libxetex_a-trans.Tpo -c -o xetexdir/libxetex_a-trans.o `test -f 'xetexdir/trans.c' || echo '$(srcdir)/'`xetexdir/trans.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) xetexdir/$(DEPDIR)/libxetex_a-trans.Tpo xetexdir/$(DEPDIR)/libxetex_a-trans.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='xetexdir/trans.c' object='xetexdir/libxetex_a-trans.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CFLAGS) $(CFLAGS) -c -o xetexdir/libxetex_a-trans.o `test -f 'xetexdir/trans.c' || echo '$(srcdir)/'`xetexdir/trans.c
+
+xetexdir/libxetex_a-trans.obj: xetexdir/trans.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CFLAGS) $(CFLAGS) -MT xetexdir/libxetex_a-trans.obj -MD -MP -MF xetexdir/$(DEPDIR)/libxetex_a-trans.Tpo -c -o xetexdir/libxetex_a-trans.obj `if test -f 'xetexdir/trans.c'; then $(CYGPATH_W) 'xetexdir/trans.c'; else $(CYGPATH_W) '$(srcdir)/xetexdir/trans.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) xetexdir/$(DEPDIR)/libxetex_a-trans.Tpo xetexdir/$(DEPDIR)/libxetex_a-trans.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='xetexdir/trans.c' object='xetexdir/libxetex_a-trans.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CFLAGS) $(CFLAGS) -c -o xetexdir/libxetex_a-trans.obj `if test -f 'xetexdir/trans.c'; then $(CYGPATH_W) 'xetexdir/trans.c'; else $(CYGPATH_W) '$(srcdir)/xetexdir/trans.c'; fi`
+
 xetexdir/image/libxetex_a-bmpimage.o: xetexdir/image/bmpimage.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CFLAGS) $(CFLAGS) -MT xetexdir/image/libxetex_a-bmpimage.o -MD -MP -MF xetexdir/image/$(DEPDIR)/libxetex_a-bmpimage.Tpo -c -o xetexdir/image/libxetex_a-bmpimage.o `test -f 'xetexdir/image/bmpimage.c' || echo '$(srcdir)/'`xetexdir/image/bmpimage.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) xetexdir/image/$(DEPDIR)/libxetex_a-bmpimage.Tpo xetexdir/image/$(DEPDIR)/libxetex_a-bmpimage.Po
@@ -11518,6 +11554,20 @@ xetexdir/image/libxetex_a-pngimage.obj: xetexdir/image/pngimage.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CFLAGS) $(CFLAGS) -c -o xetexdir/image/libxetex_a-pngimage.obj `if test -f 'xetexdir/image/pngimage.c'; then $(CYGPATH_W) 'xetexdir/image/pngimage.c'; else $(CYGPATH_W) '$(srcdir)/xetexdir/image/pngimage.c'; fi`
 
+xetexdir/libxetex_a-XeTeX_mac.o: xetexdir/XeTeX_mac.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CFLAGS) $(CFLAGS) -MT xetexdir/libxetex_a-XeTeX_mac.o -MD -MP -MF xetexdir/$(DEPDIR)/libxetex_a-XeTeX_mac.Tpo -c -o xetexdir/libxetex_a-XeTeX_mac.o `test -f 'xetexdir/XeTeX_mac.c' || echo '$(srcdir)/'`xetexdir/XeTeX_mac.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) xetexdir/$(DEPDIR)/libxetex_a-XeTeX_mac.Tpo xetexdir/$(DEPDIR)/libxetex_a-XeTeX_mac.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='xetexdir/XeTeX_mac.c' object='xetexdir/libxetex_a-XeTeX_mac.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CFLAGS) $(CFLAGS) -c -o xetexdir/libxetex_a-XeTeX_mac.o `test -f 'xetexdir/XeTeX_mac.c' || echo '$(srcdir)/'`xetexdir/XeTeX_mac.c
+
+xetexdir/libxetex_a-XeTeX_mac.obj: xetexdir/XeTeX_mac.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CFLAGS) $(CFLAGS) -MT xetexdir/libxetex_a-XeTeX_mac.obj -MD -MP -MF xetexdir/$(DEPDIR)/libxetex_a-XeTeX_mac.Tpo -c -o xetexdir/libxetex_a-XeTeX_mac.obj `if test -f 'xetexdir/XeTeX_mac.c'; then $(CYGPATH_W) 'xetexdir/XeTeX_mac.c'; else $(CYGPATH_W) '$(srcdir)/xetexdir/XeTeX_mac.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) xetexdir/$(DEPDIR)/libxetex_a-XeTeX_mac.Tpo xetexdir/$(DEPDIR)/libxetex_a-XeTeX_mac.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='xetexdir/XeTeX_mac.c' object='xetexdir/libxetex_a-XeTeX_mac.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CFLAGS) $(CFLAGS) -c -o xetexdir/libxetex_a-XeTeX_mac.obj `if test -f 'xetexdir/XeTeX_mac.c'; then $(CYGPATH_W) 'xetexdir/XeTeX_mac.c'; else $(CYGPATH_W) '$(srcdir)/xetexdir/XeTeX_mac.c'; fi`
+
 alephdir/aleph-aleph.o: alephdir/aleph.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(aleph_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT alephdir/aleph-aleph.o -MD -MP -MF alephdir/$(DEPDIR)/aleph-aleph.Tpo -c -o alephdir/aleph-aleph.o `test -f 'alephdir/aleph.c' || echo '$(srcdir)/'`alephdir/aleph.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) alephdir/$(DEPDIR)/aleph-aleph.Tpo alephdir/$(DEPDIR)/aleph-aleph.Po
@@ -12732,6 +12782,20 @@ xetexdir/libxetex_a-hz.obj: xetexdir/hz.cpp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CXXFLAGS) $(CXXFLAGS) -c -o xetexdir/libxetex_a-hz.obj `if test -f 'xetexdir/hz.cpp'; then $(CYGPATH_W) 'xetexdir/hz.cpp'; else $(CYGPATH_W) '$(srcdir)/xetexdir/hz.cpp'; fi`
 
+xetexdir/libxetex_a-pdfimage.o: xetexdir/pdfimage.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CXXFLAGS) $(CXXFLAGS) -MT xetexdir/libxetex_a-pdfimage.o -MD -MP -MF xetexdir/$(DEPDIR)/libxetex_a-pdfimage.Tpo -c -o xetexdir/libxetex_a-pdfimage.o `test -f 'xetexdir/pdfimage.cpp' || echo '$(srcdir)/'`xetexdir/pdfimage.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) xetexdir/$(DEPDIR)/libxetex_a-pdfimage.Tpo xetexdir/$(DEPDIR)/libxetex_a-pdfimage.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='xetexdir/pdfimage.cpp' object='xetexdir/libxetex_a-pdfimage.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CXXFLAGS) $(CXXFLAGS) -c -o xetexdir/libxetex_a-pdfimage.o `test -f 'xetexdir/pdfimage.cpp' || echo '$(srcdir)/'`xetexdir/pdfimage.cpp
+
+xetexdir/libxetex_a-pdfimage.obj: xetexdir/pdfimage.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CXXFLAGS) $(CXXFLAGS) -MT xetexdir/libxetex_a-pdfimage.obj -MD -MP -MF xetexdir/$(DEPDIR)/libxetex_a-pdfimage.Tpo -c -o xetexdir/libxetex_a-pdfimage.obj `if test -f 'xetexdir/pdfimage.cpp'; then $(CYGPATH_W) 'xetexdir/pdfimage.cpp'; else $(CYGPATH_W) '$(srcdir)/xetexdir/pdfimage.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) xetexdir/$(DEPDIR)/libxetex_a-pdfimage.Tpo xetexdir/$(DEPDIR)/libxetex_a-pdfimage.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='xetexdir/pdfimage.cpp' object='xetexdir/libxetex_a-pdfimage.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CXXFLAGS) $(CXXFLAGS) -c -o xetexdir/libxetex_a-pdfimage.obj `if test -f 'xetexdir/pdfimage.cpp'; then $(CYGPATH_W) 'xetexdir/pdfimage.cpp'; else $(CYGPATH_W) '$(srcdir)/xetexdir/pdfimage.cpp'; fi`
+
 xetexdir/libxetex_a-XeTeXFontInst_Mac.o: xetexdir/XeTeXFontInst_Mac.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CXXFLAGS) $(CXXFLAGS) -MT xetexdir/libxetex_a-XeTeXFontInst_Mac.o -MD -MP -MF xetexdir/$(DEPDIR)/libxetex_a-XeTeXFontInst_Mac.Tpo -c -o xetexdir/libxetex_a-XeTeXFontInst_Mac.o `test -f 'xetexdir/XeTeXFontInst_Mac.cpp' || echo '$(srcdir)/'`xetexdir/XeTeXFontInst_Mac.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) xetexdir/$(DEPDIR)/libxetex_a-XeTeXFontInst_Mac.Tpo xetexdir/$(DEPDIR)/libxetex_a-XeTeXFontInst_Mac.Po
@@ -12760,20 +12824,6 @@ xetexdir/libxetex_a-XeTeXFontMgr_FC.obj: xetexdir/XeTeXFontMgr_FC.cpp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CXXFLAGS) $(CXXFLAGS) -c -o xetexdir/libxetex_a-XeTeXFontMgr_FC.obj `if test -f 'xetexdir/XeTeXFontMgr_FC.cpp'; then $(CYGPATH_W) 'xetexdir/XeTeXFontMgr_FC.cpp'; else $(CYGPATH_W) '$(srcdir)/xetexdir/XeTeXFontMgr_FC.cpp'; fi`
 
-xetexdir/libxetex_a-pdfimage.o: xetexdir/pdfimage.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CXXFLAGS) $(CXXFLAGS) -MT xetexdir/libxetex_a-pdfimage.o -MD -MP -MF xetexdir/$(DEPDIR)/libxetex_a-pdfimage.Tpo -c -o xetexdir/libxetex_a-pdfimage.o `test -f 'xetexdir/pdfimage.cpp' || echo '$(srcdir)/'`xetexdir/pdfimage.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) xetexdir/$(DEPDIR)/libxetex_a-pdfimage.Tpo xetexdir/$(DEPDIR)/libxetex_a-pdfimage.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='xetexdir/pdfimage.cpp' object='xetexdir/libxetex_a-pdfimage.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CXXFLAGS) $(CXXFLAGS) -c -o xetexdir/libxetex_a-pdfimage.o `test -f 'xetexdir/pdfimage.cpp' || echo '$(srcdir)/'`xetexdir/pdfimage.cpp
-
-xetexdir/libxetex_a-pdfimage.obj: xetexdir/pdfimage.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CXXFLAGS) $(CXXFLAGS) -MT xetexdir/libxetex_a-pdfimage.obj -MD -MP -MF xetexdir/$(DEPDIR)/libxetex_a-pdfimage.Tpo -c -o xetexdir/libxetex_a-pdfimage.obj `if test -f 'xetexdir/pdfimage.cpp'; then $(CYGPATH_W) 'xetexdir/pdfimage.cpp'; else $(CYGPATH_W) '$(srcdir)/xetexdir/pdfimage.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) xetexdir/$(DEPDIR)/libxetex_a-pdfimage.Tpo xetexdir/$(DEPDIR)/libxetex_a-pdfimage.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='xetexdir/pdfimage.cpp' object='xetexdir/libxetex_a-pdfimage.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CXXFLAGS) $(CXXFLAGS) -c -o xetexdir/libxetex_a-pdfimage.obj `if test -f 'xetexdir/pdfimage.cpp'; then $(CYGPATH_W) 'xetexdir/pdfimage.cpp'; else $(CYGPATH_W) '$(srcdir)/xetexdir/pdfimage.cpp'; fi`
-
 luajittex-dummy.o: dummy.cxx
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(luajittex_CPPFLAGS) $(CPPFLAGS) $(luajittex_CXXFLAGS) $(CXXFLAGS) -MT luajittex-dummy.o -MD -MP -MF $(DEPDIR)/luajittex-dummy.Tpo -c -o luajittex-dummy.o `test -f 'dummy.cxx' || echo '$(srcdir)/'`dummy.cxx
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/luajittex-dummy.Tpo $(DEPDIR)/luajittex-dummy.Po
@@ -14079,6 +14129,11 @@ $(mpmath_c_h): mpmath-tangle
 mpmath-tangle: ctangle$(EXEEXT) mplibdir/mpmath.w tangle-sh
 	@$(mp_ctangle_sh) mpmath
 
+$(mpmathdecimal_c_h): mpmathdecimal-tangle
+	@$(mp_ctangle_sh) mpmathdecimal
+mpmathdecimal-tangle: ctangle$(EXEEXT) mplibdir/mpmathdecimal.w tangle-sh
+	@$(mp_ctangle_sh) mpmathdecimal
+
 $(mpmathdouble_c_h): mpmathdouble-tangle
 	@$(mp_ctangle_sh) mpmathdouble
 mpmathdouble-tangle: ctangle$(EXEEXT) mplibdir/mpmathdouble.w tangle-sh
@@ -14089,6 +14144,11 @@ $(mpstrings_c_h): mpstrings-tangle
 mpstrings-tangle: ctangle$(EXEEXT) mplibdir/mpstrings.w tangle-sh
 	@$(mp_ctangle_sh) mpstrings
 
+$(pngout_c_h): pngout-tangle
+	@$(mp_ctangle_sh) pngout
+pngout-tangle: ctangle$(EXEEXT) mplibdir/pngout.w tangle-sh
+	@$(mp_ctangle_sh) pngout
+
 $(psout_c_h): psout-tangle
 	@$(mp_ctangle_sh) psout
 psout-tangle: ctangle$(EXEEXT) mplibdir/psout.w tangle-sh
@@ -14099,11 +14159,6 @@ $(svgout_c_h): svgout-tangle
 svgout-tangle: ctangle$(EXEEXT) mplibdir/svgout.w tangle-sh
 	@$(mp_ctangle_sh) svgout
 
-$(pngout_c_h): pngout-tangle
-	@$(mp_ctangle_sh) pngout
-pngout-tangle: ctangle$(EXEEXT) mplibdir/pngout.w tangle-sh
-	@$(mp_ctangle_sh) pngout
-
 $(libmplib_a_OBJECTS): $(nodist_libmplib_a_SOURCES) $(KPATHSEA_DEPEND) $(CAIRO_DEPEND)
 $(etex_OBJECTS): $(etex_prereq)
 
diff --git a/Build/source/texk/web2c/luatexdir/lua/luatex-api.h b/Build/source/texk/web2c/luatexdir/lua/luatex-api.h
index 3a88eaf54d7..3fe463d8068 100644
--- a/Build/source/texk/web2c/luatexdir/lua/luatex-api.h
+++ b/Build/source/texk/web2c/luatexdir/lua/luatex-api.h
@@ -71,7 +71,6 @@ extern int luaopen_zlib(lua_State * L);
 extern int luaopen_gzip(lua_State * L);
 extern int luaopen_ff(lua_State * L);
 extern int luaopen_profiler(lua_State * L);
-extern int luaopen_bit32(lua_State * L);
 
 extern int luaopen_socket_core(lua_State * L);
 extern int luaopen_mime_core(lua_State * L);
@@ -133,7 +132,6 @@ extern int lua_only;
 #ifdef LuajitTeX
 extern int luajiton;
 extern char *jithash_hashname ;
-LUA_API int luajittex_choose_hash_function  ;
 #endif
 
 
diff --git a/Build/source/texk/web2c/mplibdir/am/libmplib.am b/Build/source/texk/web2c/mplibdir/am/libmplib.am
index 2435e3131a6..b53980128da 100644
--- a/Build/source/texk/web2c/mplibdir/am/libmplib.am
+++ b/Build/source/texk/web2c/mplibdir/am/libmplib.am
@@ -1,22 +1,24 @@
 ## texk/web2c/mplibdir/am/libmplib.am: Makefile fragment for libmplib.
 ##
-## Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org>
 ## You may freely use, modify and/or distribute this file.
 
 ## libmplib.a, used by MetaPost and luaTeX
 ##
 EXTRA_LIBRARIES += libmplib.a
 
-libmplib_a_CPPFLAGS = $(CAIRO_INCLUDES) $(PIXMAN_INCLUDES) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) $(AM_CPPFLAGS) -I$(srcdir)/mplibdir
+libmplib_a_CPPFLAGS = $(CAIRO_INCLUDES) $(PIXMAN_INCLUDES) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) \
+	$(AM_CPPFLAGS) -I$(srcdir)/mplibdir
 
 ## libmplib C sources
-decnumber_c_h = mplibdir/decNumber.c mplibdir/decNumber.h mplibdir/decNumberLocal.h mplibdir/decContext.h mplibdir/decContext.c
-libmplib_a_SOURCES = mplibdir/avl.h mplibdir/avl.c $(decnumber_c_h)
-nodist_libmplib_a_SOURCES = tfmin.c $(mp_c_h) $(mpmath_c_h) $(mpmathdouble_c_h) $(mpmathdecimal_c_h) $(psout_c_h) $(svgout_c_h) $(pngout_c_h) $(mpstrings_c_h)
+libmplib_a_SOURCES = mplibdir/avl.h mplibdir/avl.c mplibdir/decNumber.c mplibdir/decNumber.h \
+	mplibdir/decNumberLocal.h mplibdir/decContext.h mplibdir/decContext.c
+nodist_libmplib_a_SOURCES = tfmin.c $(mp_c_h) $(mpmath_c_h) $(mpmathdecimal_c_h) \
+	$(mpmathdouble_c_h) $(mpstrings_c_h) $(pngout_c_h) $(psout_c_h) $(svgout_c_h)
 mp_c_h =  mp.c mplib.h mpmp.h
 mpmath_c_h = mpmath.h mpmath.c
-mpmathdouble_c_h = mpmathdouble.h mpmathdouble.c
 mpmathdecimal_c_h = mpmathdecimal.h mpmathdecimal.c
+mpmathdouble_c_h = mpmathdouble.h mpmathdouble.c
 mpstrings_c_h = mpstrings.h mpstrings.c
 psout_c_h = mppsout.h psout.c mplibps.h
 svgout_c_h = mplibsvg.h mpsvgout.h svgout.c
@@ -37,21 +39,26 @@ $(mpmath_c_h): mpmath-tangle
 mpmath-tangle: ctangle$(EXEEXT) mplibdir/mpmath.w tangle-sh
 	@$(mp_ctangle_sh) mpmath
 
-$(mpmathdouble_c_h): mpmathdouble-tangle
-	@$(mp_ctangle_sh) mpmathdouble
-mpmathdouble-tangle: ctangle$(EXEEXT) mplibdir/mpmathdouble.w tangle-sh
-	@$(mp_ctangle_sh) mpmathdouble
-
 $(mpmathdecimal_c_h): mpmathdecimal-tangle
 	@$(mp_ctangle_sh) mpmathdecimal
 mpmathdecimal-tangle: ctangle$(EXEEXT) mplibdir/mpmathdecimal.w tangle-sh
 	@$(mp_ctangle_sh) mpmathdecimal
 
+$(mpmathdouble_c_h): mpmathdouble-tangle
+	@$(mp_ctangle_sh) mpmathdouble
+mpmathdouble-tangle: ctangle$(EXEEXT) mplibdir/mpmathdouble.w tangle-sh
+	@$(mp_ctangle_sh) mpmathdouble
+
 $(mpstrings_c_h): mpstrings-tangle
 	@$(mp_ctangle_sh) mpstrings
 mpstrings-tangle: ctangle$(EXEEXT) mplibdir/mpstrings.w tangle-sh
 	@$(mp_ctangle_sh) mpstrings
 
+$(pngout_c_h): pngout-tangle
+	@$(mp_ctangle_sh) pngout
+pngout-tangle: ctangle$(EXEEXT) mplibdir/pngout.w tangle-sh
+	@$(mp_ctangle_sh) pngout
+
 $(psout_c_h): psout-tangle
 	@$(mp_ctangle_sh) psout
 psout-tangle: ctangle$(EXEEXT) mplibdir/psout.w tangle-sh
@@ -62,19 +69,16 @@ $(svgout_c_h): svgout-tangle
 svgout-tangle: ctangle$(EXEEXT) mplibdir/svgout.w tangle-sh
 	@$(mp_ctangle_sh) svgout
 
-$(pngout_c_h): pngout-tangle
-	@$(mp_ctangle_sh) pngout
-pngout-tangle: ctangle$(EXEEXT) mplibdir/pngout.w tangle-sh
-	@$(mp_ctangle_sh) pngout
-
 ## libmplib CWeb sources
 libmplib_web = mplibdir/mp.w mplibdir/psout.w mplibdir/svgout.w mplibdir/pngout.w
-libmplib_web += mplibdir/mpmath.w mplibdir/mpmathdouble.w mplibdir/mpmathdecimal.w mplibdir/mpstrings.w mplibdir/tfmin.w
+libmplib_web += mplibdir/mpmath.w mplibdir/mpmathdecimal.w mplibdir/mpmathdouble.w
+libmplib_web += mplibdir/mpstrings.w mplibdir/tfmin.w
 
 $(libmplib_a_OBJECTS): $(nodist_libmplib_a_SOURCES) $(KPATHSEA_DEPEND) $(CAIRO_DEPEND)
 
 EXTRA_DIST += $(libmplib_web)
 
 DISTCLEANFILES += $(nodist_libmplib_a_SOURCES) \
-	mp-tangle mpmath-tangle mpmathdouble-tangle mpmathdecimal-tangle mpstrings-tangle psout-tangle svgout-tangle pngout-tangle
+	mp-tangle mpmath-tangle mpmathdecimal-tangle mpmathdouble-tangle mpstrings-tangle \
+	psout-tangle svgout-tangle pngout-tangle
 
diff --git a/Build/source/texk/web2c/xetexdir/am/xetex.am b/Build/source/texk/web2c/xetexdir/am/xetex.am
index 4bdc8b63e5c..7952fe1c86a 100644
--- a/Build/source/texk/web2c/xetexdir/am/xetex.am
+++ b/Build/source/texk/web2c/xetexdir/am/xetex.am
@@ -1,6 +1,6 @@
 ## texk/web2c/xetexdir/am/xetex.am: Makefile fragment for XeTeX.
 ##
-## Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org>
 ## You may freely use, modify and/or distribute this file.
 
 ## XeTeX
@@ -183,6 +183,13 @@ endif !XETEX_MACOSX
 libxetex_prereq = xetexd.h $(xetex_dependencies)
 $(libxetex_a_OBJECTS): $(libxetex_prereq)
 
+EXTRA_DIST += \
+	xetexdir/ChangeLog \
+	xetexdir/COPYING \
+	xetexdir/NEWS \
+	xetexdir/image/README \
+	xetexdir/unicode-char-prep.pl \
+	xetexdir/xewebmac.tex
 
 # XeTeX Tests
 #
@@ -194,11 +201,3 @@ if XETEX
 TESTS += $(xetex_tests)
 endif XETEX
 
-EXTRA_DIST += \
-	xetexdir/unicode-char-prep.pl \
-	xetexdir/ChangeLog \
-	xetexdir/COPYING \
-	xetexdir/NEWS \
-	xetexdir/image/README \
-	xetexdir/xewebmac.tex
-
diff --git a/Build/source/texk/web2c/xetexdir/xetex_version.h b/Build/source/texk/web2c/xetexdir/xetex_version.h
index e95594fa5fc..ec8c776d6a7 100644
--- a/Build/source/texk/web2c/xetexdir/xetex_version.h
+++ b/Build/source/texk/web2c/xetexdir/xetex_version.h
@@ -1 +1 @@
-#define XETEX_VERSION "0.9999.3"
+#define XETEX_VERSION "0.99991"
author	Peter Breitenlohner <peb@mppmu.mpg.de>	2014-03-15 13:59:02 +0000
committer	Peter Breitenlohner <peb@mppmu.mpg.de>	2014-03-15 13:59:02 +0000
commit	421f7efdd3d6fba193be461fba84adbdccaa2ced (patch)
tree	dd8db3f5f47211af551f45fd0b29dd0683265b8c /Build
parent	8dbe4b451fb55cabfd1f42b4df30e13069aa6e75 (diff)