Integrate MFLua and MFLuaJIT

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

55 files changed, 4485 insertions, 767 deletions

diff --git a/Build/source/texk/configure b/Build/source/texk/configure
index 112d137c041..1ea8e4fd21e 100755
--- a/Build/source/texk/configure
+++ b/Build/source/texk/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for TeX Live texk 2015.
+# Generated by GNU Autoconf 2.69 for TeX Live texk 2016/dev.
 #
 # Report bugs to <peb@mppmu.mpg.de>.
 #
@@ -579,8 +579,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='TeX Live texk'
 PACKAGE_TARNAME='tex-live-texk'
-PACKAGE_VERSION='2015'
-PACKAGE_STRING='TeX Live texk 2015'
+PACKAGE_VERSION='2016/dev'
+PACKAGE_STRING='TeX Live texk 2016/dev'
 PACKAGE_BUGREPORT='peb@mppmu.mpg.de'
 PACKAGE_URL=''
 
@@ -740,6 +740,10 @@ enable_xetex
 enable_xetex_synctex
 enable_mf
 enable_mf_nowin
+enable_mflua
+enable_mflua_nowin
+enable_mfluajit
+enable_mfluajit_nowin
 with_mf_x_toolkit
 enable_epsfwin
 enable_hp2627win
@@ -1423,7 +1427,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures TeX Live texk 2015 to adapt to many kinds of systems.
+\`configure' configures TeX Live texk 2016/dev to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1493,7 +1497,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of TeX Live texk 2015:";;
+     short | recursive ) echo "Configuration of TeX Live texk 2016/dev:";;
    esac
   cat <<\_ACEOF
 
@@ -1554,6 +1558,10 @@ Optional Features:
   --disable-mf              do not compile and install METAFONT
   --disable-mf-nowin          do not build a separate non-window-capable
                               METAFONT
+  --disable-mflua           do not compile and install MFLua
+  --enable-mflua-nowin        build a separate non-window-capable MFLua
+  --disable-mfluajit        do not compile and install MFLuaJIT
+  --enable-mfluajit-nowin     build a separate non-window-capable MFLuaJIT
   --enable-epsfwin            include EPSF pseudo window support
   --enable-hp2627win          include HP 2627 window support
   --enable-mftalkwin          include mftalk (generic server) window support
@@ -1783,7 +1791,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-TeX Live texk configure 2015
+TeX Live texk configure 2016/dev
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1884,7 +1892,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by TeX Live texk $as_me 2015, which was
+It was created by TeX Live texk $as_me 2016/dev, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3375,6 +3383,20 @@ $as_echo "$as_me: $host -> \`--disable-luajittex'" >&6;}
      ;;
 esac ;;
 esac
+case $enable_mfluajit in #(
+  yes | no) :
+    : ;; #(
+  *) :
+    case $host in #(
+  alpha* | sparc* | x86_64-*-cygwin | powerpc-*-darwin* ) :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: $host -> \`--disable-mfluajit'" >&5
+$as_echo "$as_me: $host -> \`--disable-mfluajit'" >&6;}
+                      ac_configure_args="$ac_configure_args '--disable-mfluajit'" ;; #(
+  *) :
+     ;;
+esac ;;
+esac
+
 ## utils/devnag/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/devnag/
 ## configure options and TL libraries required for devnag
 # Check whether --enable-devnag was given.
@@ -3947,6 +3969,62 @@ esac
 if test "${enable_mf_nowin+set}" = set; then :
   enableval=$enable_mf_nowin;
 fi
+case $enable_mf_nowin in #(
+  yes | no) :
+     ;; #(
+  *) :
+    enable_mf_nowin=yes ;;
+esac
+# Check whether --enable-mflua was given.
+if test "${enable_mflua+set}" = set; then :
+  enableval=$enable_mflua;
+fi
+case $enable_mflua in #(
+  yes | no) :
+     ;; #(
+  *) :
+    enable_mflua=yes ;;
+esac
+
+# Check whether --enable-mflua-nowin was given.
+if test "${enable_mflua_nowin+set}" = set; then :
+  enableval=$enable_mflua_nowin;
+fi
+case $enable_mflua_nowin in #(
+  yes | no) :
+     ;; #(
+  *) :
+    enable_mflua_nowin=no ;;
+esac
+
+test "x$enable_web2c:$enable_mflua" = xyes:yes && {
+  need_lua52=yes
+}
+# Check whether --enable-mfluajit was given.
+if test "${enable_mfluajit+set}" = set; then :
+  enableval=$enable_mfluajit;
+fi
+case $enable_mfluajit in #(
+  yes | no) :
+     ;; #(
+  *) :
+    enable_mfluajit=yes ;;
+esac
+
+# Check whether --enable-mfluajit-nowin was given.
+if test "${enable_mfluajit_nowin+set}" = set; then :
+  enableval=$enable_mfluajit_nowin;
+fi
+case $enable_mfluajit_nowin in #(
+  yes | no) :
+     ;; #(
+  *) :
+    enable_mfluajit_nowin=no ;;
+esac
+
+test "x$enable_web2c:$enable_mfluajit" = xyes:yes && {
+  need_luajit=yes
+}
 
 # Check whether --with-mf-x-toolkit was given.
 if test "${with_mf_x_toolkit+set}" = set; then :
@@ -6019,7 +6097,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='tex-live-texk'
- VERSION='2015'
+ VERSION='2016/dev'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -6302,13 +6380,13 @@ else
 if test "x$enable_compiler_warnings" != xno; then
   kpse_cv_warning_cflags="-Wimplicit -Wreturn-type"
   case `$CC -dumpversion` in #(
-  3.4.* | 4.*) :
+  3.4.* | 4.* | 5.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wdeclaration-after-statement" ;; #(
   *) :
      ;;
 esac
   case `$CC -dumpversion` in #(
-  3.[234].* | 4.*) :
+  3.[234].* | 4.* | 5.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wno-unknown-pragmas" ;; #(
   *) :
      ;;
@@ -6320,7 +6398,7 @@ esac
       kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
       kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
       case `$CC -dumpversion` in #(
-  3.4.* | 4.*) :
+  3.4.* | 4.* | 5.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wold-style-definition" ;; #(
   *) :
      ;;
@@ -7165,7 +7243,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by TeX Live texk $as_me 2015, which was
+This file was extended by TeX Live texk $as_me 2016/dev, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -7222,7 +7300,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-TeX Live texk config.status 2015
+TeX Live texk config.status 2016/dev
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index 0b87b59bc80..6359e9d95d5 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,3 +1,11 @@
+2015-06-12  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Integrate MFLua and MFLuaJIT.
+	* mfluadir, mfluajitdir: New directories.
+	* mf.ch: Avoid conflict with mfluadir/mf-lua.ch.
+	* Makefile.am, ac/web2c.ac, tangle-sh.in, texmfmp.h,
+	* texmfmp-help.h, triptrap-sh: Adapted.
+
 2015-05-21  Karl Berry  <karl@tug.org>
 
 	* TL'15.
diff --git a/Build/source/texk/web2c/Makefile.am b/Build/source/texk/web2c/Makefile.am
index 54515ae21d5..3c220910880 100644
--- a/Build/source/texk/web2c/Makefile.am
+++ b/Build/source/texk/web2c/Makefile.am
@@ -182,6 +182,12 @@ include $(srcdir)/am/cweb.am
 ## TeX and MF
 include $(srcdir)/am/texmf.am
 
+## MFLua
+include $(srcdir)/mfluadir/am/mflua.am
+
+## MFLuaJIT
+include $(srcdir)/mfluajitdir/am/mfluajit.am
+
 ## MetaPost
 include $(srcdir)/mplibdir/am/mplib.am
 
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index f67aee16a21..bad81cfda02 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -93,12 +93,14 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 EXTRA_PROGRAMS = $(am__EXEEXT_1) tex$(EXEEXT) mf$(EXEEXT) \
-	mf-nowin$(EXEEXT) mpost$(EXEEXT) pmpost$(EXEEXT) \
-	upmpost$(EXEEXT) etex$(EXEEXT) ptex$(EXEEXT) $(am__EXEEXT_2) \
-	eptex$(EXEEXT) uptex$(EXEEXT) $(am__EXEEXT_3) euptex$(EXEEXT) \
-	pdftex$(EXEEXT) ttf2afm$(EXEEXT) pdftosrc$(EXEEXT) \
-	luatex$(EXEEXT) luajittex$(EXEEXT) txt2zlib$(EXEEXT) \
-	xetex$(EXEEXT) $(am__EXEEXT_4) aleph$(EXEEXT) synctex$(EXEEXT)
+	mf-nowin$(EXEEXT) mflua$(EXEEXT) mflua-nowin$(EXEEXT) \
+	mfluajit$(EXEEXT) mfluajit-nowin$(EXEEXT) mpost$(EXEEXT) \
+	pmpost$(EXEEXT) upmpost$(EXEEXT) etex$(EXEEXT) ptex$(EXEEXT) \
+	$(am__EXEEXT_2) eptex$(EXEEXT) uptex$(EXEEXT) $(am__EXEEXT_3) \
+	euptex$(EXEEXT) pdftex$(EXEEXT) ttf2afm$(EXEEXT) \
+	pdftosrc$(EXEEXT) luatex$(EXEEXT) luajittex$(EXEEXT) \
+	txt2zlib$(EXEEXT) xetex$(EXEEXT) $(am__EXEEXT_4) \
+	aleph$(EXEEXT) synctex$(EXEEXT)
 bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__EXEEXT_5) \
 	ctie$(EXEEXT) cweave$(EXEEXT) tie$(EXEEXT) $(am__EXEEXT_6) \
 	$(am__EXEEXT_7) $(am__EXEEXT_8) $(am__EXEEXT_9) \
@@ -107,23 +109,25 @@ bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__EXEEXT_5) \
 	$(am__EXEEXT_16) $(am__EXEEXT_17) $(am__EXEEXT_18) \
 	$(am__EXEEXT_19) $(am__EXEEXT_20) $(am__EXEEXT_21) \
 	$(am__EXEEXT_22) $(am__EXEEXT_23) $(am__EXEEXT_24) \
-	$(am__EXEEXT_25) $(am__EXEEXT_26) $(am__EXEEXT_27)
+	$(am__EXEEXT_25) $(am__EXEEXT_26) $(am__EXEEXT_27) \
+	$(am__EXEEXT_28) $(am__EXEEXT_29) $(am__EXEEXT_30) \
+	$(am__EXEEXT_31) $(am__EXEEXT_32) $(am__EXEEXT_33)
 noinst_PROGRAMS = tangleboot$(EXEEXT) ctangleboot$(EXEEXT) \
+	$(am__EXEEXT_45) $(am__EXEEXT_46) $(am__EXEEXT_47) \
+	$(am__EXEEXT_48) $(am__EXEEXT_49) $(am__EXEEXT_50)
+check_PROGRAMS = $(am__EXEEXT_34) $(am__EXEEXT_35) $(am__EXEEXT_36) \
 	$(am__EXEEXT_37) $(am__EXEEXT_38) $(am__EXEEXT_39) \
-	$(am__EXEEXT_40) $(am__EXEEXT_41) $(am__EXEEXT_42)
-check_PROGRAMS = $(am__EXEEXT_28) $(am__EXEEXT_29) $(am__EXEEXT_30) \
-	$(am__EXEEXT_31) $(am__EXEEXT_32) $(am__EXEEXT_33) \
-	$(am__EXEEXT_34) $(am__EXEEXT_35) $(am__EXEEXT_36) \
-	md5main$(EXEEXT)
-TESTS = tangle.test $(am__EXEEXT_45) ctiedir/ctie.test \
+	$(am__EXEEXT_40) $(am__EXEEXT_41) $(am__EXEEXT_42) \
+	$(am__EXEEXT_43) $(am__EXEEXT_44) md5main$(EXEEXT)
+TESTS = tangle.test $(am__EXEEXT_53) ctiedir/ctie.test \
 	cwebdir/cweave.test tiedir/tie.test $(am__append_6) \
-	$(am__append_14) $(am__append_23) $(am__append_37) \
-	$(am__append_38) $(am__append_40) $(am__append_46) \
-	$(am__append_50) $(am__append_52) $(am__append_58) \
-	$(am__append_62) $(am__append_64) $(am__append_70) \
-	$(am__append_81) $(am__append_82) $(am__append_90) \
-	$(am__append_92) $(am__append_95) $(am__append_129) \
-	libmd5/md5.test
+	$(am__append_14) $(am__append_22) $(am__append_30) \
+	$(am__append_39) $(am__append_53) $(am__append_54) \
+	$(am__append_56) $(am__append_62) $(am__append_66) \
+	$(am__append_68) $(am__append_74) $(am__append_78) \
+	$(am__append_80) $(am__append_86) $(am__append_97) \
+	$(am__append_98) $(am__append_106) $(am__append_108) \
+	$(am__append_111) $(am__append_145) libmd5/md5.test
 @WEB_TRUE@am__append_1 = $(web_programs)
 @WEB_TRUE@am__append_2 = $(web_tests)
 @TEX_TRUE@am__append_3 = tex
@@ -141,187 +145,203 @@ TESTS = tangle.test $(am__EXEEXT_45) ctiedir/ctie.test \
 @MF_TRUE@am__append_15 = gftype tftopl
 @MF_TRUE@am__append_16 = mftrap.diffs
 @MF_TRUE@am__append_17 = trap-clean
-@MP_TRUE@am__append_18 = mpost
-@MP_TRUE@@WIN32_TRUE@am__append_19 = call_mpost
-@MP_TRUE@@WIN32_TRUE@am__append_20 = install-mpost-links
-@MP_TRUE@@WIN32_TRUE@am__append_21 = uninstall-mpost-links
-@MP_TRUE@@WIN32_FALSE@am__append_22 = mpost$(EXEEXT):dvitomp mpost$(EXEEXT):mfplain
-@MP_TRUE@am__append_23 = $(mp_tests)
-@MP_TRUE@am__append_24 = pltotf tftopl
-@MP_TRUE@am__append_25 = mptrap.diffs
-@MP_TRUE@am__append_26 = mptrap-clean
-@PMP_TRUE@am__append_27 = pmpost
-@PMP_TRUE@@WIN32_TRUE@am__append_28 = call_pmpost
-@PMP_TRUE@@WIN32_TRUE@am__append_29 = install-pmpost-links
-@PMP_TRUE@@WIN32_TRUE@am__append_30 = uninstall-pmpost-links
-@PMP_TRUE@@WIN32_FALSE@am__append_31 = pmpost$(EXEEXT):pdvitomp
-@UPMP_TRUE@am__append_32 = upmpost
-@UPMP_TRUE@@WIN32_TRUE@am__append_33 = call_upmpost
-@UPMP_TRUE@@WIN32_TRUE@am__append_34 = install-upmpost-links
-@UPMP_TRUE@@WIN32_TRUE@am__append_35 = uninstall-upmpost-links
-@UPMP_TRUE@@WIN32_FALSE@am__append_36 = upmpost$(EXEEXT):updvitomp
-@PMP_TRUE@am__append_37 = $(pmpost_tests)
-@UPMP_TRUE@am__append_38 = $(upmpost_tests)
-@ETEX_TRUE@am__append_39 = etex
-@ETEX_TRUE@am__append_40 = $(etex_tests)
-@ETEX_TRUE@am__append_41 = dvitype pltotf tftopl
-@ETEX_TRUE@am__append_42 = etrip.diffs
-@ETEX_TRUE@am__append_43 = etrip-clean
-@PTEX_TRUE@am__append_44 = ptex
-@PWEB_TRUE@am__append_45 = $(pweb_programs)
-@PTEX_TRUE@am__append_46 = $(ptex_tests)
-@PTEX_TRUE@am__append_47 = dvitype pltotf tftopl
-@PTEX_TRUE@am__append_48 = ptrip.diffs
-@PTEX_TRUE@am__append_49 = ptrip-clean
-@PWEB_TRUE@am__append_50 = $(pweb_tests)
-@EPTEX_TRUE@am__append_51 = eptex
-@EPTEX_TRUE@am__append_52 = $(eptex_tests)
-@EPTEX_TRUE@am__append_53 = dvitype pltotf tftopl
-@EPTEX_TRUE@am__append_54 = eptrip.diffs
-@EPTEX_TRUE@am__append_55 = eptrip-clean
-@UPTEX_TRUE@am__append_56 = uptex
-@UPWEB_TRUE@am__append_57 = $(upweb_programs)
-@UPTEX_TRUE@am__append_58 = $(uptex_tests)
-@UPTEX_TRUE@am__append_59 = dvitype pltotf tftopl
-@UPTEX_TRUE@am__append_60 = uptrip.diffs
-@UPTEX_TRUE@am__append_61 = uptrip-clean
-@UPWEB_TRUE@am__append_62 = $(upweb_tests)
-@EUPTEX_TRUE@am__append_63 = euptex
-@EUPTEX_TRUE@am__append_64 = $(euptex_tests)
-@EUPTEX_TRUE@am__append_65 = dvitype pltotf tftopl
-@EUPTEX_TRUE@am__append_66 = euptrip.diffs
-@EUPTEX_TRUE@am__append_67 = euptrip-clean
-@MINGW32_TRUE@am__append_68 = \
+@MFLUA_TRUE@am__append_18 = mflua
+@MFLUAN_TRUE@@MFLUA_TRUE@am__append_19 = mflua-nowin
+@MFLUA_TRUE@@WIN32_TRUE@am__append_20 = inimflua
+@MFLUA_TRUE@@WIN32_FALSE@am__append_21 = mflua$(EXEEXT):inimflua
+@MFLUA_TRUE@am__append_22 = $(mflua_tests)
+@MFLUA_TRUE@am__append_23 = gftype tftopl
+@MFLUA_TRUE@am__append_24 = mfluatrap.diffs
+@MFLUA_TRUE@am__append_25 = mfluatrap-clean
+@MFLUAJIT_TRUE@am__append_26 = mfluajit
+@MFLUAJITN_TRUE@@MFLUAJIT_TRUE@am__append_27 = mfluajit-nowin
+@MFLUAJIT_TRUE@@WIN32_TRUE@am__append_28 = inimfluajit
+@MFLUAJIT_TRUE@@WIN32_FALSE@am__append_29 = mfluajit$(EXEEXT):inimfluajit
+@MFLUAJIT_TRUE@am__append_30 = $(mfluajit_tests)
+@MFLUAJIT_TRUE@am__append_31 = gftype tftopl
+@MFLUAJIT_TRUE@am__append_32 = mfluajittrap.diffs
+@MFLUAJIT_TRUE@am__append_33 = mfluajittrap-clean
+@MP_TRUE@am__append_34 = mpost
+@MP_TRUE@@WIN32_TRUE@am__append_35 = call_mpost
+@MP_TRUE@@WIN32_TRUE@am__append_36 = install-mpost-links
+@MP_TRUE@@WIN32_TRUE@am__append_37 = uninstall-mpost-links
+@MP_TRUE@@WIN32_FALSE@am__append_38 = mpost$(EXEEXT):dvitomp mpost$(EXEEXT):mfplain
+@MP_TRUE@am__append_39 = $(mp_tests)
+@MP_TRUE@am__append_40 = pltotf tftopl
+@MP_TRUE@am__append_41 = mptrap.diffs
+@MP_TRUE@am__append_42 = mptrap-clean
+@PMP_TRUE@am__append_43 = pmpost
+@PMP_TRUE@@WIN32_TRUE@am__append_44 = call_pmpost
+@PMP_TRUE@@WIN32_TRUE@am__append_45 = install-pmpost-links
+@PMP_TRUE@@WIN32_TRUE@am__append_46 = uninstall-pmpost-links
+@PMP_TRUE@@WIN32_FALSE@am__append_47 = pmpost$(EXEEXT):pdvitomp
+@UPMP_TRUE@am__append_48 = upmpost
+@UPMP_TRUE@@WIN32_TRUE@am__append_49 = call_upmpost
+@UPMP_TRUE@@WIN32_TRUE@am__append_50 = install-upmpost-links
+@UPMP_TRUE@@WIN32_TRUE@am__append_51 = uninstall-upmpost-links
+@UPMP_TRUE@@WIN32_FALSE@am__append_52 = upmpost$(EXEEXT):updvitomp
+@PMP_TRUE@am__append_53 = $(pmpost_tests)
+@UPMP_TRUE@am__append_54 = $(upmpost_tests)
+@ETEX_TRUE@am__append_55 = etex
+@ETEX_TRUE@am__append_56 = $(etex_tests)
+@ETEX_TRUE@am__append_57 = dvitype pltotf tftopl
+@ETEX_TRUE@am__append_58 = etrip.diffs
+@ETEX_TRUE@am__append_59 = etrip-clean
+@PTEX_TRUE@am__append_60 = ptex
+@PWEB_TRUE@am__append_61 = $(pweb_programs)
+@PTEX_TRUE@am__append_62 = $(ptex_tests)
+@PTEX_TRUE@am__append_63 = dvitype pltotf tftopl
+@PTEX_TRUE@am__append_64 = ptrip.diffs
+@PTEX_TRUE@am__append_65 = ptrip-clean
+@PWEB_TRUE@am__append_66 = $(pweb_tests)
+@EPTEX_TRUE@am__append_67 = eptex
+@EPTEX_TRUE@am__append_68 = $(eptex_tests)
+@EPTEX_TRUE@am__append_69 = dvitype pltotf tftopl
+@EPTEX_TRUE@am__append_70 = eptrip.diffs
+@EPTEX_TRUE@am__append_71 = eptrip-clean
+@UPTEX_TRUE@am__append_72 = uptex
+@UPWEB_TRUE@am__append_73 = $(upweb_programs)
+@UPTEX_TRUE@am__append_74 = $(uptex_tests)
+@UPTEX_TRUE@am__append_75 = dvitype pltotf tftopl
+@UPTEX_TRUE@am__append_76 = uptrip.diffs
+@UPTEX_TRUE@am__append_77 = uptrip-clean
+@UPWEB_TRUE@am__append_78 = $(upweb_tests)
+@EUPTEX_TRUE@am__append_79 = euptex
+@EUPTEX_TRUE@am__append_80 = $(euptex_tests)
+@EUPTEX_TRUE@am__append_81 = dvitype pltotf tftopl
+@EUPTEX_TRUE@am__append_82 = euptrip.diffs
+@EUPTEX_TRUE@am__append_83 = euptrip-clean
+@MINGW32_TRUE@am__append_84 = \
 @MINGW32_TRUE@	pdftexdir/regex/regex.c \
 @MINGW32_TRUE@	pdftexdir/regex/regex.h
 
-@PDFTEX_TRUE@am__append_69 = pdftex ttf2afm pdftosrc
-@PDFTEX_TRUE@am__append_70 = $(pdftex_tests) $(ttf2afm_tests) \
+@PDFTEX_TRUE@am__append_85 = pdftex ttf2afm pdftosrc
+@PDFTEX_TRUE@am__append_86 = $(pdftex_tests) $(ttf2afm_tests) \
 @PDFTEX_TRUE@	$(pdftosrc_tests)
-@LUATEX_TRUE@am__append_71 = luatex
-@LUATEX_TRUE@@WIN32_TRUE@am__append_72 = call_luatex
-@LUATEX_TRUE@@WIN32_TRUE@am__append_73 = install-luatex-links
-@LUATEX_TRUE@@WIN32_TRUE@am__append_74 = uninstall-luatex-links
-@LUATEX_TRUE@@WIN32_FALSE@am__append_75 = luatex$(EXEEXT):texlua luatex$(EXEEXT):texluac
-@LUAJITTEX_TRUE@am__append_76 = luajittex
-@LUAJITTEX_TRUE@@WIN32_TRUE@am__append_77 = call_luajittex
-@LUAJITTEX_TRUE@@WIN32_TRUE@am__append_78 = install-luajittex-links
-@LUAJITTEX_TRUE@@WIN32_TRUE@am__append_79 = uninstall-luajittex-links
-@LUAJITTEX_TRUE@@WIN32_FALSE@am__append_80 = luajittex$(EXEEXT):texluajit luajittex$(EXEEXT):texluajitc
-@LUATEX_TRUE@am__append_81 = $(luatex_tests)
-@LUAJITTEX_TRUE@am__append_82 = $(luajittex_tests)
-@LUATEX_TRUE@@cross_FALSE@am__append_83 = txt2zlib
-@XETEX_TRUE@am__append_84 = xetex
-@XETEX_MACOSX_TRUE@am__append_85 = -DXETEX_MAC
-@XETEX_MACOSX_FALSE@am__append_86 = $(FONTCONFIG_INCLUDES)
-@XETEX_MACOSX_FALSE@am__append_87 = $(FONTCONFIG_LIBS)
-@XETEX_MACOSX_TRUE@am__append_88 = \
+@LUATEX_TRUE@am__append_87 = luatex
+@LUATEX_TRUE@@WIN32_TRUE@am__append_88 = call_luatex
+@LUATEX_TRUE@@WIN32_TRUE@am__append_89 = install-luatex-links
+@LUATEX_TRUE@@WIN32_TRUE@am__append_90 = uninstall-luatex-links
+@LUATEX_TRUE@@WIN32_FALSE@am__append_91 = luatex$(EXEEXT):texlua luatex$(EXEEXT):texluac
+@LUAJITTEX_TRUE@am__append_92 = luajittex
+@LUAJITTEX_TRUE@@WIN32_TRUE@am__append_93 = call_luajittex
+@LUAJITTEX_TRUE@@WIN32_TRUE@am__append_94 = install-luajittex-links
+@LUAJITTEX_TRUE@@WIN32_TRUE@am__append_95 = uninstall-luajittex-links
+@LUAJITTEX_TRUE@@WIN32_FALSE@am__append_96 = luajittex$(EXEEXT):texluajit luajittex$(EXEEXT):texluajitc
+@LUATEX_TRUE@am__append_97 = $(luatex_tests)
+@LUAJITTEX_TRUE@am__append_98 = $(luajittex_tests)
+@LUATEX_TRUE@@cross_FALSE@am__append_99 = txt2zlib
+@XETEX_TRUE@am__append_100 = xetex
+@XETEX_MACOSX_TRUE@am__append_101 = -DXETEX_MAC
+@XETEX_MACOSX_FALSE@am__append_102 = $(FONTCONFIG_INCLUDES)
+@XETEX_MACOSX_FALSE@am__append_103 = $(FONTCONFIG_LIBS)
+@XETEX_MACOSX_TRUE@am__append_104 = \
 @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_89 = \
+@XETEX_MACOSX_FALSE@am__append_105 = \
 @XETEX_MACOSX_FALSE@	xetexdir/XeTeXFontMgr_FC.cpp \
 @XETEX_MACOSX_FALSE@	xetexdir/XeTeXFontMgr_FC.h
 
-@XETEX_TRUE@am__append_90 = $(xetex_tests)
-@OTANGLE_TRUE@am__append_91 = $(omegaware_programs)
-@OTANGLE_TRUE@am__append_92 = $(OTANGLE_tests) $(OMFONTS_tests)
-@OTANGLE_TRUE@am__append_93 = pltotf tftopl
-@ALEPH_TRUE@am__append_94 = aleph
-@ALEPH_TRUE@am__append_95 = $(aleph_tests)
-@SYNCTEX_TRUE@am__append_96 = synctex
-@SYNCTEX_TRUE@am__append_97 = $(LTLIBSYNCTEX)
-@SYNCTEX_TRUE@am__append_98 = $(LIBSYNCTEX)
-@MINGW32_TRUE@am__append_99 = -lshlwapi
-@MINGW32_TRUE@am__append_100 = -lshlwapi
-@TEX_SYNCTEX_TRUE@am__append_101 = -I$(srcdir)/synctexdir \
+@XETEX_TRUE@am__append_106 = $(xetex_tests)
+@OTANGLE_TRUE@am__append_107 = $(omegaware_programs)
+@OTANGLE_TRUE@am__append_108 = $(OTANGLE_tests) $(OMFONTS_tests)
+@OTANGLE_TRUE@am__append_109 = pltotf tftopl
+@ALEPH_TRUE@am__append_110 = aleph
+@ALEPH_TRUE@am__append_111 = $(aleph_tests)
+@SYNCTEX_TRUE@am__append_112 = synctex
+@SYNCTEX_TRUE@am__append_113 = $(LTLIBSYNCTEX)
+@SYNCTEX_TRUE@am__append_114 = $(LIBSYNCTEX)
+@MINGW32_TRUE@am__append_115 = -lshlwapi
+@MINGW32_TRUE@am__append_116 = -lshlwapi
+@TEX_SYNCTEX_TRUE@am__append_117 = -I$(srcdir)/synctexdir \
 @TEX_SYNCTEX_TRUE@	$(ZLIB_INCLUDES) -D__SyncTeX__ \
 @TEX_SYNCTEX_TRUE@	-DSYNCTEX_ENGINE_H=\"synctex-tex.h\"
-@TEX_SYNCTEX_TRUE@am__append_102 = $(ZLIB_LIBS)
-@TEX_SYNCTEX_TRUE@am__append_103 = $(ZLIB_DEPEND)
-@TEX_SYNCTEX_TRUE@am__append_104 = \
+@TEX_SYNCTEX_TRUE@am__append_118 = $(ZLIB_LIBS)
+@TEX_SYNCTEX_TRUE@am__append_119 = $(ZLIB_DEPEND)
+@TEX_SYNCTEX_TRUE@am__append_120 = \
 @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_105 = -I$(srcdir)/synctexdir \
+@ETEX_SYNCTEX_TRUE@am__append_121 = -I$(srcdir)/synctexdir \
 @ETEX_SYNCTEX_TRUE@	$(ZLIB_INCLUDES) -D__SyncTeX__ \
 @ETEX_SYNCTEX_TRUE@	-DSYNCTEX_ENGINE_H=\"synctex-etex.h\"
-@ETEX_SYNCTEX_TRUE@am__append_106 = $(ZLIB_LIBS)
-@ETEX_SYNCTEX_TRUE@am__append_107 = $(ZLIB_DEPEND)
-@ETEX_SYNCTEX_TRUE@am__append_108 = \
+@ETEX_SYNCTEX_TRUE@am__append_122 = $(ZLIB_LIBS)
+@ETEX_SYNCTEX_TRUE@am__append_123 = $(ZLIB_DEPEND)
+@ETEX_SYNCTEX_TRUE@am__append_124 = \
 @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_109 = -I$(srcdir)/synctexdir \
+@PTEX_SYNCTEX_TRUE@am__append_125 = -I$(srcdir)/synctexdir \
 @PTEX_SYNCTEX_TRUE@	$(ZLIB_INCLUDES) -D__SyncTeX__ \
 @PTEX_SYNCTEX_TRUE@	-DSYNCTEX_ENGINE_H=\"synctex-ptex.h\"
-@PTEX_SYNCTEX_TRUE@am__append_110 = $(ZLIB_LIBS)
-@PTEX_SYNCTEX_TRUE@am__append_111 = $(ZLIB_DEPEND)
-@PTEX_SYNCTEX_TRUE@am__append_112 = \
+@PTEX_SYNCTEX_TRUE@am__append_126 = $(ZLIB_LIBS)
+@PTEX_SYNCTEX_TRUE@am__append_127 = $(ZLIB_DEPEND)
+@PTEX_SYNCTEX_TRUE@am__append_128 = \
 @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_113 = -I$(srcdir)/synctexdir \
+@UPTEX_SYNCTEX_TRUE@am__append_129 = -I$(srcdir)/synctexdir \
 @UPTEX_SYNCTEX_TRUE@	$(ZLIB_INCLUDES) -D__SyncTeX__ \
 @UPTEX_SYNCTEX_TRUE@	-DSYNCTEX_ENGINE_H=\"synctex-uptex.h\"
-@UPTEX_SYNCTEX_TRUE@am__append_114 = $(ZLIB_LIBS)
-@UPTEX_SYNCTEX_TRUE@am__append_115 = $(ZLIB_DEPEND)
-@UPTEX_SYNCTEX_TRUE@am__append_116 = \
+@UPTEX_SYNCTEX_TRUE@am__append_130 = $(ZLIB_LIBS)
+@UPTEX_SYNCTEX_TRUE@am__append_131 = $(ZLIB_DEPEND)
+@UPTEX_SYNCTEX_TRUE@am__append_132 = \
 @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_117 = -I$(srcdir)/synctexdir \
+@EPTEX_SYNCTEX_TRUE@am__append_133 = -I$(srcdir)/synctexdir \
 @EPTEX_SYNCTEX_TRUE@	$(ZLIB_INCLUDES) -D__SyncTeX__ \
 @EPTEX_SYNCTEX_TRUE@	-DSYNCTEX_ENGINE_H=\"synctex-eptex.h\"
-@EPTEX_SYNCTEX_TRUE@am__append_118 = $(ZLIB_LIBS)
-@EPTEX_SYNCTEX_TRUE@am__append_119 = $(ZLIB_DEPEND)
-@EPTEX_SYNCTEX_TRUE@am__append_120 = \
+@EPTEX_SYNCTEX_TRUE@am__append_134 = $(ZLIB_LIBS)
+@EPTEX_SYNCTEX_TRUE@am__append_135 = $(ZLIB_DEPEND)
+@EPTEX_SYNCTEX_TRUE@am__append_136 = \
 @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_121 = -I$(srcdir)/synctexdir \
+@EUPTEX_SYNCTEX_TRUE@am__append_137 = -I$(srcdir)/synctexdir \
 @EUPTEX_SYNCTEX_TRUE@	$(ZLIB_INCLUDES) -D__SyncTeX__ \
 @EUPTEX_SYNCTEX_TRUE@	-DSYNCTEX_ENGINE_H=\"synctex-euptex.h\"
-@EUPTEX_SYNCTEX_TRUE@am__append_122 = $(ZLIB_LIBS)
-@EUPTEX_SYNCTEX_TRUE@am__append_123 = $(ZLIB_DEPEND)
-@EUPTEX_SYNCTEX_TRUE@am__append_124 = \
+@EUPTEX_SYNCTEX_TRUE@am__append_138 = $(ZLIB_LIBS)
+@EUPTEX_SYNCTEX_TRUE@am__append_139 = $(ZLIB_DEPEND)
+@EUPTEX_SYNCTEX_TRUE@am__append_140 = \
 @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_125 = -I$(srcdir)/synctexdir \
+@PDFTEX_SYNCTEX_TRUE@am__append_141 = -I$(srcdir)/synctexdir \
 @PDFTEX_SYNCTEX_TRUE@	-D__SyncTeX__ \
 @PDFTEX_SYNCTEX_TRUE@	-DSYNCTEX_ENGINE_H=\"synctex-pdftex.h\"
-@PDFTEX_SYNCTEX_TRUE@am__append_126 = \
+@PDFTEX_SYNCTEX_TRUE@am__append_142 = \
 @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_127 = -I$(srcdir)/synctexdir \
+@XETEX_SYNCTEX_TRUE@am__append_143 = -I$(srcdir)/synctexdir \
 @XETEX_SYNCTEX_TRUE@	-D__SyncTeX__ \
 @XETEX_SYNCTEX_TRUE@	-DSYNCTEX_ENGINE_H=\"synctex-xetex.h\"
-@XETEX_SYNCTEX_TRUE@am__append_128 = \
+@XETEX_SYNCTEX_TRUE@am__append_144 = \
 @XETEX_SYNCTEX_TRUE@	synctexdir/synctex.c \
 @XETEX_SYNCTEX_TRUE@	synctexdir/synctex.h \
 @XETEX_SYNCTEX_TRUE@	synctexdir/synctex-common.h \
 @XETEX_SYNCTEX_TRUE@	synctexdir/synctex-xetex.h
 
-@SYNCTEX_TRUE@am__append_129 = $(synctex_tests)
+@SYNCTEX_TRUE@am__append_145 = $(synctex_tests)
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \
@@ -814,21 +834,39 @@ libmf_a_LIBADD =
 am__objects_11 = mfini.$(OBJEXT) mf0.$(OBJEXT)
 nodist_libmf_a_OBJECTS = $(am__objects_11) mf-pool.$(OBJEXT)
 libmf_a_OBJECTS = $(nodist_libmf_a_OBJECTS)
+libmflua_a_AR = $(AR) $(ARFLAGS)
+libmflua_a_LIBADD =
+dist_libmflua_a_OBJECTS = mfluadir/libmflua_a-mfluac.$(OBJEXT)
+am__objects_12 = libmflua_a-mfluaini.$(OBJEXT) \
+	libmflua_a-mflua0.$(OBJEXT)
+nodist_libmflua_a_OBJECTS = $(am__objects_12) \
+	libmflua_a-mflua-pool.$(OBJEXT)
+libmflua_a_OBJECTS = $(dist_libmflua_a_OBJECTS) \
+	$(nodist_libmflua_a_OBJECTS)
+libmfluajit_a_AR = $(AR) $(ARFLAGS)
+libmfluajit_a_LIBADD =
+dist_libmfluajit_a_OBJECTS = mfluadir/libmfluajit_a-mfluac.$(OBJEXT)
+am__objects_13 = libmfluajit_a-mfluajitini.$(OBJEXT) \
+	libmfluajit_a-mfluajit0.$(OBJEXT)
+nodist_libmfluajit_a_OBJECTS = $(am__objects_13) \
+	libmfluajit_a-mfluajit-pool.$(OBJEXT)
+libmfluajit_a_OBJECTS = $(dist_libmfluajit_a_OBJECTS) \
+	$(nodist_libmfluajit_a_OBJECTS)
 libmplib_a_AR = $(AR) $(ARFLAGS)
 libmplib_a_LIBADD =
-am__objects_12 = libmplib_a-mp.$(OBJEXT)
-am__objects_13 = libmplib_a-mpmath.$(OBJEXT)
-am__objects_14 = libmplib_a-mpmathbinary.$(OBJEXT)
-am__objects_15 = libmplib_a-mpmathdecimal.$(OBJEXT)
-am__objects_16 = libmplib_a-mpmathdouble.$(OBJEXT)
-am__objects_17 = libmplib_a-mpstrings.$(OBJEXT)
-am__objects_18 = libmplib_a-pngout.$(OBJEXT)
-am__objects_19 = libmplib_a-psout.$(OBJEXT)
-am__objects_20 = libmplib_a-svgout.$(OBJEXT)
+am__objects_14 = libmplib_a-mp.$(OBJEXT)
+am__objects_15 = libmplib_a-mpmath.$(OBJEXT)
+am__objects_16 = libmplib_a-mpmathbinary.$(OBJEXT)
+am__objects_17 = libmplib_a-mpmathdecimal.$(OBJEXT)
+am__objects_18 = libmplib_a-mpmathdouble.$(OBJEXT)
+am__objects_19 = libmplib_a-mpstrings.$(OBJEXT)
+am__objects_20 = libmplib_a-pngout.$(OBJEXT)
+am__objects_21 = libmplib_a-psout.$(OBJEXT)
+am__objects_22 = 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_19) $(am__objects_20)
+	$(am__objects_14) $(am__objects_15) $(am__objects_16) \
+	$(am__objects_17) $(am__objects_18) $(am__objects_19) \
+	$(am__objects_20) $(am__objects_21) $(am__objects_22)
 libmplib_a_OBJECTS = $(nodist_libmplib_a_OBJECTS)
 libmputil_a_AR = $(AR) $(ARFLAGS)
 libmputil_a_LIBADD =
@@ -850,7 +888,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_21 =  \
+@MINGW32_TRUE@am__objects_23 =  \
 @MINGW32_TRUE@	pdftexdir/regex/libpdftex_a-regex.$(OBJEXT)
 am_libpdftex_a_OBJECTS = pdftexdir/libpdftex_a-avl.$(OBJEXT) \
 	pdftexdir/libpdftex_a-avlstuff.$(OBJEXT) \
@@ -871,13 +909,13 @@ 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_21)
+	pdftexdir/libpdftex_a-writezip.$(OBJEXT) $(am__objects_23)
 libpdftex_a_OBJECTS = $(am_libpdftex_a_OBJECTS)
 libsynctex_a_AR = $(AR) $(ARFLAGS)
 libsynctex_a_LIBADD =
-am__objects_22 = synctexdir/libsynctex_a-synctex_parser.$(OBJEXT) \
+am__objects_24 = synctexdir/libsynctex_a-synctex_parser.$(OBJEXT) \
 	synctexdir/libsynctex_a-synctex_parser_utils.$(OBJEXT)
-nodist_libsynctex_a_OBJECTS = $(am__objects_22)
+nodist_libsynctex_a_OBJECTS = $(am__objects_24)
 libsynctex_a_OBJECTS = $(nodist_libsynctex_a_OBJECTS)
 libukanji_a_AR = $(AR) $(ARFLAGS)
 libukanji_a_LIBADD =
@@ -918,10 +956,10 @@ am__libxetex_a_SOURCES_DIST = xetexdir/MathTable.h \
 	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_23 = xetexdir/libxetex_a-XeTeXFontInst_Mac.$(OBJEXT) \
+@XETEX_MACOSX_TRUE@am__objects_25 = 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_24 = xetexdir/libxetex_a-XeTeXFontMgr_FC.$(OBJEXT)
+@XETEX_MACOSX_FALSE@am__objects_26 = 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) \
@@ -935,8 +973,8 @@ am_libxetex_a_OBJECTS = xetexdir/libxetex_a-XeTeXFontInst.$(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_23) \
-	$(am__objects_24)
+	xetexdir/image/libxetex_a-pngimage.$(OBJEXT) $(am__objects_25) \
+	$(am__objects_26)
 libxetex_a_OBJECTS = $(am_libxetex_a_OBJECTS)
 LTLIBRARIES = $(lib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
@@ -970,51 +1008,60 @@ am__EXEEXT_4 = odvicopy$(EXEEXT) odvitype$(EXEEXT) otangle$(EXEEXT) \
 @MF_TRUE@am__EXEEXT_8 = mf$(EXEEXT)
 @MFN_TRUE@@MF_TRUE@am__EXEEXT_9 = mf-nowin$(EXEEXT)
 @MF_TRUE@@WIN32_TRUE@am__EXEEXT_10 = inimf$(EXEEXT)
-@MP_TRUE@am__EXEEXT_11 = mpost$(EXEEXT)
-@PMP_TRUE@am__EXEEXT_12 = pmpost$(EXEEXT)
-@UPMP_TRUE@am__EXEEXT_13 = upmpost$(EXEEXT)
-@ETEX_TRUE@am__EXEEXT_14 = etex$(EXEEXT)
-@PTEX_TRUE@am__EXEEXT_15 = ptex$(EXEEXT)
-@PWEB_TRUE@am__EXEEXT_16 = $(am__EXEEXT_2)
-@EPTEX_TRUE@am__EXEEXT_17 = eptex$(EXEEXT)
-@UPTEX_TRUE@am__EXEEXT_18 = uptex$(EXEEXT)
-@UPWEB_TRUE@am__EXEEXT_19 = $(am__EXEEXT_3)
-@EUPTEX_TRUE@am__EXEEXT_20 = euptex$(EXEEXT)
-@PDFTEX_TRUE@am__EXEEXT_21 = pdftex$(EXEEXT) ttf2afm$(EXEEXT) \
+@MFLUA_TRUE@am__EXEEXT_11 = mflua$(EXEEXT)
+@MFLUAN_TRUE@@MFLUA_TRUE@am__EXEEXT_12 = mflua-nowin$(EXEEXT)
+@MFLUA_TRUE@@WIN32_TRUE@am__EXEEXT_13 = inimflua$(EXEEXT)
+@MFLUAJIT_TRUE@am__EXEEXT_14 = mfluajit$(EXEEXT)
+@MFLUAJITN_TRUE@@MFLUAJIT_TRUE@am__EXEEXT_15 =  \
+@MFLUAJITN_TRUE@@MFLUAJIT_TRUE@	mfluajit-nowin$(EXEEXT)
+@MFLUAJIT_TRUE@@WIN32_TRUE@am__EXEEXT_16 = inimfluajit$(EXEEXT)
+@MP_TRUE@am__EXEEXT_17 = mpost$(EXEEXT)
+@PMP_TRUE@am__EXEEXT_18 = pmpost$(EXEEXT)
+@UPMP_TRUE@am__EXEEXT_19 = upmpost$(EXEEXT)
+@ETEX_TRUE@am__EXEEXT_20 = etex$(EXEEXT)
+@PTEX_TRUE@am__EXEEXT_21 = ptex$(EXEEXT)
+@PWEB_TRUE@am__EXEEXT_22 = $(am__EXEEXT_2)
+@EPTEX_TRUE@am__EXEEXT_23 = eptex$(EXEEXT)
+@UPTEX_TRUE@am__EXEEXT_24 = uptex$(EXEEXT)
+@UPWEB_TRUE@am__EXEEXT_25 = $(am__EXEEXT_3)
+@EUPTEX_TRUE@am__EXEEXT_26 = euptex$(EXEEXT)
+@PDFTEX_TRUE@am__EXEEXT_27 = pdftex$(EXEEXT) ttf2afm$(EXEEXT) \
 @PDFTEX_TRUE@	pdftosrc$(EXEEXT)
-@LUATEX_TRUE@am__EXEEXT_22 = luatex$(EXEEXT)
-@LUAJITTEX_TRUE@am__EXEEXT_23 = luajittex$(EXEEXT)
-@XETEX_TRUE@am__EXEEXT_24 = xetex$(EXEEXT)
-@OTANGLE_TRUE@am__EXEEXT_25 = $(am__EXEEXT_4)
-@ALEPH_TRUE@am__EXEEXT_26 = aleph$(EXEEXT)
-@SYNCTEX_TRUE@am__EXEEXT_27 = synctex$(EXEEXT)
-@TEX_TRUE@am__EXEEXT_28 = dvitype$(EXEEXT) pltotf$(EXEEXT) \
+@LUATEX_TRUE@am__EXEEXT_28 = luatex$(EXEEXT)
+@LUAJITTEX_TRUE@am__EXEEXT_29 = luajittex$(EXEEXT)
+@XETEX_TRUE@am__EXEEXT_30 = xetex$(EXEEXT)
+@OTANGLE_TRUE@am__EXEEXT_31 = $(am__EXEEXT_4)
+@ALEPH_TRUE@am__EXEEXT_32 = aleph$(EXEEXT)
+@SYNCTEX_TRUE@am__EXEEXT_33 = synctex$(EXEEXT)
+@TEX_TRUE@am__EXEEXT_34 = dvitype$(EXEEXT) pltotf$(EXEEXT) \
 @TEX_TRUE@	tftopl$(EXEEXT)
-@MF_TRUE@am__EXEEXT_29 = gftype$(EXEEXT) tftopl$(EXEEXT)
-@MP_TRUE@am__EXEEXT_30 = pltotf$(EXEEXT) tftopl$(EXEEXT)
-@ETEX_TRUE@am__EXEEXT_31 = dvitype$(EXEEXT) pltotf$(EXEEXT) \
+@MF_TRUE@am__EXEEXT_35 = gftype$(EXEEXT) tftopl$(EXEEXT)
+@MFLUA_TRUE@am__EXEEXT_36 = gftype$(EXEEXT) tftopl$(EXEEXT)
+@MFLUAJIT_TRUE@am__EXEEXT_37 = gftype$(EXEEXT) tftopl$(EXEEXT)
+@MP_TRUE@am__EXEEXT_38 = pltotf$(EXEEXT) tftopl$(EXEEXT)
+@ETEX_TRUE@am__EXEEXT_39 = dvitype$(EXEEXT) pltotf$(EXEEXT) \
 @ETEX_TRUE@	tftopl$(EXEEXT)
-@PTEX_TRUE@am__EXEEXT_32 = dvitype$(EXEEXT) pltotf$(EXEEXT) \
+@PTEX_TRUE@am__EXEEXT_40 = dvitype$(EXEEXT) pltotf$(EXEEXT) \
 @PTEX_TRUE@	tftopl$(EXEEXT)
-@EPTEX_TRUE@am__EXEEXT_33 = dvitype$(EXEEXT) pltotf$(EXEEXT) \
+@EPTEX_TRUE@am__EXEEXT_41 = dvitype$(EXEEXT) pltotf$(EXEEXT) \
 @EPTEX_TRUE@	tftopl$(EXEEXT)
-@UPTEX_TRUE@am__EXEEXT_34 = dvitype$(EXEEXT) pltotf$(EXEEXT) \
+@UPTEX_TRUE@am__EXEEXT_42 = dvitype$(EXEEXT) pltotf$(EXEEXT) \
 @UPTEX_TRUE@	tftopl$(EXEEXT)
-@EUPTEX_TRUE@am__EXEEXT_35 = dvitype$(EXEEXT) pltotf$(EXEEXT) \
+@EUPTEX_TRUE@am__EXEEXT_43 = dvitype$(EXEEXT) pltotf$(EXEEXT) \
 @EUPTEX_TRUE@	tftopl$(EXEEXT)
-@OTANGLE_TRUE@am__EXEEXT_36 = pltotf$(EXEEXT) tftopl$(EXEEXT)
-@MP_TRUE@@WIN32_TRUE@am__EXEEXT_37 = call_mpost$(EXEEXT)
-@PMP_TRUE@@WIN32_TRUE@am__EXEEXT_38 = call_pmpost$(EXEEXT)
-@UPMP_TRUE@@WIN32_TRUE@am__EXEEXT_39 = call_upmpost$(EXEEXT)
-@LUATEX_TRUE@@WIN32_TRUE@am__EXEEXT_40 = call_luatex$(EXEEXT)
-@LUAJITTEX_TRUE@@WIN32_TRUE@am__EXEEXT_41 = call_luajittex$(EXEEXT)
-@LUATEX_TRUE@@cross_FALSE@am__EXEEXT_42 = txt2zlib$(EXEEXT)
+@OTANGLE_TRUE@am__EXEEXT_44 = pltotf$(EXEEXT) tftopl$(EXEEXT)
+@MP_TRUE@@WIN32_TRUE@am__EXEEXT_45 = call_mpost$(EXEEXT)
+@PMP_TRUE@@WIN32_TRUE@am__EXEEXT_46 = call_pmpost$(EXEEXT)
+@UPMP_TRUE@@WIN32_TRUE@am__EXEEXT_47 = call_upmpost$(EXEEXT)
+@LUATEX_TRUE@@WIN32_TRUE@am__EXEEXT_48 = call_luatex$(EXEEXT)
+@LUAJITTEX_TRUE@@WIN32_TRUE@am__EXEEXT_49 = call_luajittex$(EXEEXT)
+@LUATEX_TRUE@@cross_FALSE@am__EXEEXT_50 = txt2zlib$(EXEEXT)
 PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
 dist_aleph_OBJECTS = alephdir/aleph-aleph.$(OBJEXT) \
 	alephdir/aleph-alephbis.$(OBJEXT) \
 	alephdir/aleph-alephextra.$(OBJEXT)
-am__objects_25 = aleph-alephini.$(OBJEXT) aleph-aleph0.$(OBJEXT)
-nodist_aleph_OBJECTS = $(am__objects_25) aleph-aleph-pool.$(OBJEXT)
+am__objects_27 = aleph-alephini.$(OBJEXT) aleph-aleph0.$(OBJEXT)
+nodist_aleph_OBJECTS = $(am__objects_27) aleph-aleph-pool.$(OBJEXT)
 aleph_OBJECTS = $(dist_aleph_OBJECTS) $(nodist_aleph_OBJECTS)
 am__DEPENDENCIES_2 = $(proglib) $(am__DEPENDENCIES_1)
 aleph_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
@@ -1064,22 +1111,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_26 =  \
+@EPTEX_SYNCTEX_TRUE@am__objects_28 =  \
 @EPTEX_SYNCTEX_TRUE@	synctexdir/eptex-synctex.$(OBJEXT)
 dist_eptex_OBJECTS = eptexdir/eptex-eptexextra.$(OBJEXT) \
-	$(am__objects_26)
-am__objects_27 = eptex-eptexini.$(OBJEXT) eptex-eptex0.$(OBJEXT)
-nodist_eptex_OBJECTS = $(am__objects_27) eptex-eptex-pool.$(OBJEXT)
+	$(am__objects_28)
+am__objects_29 = eptex-eptexini.$(OBJEXT) eptex-eptex0.$(OBJEXT)
+nodist_eptex_OBJECTS = $(am__objects_29) 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_28 = synctexdir/etex-synctex.$(OBJEXT)
-dist_etex_OBJECTS = etexdir/etex-etexextra.$(OBJEXT) $(am__objects_28)
-am__objects_29 = etex-etexini.$(OBJEXT) etex-etex0.$(OBJEXT)
-nodist_etex_OBJECTS = $(am__objects_29) etex-etex-pool.$(OBJEXT)
+@ETEX_SYNCTEX_TRUE@am__objects_30 = synctexdir/etex-synctex.$(OBJEXT)
+dist_etex_OBJECTS = etexdir/etex-etexextra.$(OBJEXT) $(am__objects_30)
+am__objects_31 = etex-etexini.$(OBJEXT) etex-etex0.$(OBJEXT)
+nodist_etex_OBJECTS = $(am__objects_31) 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) \
@@ -1088,12 +1135,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_30 =  \
+@EUPTEX_SYNCTEX_TRUE@am__objects_32 =  \
 @EUPTEX_SYNCTEX_TRUE@	synctexdir/euptex-synctex.$(OBJEXT)
 dist_euptex_OBJECTS = euptexdir/euptex-euptexextra.$(OBJEXT) \
-	$(am__objects_30)
-am__objects_31 = euptex-euptexini.$(OBJEXT) euptex-euptex0.$(OBJEXT)
-nodist_euptex_OBJECTS = $(am__objects_31) euptex-euptex-pool.$(OBJEXT)
+	$(am__objects_32)
+am__objects_33 = euptex-euptexini.$(OBJEXT) euptex-euptex0.$(OBJEXT)
+nodist_euptex_OBJECTS = $(am__objects_33) euptex-euptex-pool.$(OBJEXT)
 euptex_OBJECTS = $(dist_euptex_OBJECTS) $(nodist_euptex_OBJECTS)
 @EUPTEX_SYNCTEX_TRUE@am__DEPENDENCIES_5 = $(am__DEPENDENCIES_1)
 am_gftodvi_OBJECTS =
@@ -1112,12 +1159,18 @@ gftype_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1)
 nodist_inimf_OBJECTS = inimf-callexe.$(OBJEXT)
 inimf_OBJECTS = $(nodist_inimf_OBJECTS)
 inimf_DEPENDENCIES =
+nodist_inimflua_OBJECTS = inimflua-callexe.$(OBJEXT)
+inimflua_OBJECTS = $(nodist_inimflua_OBJECTS)
+inimflua_DEPENDENCIES =
+nodist_inimfluajit_OBJECTS = inimfluajit-callexe.$(OBJEXT)
+inimfluajit_OBJECTS = $(nodist_inimfluajit_OBJECTS)
+inimfluajit_DEPENDENCIES =
 nodist_initex_OBJECTS = initex-callexe.$(OBJEXT)
 initex_OBJECTS = $(nodist_initex_OBJECTS)
 initex_DEPENDENCIES =
-am__objects_32 = luatexdir/luajittex-luatex.$(OBJEXT) \
+am__objects_34 = luatexdir/luajittex-luatex.$(OBJEXT) \
 	mplibdir/luajittex-lmplib.$(OBJEXT)
-nodist_luajittex_OBJECTS = $(am__objects_32)
+nodist_luajittex_OBJECTS = $(am__objects_34)
 luajittex_OBJECTS = $(nodist_luajittex_OBJECTS)
 am__DEPENDENCIES_6 = libmplib.a $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -1128,9 +1181,9 @@ am__DEPENDENCIES_6 = libmplib.a $(am__DEPENDENCIES_1) \
 luajittex_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(luajittex_CXXFLAGS) \
 	$(CXXFLAGS) $(luajittex_LDFLAGS) $(LDFLAGS) -o $@
-am__objects_33 = luatexdir/luatex-luatex.$(OBJEXT) \
+am__objects_35 = luatexdir/luatex-luatex.$(OBJEXT) \
 	mplibdir/luatex-lmplib.$(OBJEXT)
-nodist_luatex_OBJECTS = $(am__objects_33)
+nodist_luatex_OBJECTS = $(am__objects_35)
 luatex_OBJECTS = $(nodist_luatex_OBJECTS)
 am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
 luatex_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
@@ -1150,12 +1203,43 @@ mf_DEPENDENCIES = libmf.a $(am__DEPENDENCIES_2) $(windowlib) \
 dist_mf_nowin_OBJECTS = mf_nowin-mfextra.$(OBJEXT)
 mf_nowin_OBJECTS = $(dist_mf_nowin_OBJECTS)
 mf_nowin_DEPENDENCIES = libmf.a $(am__DEPENDENCIES_2) $(windowlib)
+dist_mflua_OBJECTS = mfluadir/mflua-mfluaextra.$(OBJEXT)
+mflua_OBJECTS = $(dist_mflua_OBJECTS)
+mflua_DEPENDENCIES = libmflua.a $(am__DEPENDENCIES_2) $(windowlib) \
+	$(am__DEPENDENCIES_8) $(am__DEPENDENCIES_7)
+mflua_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(mflua_LDFLAGS) $(LDFLAGS) -o $@
+am__objects_36 = mfluadir/mflua_nowin-mfluaextra.$(OBJEXT)
+nodist_mflua_nowin_OBJECTS = $(am__objects_36)
+mflua_nowin_OBJECTS = $(nodist_mflua_nowin_OBJECTS)
+mflua_nowin_DEPENDENCIES = libmflua.a $(am__DEPENDENCIES_2) \
+	$(windowlib) $(am__DEPENDENCIES_7)
+mflua_nowin_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(mflua_nowin_LDFLAGS) $(LDFLAGS) -o $@
+dist_mfluajit_OBJECTS = mfluajitdir/mfluajit-mfluajitextra.$(OBJEXT)
+mfluajit_OBJECTS = $(dist_mfluajit_OBJECTS)
+mfluajit_DEPENDENCIES = libmfluajit.a $(am__DEPENDENCIES_2) \
+	$(windowlib) $(am__DEPENDENCIES_8) $(am__DEPENDENCIES_1)
+mfluajit_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(mfluajit_LDFLAGS) $(LDFLAGS) -o $@
+am__objects_37 = mfluajitdir/mfluajit_nowin-mfluajitextra.$(OBJEXT)
+nodist_mfluajit_nowin_OBJECTS = $(am__objects_37)
+mfluajit_nowin_OBJECTS = $(nodist_mfluajit_nowin_OBJECTS)
+mfluajit_nowin_DEPENDENCIES = libmfluajit.a $(am__DEPENDENCIES_2) \
+	$(windowlib) $(am__DEPENDENCIES_1)
+mfluajit_nowin_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(AM_CFLAGS) $(CFLAGS) $(mfluajit_nowin_LDFLAGS) $(LDFLAGS) -o \
+	$@
 nodist_mft_OBJECTS = mft.$(OBJEXT)
 mft_OBJECTS = $(nodist_mft_OBJECTS)
 mft_LDADD = $(LDADD)
 mft_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1)
-am__objects_34 = mpost-mpxout.$(OBJEXT)
-nodist_mpost_OBJECTS = mpost-mpost.$(OBJEXT) $(am__objects_34)
+am__objects_38 = mpost-mpxout.$(OBJEXT)
+nodist_mpost_OBJECTS = mpost-mpost.$(OBJEXT) $(am__objects_38)
 mpost_OBJECTS = $(nodist_mpost_OBJECTS)
 mpost_DEPENDENCIES = libmplib.a $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -1187,12 +1271,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_35 =  \
+@PDFTEX_SYNCTEX_TRUE@am__objects_39 =  \
 @PDFTEX_SYNCTEX_TRUE@	synctexdir/pdftex-synctex.$(OBJEXT)
 dist_pdftex_OBJECTS = pdftexdir/pdftex-pdftexextra.$(OBJEXT) \
-	$(am__objects_35)
-am__objects_36 = pdftex-pdftexini.$(OBJEXT) pdftex-pdftex0.$(OBJEXT)
-nodist_pdftex_OBJECTS = $(am__objects_36) pdftex-pdftex-pool.$(OBJEXT)
+	$(am__objects_39)
+am__objects_40 = pdftex-pdftexini.$(OBJEXT) pdftex-pdftex0.$(OBJEXT)
+nodist_pdftex_OBJECTS = $(am__objects_40) pdftex-pdftex-pool.$(OBJEXT)
 pdftex_OBJECTS = $(dist_pdftex_OBJECTS) $(nodist_pdftex_OBJECTS)
 am__DEPENDENCIES_10 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) libmd5.a
@@ -1219,20 +1303,20 @@ nodist_pltotf_OBJECTS = pltotf.$(OBJEXT)
 pltotf_OBJECTS = $(nodist_pltotf_OBJECTS)
 pltotf_LDADD = $(LDADD)
 pltotf_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1)
-am__objects_37 = pmpost-pmp.$(OBJEXT)
-am__objects_38 = pmpost-pmpmath.$(OBJEXT)
-am__objects_39 = pmpost-pmpmathbinary.$(OBJEXT)
-am__objects_40 = pmpost-pmpmathdecimal.$(OBJEXT)
-am__objects_41 = pmpost-pmpmathdouble.$(OBJEXT)
-am__objects_42 = pmpost-pmpstrings.$(OBJEXT)
-am__objects_43 = pmpost-pmpxout.$(OBJEXT)
-am__objects_44 = pmpost-ppngout.$(OBJEXT)
-am__objects_45 = pmpost-ppsout.$(OBJEXT)
-am__objects_46 = pmpost-psvgout.$(OBJEXT)
-nodist_pmpost_OBJECTS = $(am__objects_37) $(am__objects_38) \
-	$(am__objects_39) $(am__objects_40) $(am__objects_41) \
-	pmpost-pmpost.$(OBJEXT) $(am__objects_42) $(am__objects_43) \
-	$(am__objects_44) $(am__objects_45) $(am__objects_46) \
+am__objects_41 = pmpost-pmp.$(OBJEXT)
+am__objects_42 = pmpost-pmpmath.$(OBJEXT)
+am__objects_43 = pmpost-pmpmathbinary.$(OBJEXT)
+am__objects_44 = pmpost-pmpmathdecimal.$(OBJEXT)
+am__objects_45 = pmpost-pmpmathdouble.$(OBJEXT)
+am__objects_46 = pmpost-pmpstrings.$(OBJEXT)
+am__objects_47 = pmpost-pmpxout.$(OBJEXT)
+am__objects_48 = pmpost-ppngout.$(OBJEXT)
+am__objects_49 = pmpost-ppsout.$(OBJEXT)
+am__objects_50 = pmpost-psvgout.$(OBJEXT)
+nodist_pmpost_OBJECTS = $(am__objects_41) $(am__objects_42) \
+	$(am__objects_43) $(am__objects_44) $(am__objects_45) \
+	pmpost-pmpost.$(OBJEXT) $(am__objects_46) $(am__objects_47) \
+	$(am__objects_48) $(am__objects_49) $(am__objects_50) \
 	pmpost-ptfmin.$(OBJEXT)
 pmpost_OBJECTS = $(nodist_pmpost_OBJECTS)
 pmpost_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -1250,10 +1334,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_47 = synctexdir/ptex-synctex.$(OBJEXT)
-dist_ptex_OBJECTS = ptexdir/ptex-ptexextra.$(OBJEXT) $(am__objects_47)
-am__objects_48 = ptex-ptexini.$(OBJEXT) ptex-ptex0.$(OBJEXT)
-nodist_ptex_OBJECTS = $(am__objects_48) ptex-ptex-pool.$(OBJEXT)
+@PTEX_SYNCTEX_TRUE@am__objects_51 = synctexdir/ptex-synctex.$(OBJEXT)
+dist_ptex_OBJECTS = ptexdir/ptex-ptexextra.$(OBJEXT) $(am__objects_51)
+am__objects_52 = ptex-ptexini.$(OBJEXT) ptex-ptex0.$(OBJEXT)
+nodist_ptex_OBJECTS = $(am__objects_52) ptex-ptex-pool.$(OBJEXT)
 ptex_OBJECTS = $(dist_ptex_OBJECTS) $(nodist_ptex_OBJECTS)
 @PTEX_SYNCTEX_TRUE@am__DEPENDENCIES_11 = $(am__DEPENDENCIES_1)
 am_ptftopl_OBJECTS =
@@ -1274,10 +1358,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_49 = synctexdir/tex-synctex.$(OBJEXT)
-dist_tex_OBJECTS = tex-texextra.$(OBJEXT) $(am__objects_49)
-am__objects_50 = tex-texini.$(OBJEXT) tex-tex0.$(OBJEXT)
-nodist_tex_OBJECTS = $(am__objects_50) tex-tex-pool.$(OBJEXT)
+@TEX_SYNCTEX_TRUE@am__objects_53 = synctexdir/tex-synctex.$(OBJEXT)
+dist_tex_OBJECTS = tex-texextra.$(OBJEXT) $(am__objects_53)
+am__objects_54 = tex-texini.$(OBJEXT) tex-tex0.$(OBJEXT)
+nodist_tex_OBJECTS = $(am__objects_54) 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) \
@@ -1304,21 +1388,21 @@ am_updvitype_OBJECTS =
 nodist_updvitype_OBJECTS = updvitype-updvitype.$(OBJEXT)
 updvitype_OBJECTS = $(am_updvitype_OBJECTS) \
 	$(nodist_updvitype_OBJECTS)
-am__objects_51 = upmpost-pmp.$(OBJEXT)
-am__objects_52 = upmpost-pmpmath.$(OBJEXT)
-am__objects_53 = upmpost-pmpmathbinary.$(OBJEXT)
-am__objects_54 = upmpost-pmpmathdecimal.$(OBJEXT)
-am__objects_55 = upmpost-pmpmathdouble.$(OBJEXT)
-am__objects_56 = upmpost-pmpstrings.$(OBJEXT)
-am__objects_57 = upmpost-pmpxout.$(OBJEXT)
-am__objects_58 = upmpost-ppngout.$(OBJEXT)
-am__objects_59 = upmpost-ppsout.$(OBJEXT)
-am__objects_60 = upmpost-psvgout.$(OBJEXT)
-am__objects_61 = $(am__objects_51) $(am__objects_52) $(am__objects_53) \
-	$(am__objects_54) $(am__objects_55) upmpost-pmpost.$(OBJEXT) \
-	$(am__objects_56) $(am__objects_57) $(am__objects_58) \
-	$(am__objects_59) $(am__objects_60) upmpost-ptfmin.$(OBJEXT)
-nodist_upmpost_OBJECTS = $(am__objects_61)
+am__objects_55 = upmpost-pmp.$(OBJEXT)
+am__objects_56 = upmpost-pmpmath.$(OBJEXT)
+am__objects_57 = upmpost-pmpmathbinary.$(OBJEXT)
+am__objects_58 = upmpost-pmpmathdecimal.$(OBJEXT)
+am__objects_59 = upmpost-pmpmathdouble.$(OBJEXT)
+am__objects_60 = upmpost-pmpstrings.$(OBJEXT)
+am__objects_61 = upmpost-pmpxout.$(OBJEXT)
+am__objects_62 = upmpost-ppngout.$(OBJEXT)
+am__objects_63 = upmpost-ppsout.$(OBJEXT)
+am__objects_64 = upmpost-psvgout.$(OBJEXT)
+am__objects_65 = $(am__objects_55) $(am__objects_56) $(am__objects_57) \
+	$(am__objects_58) $(am__objects_59) upmpost-pmpost.$(OBJEXT) \
+	$(am__objects_60) $(am__objects_61) $(am__objects_62) \
+	$(am__objects_63) $(am__objects_64) upmpost-ptfmin.$(OBJEXT)
+nodist_upmpost_OBJECTS = $(am__objects_65)
 upmpost_OBJECTS = $(nodist_upmpost_OBJECTS)
 am__DEPENDENCIES_15 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -1332,12 +1416,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_62 =  \
+@UPTEX_SYNCTEX_TRUE@am__objects_66 =  \
 @UPTEX_SYNCTEX_TRUE@	synctexdir/uptex-synctex.$(OBJEXT)
 dist_uptex_OBJECTS = uptexdir/uptex-uptexextra.$(OBJEXT) \
-	$(am__objects_62)
-am__objects_63 = uptex-uptexini.$(OBJEXT) uptex-uptex0.$(OBJEXT)
-nodist_uptex_OBJECTS = $(am__objects_63) uptex-uptex-pool.$(OBJEXT)
+	$(am__objects_66)
+am__objects_67 = uptex-uptexini.$(OBJEXT) uptex-uptex0.$(OBJEXT)
+nodist_uptex_OBJECTS = $(am__objects_67) uptex-uptex-pool.$(OBJEXT)
 uptex_OBJECTS = $(dist_uptex_OBJECTS) $(nodist_uptex_OBJECTS)
 @UPTEX_SYNCTEX_TRUE@am__DEPENDENCIES_16 = $(am__DEPENDENCIES_1)
 am_uptftopl_OBJECTS =
@@ -1376,12 +1460,12 @@ 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_64 =  \
+@XETEX_SYNCTEX_TRUE@am__objects_68 =  \
 @XETEX_SYNCTEX_TRUE@	synctexdir/xetex-synctex.$(OBJEXT)
 dist_xetex_OBJECTS = xetexdir/xetex-xetexextra.$(OBJEXT) \
-	$(am__objects_64)
-am__objects_65 = xetex-xetexini.$(OBJEXT) xetex-xetex0.$(OBJEXT)
-nodist_xetex_OBJECTS = $(am__objects_65) xetex-xetex-pool.$(OBJEXT)
+	$(am__objects_68)
+am__objects_69 = xetex-xetexini.$(OBJEXT) xetex-xetex0.$(OBJEXT)
+nodist_xetex_OBJECTS = $(am__objects_69) xetex-xetex-pool.$(OBJEXT)
 xetex_OBJECTS = $(dist_xetex_OBJECTS) $(nodist_xetex_OBJECTS)
 @XETEX_MACOSX_FALSE@am__DEPENDENCIES_17 = $(am__DEPENDENCIES_1)
 am__DEPENDENCIES_18 = $(libxetex) $(am__DEPENDENCIES_1) \
@@ -1471,7 +1555,9 @@ SOURCES = $(nodist_libff_a_SOURCES) $(nodist_libjitff_a_SOURCES) \
 	$(nodist_libluamisc_a_SOURCES) \
 	$(nodist_libluasocket_a_SOURCES) $(dist_libluatex_a_SOURCES) \
 	$(nodist_libluatex_a_SOURCES) $(libmd5_a_SOURCES) \
-	$(nodist_libmf_a_SOURCES) $(nodist_libmplib_a_SOURCES) \
+	$(nodist_libmf_a_SOURCES) $(dist_libmflua_a_SOURCES) \
+	$(nodist_libmflua_a_SOURCES) $(dist_libmfluajit_a_SOURCES) \
+	$(nodist_libmfluajit_a_SOURCES) $(nodist_libmplib_a_SOURCES) \
 	$(libmputil_a_SOURCES) $(libpdftex_a_SOURCES) \
 	$(EXTRA_libpdftex_a_SOURCES) $(nodist_libsynctex_a_SOURCES) \
 	$(libukanji_a_SOURCES) $(libunilib_a_SOURCES) \
@@ -1488,10 +1574,13 @@ SOURCES = $(nodist_libff_a_SOURCES) $(nodist_libjitff_a_SOURCES) \
 	$(dist_euptex_SOURCES) $(nodist_euptex_SOURCES) \
 	$(gftodvi_SOURCES) $(nodist_gftodvi_SOURCES) \
 	$(nodist_gftopk_SOURCES) $(nodist_gftype_SOURCES) \
-	$(nodist_inimf_SOURCES) $(nodist_initex_SOURCES) \
+	$(nodist_inimf_SOURCES) $(nodist_inimflua_SOURCES) \
+	$(nodist_inimfluajit_SOURCES) $(nodist_initex_SOURCES) \
 	$(nodist_luajittex_SOURCES) $(nodist_EXTRA_luajittex_SOURCES) \
 	$(nodist_luatex_SOURCES) $(nodist_EXTRA_luatex_SOURCES) \
 	$(md5main_SOURCES) $(dist_mf_SOURCES) $(dist_mf_nowin_SOURCES) \
+	$(dist_mflua_SOURCES) $(nodist_mflua_nowin_SOURCES) \
+	$(dist_mfluajit_SOURCES) $(nodist_mfluajit_nowin_SOURCES) \
 	$(nodist_mft_SOURCES) $(nodist_mpost_SOURCES) \
 	$(nodist_odvicopy_SOURCES) $(nodist_odvitype_SOURCES) \
 	$(nodist_otangle_SOURCES) $(nodist_patgen_SOURCES) \
@@ -1522,6 +1611,7 @@ SOURCES = $(nodist_libff_a_SOURCES) $(nodist_libjitff_a_SOURCES) \
 	$(nodist_xetex_SOURCES) $(nodist_EXTRA_xetex_SOURCES)
 DIST_SOURCES = $(libkanji_a_SOURCES) $(dist_libluajittex_a_SOURCES) \
 	$(dist_libluatex_a_SOURCES) $(libmd5_a_SOURCES) \
+	$(dist_libmflua_a_SOURCES) $(dist_libmfluajit_a_SOURCES) \
 	$(libmputil_a_SOURCES) $(am__libpdftex_a_SOURCES_DIST) \
 	$(EXTRA_libpdftex_a_SOURCES) $(libukanji_a_SOURCES) \
 	$(libunilib_a_SOURCES) $(am__libxetex_a_SOURCES_DIST) \
@@ -1529,6 +1619,7 @@ DIST_SOURCES = $(libkanji_a_SOURCES) $(dist_libluajittex_a_SOURCES) \
 	$(am__dist_eptex_SOURCES_DIST) $(am__dist_etex_SOURCES_DIST) \
 	$(am__dist_euptex_SOURCES_DIST) $(gftodvi_SOURCES) \
 	$(md5main_SOURCES) $(dist_mf_SOURCES) $(dist_mf_nowin_SOURCES) \
+	$(dist_mflua_SOURCES) $(dist_mfluajit_SOURCES) \
 	$(pbibtex_SOURCES) $(am__dist_pdftex_SOURCES_DIST) \
 	$(pdftosrc_SOURCES) $(pdvitype_SOURCES) $(ppltotf_SOURCES) \
 	$(am__dist_ptex_SOURCES_DIST) $(ptftopl_SOURCES) \
@@ -1743,13 +1834,13 @@ am__set_TESTS_bases = \
   bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
   bases=`echo $$bases`
 RECHECK_LOGS = $(TEST_LOGS)
-am__EXEEXT_43 = bibtex.test dvicopy.test dvitype.test gftodvi.test \
+am__EXEEXT_51 = bibtex.test dvicopy.test dvitype.test gftodvi.test \
 	gftopk.test gftype.test mft.test patgen.test pktogf.test \
 	pktype.test pltotf.test pooltype.test tftopl.test vftovp.test \
 	vptovf.test weave.test
-am__EXEEXT_44 = $(am__EXEEXT_43) tests/bibtex-openout-test.pl \
+am__EXEEXT_52 = $(am__EXEEXT_51) tests/bibtex-openout-test.pl \
 	tests/bibtex-longline-test.pl tests/bibtex-mem.test
-@WEB_TRUE@am__EXEEXT_45 = $(am__EXEEXT_44)
+@WEB_TRUE@am__EXEEXT_53 = $(am__EXEEXT_52)
 TEST_SUITE_LOG = test-suite.log
 TEST_EXTENSIONS = @EXEEXT@ .test
 LOG_DRIVER = $(SHELL) $(top_srcdir)/../../build-aux/test-driver
@@ -1785,6 +1876,8 @@ am__DIST_COMMON = $(dist_man_MANS) $(srcdir)/../../am/bin_links.am \
 	$(srcdir)/luatexdir/am/luasocket.am \
 	$(srcdir)/luatexdir/am/luatex.am \
 	$(srcdir)/luatexdir/am/txt2zlib.am \
+	$(srcdir)/mfluadir/am/mflua.am \
+	$(srcdir)/mfluajitdir/am/mfluajit.am \
 	$(srcdir)/mplibdir/am/libmplib.am \
 	$(srcdir)/mplibdir/am/libmputil.am \
 	$(srcdir)/mplibdir/am/mplib.am \
@@ -2083,13 +2176,14 @@ AM_OBJCXXFLAGS = ## $(WARNING_OBJCXXFLAGS)
 version = $(WEB2CVERSION)
 SUBDIRS = doc lib man web2c . window omegafonts otps
 proglib = lib/lib.a
-EXTRA_LIBRARIES = libmf.a libmputil.a libmplib.a libkanji.a \
-	libukanji.a libpdftex.a libluasocket.a libluajitsocket.a \
-	libluamisc.a libluajitmisc.a libunilib.a libff.a libjitff.a \
-	libluatex.a libluajittex.a libxetex.a libsynctex.a libmd5.a
+EXTRA_LIBRARIES = libmf.a libmflua.a libmfluajit.a libmputil.a \
+	libmplib.a libkanji.a libukanji.a libpdftex.a libluasocket.a \
+	libluajitsocket.a libluamisc.a libluajitmisc.a libunilib.a \
+	libff.a libjitff.a libluatex.a libluajittex.a libxetex.a \
+	libsynctex.a libmd5.a
 EXTRA_LTLIBRARIES = libsynctex.la
-lib_LIBRARIES = $(am__append_98)
-lib_LTLIBRARIES = $(am__append_97)
+lib_LIBRARIES = $(am__append_114)
+lib_LTLIBRARIES = $(am__append_113)
 dist_man_MANS = synctexdir/man1/synctex.1 synctexdir/man5/synctex.5
 nodist_man_MANS = 
 EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h \
@@ -2135,23 +2229,61 @@ EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h \
 	triptrap/trip.pl triptrap/trip.tex triptrap/trip.typ \
 	triptrap/trip1.in triptrap/trip2.in triptrap/tripin.log \
 	triptrap/tripman.tex triptrap/tripos.tex triptrap/writeo \
-	triptrap/writeo.2 mplibdir/ChangeLog $(mpost_web) $(mp_tests) \
-	pmpostdir/ChangeLog $(pmpost_web) $(pmpost_tests) \
-	$(upmpost_tests) pmpostdir/tests/psample.mp $(libmplib_web) \
-	$(etex_web_srcs) $(etex_ch_srcs) etexdir/ChangeLog \
-	etexdir/etex_gen.tex $(etex_tests) tests/wprob.tex \
-	etexdir/etrip/etrip.diffs etexdir/etrip/etrip.fot \
-	etexdir/etrip/etrip.log etexdir/etrip/etrip.out \
-	etexdir/etrip/etrip.pl etexdir/etrip/etrip.tex \
-	etexdir/etrip/etrip.typ etexdir/etrip/etrip1.in \
-	etexdir/etrip/etrip2.in etexdir/etrip/etrip3.in \
-	etexdir/etrip/etripin.log etexdir/etrip/etripman.tex \
-	etexdir/etrip/texmf.cnf etexdir/etrip/trip2.in $(ptex_tests) \
-	$(pweb_tests) $(ptex_web_srcs) $(ptex_ch_srcs) \
-	ptexdir/ptex.defines ptexdir/pbibtex.ch web2c/cvtbib.sed \
-	ptexdir/pdvitype.ch ptexdir/ppltotf.ch ptexdir/ptftopl.ch \
-	ptexdir/COPYRIGHT ptexdir/COPYRIGHT.jis ptexdir/ChangeLog \
-	ptexdir/Changes.txt ptexdir/INSTALL.txt ptexdir/README.txt \
+	triptrap/writeo.2 $(mflua_web_srcs) $(mflua_ch_src) \
+	mfluadir/mflua.defines mfluadir/ChangeLog $(mflua_tests) \
+	mfluadir/mfluatrap/begin_program.lua \
+	mfluadir/mfluatrap/do_add_to.lua \
+	mfluadir/mfluatrap/end_program.lua \
+	mfluadir/mfluatrap/fill_envelope.lua \
+	mfluadir/mfluatrap/fill_spec.lua \
+	mfluadir/mfluatrap/final_cleanup.lua \
+	mfluadir/mfluatrap/main_control.lua \
+	mfluadir/mfluatrap/make_ellipse.lua \
+	mfluadir/mfluatrap/mfluaini.lua \
+	mfluadir/mfluatrap/offset_prep.lua \
+	mfluadir/mfluatrap/print_edges.lua \
+	mfluadir/mfluatrap/print_path.lua \
+	mfluadir/mfluatrap/scan_direction.lua \
+	mfluadir/mfluatrap/skew_line_edges.lua \
+	mfluadir/mfluatrap/start_of_MF.lua \
+	mfluadir/mfluatrap/texmf.cnf \
+	mfluadir/mfluatrap/mfluatrap.diffs $(mfluajit_web_srcs) \
+	$(mfluajit_ch_src) mfluajitdir/mfluajit.defines \
+	mfluajitdir/ChangeLog $(mfluajit_tests) \
+	mfluadir/mfluatrap/begin_program.lua \
+	mfluadir/mfluatrap/do_add_to.lua \
+	mfluadir/mfluatrap/end_program.lua \
+	mfluadir/mfluatrap/fill_envelope.lua \
+	mfluadir/mfluatrap/fill_spec.lua \
+	mfluadir/mfluatrap/final_cleanup.lua \
+	mfluadir/mfluatrap/main_control.lua \
+	mfluadir/mfluatrap/make_ellipse.lua \
+	mfluadir/mfluatrap/mfluaini.lua \
+	mfluadir/mfluatrap/offset_prep.lua \
+	mfluadir/mfluatrap/print_edges.lua \
+	mfluadir/mfluatrap/print_path.lua \
+	mfluadir/mfluatrap/scan_direction.lua \
+	mfluadir/mfluatrap/skew_line_edges.lua \
+	mfluadir/mfluatrap/start_of_MF.lua \
+	mfluadir/mfluatrap/texmf.cnf \
+	mfluajitdir/mfluajittrap/mfluajittrap.diffs mplibdir/ChangeLog \
+	$(mpost_web) $(mp_tests) pmpostdir/ChangeLog $(pmpost_web) \
+	$(pmpost_tests) $(upmpost_tests) pmpostdir/tests/psample.mp \
+	$(libmplib_web) $(etex_web_srcs) $(etex_ch_srcs) \
+	etexdir/ChangeLog etexdir/etex_gen.tex $(etex_tests) \
+	tests/wprob.tex etexdir/etrip/etrip.diffs \
+	etexdir/etrip/etrip.fot etexdir/etrip/etrip.log \
+	etexdir/etrip/etrip.out etexdir/etrip/etrip.pl \
+	etexdir/etrip/etrip.tex etexdir/etrip/etrip.typ \
+	etexdir/etrip/etrip1.in etexdir/etrip/etrip2.in \
+	etexdir/etrip/etrip3.in etexdir/etrip/etripin.log \
+	etexdir/etrip/etripman.tex etexdir/etrip/texmf.cnf \
+	etexdir/etrip/trip2.in $(ptex_tests) $(pweb_tests) \
+	$(ptex_web_srcs) $(ptex_ch_srcs) ptexdir/ptex.defines \
+	ptexdir/pbibtex.ch web2c/cvtbib.sed ptexdir/pdvitype.ch \
+	ptexdir/ppltotf.ch ptexdir/ptftopl.ch ptexdir/COPYRIGHT \
+	ptexdir/COPYRIGHT.jis ptexdir/ChangeLog ptexdir/Changes.txt \
+	ptexdir/INSTALL.txt ptexdir/README.txt \
 	ptexdir/tests/nissya_bib.aux ptexdir/tests/nissya.bst \
 	ptexdir/tests/sample.bib tests/memdata1.bst tests/memdata2.bst \
 	tests/memdata3.bst ptexdir/tests/goth10.tfm \
@@ -2368,7 +2500,12 @@ DISTCLEANFILES = CXXLD.sh tangle.c tangle.h tangle.p tangle-web2c \
 	common.idx tie.outc tie.outm $(nodist_tex_SOURCES) \
 	tex-final.ch tex-web2c tex.p tex.pool tex-tangle trip.diffs \
 	write18-quote.log mftrap.diffs $(nodist_libmf_a_SOURCES) \
-	mf-final.ch mf-web2c mf.p mf.pool mf-tangle \
+	mf-final.ch mf-web2c mf.p mf.pool mf-tangle mfluatrap.diffs \
+	$(nodist_libmflua_a_SOURCES) mflua.web mflua.ch mflua-web2c \
+	mflua.p mflua.pool mflua-tangle mfluatrap.diffs \
+	mfluajittrap.diffs $(nodist_libmfluajit_a_SOURCES) \
+	mfluajit.web mfluajit.ch mfluajit-web2c mfluajit.p \
+	mfluajit.pool mfluajit-tangle mfluajittrap.diffs \
 	$(nodist_mpost_SOURCES) mpxout-tangle mptrap.diffs ptmr.mpx \
 	tests/xptmr.mpx tests/xstory.mpx $(nodist_pmpost_SOURCES) \
 	pmp.w pmpost.w pmpxout.w ppsout.w psvgout.w ptfmin.w \
@@ -2425,19 +2562,21 @@ DISTCLEANFILES = CXXLD.sh tangle.c tangle.h tangle.p tangle-web2c \
 	$(nodist_aleph_SOURCES) aleph.web aleph.ch aleph-web2c aleph.p \
 	aleph.pool aleph-tangle
 CLEANFILES = 
-TRIPTRAP_CLEAN = $(am__append_9) $(am__append_17) $(am__append_26) \
-	$(am__append_43) $(am__append_49) $(am__append_55) \
-	$(am__append_61) $(am__append_67)
-TRIPTRAP = $(am__append_8) $(am__append_16) $(am__append_25) \
-	$(am__append_42) $(am__append_48) $(am__append_54) \
-	$(am__append_60) $(am__append_66)
-bin_links = $(am__append_5) $(am__append_13) $(am__append_22) \
-	$(am__append_31) $(am__append_36) $(am__append_75) \
-	$(am__append_80)
-install_exe_links = $(am__append_20) $(am__append_29) $(am__append_34) \
-	$(am__append_73) $(am__append_78)
-uninstall_exe_links = $(am__append_21) $(am__append_30) \
-	$(am__append_35) $(am__append_74) $(am__append_79)
+TRIPTRAP_CLEAN = $(am__append_9) $(am__append_17) $(am__append_25) \
+	$(am__append_33) $(am__append_42) $(am__append_59) \
+	$(am__append_65) $(am__append_71) $(am__append_77) \
+	$(am__append_83)
+TRIPTRAP = $(am__append_8) $(am__append_16) $(am__append_24) \
+	$(am__append_32) $(am__append_41) $(am__append_58) \
+	$(am__append_64) $(am__append_70) $(am__append_76) \
+	$(am__append_82)
+bin_links = $(am__append_5) $(am__append_13) $(am__append_21) \
+	$(am__append_29) $(am__append_38) $(am__append_47) \
+	$(am__append_52) $(am__append_91) $(am__append_96)
+install_exe_links = $(am__append_36) $(am__append_45) $(am__append_50) \
+	$(am__append_89) $(am__append_94)
+uninstall_exe_links = $(am__append_37) $(am__append_46) \
+	$(am__append_51) $(am__append_90) $(am__append_95)
 NEVER_DIST = `find . $(NEVER_NAMES)` cwebdir/cweave.log \
 	cwebdir/cweave.trs ctiedir/ctie.log ctiedir/ctie.trs \
 	tiedir/tie.log tiedir/tie.trs
@@ -2545,18 +2684,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_101)
+tex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_117)
 
 # With --enable-ipc, TeX may need to link with -lsocket.
-tex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_102)
+tex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_118)
 
 # 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_104)
+dist_tex_SOURCES = texextra.c $(am__append_120)
 
 # We must create texd.h before building the tex_OBJECTS.
-tex_prereq = texd.h $(am__append_103)
+tex_prereq = texd.h $(am__append_119)
 tex_ch_srcs = \
 	tex.web \
 	tex.ch \
@@ -2600,6 +2739,67 @@ mf_ch_src = \
 # Metafont tests
 #
 mf_tests = mftraptest
+inimflua_CPPFLAGS = -DEXEPROG=\"mflua.exe\"
+nodist_inimflua_SOURCES = callexe.c
+inimflua_LDADD = 
+dist_mflua_SOURCES = mfluadir/mfluaextra.c mfluadir/mfluaextra.h mfluadir/mflua_version.h
+mflua_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS) $(LUA_INCLUDES)
+mflua_LDADD = libmflua.a $(LDADD) $(windowlib) $(mf_x_libs) $(LUA_LIBS)
+mflua_LDFLAGS = -export-dynamic
+nodist_mflua_nowin_SOURCES = $(dist_mflua_SOURCES)
+mflua_nowin_CPPFLAGS = $(mflua_CPPFLAGS) -DMFNOWIN $(LUA_INCLUDES)
+mflua_nowin_LDADD = libmflua.a $(LDADD) $(windowlib) $(LUA_LIBS)
+mflua_nowin_LDFLAGS = -export-dynamic
+
+# MFLua C sources
+mflua_c_h = mfluaini.c mflua0.c mfluacoerce.h mfluad.h
+dist_libmflua_a_SOURCES = mfluadir/mfluac.c  mfluadir/mfluac.h
+nodist_libmflua_a_SOURCES = $(mflua_c_h) mflua-pool.c
+libmflua_a_CPPFLAGS = $(AM_CPPFLAGS) $(LUA_INCLUDES)
+mflua_web_srcs = \
+	mf.web \
+	mfluadir/mf-lua.ch
+
+mflua_ch_src = \
+	mf.ch \
+	mfluadir/mflua-m.ch \
+	mf-binpool.ch
+
+
+# MFLua tests
+#
+mflua_tests = mfluadir/mfluatraptest
+inimfluajit_CPPFLAGS = -DEXEPROG=\"mfluajit.exe\"
+nodist_inimfluajit_SOURCES = callexe.c
+inimfluajit_LDADD = 
+dist_mfluajit_SOURCES = mfluajitdir/mfluajitextra.c mfluajitdir/mfluajitextra.h mfluadir/mflua_version.h
+mfluajit_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS) $(LUAJIT_INCLUDES) $(LUAJIT_DEFINES)
+mfluajit_LDADD = libmfluajit.a $(LDADD) $(windowlib) $(mf_x_libs) $(LUAJIT_LIBS)
+mfluajit_LDFLAGS = -export-dynamic $(LUAJIT_LDEXTRA)
+nodist_mfluajit_nowin_SOURCES = $(dist_mfluajit_SOURCES)
+mfluajit_nowin_CPPFLAGS = $(mfluajit_CPPFLAGS) -DMFNOWIN $(LUAJIT_INCLUDES) $(LUAJIT_DEFINES)
+mfluajit_nowin_LDADD = libmfluajit.a $(LDADD) $(windowlib) $(LUAJIT_LIBS)
+mfluajit_nowin_LDFLAGS = -export-dynamic $(LUAJIT_LDEXTRA)
+
+# MFLua C sources
+mfluajit_c_h = mfluajitini.c mfluajit0.c mfluajitcoerce.h mfluajitd.h
+dist_libmfluajit_a_SOURCES = mfluadir/mfluac.c  mfluadir/mfluac.h
+nodist_libmfluajit_a_SOURCES = $(mfluajit_c_h) mfluajit-pool.c
+libmfluajit_a_CPPFLAGS = $(AM_CPPFLAGS) $(LUAJIT_INCLUDES) -DJIT
+mfluajit_web_srcs = \
+	mf.web \
+	mfluadir/mf-lua.ch \
+	mfluajitdir/mf-luajit.ch
+
+mfluajit_ch_src = \
+	mf.ch \
+	mfluadir/mflua-m.ch \
+	mf-binpool.ch
+
+
+# MFLua tests
+#
+mfluajit_tests = mfluajitdir/mfluajittraptest
 mpost_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) -I$(srcdir)/mplibdir
 mpost_LDADD = libmplib.a $(KPATHSEA_LIBS) $(MPFR_LIBS) $(GMP_LIBS) \
 	$(CAIRO_LIBS) $(PIXMAN_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS) libmputil.a
@@ -2686,19 +2886,19 @@ libmplib_web = mplibdir/mp.w mplibdir/psout.w mplibdir/svgout.w \
 	mplibdir/pngout.w mplibdir/mpmath.w mplibdir/mpmathbinary.w \
 	mplibdir/mpmathdecimal.w mplibdir/mpmathdouble.w \
 	mplibdir/mpstrings.w mplibdir/tfmin.w
-etex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_105)
+etex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_121)
 
 # With --enable-ipc, e-TeX may need to link with -lsocket.
-etex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_106)
+etex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_122)
 
 # 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_108)
+	etexdir/etex_version.h $(am__append_124)
 
 # 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_107)
+etex_prereq = etexd.h etexdir/etex_version.h $(am__append_123)
 etex_web_srcs = \
 	tex.web \
 	etexdir/etex.ch
@@ -2733,20 +2933,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_109)
+ptex_CPPFLAGS = $(ptex_cppflags) $(am__append_125)
 
 # With --enable-ipc, pTeX may need to link with -lsocket.
-ptex_LDADD = $(ptex_ldadd) $(ipc_socketlibs) $(am__append_110)
+ptex_LDADD = $(ptex_ldadd) $(ipc_socketlibs) $(am__append_126)
 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_112)
+	ptexdir/ptex_version.h $(am__append_128)
 
 # 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_111)
+ptex_prereq = ptexd.h ptexdir/ptex_version.h $(am__append_127)
 ptex_web_srcs = \
 	tex.web \
 	tex.ch
@@ -2780,22 +2980,22 @@ ptftopl_DEPENDENCIES = $(ptex_dependencies)
 # e-pTeX Tests
 #
 eptex_tests = eptexdir/eptriptest
-eptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) $(am__append_117)
+eptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) $(am__append_133)
 
 # With --enable-ipc, e-pTeX may need to link with -lsocket.
 eptex_LDADD = libkanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD) \
-	$(ipc_socketlibs) $(am__append_118)
+	$(ipc_socketlibs) $(am__append_134)
 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_120)
+	eptexdir/eptex_version.h $(am__append_136)
 
 # 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_119)
+	eptexdir/eptex_version.h $(am__append_135)
 eptex_web_srcs = \
 	tex.web \
 	etexdir/etex.ch \
@@ -2827,21 +3027,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_113)
+uptex_CPPFLAGS = $(uptex_cppflags) $(am__append_129)
 
 # With --enable-ipc, upTeX may need to link with -lsocket.
-uptex_LDADD = $(uptex_ldadd) $(ipc_socketlibs) $(am__append_114)
+uptex_LDADD = $(uptex_ldadd) $(ipc_socketlibs) $(am__append_130)
 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_116)
+	uptexdir/uptex_version.h $(am__append_132)
 
 # 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_115)
+	uptexdir/uptex_version.h $(am__append_131)
 uptex_web_srcs = \
 	tex.web \
 	tex.ch
@@ -2876,23 +3076,23 @@ uptftopl_DEPENDENCIES = $(uptex_dependencies)
 # e-upTeX Tests
 #
 euptex_tests = euptexdir/euptriptest
-euptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) $(am__append_121)
+euptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) $(am__append_137)
 
 # With --enable-ipc, e-upTeX may need to link with -lsocket.
 euptex_LDADD = libukanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD) \
-	$(ipc_socketlibs) $(am__append_122)
+	$(ipc_socketlibs) $(am__append_138)
 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_124)
+	$(am__append_140)
 
 # 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_123)
+	uptexdir/uptex_version.h $(am__append_139)
 euptex_web_srcs = \
 	tex.web \
 	etexdir/etex.ch \
@@ -2928,7 +3128,7 @@ libpdftex_a_SOURCES = pdftexdir/avl.c pdftexdir/avl.h \
 	pdftexdir/writejbig2.c pdftexdir/writejpg.c \
 	pdftexdir/writepng.c pdftexdir/writet1.c pdftexdir/writet3.c \
 	pdftexdir/writettf.c pdftexdir/writettf.h pdftexdir/writezip.c \
-	$(am__append_68)
+	$(am__append_84)
 @MINGW32_TRUE@REGEX_INCLUDES = -I$(srcdir)/pdftexdir/regex
 EXTRA_libpdftex_a_SOURCES = pdftexdir/macnames.c \
 	pdftexdir/regex/regcomp.c pdftexdir/regex/regex_internal.c \
@@ -2944,7 +3144,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_125)
+pdftex_CPPFLAGS = $(pdftex_cppflags) $(am__append_141)
 pdftex_CXXFLAGS = $(WARNING_CXXFLAGS)
 
 # With --enable-ipc, pdfTeX may need to link with -lsocket.
@@ -2957,7 +3157,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_126)
+	$(am__append_142)
 pdftex_ch_srcs = \
 	pdftexdir/pdftex.web \
 	pdftexdir/tex.ch0 \
@@ -3393,16 +3593,16 @@ libxetex = libxetex.a
 xetex_cppflags = $(AM_CPPFLAGS) -I$(srcdir)/xetexdir $(ICU_INCLUDES) \
 	$(FREETYPE2_INCLUDES) $(TECKIT_INCLUDES) $(HARFBUZZ_INCLUDES) \
 	$(GRAPHITE2_INCLUDES) $(POPPLER_INCLUDES) $(LIBPNG_INCLUDES) \
-	$(ZLIB_INCLUDES) $(am__append_85) $(am__append_86)
+	$(ZLIB_INCLUDES) $(am__append_101) $(am__append_102)
 xetex_ldadd = $(libxetex) $(HARFBUZZ_LIBS) $(GRAPHITE2_LIBS) \
 	$(ICU_LIBS) $(TECKIT_LIBS) $(POPPLER_LIBS) $(LIBPNG_LIBS) \
-	$(FREETYPE2_LIBS) $(ZLIB_LIBS) $(am__append_87)
+	$(FREETYPE2_LIBS) $(ZLIB_LIBS) $(am__append_103)
 xetex_dependencies = $(proglib) $(KPATHSEA_DEPEND) $(ICU_DEPEND) \
 	$(TECKIT_DEPEND) $(HARFBUZZ_DEPEND) $(GRAPHITE2_DEPEND) \
 	$(POPPLER_DEPEND) $(LIBPNG_DEPEND) $(FREETYPE2_DEPEND) \
 	$(ZLIB_DEPEND)
 @XETEX_MACOSX_TRUE@xetex_LDFLAGS = -framework ApplicationServices -framework Cocoa
-xetex_CPPFLAGS = $(xetex_cppflags) $(am__append_127)
+xetex_CPPFLAGS = $(xetex_cppflags) $(am__append_143)
 xetex_CFLAGS = # $(WARNING_CFLAGS)
 xetex_CXXFLAGS = # $(WARNING_CXXFLAGS)
 xetex_LDADD = $(xetex_ldadd) $(LDADD) $(ipc_socketlibs)
@@ -3413,7 +3613,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_128)
+	$(am__append_144)
 xetex_ch_srcs = \
 	xetexdir/xetex.web \
 	xetexdir/tex.ch0 \
@@ -3440,7 +3640,7 @@ libxetex_a_SOURCES = xetexdir/MathTable.h xetexdir/XeTeXFontInst.cpp \
 	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_88) $(am__append_89)
+	xetexdir/image/pngimage.h $(am__append_104) $(am__append_105)
 
 # We must create xetexd.h etc. before building the libxetex_a_OBJECTS.
 libxetex_prereq = xetexd.h $(xetex_dependencies)
@@ -3544,12 +3744,12 @@ synctex_SOURCES = \
 	synctexdir/synctex_main.c
 
 synctex_CPPFLAGS = -I$(srcdir)/synctexdir
-synctex_LDADD = $(libsynctex) $(ZLIB_LIBS) $(am__append_99)
+synctex_LDADD = $(libsynctex) $(ZLIB_LIBS) $(am__append_115)
 libsynctex = $(LTLIBSYNCTEX) $(LIBSYNCTEX)
 libsynctex_la_CPPFLAGS = -I$(srcdir)/synctexdir $(ZLIB_INCLUDES) -DSYNCTEX_USE_LOCAL_HEADER
 libsynctex_a_CPPFLAGS = $(libsynctex_la_CPPFLAGS)
 libsynctex_la_LDFLAGS = -rpath @libdir@ -bindir @bindir@ -no-undefined -version-info $(SYNCTEX_LT_VERSINFO)
-libsynctex_la_LIBADD = $(ZLIB_LIBS) $(am__append_100)
+libsynctex_la_LIBADD = $(ZLIB_LIBS) $(am__append_116)
 libsynctex_la_SOURCES = \
 	synctexdir/synctex_parser.c \
 	synctexdir/synctex_parser_local.h \
@@ -3663,7 +3863,7 @@ all: ff-config.h
 .SUFFIXES: .c .cc .cin .cpp .cxx .h .hin .lo .log .mm .o .obj .p .pin .test .test$(EXEEXT) .trs
 am--refresh: Makefile
 	@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/dist_hook.am $(srcdir)/am/bootstrap.am $(srcdir)/am/web.am $(srcdir)/am/cweb.am $(srcdir)/am/texmf.am $(srcdir)/mplibdir/am/mplib.am $(srcdir)/pmpostdir/am/pmpost.am $(srcdir)/mplibdir/am/libmputil.am $(srcdir)/mplibdir/am/libmplib.am $(srcdir)/etexdir/am/etex.am $(srcdir)/ptexdir/am/ptex.am $(srcdir)/eptexdir/am/eptex.am $(srcdir)/uptexdir/am/uptex.am $(srcdir)/euptexdir/am/euptex.am $(srcdir)/pdftexdir/am/libpdftex.am $(srcdir)/pdftexdir/am/pdftex.am $(srcdir)/pdftexdir/am/ttf2afm.am $(srcdir)/pdftexdir/am/pdftosrc.am $(srcdir)/luatexdir/am/luasocket.am $(srcdir)/luatexdir/am/luamisc.am $(srcdir)/luatexdir/am/libunilib.am $(srcdir)/luatexdir/am/luafontforge.am $(srcdir)/luatexdir/am/libluatex.am $(srcdir)/luatexdir/am/luatex.am $(srcdir)/luatexdir/am/txt2zlib.am $(srcdir)/xetexdir/am/xetex.am $(srcdir)/omegaware/am/omegaware.am $(srcdir)/alephdir/am/aleph.am $(srcdir)/synctexdir/am/synctex.am $(srcdir)/libmd5/am/md5.am $(srcdir)/../../am/bin_links.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/dist_hook.am $(srcdir)/am/bootstrap.am $(srcdir)/am/web.am $(srcdir)/am/cweb.am $(srcdir)/am/texmf.am $(srcdir)/mfluadir/am/mflua.am $(srcdir)/mfluajitdir/am/mfluajit.am $(srcdir)/mplibdir/am/mplib.am $(srcdir)/pmpostdir/am/pmpost.am $(srcdir)/mplibdir/am/libmputil.am $(srcdir)/mplibdir/am/libmplib.am $(srcdir)/etexdir/am/etex.am $(srcdir)/ptexdir/am/ptex.am $(srcdir)/eptexdir/am/eptex.am $(srcdir)/uptexdir/am/uptex.am $(srcdir)/euptexdir/am/euptex.am $(srcdir)/pdftexdir/am/libpdftex.am $(srcdir)/pdftexdir/am/pdftex.am $(srcdir)/pdftexdir/am/ttf2afm.am $(srcdir)/pdftexdir/am/pdftosrc.am $(srcdir)/luatexdir/am/luasocket.am $(srcdir)/luatexdir/am/luamisc.am $(srcdir)/luatexdir/am/libunilib.am $(srcdir)/luatexdir/am/luafontforge.am $(srcdir)/luatexdir/am/libluatex.am $(srcdir)/luatexdir/am/luatex.am $(srcdir)/luatexdir/am/txt2zlib.am $(srcdir)/xetexdir/am/xetex.am $(srcdir)/omegaware/am/omegaware.am $(srcdir)/alephdir/am/aleph.am $(srcdir)/synctexdir/am/synctex.am $(srcdir)/libmd5/am/md5.am $(srcdir)/../../am/bin_links.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -3685,7 +3885,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
 	esac;
-$(srcdir)/../../am/dist_hook.am $(srcdir)/am/bootstrap.am $(srcdir)/am/web.am $(srcdir)/am/cweb.am $(srcdir)/am/texmf.am $(srcdir)/mplibdir/am/mplib.am $(srcdir)/pmpostdir/am/pmpost.am $(srcdir)/mplibdir/am/libmputil.am $(srcdir)/mplibdir/am/libmplib.am $(srcdir)/etexdir/am/etex.am $(srcdir)/ptexdir/am/ptex.am $(srcdir)/eptexdir/am/eptex.am $(srcdir)/uptexdir/am/uptex.am $(srcdir)/euptexdir/am/euptex.am $(srcdir)/pdftexdir/am/libpdftex.am $(srcdir)/pdftexdir/am/pdftex.am $(srcdir)/pdftexdir/am/ttf2afm.am $(srcdir)/pdftexdir/am/pdftosrc.am $(srcdir)/luatexdir/am/luasocket.am $(srcdir)/luatexdir/am/luamisc.am $(srcdir)/luatexdir/am/libunilib.am $(srcdir)/luatexdir/am/luafontforge.am $(srcdir)/luatexdir/am/libluatex.am $(srcdir)/luatexdir/am/luatex.am $(srcdir)/luatexdir/am/txt2zlib.am $(srcdir)/xetexdir/am/xetex.am $(srcdir)/omegaware/am/omegaware.am $(srcdir)/alephdir/am/aleph.am $(srcdir)/synctexdir/am/synctex.am $(srcdir)/libmd5/am/md5.am $(srcdir)/../../am/bin_links.am $(am__empty):
+$(srcdir)/../../am/dist_hook.am $(srcdir)/am/bootstrap.am $(srcdir)/am/web.am $(srcdir)/am/cweb.am $(srcdir)/am/texmf.am $(srcdir)/mfluadir/am/mflua.am $(srcdir)/mfluajitdir/am/mfluajit.am $(srcdir)/mplibdir/am/mplib.am $(srcdir)/pmpostdir/am/pmpost.am $(srcdir)/mplibdir/am/libmputil.am $(srcdir)/mplibdir/am/libmplib.am $(srcdir)/etexdir/am/etex.am $(srcdir)/ptexdir/am/ptex.am $(srcdir)/eptexdir/am/eptex.am $(srcdir)/uptexdir/am/uptex.am $(srcdir)/euptexdir/am/euptex.am $(srcdir)/pdftexdir/am/libpdftex.am $(srcdir)/pdftexdir/am/pdftex.am $(srcdir)/pdftexdir/am/ttf2afm.am $(srcdir)/pdftexdir/am/pdftosrc.am $(srcdir)/luatexdir/am/luasocket.am $(srcdir)/luatexdir/am/luamisc.am $(srcdir)/luatexdir/am/libunilib.am $(srcdir)/luatexdir/am/luafontforge.am $(srcdir)/luatexdir/am/libluatex.am $(srcdir)/luatexdir/am/luatex.am $(srcdir)/luatexdir/am/txt2zlib.am $(srcdir)/xetexdir/am/xetex.am $(srcdir)/omegaware/am/omegaware.am $(srcdir)/alephdir/am/aleph.am $(srcdir)/synctexdir/am/synctex.am $(srcdir)/libmd5/am/md5.am $(srcdir)/../../am/bin_links.am $(am__empty):
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
@@ -4477,6 +4677,26 @@ libmf.a: $(libmf_a_OBJECTS) $(libmf_a_DEPENDENCIES) $(EXTRA_libmf_a_DEPENDENCIES
 	$(AM_V_at)-rm -f libmf.a
 	$(AM_V_AR)$(libmf_a_AR) libmf.a $(libmf_a_OBJECTS) $(libmf_a_LIBADD)
 	$(AM_V_at)$(RANLIB) libmf.a
+mfluadir/$(am__dirstamp):
+	@$(MKDIR_P) mfluadir
+	@: > mfluadir/$(am__dirstamp)
+mfluadir/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) mfluadir/$(DEPDIR)
+	@: > mfluadir/$(DEPDIR)/$(am__dirstamp)
+mfluadir/libmflua_a-mfluac.$(OBJEXT): mfluadir/$(am__dirstamp) \
+	mfluadir/$(DEPDIR)/$(am__dirstamp)
+
+libmflua.a: $(libmflua_a_OBJECTS) $(libmflua_a_DEPENDENCIES) $(EXTRA_libmflua_a_DEPENDENCIES) 
+	$(AM_V_at)-rm -f libmflua.a
+	$(AM_V_AR)$(libmflua_a_AR) libmflua.a $(libmflua_a_OBJECTS) $(libmflua_a_LIBADD)
+	$(AM_V_at)$(RANLIB) libmflua.a
+mfluadir/libmfluajit_a-mfluac.$(OBJEXT): mfluadir/$(am__dirstamp) \
+	mfluadir/$(DEPDIR)/$(am__dirstamp)
+
+libmfluajit.a: $(libmfluajit_a_OBJECTS) $(libmfluajit_a_DEPENDENCIES) $(EXTRA_libmfluajit_a_DEPENDENCIES) 
+	$(AM_V_at)-rm -f libmfluajit.a
+	$(AM_V_AR)$(libmfluajit_a_AR) libmfluajit.a $(libmfluajit_a_OBJECTS) $(libmfluajit_a_LIBADD)
+	$(AM_V_at)$(RANLIB) libmfluajit.a
 
 libmplib.a: $(libmplib_a_OBJECTS) $(libmplib_a_DEPENDENCIES) $(EXTRA_libmplib_a_DEPENDENCIES) 
 	$(AM_V_at)-rm -f libmplib.a
@@ -4929,6 +5149,14 @@ inimf$(EXEEXT): $(inimf_OBJECTS) $(inimf_DEPENDENCIES) $(EXTRA_inimf_DEPENDENCIE
 	@rm -f inimf$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(inimf_OBJECTS) $(inimf_LDADD) $(LIBS)
 
+inimflua$(EXEEXT): $(inimflua_OBJECTS) $(inimflua_DEPENDENCIES) $(EXTRA_inimflua_DEPENDENCIES) 
+	@rm -f inimflua$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(inimflua_OBJECTS) $(inimflua_LDADD) $(LIBS)
+
+inimfluajit$(EXEEXT): $(inimfluajit_OBJECTS) $(inimfluajit_DEPENDENCIES) $(EXTRA_inimfluajit_DEPENDENCIES) 
+	@rm -f inimfluajit$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(inimfluajit_OBJECTS) $(inimfluajit_LDADD) $(LIBS)
+
 initex$(EXEEXT): $(initex_OBJECTS) $(initex_DEPENDENCIES) $(EXTRA_initex_DEPENDENCIES) 
 	@rm -f initex$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(initex_OBJECTS) $(initex_LDADD) $(LIBS)
@@ -4968,6 +5196,38 @@ mf$(EXEEXT): $(mf_OBJECTS) $(mf_DEPENDENCIES) $(EXTRA_mf_DEPENDENCIES)
 mf-nowin$(EXEEXT): $(mf_nowin_OBJECTS) $(mf_nowin_DEPENDENCIES) $(EXTRA_mf_nowin_DEPENDENCIES) 
 	@rm -f mf-nowin$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(mf_nowin_OBJECTS) $(mf_nowin_LDADD) $(LIBS)
+mfluadir/mflua-mfluaextra.$(OBJEXT): mfluadir/$(am__dirstamp) \
+	mfluadir/$(DEPDIR)/$(am__dirstamp)
+
+mflua$(EXEEXT): $(mflua_OBJECTS) $(mflua_DEPENDENCIES) $(EXTRA_mflua_DEPENDENCIES) 
+	@rm -f mflua$(EXEEXT)
+	$(AM_V_CCLD)$(mflua_LINK) $(mflua_OBJECTS) $(mflua_LDADD) $(LIBS)
+mfluadir/mflua_nowin-mfluaextra.$(OBJEXT): mfluadir/$(am__dirstamp) \
+	mfluadir/$(DEPDIR)/$(am__dirstamp)
+
+mflua-nowin$(EXEEXT): $(mflua_nowin_OBJECTS) $(mflua_nowin_DEPENDENCIES) $(EXTRA_mflua_nowin_DEPENDENCIES) 
+	@rm -f mflua-nowin$(EXEEXT)
+	$(AM_V_CCLD)$(mflua_nowin_LINK) $(mflua_nowin_OBJECTS) $(mflua_nowin_LDADD) $(LIBS)
+mfluajitdir/$(am__dirstamp):
+	@$(MKDIR_P) mfluajitdir
+	@: > mfluajitdir/$(am__dirstamp)
+mfluajitdir/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) mfluajitdir/$(DEPDIR)
+	@: > mfluajitdir/$(DEPDIR)/$(am__dirstamp)
+mfluajitdir/mfluajit-mfluajitextra.$(OBJEXT):  \
+	mfluajitdir/$(am__dirstamp) \
+	mfluajitdir/$(DEPDIR)/$(am__dirstamp)
+
+mfluajit$(EXEEXT): $(mfluajit_OBJECTS) $(mfluajit_DEPENDENCIES) $(EXTRA_mfluajit_DEPENDENCIES) 
+	@rm -f mfluajit$(EXEEXT)
+	$(AM_V_CCLD)$(mfluajit_LINK) $(mfluajit_OBJECTS) $(mfluajit_LDADD) $(LIBS)
+mfluajitdir/mfluajit_nowin-mfluajitextra.$(OBJEXT):  \
+	mfluajitdir/$(am__dirstamp) \
+	mfluajitdir/$(DEPDIR)/$(am__dirstamp)
+
+mfluajit-nowin$(EXEEXT): $(mfluajit_nowin_OBJECTS) $(mfluajit_nowin_DEPENDENCIES) $(EXTRA_mfluajit_nowin_DEPENDENCIES) 
+	@rm -f mfluajit-nowin$(EXEEXT)
+	$(AM_V_CCLD)$(mfluajit_nowin_LINK) $(mfluajit_nowin_OBJECTS) $(mfluajit_nowin_LDADD) $(LIBS)
 
 mft$(EXEEXT): $(mft_OBJECTS) $(mft_DEPENDENCIES) $(EXTRA_mft_DEPENDENCIES) 
 	@rm -f mft$(EXEEXT)
@@ -5177,6 +5437,8 @@ mostlyclean-compile:
 	-rm -f luatexdir/slnunicode/*.$(OBJEXT)
 	-rm -f luatexdir/unilib/*.$(OBJEXT)
 	-rm -f luatexdir/utils/*.$(OBJEXT)
+	-rm -f mfluadir/*.$(OBJEXT)
+	-rm -f mfluajitdir/*.$(OBJEXT)
 	-rm -f mplibdir/*.$(OBJEXT)
 	-rm -f pdftexdir/*.$(OBJEXT)
 	-rm -f pdftexdir/regex/*.$(OBJEXT)
@@ -5220,6 +5482,8 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gftopk.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gftype.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inimf-callexe.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inimflua-callexe.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inimfluajit-callexe.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/initex-callexe.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluajittex_a-align.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluajittex_a-arithmetic.Po@am__quote@
@@ -5415,6 +5679,12 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-writettf.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-writetype0.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-writetype2.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmflua_a-mflua-pool.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmflua_a-mflua0.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmflua_a-mfluaini.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmfluajit_a-mfluajit-pool.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmfluajit_a-mfluajit0.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmfluajit_a-mfluajitini.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-mpmathbinary.Po@am__quote@
@@ -5712,6 +5982,12 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@luatexdir/unilib/$(DEPDIR)/libunilib_a-utype.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@luatexdir/utils/$(DEPDIR)/libluajittex_a-avl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@luatexdir/utils/$(DEPDIR)/libluatex_a-avl.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@mfluadir/$(DEPDIR)/libmflua_a-mfluac.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@mfluadir/$(DEPDIR)/libmfluajit_a-mfluac.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@mfluadir/$(DEPDIR)/mflua-mfluaextra.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@mfluadir/$(DEPDIR)/mflua_nowin-mfluaextra.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@mfluajitdir/$(DEPDIR)/mfluajit-mfluajitextra.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@mfluajitdir/$(DEPDIR)/mfluajit_nowin-mfluajitextra.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@mplibdir/$(DEPDIR)/libmputil_a-avl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@mplibdir/$(DEPDIR)/libmputil_a-decContext.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@mplibdir/$(DEPDIR)/libmputil_a-decNumber.Po@am__quote@
@@ -11102,6 +11378,118 @@ libmd5/libmd5_a-md5.obj: libmd5/md5.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmd5_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmd5/libmd5_a-md5.obj `if test -f 'libmd5/md5.c'; then $(CYGPATH_W) 'libmd5/md5.c'; else $(CYGPATH_W) '$(srcdir)/libmd5/md5.c'; fi`
 
+mfluadir/libmflua_a-mfluac.o: mfluadir/mfluac.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmflua_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mfluadir/libmflua_a-mfluac.o -MD -MP -MF mfluadir/$(DEPDIR)/libmflua_a-mfluac.Tpo -c -o mfluadir/libmflua_a-mfluac.o `test -f 'mfluadir/mfluac.c' || echo '$(srcdir)/'`mfluadir/mfluac.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) mfluadir/$(DEPDIR)/libmflua_a-mfluac.Tpo mfluadir/$(DEPDIR)/libmflua_a-mfluac.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='mfluadir/mfluac.c' object='mfluadir/libmflua_a-mfluac.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) $(libmflua_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mfluadir/libmflua_a-mfluac.o `test -f 'mfluadir/mfluac.c' || echo '$(srcdir)/'`mfluadir/mfluac.c
+
+mfluadir/libmflua_a-mfluac.obj: mfluadir/mfluac.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmflua_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mfluadir/libmflua_a-mfluac.obj -MD -MP -MF mfluadir/$(DEPDIR)/libmflua_a-mfluac.Tpo -c -o mfluadir/libmflua_a-mfluac.obj `if test -f 'mfluadir/mfluac.c'; then $(CYGPATH_W) 'mfluadir/mfluac.c'; else $(CYGPATH_W) '$(srcdir)/mfluadir/mfluac.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) mfluadir/$(DEPDIR)/libmflua_a-mfluac.Tpo mfluadir/$(DEPDIR)/libmflua_a-mfluac.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='mfluadir/mfluac.c' object='mfluadir/libmflua_a-mfluac.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) $(libmflua_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mfluadir/libmflua_a-mfluac.obj `if test -f 'mfluadir/mfluac.c'; then $(CYGPATH_W) 'mfluadir/mfluac.c'; else $(CYGPATH_W) '$(srcdir)/mfluadir/mfluac.c'; fi`
+
+libmflua_a-mfluaini.o: mfluaini.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmflua_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmflua_a-mfluaini.o -MD -MP -MF $(DEPDIR)/libmflua_a-mfluaini.Tpo -c -o libmflua_a-mfluaini.o `test -f 'mfluaini.c' || echo '$(srcdir)/'`mfluaini.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmflua_a-mfluaini.Tpo $(DEPDIR)/libmflua_a-mfluaini.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='mfluaini.c' object='libmflua_a-mfluaini.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) $(libmflua_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmflua_a-mfluaini.o `test -f 'mfluaini.c' || echo '$(srcdir)/'`mfluaini.c
+
+libmflua_a-mfluaini.obj: mfluaini.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmflua_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmflua_a-mfluaini.obj -MD -MP -MF $(DEPDIR)/libmflua_a-mfluaini.Tpo -c -o libmflua_a-mfluaini.obj `if test -f 'mfluaini.c'; then $(CYGPATH_W) 'mfluaini.c'; else $(CYGPATH_W) '$(srcdir)/mfluaini.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmflua_a-mfluaini.Tpo $(DEPDIR)/libmflua_a-mfluaini.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='mfluaini.c' object='libmflua_a-mfluaini.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) $(libmflua_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmflua_a-mfluaini.obj `if test -f 'mfluaini.c'; then $(CYGPATH_W) 'mfluaini.c'; else $(CYGPATH_W) '$(srcdir)/mfluaini.c'; fi`
+
+libmflua_a-mflua0.o: mflua0.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmflua_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmflua_a-mflua0.o -MD -MP -MF $(DEPDIR)/libmflua_a-mflua0.Tpo -c -o libmflua_a-mflua0.o `test -f 'mflua0.c' || echo '$(srcdir)/'`mflua0.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmflua_a-mflua0.Tpo $(DEPDIR)/libmflua_a-mflua0.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='mflua0.c' object='libmflua_a-mflua0.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) $(libmflua_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmflua_a-mflua0.o `test -f 'mflua0.c' || echo '$(srcdir)/'`mflua0.c
+
+libmflua_a-mflua0.obj: mflua0.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmflua_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmflua_a-mflua0.obj -MD -MP -MF $(DEPDIR)/libmflua_a-mflua0.Tpo -c -o libmflua_a-mflua0.obj `if test -f 'mflua0.c'; then $(CYGPATH_W) 'mflua0.c'; else $(CYGPATH_W) '$(srcdir)/mflua0.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmflua_a-mflua0.Tpo $(DEPDIR)/libmflua_a-mflua0.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='mflua0.c' object='libmflua_a-mflua0.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) $(libmflua_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmflua_a-mflua0.obj `if test -f 'mflua0.c'; then $(CYGPATH_W) 'mflua0.c'; else $(CYGPATH_W) '$(srcdir)/mflua0.c'; fi`
+
+libmflua_a-mflua-pool.o: mflua-pool.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmflua_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmflua_a-mflua-pool.o -MD -MP -MF $(DEPDIR)/libmflua_a-mflua-pool.Tpo -c -o libmflua_a-mflua-pool.o `test -f 'mflua-pool.c' || echo '$(srcdir)/'`mflua-pool.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmflua_a-mflua-pool.Tpo $(DEPDIR)/libmflua_a-mflua-pool.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='mflua-pool.c' object='libmflua_a-mflua-pool.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) $(libmflua_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmflua_a-mflua-pool.o `test -f 'mflua-pool.c' || echo '$(srcdir)/'`mflua-pool.c
+
+libmflua_a-mflua-pool.obj: mflua-pool.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmflua_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmflua_a-mflua-pool.obj -MD -MP -MF $(DEPDIR)/libmflua_a-mflua-pool.Tpo -c -o libmflua_a-mflua-pool.obj `if test -f 'mflua-pool.c'; then $(CYGPATH_W) 'mflua-pool.c'; else $(CYGPATH_W) '$(srcdir)/mflua-pool.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmflua_a-mflua-pool.Tpo $(DEPDIR)/libmflua_a-mflua-pool.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='mflua-pool.c' object='libmflua_a-mflua-pool.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) $(libmflua_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmflua_a-mflua-pool.obj `if test -f 'mflua-pool.c'; then $(CYGPATH_W) 'mflua-pool.c'; else $(CYGPATH_W) '$(srcdir)/mflua-pool.c'; fi`
+
+mfluadir/libmfluajit_a-mfluac.o: mfluadir/mfluac.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmfluajit_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mfluadir/libmfluajit_a-mfluac.o -MD -MP -MF mfluadir/$(DEPDIR)/libmfluajit_a-mfluac.Tpo -c -o mfluadir/libmfluajit_a-mfluac.o `test -f 'mfluadir/mfluac.c' || echo '$(srcdir)/'`mfluadir/mfluac.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) mfluadir/$(DEPDIR)/libmfluajit_a-mfluac.Tpo mfluadir/$(DEPDIR)/libmfluajit_a-mfluac.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='mfluadir/mfluac.c' object='mfluadir/libmfluajit_a-mfluac.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) $(libmfluajit_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mfluadir/libmfluajit_a-mfluac.o `test -f 'mfluadir/mfluac.c' || echo '$(srcdir)/'`mfluadir/mfluac.c
+
+mfluadir/libmfluajit_a-mfluac.obj: mfluadir/mfluac.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmfluajit_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mfluadir/libmfluajit_a-mfluac.obj -MD -MP -MF mfluadir/$(DEPDIR)/libmfluajit_a-mfluac.Tpo -c -o mfluadir/libmfluajit_a-mfluac.obj `if test -f 'mfluadir/mfluac.c'; then $(CYGPATH_W) 'mfluadir/mfluac.c'; else $(CYGPATH_W) '$(srcdir)/mfluadir/mfluac.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) mfluadir/$(DEPDIR)/libmfluajit_a-mfluac.Tpo mfluadir/$(DEPDIR)/libmfluajit_a-mfluac.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='mfluadir/mfluac.c' object='mfluadir/libmfluajit_a-mfluac.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) $(libmfluajit_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mfluadir/libmfluajit_a-mfluac.obj `if test -f 'mfluadir/mfluac.c'; then $(CYGPATH_W) 'mfluadir/mfluac.c'; else $(CYGPATH_W) '$(srcdir)/mfluadir/mfluac.c'; fi`
+
+libmfluajit_a-mfluajitini.o: mfluajitini.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmfluajit_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmfluajit_a-mfluajitini.o -MD -MP -MF $(DEPDIR)/libmfluajit_a-mfluajitini.Tpo -c -o libmfluajit_a-mfluajitini.o `test -f 'mfluajitini.c' || echo '$(srcdir)/'`mfluajitini.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmfluajit_a-mfluajitini.Tpo $(DEPDIR)/libmfluajit_a-mfluajitini.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='mfluajitini.c' object='libmfluajit_a-mfluajitini.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) $(libmfluajit_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmfluajit_a-mfluajitini.o `test -f 'mfluajitini.c' || echo '$(srcdir)/'`mfluajitini.c
+
+libmfluajit_a-mfluajitini.obj: mfluajitini.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmfluajit_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmfluajit_a-mfluajitini.obj -MD -MP -MF $(DEPDIR)/libmfluajit_a-mfluajitini.Tpo -c -o libmfluajit_a-mfluajitini.obj `if test -f 'mfluajitini.c'; then $(CYGPATH_W) 'mfluajitini.c'; else $(CYGPATH_W) '$(srcdir)/mfluajitini.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmfluajit_a-mfluajitini.Tpo $(DEPDIR)/libmfluajit_a-mfluajitini.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='mfluajitini.c' object='libmfluajit_a-mfluajitini.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) $(libmfluajit_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmfluajit_a-mfluajitini.obj `if test -f 'mfluajitini.c'; then $(CYGPATH_W) 'mfluajitini.c'; else $(CYGPATH_W) '$(srcdir)/mfluajitini.c'; fi`
+
+libmfluajit_a-mfluajit0.o: mfluajit0.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmfluajit_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmfluajit_a-mfluajit0.o -MD -MP -MF $(DEPDIR)/libmfluajit_a-mfluajit0.Tpo -c -o libmfluajit_a-mfluajit0.o `test -f 'mfluajit0.c' || echo '$(srcdir)/'`mfluajit0.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmfluajit_a-mfluajit0.Tpo $(DEPDIR)/libmfluajit_a-mfluajit0.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='mfluajit0.c' object='libmfluajit_a-mfluajit0.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) $(libmfluajit_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmfluajit_a-mfluajit0.o `test -f 'mfluajit0.c' || echo '$(srcdir)/'`mfluajit0.c
+
+libmfluajit_a-mfluajit0.obj: mfluajit0.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmfluajit_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmfluajit_a-mfluajit0.obj -MD -MP -MF $(DEPDIR)/libmfluajit_a-mfluajit0.Tpo -c -o libmfluajit_a-mfluajit0.obj `if test -f 'mfluajit0.c'; then $(CYGPATH_W) 'mfluajit0.c'; else $(CYGPATH_W) '$(srcdir)/mfluajit0.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmfluajit_a-mfluajit0.Tpo $(DEPDIR)/libmfluajit_a-mfluajit0.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='mfluajit0.c' object='libmfluajit_a-mfluajit0.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) $(libmfluajit_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmfluajit_a-mfluajit0.obj `if test -f 'mfluajit0.c'; then $(CYGPATH_W) 'mfluajit0.c'; else $(CYGPATH_W) '$(srcdir)/mfluajit0.c'; fi`
+
+libmfluajit_a-mfluajit-pool.o: mfluajit-pool.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmfluajit_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmfluajit_a-mfluajit-pool.o -MD -MP -MF $(DEPDIR)/libmfluajit_a-mfluajit-pool.Tpo -c -o libmfluajit_a-mfluajit-pool.o `test -f 'mfluajit-pool.c' || echo '$(srcdir)/'`mfluajit-pool.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmfluajit_a-mfluajit-pool.Tpo $(DEPDIR)/libmfluajit_a-mfluajit-pool.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='mfluajit-pool.c' object='libmfluajit_a-mfluajit-pool.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) $(libmfluajit_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmfluajit_a-mfluajit-pool.o `test -f 'mfluajit-pool.c' || echo '$(srcdir)/'`mfluajit-pool.c
+
+libmfluajit_a-mfluajit-pool.obj: mfluajit-pool.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmfluajit_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmfluajit_a-mfluajit-pool.obj -MD -MP -MF $(DEPDIR)/libmfluajit_a-mfluajit-pool.Tpo -c -o libmfluajit_a-mfluajit-pool.obj `if test -f 'mfluajit-pool.c'; then $(CYGPATH_W) 'mfluajit-pool.c'; else $(CYGPATH_W) '$(srcdir)/mfluajit-pool.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmfluajit_a-mfluajit-pool.Tpo $(DEPDIR)/libmfluajit_a-mfluajit-pool.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='mfluajit-pool.c' object='libmfluajit_a-mfluajit-pool.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) $(libmfluajit_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmfluajit_a-mfluajit-pool.obj `if test -f 'mfluajit-pool.c'; then $(CYGPATH_W) 'mfluajit-pool.c'; else $(CYGPATH_W) '$(srcdir)/mfluajit-pool.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
@@ -12334,6 +12722,34 @@ inimf-callexe.obj: callexe.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(inimf_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o inimf-callexe.obj `if test -f 'callexe.c'; then $(CYGPATH_W) 'callexe.c'; else $(CYGPATH_W) '$(srcdir)/callexe.c'; fi`
 
+inimflua-callexe.o: callexe.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(inimflua_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT inimflua-callexe.o -MD -MP -MF $(DEPDIR)/inimflua-callexe.Tpo -c -o inimflua-callexe.o `test -f 'callexe.c' || echo '$(srcdir)/'`callexe.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/inimflua-callexe.Tpo $(DEPDIR)/inimflua-callexe.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='callexe.c' object='inimflua-callexe.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) $(inimflua_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o inimflua-callexe.o `test -f 'callexe.c' || echo '$(srcdir)/'`callexe.c
+
+inimflua-callexe.obj: callexe.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(inimflua_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT inimflua-callexe.obj -MD -MP -MF $(DEPDIR)/inimflua-callexe.Tpo -c -o inimflua-callexe.obj `if test -f 'callexe.c'; then $(CYGPATH_W) 'callexe.c'; else $(CYGPATH_W) '$(srcdir)/callexe.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/inimflua-callexe.Tpo $(DEPDIR)/inimflua-callexe.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='callexe.c' object='inimflua-callexe.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) $(inimflua_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o inimflua-callexe.obj `if test -f 'callexe.c'; then $(CYGPATH_W) 'callexe.c'; else $(CYGPATH_W) '$(srcdir)/callexe.c'; fi`
+
+inimfluajit-callexe.o: callexe.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(inimfluajit_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT inimfluajit-callexe.o -MD -MP -MF $(DEPDIR)/inimfluajit-callexe.Tpo -c -o inimfluajit-callexe.o `test -f 'callexe.c' || echo '$(srcdir)/'`callexe.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/inimfluajit-callexe.Tpo $(DEPDIR)/inimfluajit-callexe.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='callexe.c' object='inimfluajit-callexe.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) $(inimfluajit_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o inimfluajit-callexe.o `test -f 'callexe.c' || echo '$(srcdir)/'`callexe.c
+
+inimfluajit-callexe.obj: callexe.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(inimfluajit_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT inimfluajit-callexe.obj -MD -MP -MF $(DEPDIR)/inimfluajit-callexe.Tpo -c -o inimfluajit-callexe.obj `if test -f 'callexe.c'; then $(CYGPATH_W) 'callexe.c'; else $(CYGPATH_W) '$(srcdir)/callexe.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/inimfluajit-callexe.Tpo $(DEPDIR)/inimfluajit-callexe.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='callexe.c' object='inimfluajit-callexe.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) $(inimfluajit_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o inimfluajit-callexe.obj `if test -f 'callexe.c'; then $(CYGPATH_W) 'callexe.c'; else $(CYGPATH_W) '$(srcdir)/callexe.c'; fi`
+
 initex-callexe.o: callexe.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(initex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT initex-callexe.o -MD -MP -MF $(DEPDIR)/initex-callexe.Tpo -c -o initex-callexe.o `test -f 'callexe.c' || echo '$(srcdir)/'`callexe.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/initex-callexe.Tpo $(DEPDIR)/initex-callexe.Po
@@ -12446,6 +12862,62 @@ mf_nowin-mfextra.obj: mfextra.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mf_nowin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mf_nowin-mfextra.obj `if test -f 'mfextra.c'; then $(CYGPATH_W) 'mfextra.c'; else $(CYGPATH_W) '$(srcdir)/mfextra.c'; fi`
 
+mfluadir/mflua-mfluaextra.o: mfluadir/mfluaextra.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mflua_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mfluadir/mflua-mfluaextra.o -MD -MP -MF mfluadir/$(DEPDIR)/mflua-mfluaextra.Tpo -c -o mfluadir/mflua-mfluaextra.o `test -f 'mfluadir/mfluaextra.c' || echo '$(srcdir)/'`mfluadir/mfluaextra.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) mfluadir/$(DEPDIR)/mflua-mfluaextra.Tpo mfluadir/$(DEPDIR)/mflua-mfluaextra.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='mfluadir/mfluaextra.c' object='mfluadir/mflua-mfluaextra.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) $(mflua_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mfluadir/mflua-mfluaextra.o `test -f 'mfluadir/mfluaextra.c' || echo '$(srcdir)/'`mfluadir/mfluaextra.c
+
+mfluadir/mflua-mfluaextra.obj: mfluadir/mfluaextra.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mflua_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mfluadir/mflua-mfluaextra.obj -MD -MP -MF mfluadir/$(DEPDIR)/mflua-mfluaextra.Tpo -c -o mfluadir/mflua-mfluaextra.obj `if test -f 'mfluadir/mfluaextra.c'; then $(CYGPATH_W) 'mfluadir/mfluaextra.c'; else $(CYGPATH_W) '$(srcdir)/mfluadir/mfluaextra.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) mfluadir/$(DEPDIR)/mflua-mfluaextra.Tpo mfluadir/$(DEPDIR)/mflua-mfluaextra.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='mfluadir/mfluaextra.c' object='mfluadir/mflua-mfluaextra.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) $(mflua_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mfluadir/mflua-mfluaextra.obj `if test -f 'mfluadir/mfluaextra.c'; then $(CYGPATH_W) 'mfluadir/mfluaextra.c'; else $(CYGPATH_W) '$(srcdir)/mfluadir/mfluaextra.c'; fi`
+
+mfluadir/mflua_nowin-mfluaextra.o: mfluadir/mfluaextra.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mflua_nowin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mfluadir/mflua_nowin-mfluaextra.o -MD -MP -MF mfluadir/$(DEPDIR)/mflua_nowin-mfluaextra.Tpo -c -o mfluadir/mflua_nowin-mfluaextra.o `test -f 'mfluadir/mfluaextra.c' || echo '$(srcdir)/'`mfluadir/mfluaextra.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) mfluadir/$(DEPDIR)/mflua_nowin-mfluaextra.Tpo mfluadir/$(DEPDIR)/mflua_nowin-mfluaextra.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='mfluadir/mfluaextra.c' object='mfluadir/mflua_nowin-mfluaextra.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) $(mflua_nowin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mfluadir/mflua_nowin-mfluaextra.o `test -f 'mfluadir/mfluaextra.c' || echo '$(srcdir)/'`mfluadir/mfluaextra.c
+
+mfluadir/mflua_nowin-mfluaextra.obj: mfluadir/mfluaextra.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mflua_nowin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mfluadir/mflua_nowin-mfluaextra.obj -MD -MP -MF mfluadir/$(DEPDIR)/mflua_nowin-mfluaextra.Tpo -c -o mfluadir/mflua_nowin-mfluaextra.obj `if test -f 'mfluadir/mfluaextra.c'; then $(CYGPATH_W) 'mfluadir/mfluaextra.c'; else $(CYGPATH_W) '$(srcdir)/mfluadir/mfluaextra.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) mfluadir/$(DEPDIR)/mflua_nowin-mfluaextra.Tpo mfluadir/$(DEPDIR)/mflua_nowin-mfluaextra.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='mfluadir/mfluaextra.c' object='mfluadir/mflua_nowin-mfluaextra.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) $(mflua_nowin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mfluadir/mflua_nowin-mfluaextra.obj `if test -f 'mfluadir/mfluaextra.c'; then $(CYGPATH_W) 'mfluadir/mfluaextra.c'; else $(CYGPATH_W) '$(srcdir)/mfluadir/mfluaextra.c'; fi`
+
+mfluajitdir/mfluajit-mfluajitextra.o: mfluajitdir/mfluajitextra.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mfluajit_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mfluajitdir/mfluajit-mfluajitextra.o -MD -MP -MF mfluajitdir/$(DEPDIR)/mfluajit-mfluajitextra.Tpo -c -o mfluajitdir/mfluajit-mfluajitextra.o `test -f 'mfluajitdir/mfluajitextra.c' || echo '$(srcdir)/'`mfluajitdir/mfluajitextra.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) mfluajitdir/$(DEPDIR)/mfluajit-mfluajitextra.Tpo mfluajitdir/$(DEPDIR)/mfluajit-mfluajitextra.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='mfluajitdir/mfluajitextra.c' object='mfluajitdir/mfluajit-mfluajitextra.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) $(mfluajit_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mfluajitdir/mfluajit-mfluajitextra.o `test -f 'mfluajitdir/mfluajitextra.c' || echo '$(srcdir)/'`mfluajitdir/mfluajitextra.c
+
+mfluajitdir/mfluajit-mfluajitextra.obj: mfluajitdir/mfluajitextra.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mfluajit_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mfluajitdir/mfluajit-mfluajitextra.obj -MD -MP -MF mfluajitdir/$(DEPDIR)/mfluajit-mfluajitextra.Tpo -c -o mfluajitdir/mfluajit-mfluajitextra.obj `if test -f 'mfluajitdir/mfluajitextra.c'; then $(CYGPATH_W) 'mfluajitdir/mfluajitextra.c'; else $(CYGPATH_W) '$(srcdir)/mfluajitdir/mfluajitextra.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) mfluajitdir/$(DEPDIR)/mfluajit-mfluajitextra.Tpo mfluajitdir/$(DEPDIR)/mfluajit-mfluajitextra.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='mfluajitdir/mfluajitextra.c' object='mfluajitdir/mfluajit-mfluajitextra.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) $(mfluajit_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mfluajitdir/mfluajit-mfluajitextra.obj `if test -f 'mfluajitdir/mfluajitextra.c'; then $(CYGPATH_W) 'mfluajitdir/mfluajitextra.c'; else $(CYGPATH_W) '$(srcdir)/mfluajitdir/mfluajitextra.c'; fi`
+
+mfluajitdir/mfluajit_nowin-mfluajitextra.o: mfluajitdir/mfluajitextra.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mfluajit_nowin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mfluajitdir/mfluajit_nowin-mfluajitextra.o -MD -MP -MF mfluajitdir/$(DEPDIR)/mfluajit_nowin-mfluajitextra.Tpo -c -o mfluajitdir/mfluajit_nowin-mfluajitextra.o `test -f 'mfluajitdir/mfluajitextra.c' || echo '$(srcdir)/'`mfluajitdir/mfluajitextra.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) mfluajitdir/$(DEPDIR)/mfluajit_nowin-mfluajitextra.Tpo mfluajitdir/$(DEPDIR)/mfluajit_nowin-mfluajitextra.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='mfluajitdir/mfluajitextra.c' object='mfluajitdir/mfluajit_nowin-mfluajitextra.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) $(mfluajit_nowin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mfluajitdir/mfluajit_nowin-mfluajitextra.o `test -f 'mfluajitdir/mfluajitextra.c' || echo '$(srcdir)/'`mfluajitdir/mfluajitextra.c
+
+mfluajitdir/mfluajit_nowin-mfluajitextra.obj: mfluajitdir/mfluajitextra.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mfluajit_nowin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mfluajitdir/mfluajit_nowin-mfluajitextra.obj -MD -MP -MF mfluajitdir/$(DEPDIR)/mfluajit_nowin-mfluajitextra.Tpo -c -o mfluajitdir/mfluajit_nowin-mfluajitextra.obj `if test -f 'mfluajitdir/mfluajitextra.c'; then $(CYGPATH_W) 'mfluajitdir/mfluajitextra.c'; else $(CYGPATH_W) '$(srcdir)/mfluajitdir/mfluajitextra.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) mfluajitdir/$(DEPDIR)/mfluajit_nowin-mfluajitextra.Tpo mfluajitdir/$(DEPDIR)/mfluajit_nowin-mfluajitextra.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='mfluajitdir/mfluajitextra.c' object='mfluajitdir/mfluajit_nowin-mfluajitextra.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) $(mfluajit_nowin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mfluajitdir/mfluajit_nowin-mfluajitextra.obj `if test -f 'mfluajitdir/mfluajitextra.c'; then $(CYGPATH_W) 'mfluajitdir/mfluajitextra.c'; else $(CYGPATH_W) '$(srcdir)/mfluajitdir/mfluajitextra.c'; fi`
+
 mpost-mpost.o: mpost.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mpost-mpost.o -MD -MP -MF $(DEPDIR)/mpost-mpost.Tpo -c -o mpost-mpost.o `test -f 'mpost.c' || echo '$(srcdir)/'`mpost.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mpost-mpost.Tpo $(DEPDIR)/mpost-mpost.Po
@@ -14166,6 +14638,20 @@ mftraptest.log: mftraptest
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
+mfluadir/mfluatraptest.log: mfluadir/mfluatraptest
+	@p='mfluadir/mfluatraptest'; \
+	b='mfluadir/mfluatraptest'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+mfluajitdir/mfluajittraptest.log: mfluajitdir/mfluajittraptest
+	@p='mfluajitdir/mfluajittraptest'; \
+	b='mfluajitdir/mfluajittraptest'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 mplibdir/mptraptest.log: mplibdir/mptraptest
 	@p='mplibdir/mptraptest'; \
 	b='mplibdir/mptraptest'; \
@@ -14511,6 +14997,10 @@ distclean-generic:
 	-rm -f luatexdir/unilib/$(am__dirstamp)
 	-rm -f luatexdir/utils/$(DEPDIR)/$(am__dirstamp)
 	-rm -f luatexdir/utils/$(am__dirstamp)
+	-rm -f mfluadir/$(DEPDIR)/$(am__dirstamp)
+	-rm -f mfluadir/$(am__dirstamp)
+	-rm -f mfluajitdir/$(DEPDIR)/$(am__dirstamp)
+	-rm -f mfluajitdir/$(am__dirstamp)
 	-rm -f mplibdir/$(DEPDIR)/$(am__dirstamp)
 	-rm -f mplibdir/$(am__dirstamp)
 	-rm -f pdftexdir/$(DEPDIR)/$(am__dirstamp)
@@ -14540,7 +15030,7 @@ clean-am: clean-binPROGRAMS clean-checkPROGRAMS clean-generic \
 
 distclean: distclean-recursive
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf ./$(DEPDIR) alephdir/$(DEPDIR) eptexdir/$(DEPDIR) etexdir/$(DEPDIR) euptexdir/$(DEPDIR) libmd5/$(DEPDIR) luatexdir/$(DEPDIR) luatexdir/lua/$(DEPDIR) luatexdir/luafilesystem/src/$(DEPDIR) luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR) luatexdir/luafontloader/fontforge/gutils/$(DEPDIR) luatexdir/luafontloader/src/$(DEPDIR) luatexdir/luamd5/$(DEPDIR) luatexdir/luapeg/$(DEPDIR) luatexdir/luaprofiler/$(DEPDIR) luatexdir/luasocket/src/$(DEPDIR) luatexdir/luazip/src/$(DEPDIR) luatexdir/luazlib/$(DEPDIR) luatexdir/slnunicode/$(DEPDIR) luatexdir/unilib/$(DEPDIR) luatexdir/utils/$(DEPDIR) mplibdir/$(DEPDIR) pdftexdir/$(DEPDIR) pdftexdir/regex/$(DEPDIR) ptexdir/$(DEPDIR) synctexdir/$(DEPDIR) uptexdir/$(DEPDIR) xetexdir/$(DEPDIR) xetexdir/image/$(DEPDIR)
+	-rm -rf ./$(DEPDIR) alephdir/$(DEPDIR) eptexdir/$(DEPDIR) etexdir/$(DEPDIR) euptexdir/$(DEPDIR) libmd5/$(DEPDIR) luatexdir/$(DEPDIR) luatexdir/lua/$(DEPDIR) luatexdir/luafilesystem/src/$(DEPDIR) luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR) luatexdir/luafontloader/fontforge/gutils/$(DEPDIR) luatexdir/luafontloader/src/$(DEPDIR) luatexdir/luamd5/$(DEPDIR) luatexdir/luapeg/$(DEPDIR) luatexdir/luaprofiler/$(DEPDIR) luatexdir/luasocket/src/$(DEPDIR) luatexdir/luazip/src/$(DEPDIR) luatexdir/luazlib/$(DEPDIR) luatexdir/slnunicode/$(DEPDIR) luatexdir/unilib/$(DEPDIR) luatexdir/utils/$(DEPDIR) mfluadir/$(DEPDIR) mfluajitdir/$(DEPDIR) mplibdir/$(DEPDIR) pdftexdir/$(DEPDIR) pdftexdir/regex/$(DEPDIR) ptexdir/$(DEPDIR) synctexdir/$(DEPDIR) uptexdir/$(DEPDIR) xetexdir/$(DEPDIR) xetexdir/image/$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-hdr distclean-libtool distclean-tags
@@ -14591,7 +15081,7 @@ installcheck-am:
 maintainer-clean: maintainer-clean-recursive
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
 	-rm -rf $(top_srcdir)/autom4te.cache
-	-rm -rf ./$(DEPDIR) alephdir/$(DEPDIR) eptexdir/$(DEPDIR) etexdir/$(DEPDIR) euptexdir/$(DEPDIR) libmd5/$(DEPDIR) luatexdir/$(DEPDIR) luatexdir/lua/$(DEPDIR) luatexdir/luafilesystem/src/$(DEPDIR) luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR) luatexdir/luafontloader/fontforge/gutils/$(DEPDIR) luatexdir/luafontloader/src/$(DEPDIR) luatexdir/luamd5/$(DEPDIR) luatexdir/luapeg/$(DEPDIR) luatexdir/luaprofiler/$(DEPDIR) luatexdir/luasocket/src/$(DEPDIR) luatexdir/luazip/src/$(DEPDIR) luatexdir/luazlib/$(DEPDIR) luatexdir/slnunicode/$(DEPDIR) luatexdir/unilib/$(DEPDIR) luatexdir/utils/$(DEPDIR) mplibdir/$(DEPDIR) pdftexdir/$(DEPDIR) pdftexdir/regex/$(DEPDIR) ptexdir/$(DEPDIR) synctexdir/$(DEPDIR) uptexdir/$(DEPDIR) xetexdir/$(DEPDIR) xetexdir/image/$(DEPDIR)
+	-rm -rf ./$(DEPDIR) alephdir/$(DEPDIR) eptexdir/$(DEPDIR) etexdir/$(DEPDIR) euptexdir/$(DEPDIR) libmd5/$(DEPDIR) luatexdir/$(DEPDIR) luatexdir/lua/$(DEPDIR) luatexdir/luafilesystem/src/$(DEPDIR) luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR) luatexdir/luafontloader/fontforge/gutils/$(DEPDIR) luatexdir/luafontloader/src/$(DEPDIR) luatexdir/luamd5/$(DEPDIR) luatexdir/luapeg/$(DEPDIR) luatexdir/luaprofiler/$(DEPDIR) luatexdir/luasocket/src/$(DEPDIR) luatexdir/luazip/src/$(DEPDIR) luatexdir/luazlib/$(DEPDIR) luatexdir/slnunicode/$(DEPDIR) luatexdir/unilib/$(DEPDIR) luatexdir/utils/$(DEPDIR) mfluadir/$(DEPDIR) mfluajitdir/$(DEPDIR) mplibdir/$(DEPDIR) pdftexdir/$(DEPDIR) pdftexdir/regex/$(DEPDIR) ptexdir/$(DEPDIR) synctexdir/$(DEPDIR) uptexdir/$(DEPDIR) xetexdir/$(DEPDIR) xetexdir/image/$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -14901,6 +15391,79 @@ mftrap.diffs: mf$(EXEEXT)
 trap-clean:
 	rm -rf trapdir
 
+# We must create mfluad.h and mfluadir/mflua_version.h before compiling mfluaextra.c.
+$(mflua_OBJECTS) $(mflua_nowin_OBJECTS): mfluad.h mfluadir/mflua_version.h
+
+# We must create mfluad.h before building the libmflua_a_OBJECTS.
+$(libmflua_a_OBJECTS): mfluad.h
+
+$(mflua_c_h): mflua-web2c $(LUA_LIBS)
+	@$(web2c) mflua
+mflua-web2c: mflua.p $(web2c_texmf) web2c/cvtmf1.sed web2c/cvtmf2.sed mfluadir/mflua.defines
+	@$(web2c) mflua
+
+mflua-pool.c: mflua.pool mfluad.h $(makecpool_stamp)
+	$(makecpool) mflua >$@ || rm -f $@
+
+# Tangling MFLua
+mflua.p mflua.pool: mflua-tangle
+	@$(texmf_tangle) mflua mflua
+mflua-tangle: tangle$(EXEEXT) mflua.web mflua.ch tangle-sh
+	@$(texmf_tangle) mflua mflua
+
+# Extract mflua version
+$(srcdir)/mfluadir/mflua_version.h: @MAINTAINER_MODE_TRUE@ mfluadir/mf-lua.ch
+	$(AM_V_GEN)grep '^@d MFLua_version_string==' $(srcdir)/mfluadir/mf-lua.ch \
+	  | sed "s/^.*'-/#define MFLUA_VERSION \"/;s/'.*$$/\"/" >$@
+
+# Generate mflua.web
+mflua.web: tie$(EXEEXT) $(mflua_web_srcs)
+	$(tie) -m mflua.web $(mflua_web_srcs)
+
+# Generate mflua.ch
+mflua.ch: tie$(EXEEXT) mflua.web $(mflua_ch_src)
+	$(tie) -c $@ mflua.web $(mflua_ch_src)
+
+mfluatrap.diffs: mflua$(EXEEXT)
+	$(triptrap_diffs) $@
+.PHONY: mfluatrap-clean
+mfluatrap-clean:
+	rm -rf mfluatrapdir
+
+# We must create mfluajitd.h and mfluadir/mflua_version.h before compiling mfluajitextra.c.
+$(mfluajit_OBJECTS) $(mfluajit_nowin_OBJECTS): mfluajitd.h mfluadir/mflua_version.h
+
+# We must create mfluajitd.h before building the libmfluajit_a_OBJECTS.
+$(libmfluajit_a_OBJECTS): mfluajitd.h
+
+$(mfluajit_c_h): mfluajit-web2c $(LUAJIT_LIBS)
+	@$(web2c) mfluajit
+mfluajit-web2c: mfluajit.p $(web2c_texmf) web2c/cvtmf1.sed web2c/cvtmf2.sed mfluajitdir/mfluajit.defines
+	@$(web2c) mfluajit
+
+mfluajit-pool.c: mfluajit.pool mfluajitd.h $(makecpool_stamp)
+	$(makecpool) mfluajit >$@ || rm -f $@
+
+# Tangling MFLua
+mfluajit.p mfluajit.pool: mfluajit-tangle
+	@$(texmf_tangle) mfluajit mfluajit
+mfluajit-tangle: tangle$(EXEEXT) mfluajit.web mfluajit.ch tangle-sh
+	@$(texmf_tangle) mfluajit mfluajit
+
+# Generate mfluajit.web
+mfluajit.web: tie$(EXEEXT) $(mfluajit_web_srcs)
+	$(tie) -m mfluajit.web $(mfluajit_web_srcs)
+
+# Generate mfluajit.ch
+mfluajit.ch: tie$(EXEEXT) mfluajit.web $(mfluajit_ch_src)
+	$(tie) -c $@ mfluajit.web $(mfluajit_ch_src)
+
+mfluajittrap.diffs: mfluajit$(EXEEXT)
+	$(triptrap_diffs) $@
+.PHONY: mfluajittrap-clean
+mfluajittrap-clean:
+	rm -rf mfluajittrapdir
+
 .PHONY: install-mpost-links uninstall-mpost-links
 @WIN32_TRUE@install-mpost-links: call_mpost$(EXEEXT)
 @WIN32_TRUE@	$(INSTALL_PROGRAM) call_mpost$(EXEEXT) $(DESTDIR)$(bindir)/dvitomp$(EXEEXT)
diff --git a/Build/source/texk/web2c/ac/web2c.ac b/Build/source/texk/web2c/ac/web2c.ac
index 47752afeceb..bb9d559ed20 100644
--- a/Build/source/texk/web2c/ac/web2c.ac
+++ b/Build/source/texk/web2c/ac/web2c.ac
@@ -48,7 +48,9 @@ m4_foreach([Kpse_Prog], [kpse_tex_progs],
 ## configure options for MF
 dnl [PROG, BUILD-OR-NO, NOWIN-OR-NO, TEXT, REQUIRED-LIBS]
 m4_define([kpse_mf_progs], [dnl
-[[mf],    [yes], [yes], [METAFONT], []],
+[[mf],       [yes], [yes], [METAFONT], []],
+[[mflua],    [yes], [no],  [MFLua],    [lua52]],
+[[mfluajit], [yes], [no],  [MFLuaJIT], [luajit]],
 ])[]dnl
 m4_foreach([Kpse_Prog], [kpse_mf_progs],
            [m4_ifset([Kpse_Prog],
diff --git a/Build/source/texk/web2c/c-auto.in b/Build/source/texk/web2c/c-auto.in
index 54ce2c40044..b75d2f66d53 100644
--- a/Build/source/texk/web2c/c-auto.in
+++ b/Build/source/texk/web2c/c-auto.in
@@ -55,6 +55,10 @@
 /* Define to 1 if you have the `atoi' function. */
 #undef HAVE_ATOI
 
+/* Define to 1 if you have the declaration of `isascii', and to 0 if you
+   don't. */
+#undef HAVE_DECL_ISASCII
+
 /* Define to 1 if you have the declaration of `strndup', and to 0 if you
    don't. */
 #undef HAVE_DECL_STRNDUP
diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure
index 79bf89504fd..bdc59cfe55c 100755
--- a/Build/source/texk/web2c/configure
+++ b/Build/source/texk/web2c/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Web2C 2015.
+# Generated by GNU Autoconf 2.69 for Web2C 2016/dev.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='Web2C'
 PACKAGE_TARNAME='web2c'
-PACKAGE_VERSION='2015'
-PACKAGE_STRING='Web2C 2015'
+PACKAGE_VERSION='2016/dev'
+PACKAGE_STRING='Web2C 2016/dev'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
@@ -746,6 +746,14 @@ X_LIBS
 X_PRE_LIBS
 X_CFLAGS
 XMKMF
+MFLUAJITN_FALSE
+MFLUAJITN_TRUE
+MFLUAJIT_FALSE
+MFLUAJIT_TRUE
+MFLUAN_FALSE
+MFLUAN_TRUE
+MFLUA_FALSE
+MFLUA_TRUE
 MFN_FALSE
 MFN_TRUE
 MF_FALSE
@@ -999,6 +1007,10 @@ enable_xetex
 enable_xetex_synctex
 enable_mf
 enable_mf_nowin
+enable_mflua
+enable_mflua_nowin
+enable_mfluajit
+enable_mfluajit_nowin
 with_mf_x_toolkit
 enable_epsfwin
 enable_hp2627win
@@ -1596,7 +1608,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures Web2C 2015 to adapt to many kinds of systems.
+\`configure' configures Web2C 2016/dev to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1670,7 +1682,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Web2C 2015:";;
+     short | recursive ) echo "Configuration of Web2C 2016/dev:";;
    esac
   cat <<\_ACEOF
 
@@ -1726,6 +1738,10 @@ Optional Features:
   --disable-mf            do not compile and install METAFONT
   --disable-mf-nowin        do not build a separate non-window-capable
                             METAFONT
+  --disable-mflua         do not compile and install MFLua
+  --enable-mflua-nowin      build a separate non-window-capable MFLua
+  --disable-mfluajit      do not compile and install MFLuaJIT
+  --enable-mfluajit-nowin   build a separate non-window-capable MFLuaJIT
   --enable-epsfwin          include EPSF pseudo window support
   --enable-hp2627win        include HP 2627 window support
   --enable-mftalkwin        include mftalk (generic server) window support
@@ -1887,7 +1903,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Web2C configure 2015
+Web2C configure 2016/dev
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2437,6 +2453,52 @@ $as_echo "$ac_res" >&6; }
 
 } # ac_fn_c_find_uintX_t
 
+# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
+# ---------------------------------------------
+# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
+# accordingly.
+ac_fn_c_check_decl ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  as_decl_name=`echo $2|sed 's/ *(.*//'`
+  as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
+$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+#ifndef $as_decl_name
+#ifdef __cplusplus
+  (void) $as_decl_use;
+#else
+  (void) $as_decl_name;
+#endif
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_decl
+
 # ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES
 # ----------------------------------------------------
 # Tries to find if the field MEMBER exists in type AGGR, after including
@@ -2926,57 +2988,11 @@ rm -f conftest.val
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_compute_int
-
-# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
-# ---------------------------------------------
-# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
-# accordingly.
-ac_fn_c_check_decl ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  as_decl_name=`echo $2|sed 's/ *(.*//'`
-  as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
-$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-#ifndef $as_decl_name
-#ifdef __cplusplus
-  (void) $as_decl_use;
-#else
-  (void) $as_decl_name;
-#endif
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$3=yes"
-else
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_decl
 cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Web2C $as_me 2015, which was
+It was created by Web2C $as_me 2016/dev, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3357,7 +3373,7 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
 
-WEB2CVERSION=2015
+WEB2CVERSION=2016/dev
 
 
 am__api_version='1.15'
@@ -8664,7 +8680,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='web2c'
- VERSION='2015'
+ VERSION='2016/dev'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -8819,13 +8835,13 @@ else
 if test "x$enable_compiler_warnings" != xno; then
   kpse_cv_warning_cflags="-Wimplicit -Wreturn-type"
   case `$CC -dumpversion` in #(
-  3.4.* | 4.*) :
+  3.4.* | 4.* | 5.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wdeclaration-after-statement" ;; #(
   *) :
      ;;
 esac
   case `$CC -dumpversion` in #(
-  3.[234].* | 4.*) :
+  3.[234].* | 4.* | 5.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wno-unknown-pragmas" ;; #(
   *) :
      ;;
@@ -8837,7 +8853,7 @@ esac
       kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
       kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
       case `$CC -dumpversion` in #(
-  3.4.* | 4.*) :
+  3.4.* | 4.* | 5.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wold-style-definition" ;; #(
   *) :
      ;;
@@ -14244,6 +14260,18 @@ case :$ac_cv_c_int64_t:$ac_cv_c_int64_t: in #(
   *) :
      ;;
 esac
+ac_fn_c_check_decl "$LINENO" "isascii" "ac_cv_have_decl_isascii" "#include <ctype.h>
+"
+if test "x$ac_cv_have_decl_isascii" = xyes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_ISASCII $ac_have_decl
+_ACEOF
+
 ac_fn_c_check_member "$LINENO" "struct stat" "st_mtim" "ac_cv_member_struct_stat_st_mtim" "$ac_includes_default"
 if test "x$ac_cv_member_struct_stat_st_mtim" = xyes; then :
 
@@ -14666,7 +14694,7 @@ if test "x$enable_compiler_warnings" != xno; then
      ;;
 esac
   case `$CXX -dumpversion` in #(
-  3.[234].* | 4.*) :
+  3.[234].* | 4.* | 5.*) :
     kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wno-unknown-pragmas" ;; #(
   *) :
      ;;
@@ -18404,7 +18432,7 @@ if test "x$enable_compiler_warnings" != xno; then
      ;;
 esac
   case `$OBJCXX -dumpversion` in #(
-  3.[234].* | 4.*) :
+  3.[234].* | 4.* | 5.*) :
     kpse_cv_warning_objcxxflags="$kpse_cv_warning_objcxxflags -Wno-unknown-pragmas" ;; #(
   *) :
      ;;
@@ -18843,6 +18871,62 @@ esac
 if test "${enable_mf_nowin+set}" = set; then :
   enableval=$enable_mf_nowin;
 fi
+case $enable_mf_nowin in #(
+  yes | no) :
+     ;; #(
+  *) :
+    enable_mf_nowin=yes ;;
+esac
+# Check whether --enable-mflua was given.
+if test "${enable_mflua+set}" = set; then :
+  enableval=$enable_mflua;
+fi
+case $enable_mflua in #(
+  yes | no) :
+     ;; #(
+  *) :
+    enable_mflua=yes ;;
+esac
+
+# Check whether --enable-mflua-nowin was given.
+if test "${enable_mflua_nowin+set}" = set; then :
+  enableval=$enable_mflua_nowin;
+fi
+case $enable_mflua_nowin in #(
+  yes | no) :
+     ;; #(
+  *) :
+    enable_mflua_nowin=no ;;
+esac
+
+test "x$enable_web2c:$enable_mflua" = xyes:yes && {
+  need_lua52=yes
+}
+# Check whether --enable-mfluajit was given.
+if test "${enable_mfluajit+set}" = set; then :
+  enableval=$enable_mfluajit;
+fi
+case $enable_mfluajit in #(
+  yes | no) :
+     ;; #(
+  *) :
+    enable_mfluajit=yes ;;
+esac
+
+# Check whether --enable-mfluajit-nowin was given.
+if test "${enable_mfluajit_nowin+set}" = set; then :
+  enableval=$enable_mfluajit_nowin;
+fi
+case $enable_mfluajit_nowin in #(
+  yes | no) :
+     ;; #(
+  *) :
+    enable_mfluajit_nowin=no ;;
+esac
+
+test "x$enable_web2c:$enable_mfluajit" = xyes:yes && {
+  need_luajit=yes
+}
 
 # Check whether --with-mf-x-toolkit was given.
 if test "${with_mf_x_toolkit+set}" = set; then :
@@ -20221,6 +20305,38 @@ else
   MFN_TRUE='#'
   MFN_FALSE=
 fi
+ if test "x$enable_mflua" != xno; then
+  MFLUA_TRUE=
+  MFLUA_FALSE='#'
+else
+  MFLUA_TRUE='#'
+  MFLUA_FALSE=
+fi
+test "x$enable_mflua" = xyes && : ${with_x=yes}
+
+ if test "x$enable_mflua_nowin" != xno; then
+  MFLUAN_TRUE=
+  MFLUAN_FALSE='#'
+else
+  MFLUAN_TRUE='#'
+  MFLUAN_FALSE=
+fi
+ if test "x$enable_mfluajit" != xno; then
+  MFLUAJIT_TRUE=
+  MFLUAJIT_FALSE='#'
+else
+  MFLUAJIT_TRUE='#'
+  MFLUAJIT_FALSE=
+fi
+test "x$enable_mfluajit" = xyes && : ${with_x=yes}
+
+ if test "x$enable_mfluajit_nowin" != xno; then
+  MFLUAJITN_TRUE=
+  MFLUAJITN_FALSE='#'
+else
+  MFLUAJITN_TRUE='#'
+  MFLUAJITN_FALSE=
+fi
 : ${with_x=yes}
 
 # Distinguish no X at all, no toolkit, or toolkit.
@@ -22385,7 +22501,7 @@ Usage: $0 [OPTIONS]
 Report bugs to <bug-libtool@gnu.org>."
 
 lt_cl_version="\
-Web2C config.lt 2015
+Web2C config.lt 2016/dev
 configured by $0, generated by GNU Autoconf 2.69.
 
 Copyright (C) 2011 Free Software Foundation, Inc.
@@ -23996,11 +24112,11 @@ if test "${with_system_poppler+set}" = set; then :
   withval=$with_system_poppler;
 fi
 if test "x$with_system_poppler" = xyes; then
-  if $PKG_CONFIG poppler --atleast-version=0.18; then
+  if $PKG_CONFIG poppler --atleast-version=0.30; then
   POPPLER_INCLUDES=`$PKG_CONFIG poppler --cflags`
   POPPLER_LIBS=`$PKG_CONFIG poppler --libs`
 elif test "x$need_poppler:$with_system_poppler" = xyes:yes; then
-  as_fn_error $? "did not find poppler 0.18 or better" "$LINENO" 5
+  as_fn_error $? "did not find poppler 0.30 or better" "$LINENO" 5
 fi
 
 POPPLER_VERSION='-DPOPPLER_VERSION=\"'`$PKG_CONFIG poppler --modversion`'\"'
@@ -25068,6 +25184,22 @@ if test -z "${MFN_TRUE}" && test -z "${MFN_FALSE}"; then
   as_fn_error $? "conditional \"MFN\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${MFLUA_TRUE}" && test -z "${MFLUA_FALSE}"; then
+  as_fn_error $? "conditional \"MFLUA\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${MFLUAN_TRUE}" && test -z "${MFLUAN_FALSE}"; then
+  as_fn_error $? "conditional \"MFLUAN\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${MFLUAJIT_TRUE}" && test -z "${MFLUAJIT_FALSE}"; then
+  as_fn_error $? "conditional \"MFLUAJIT\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${MFLUAJITN_TRUE}" && test -z "${MFLUAJITN_FALSE}"; then
+  as_fn_error $? "conditional \"MFLUAJITN\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${MFXT_TRUE}" && test -z "${MFXT_FALSE}"; then
   as_fn_error $? "conditional \"MFXT\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -25486,7 +25618,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Web2C $as_me 2015, which was
+This file was extended by Web2C $as_me 2016/dev, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -25556,7 +25688,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-Web2C config.status 2015
+Web2C config.status 2016/dev
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/Build/source/texk/web2c/lib/ChangeLog b/Build/source/texk/web2c/lib/ChangeLog
index 56b76e9eb45..7771412da7a 100644
--- a/Build/source/texk/web2c/lib/ChangeLog
+++ b/Build/source/texk/web2c/lib/ChangeLog
@@ -1,3 +1,8 @@
+2015-06-12  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Integrate MFLua and MFLuaJIT.
+	* texmfmp.c: Adapted.
+
 2015-03-16  Akira Kakuto  <kakuto@fuk.kinidai.ac.jp>
 
 	* printversion.c: 2014 ---> 2015.
diff --git a/Build/source/texk/web2c/lib/texmfmp.c b/Build/source/texk/web2c/lib/texmfmp.c
index 00e32e63283..a2ec1986b63 100644
--- a/Build/source/texk/web2c/lib/texmfmp.c
+++ b/Build/source/texk/web2c/lib/texmfmp.c
@@ -89,6 +89,11 @@
 #define edit_var "TEXEDIT"
 #endif /* TeX */
 #ifdef MF
+#if defined(MFLua)
+#include <mfluadir/mfluaextra.h>
+#elif defined(MFLuaJIT)
+#include <mfluajitdir/mfluajitextra.h>
+#else
 #define BANNER "This is Metafont, Version 2.7182818"
 #define COPYRIGHT_HOLDER "D.E. Knuth"
 #define AUTHOR NULL
@@ -105,6 +110,7 @@
 #define INPUT_FORMAT kpse_mf_format
 #define INI_PROGRAM "inimf"
 #define VIR_PROGRAM "virmf"
+#endif
 #define edit_var "MFEDIT"
 #endif /* MF */
 
diff --git a/Build/source/texk/web2c/mf.ch b/Build/source/texk/web2c/mf.ch
index ea718c6869a..7d122e54827 100644
--- a/Build/source/texk/web2c/mf.ch
+++ b/Build/source/texk/web2c/mf.ch
@@ -38,7 +38,7 @@
 @d gubed==endif('TEXMF_DEBUG')
 @z
 
-@x
+@x [1.7]
 @d stat==@{ {change this to `$\\{stat}\equiv\null$' when gathering
   usage statistics}
 @d tats==@t@>@} {change this to `$\\{tats}\equiv\null$' when gathering
@@ -235,7 +235,7 @@ for i:=0 to @'37 do xchr[i]:=i;
 for i:=@'177 to @'377 do xchr[i]:=i;
 @z
 
-@x [2.24]
+@x [2.23]
 for i:=0 to @'176 do xord[xchr[i]]:=i;
 @y
 for i:=0 to @'176 do xord[xchr[i]]:=i;
@@ -715,13 +715,13 @@ noreturn procedure confusion(@!s:str_number);
 @y
 @z
 
-@x [102] Use halfp.
+@x [7.102] Use halfp.
 round_decimals:=half(a+1);
 @y
 round_decimals:=halfp(a+1);
 @z
 
-@x [7.107-7.115] Optionally replace make_fraction etc. with external routines
+@x [7.107-7.114] Optionally replace make_fraction etc. with external routines
 @p function make_fraction(@!p,@!q:integer):fraction;
 @y
 In the C version, there are external routines that use double precision
@@ -736,7 +736,7 @@ don't expect anyone will actually notice.)
 @p ifdef('FIXPT')@/
 function make_fraction(@!p,@!q:integer):fraction;
 @z
-@x
+@x [7.107]
   if negative then make_fraction:=-(f+n)@+else make_fraction:=f+n;
   end;
 end;
@@ -746,13 +746,13 @@ end;
 end;@/
 endif('FIXPT')
 @z
-@x
+@x [7.109]
 @p function take_fraction(@!q:integer;@!f:fraction):integer;
 @y
 @p ifdef('FIXPT')@/
 function take_fraction(@!q:integer;@!f:fraction):integer;
 @z
-@x
+@x [7.109]
 else take_fraction:=n+p;
 end;
 @y
@@ -761,35 +761,27 @@ end;@/
 endif('FIXPT')
 @z
 
-@x [111]
-@<Compute $p=\lfloor qf/2^{28}+{1\over2}\rfloor-q$@>=
-p:=fraction_half; {that's $2^{27}$; the invariants hold now with $k=28$}
-if q<fraction_four then
+@x [7.111] Use halfp.
   repeat if odd(f) then p:=half(p+q)@+else p:=half(p);
   f:=half(f);
   until f=1
 else  repeat if odd(f) then p:=p+half(q-p)@+else p:=half(p);
   f:=half(f);
-  until f=1
 @y
-@<Compute $p=\lfloor qf/2^{28}+{1\over2}\rfloor-q$@>=
-p:=fraction_half; {that's $2^{27}$; the invariants hold now with $k=28$}
-if q<fraction_four then
   repeat if odd(f) then p:=halfp(p+q)@+else p:=halfp(p);
   f:=halfp(f);
   until f=1
 else  repeat if odd(f) then p:=p+halfp(q-p)@+else p:=halfp(p);
   f:=halfp(f);
-  until f=1
 @z
 
-@x
+@x [7.112]
 @p function take_scaled(@!q:integer;@!f:scaled):integer;
 @y
 @p ifdef('FIXPT')@/
 function take_scaled(@!q:integer;@!f:scaled):integer;
 @z
-@x
+@x [7.112]
 else take_scaled:=n+p;
 end;
 @y
@@ -798,31 +790,21 @@ end;@/
 endif('FIXPT')
 @z
 
-@x [113]
-@ @<Compute $p=\lfloor qf/2^{16}+{1\over2}\rfloor-q$@>=
-p:=half_unit; {that's $2^{15}$; the invariants hold now with $k=16$}
-@^inner loop@>
-if q<fraction_four then
+@x [7.113] Use halfp.
   repeat if odd(f) then p:=half(p+q)@+else p:=half(p);
   f:=half(f);
   until f=1
 else  repeat if odd(f) then p:=p+half(q-p)@+else p:=half(p);
   f:=half(f);
-  until f=1
 @y
-@ @<Compute $p=\lfloor qf/2^{16}+{1\over2}\rfloor-q$@>=
-p:=half_unit; {that's $2^{15}$; the invariants hold now with $k=16$}
-@^inner loop@>
-if q<fraction_four then
   repeat if odd(f) then p:=halfp(p+q)@+else p:=halfp(p);
   f:=halfp(f);
   until f=1
 else  repeat if odd(f) then p:=p+halfp(q-p)@+else p:=halfp(p);
   f:=halfp(f);
-  until f=1
 @z
 
-@x
+@x [7.114]
 operands are positive. \ (This procedure is not used especially often,
 so it is not part of \MF's inner loop.)
 
@@ -835,7 +817,7 @@ an external C routine.)
 @p ifdef('FIXPT')@/
 function make_scaled(@!p,@!q:integer):scaled;
 @z
-@x
+@x [7.114]
   if negative then make_scaled:=-(f+n)@+else make_scaled:=f+n;
   end;
 end;
@@ -886,116 +868,34 @@ end;
 @y
 @z
 
-@x [121]
+@x [8.121] Use halfp.
   square_rt:=half(q);
 @y
   square_rt:=halfp(q);
 @z
 
-@x [126]
-@p function pyth_sub(@!a,@!b:integer):integer;
-label done;
-var @!r:fraction; {register used to transform |a| and |b|}
-@!big:boolean; {is the input dangerously near $2^{31}$?}
-begin a:=abs(a); b:=abs(b);
-if a<=b then @<Handle erroneous |pyth_sub| and set |a:=0|@>
-else  begin if a<fraction_four then big:=false
+@x [8.126] Use halfp.
   else  begin a:=half(a); b:=half(b); big:=true;
-    end;
-  @<Replace |a| by an approximation to $\psqrt{a^2-b^2}$@>;
-  if big then a:=a+a;
-  end;
-pyth_sub:=a;
-end;
 @y
-@p function pyth_sub(@!a,@!b:integer):integer;
-label done;
-var @!r:fraction; {register used to transform |a| and |b|}
-@!big:boolean; {is the input dangerously near $2^{31}$?}
-begin a:=abs(a); b:=abs(b);
-if a<=b then @<Handle erroneous |pyth_sub| and set |a:=0|@>
-else  begin if a<fraction_four then big:=false
   else  begin a:=halfp(a); b:=halfp(b); big:=true;
-    end;
-  @<Replace |a| by an approximation to $\psqrt{a^2-b^2}$@>;
-  if big then a:=a+a;
-  end;
-pyth_sub:=a;
-end;
 @z
 
-@x [133]
-@ @<Increase |k| until |x| can...@>=
-begin z:=((x-1) div two_to_the[k])+1; {$z=\lceil x/2^k\rceil$}
-while x<fraction_four+z do
+@x [8.133] Use halfp.
   begin z:=half(z+1); k:=k+1;
-  end;
-y:=y+spec_log[k]; x:=x-z;
-end
 @y
-@ @<Increase |k| until |x| can...@>=
-begin z:=((x-1) div two_to_the[k])+1; {$z=\lceil x/2^k\rceil$}
-while x<fraction_four+z do
   begin z:=halfp(z+1); k:=k+1;
-  end;
-y:=y+spec_log[k]; x:=x-z;
-end
 @z
 
-@x [142]
-@<Set variable |z| to the arg...@>=
-while x>=fraction_two do
+@x [8.142] Use halfp.
   begin x:=half(x); y:=half(y);
-  end;
-z:=0;
-if y>0 then
-  begin while x<fraction_one do
-    begin double(x); double(y);
-    end;
-  @<Increase |z| to the arg of $(x,y)$@>;
-  end
 @y
-@<Set variable |z| to the arg...@>=
-while x>=fraction_two do
   begin x:=halfp(x); y:=halfp(y);
-  end;
-z:=0;
-if y>0 then
-  begin while x<fraction_one do
-    begin double(x); double(y);
-    end;
-  @<Increase |z| to the arg of $(x,y)$@>;
-  end
 @z
 
-@x [150]
-@p procedure init_randoms(@!seed:scaled);
-var @!j,@!jj,@!k:fraction; {more or less random integers}
-@!i:0..54; {index into |randoms|}
-begin j:=abs(seed);
+@x [8.150] Use halfp.
 while j>=fraction_one do j:=half(j);
-k:=1;
-for i:=0 to 54 do
-  begin jj:=k; k:=j-k; j:=jj;
-  if k<0 then k:=k+fraction_one;
-  randoms[(i*21)mod 55]:=j;
-  end;
-new_randoms; new_randoms; new_randoms; {``warm up'' the array}
-end;
 @y
-@p procedure init_randoms(@!seed:scaled);
-var @!j,@!jj,@!k:fraction; {more or less random integers}
-@!i:0..54; {index into |randoms|}
-begin j:=abs(seed);
 while j>=fraction_one do j:=halfp(j);
-k:=1;
-for i:=0 to 54 do
-  begin jj:=k; k:=j-k; j:=jj;
-  if k<0 then k:=k+fraction_one;
-  randoms[(i*21)mod 55]:=j;
-  end;
-new_randoms; new_randoms; new_randoms; {``warm up'' the array}
-end;
 @z
 
 @x [9.153] Increase memory size.
@@ -1129,26 +1029,10 @@ char_class[tab]:=space_class;
 char_class[form_feed]:=space_class;
 @z
 
-@x [232] Use halfp.
-@p procedure init_big_node(@!p:pointer);
-var @!q:pointer; {the new node}
-@!s:small_number; {its size}
-begin s:=big_node_size[type(p)]; q:=get_node(s);
-repeat s:=s-2; @<Make variable |q+s| newly independent@>;
+@x [15.232] Use halfp.
 name_type(q+s):=half(s)+x_part_sector; link(q+s):=null;
-until s=0;
-link(q):=p; value(p):=q;
-end;
 @y
-@p procedure init_big_node(@!p:pointer);
-var @!q:pointer; {the new node}
-@!s:small_number; {its size}
-begin s:=big_node_size[type(p)]; q:=get_node(s);
-repeat s:=s-2; @<Make variable |q+s| newly independent@>;
 name_type(q+s):=halfp(s)+x_part_sector; link(q+s):=null;
-until s=0;
-link(q):=p; value(p):=q;
-end;
 @z
 
  [20.329] |valid_range| uses |abs|, which we have defined as a C
@@ -1162,7 +1046,6 @@ var @!delta:halfword; {amount of change}
 var @!delta:halfword; {amount of change}
 temp:integer;
 @z
-
 @x
 if not valid_range(m_min(cur_edges)+m_offset(cur_edges)-zero_field) or@|
  not valid_range(m_max(cur_edges)+m_offset(cur_edges)-zero_field) then
@@ -1173,24 +1056,12 @@ if not valid_range (m_min (cur_edges) + temp)
 then
 @z
 
-@x [442] Use halfp.
-@<Compute a good coordinate at a diagonal transition@>=
-begin if cur_pen=null_pen then pen_edge:=0
-else if cur_path_type=double_path_code then @<Compute a compromise |pen_edge|@>
-else if right_type(q)<=switch_x_and_y then pen_edge:=diag_offset(right_type(q))
-else pen_edge:=-diag_offset(right_type(q));
+@x [21.442] Use halfp.
 if odd(right_type(q)) then a:=good_val(b,pen_edge+half(cur_gran))
 else a:=good_val(b-1,pen_edge+half(cur_gran));
-end
 @y
-@<Compute a good coordinate at a diagonal transition@>=
-begin if cur_pen=null_pen then pen_edge:=0
-else if cur_path_type=double_path_code then @<Compute a compromise |pen_edge|@>
-else if right_type(q)<=switch_x_and_y then pen_edge:=diag_offset(right_type(q))
-else pen_edge:=-diag_offset(right_type(q));
 if odd(right_type(q)) then a:=good_val(b,pen_edge+halfp(cur_gran))
 else a:=good_val(b-1,pen_edge+halfp(cur_gran));
-end
 @z
 
 @x [24.509] i18n fix
@@ -1222,82 +1093,16 @@ else print(" offset");
   gamma := pyth_add (take_fraction (major_axis, n_cos), gamma);
 @z
 
-@x [556]
-@p procedure cubic_intersection(@!p,@!pp:pointer);
-label continue, not_found, exit;
-var @!q,@!qq:pointer; {|link(p)|, |link(pp)|}
-begin time_to_go:=max_patience; max_t:=2;
-@<Initialize for intersections at level zero@>;
-loop@+  begin continue:
-  if delx-tol<=stack_max(x_packet(xy))-stack_min(u_packet(uv)) then
-   if delx+tol>=stack_min(x_packet(xy))-stack_max(u_packet(uv)) then
-   if dely-tol<=stack_max(y_packet(xy))-stack_min(v_packet(uv)) then
-   if dely+tol>=stack_min(y_packet(xy))-stack_max(v_packet(uv)) then
-    begin if cur_t>=max_t then
-      begin if max_t=two then {we've done 17 bisections}
+@x [26.556] Use halfp.
         begin cur_t:=half(cur_t+1); cur_tt:=half(cur_tt+1); return;
-        end;
-      double(max_t); appr_t:=cur_t; appr_tt:=cur_tt;
-      end;
-    @<Subdivide for a new level of intersection@>;
-    goto continue;
-    end;
-  if time_to_go>0 then decr(time_to_go)
-  else  begin while appr_t<unity do
-      begin double(appr_t); double(appr_tt);
-      end;
-    cur_t:=appr_t; cur_tt:=appr_tt; return;
-    end;
-  @<Advance to the next pair |(cur_t,cur_tt)|@>;
-  end;
-exit:end;
 @y
-@p procedure cubic_intersection(@!p,@!pp:pointer);
-label continue, not_found, exit;
-var @!q,@!qq:pointer; {|link(p)|, |link(pp)|}
-begin time_to_go:=max_patience; max_t:=2;
-@<Initialize for intersections at level zero@>;
-loop@+  begin continue:
-  if delx-tol<=stack_max(x_packet(xy))-stack_min(u_packet(uv)) then
-   if delx+tol>=stack_min(x_packet(xy))-stack_max(u_packet(uv)) then
-   if dely-tol<=stack_max(y_packet(xy))-stack_min(v_packet(uv)) then
-   if dely+tol>=stack_min(y_packet(xy))-stack_max(v_packet(uv)) then
-    begin if cur_t>=max_t then
-      begin if max_t=two then {we've done 17 bisections}
         begin cur_t:=halfp(cur_t+1); cur_tt:=halfp(cur_tt+1); return;
-        end;
-      double(max_t); appr_t:=cur_t; appr_tt:=cur_tt;
-      end;
-    @<Subdivide for a new level of intersection@>;
-    goto continue;
-    end;
-  if time_to_go>0 then decr(time_to_go)
-  else  begin while appr_t<unity do
-      begin double(appr_t); double(appr_tt);
-      end;
-    cur_t:=appr_t; cur_tt:=appr_tt; return;
-    end;
-  @<Advance to the next pair |(cur_t,cur_tt)|@>;
-  end;
-exit:end;
 @z
 
-@x [561]
-@ @<Descend to the previous level...@>=
+@x [26.561] Use halfp.
 begin cur_t:=half(cur_t); cur_tt:=half(cur_tt);
-if cur_t=0 then return;
-bisect_ptr:=bisect_ptr-int_increment; three_l:=three_l-tol_step;
-delx:=stack_dx; dely:=stack_dy; tol:=stack_tol; uv:=stack_uv; xy:=stack_xy;@/
-goto not_found;
-end
 @y
-@ @<Descend to the previous level...@>=
 begin cur_t:=halfp(cur_t); cur_tt:=halfp(cur_tt);
-if cur_t=0 then return;
-bisect_ptr:=bisect_ptr-int_increment; three_l:=three_l-tol_step;
-delx:=stack_dx; dely:=stack_dy; tol:=stack_tol; uv:=stack_uv; xy:=stack_xy;@/
-goto not_found;
-end
 @z
 
 @x [27.564] The window functions are defined externally, in C.
@@ -1360,32 +1165,10 @@ end;
 {Same thing}
 @z
 
-@x [596] Use halfp.
-@ @<Contribute a term from |q|, multiplied by~|f|@>=
-begin if tt=dependent then v:=take_fraction(f,value(q))
-else v:=take_scaled(f,value(q));
+@x [28.596] Use halfp.
 if abs(v)>half(threshold) then
-  begin s:=get_node(dep_node_size); info(s):=qq; value(s):=v;
-  if abs(v)>=coef_bound then if watch_coefs then
-    begin type(qq):=independent_needing_fix; fix_needed:=true;
-    end;
-  link(r):=s; r:=s;
-  end;
-q:=link(q); qq:=info(q);
-end
 @y
-@ @<Contribute a term from |q|, multiplied by~|f|@>=
-begin if tt=dependent then v:=take_fraction(f,value(q))
-else v:=take_scaled(f,value(q));
 if abs(v)>halfp(threshold) then
-  begin s:=get_node(dep_node_size); info(s):=qq; value(s):=v;
-  if abs(v)>=coef_bound then if watch_coefs then
-    begin type(qq):=independent_needing_fix; fix_needed:=true;
-    end;
-  link(r):=s; r:=s;
-  end;
-q:=link(q); qq:=info(q);
-end
 @z
 
 @x [31.631] l.13346 - Add datastructures for file:line:error.
@@ -1787,32 +1570,14 @@ if name=str_ptr-1 then {we can conserve string pool space now}
 @y
 @z
 
-@x [866] Use halfp.
-@<Change node |q|...@>=
-begin tx:=x_coord(q); ty:=y_coord(q);
-txx:=left_x(q)-tx; tyx:=left_y(q)-ty;
-txy:=right_x(q)-tx; tyy:=right_y(q)-ty;
-a_minus_b:=pyth_add(txx-tyy,tyx+txy); a_plus_b:=pyth_add(txx+tyy,tyx-txy);
+@x [41.866] Use halfp.
 major_axis:=half(a_minus_b+a_plus_b); minor_axis:=half(abs(a_plus_b-a_minus_b));
 if major_axis=minor_axis then theta:=0 {circle}
 else theta:=half(n_arg(txx-tyy,tyx+txy)+n_arg(txx+tyy,tyx-txy));
-free_node(q,knot_node_size);
-q:=make_ellipse(major_axis,minor_axis,theta);
-if (tx<>0)or(ty<>0) then @<Shift the coordinates of path |q|@>;
-end
 @y
-@<Change node |q|...@>=
-begin tx:=x_coord(q); ty:=y_coord(q);
-txx:=left_x(q)-tx; tyx:=left_y(q)-ty;
-txy:=right_x(q)-tx; tyy:=right_y(q)-ty;
-a_minus_b:=pyth_add(txx-tyy,tyx+txy); a_plus_b:=pyth_add(txx+tyy,tyx-txy);
 major_axis:=halfp(a_minus_b+a_plus_b); minor_axis:=halfp(abs(a_plus_b-a_minus_b));
 if major_axis=minor_axis then theta:=0 {circle}
 else theta:=half(n_arg(txx-tyy,tyx+txy)+n_arg(txx+tyy,tyx-txy));
-free_node(q,knot_node_size);
-q:=make_ellipse(major_axis,minor_axis,theta);
-if (tx<>0)or(ty<>0) then @<Shift the coordinates of path |q|@>;
-end
 @z
 
 @x [44.1023] if batchmode, MakeTeX... scripts should be silent.
@@ -1852,30 +1617,10 @@ begin d:=threshold(m); perturbation:=0;
 begin d:=threshold_fn(m); perturbation:=0;
 @z
 
-@x [1122]
-@ @<Replace an interval...@>=
-begin repeat p:=link(p); info(p):=m;
-decr(excess);@+if excess=0 then d:=0;
-until value(link(p))>l+d;
+@x [45.1122] Use halfp.
 v:=l+half(value(p)-l);
-if value(p)-v>perturbation then perturbation:=value(p)-v;
-r:=q;
-repeat r:=link(r); value(r):=v;
-until r=p;
-link(q):=p; {remove duplicate values from the current list}
-end
 @y
-@ @<Replace an interval...@>=
-begin repeat p:=link(p); info(p):=m;
-decr(excess);@+if excess=0 then d:=0;
-until value(link(p))>l+d;
 v:=l+halfp(value(p)-l);
-if value(p)-v>perturbation then perturbation:=value(p)-v;
-r:=q;
-repeat r:=link(r); value(r):=v;
-until r=p;
-link(q):=p; {remove duplicate values from the current list}
-end
 @z
 
 @x [45.1133] Use C macros to do the TFM writing, to avoid casting(?) problems.
@@ -1908,7 +1653,7 @@ I don't know why not. Some casting problem?
 @p procedure tfm_qqqq(@!x:four_quarters); {output four quarterwords to |tfm_file|}
 @z
 
-@x [47.1134] print_file_name
+@x [45.1134] print_file_name
 print_nl("Font metrics written on "); slow_print(metric_file_name);
 @y
 print_nl("Font metrics written on "); print_file_name(0,metric_file_name,0);
@@ -2165,7 +1910,7 @@ end;
 tini@/
 @z
 
-@x
+@x [49.1204]
 end_of_MF: close_files_and_terminate;
 final_end: ready_already:=0;
 @y
diff --git a/Build/source/texk/web2c/mfluadir/ChangeLog b/Build/source/texk/web2c/mfluadir/ChangeLog
new file mode 100644
index 00000000000..8bb01a97eab
--- /dev/null
+++ b/Build/source/texk/web2c/mfluadir/ChangeLog
@@ -0,0 +1,5 @@
+2015-04-01  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Imported MFLua into TeX Live, based on the SVN repository
+	  https://foundry.supelec.fr/projects/mflua
+	  from Luigi Scarso <luigi.scarso@gmail.com>.
diff --git a/Build/source/texk/web2c/mfluadir/am/mflua.am b/Build/source/texk/web2c/mfluadir/am/mflua.am
new file mode 100644
index 00000000000..e2fea0a36ad
--- /dev/null
+++ b/Build/source/texk/web2c/mfluadir/am/mflua.am
@@ -0,0 +1,133 @@
+## texk/web2c/mfluadir/am/mflua.am: Makefile fragment for MFLua.
+##
+## Copyright (C) 2015 Peter Breitenlohner <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
+
+## MFLua
+##
+if MFLUA
+bin_PROGRAMS += mflua
+if MFLUAN
+bin_PROGRAMS += mflua-nowin
+endif MFLUAN
+if WIN32
+bin_PROGRAMS += inimflua
+else !WIN32
+bin_links += mflua$(EXEEXT):inimflua
+endif !WIN32
+endif MFLUA
+EXTRA_PROGRAMS += mflua mflua-nowin
+DISTCLEANFILES += mfluatrap.diffs
+
+inimflua_CPPFLAGS = -DEXEPROG=\"mflua.exe\"
+nodist_inimflua_SOURCES = callexe.c
+inimflua_LDADD =
+
+dist_mflua_SOURCES = mfluadir/mfluaextra.c mfluadir/mfluaextra.h mfluadir/mflua_version.h
+mflua_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS) $(LUA_INCLUDES)
+mflua_LDADD = libmflua.a $(LDADD) $(windowlib) $(mf_x_libs) $(LUA_LIBS)
+mflua_LDFLAGS = -export-dynamic
+nodist_mflua_nowin_SOURCES = $(dist_mflua_SOURCES)
+mflua_nowin_CPPFLAGS = $(mflua_CPPFLAGS) -DMFNOWIN $(LUA_INCLUDES)
+mflua_nowin_LDADD = libmflua.a $(LDADD) $(windowlib) $(LUA_LIBS)
+mflua_nowin_LDFLAGS = -export-dynamic
+
+# We must create mfluad.h and mfluadir/mflua_version.h before compiling mfluaextra.c.
+$(mflua_OBJECTS) $(mflua_nowin_OBJECTS): mfluad.h mfluadir/mflua_version.h
+
+## mflua and mflua-nowin compile mfluaextra.c with different CPPFLAGS.
+## Automake, however, does not support CPPFLAGS for individual source files.
+## To avoid compiling everything twice, the common objects are in a library.
+EXTRA_LIBRARIES += libmflua.a
+
+# MFLua C sources
+mflua_c_h = mfluaini.c mflua0.c mfluacoerce.h mfluad.h
+dist_libmflua_a_SOURCES = mfluadir/mfluac.c  mfluadir/mfluac.h
+nodist_libmflua_a_SOURCES = $(mflua_c_h) mflua-pool.c
+libmflua_a_CPPFLAGS = $(AM_CPPFLAGS) $(LUA_INCLUDES)
+
+# We must create mfluad.h before building the libmflua_a_OBJECTS.
+$(libmflua_a_OBJECTS): mfluad.h
+
+$(mflua_c_h): mflua-web2c $(LUA_LIBS)
+	@$(web2c) mflua
+mflua-web2c: mflua.p $(web2c_texmf) web2c/cvtmf1.sed web2c/cvtmf2.sed mfluadir/mflua.defines
+	@$(web2c) mflua
+
+mflua-pool.c: mflua.pool mfluad.h $(makecpool_stamp)
+	$(makecpool) mflua >$@ || rm -f $@
+
+# Tangling MFLua
+mflua.p mflua.pool: mflua-tangle
+	@$(texmf_tangle) mflua mflua
+mflua-tangle: tangle$(EXEEXT) mflua.web mflua.ch tangle-sh
+	@$(texmf_tangle) mflua mflua
+
+# Extract mflua version
+$(srcdir)/mfluadir/mflua_version.h: @MAINTAINER_MODE_TRUE@ mfluadir/mf-lua.ch
+	$(AM_V_GEN)grep '^@d MFLua_version_string==' $(srcdir)/mfluadir/mf-lua.ch \
+	  | sed "s/^.*'-/#define MFLUA_VERSION \"/;s/'.*$$/\"/" >$@
+
+# Generate mflua.web
+mflua.web: tie$(EXEEXT) $(mflua_web_srcs)
+	$(tie) -m mflua.web $(mflua_web_srcs)
+mflua_web_srcs = \
+	mf.web \
+	mfluadir/mf-lua.ch
+
+# Generate mflua.ch
+mflua.ch: tie$(EXEEXT) mflua.web $(mflua_ch_src)
+	$(tie) -c $@ mflua.web $(mflua_ch_src)
+mflua_ch_src = \
+	mf.ch \
+	mfluadir/mflua-m.ch \
+	mf-binpool.ch
+##
+EXTRA_DIST += $(mflua_web_srcs) $(mflua_ch_src) mfluadir/mflua.defines
+
+DISTCLEANFILES += $(nodist_libmflua_a_SOURCES) mflua.web mflua.ch mflua-web2c \
+	mflua.p mflua.pool mflua-tangle
+
+EXTRA_DIST += \
+	mfluadir/ChangeLog
+
+# MFLua tests
+#
+mflua_tests = mfluadir/mfluatraptest
+EXTRA_DIST += $(mflua_tests)
+
+if MFLUA
+TESTS += $(mflua_tests)
+check_PROGRAMS += gftype tftopl
+TRIPTRAP += mfluatrap.diffs
+TRIPTRAP_CLEAN += mfluatrap-clean
+endif MFLUA
+DISTCLEANFILES += mfluatrap.diffs
+
+## mfluadir/mfluatraptest
+mfluatrap.diffs: mflua$(EXEEXT)
+	$(triptrap_diffs) $@
+.PHONY: mfluatrap-clean
+mfluatrap-clean:
+	rm -rf mfluatrapdir
+
+## Test data 
+##
+EXTRA_DIST += \
+	mfluadir/mfluatrap/begin_program.lua \
+	mfluadir/mfluatrap/do_add_to.lua \
+	mfluadir/mfluatrap/end_program.lua \
+	mfluadir/mfluatrap/fill_envelope.lua \
+	mfluadir/mfluatrap/fill_spec.lua \
+	mfluadir/mfluatrap/final_cleanup.lua \
+	mfluadir/mfluatrap/main_control.lua \
+	mfluadir/mfluatrap/make_ellipse.lua \
+	mfluadir/mfluatrap/mfluaini.lua \
+	mfluadir/mfluatrap/offset_prep.lua \
+	mfluadir/mfluatrap/print_edges.lua \
+	mfluadir/mfluatrap/print_path.lua \
+	mfluadir/mfluatrap/scan_direction.lua \
+	mfluadir/mfluatrap/skew_line_edges.lua \
+	mfluadir/mfluatrap/start_of_MF.lua \
+	mfluadir/mfluatrap/texmf.cnf \
+	mfluadir/mfluatrap/mfluatrap.diffs
diff --git a/Build/source/texk/web2c/mfluadir/mf-lua.ch b/Build/source/texk/web2c/mfluadir/mf-lua.ch
new file mode 100644
index 00000000000..46f03757e83
--- /dev/null
+++ b/Build/source/texk/web2c/mfluadir/mf-lua.ch
@@ -0,0 +1,538 @@
+@x [0] MFLua
+% This program is copyright (C) 1984 by D. E. Knuth; all rights are reserved.
+@y
+% This program is MFLua, strictly based on the METAFONT 2.7182818 source code.
+% What follow are the original comments of METAFONT 2.7182818. 
+
+% This program is copyright (C) 1984 by D. E. Knuth; all rights are reserved.
+@z
+
+@x [0] MFLua
+\def\MF{{\tenlogo META}\-{\tenlogo FONT}}
+@y
+%\def\MF{{\tenlogo META}\-{\tenlogo FONT}}
+\def\MF{{\tenlogo MF}{\mc LUA}}
+@z
+
+@x [1.2] MFLua
+@d banner=='This is METAFONT, Version 2.7182818' {printed when \MF\ starts}
+@y
+@d METAFONT_banner=='This is METAFONT, Version 2.7182818' {printed when \MF\ starts}
+@#
+@d MFLua_version_string=='-0.5'
+@#
+@d MFLua_banner=='This is MFLua, Version 2.7182818', MFLua_version_string
+  {printed when MFLua starts}
+@#
+@d banner==MFLua_banner
+@z
+
+@x [12.186] MFLua - runscript primitive
+At any rate, here is the list, for future reference.
+
+@d if_test=1 {conditional text (\&{if})}
+@d fi_or_else=2 {delimiters for conditionals (\&{elseif}, \&{else}, \&{fi})}
+@d input=3 {input a source file (\&{input}, \&{endinput})}
+@d iteration=4 {iterate (\&{for}, \&{forsuffixes}, \&{forever}, \&{endfor})}
+@d repeat_loop=5 {special command substituted for \&{endfor}}
+@d exit_test=6 {premature exit from a loop (\&{exitif})}
+@d relax=7 {do nothing (\.{\char`\\})}
+@d scan_tokens=8 {put a string into the input buffer}
+@d expand_after=9 {look ahead one token}
+@d defined_macro=10 {a macro defined by the user}
+@d min_command=defined_macro+1
+@d display_command=11 {online graphic output (\&{display})}
+@d save_command=12 {save a list of tokens (\&{save})}
+@d interim_command=13 {save an internal quantity (\&{interim})}
+@d let_command=14 {redefine a symbolic token (\&{let})}
+@d new_internal=15 {define a new internal quantity (\&{newinternal})}
+@d macro_def=16 {define a macro (\&{def}, \&{vardef}, etc.)}
+@d ship_out_command=17 {output a character (\&{shipout})}
+@d add_to_command=18 {add to edges (\&{addto})}
+@d cull_command=19 {cull and normalize edges (\&{cull})}
+@d tfm_command=20 {command for font metric info (\&{ligtable}, etc.)}
+@d protection_command=21 {set protection flag (\&{outer}, \&{inner})}
+@d show_command=22 {diagnostic output (\&{show}, \&{showvariable}, etc.)}
+@d mode_command=23 {set interaction level (\&{batchmode}, etc.)}
+@d random_seed=24 {initialize random number generator (\&{randomseed})}
+@d message_command=25 {communicate to user (\&{message}, \&{errmessage})}
+@d every_job_command=26 {designate a starting token (\&{everyjob})}
+@d delimiters=27 {define a pair of delimiters (\&{delimiters})}
+@d open_window=28 {define a window on the screen (\&{openwindow})}
+@d special_command=29 {output special info (\&{special}, \&{numspecial})}
+@d type_name=30 {declare a type (\&{numeric}, \&{pair}, etc.)}
+@d max_statement_command=type_name
+@d min_primary_command=type_name
+@d left_delimiter=31 {the left delimiter of a matching pair}
+@d begin_group=32 {beginning of a group (\&{begingroup})}
+@d nullary=33 {an operator without arguments (e.g., \&{normaldeviate})}
+@d unary=34 {an operator with one argument (e.g., \&{sqrt})}
+@d str_op=35 {convert a suffix to a string (\&{str})}
+@d cycle=36 {close a cyclic path (\&{cycle})}
+@d primary_binary=37 {binary operation taking `\&{of}' (e.g., \&{point})}
+@d capsule_token=38 {a value that has been put into a token list}
+@d string_token=39 {a string constant (e.g., |"hello"|)}
+@d internal_quantity=40 {internal numeric parameter (e.g., \&{pausing})}
+@d min_suffix_token=internal_quantity
+@d tag_token=41 {a symbolic token without a primitive meaning}
+@d numeric_token=42 {a numeric constant (e.g., \.{3.14159})}
+@d max_suffix_token=numeric_token
+@d plus_or_minus=43 {either `\.+' or `\.-'}
+@d max_primary_command=plus_or_minus {should also be |numeric_token+1|}
+@d min_tertiary_command=plus_or_minus
+@d tertiary_secondary_macro=44 {a macro defined by \&{secondarydef}}
+@d tertiary_binary=45 {an operator at the tertiary level (e.g., `\.{++}')}
+@d max_tertiary_command=tertiary_binary
+@d left_brace=46 {the operator `\.{\char`\{}'}
+@d min_expression_command=left_brace
+@d path_join=47 {the operator `\.{..}'}
+@d ampersand=48 {the operator `\.\&'}
+@d expression_tertiary_macro=49 {a macro defined by \&{tertiarydef}}
+@d expression_binary=50 {an operator at the expression level (e.g., `\.<')}
+@d equals=51 {the operator `\.='}
+@d max_expression_command=equals
+@d and_command=52 {the operator `\&{and}'}
+@d min_secondary_command=and_command
+@d secondary_primary_macro=53 {a macro defined by \&{primarydef}}
+@d slash=54 {the operator `\./'}
+@d secondary_binary=55 {an operator at the binary level (e.g., \&{shifted})}
+@d max_secondary_command=secondary_binary
+@d param_type=56 {type of parameter (\&{primary}, \&{expr}, \&{suffix}, etc.)}
+@d controls=57 {specify control points explicitly (\&{controls})}
+@d tension=58 {specify tension between knots (\&{tension})}
+@d at_least=59 {bounded tension value (\&{atleast})}
+@d curl_command=60 {specify curl at an end knot (\&{curl})}
+@d macro_special=61 {special macro operators (\&{quote}, \.{\#\AT!}, etc.)}
+@d right_delimiter=62 {the right delimiter of a matching pair}
+@d left_bracket=63 {the operator `\.['}
+@d right_bracket=64 {the operator `\.]'}
+@d right_brace=65 {the operator `\.{\char`\}}'}
+@d with_option=66 {option for filling (\&{withpen}, \&{withweight})}
+@d cull_op=67 {the operator `\&{keeping}' or `\&{dropping}'}
+@d thing_to_add=68
+  {variant of \&{addto} (\&{contour}, \&{doublepath}, \&{also})}
+@d of_token=69 {the operator `\&{of}'}
+@d from_token=70 {the operator `\&{from}'}
+@d to_token=71 {the operator `\&{to}'}
+@d at_token=72 {the operator `\&{at}'}
+@d in_window=73 {the operator `\&{inwindow}'}
+@d step_token=74 {the operator `\&{step}'}
+@d until_token=75 {the operator `\&{until}'}
+@d lig_kern_token=76
+  {the operators `\&{kern}' and `\.{=:}' and `\.{=:\char'174}', etc.}
+@d assignment=77 {the operator `\.{:=}'}
+@d skip_to=78 {the operation `\&{skipto}'}
+@d bchar_label=79 {the operator `\.{\char'174\char'174:}'}
+@d double_colon=80 {the operator `\.{::}'}
+@d colon=81 {the operator `\.:'}
+@#
+@d comma=82 {the operator `\.,', must be |colon+1|}
+@d end_of_statement==cur_cmd>comma
+@d semicolon=83 {the operator `\.;', must be |comma+1|}
+@d end_group=84 {end a group (\&{endgroup}), must be |semicolon+1|}
+@d stop=85 {end a job (\&{end}, \&{dump}), must be |end_group+1|}
+@d max_command_code=stop
+@d outer_tag=max_command_code+1 {protection code added to command code}
+@y
+At any rate, here is the list, for future reference.
+
+@d delta_code=1 {n. of new primitives added }
+@d if_test=1 {conditional text (\&{if})}
+@d fi_or_else=2 {delimiters for conditionals (\&{elseif}, \&{else}, \&{fi})}
+@d input=3 {input a source file (\&{input}, \&{endinput})}
+@d iteration=4 {iterate (\&{for}, \&{forsuffixes}, \&{forever}, \&{endfor})}
+@d repeat_loop=5 {special command substituted for \&{endfor}}
+@d exit_test=6 {premature exit from a loop (\&{exitif})}
+@d relax=7 {do nothing (\.{\char`\\})}
+@d scan_tokens=8 {put a string into the input buffer}
+@d run_script=8+delta_code {execute a Lua script}
+@d expand_after=9+delta_code {look ahead one token}
+@d defined_macro=10+delta_code {a macro defined by the user}
+@d min_command=defined_macro+1
+@d display_command=11+delta_code {online graphic output (\&{display})}
+@d save_command=12+delta_code {save a list of tokens (\&{save})}
+@d interim_command=13+delta_code {save an internal quantity (\&{interim})}
+@d let_command=14+delta_code {redefine a symbolic token (\&{let})}
+@d new_internal=15+delta_code {define a new internal quantity (\&{newinternal})}
+@d macro_def=16+delta_code {define a macro (\&{def}, \&{vardef}, etc.)}
+@d ship_out_command=17+delta_code {output a character (\&{shipout})}
+@d add_to_command=18+delta_code {add to edges (\&{addto})}
+@d cull_command=19+delta_code {cull and normalize edges (\&{cull})}
+@d tfm_command=20+delta_code {command for font metric info (\&{ligtable}, etc.)}
+@d protection_command=21+delta_code {set protection flag (\&{outer}, \&{inner})}
+@d show_command=22+delta_code {diagnostic output (\&{show}, \&{showvariable}, etc.)}
+@d mode_command=23+delta_code {set interaction level (\&{batchmode}, etc.)}
+@d random_seed=24+delta_code {initialize random number generator (\&{randomseed})}
+@d message_command=25+delta_code {communicate to user (\&{message}, \&{errmessage})}
+@d every_job_command=26+delta_code {designate a starting token (\&{everyjob})}
+@d delimiters=27+delta_code {define a pair of delimiters (\&{delimiters})}
+@d open_window=28+delta_code {define a window on the screen (\&{openwindow})}
+@d special_command=29+delta_code {output special info (\&{special}, \&{numspecial})}
+@d type_name=30+delta_code {declare a type (\&{numeric}, \&{pair}, etc.)}
+@d max_statement_command=type_name
+@d min_primary_command=type_name
+@d left_delimiter=31+delta_code {the left delimiter of a matching pair}
+@d begin_group=32+delta_code {beginning of a group (\&{begingroup})}
+@d nullary=33+delta_code {an operator without arguments (e.g., \&{normaldeviate})}
+@d unary=34+delta_code {an operator with one argument (e.g., \&{sqrt})}
+@d str_op=35+delta_code {convert a suffix to a string (\&{str})}
+@d cycle=36+delta_code {close a cyclic path (\&{cycle})}
+@d primary_binary=37+delta_code {binary operation taking `\&{of}' (e.g., \&{point})}
+@d capsule_token=38+delta_code {a value that has been put into a token list}
+@d string_token=39+delta_code {a string constant (e.g., |"hello"|)}
+@d internal_quantity=40+delta_code {internal numeric parameter (e.g., \&{pausing})}
+@d min_suffix_token=internal_quantity
+@d tag_token=41+delta_code {a symbolic token without a primitive meaning}
+@d numeric_token=42+delta_code {a numeric constant (e.g., \.{3.14159})}
+@d max_suffix_token=numeric_token
+@d plus_or_minus=43+delta_code {either `\.+' or `\.-'}
+@d max_primary_command=plus_or_minus {should also be |numeric_token+1|}
+@d min_tertiary_command=plus_or_minus
+@d tertiary_secondary_macro=44+delta_code {a macro defined by \&{secondarydef}}
+@d tertiary_binary=45+delta_code {an operator at the tertiary level (e.g., `\.{++}')}
+@d max_tertiary_command=tertiary_binary
+@d left_brace=46+delta_code {the operator `\.{\char`\{}'}
+@d min_expression_command=left_brace
+@d path_join=47+delta_code {the operator `\.{..}'}
+@d ampersand=48+delta_code {the operator `\.\&'}
+@d expression_tertiary_macro=49+delta_code {a macro defined by \&{tertiarydef}}
+@d expression_binary=50+delta_code {an operator at the expression level (e.g., `\.<')}
+@d equals=51+delta_code {the operator `\.='}
+@d max_expression_command=equals
+@d and_command=52+delta_code {the operator `\&{and}'}
+@d min_secondary_command=and_command
+@d secondary_primary_macro=53+delta_code {a macro defined by \&{primarydef}}
+@d slash=54+delta_code {the operator `\./'}
+@d secondary_binary=55+delta_code {an operator at the binary level (e.g., \&{shifted})}
+@d max_secondary_command=secondary_binary
+@d param_type=56+delta_code {type of parameter (\&{primary}, \&{expr}, \&{suffix}, etc.)}
+@d controls=57+delta_code {specify control points explicitly (\&{controls})}
+@d tension=58+delta_code {specify tension between knots (\&{tension})}
+@d at_least=59+delta_code {bounded tension value (\&{atleast})}
+@d curl_command=60+delta_code {specify curl at an end knot (\&{curl})}
+@d macro_special=61+delta_code {special macro operators (\&{quote}, \.{\#\AT!}, etc.)}
+@d right_delimiter=62+delta_code {the right delimiter of a matching pair}
+@d left_bracket=63+delta_code {the operator `\.['}
+@d right_bracket=64+delta_code {the operator `\.]'}
+@d right_brace=65+delta_code {the operator `\.{\char`\}}'}
+@d with_option=66+delta_code {option for filling (\&{withpen}, \&{withweight})}
+@d cull_op=67+delta_code {the operator `\&{keeping}' or `\&{dropping}'}
+@d thing_to_add=68+delta_code
+  {variant of \&{addto} (\&{contour}, \&{doublepath}, \&{also})}
+@d of_token=69+delta_code {the operator `\&{of}'}
+@d from_token=70+delta_code {the operator `\&{from}'}
+@d to_token=71+delta_code {the operator `\&{to}'}
+@d at_token=72+delta_code {the operator `\&{at}'}
+@d in_window=73+delta_code {the operator `\&{inwindow}'}
+@d step_token=74+delta_code {the operator `\&{step}'}
+@d until_token=75+delta_code {the operator `\&{until}'}
+@d lig_kern_token=76+delta_code
+  {the operators `\&{kern}' and `\.{=:}' and `\.{=:\char'174}', etc.}
+@d assignment=77+delta_code {the operator `\.{:=}'}
+@d skip_to=78+delta_code {the operation `\&{skipto}'}
+@d bchar_label=79+delta_code {the operator `\.{\char'174\char'174:}'}
+@d double_colon=80+delta_code {the operator `\.{::}'}
+@d colon=81+delta_code {the operator `\.:'}
+@#
+@d comma=82+delta_code {the operator `\.,', must be |colon+1|}
+@d end_of_statement==cur_cmd>comma
+@d semicolon=83+delta_code {the operator `\.;', must be |comma+1|}
+@d end_group=84+delta_code {end a group (\&{endgroup}), must be |semicolon+1|}
+@d stop=85+delta_code {end a job (\&{end}, \&{dump}), must be |end_group+1|}
+@d max_command_code=stop
+@d outer_tag=max_command_code+1 {protection code added to command code}
+@z
+
+@x [13.211] MFLua - runscript primitive
+primitive("randomseed",random_seed,0);@/
+@!@:random_seed_}{\&{randomseed} primitive@>
+@y
+primitive("randomseed",random_seed,0);@/
+@!@:random_seed_}{\&{randomseed} primitive@>
+primitive("runscript",run_script,0);@/
+@!@:run_script_}{\&{runscript} primitive@>
+@z
+
+@x [13.212] MFLua - runscript primitive
+right_bracket:print("]");
+@y
+right_bracket:print("]");
+run_script:print("runscript");
+@z
+
+@x [17.257] MFLua
+begin print_diagnostic("Path",s,nuline); print_ln;
+@y
+begin 
+mflua_printpath(h,s,nuline);
+print_diagnostic("Path",s,nuline); print_ln;
+@z
+
+@x [20.332] MFLua
+begin print_diagnostic("Edge structure",s,nuline);
+@y
+begin
+{mflua\_printedges(s,nuline,x\_off,y\_off);}
+print_diagnostic("Edge structure",s,nuline);
+@z
+
+@x [22.465] MFLua
+  move_to_edges(m0,n0,m1,n1);
+@y
+  mflua_PRE_move_to_edges(p);
+  move_to_edges(m0,n0,m1,n1);
+  mflua_POST_move_to_edges(p);
+@z
+
+@x [24.491] MFLua
+begin p:=c; n:=info(h); lh:=link(h); {now |lh| points to $w_0$}
+@y
+begin
+{mflua\_offsetprep(c,h);}
+p:=c; n:=info(h); lh:=link(h); {now |lh| points to $w_0$}
+@z
+
+@x [24.506] MFLua
+offset_prep(p,h); {this may clobber node~|q|, if it becomes ``dead''}
+@y
+mfluaPRE_offset_prep(p,h);
+offset_prep(p,h); {this may clobber node~|q|, if it becomes ``dead''}
+mfluaPOST_offset_prep(p,h);
+@z
+
+@x [24.519] MFLua
+  unskew(x1,y1,octant);@/
+@y
+  unskew(x1,y1,octant);@/
+  mflua_print_retrograde_line(x0,y0,cur_x,cur_y);
+@z
+
+@x [24.515] MFLua
+begin xx:=x_coord(r)+x_coord(w); yy:=y_coord(r)+y_coord(w)+half_unit;
+@y
+begin xx:=x_coord(r)+x_coord(w); yy:=y_coord(r)+y_coord(w)+half_unit;
+mflua_print_transition_line_from(xx,yy-half_unit);
+@z
+
+@x [24.515] MFLua
+else  begin decr(k); w:=knil(w);
+  xp:=x_coord(r)+x_coord(w); yp:=y_coord(r)+y_coord(w)+half_unit;
+  end;
+@y
+else  begin decr(k); w:=knil(w);
+  xp:=x_coord(r)+x_coord(w); yp:=y_coord(r)+y_coord(w)+half_unit;
+  end;
+mflua_print_transition_line_to(xp,yp-half_unit);
+@z
+
+@x [24.521] MFLua
+@<Insert a line segment dually to approach the correct offset@>=
+begin xx:=x_coord(r)+x_coord(w); yy:=y_coord(r)+y_coord(w)+half_unit;
+@y
+@<Insert a line segment dually to approach the correct offset@>=
+begin xx:=x_coord(r)+x_coord(w); yy:=y_coord(r)+y_coord(w)+half_unit;
+mflua_print_transition_line_from(xx,yy-half_unit);
+@z
+
+@x [24.521] MFLua
+else  begin incr(k); w:=link(w);
+  xp:=x_coord(r)+x_coord(w); yp:=y_coord(r)+y_coord(w)+half_unit;
+  end;
+@y
+else  begin incr(k); w:=link(w);
+  xp:=x_coord(r)+x_coord(w); yp:=y_coord(r)+y_coord(w)+half_unit;
+  end;
+mflua_print_transition_line_to(xp,yp-half_unit);
+@z
+
+@x [31.630] MFLua - runscript primitive
+moved into the buffer by \&{scantokens}.
+@y
+moved into the buffer by \&{scantokens} or \&{runscript}.
+@z
+
+@x [31.637] MFLua - runscript primitive
+else if name=2 then print_nl("<scantokens>")
+@y
+else if name=2 then print_nl("<scantokens> or <runscript>")
+@z
+
+@x [33.679] MFLua - runscript primitive
+     {text was inserted during error recovery or by \&{scantokens}}
+@y
+     {text was inserted during error recovery or by \&{scantokens} or \&{runscript}}
+@z
+
+@x [35.706] MFLua - runscript primitive
+|exit_test|, |relax|, |scan_tokens|, |expand_after|, and |defined_macro|.
+@y
+|exit_test|, |relax|, |scan_tokens|, |run_script|, |expand_after|, and |defined_macro|.
+@z
+
+@x [35.707] MFLua - runscript primitive
+scan_tokens: @<Put a string into the input buffer@>;
+@y
+scan_tokens: @<Put a string into the input buffer@>;
+run_script:  @<Pass a string to the Lua interpreter and put the result string into the input buffer@>;
+@z
+
+@x [39.796] MFLua - runscript primitive
+@!cur_exp:integer; {the value of the expression just found}
+@y
+@!cur_exp:integer; {the value of the expression just found}
+@!lua_cur_exp:integer; {the value of the Lua expression returned by runscript}
+@z
+
+@x [41.866] MFLua
+q:=make_ellipse(major_axis,minor_axis,theta);
+if (tx<>0)or(ty<>0) then @<Shift the coordinates of path |q|@>;
+@y
+mfluaPRE_make_ellipse(major_axis,minor_axis,theta,tx,ty,0);
+q:=make_ellipse(major_axis,minor_axis,theta);
+if (tx<>0)or(ty<>0) then @<Shift the coordinates of path |q|@>;
+mfluaPOST_make_ellipse(major_axis,minor_axis,theta,tx,ty,q);
+@z
+
+@x [41.891] MFLua
+make_choices(p);
+@y
+mfluaPRE_make_choices(p);
+make_choices(p);
+mfluaPOST_make_choices(p);
+@z
+
+@x [44.1064] MFLua
+  if max_offset(cur_pen)=0 then fill_spec(rhs)
+  else fill_envelope(rhs);
+  if lhs<>null then
+    begin rev_turns:=true;
+    lhs:=make_spec(lhs,max_offset(cur_pen),internal[tracing_specs]);
+    rev_turns:=false;
+    if max_offset(cur_pen)=0 then fill_spec(lhs)
+    else fill_envelope(lhs);
+@y
+  if max_offset(cur_pen)=0 then begin mfluaPRE_fill_spec_rhs(rhs); fill_spec(rhs); mfluaPOST_fill_spec_rhs(rhs);end 
+  else begin mfluaPRE_fill_envelope_rhs(rhs); fill_envelope(rhs); mfluaPOST_fill_envelope_rhs(rhs); end ;
+  if lhs<>null then
+    begin rev_turns:=true;
+    lhs:=make_spec(lhs,max_offset(cur_pen),internal[tracing_specs]);
+    rev_turns:=false;
+    if max_offset(cur_pen)=0 then begin mfluaPRE_fill_spec_lhs(lhs); fill_spec(lhs); mfluaPOST_fill_spec_lhs(lhs); end
+    else begin mfluaPRE_fill_envelope_lhs(lhs); fill_envelope(lhs); mfluaPOST_fill_envelope_lhs(lhs); end;
+@z
+
+@x [47.1165] MFLua
+print_char("]"); update_terminal; {progress report}
+@y
+print_char("]"); update_terminal; {progress report}
+mflua_printedges(" (just shipped out)",true,x_off,y_off);
+@z
+
+@x [49.1204] MFLua
+@p begin @!{|start_here|}
+@y
+@p begin @!{|start_here|}
+mflua_begin_program;
+@z
+
+@x [49.1204] MFLua
+start_of_MF: @<Initialize the output routines@>;
+@<Get the first line of input and prepare to start@>;
+history:=spotless; {ready to go!}
+if start_sym>0 then {insert the `\&{everyjob}' symbol}
+  begin cur_sym:=start_sym; back_input;
+  end;
+main_control; {come to life}
+final_cleanup; {prepare for death}
+@y
+mfluaPRE_start_of_MF;
+start_of_MF: @<Initialize the output routines@>;
+@<Get the first line of input and prepare to start@>;
+history:=spotless; {ready to go!}
+{This was the first sensor. Original comment: "remember to modify web2c/texmf.defines by adding mfuainitialize and then texmfmp.h and lib/texmfmp.c". Now obsolete}
+mflua_initialize;
+if start_sym>0 then {insert the `\&{everyjob}' symbol}
+  begin cur_sym:=start_sym; back_input;
+  end;
+mfluaPRE_main_control;
+main_control; {come to life}
+mfluaPOST_main_control;
+final_cleanup; {prepare for death}
+mfluaPOST_final_cleanup;
+@z
+
+@x [49.1205] MFLua
+  end;
+end;
+@y
+  end;
+mflua_end_program;
+end;
+@z
+
+@x [51.1214] MFLua - additional sections to handle runscript
+@* \[51] System-dependent changes.
+@y
+@ @<Pass a string to the Lua interpreter and put the result string into the input buffer@>=
+begin get_x_next; scan_primary;
+if cur_type<>string_type then
+  begin disp_err(null,"Not a string");
+@.Not a string@>
+  help2("I'm going to flush this expression, since")@/
+    ("runscript should be followed by a known string.");
+  put_get_flush_error(0);
+  end
+else  begin back_input;
+  if length(cur_exp)>0 then @<As for scantokens, pretend we're reading a new one-line file@>;
+  end;
+end
+
+@ @<As for scantokens, pretend we're reading a new one-line file@>=
+begin {begin\_file\_reading;} name:=2; {should be name:=3 but for the moment we keep 2}
+k:=first+length(cur_exp);
+{print("  k=");print\_int(k);print\_ln;}
+{print("  first=");print\_int(first);print\_ln;}
+{print("  length(cur\_exp)=");print\_int(length(cur\_exp));print\_ln;}
+{ Will be removed as soon as we have tested that it's ok}
+{if k>=max\_buf\_stack then}
+{  begin if k>=buf\_size then}
+{    begin max\_buf\_stack:=buf\_size;}
+{    overflow("buffer size",buf\_size);}
+{    end;}
+{  max\_buf\_stack:=k+1;}
+{  end;}
+j:=str_start[cur_exp]; limit:=k;
+mflua_runscript(j,first,limit);
+lua_cur_exp:=make_string; 
+if length(lua_cur_exp)> 0 then 
+begin
+ begin_file_reading;
+ add_str_ref(lua_cur_exp);
+ j:=str_start[lua_cur_exp]; k:=first+length(lua_cur_exp);limit:=k;
+{ Will be removed as soon as we have tested that it's ok}
+{print("=============BEGIN TEST===============");print\_ln;}
+{print("  k=");print\_int(k);print\_ln;}
+{print("  first=");print\_int(first);print\_ln;}
+{print("  limit=");print\_int(limit);print\_ln;}
+{print("  length(lua\_cur\_exp)=");print\_int(length(lua\_cur\_exp));print\_ln;}
+ if k>=max_buf_stack then
+ begin if k>=buf_size then
+   begin max_buf_stack:=buf_size;
+    overflow("buffer size",buf_size);
+@:METAFONT capacity exceeded buffer size}{\quad buffer size@>
+   end;
+ max_buf_stack:=k+1;
+ end;
+ while first<limit do
+  begin 
+   {print("  loop");print\_ln;}
+   buffer[first]:=so(str_pool[j]); {print(so(str\_pool[j]));} incr(j); incr(first);
+  end;
+  buffer[limit]:="%"; first:=limit+1; loc:=start; 
+  {print("=============END TEST=================");print\_ln;}
+  delete_str_ref(lua_cur_exp);
+end;
+flush_cur_exp(0);
+end
+@* \[51] System-dependent changes.
+@z
\ No newline at end of file
diff --git a/Build/source/texk/web2c/mfluadir/mflua-m.ch b/Build/source/texk/web2c/mfluadir/mflua-m.ch
new file mode 100644
index 00000000000..c915d72e12b
--- /dev/null
+++ b/Build/source/texk/web2c/mfluadir/mflua-m.ch
@@ -0,0 +1,12 @@
+@x [1.11]
+@!max_strings=7500; {maximum number of strings; must not exceed |max_halfword|}
+@y
+@!max_strings=75000; {maximum number of strings; must not exceed |max_halfword|}
+@z
+
+@x [1.11]
+@!pool_size=100000; {maximum number of characters in strings, including all
+@y
+@!pool_size=1000000; {maximum number of characters in strings, including all
+@z
+
diff --git a/Build/source/texk/web2c/mfluadir/mflua.defines b/Build/source/texk/web2c/mfluadir/mflua.defines
new file mode 100644
index 00000000000..383f1def95b
--- /dev/null
+++ b/Build/source/texk/web2c/mfluadir/mflua.defines
@@ -0,0 +1,25 @@
+{ Additional symbols for MFLua.  Public domain.}
+
+@define procedure mfluainitialize;
+@define procedure mfluaprintpath();
+@define procedure mfluaprintedges();
+@define procedure mfluaPREoffsetprep();
+@define procedure mfluaPOSToffsetprep();
+@define procedure mfluaPREfillenveloperhs();
+@define procedure mfluaPOSTfillenveloperhs();
+@define procedure mfluaPREfillenvelopelhs();
+@define procedure mfluaPOSTfillenvelopelhs();
+@define procedure mfluaPREfillspecrhs();
+@define procedure mfluaPOSTfillspecrhs();
+@define procedure mfluaPREfillspeclhs();
+@define procedure mfluaPOSTfillspeclhs();
+@define procedure mfluaPREmovetoedges();
+@define procedure mfluaPOSTmovetoedges();
+@define procedure mfluaPREmakechoices();
+@define procedure mfluaPOSTmakechoices();
+@define procedure mfluaprintretrogradeline();
+@define procedure mfluaprinttransitionlinefrom();
+@define procedure mfluaprinttransitionlineto();
+@define procedure mfluaPREmakeellipse();
+@define procedure mfluaPOSTmakeellipse();
+@define procedure mfluarunscript();
diff --git a/Build/source/texk/web2c/mfluadir/mflua_version.h b/Build/source/texk/web2c/mfluadir/mflua_version.h
new file mode 100644
index 00000000000..9b0b575ceab
--- /dev/null
+++ b/Build/source/texk/web2c/mfluadir/mflua_version.h
@@ -0,0 +1 @@
+#define MFLUA_VERSION "0.5"
diff --git a/Build/source/texk/web2c/mfluadir/mfluac.c b/Build/source/texk/web2c/mfluadir/mfluac.c
new file mode 100644
index 00000000000..5c1ddd5f66a
--- /dev/null
+++ b/Build/source/texk/web2c/mfluadir/mfluac.c
@@ -0,0 +1,1480 @@
+#define EXTERN extern
+
+#if defined(JIT)
+#include "mfluajitd.h"
+#else
+#include "mfluad.h"
+#endif
+
+#include <lua.h>
+#include <lualib.h>
+#include <lauxlib.h>
+
+/**************************************************************/
+/*                                                            */
+/* private functions                                          */
+/*                                                            */
+/**************************************************************/
+static lua_State *Luas[1];
+
+static void priv_lua_reporterrors(lua_State *L, int status)
+{
+  if ( status!=0 ) {
+    fprintf(stderr,"\n! %s\n",lua_tostring(L, -1));
+    lua_pop(L, 1); /* remove error message */
+  }
+}
+
+#define link_field(p) mem[p].hhfield.rh /* {the |link| field of a memory word} */
+static int priv_mfweb_link(lua_State *L)
+{
+  halfword p,q;
+  p = (halfword) lua_tonumber(L,1);
+  q = link_field(p);
+  lua_pushnumber(L,q);
+  return 1;
+}
+
+#define info_field(p) mem[p].hhfield.lhfield /* {the |info| field of a memory word} */
+static int priv_mfweb_info(lua_State *L)
+{
+  halfword p,q;
+  p = (halfword) lua_tonumber(L,1);
+  q = info_field(p);
+  lua_pushnumber(L,q);
+  return 1;
+}
+
+
+#define x_coord(p) mem[p+1].cint /* {the |x| coordinate of this knot} */
+static int priv_mfweb_x_coord(lua_State *L)
+{
+  halfword p;
+  int q;
+  p = (halfword) lua_tonumber(L,1);
+  q = x_coord(p);
+  lua_pushnumber(L,q);
+  return 1;
+}
+
+#define y_coord(p) mem[p+2].cint /* {the |y| coordinate of this knot} */
+static int priv_mfweb_y_coord(lua_State *L)
+{
+  halfword p,q;
+  p = (halfword) lua_tonumber(L,1);
+  q = y_coord(p);
+  lua_pushnumber(L,q);
+  return 1;
+}
+
+
+#define left_type(p) mem[p].hhfield.b0 /* {characterizes the path entering this knot} */
+static int priv_mfweb_left_type(lua_State *L)
+{
+  halfword p,q;
+  p = (halfword) lua_tonumber(L,1);
+  q = left_type(p);
+  lua_pushnumber(L,q);
+  return 1;
+}
+
+#define right_type(p) mem[p].hhfield.b1 /* {characterizes the path leaving this knot} */
+static int priv_mfweb_right_type(lua_State *L)
+{
+  halfword p,q;
+  p = (halfword) lua_tonumber(L,1);
+  q = right_type(p);
+  lua_pushnumber(L,q);
+  return 1;
+}
+
+
+#define left_x(p) mem[p+3].cint /* {the |x| coordinate of previous control point} */
+static int priv_mfweb_left_x(lua_State *L)
+{
+  halfword p;
+  integer q ;
+  p = (halfword) lua_tonumber(L,1);
+  q = left_x(p);
+  lua_pushnumber(L,q);
+  return 1;
+}
+
+
+#define left_y(p) mem[p+4].cint /* {the |y| coordinate of previous control point} */
+static int priv_mfweb_left_y(lua_State *L)
+{
+  halfword p;
+  integer q ;
+  p = (halfword) lua_tonumber(L,1);
+  q = left_y(p);
+  lua_pushnumber(L,q);
+  return 1;
+}
+
+
+#define right_x(p) mem[p+5].cint /* {the |x| coordinate of next control point} */
+static int priv_mfweb_right_x(lua_State *L)
+{
+  halfword p;
+  integer q ;
+  p = (halfword) lua_tonumber(L,1);
+  q = right_x(p);
+  lua_pushnumber(L,q);
+  return 1;
+}
+
+#define right_y(p) mem[p+6].cint /* {the |y| coordinate of next control point} */
+static int priv_mfweb_right_y(lua_State *L)
+{
+  halfword p;
+  integer q;
+  p = (halfword) lua_tonumber(L,1);
+  q = right_y(p);
+  lua_pushnumber(L,q);
+  return 1;
+}
+
+/* @ Conversely, the |n_sin_cos| routine takes an |angle| and produces the sine */
+/* and cosine of that angle. The results of this routine are */
+/* stored in global integer variables |n_sin| and |n_cos|. */
+
+/* @<Glob...@>= */
+/* @!n_sin,@!n_cos:fraction; {results computed by |n_sin_cos|} */
+
+/* @ Given an integer |z| that is $2^{20}$ times an angle $\theta$ in degrees, */
+/* the purpose of |n_sin_cos(z)| is to set */
+/* |x=@t$r\cos\theta$@>| and |y=@t$r\sin\theta$@>| (approximately), */
+/* for some rather large number~|r|. The maximum of |x| and |y| */
+/* will be between $2^{28}$ and $2^{30}$, so that there will be hardly */
+/* any loss of accuracy. Then |x| and~|y| are divided by~|r|. */
+static int priv_mfweb_n_sin_cos(lua_State *L)
+{
+  nsincos(lua_tonumber(L,1));
+  return 0;
+}
+
+	   
+/* @ When a lot of work is being done on a particular edge structure, we plant */
+/* a pointer to its main header in the global variable |cur_edges|. */
+/* This saves us from having to pass this pointer as a parameter over and */
+/* over again between subroutines. */
+
+/* Similarly, |cur_wt| is a global weight that is being used by several */
+/* procedures at once. */
+
+/* @<Glob...@>= */
+/* @!cur_edges:pointer; {the edge structure of current interest} */
+/* @!cur_wt:integer; {the edge weight of current interest} */
+static int priv_mfweb_LUAGLOBALGET_cur_edges(lua_State *L)
+{
+  halfword p = curedges;
+  lua_pushnumber(L,p);
+  return 1;
+}
+
+
+/* @<Glob...@>= */
+/* @!cur_type:small_number; {the type of the expression just found} */
+/* @!cur_exp:integer; {the value of the expression just found} */
+static int priv_mfweb_LUAGLOBALGET_cur_exp(lua_State *L)
+{
+  halfword p = curexp;
+  lua_pushnumber(L,p);
+  return 1;
+}
+
+
+
+
+
+
+/* @d mem_top==30000 {largest index in the |mem| array dumped by \.{INIMF}; */
+/*   must be substantially larger than |mem_min| */
+/*   and not greater than |mem_max|} */
+static int priv_mfweb_LUAGLOBALGET_mem_top(lua_State *L)
+{
+  integer p = memtop;
+  lua_pushnumber(L,p);
+  return 1;
+}
+
+
+
+/* And there are two global variables that affect the rounding */
+/* decisions, as we'll see later; they are called |cur_pen| and |cur_path_type|. */
+/* The latter will be |double_path_code| if |make_spec| is being */
+/* applied to a double path.*/
+/* @!cur_pen:pointer; {an implicit input of |make_spec|, used in autorounding} */
+static int priv_mfweb_LUAGLOBALGET_cur_pen(lua_State *L)
+{
+  halfword p = curpen;
+  lua_pushnumber(L,p);
+  return 1;
+}
+
+
+/* @ The current octant code appears in a global variable. If, for example, */  
+/* we have |octant=third_octant|, it means that a curve traveling in a north to */  
+/* north-westerly direction has been rotated for the purposes of internal */  
+/* calculations so that the |move| data travels in an east to north-easterly */  
+/* direction. We want to unrotate as we update the edge structure.       */  
+/*                                                                       */
+/* @<Glob...@>=                                                          */ 
+/* @!octant:first_octant..sixth_octant; {the current octant of interest} */
+static int priv_mfweb_LUAGLOBALGET_octant(lua_State *L)
+{
+  char p = octant;
+  lua_pushnumber(L,p);
+  return 1;
+}
+
+
+
+
+
+/* @ \MF\ also has a bunch of internal parameters that a user might want to      */
+/* fuss with. Every such parameter has an identifying code number, defined here. */
+/* Warning: these parameters must be the same of the original MF !!              */
+#define tracing_titles 1 /*show titles online when they appear} */
+#define tracing_equations 2 /*show each variable when it becomes known} */
+#define tracing_capsules 3 /*show capsules too} */
+#define tracing_choices 4 /*show the control points chosen for paths} */
+#define tracing_specs 5 /*show subdivision of paths into octants before digitizing} */
+#define tracing_pens 6 /*show details of pens that are made} */
+#define tracing_commands 7 /*show commands and operations before they are performed} */
+#define tracing_restores 8 /*show when a variable or internal is restored} */
+#define tracing_macros 9 /*show macros before they are expanded} */
+#define tracing_edges 10 /*show digitized edges as they are computed} */
+#define tracing_output 11 /*show digitized edges as they are output} */
+#define tracing_stats 12 /*show memory usage at end of job} */
+#define tracing_online 13 /*show long diagnostics on terminal and in the log file} */
+#define year 14 /*the current year (e.g., 1984)} */
+#define month 15 /*the current month (e.g., 3 $\equiv$ March)} */
+#define day 16 /*the current day of the month} */
+#define time 17 /*the number of minutes past midnight when this job started} */
+#define char_code 18 /*the number of the next character to be output} */
+#define char_ext 19 /*the extension code of the next character to be output} */
+#define char_wd 20 /*the width of the next character to be output} */
+#define char_ht 21 /*the height of the next character to be output} */
+#define char_dp 22 /*the depth of the next character to be output} */
+#define char_ic 23 /*the italic correction of the next character to be output} */
+#define char_dx 24 /*the device's $x$ movement for the next character, in pixels} */
+#define char_dy 25 /*the device's $y$ movement for the next character, in pixels} */
+#define design_size 26 /*the unit of measure used for |char_wd..char_ic|, in points} */
+#define hppp 27 /*the number of horizontal pixels per point} */
+#define vppp 28 /*the number of vertical pixels per point} */
+#define x_offset 29 /*horizontal displacement of shipped-out characters} */
+#define y_offset 30 /*vertical displacement of shipped-out characters} */
+#define pausing 31 /*positive to display lines on the terminal before they are read} */
+#define showstopping 32 /*positive to stop after each \&{show} command} */
+#define fontmaking 33 /*positive if font metric output is to be produced} */
+#define proofing 34 /*positive for proof mode, negative to suppress output} */
+#define smoothing 35 /*positive if moves are to be ``smoothed''} */
+#define autorounding 36 /*controls path modification to ``good'' points} */
+#define granularity 37 /*autorounding uses this pixel size} */
+#define fillin 38 /*extra darkness of diagonal lines} */
+#define turning_check 39 /*controls reorientation of clockwise paths} */
+#define warning_check 40 /*controls error message when variable value is large} */
+#define boundary_char 41 /*the right boundary character for ligatures} */
+/* @d max_given_internal=41 */
+
+static int priv_mfweb_LUAGLOBALGET_char_code(lua_State *L)
+{
+  integer p =  roundunscaled ( internal [char_code]) % 256 ;
+  lua_pushnumber(L,p);
+  return 1;
+}
+static int priv_mfweb_LUAGLOBALGET_char_ext(lua_State *L)
+{
+  integer p =  roundunscaled ( internal [char_ext]) ;
+  lua_pushnumber(L,p);
+  return 1;
+}
+
+
+static int priv_mfweb_LUAGLOBALGET_char_wd(lua_State *L)
+{
+  integer p =   internal [char_wd]  ;
+  lua_pushnumber(L,p);
+  return 1;
+}
+static int priv_mfweb_LUAGLOBALGET_char_ht(lua_State *L)
+{
+  integer p =   internal [char_ht]  ;
+  lua_pushnumber(L,p);
+  return 1;
+}
+static int priv_mfweb_LUAGLOBALGET_char_dp(lua_State *L)
+{
+  integer p =   internal [char_dp]  ;
+  lua_pushnumber(L,p);
+  return 1;
+}
+static int priv_mfweb_LUAGLOBALGET_char_ic(lua_State *L)
+{
+  integer p =   internal [char_ic]  ;
+  lua_pushnumber(L,p);
+  return 1;
+}
+
+static int priv_mfweb_LUAGLOBALGET_char_dx(lua_State *L)
+{
+  integer p =   internal [char_dx]  ;
+  lua_pushnumber(L,p);
+  return 1;
+}
+
+static int priv_mfweb_LUAGLOBALGET_char_dy(lua_State *L)
+{
+  integer p =   internal [char_dy]  ;
+  lua_pushnumber(L,p);
+  return 1;
+}
+
+static int priv_mfweb_LUAGLOBALGET_designsize(lua_State *L)
+{
+  integer p =   internal [design_size] ;
+  lua_pushnumber(L,p);
+  return 1;
+}
+
+static int priv_mfweb_LUAGLOBALGET_hppp(lua_State *L)
+{
+  integer p =   internal [hppp]  ;
+  lua_pushnumber(L,p);
+  return 1;
+}
+
+static int priv_mfweb_LUAGLOBALGET_vppp(lua_State *L)
+{
+  integer p =   internal [vppp]  ;
+  lua_pushnumber(L,p);
+  return 1;
+}
+
+static int priv_mfweb_LUAGLOBALGET_x_offset(lua_State *L)
+{
+  integer p =   internal [x_offset]  ;
+  lua_pushnumber(L,p);
+  return 1;
+}
+
+static int priv_mfweb_LUAGLOBALGET_y_offset(lua_State *L)
+{
+  integer p =   internal [y_offset]  ;
+  lua_pushnumber(L,p);
+  return 1;
+}
+
+static int priv_mfweb_LUAGLOBALGET_granularity(lua_State *L)
+{
+  integer p =   internal [granularity]  ;
+  lua_pushnumber(L,p);
+  return 1;
+}
+
+static int priv_mfweb_LUAGLOBALGET_fillin(lua_State *L)
+{
+  integer p =   internal [fillin]  ;
+  lua_pushnumber(L,p);
+  return 1;
+}
+
+static int priv_mfweb_LUAGLOBALGET_turning_check(lua_State *L)
+{
+  integer p =   internal [turning_check]  ;
+  lua_pushnumber(L,p);
+  return 1;
+}
+
+static int priv_mfweb_LUAGLOBALGET_boundary_char(lua_State *L)
+{
+  integer p =   internal [boundary_char]  ;
+  lua_pushnumber(L,p);
+  return 1;
+}
+
+
+
+
+
+
+/**************************************************************/
+/*                                                            */
+/* mflua layer                                                */
+/*                                                            */
+/**************************************************************/
+int mfluabeginprogram(void)
+{
+  lua_State *L = luaL_newstate();
+  const char* luafile = "begin_program.lua";
+  int res ;
+  luaL_openlibs(L);
+  Luas[0] = L;
+  /* execute Lua external "begin_program.lua" */
+  res = luaL_loadfile(L, luafile);
+  if ( res==0 ) {
+      res = lua_pcall(L, 0, 0, 0);
+    }
+  /* stackdump_g(L); */
+  priv_lua_reporterrors(L, res);
+  return 0;
+}
+
+int mfluaendprogram(void)
+{
+  lua_State *L = Luas[0];
+   /* execute Lua external "end_program.lua" */
+  const char* file = "end_program.lua";
+  int res = luaL_loadfile(L, file);
+  if ( res==0 ) {
+      res = lua_pcall(L, 0, 0, 0);
+    }
+  /* stackdump_g(L); */
+  priv_lua_reporterrors(L, res);
+  return 0;
+}
+
+
+int mfluaPREstartofMF(void)
+{
+  lua_State *L = Luas[0];
+  const char* file = "start_of_MF.lua";
+  int res = luaL_loadfile(L, file);
+  if ( res==0 ){
+      res = lua_pcall(L, 0, 0, 0);
+      if (res==0){
+	lua_getglobal(L, "PRE_start_of_MF");  /* function to be called */
+	/* do the call (0 arguments, 1 result) */
+	res = lua_pcall(L, 0, 1, 0) ;
+	if (res==0) {
+	  /* retrieve result */
+	  int z = 0;
+	  if (!lua_isnumber(L, -1)){
+	    fprintf(stderr,"\n! Error:function `PRE_start_of_MF number called with %s\n",lua_tostring(L, -1));
+	    lua_pop(L, 1);  /* pop returned value */
+	    return z;
+	  }else {
+	    z = lua_tonumber(L, -1);
+	    lua_pop(L, 1);  /* pop returned value */
+	    return z;
+	  }
+	}
+      }
+  }
+  /* stackdump_g(L); */
+  priv_lua_reporterrors(L, res);
+  return 0;
+
+}
+
+
+int mfluaPREmaincontrol(void)
+{
+  lua_State *L = Luas[0];
+  const char* file = "main_control.lua";
+  int res = luaL_loadfile(L, file);
+  if ( res==0 ){
+      res = lua_pcall(L, 0, 0, 0);
+      if (res==0){
+	lua_getglobal(L, "PRE_main_control");  /* function to be called */
+	/* do the call (0 arguments, 1 result) */
+	res = lua_pcall(L, 0, 1, 0) ;
+	if (res==0) {
+	  /* retrieve result */
+	  int z = 0;
+	  if (!lua_isnumber(L, -1)){
+	    fprintf(stderr,"\n! Error:function `PRE_main_control called with %s\n",lua_tostring(L, -1));
+	    lua_pop(L, 1);  /* pop returned value */
+	    return z;
+	  }else {
+	    z = lua_tonumber(L, -1);
+	    lua_pop(L, 1);  /* pop returned value */
+	    return z;
+	  }
+	}
+      }
+  }
+  /*stackdump_g(L);*/
+  priv_lua_reporterrors(L, res);
+  return 0;
+
+}
+
+
+int mfluaPOSTmaincontrol(void)
+{
+  lua_State *L = Luas[0];
+  const char* file = "main_control.lua";
+  int res = luaL_loadfile(L, file);
+  if ( res==0 ){
+      res = lua_pcall(L, 0, 0, 0);
+      if (res==0){
+	lua_getglobal(L, "POST_main_control");  /* function to be called */
+	/* do the call (0 arguments, 1 result) */
+	res = lua_pcall(L, 0, 1, 0) ;
+	if (res==0) {
+	  /* retrieve result */
+	  int z = 0;
+	  if (!lua_isnumber(L, -1)){
+	    fprintf(stderr,"\n! Error:function `POST_main_control called with %s\n",lua_tostring(L, -1));
+	    lua_pop(L, 1);  /* pop returned value */
+	    return z;
+	  }else {
+	    z = lua_tonumber(L, -1);
+	    lua_pop(L, 1);  /* pop returned value */
+	    return z;
+	  }
+	}
+      }
+  }
+  /*stackdump_g(L);*/
+  priv_lua_reporterrors(L, res);
+  return 0;
+
+}
+
+
+
+int mfluainitialize(void)
+{
+  /* execute Lua external "mfluaini.lua" */
+  lua_State *L = Luas[0];
+  const char* file = "mfluaini.lua";
+  int res ;
+  /* register lua functions */
+  lua_pushcfunction(L, priv_mfweb_link);lua_setglobal(L, "link");
+  lua_pushcfunction(L, priv_mfweb_info);lua_setglobal(L, "info");
+  lua_pushcfunction(L, priv_mfweb_x_coord);lua_setglobal(L, "x_coord");
+  lua_pushcfunction(L, priv_mfweb_y_coord);lua_setglobal(L, "y_coord");
+  lua_pushcfunction(L, priv_mfweb_left_type);lua_setglobal(L, "left_type");
+  lua_pushcfunction(L, priv_mfweb_right_type);lua_setglobal(L, "right_type");
+  lua_pushcfunction(L, priv_mfweb_left_x);lua_setglobal(L, "left_x");
+  lua_pushcfunction(L, priv_mfweb_left_y);lua_setglobal(L, "left_y");
+  lua_pushcfunction(L, priv_mfweb_right_x);lua_setglobal(L, "right_x");
+  lua_pushcfunction(L, priv_mfweb_right_y);lua_setglobal(L, "right_y");
+  lua_pushcfunction(L, priv_mfweb_n_sin_cos);lua_setglobal(L, "n_sin_cos");
+  lua_pushcfunction(L, priv_mfweb_LUAGLOBALGET_cur_edges);lua_setglobal(L, "LUAGLOBALGET_cur_edges");
+  lua_pushcfunction(L, priv_mfweb_LUAGLOBALGET_cur_exp);lua_setglobal(L, "LUAGLOBALGET_cur_exp");
+  lua_pushcfunction(L, priv_mfweb_LUAGLOBALGET_mem_top);lua_setglobal(L, "LUAGLOBALGET_mem_top");
+  lua_pushcfunction(L, priv_mfweb_LUAGLOBALGET_cur_pen);lua_setglobal(L, "LUAGLOBALGET_cur_pen");
+  lua_pushcfunction(L, priv_mfweb_LUAGLOBALGET_octant);lua_setglobal(L, "LUAGLOBALGET_octant");
+  lua_pushcfunction(L, priv_mfweb_LUAGLOBALGET_char_code);lua_setglobal(L, "LUAGLOBALGET_char_code");
+  lua_pushcfunction(L, priv_mfweb_LUAGLOBALGET_char_ext);lua_setglobal(L, "LUAGLOBALGET_char_ext");
+  lua_pushcfunction(L, priv_mfweb_LUAGLOBALGET_char_wd);lua_setglobal(L, "LUAGLOBALGET_char_wd");
+  lua_pushcfunction(L, priv_mfweb_LUAGLOBALGET_char_ht);lua_setglobal(L, "LUAGLOBALGET_char_ht");
+  lua_pushcfunction(L, priv_mfweb_LUAGLOBALGET_char_dp);lua_setglobal(L, "LUAGLOBALGET_char_dp");
+  lua_pushcfunction(L, priv_mfweb_LUAGLOBALGET_char_ic);lua_setglobal(L, "LUAGLOBALGET_char_ic");
+  /* */
+  lua_pushcfunction(L, priv_mfweb_LUAGLOBALGET_char_dx);lua_setglobal(L,"LUAGLOBALGET_char_dx");
+  lua_pushcfunction(L, priv_mfweb_LUAGLOBALGET_char_dy);lua_setglobal(L,"LUAGLOBALGET_char_dy");
+  lua_pushcfunction(L, priv_mfweb_LUAGLOBALGET_designsize);lua_setglobal(L,"LUAGLOBALGET_designsize");
+  lua_pushcfunction(L, priv_mfweb_LUAGLOBALGET_hppp);lua_setglobal(L,"LUAGLOBALGET_hppp");
+  lua_pushcfunction(L, priv_mfweb_LUAGLOBALGET_vppp);lua_setglobal(L,"LUAGLOBALGET_vppp");
+  lua_pushcfunction(L, priv_mfweb_LUAGLOBALGET_x_offset);lua_setglobal(L,"LUAGLOBALGET_x_offset");
+  lua_pushcfunction(L, priv_mfweb_LUAGLOBALGET_y_offset);lua_setglobal(L,"LUAGLOBALGET_y_offset");
+  lua_pushcfunction(L, priv_mfweb_LUAGLOBALGET_granularity);lua_setglobal(L,"LUAGLOBALGET_granularity");
+  lua_pushcfunction(L, priv_mfweb_LUAGLOBALGET_fillin);lua_setglobal(L,"LUAGLOBALGET_fillin");
+  lua_pushcfunction(L, priv_mfweb_LUAGLOBALGET_turning_check);lua_setglobal(L,"LUAGLOBALGET_turning_check");
+  lua_pushcfunction(L, priv_mfweb_LUAGLOBALGET_boundary_char);lua_setglobal(L,"LUAGLOBALGET_boundary_char");
+
+  /*lua_pushcfunction(L, priv_mfweb_SKELETON);lua_setglobal(L, "SKELETON");*/
+  /* execute Lua external "mfluaini.lua" */
+  res = luaL_loadfile(L, file);
+  if ( res==0 ) {
+      res = lua_pcall(L, 0, 0, 0);
+    }
+  priv_lua_reporterrors(L, res);
+  return 0;
+}
+
+
+int mfluaPOSTfinalcleanup(void)
+{
+  lua_State *L = Luas[0];
+  const char* file = "final_cleanup.lua";
+  int res = luaL_loadfile(L, file);
+  /*if (res!=0) {fprintf(stderr,"\n! Warning: file final_cleanup not loaded\n",lua_tostring(L, -1)); return res;}*/
+  if ( res==0 ){
+      res = lua_pcall(L, 0, 0, 0);
+      /*if (res!=0) {fprintf(stderr,"\n! Error: final_cleanup lua_pcall fails\n",lua_tostring(L, -1)); return res;}*/
+      if (res==0){
+	lua_getglobal(L, "POST_final_cleanup");  /* function to be called */
+	/* do the call (0 arguments, 1 result) */
+	res = lua_pcall(L, 0, 1, 0) ;
+        /*if (res!=0) {fprintf(stderr,"\n! Error:function `POST_final_cleanup called fails\n",lua_tostring(L, -1)); return res;}*/
+	if (res==0) {
+	  /* retrieve result */
+	  int z = 0;
+	  if (!lua_isnumber(L, -1)){
+	    fprintf(stderr,"\n! Error:function `POST_final_cleanup called with %s\n",lua_tostring(L, -1));
+	    lua_pop(L, 1);  /* pop returned value */
+	    return z;
+	  }else {
+	    z = lua_tonumber(L, -1);
+	    lua_pop(L, 1);  /* pop returned value */
+	    return z;
+	  }
+	}
+      }
+  }
+  /*stackdump_g(L);*/
+  priv_lua_reporterrors(L, res);
+  return 0;
+}
+
+
+
+/* Not a good way: */
+/* 1) these definitions are taken from mfcoerc.h which is generated at run-time */
+/* 2) too much coupling with webc2c translation of mf.web*/
+/*                               */
+/* #define printdiagnostic(s, t, nuline) zprintdiagnostic((strnumber) (s), (strnumber) (t), (boolean) (nuline)) */
+/* #define print(s) zprint((integer) (s)) */
+/* #define printarg(q, n, b) zprintarg((halfword) (q), (integer) (n), (halfword) (b) */
+/* int mfluaprintpath P3C(halfword, h , strnumber, s , boolean, nuline) */
+/* { */
+/*   fprintf(stderr,"\n! %d \n",s); */
+/*   printdiagnostic ( 517 , s , nuline ) ; */
+/*   println () ; */
+/*   print ( 518 ) ; */
+/*   println () ; */
+/*   fprintf(stderr,"\n! %s\n","*end***************"); */
+
+/*   lua_State *L = Luas[0]; */
+/*   const char* file = "print_path.lua"; */
+/*   int res = luaL_loadfile(L, file); */
+/*   if ( res==0 ) { */
+/*       res = lua_pcall(L, 0, 0, 0); */
+/*     } */
+/*   // */
+/*   //stackdump_g(L); */
+
+/*   // */
+/*   priv_lua_reporterrors(L, res); */
+/*   return 0; */
+
+/* } */
+
+int mfluaprintpath(halfword h, strnumber s, boolean nuline)
+{
+  lua_State *L = Luas[0];
+  const char* file = "print_path.lua";
+  int res = luaL_loadfile(L, file);
+  if ( res==0 ){
+      res = lua_pcall(L, 0, 0, 0);
+      if (res==0){
+	lua_getglobal(L, "print_path");  /* function to be called */
+	lua_pushnumber(L, h);   /* push 1st argument */
+	lua_pushnumber(L, s);   /* push 2nd argument */
+	lua_pushnumber(L, nuline);   /* push 3nd argument */
+	/* do the call (3 arguments, 1 result) */
+	res = lua_pcall(L, 3, 1, 0) ;
+	if (res==0) {
+	  /* retrieve result */
+	  int z = 0;
+	  if (!lua_isnumber(L, -1)){
+	    fprintf(stderr,"\n! Error:function `print_path' must return a number called with %s\n",lua_tostring(L, -1));
+	    lua_pop(L, 1);  /* pop returned value */
+	    return z;
+	  }else {
+	    z = lua_tonumber(L, -1);
+	    lua_pop(L, 1);  /* pop returned value */
+	    return z;
+	  }
+	}
+      }
+  }
+  /*stackdump_g(L); */
+  priv_lua_reporterrors(L, res);
+  return 0;
+
+}
+
+ 
+int mfluaprintedges(strnumber s, boolean nuline, integer xoff, integer yoff)
+{
+
+  lua_State *L = Luas[0];
+  const char* file = "print_edges.lua";
+  int res = luaL_loadfile(L, file);
+  if ( res==0 ){
+      res = lua_pcall(L, 0, 0, 0);
+      if (res==0){
+	lua_getglobal(L, "print_edges");  /* function to be called */
+	lua_pushnumber(L, s);   /* push 1st argument */
+	lua_pushnumber(L, nuline);   /* push 2nd argument */
+	lua_pushnumber(L, xoff);   /* push 3nd argument */
+	lua_pushnumber(L, yoff);   /* push 4nd argument */
+	/* do the call (4 arguments, 1 result) */
+	res = lua_pcall(L, 4, 1, 0) ;
+	if (res==0) {
+	  /* retrieve result */
+	  int z = 0;
+	  if (!lua_isnumber(L, -1)){
+	    fprintf(stderr,"\n! Error:function `print_edges' must return a number called with %s\n",lua_tostring(L, -1));
+	    lua_pop(L, 1);  /* pop returned value */
+	    return z;
+	  }else {
+	    z = lua_tonumber(L, -1);
+	    lua_pop(L, 1);  /* pop returned value */
+	    return z;
+	  }
+	}
+      }
+  }
+  /*stackdump_g(L);*/
+  priv_lua_reporterrors(L, res);
+  return 0;
+
+}
+
+
+/* int mfluaoffsetprep(halfword c, halfword h) */
+/* { */
+
+/*   lua_State *L = Luas[0]; */
+/*   const char* file = "offset_prep.lua"; */
+/*   int res = luaL_loadfile(L, file); */
+/*   if ( res==0 ){ */
+/*       res = lua_pcall(L, 0, 0, 0); */
+/*       if (res==0){ */
+/* 	lua_getglobal(L, "offset_prep");  /\* function to be called *\/ */
+/* 	lua_pushnumber(L, c);   /\* push 1st argument *\/ */
+/* 	lua_pushnumber(L, h);   /\* push 2nd argument *\/ */
+/* 	/\* do the call (2 arguments, 1 result) *\/ */
+/* 	res = lua_pcall(L, 2, 1, 0) ; */
+/* 	if (res==0) { */
+/* 	  /\* retrieve result *\/ */
+/* 	  int z = 0; */
+/* 	  if (!lua_isnumber(L, -1)){ */
+/* 	    fprintf(stderr,"\n! Error:function `offset_prep' must return a number\n",lua_tostring(L, -1)); */
+/* 	    lua_pop(L, 1);  /\* pop returned value *\/ */
+/* 	    return z; */
+/* 	  }else { */
+/* 	    z = lua_tonumber(L, -1); */
+/* 	    lua_pop(L, 1);  /\* pop returned value *\/ */
+/* 	    return z; */
+/* 	  } */
+/* 	} */
+/*       } */
+/*   } */
+/*   // */
+/*   //stackdump_g(L); */
+/*   // */
+/*   priv_lua_reporterrors(L, res); */
+/*   return 0; */
+
+/* } */
+
+
+/*                                     */
+/* Sensor before and after offset_prep */
+/*                                     */
+int mfluaPREoffsetprep(halfword c, halfword h)
+{
+
+  lua_State *L = Luas[0];
+  const char* file = "offset_prep.lua";
+  int res = luaL_loadfile(L, file);
+  if ( res==0 ){
+      res = lua_pcall(L, 0, 0, 0);
+      if (res==0){
+	lua_getglobal(L, "PRE_offset_prep");  /* function to be called */
+	lua_pushnumber(L, c);   /* push 1st argument */
+	lua_pushnumber(L, h);   /* push 2nd argument */
+	/* do the call (2 arguments, 1 result) */
+	res = lua_pcall(L, 2, 1, 0) ;
+	if (res==0) {
+	  /* retrieve result */
+	  int z = 0;
+	  if (!lua_isnumber(L, -1)){
+	    fprintf(stderr,"\n! Error:function `PRE_offset_prep' must return a number called with %s\n",lua_tostring(L, -1));
+	    lua_pop(L, 1);  /* pop returned value */
+	    return z;
+	  }else {
+	    z = lua_tonumber(L, -1);
+	    lua_pop(L, 1);  /* pop returned value */
+	    return z;
+	  }
+	}
+      }
+  }
+  /*stackdump_g(L);*/
+  priv_lua_reporterrors(L, res);
+  return 0;
+
+}
+
+int mfluaPOSToffsetprep(halfword c, halfword h)
+{
+
+  lua_State *L = Luas[0];
+  const char* file = "offset_prep.lua";
+  int res = luaL_loadfile(L, file);
+  if ( res==0 ){
+      res = lua_pcall(L, 0, 0, 0);
+      if (res==0){
+	lua_getglobal(L, "POST_offset_prep");  /* function to be called */
+	lua_pushnumber(L, c);   /* push 1st argument */
+	lua_pushnumber(L, h);   /* push 2nd argument */
+	/* do the call (2 arguments, 1 result) */
+	res = lua_pcall(L, 2, 1, 0) ;
+	if (res==0) {
+	  /* retrieve result */
+	  int z = 0;
+	  if (!lua_isnumber(L, -1)){
+	    fprintf(stderr,"\n! Error:function `PRE_offset_prep' must return a number called with %s\n",lua_tostring(L, -1));
+	    lua_pop(L, 1);  /* pop returned value */
+	    return z;
+	  }else {
+	    z = lua_tonumber(L, -1);
+	    lua_pop(L, 1);  /* pop returned value */
+	    return z;
+	  }
+	}
+      }
+  }
+  /*stackdump_g(L);*/
+  priv_lua_reporterrors(L, res);
+  return 0;
+
+}
+
+
+int mfluaPREfillenveloperhs(halfword rhs)
+{
+  lua_State *L = Luas[0];
+  const char* file = "do_add_to.lua";
+  int res = luaL_loadfile(L, file);
+  if ( res==0 ){
+      res = lua_pcall(L, 0, 0, 0);
+      if (res==0){
+	lua_getglobal(L, "PRE_fill_envelope_rhs");  /* function to be called */
+	lua_pushnumber(L, rhs);   /* push 1st argument */
+	/* do the call (1 arguments, 1 result) */
+	res = lua_pcall(L, 1, 1, 0) ;
+	if (res==0) {
+	  /* retrieve result */
+	  int z = 0;
+	  if (!lua_isnumber(L, -1)){
+	    fprintf(stderr,"\n! Error:function `PRE_fill_envelope_rhs' must return a number called with %s\n",lua_tostring(L, -1));
+	    lua_pop(L, 1);  /* pop returned value */
+	    return z;
+	  }else {
+	    z = lua_tonumber(L, -1);
+	    lua_pop(L, 1);  /* pop returned value */
+	    return z;
+	  }
+	}
+      }
+  }
+  /*stackdump_g(L);*/
+  priv_lua_reporterrors(L, res);
+  return 0;
+}
+
+
+int mfluaPOSTfillenveloperhs(halfword rhs)
+{
+  lua_State *L = Luas[0];
+  const char* file = "do_add_to.lua";
+  int res = luaL_loadfile(L, file);
+  if ( res==0 ){
+      res = lua_pcall(L, 0, 0, 0);
+      if (res==0){
+	lua_getglobal(L, "POST_fill_envelope_rhs");  /* function to be called */
+	lua_pushnumber(L, rhs);   /* push 1st argument */
+	/* do the call (1 arguments, 1 result) */
+	res = lua_pcall(L, 1, 1, 0) ;
+	if (res==0) {
+	  /* retrieve result */
+	  int z = 0;
+	  if (!lua_isnumber(L, -1)){
+	    fprintf(stderr,"\n! Error:function `POST_fill_envelope_rhs' must return a number called with %s\n",lua_tostring(L, -1));
+	    lua_pop(L, 1);  /* pop returned value */
+	    return z;
+	  }else {
+	    z = lua_tonumber(L, -1);
+	    lua_pop(L, 1);  /* pop returned value */
+	    return z;
+	  }
+	}
+      }
+  }
+  /*stackdump_g(L); */
+  priv_lua_reporterrors(L, res);
+  return 0;
+}
+
+
+
+int mfluaPREfillenvelopelhs(halfword lhs)
+{
+  lua_State *L = Luas[0];
+  const char* file = "do_add_to.lua";
+  int res = luaL_loadfile(L, file);
+  if ( res==0 ){
+      res = lua_pcall(L, 0, 0, 0);
+      if (res==0){
+	lua_getglobal(L, "PRE_fill_envelope_lhs");  /* function to be called */
+	lua_pushnumber(L, lhs);   /* push 1st argument */
+	/* do the call (1 arguments, 1 result) */
+	res = lua_pcall(L, 1, 1, 0) ;
+	if (res==0) {
+	  /* retrieve result */
+	  int z = 0;
+	  if (!lua_isnumber(L, -1)){
+	    fprintf(stderr,"\n! Error:function `PRE_fill_envelope_lhs' must return a number called with %s\n",lua_tostring(L, -1));
+	    lua_pop(L, 1);  /* pop returned value */
+	    return z;
+	  }else {
+	    z = lua_tonumber(L, -1);
+	    lua_pop(L, 1);  /* pop returned value */
+	    return z;
+	  }
+	}
+      }
+  }
+  /*stackdump_g(L);*/
+  priv_lua_reporterrors(L, res);
+  return 0;
+}
+
+
+int mfluaPOSTfillenvelopelhs(halfword lhs)
+{
+  lua_State *L = Luas[0];
+  const char* file = "do_add_to.lua";
+  int res = luaL_loadfile(L, file);
+  if ( res==0 ){
+      res = lua_pcall(L, 0, 0, 0);
+      if (res==0){
+	lua_getglobal(L, "POST_fill_envelope_lhs");  /* function to be called */
+	lua_pushnumber(L, lhs);   /* push 1st argument */
+	/* do the call (1 arguments, 1 result) */
+	res = lua_pcall(L, 1, 1, 0) ;
+	if (res==0) {
+	  /* retrieve result */
+	  int z = 0;
+	  if (!lua_isnumber(L, -1)){
+	    fprintf(stderr,"\n! Error:function `POST_fill_envelope_lhs' must return a number called with %s\n",lua_tostring(L, -1));
+	    lua_pop(L, 1);  /* pop returned value */
+	    return z;
+	  }else {
+	    z = lua_tonumber(L, -1);
+	    lua_pop(L, 1);  /* pop returned value */
+	    return z;
+	  }
+	}
+      }
+  }
+  /*stackdump_g(L);*/
+  priv_lua_reporterrors(L, res);
+  return 0;
+}
+
+
+
+int mfluaPREfillspecrhs(halfword rhs)
+{
+  lua_State *L = Luas[0];
+  const char* file = "do_add_to.lua";
+  int res = luaL_loadfile(L, file);
+  if ( res==0 ){
+      res = lua_pcall(L, 0, 0, 0);
+      if (res==0){
+	lua_getglobal(L, "PRE_fill_spec_rhs");  /* function to be called */
+	lua_pushnumber(L, rhs);   /* push 1st argument */
+	/* do the call (1 arguments, 1 result) */
+	res = lua_pcall(L, 1, 1, 0) ;
+	if (res==0) {
+	  /* retrieve result */
+	  int z = 0;
+	  if (!lua_isnumber(L, -1)){
+	    fprintf(stderr,"\n! Error:function `PRE_fill_spec_rhs' must return a number called with %s\n",lua_tostring(L, -1));
+	    lua_pop(L, 1);  /* pop returned value */
+	    return z;
+	  }else {
+	    z = lua_tonumber(L, -1);
+	    lua_pop(L, 1);  /* pop returned value */
+	    return z;
+	  }
+	}
+      }
+  }
+  /*stackdump_g(L);*/
+  priv_lua_reporterrors(L, res);
+  return 0;
+}
+
+
+int mfluaPOSTfillspecrhs(halfword rhs)
+{
+  lua_State *L = Luas[0];
+  const char* file = "do_add_to.lua";
+  int res = luaL_loadfile(L, file);
+  if ( res==0 ){
+      res = lua_pcall(L, 0, 0, 0);
+      if (res==0){
+	lua_getglobal(L, "POST_fill_spec_rhs");  /* function to be called */
+	lua_pushnumber(L, rhs);   /* push 1st argument */
+	/* do the call (1 arguments, 1 result) */
+	res = lua_pcall(L, 1, 1, 0) ;
+	if (res==0) {
+	  /* retrieve result */
+	  int z = 0;
+	  if (!lua_isnumber(L, -1)){
+	    fprintf(stderr,"\n! Error:function `POST_fill_spec_rhs' must return a number called with %s\n",lua_tostring(L, -1));
+	    lua_pop(L, 1);  /* pop returned value */
+	    return z;
+	  }else {
+	    z = lua_tonumber(L, -1);
+	    lua_pop(L, 1);  /* pop returned value */
+	    return z;
+	  }
+	}
+      }
+  }
+  /*stackdump_g(L);*/
+  priv_lua_reporterrors(L, res);
+  return 0;
+}
+
+
+int mfluaPREfillspeclhs(halfword lhs)
+{
+  lua_State *L = Luas[0];
+  const char* file = "do_add_to.lua";
+  int res = luaL_loadfile(L, file);
+  if ( res==0 ){
+      res = lua_pcall(L, 0, 0, 0);
+      if (res==0){
+	lua_getglobal(L, "PRE_fill_spec_lhs");  /* function to be called */
+	lua_pushnumber(L, lhs);   /* push 1st argument */
+	/* do the call (1 arguments, 1 result) */
+	res = lua_pcall(L, 1, 1, 0) ;
+	if (res==0) {
+	  /* retrieve result */
+	  int z = 0;
+	  if (!lua_isnumber(L, -1)){
+	    fprintf(stderr,"\n! Error:function `PRE_fill_spec_lhs' must return a number called with %s\n",lua_tostring(L, -1));
+	    lua_pop(L, 1);  /* pop returned value */
+	    return z;
+	  }else {
+	    z = lua_tonumber(L, -1);
+	    lua_pop(L, 1);  /* pop returned value */
+	    return z;
+	  }
+	}
+      }
+  }
+  /*stackdump_g(L);*/
+  priv_lua_reporterrors(L, res);
+  return 0;
+}
+
+
+int mfluaPOSTfillspeclhs(halfword lhs)
+{
+  lua_State *L = Luas[0];
+  const char* file = "do_add_to.lua";
+  int res = luaL_loadfile(L, file);
+  if ( res==0 ){
+      res = lua_pcall(L, 0, 0, 0);
+      if (res==0){
+	lua_getglobal(L, "POST_fill_spec_lhs");  /* function to be called */
+	lua_pushnumber(L, lhs);   /* push 1st argument */
+	/* do the call (1 arguments, 1 result) */
+	res = lua_pcall(L, 1, 1, 0) ;
+	if (res==0) {
+	  /* retrieve result */
+	  int z = 0;
+	  if (!lua_isnumber(L, -1)){
+	    fprintf(stderr,"\n! Error:function `POST_fill_spec_lhs' must return a number called with %s\n",lua_tostring(L, -1));
+	    lua_pop(L, 1);  /* pop returned value */
+	    return z;
+	  }else {
+	    z = lua_tonumber(L, -1);
+	    lua_pop(L, 1);  /* pop returned value */
+	    return z;
+	  }
+	}
+      }
+  }
+  /*stackdump_g(L);*/
+  priv_lua_reporterrors(L, res);
+  return 0;
+}
+
+int mfluaPREmovetoedges(halfword lhs)
+{
+  lua_State *L = Luas[0];
+  const char* file = "fill_spec.lua";
+  int res = luaL_loadfile(L, file);
+  if ( res==0 ){
+      res = lua_pcall(L, 0, 0, 0);
+      if (res==0){
+	lua_getglobal(L, "PRE_move_to_edges");  /* function to be called */
+	lua_pushnumber(L, lhs);   /* push 1st argument */
+	/* do the call (1 arguments, 1 result) */
+	res = lua_pcall(L, 1, 1, 0) ;
+	if (res==0) {
+	  /* retrieve result */
+	  int z = 0;
+	  if (!lua_isnumber(L, -1)){
+	    fprintf(stderr,"\n! Error:function `PRE_move_to_edges' must return a number called with %s\n",lua_tostring(L, -1));
+	    lua_pop(L, 1);  /* pop returned value */
+	    return z;
+	  }else {
+	    z = lua_tonumber(L, -1);
+	    lua_pop(L, 1);  /* pop returned value */
+	    return z;
+	  }
+	}
+      }
+  }
+  /*stackdump_g(L);*/
+  priv_lua_reporterrors(L, res);
+  return 0;
+}
+
+
+
+int mfluaPOSTmovetoedges(halfword lhs)
+{
+  lua_State *L = Luas[0];
+  const char* file = "fill_spec.lua";
+  int res = luaL_loadfile(L, file);
+  if ( res==0 ){
+      res = lua_pcall(L, 0, 0, 0);
+      if (res==0){
+	lua_getglobal(L, "POST_move_to_edges");  /* function to be called */
+	lua_pushnumber(L, lhs);   /* push 1st argument */
+	/* do the call (1 arguments, 1 result) */
+	res = lua_pcall(L, 1, 1, 0) ;
+	if (res==0) {
+	  /* retrieve result */
+	  int z = 0;
+	  if (!lua_isnumber(L, -1)){
+	    fprintf(stderr,"\n! Error:function `POST_move_to_edges' must return a number called with %s\n",lua_tostring(L, -1));
+	    lua_pop(L, 1);  /* pop returned value */
+	    return z;
+	  }else {
+	    z = lua_tonumber(L, -1);
+	    lua_pop(L, 1);  /* pop returned value */
+	    return z;
+	  }
+	}
+      }
+  }
+  /*stackdump_g(L);*/
+  priv_lua_reporterrors(L, res);
+  return 0;
+}
+
+
+
+int mfluaPREmakechoices(halfword p)
+{
+  lua_State *L = Luas[0];
+  const char* file = "scan_direction.lua";
+  int res = luaL_loadfile(L, file);
+  if ( res==0 ){
+      res = lua_pcall(L, 0, 0, 0);
+      if (res==0){
+	lua_getglobal(L, "PRE_make_choices");  /* function to be called */
+	lua_pushnumber(L, p);   /* push 1st argument */
+	/* do the call (1 arguments, 1 result) */
+	res = lua_pcall(L, 1, 1, 0) ;
+	if (res==0) {
+	  /* retrieve result */
+	  int z = 0;
+	  if (!lua_isnumber(L, -1)){
+	    fprintf(stderr,"\n! Error:function `PRE_make_choices' must return a number and not %s\n",lua_tostring(L, -1));
+	    lua_pop(L, 1);  /* pop returned value */
+	    return z;
+	  }else {
+	    z = lua_tonumber(L, -1);
+	    lua_pop(L, 1);  /* pop returned value */
+	    return z;
+	  }
+	}
+      }
+  }
+  /*stackdump_g(L);*/
+  priv_lua_reporterrors(L, res);
+  return 0;
+}
+
+
+int mfluaPOSTmakechoices(halfword p)
+{
+  lua_State *L = Luas[0];
+  const char* file = "scan_direction.lua";
+  int res = luaL_loadfile(L, file);
+  if ( res==0 ){
+      res = lua_pcall(L, 0, 0, 0);
+      if (res==0){
+	lua_getglobal(L, "POST_make_choices");  /* function to be called */
+	lua_pushnumber(L, p);   /* push 1st argument */
+	/* do the call (1 arguments, 1 result) */
+	res = lua_pcall(L, 1, 1, 0) ;
+	if (res==0) {
+	  /* retrieve result */
+	  int z = 0;
+	  if (!lua_isnumber(L, -1)){
+	    fprintf(stderr,"\n! Error:function `POST_make_choices' must return a number and not %s\n",lua_tostring(L, -1));
+	    lua_pop(L, 1);  /* pop returned value */
+	    return z;
+	  }else {
+	    z = lua_tonumber(L, -1);
+	    lua_pop(L, 1);  /* pop returned value */
+	    return z;
+	  }
+	}
+      }
+  }
+  /*stackdump_g(L);*/
+  priv_lua_reporterrors(L, res);
+  return 0;
+}
+
+
+
+
+
+
+int mfluaprintretrogradeline(integer x0, integer y0, integer cur_x, integer cur_y)
+{
+  lua_State *L = Luas[0];
+  const char* file = "skew_line_edges.lua";
+  int res = luaL_loadfile(L, file);
+  if ( res==0 ){
+      res = lua_pcall(L, 0, 0, 0);
+      if (res==0){
+	lua_getglobal(L, "print_retrograde_line");  /* function to be called */
+	lua_pushnumber(L, x0);   /* push 1st argument */
+	lua_pushnumber(L, y0);   /* push 2nd argument */
+	lua_pushnumber(L, cur_x);   /* push 3th argument */
+	lua_pushnumber(L, cur_y);   /* push 4th argument */
+	/* do the call (4 arguments, 1 result) */
+	res = lua_pcall(L, 4, 1, 0) ;
+	if (res==0) {
+	  /* retrieve result */
+	  int z = 0;
+	  if (!lua_isnumber(L, -1)){
+	    fprintf(stderr,"\n! Error:function `print_retrograde_line called with %s\n",lua_tostring(L, -1));
+	    lua_pop(L, 1);  /* pop returned value */
+	    return z;
+	  }else {
+	    z = lua_tonumber(L, -1);
+	    lua_pop(L, 1);  /* pop returned value */
+	    return z;
+	  }
+	}
+      }
+  }
+  /*stackdump_g(L);*/
+  priv_lua_reporterrors(L, res);
+  return 0;
+
+}
+
+
+int mfluaPREmakeellipse(integer major_axis, integer minor_axis, integer theta , integer tx, integer ty,integer q)
+{
+  lua_State *L = Luas[0];
+  const char* file = "make_ellipse.lua";
+  int res = luaL_loadfile(L, file);
+  if ( res==0 ){
+      res = lua_pcall(L, 0, 0, 0);
+      if (res==0){
+	lua_getglobal(L, "PRE_make_ellipse");  /* function to be called */
+	lua_pushnumber(L, major_axis);   /* push 1st argument */
+	lua_pushnumber(L, minor_axis);   /* push 2nd argument */
+	lua_pushnumber(L, theta);   /* push 3th argument */
+	lua_pushnumber(L, tx);   /* push 4th argument */
+	lua_pushnumber(L, ty);   /* push 5th argument */
+	lua_pushnumber(L, q);   /* push 6th argument */
+	/* do the call (6 arguments, 1 result) */
+	res = lua_pcall(L, 6, 1, 0) ;
+	if (res==0) {
+	  /* retrieve result */
+	  int z = 0;
+	  if (!lua_isnumber(L, -1)){
+	    fprintf(stderr,"\n! Error:function `PRE_make_ellipse returns  %s\n",lua_tostring(L, -1));
+	    lua_pop(L, 1);  /* pop returned value */
+	    return z;
+	  }else {
+	    z = lua_tonumber(L, -1);
+	    lua_pop(L, 1);  /* pop returned value */
+	    return z;
+	  }
+	}
+      }
+  }
+  /*stackdump_g(L);*/
+  priv_lua_reporterrors(L, res);
+  return 0;
+
+}
+
+
+int mfluaPOSTmakeellipse(integer major_axis, integer minor_axis, integer theta , integer tx, integer ty,integer q)
+{
+  lua_State *L = Luas[0];
+  const char* file = "make_ellipse.lua";
+  int res = luaL_loadfile(L, file);
+  if ( res==0 ){
+      res = lua_pcall(L, 0, 0, 0);
+      if (res==0){
+	lua_getglobal(L, "POST_make_ellipse");  /* function to be called */
+	lua_pushnumber(L, major_axis);   /* push 1st argument */
+	lua_pushnumber(L, minor_axis);   /* push 2nd argument */
+	lua_pushnumber(L, theta);   /* push 3th argument */
+	lua_pushnumber(L, tx);   /* push 4th argument */
+	lua_pushnumber(L, ty);   /* push 5th argument */
+	lua_pushnumber(L, q);   /* push 6th argument */
+	/* do the call (6 arguments, 1 result) */
+	res = lua_pcall(L, 6, 1, 0) ;
+	if (res==0) {
+	  /* retrieve result */
+	  int z = 0;
+	  if (!lua_isnumber(L, -1)){
+	    fprintf(stderr,"\n! Error:function `PRE_make_ellipse returns %s\n",lua_tostring(L, -1));
+	    lua_pop(L, 1);  /* pop returned value */
+	    return z;
+	  }else {
+	    z = lua_tonumber(L, -1);
+	    lua_pop(L, 1);  /* pop returned value */
+	    return z;
+	  }
+	}
+      }
+  }
+  /*stackdump_g(L);*/
+  priv_lua_reporterrors(L, res);
+  return 0;
+
+}
+
+
+
+
+
+
+
+
+int mfluaprinttransitionlinefrom(integer x, integer y)
+{
+  lua_State *L = Luas[0];
+  const char* file = "fill_envelope.lua";
+  int res = luaL_loadfile(L, file);
+  if ( res==0 ){
+      res = lua_pcall(L, 0, 0, 0);
+      if (res==0){
+	lua_getglobal(L, "print_transition_line_from");  /* function to be called */
+	lua_pushnumber(L, x);   /* push 1st argument */
+	lua_pushnumber(L, y);   /* push 2nd argument */
+	/* do the call (2 arguments, 1 result) */
+	res = lua_pcall(L, 2, 1, 0) ;
+	if (res==0) {
+	  /* retrieve result */
+	  int z = 0;
+	  if (!lua_isnumber(L, -1)){
+	    fprintf(stderr,"\n! Error:function `print_transition_from' must return a number and nt %s\n",lua_tostring(L, -1));
+	    lua_pop(L, 1);  /* pop returned value */
+	    return z;
+	  }else {
+	    z = lua_tonumber(L, -1);
+	    lua_pop(L, 1);  /* pop returned value */
+	    return z;
+	  }
+	}
+      }
+  }
+  /*stackdump_g(L);*/
+  priv_lua_reporterrors(L, res);
+  return 0;
+}
+
+int mfluaprinttransitionlineto(integer x, integer y)
+{
+  lua_State *L = Luas[0];
+  const char* file = "fill_envelope.lua";
+  int res = luaL_loadfile(L, file);
+  if ( res==0 ){
+      res = lua_pcall(L, 0, 0, 0);
+      if (res==0){
+	lua_getglobal(L, "print_transition_line_to");  /* function to be called */
+	lua_pushnumber(L, x);   /* push 1st argument */
+	lua_pushnumber(L, y);   /* push 2nd argument */
+	/* do the call (2 arguments, 1 result) */
+	res = lua_pcall(L, 2, 1, 0) ;
+	if (res==0) {
+	  /* retrieve result */
+	  int z = 0;
+	  if (!lua_isnumber(L, -1)){
+	    fprintf(stderr,"\n! Error:function `print_transition_to' must return a number and not %s\n",lua_tostring(L, -1));
+	    lua_pop(L, 1);  /* pop returned value */
+	    return z;
+	  }else {
+	    z = lua_tonumber(L, -1);
+	    lua_pop(L, 1);  /* pop returned value */
+	    return z;
+	  }
+	}
+      }
+  }
+  /*stackdump_g(L);*/
+  priv_lua_reporterrors(L, res);
+  return 0;
+}
+
+#define priv_append_char(c) do { \
+  strpool[poolptr]=c;            \
+  poolptr++;                     \
+} while(0)  
+
+#define  priv_str_room(l) do   {    \
+  if ((poolptr + l) > maxpoolptr) { \
+    if ((poolptr + l) > poolsize) { \
+      fprintf(stderr,"\n! (Lua) MFLua capacity exceeded, sorry [pool size=%ld]\nIf you really absolutely need more capacity,\nyou can ask a wizard to enlarge me.\n",poolsize-initpoolptr); \
+      exit(1);                      \
+    }                               \
+    maxpoolptr = poolptr + l;       \
+  }                                 \
+} while (0)
+
+int mfluarunscript(halfword j, halfword first, halfword limit) 
+{
+  int i ;
+  lua_State *L ;
+  unsigned char last_char;
+  int error;
+  const char *str;
+  size_t len;
+  L = Luas[0];
+  last_char = strpool[j+limit-first] ;
+  /* end of a C string */ 
+  strpool[j+limit-first] = '\0';
+  str = (const char *)(strpool+j) ;
+  /*fprintf(stderr,"\n! str=%s\n",str);*/
+  /* do the call (0 arguments, 1 result) */
+  error = (luaL_loadstring(L, str) || lua_pcall(L, 0, 1, 0)) ; 
+  strpool[j+limit-first] = last_char;
+  if(error) {
+    priv_lua_reporterrors(L,error);
+  } else {
+    /* retrieve result */
+    str = lua_tolstring(L, -1,&len);
+    priv_str_room(len); 
+    for(i=0;i<len;i++){
+      priv_append_char( (unsigned char)(*(str+i))) ; 
+    }
+    lua_pop(L, 1);  /* pop returned value */
+  }
+  return 0;
+}
diff --git a/Build/source/texk/web2c/mfluadir/mfluac.h b/Build/source/texk/web2c/mfluadir/mfluac.h
new file mode 100644
index 00000000000..4f870a46d78
--- /dev/null
+++ b/Build/source/texk/web2c/mfluadir/mfluac.h
@@ -0,0 +1,38 @@
+extern int mfluabeginprogram(void);
+extern int mfluaPREstartofMF(void);
+extern int mfluaPREmaincontrol(void);
+extern int mfluaPOSTmaincontrol(void);
+extern int mfluainitialize(void);
+extern int mfluaPOSTfinalcleanup(void);
+extern int mfluaendprogram(void);
+
+extern int mfluaprintpath(halfword, strnumber, boolean);
+extern int mfluarunscript(halfword, halfword, halfword);
+extern int mfluaprintedges(strnumber, boolean, integer, integer);
+
+extern int mfluaPREoffsetprep(halfword, halfword); 
+extern int mfluaPOSToffsetprep(halfword, halfword); 
+
+extern int mfluaPREfillenveloperhs(halfword);
+extern int mfluaPOSTfillenveloperhs(halfword);
+extern int mfluaPREfillenvelopelhs(halfword);
+extern int mfluaPOSTfillenvelopelhs(halfword);
+
+extern int mfluaPREfillspecrhs(halfword);
+extern int mfluaPOSTfillspecrhs(halfword);
+extern int mfluaPREfillspeclhs(halfword);
+extern int mfluaPOSTfillspeclhs(halfword);
+
+extern int mfluaPREmakechoices(halfword);
+extern int mfluaPOSTmakechoices(halfword);
+
+extern int mfluaPREmovetoedges(halfword);
+extern int mfluaPOSTmovetoedges(halfword);
+
+extern int mfluaprintretrogradeline(integer, integer, integer, integer);
+
+extern int mfluaprinttransitionlinefrom(integer, integer);
+extern int mfluaprinttransitionlineto(integer, integer);
+
+extern int mfluaPREmakeellipse(integer, integer, integer, integer, integer, integer);
+extern int mfluaPOSTmakeellipse(integer, integer, integer, integer, integer, integer);
diff --git a/Build/source/texk/web2c/mfluadir/mfluaextra.c b/Build/source/texk/web2c/mfluadir/mfluaextra.c
new file mode 100644
index 00000000000..3ec9db1060a
--- /dev/null
+++ b/Build/source/texk/web2c/mfluadir/mfluaextra.c
@@ -0,0 +1,11 @@
+/* mfluaextra.c: Hand-coded routines for MFLua.
+
+   This file is public domain.  */
+
+#define	EXTERN /* Instantiate data from mfluad.h here.  */
+
+/* This file defines MFLua.  */
+#include <mfluad.h>
+
+/* Hand-coded routines for TeX or Metafont in C.  */
+#include <lib/texmfmp.c>
diff --git a/Build/source/texk/web2c/mfluadir/mfluaextra.h b/Build/source/texk/web2c/mfluadir/mfluaextra.h
new file mode 100644
index 00000000000..6e3d7994e7d
--- /dev/null
+++ b/Build/source/texk/web2c/mfluadir/mfluaextra.h
@@ -0,0 +1,23 @@
+/* mfluaextra.h: banner etc. for MFLua.
+
+   This is included by MFLua, from mfluaextra.c
+*/
+
+#include <mfluadir/mflua_version.h> /* for MFLUA_VERSION */
+
+#define BANNER "This is MFLua, Version 2.7182818-" MFLUA_VERSION
+#define COPYRIGHT_HOLDER "L. Scarso"
+#define AUTHOR NULL
+#define PROGRAM_HELP MFLUAHELP
+#define BUG_ADDRESS "luigi.scarso@gmail.com"
+#define DUMP_VAR MFbasedefault
+#define DUMP_LENGTH_VAR basedefaultlength
+#define DUMP_OPTION "base"
+#ifdef DOS
+#define DUMP_EXT ".bas"
+#else
+#define DUMP_EXT ".base"
+#endif
+#define INPUT_FORMAT kpse_mf_format
+#define INI_PROGRAM "inimflua"
+#define VIR_PROGRAM "virmflua"
diff --git a/Build/source/texk/web2c/mfluadir/mfluatrap/begin_program.lua b/Build/source/texk/web2c/mfluadir/mfluatrap/begin_program.lua
new file mode 100644
index 00000000000..0711ed9dddb
--- /dev/null
+++ b/Build/source/texk/web2c/mfluadir/mfluatrap/begin_program.lua
@@ -0,0 +1 @@
+-- empty
diff --git a/Build/source/texk/web2c/mfluadir/mfluatrap/do_add_to.lua b/Build/source/texk/web2c/mfluadir/mfluatrap/do_add_to.lua
new file mode 100644
index 00000000000..98dd9750722
--- /dev/null
+++ b/Build/source/texk/web2c/mfluadir/mfluatrap/do_add_to.lua
@@ -0,0 +1,9 @@
+function PRE_fill_envelope_rhs(rhs)  return 0 end
+function POST_fill_envelope_rhs(rhs) return 0 end
+function PRE_fill_envelope_lhs(rhs)  return 0 end
+function POST_fill_envelope_lhs(rhs) return 0 end
+
+function PRE_fill_spec_rhs(rhs)  return 0 end
+function POST_fill_spec_rhs(rhs) return 0 end
+function PRE_fill_spec_lhs(rhs)  return 0 end
+function POST_fill_spec_lhs(rhs) return 0 end
\ No newline at end of file
diff --git a/Build/source/texk/web2c/mfluadir/mfluatrap/end_program.lua b/Build/source/texk/web2c/mfluadir/mfluatrap/end_program.lua
new file mode 100644
index 00000000000..0711ed9dddb
--- /dev/null
+++ b/Build/source/texk/web2c/mfluadir/mfluatrap/end_program.lua
@@ -0,0 +1 @@
+-- empty
diff --git a/Build/source/texk/web2c/mfluadir/mfluatrap/fill_envelope.lua b/Build/source/texk/web2c/mfluadir/mfluatrap/fill_envelope.lua
new file mode 100644
index 00000000000..cbd9b2841be
--- /dev/null
+++ b/Build/source/texk/web2c/mfluadir/mfluatrap/fill_envelope.lua
@@ -0,0 +1,2 @@
+function print_transition_line_from(x,y) return 0 end
+function print_transition_line_to(x,y)  return 0 end
\ No newline at end of file
diff --git a/Build/source/texk/web2c/mfluadir/mfluatrap/fill_spec.lua b/Build/source/texk/web2c/mfluadir/mfluatrap/fill_spec.lua
new file mode 100644
index 00000000000..54367f46110
--- /dev/null
+++ b/Build/source/texk/web2c/mfluadir/mfluatrap/fill_spec.lua
@@ -0,0 +1,2 @@
+function PRE_move_to_edges(lhs)  return 0 end
+function POST_move_to_edges(lhs)  return 0 end
\ No newline at end of file
diff --git a/Build/source/texk/web2c/mfluadir/mfluatrap/final_cleanup.lua b/Build/source/texk/web2c/mfluadir/mfluatrap/final_cleanup.lua
new file mode 100644
index 00000000000..627d09c0fec
--- /dev/null
+++ b/Build/source/texk/web2c/mfluadir/mfluatrap/final_cleanup.lua
@@ -0,0 +1 @@
+function POST_final_cleanup() return 0 end
\ No newline at end of file
diff --git a/Build/source/texk/web2c/mfluadir/mfluatrap/main_control.lua b/Build/source/texk/web2c/mfluadir/mfluatrap/main_control.lua
new file mode 100644
index 00000000000..bf6c5784959
--- /dev/null
+++ b/Build/source/texk/web2c/mfluadir/mfluatrap/main_control.lua
@@ -0,0 +1,2 @@
+function PRE_main_control()  return 0 end
+function POST_main_control() return 0 end
\ No newline at end of file
diff --git a/Build/source/texk/web2c/mfluadir/mfluatrap/make_ellipse.lua b/Build/source/texk/web2c/mfluadir/mfluatrap/make_ellipse.lua
new file mode 100644
index 00000000000..7c094499b88
--- /dev/null
+++ b/Build/source/texk/web2c/mfluadir/mfluatrap/make_ellipse.lua
@@ -0,0 +1,2 @@
+function PRE_make_ellipse(major_axis,minor_axis,theta,tx,ty) return 0 end
+function POST_make_ellipse(major_axis,minor_axis,theta,tx,ty) return 0 end
\ No newline at end of file
diff --git a/Build/source/texk/web2c/mfluadir/mfluatrap/mfluaini.lua b/Build/source/texk/web2c/mfluadir/mfluatrap/mfluaini.lua
new file mode 100644
index 00000000000..0711ed9dddb
--- /dev/null
+++ b/Build/source/texk/web2c/mfluadir/mfluatrap/mfluaini.lua
@@ -0,0 +1 @@
+-- empty
diff --git a/Build/source/texk/web2c/mfluadir/mfluatrap/mfluatrap.diffs b/Build/source/texk/web2c/mfluadir/mfluatrap/mfluatrap.diffs
new file mode 100644
index 00000000000..a8176a88ce7
--- /dev/null
+++ b/Build/source/texk/web2c/mfluadir/mfluatrap/mfluatrap.diffs
@@ -0,0 +1,203 @@
+>>> Running TRAP test for MFLua.
+>>> See SRCDIR/mfluadir/mfluatrap/mfluatrap.diffs for example of acceptable diffs.
++ ln -s SRCDIR/triptrap/trap.mf .
++ ./mflua --progname=inimflua
++ test '!' -s trap.base
++ mv trap.log mftrapin.log
++ diff SRCDIR/triptrap/mftrapin.log mftrapin.log
+1c1
+< This is METAFONT, Version 2.7182818 (INIMF)  7 JAN 2014 17:51
+---
+> This is MFLua, Version 2.7182818-0.5 (TeX Live 2015) (INIMF)  17 APR 2015 11:16
+150c150
+< String usage 26&83 (891&11438 still untouched)
+---
+> String usage 30&98 (6384&979377 still untouched)
+176,177c176,177
+<  (preloaded base=trap 2014.1.7)
+< 1117 strings of total length 20614
+---
+>  (preloaded base=trap 2015.4.17)
+> 1125 strings of total length 20684
+179c179
+< 265 symbolic tokens
+---
+> 266 symbolic tokens
++ ./mflua --progname=inimflua
++ mv trap.log mftrap.log
++ mv trap.tfm mftrap.tfm
++ diff SRCDIR/triptrap/mftrap.fot mftrap.fot
+1,3c1,2
+< This is METAFONT, Version 2.7182818 (INIMF)
+< ** &trap  trap 
+< (trap.mf
+---
+> This is MFLua, Version 2.7182818-0.5 (TeX Live 2015) (INIMF)
+> **(trap.mf
+39c38
+< String usage 41&161 (815&7634 still untouched)
+---
+> String usage 50&202 (6298&975523 still untouched)
++ diff SRCDIR/triptrap/mftrap.log mftrap.log
+1c1
+< This is METAFONT, Version 2.7182818 (preloaded base=trap 2014.1.7)  7 JAN 2014 18:11
+---
+> This is MFLua, Version 2.7182818-0.5 (TeX Live 2015) (preloaded base=trap 2015.4.17)  17 APR 2015 11:16
+133,134c133,134
+< <scantokens> pair
+<                   p[],';^^ff
+---
+> <scantokens> or <runscript> pair
+>                                  p[],';^^ff
+145,146c145,146
+< <scantokens> pair
+<                   p[],';^^ff
+---
+> <scantokens> or <runscript> pair
+>                                  p[],';^^ff
+158,159c158,159
+< <scantokens> pair
+<                   p[],';^^ff
+---
+> <scantokens> or <runscript> pair
+>                                  p[],';^^ff
+169,170c169,170
+< <scantokens> pair p[],';^^ff
+<                             
+---
+> <scantokens> or <runscript> ...f
+>                                 
+1825c1825
+< String usage 24&92 (858&11309 still untouched)
+---
+> String usage 30&119 (6344&979191 still untouched)
+3693,3695c3693,3695
+< xpart %CAPSULE1359=xx
+< %CAPSULE1367=2yy-2
+< %CAPSULE1375 = 3.3333xx+3.3333
+---
+> xpart %CAPSULE1370=xx
+> %CAPSULE1378=2yy-2
+> %CAPSULE1386 = 3.3333xx+3.3333
+3755,3757c3755,3757
+< xpart %CAPSULE1049 = 8000o2-4000o1+1000o3+9
+< xpart %CAPSULE1383=xpart '
+< ypart %CAPSULE1383=ypart '
+---
+> xpart %CAPSULE604 = 8000o2-4000o1+1000o3+9
+> xpart %CAPSULE1394=xpart '
+> ypart %CAPSULE1394=ypart '
+3760,3761c3760,3761
+< ### 4000o1 = -xpart %CAPSULE1049+8000o2+1000o3+9
+< ### -4.87383o2 = -oo-0.0004xpart %CAPSULE1049+0.39673o3-17.99643
+---
+> ### 4000o1 = -xpart %CAPSULE604+8000o2+1000o3+9
+> ### -4.87383o2 = -oo-0.0004xpart %CAPSULE604+0.39673o3-17.99643
+3768c3768
+< ### -alfa=-xpart %CAPSULE1494
+---
+> ### -alfa=-xpart %CAPSULE368
+3770,3771c3770,3771
+< {xpart((xpart %CAPSULE1494,0))}
+< ### -xpart %CAPSULE17=-%CAPSULE1176
+---
+> {xpart((xpart %CAPSULE368,0))}
+> ### -xpart %CAPSULE17=-%CAPSULE1376
+3773,3775c3773,3775
+< {(%CAPSULE382)+(%CAPSULE1176)}
+< ### -%CAPSULE382=-%CAPSULE1893+%CAPSULE1176
+< ### -%CAPSULE1893=-ypart %CAPSULE1049
+---
+> {(%CAPSULE382)+(%CAPSULE1376)}
+> ### -%CAPSULE382=-%CAPSULE1364+%CAPSULE1376
+> ### -%CAPSULE1364=-ypart %CAPSULE604
+3780c3780
+< ### p$=-ypart %CAPSULE604+1
+---
+> ### p$=-ypart %CAPSULE1360+1
+3782,3793c3782,3793
+< {(2/3)*((-ypart %CAPSULE604+1,ypart %CAPSULE604))}
+< ### ypart %CAPSULE604=-xpart %CAPSULE604+1
+< ### -0.66667xpart %CAPSULE604=-xpart %CAPSULE1889
+< {-((xpart %CAPSULE1889,-xpart %CAPSULE1889+0.66667))}
+< ### xpart %CAPSULE1889=-xpart %CAPSULE1172
+< {((xpart %CAPSULE1049,ypart %CAPSULE1049))=((xpart %CAPSULE1172,-xpart %
+< CAPSULE1172-0.66667))}
+< ## xpart %CAPSULE1172=-ypart %CAPSULE1049-0.66667
+< ## ypart %CAPSULE1049=-xpart %CAPSULE1049-0.66667
+< ### -xpart %CAPSULE1049=-xpart %CAPSULE1172
+< {((xpart ',ypart '))=((xpart %CAPSULE1172,-xpart %CAPSULE1172-0.66667))}
+< ## xpart %CAPSULE1172=-ypart '-0.66667
+---
+> {(2/3)*((-ypart %CAPSULE1360+1,ypart %CAPSULE1360))}
+> ### ypart %CAPSULE1360=-xpart %CAPSULE1360+1
+> ### -0.66667xpart %CAPSULE1360=-xpart %CAPSULE1744
+> {-((xpart %CAPSULE1744,-xpart %CAPSULE1744+0.66667))}
+> ### xpart %CAPSULE1744=-xpart %CAPSULE1675
+> {((xpart %CAPSULE604,ypart %CAPSULE604))=((xpart %CAPSULE1675,-xpart %CA
+> PSULE1675-0.66667))}
+> ## xpart %CAPSULE1675=-ypart %CAPSULE604-0.66667
+> ## ypart %CAPSULE604=-xpart %CAPSULE604-0.66667
+> ### -xpart %CAPSULE604=-xpart %CAPSULE1675
+> {((xpart ',ypart '))=((xpart %CAPSULE1675,-xpart %CAPSULE1675-0.66667))}
+> ## xpart %CAPSULE1675=-ypart '-0.66667
+3799c3799
+< ### -ooo=-%CAPSULE1494
+---
+> ### -ooo=-%CAPSULE1051
+3801,3810c3801,3810
+< {(%CAPSULE1494)+(1)}
+< ### -%CAPSULE1494=-%CAPSULE1350+1
+< {(1/2)*(%CAPSULE1350)}
+< ### -0.5%CAPSULE1350=-%CAPSULE1367
+< {-(%CAPSULE1367)}
+< ### %CAPSULE1367=-%CAPSULE1893
+< {(2)*(%CAPSULE1893)}
+< ### -2%CAPSULE1893=-%CAPSULE1885
+< {(-0.5%CAPSULE1885-0.5)=(%CAPSULE1885)}
+< ## %CAPSULE1885=-0.33333
+---
+> {(%CAPSULE1051)+(1)}
+> ### -%CAPSULE1051=-%CAPSULE1378+1
+> {(1/2)*(%CAPSULE1378)}
+> ### -0.5%CAPSULE1378=-%CAPSULE1370
+> {-(%CAPSULE1370)}
+> ### %CAPSULE1370=-%CAPSULE1362
+> {(2)*(%CAPSULE1362)}
+> ### -2%CAPSULE1362=-%CAPSULE1354
+> {(-0.5%CAPSULE1354-0.5)=(%CAPSULE1354)}
+> ## %CAPSULE1354=-0.33333
+4235c4235
+< String usage 41&161 (815&7634 still untouched)
+---
+> String usage 50&202 (6298&975523 still untouched)
+4251,4252c4251,4252
+<  68 strings out of 883
+<  3752 string characters out of 11386
+---
+>  77 strings out of 6375
+>  3793 string characters out of 979316
+4254,4255c4254,4255
+<  289 symbolic tokens out of 2100
+<  8i,43n,14r,8p,167b stack positions out of 30i,100n,300r,150p,500b
+---
+>  290 symbolic tokens out of 9500
+>  8i,43n,14r,8p,167b stack positions out of 300i,300n,1000r,150p,3000b
+4263c4263
+<   out of 256w,16h,16d,64i,5000l,500k,256e,50p)
+---
+>   out of 256w,16h,16d,64i,15000l,2500k,256e,60p)
++ ./tftopl ./mftrap.tfm mftrap.pl
++ diff SRCDIR/triptrap/mftrap.pl mftrap.pl
++ ./gftype -m -i ./trap.72270gf
++ diff SRCDIR/triptrap/trap.typ trap.typ
+1c1
+< This is GFtype, Version 3.1
+---
+> This is GFtype, Version 3.1 (TeX Live 2015)
+3c3
+< ' METAFONT output 2014.01.07:1811'
+---
+> ' METAFONT output 2015.04.17:1116'
++ :
+PASS: mfluadir/mfluatraptest
diff --git a/Build/source/texk/web2c/mfluadir/mfluatrap/offset_prep.lua b/Build/source/texk/web2c/mfluadir/mfluatrap/offset_prep.lua
new file mode 100644
index 00000000000..1452e0325cd
--- /dev/null
+++ b/Build/source/texk/web2c/mfluadir/mfluatrap/offset_prep.lua
@@ -0,0 +1,2 @@
+function PRE_offset_prep(c,h) return 0 end
+function POST_offset_prep(c,h) return 0 end
\ No newline at end of file
diff --git a/Build/source/texk/web2c/mfluadir/mfluatrap/print_edges.lua b/Build/source/texk/web2c/mfluadir/mfluatrap/print_edges.lua
new file mode 100644
index 00000000000..ae35ce6585e
--- /dev/null
+++ b/Build/source/texk/web2c/mfluadir/mfluatrap/print_edges.lua
@@ -0,0 +1 @@
+function print_edges(s,nuline,xoff,yoff) return 0 end
\ No newline at end of file
diff --git a/Build/source/texk/web2c/mfluadir/mfluatrap/print_path.lua b/Build/source/texk/web2c/mfluadir/mfluatrap/print_path.lua
new file mode 100644
index 00000000000..1733bc9d2cd
--- /dev/null
+++ b/Build/source/texk/web2c/mfluadir/mfluatrap/print_path.lua
@@ -0,0 +1 @@
+function print_path(h,s,nuline) return 0  end
\ No newline at end of file
diff --git a/Build/source/texk/web2c/mfluadir/mfluatrap/scan_direction.lua b/Build/source/texk/web2c/mfluadir/mfluatrap/scan_direction.lua
new file mode 100644
index 00000000000..6c896677f6c
--- /dev/null
+++ b/Build/source/texk/web2c/mfluadir/mfluatrap/scan_direction.lua
@@ -0,0 +1,2 @@
+function PRE_make_choices(p) return 0 end
+function POST_make_choices(p) return 0 end
\ No newline at end of file
diff --git a/Build/source/texk/web2c/mfluadir/mfluatrap/skew_line_edges.lua b/Build/source/texk/web2c/mfluadir/mfluatrap/skew_line_edges.lua
new file mode 100644
index 00000000000..2ae9dc20a6a
--- /dev/null
+++ b/Build/source/texk/web2c/mfluadir/mfluatrap/skew_line_edges.lua
@@ -0,0 +1 @@
+function print_retrograde_line(x0,y0,cur_x,cur_y) return 0 end
\ No newline at end of file
diff --git a/Build/source/texk/web2c/mfluadir/mfluatrap/start_of_MF.lua b/Build/source/texk/web2c/mfluadir/mfluatrap/start_of_MF.lua
new file mode 100644
index 00000000000..7c24087ca5d
--- /dev/null
+++ b/Build/source/texk/web2c/mfluadir/mfluatrap/start_of_MF.lua
@@ -0,0 +1 @@
+function PRE_start_of_MF() return 0 end
\ No newline at end of file
diff --git a/Build/source/texk/web2c/mfluadir/mfluatrap/texmf.cnf b/Build/source/texk/web2c/mfluadir/mfluatrap/texmf.cnf
new file mode 100644
index 00000000000..04165594719
--- /dev/null
+++ b/Build/source/texk/web2c/mfluadir/mfluatrap/texmf.cnf
@@ -0,0 +1,38 @@
+% mfluadir/mfluatrap/texmf.cnf -- configuration for the MFLua and MFLuaJIT trap tests.
+
+% These values apply to all the programs, and they are necessary for any
+% kind of reasonable diff.
+error_line = 64
+half_error_line = 32
+max_print_line = 72
+		
+% Metafont
+main_memory       = 3001
+
+% Actually, Metafont currently ignores the settings for max_strings,
+% string_vacancies and pool_size specified here, but it doesn't hurt
+% to supply the correct values, just in case this changes one day.
+
+max_strings       = 2000
+string_vacancies = 8000
+pool_size = 40000
+
+gf_buf_size    = 8   % trapman.tex says to use this.
+MFTERM    = trap     % get the right screen output
+screen_width    = 100
+screen_depth    = 200
+
+% Search paths. 
+% trap.mf:
+MFINPUTS = .
+% trip.tfm, trap.tfm, trapf.tfm:
+TFMFONTS = .
+% trap.base:
+MFBASES = .
+% mf.pool:
+MFPOOL = .
+
+% GFtype only.
+line_length.gftype = 79
+max_rows.gftype = 79
+max_cols.gftype = 79
diff --git a/Build/source/texk/web2c/mfluadir/mfluatraptest b/Build/source/texk/web2c/mfluadir/mfluatraptest
new file mode 100755
index 00000000000..92866a869ad
--- /dev/null
+++ b/Build/source/texk/web2c/mfluadir/mfluatraptest
@@ -0,0 +1,51 @@
+#! /bin/sh
+
+# Copyright (C) 2015 Peter Breitenlohner <tex-live@tug.org>
+# You may freely use, modify and/or distribute this file.
+
+testdir=$abs_srcdir/triptrap
+ltestdir=$abs_srcdir/mfluadir/mfluatrap
+
+TEXMFCNF=$ltestdir; export TEXMFCNF
+
+rm -rf mfluatrapdir
+mkdir mfluatrapdir
+cd mfluatrapdir
+
+cp $ltestdir/*.lua .
+
+echo ">>> Running TRAP test for MFLua." >&2
+echo ">>> See $ltestdir/mfluatrap.diffs for example of acceptable diffs." >&2
+
+is_OK=:
+
+set -x
+
+# get same filename in log
+$LN_S $testdir/trap.mf .
+
+../mflua --progname=inimflua <$testdir/mftrap1.in >mftrapin.fot
+if test ! -s trap.base; then
+  echo "*** trap.base not created by mftrap1.in, investigate!" >&2
+  exit 1
+fi
+mv trap.log mftrapin.log || exit 1
+diff $testdir/mftrapin.log mftrapin.log
+
+../mflua --progname=inimflua <$testdir/mftrap2.in >mftrap.fot
+mv trap.log mftrap.log || exit 1
+mv trap.tfm mftrap.tfm || exit 1
+diff $testdir/mftrap.fot mftrap.fot
+diff $testdir/mftrap.log mftrap.log
+
+../tftopl ./mftrap.tfm mftrap.pl || exit 1
+diff $testdir/mftrap.pl mftrap.pl || is_OK=false
+
+../gftype -m -i ./trap.72270gf >trap.typ || exit 1
+diff $testdir/trap.typ trap.typ
+
+$is_OK || {
+  echo ">>> There were some errors." >&2
+  exit 1
+}
+
diff --git a/Build/source/texk/web2c/mfluajitdir/ChangeLog b/Build/source/texk/web2c/mfluajitdir/ChangeLog
new file mode 100644
index 00000000000..45c8f107a07
--- /dev/null
+++ b/Build/source/texk/web2c/mfluajitdir/ChangeLog
@@ -0,0 +1,5 @@
+2015-04-12  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Imported MFLuaJIT into TeX Live, based on the SVN repository
+	  https://foundry.supelec.fr/projects/mflua
+	  from Luigi Scarso <luigi.scarso@gmail.com>.
diff --git a/Build/source/texk/web2c/mfluajitdir/am/mfluajit.am b/Build/source/texk/web2c/mfluajitdir/am/mfluajit.am
new file mode 100644
index 00000000000..4a98fa3da18
--- /dev/null
+++ b/Build/source/texk/web2c/mfluajitdir/am/mfluajit.am
@@ -0,0 +1,129 @@
+## texk/web2c/mfluajitdir/am/mfluajit.am: Makefile fragment for MFLuaJIT.
+##
+## Copyright (C) 2015 Peter Breitenlohner <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
+
+## MFLua
+##
+if MFLUAJIT
+bin_PROGRAMS += mfluajit
+if MFLUAJITN
+bin_PROGRAMS += mfluajit-nowin
+endif MFLUAJITN
+if WIN32
+bin_PROGRAMS += inimfluajit
+else !WIN32
+bin_links += mfluajit$(EXEEXT):inimfluajit
+endif !WIN32
+endif MFLUAJIT
+EXTRA_PROGRAMS += mfluajit mfluajit-nowin
+DISTCLEANFILES += mfluajittrap.diffs
+
+inimfluajit_CPPFLAGS = -DEXEPROG=\"mfluajit.exe\"
+nodist_inimfluajit_SOURCES = callexe.c
+inimfluajit_LDADD =
+
+dist_mfluajit_SOURCES = mfluajitdir/mfluajitextra.c mfluajitdir/mfluajitextra.h mfluadir/mflua_version.h
+mfluajit_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS) $(LUAJIT_INCLUDES) $(LUAJIT_DEFINES)
+mfluajit_LDADD = libmfluajit.a $(LDADD) $(windowlib) $(mf_x_libs) $(LUAJIT_LIBS)
+mfluajit_LDFLAGS = -export-dynamic $(LUAJIT_LDEXTRA)
+nodist_mfluajit_nowin_SOURCES = $(dist_mfluajit_SOURCES)
+mfluajit_nowin_CPPFLAGS = $(mfluajit_CPPFLAGS) -DMFNOWIN $(LUAJIT_INCLUDES) $(LUAJIT_DEFINES)
+mfluajit_nowin_LDADD = libmfluajit.a $(LDADD) $(windowlib) $(LUAJIT_LIBS)
+mfluajit_nowin_LDFLAGS = -export-dynamic $(LUAJIT_LDEXTRA)
+
+# We must create mfluajitd.h and mfluadir/mflua_version.h before compiling mfluajitextra.c.
+$(mfluajit_OBJECTS) $(mfluajit_nowin_OBJECTS): mfluajitd.h mfluadir/mflua_version.h
+
+## mfluajit and mfluajit-nowin compile mfluajitextra.c with different CPPFLAGS.
+## Automake, however, does not support CPPFLAGS for individual source files.
+## To avoid compiling everything twice, the common objects are in a library.
+EXTRA_LIBRARIES += libmfluajit.a
+
+# MFLua C sources
+mfluajit_c_h = mfluajitini.c mfluajit0.c mfluajitcoerce.h mfluajitd.h
+dist_libmfluajit_a_SOURCES = mfluadir/mfluac.c  mfluadir/mfluac.h
+nodist_libmfluajit_a_SOURCES = $(mfluajit_c_h) mfluajit-pool.c
+libmfluajit_a_CPPFLAGS = $(AM_CPPFLAGS) $(LUAJIT_INCLUDES) -DJIT
+
+# We must create mfluajitd.h before building the libmfluajit_a_OBJECTS.
+$(libmfluajit_a_OBJECTS): mfluajitd.h
+
+$(mfluajit_c_h): mfluajit-web2c $(LUAJIT_LIBS)
+	@$(web2c) mfluajit
+mfluajit-web2c: mfluajit.p $(web2c_texmf) web2c/cvtmf1.sed web2c/cvtmf2.sed mfluajitdir/mfluajit.defines
+	@$(web2c) mfluajit
+
+mfluajit-pool.c: mfluajit.pool mfluajitd.h $(makecpool_stamp)
+	$(makecpool) mfluajit >$@ || rm -f $@
+
+# Tangling MFLua
+mfluajit.p mfluajit.pool: mfluajit-tangle
+	@$(texmf_tangle) mfluajit mfluajit
+mfluajit-tangle: tangle$(EXEEXT) mfluajit.web mfluajit.ch tangle-sh
+	@$(texmf_tangle) mfluajit mfluajit
+
+# Generate mfluajit.web
+mfluajit.web: tie$(EXEEXT) $(mfluajit_web_srcs)
+	$(tie) -m mfluajit.web $(mfluajit_web_srcs)
+mfluajit_web_srcs = \
+	mf.web \
+	mfluadir/mf-lua.ch \
+	mfluajitdir/mf-luajit.ch
+
+# Generate mfluajit.ch
+mfluajit.ch: tie$(EXEEXT) mfluajit.web $(mfluajit_ch_src)
+	$(tie) -c $@ mfluajit.web $(mfluajit_ch_src)
+mfluajit_ch_src = \
+	mf.ch \
+	mfluadir/mflua-m.ch \
+	mf-binpool.ch
+##
+EXTRA_DIST += $(mfluajit_web_srcs) $(mfluajit_ch_src) mfluajitdir/mfluajit.defines
+
+DISTCLEANFILES += $(nodist_libmfluajit_a_SOURCES) mfluajit.web mfluajit.ch mfluajit-web2c \
+	mfluajit.p mfluajit.pool mfluajit-tangle
+
+EXTRA_DIST += \
+	mfluajitdir/ChangeLog
+
+# MFLua tests
+#
+mfluajit_tests = mfluajitdir/mfluajittraptest
+EXTRA_DIST += $(mfluajit_tests)
+
+if MFLUAJIT
+TESTS += $(mfluajit_tests)
+check_PROGRAMS += gftype tftopl
+TRIPTRAP += mfluajittrap.diffs
+TRIPTRAP_CLEAN += mfluajittrap-clean
+endif MFLUAJIT
+DISTCLEANFILES += mfluajittrap.diffs
+
+## mfluajitdir/mfluajittraptest
+mfluajittrap.diffs: mfluajit$(EXEEXT)
+	$(triptrap_diffs) $@
+.PHONY: mfluajittrap-clean
+mfluajittrap-clean:
+	rm -rf mfluajittrapdir
+
+## Test data 
+##
+EXTRA_DIST += \
+	mfluadir/mfluatrap/begin_program.lua \
+	mfluadir/mfluatrap/do_add_to.lua \
+	mfluadir/mfluatrap/end_program.lua \
+	mfluadir/mfluatrap/fill_envelope.lua \
+	mfluadir/mfluatrap/fill_spec.lua \
+	mfluadir/mfluatrap/final_cleanup.lua \
+	mfluadir/mfluatrap/main_control.lua \
+	mfluadir/mfluatrap/make_ellipse.lua \
+	mfluadir/mfluatrap/mfluaini.lua \
+	mfluadir/mfluatrap/offset_prep.lua \
+	mfluadir/mfluatrap/print_edges.lua \
+	mfluadir/mfluatrap/print_path.lua \
+	mfluadir/mfluatrap/scan_direction.lua \
+	mfluadir/mfluatrap/skew_line_edges.lua \
+	mfluadir/mfluatrap/start_of_MF.lua \
+	mfluadir/mfluatrap/texmf.cnf \
+	mfluajitdir/mfluajittrap/mfluajittrap.diffs
diff --git a/Build/source/texk/web2c/mfluajitdir/mf-luajit.ch b/Build/source/texk/web2c/mfluajitdir/mf-luajit.ch
new file mode 100644
index 00000000000..af718650d8a
--- /dev/null
+++ b/Build/source/texk/web2c/mfluajitdir/mf-luajit.ch
@@ -0,0 +1,8 @@
+@x [1.2] - this is MFLuaJIT
+@d banner==MFLua_banner
+@y
+@d MFLuaJITbanner=='This is MFLuaJIT, Version 2.7182818', MFLua_version_string
+  {printed when MFLuaJIT starts}
+@#
+@d banner==MFLuaJITbanner
+@z
diff --git a/Build/source/texk/web2c/mfluajitdir/mfluajit.defines b/Build/source/texk/web2c/mfluajitdir/mfluajit.defines
new file mode 100644
index 00000000000..5889c31e803
--- /dev/null
+++ b/Build/source/texk/web2c/mfluajitdir/mfluajit.defines
@@ -0,0 +1,25 @@
+{ Additional symbols for MFLuaJIT.  Public domain.}
+
+@define procedure mfluainitialize;
+@define procedure mfluaprintpath();
+@define procedure mfluaprintedges();
+@define procedure mfluaPREoffsetprep();
+@define procedure mfluaPOSToffsetprep();
+@define procedure mfluaPREfillenveloperhs();
+@define procedure mfluaPOSTfillenveloperhs();
+@define procedure mfluaPREfillenvelopelhs();
+@define procedure mfluaPOSTfillenvelopelhs();
+@define procedure mfluaPREfillspecrhs();
+@define procedure mfluaPOSTfillspecrhs();
+@define procedure mfluaPREfillspeclhs();
+@define procedure mfluaPOSTfillspeclhs();
+@define procedure mfluaPREmovetoedges();
+@define procedure mfluaPOSTmovetoedges();
+@define procedure mfluaPREmakechoices();
+@define procedure mfluaPOSTmakechoices();
+@define procedure mfluaprintretrogradeline();
+@define procedure mfluaprinttransitionlinefrom();
+@define procedure mfluaprinttransitionlineto();
+@define procedure mfluaPREmakeellipse();
+@define procedure mfluaPOSTmakeellipse();
+@define procedure mfluarunscript();
diff --git a/Build/source/texk/web2c/mfluajitdir/mfluajitextra.c b/Build/source/texk/web2c/mfluajitdir/mfluajitextra.c
new file mode 100644
index 00000000000..653bc69113d
--- /dev/null
+++ b/Build/source/texk/web2c/mfluajitdir/mfluajitextra.c
@@ -0,0 +1,11 @@
+/* mfluajitextra.c: Hand-coded routines for MFLuaJIT.
+
+   This file is public domain.  */
+
+#define	EXTERN /* Instantiate data from mfluajitd.h here.  */
+
+/* This file defines MFLuaJIT.  */
+#include <mfluajitd.h>
+
+/* Hand-coded routines for TeX or Metafont in C.  */
+#include <lib/texmfmp.c>
diff --git a/Build/source/texk/web2c/mfluajitdir/mfluajitextra.h b/Build/source/texk/web2c/mfluajitdir/mfluajitextra.h
new file mode 100644
index 00000000000..9927a9e9f26
--- /dev/null
+++ b/Build/source/texk/web2c/mfluajitdir/mfluajitextra.h
@@ -0,0 +1,23 @@
+/* mfluajitextra.h: banner etc. for MFLuaJIT.
+
+   This is included by MFLuaJIT, from mfluajitextra.c
+*/
+
+#include <mfluadir/mflua_version.h> /* for MFLUA_VERSION */
+
+#define BANNER "This is MFLuaJIT, Version 2.7182818-" MFLUA_VERSION
+#define COPYRIGHT_HOLDER "L. Scarso"
+#define AUTHOR NULL
+#define PROGRAM_HELP MFLUAJITHELP
+#define BUG_ADDRESS "luigi.scarso@gmail.com"
+#define DUMP_VAR MFbasedefault
+#define DUMP_LENGTH_VAR basedefaultlength
+#define DUMP_OPTION "base"
+#ifdef DOS
+#define DUMP_EXT ".bas"
+#else
+#define DUMP_EXT ".base"
+#endif
+#define INPUT_FORMAT kpse_mf_format
+#define INI_PROGRAM "inimfluajit"
+#define VIR_PROGRAM "virmfluajit"
diff --git a/Build/source/texk/web2c/mfluajitdir/mfluajittrap/mfluajittrap.diffs b/Build/source/texk/web2c/mfluajitdir/mfluajittrap/mfluajittrap.diffs
new file mode 100644
index 00000000000..a12ee7d11cc
--- /dev/null
+++ b/Build/source/texk/web2c/mfluajitdir/mfluajittrap/mfluajittrap.diffs
@@ -0,0 +1,203 @@
+>>> Running TRAP test for MFLuaJIT.
+>>> See SRCDIR/mfluajitdir/mfluajittrap/mfluajittrap.diffs for example of acceptable diffs.
++ ln -s SRCDIR/triptrap/trap.mf .
++ ./mfluajit --progname=inimfluajit
++ test '!' -s trap.base
++ mv trap.log mftrapin.log
++ diff SRCDIR/triptrap/mftrapin.log mftrapin.log
+1c1
+< This is METAFONT, Version 2.7182818 (INIMF)  7 JAN 2014 17:51
+---
+> This is MFLuaJIT, Version 2.7182818-0.5 (TeX Live 2015) (INIMF)  17 APR 2015 11:16
+150c150
+< String usage 26&83 (891&11438 still untouched)
+---
+> String usage 30&98 (6384&979377 still untouched)
+176,177c176,177
+<  (preloaded base=trap 2014.1.7)
+< 1117 strings of total length 20614
+---
+>  (preloaded base=trap 2015.4.17)
+> 1125 strings of total length 20684
+179c179
+< 265 symbolic tokens
+---
+> 266 symbolic tokens
++ ./mfluajit --progname=inimfluajit
++ mv trap.log mftrap.log
++ mv trap.tfm mftrap.tfm
++ diff SRCDIR/triptrap/mftrap.fot mftrap.fot
+1,3c1,2
+< This is METAFONT, Version 2.7182818 (INIMF)
+< ** &trap  trap 
+< (trap.mf
+---
+> This is MFLuaJIT, Version 2.7182818-0.5 (TeX Live 2015) (INIMF)
+> **(trap.mf
+39c38
+< String usage 41&161 (815&7634 still untouched)
+---
+> String usage 50&202 (6298&975523 still untouched)
++ diff SRCDIR/triptrap/mftrap.log mftrap.log
+1c1
+< This is METAFONT, Version 2.7182818 (preloaded base=trap 2014.1.7)  7 JAN 2014 18:11
+---
+> This is MFLuaJIT, Version 2.7182818-0.5 (TeX Live 2015) (preloaded base=trap 2015.4.17)  17 APR 2015 11:16
+133,134c133,134
+< <scantokens> pair
+<                   p[],';^^ff
+---
+> <scantokens> or <runscript> pair
+>                                  p[],';^^ff
+145,146c145,146
+< <scantokens> pair
+<                   p[],';^^ff
+---
+> <scantokens> or <runscript> pair
+>                                  p[],';^^ff
+158,159c158,159
+< <scantokens> pair
+<                   p[],';^^ff
+---
+> <scantokens> or <runscript> pair
+>                                  p[],';^^ff
+169,170c169,170
+< <scantokens> pair p[],';^^ff
+<                             
+---
+> <scantokens> or <runscript> ...f
+>                                 
+1825c1825
+< String usage 24&92 (858&11309 still untouched)
+---
+> String usage 30&119 (6344&979191 still untouched)
+3693,3695c3693,3695
+< xpart %CAPSULE1359=xx
+< %CAPSULE1367=2yy-2
+< %CAPSULE1375 = 3.3333xx+3.3333
+---
+> xpart %CAPSULE1370=xx
+> %CAPSULE1378=2yy-2
+> %CAPSULE1386 = 3.3333xx+3.3333
+3755,3757c3755,3757
+< xpart %CAPSULE1049 = 8000o2-4000o1+1000o3+9
+< xpart %CAPSULE1383=xpart '
+< ypart %CAPSULE1383=ypart '
+---
+> xpart %CAPSULE604 = 8000o2-4000o1+1000o3+9
+> xpart %CAPSULE1394=xpart '
+> ypart %CAPSULE1394=ypart '
+3760,3761c3760,3761
+< ### 4000o1 = -xpart %CAPSULE1049+8000o2+1000o3+9
+< ### -4.87383o2 = -oo-0.0004xpart %CAPSULE1049+0.39673o3-17.99643
+---
+> ### 4000o1 = -xpart %CAPSULE604+8000o2+1000o3+9
+> ### -4.87383o2 = -oo-0.0004xpart %CAPSULE604+0.39673o3-17.99643
+3768c3768
+< ### -alfa=-xpart %CAPSULE1494
+---
+> ### -alfa=-xpart %CAPSULE368
+3770,3771c3770,3771
+< {xpart((xpart %CAPSULE1494,0))}
+< ### -xpart %CAPSULE17=-%CAPSULE1176
+---
+> {xpart((xpart %CAPSULE368,0))}
+> ### -xpart %CAPSULE17=-%CAPSULE1376
+3773,3775c3773,3775
+< {(%CAPSULE382)+(%CAPSULE1176)}
+< ### -%CAPSULE382=-%CAPSULE1893+%CAPSULE1176
+< ### -%CAPSULE1893=-ypart %CAPSULE1049
+---
+> {(%CAPSULE382)+(%CAPSULE1376)}
+> ### -%CAPSULE382=-%CAPSULE1364+%CAPSULE1376
+> ### -%CAPSULE1364=-ypart %CAPSULE604
+3780c3780
+< ### p$=-ypart %CAPSULE604+1
+---
+> ### p$=-ypart %CAPSULE1360+1
+3782,3793c3782,3793
+< {(2/3)*((-ypart %CAPSULE604+1,ypart %CAPSULE604))}
+< ### ypart %CAPSULE604=-xpart %CAPSULE604+1
+< ### -0.66667xpart %CAPSULE604=-xpart %CAPSULE1889
+< {-((xpart %CAPSULE1889,-xpart %CAPSULE1889+0.66667))}
+< ### xpart %CAPSULE1889=-xpart %CAPSULE1172
+< {((xpart %CAPSULE1049,ypart %CAPSULE1049))=((xpart %CAPSULE1172,-xpart %
+< CAPSULE1172-0.66667))}
+< ## xpart %CAPSULE1172=-ypart %CAPSULE1049-0.66667
+< ## ypart %CAPSULE1049=-xpart %CAPSULE1049-0.66667
+< ### -xpart %CAPSULE1049=-xpart %CAPSULE1172
+< {((xpart ',ypart '))=((xpart %CAPSULE1172,-xpart %CAPSULE1172-0.66667))}
+< ## xpart %CAPSULE1172=-ypart '-0.66667
+---
+> {(2/3)*((-ypart %CAPSULE1360+1,ypart %CAPSULE1360))}
+> ### ypart %CAPSULE1360=-xpart %CAPSULE1360+1
+> ### -0.66667xpart %CAPSULE1360=-xpart %CAPSULE1744
+> {-((xpart %CAPSULE1744,-xpart %CAPSULE1744+0.66667))}
+> ### xpart %CAPSULE1744=-xpart %CAPSULE1675
+> {((xpart %CAPSULE604,ypart %CAPSULE604))=((xpart %CAPSULE1675,-xpart %CA
+> PSULE1675-0.66667))}
+> ## xpart %CAPSULE1675=-ypart %CAPSULE604-0.66667
+> ## ypart %CAPSULE604=-xpart %CAPSULE604-0.66667
+> ### -xpart %CAPSULE604=-xpart %CAPSULE1675
+> {((xpart ',ypart '))=((xpart %CAPSULE1675,-xpart %CAPSULE1675-0.66667))}
+> ## xpart %CAPSULE1675=-ypart '-0.66667
+3799c3799
+< ### -ooo=-%CAPSULE1494
+---
+> ### -ooo=-%CAPSULE1051
+3801,3810c3801,3810
+< {(%CAPSULE1494)+(1)}
+< ### -%CAPSULE1494=-%CAPSULE1350+1
+< {(1/2)*(%CAPSULE1350)}
+< ### -0.5%CAPSULE1350=-%CAPSULE1367
+< {-(%CAPSULE1367)}
+< ### %CAPSULE1367=-%CAPSULE1893
+< {(2)*(%CAPSULE1893)}
+< ### -2%CAPSULE1893=-%CAPSULE1885
+< {(-0.5%CAPSULE1885-0.5)=(%CAPSULE1885)}
+< ## %CAPSULE1885=-0.33333
+---
+> {(%CAPSULE1051)+(1)}
+> ### -%CAPSULE1051=-%CAPSULE1378+1
+> {(1/2)*(%CAPSULE1378)}
+> ### -0.5%CAPSULE1378=-%CAPSULE1370
+> {-(%CAPSULE1370)}
+> ### %CAPSULE1370=-%CAPSULE1362
+> {(2)*(%CAPSULE1362)}
+> ### -2%CAPSULE1362=-%CAPSULE1354
+> {(-0.5%CAPSULE1354-0.5)=(%CAPSULE1354)}
+> ## %CAPSULE1354=-0.33333
+4235c4235
+< String usage 41&161 (815&7634 still untouched)
+---
+> String usage 50&202 (6298&975523 still untouched)
+4251,4252c4251,4252
+<  68 strings out of 883
+<  3752 string characters out of 11386
+---
+>  77 strings out of 6375
+>  3793 string characters out of 979316
+4254,4255c4254,4255
+<  289 symbolic tokens out of 2100
+<  8i,43n,14r,8p,167b stack positions out of 30i,100n,300r,150p,500b
+---
+>  290 symbolic tokens out of 9500
+>  8i,43n,14r,8p,167b stack positions out of 300i,300n,1000r,150p,3000b
+4263c4263
+<   out of 256w,16h,16d,64i,5000l,500k,256e,50p)
+---
+>   out of 256w,16h,16d,64i,15000l,2500k,256e,60p)
++ ./tftopl ./mftrap.tfm mftrap.pl
++ diff SRCDIR/triptrap/mftrap.pl mftrap.pl
++ ./gftype -m -i ./trap.72270gf
++ diff SRCDIR/triptrap/trap.typ trap.typ
+1c1
+< This is GFtype, Version 3.1
+---
+> This is GFtype, Version 3.1 (TeX Live 2015)
+3c3
+< ' METAFONT output 2014.01.07:1811'
+---
+> ' METAFONT output 2015.04.17:1116'
++ :
+PASS: mfluajitdir/mfluajittraptest
diff --git a/Build/source/texk/web2c/mfluajitdir/mfluajittraptest b/Build/source/texk/web2c/mfluajitdir/mfluajittraptest
new file mode 100755
index 00000000000..78437cd92a2
--- /dev/null
+++ b/Build/source/texk/web2c/mfluajitdir/mfluajittraptest
@@ -0,0 +1,52 @@
+#! /bin/sh
+
+# Copyright (C) 2015 Peter Breitenlohner <tex-live@tug.org>
+# You may freely use, modify and/or distribute this file.
+
+testdir=$abs_srcdir/triptrap
+ltestdir=$abs_srcdir/mfluadir/mfluatrap
+jtestdir=$abs_srcdir/mfluajitdir/mfluajittrap
+
+TEXMFCNF=$ltestdir; export TEXMFCNF
+
+rm -rf mfluajittrapdir
+mkdir mfluajittrapdir
+cd mfluajittrapdir
+
+cp $ltestdir/*.lua .
+
+echo ">>> Running TRAP test for MFLuaJIT." >&2
+echo ">>> See $jtestdir/mfluajittrap.diffs for example of acceptable diffs." >&2
+
+is_OK=:
+
+set -x
+
+# get same filename in log
+$LN_S $testdir/trap.mf .
+
+../mfluajit --progname=inimfluajit <$testdir/mftrap1.in >mftrapin.fot
+if test ! -s trap.base; then
+  echo "*** trap.base not created by mftrap1.in, investigate!" >&2
+  exit 1
+fi
+mv trap.log mftrapin.log || exit 1
+diff $testdir/mftrapin.log mftrapin.log
+
+../mfluajit --progname=inimfluajit <$testdir/mftrap2.in >mftrap.fot
+mv trap.log mftrap.log || exit 1
+mv trap.tfm mftrap.tfm || exit 1
+diff $testdir/mftrap.fot mftrap.fot
+diff $testdir/mftrap.log mftrap.log
+
+../tftopl ./mftrap.tfm mftrap.pl || exit 1
+diff $testdir/mftrap.pl mftrap.pl || is_OK=false
+
+../gftype -m -i ./trap.72270gf >trap.typ || exit 1
+diff $testdir/trap.typ trap.typ
+
+$is_OK || {
+  echo ">>> There were some errors." >&2
+  exit 1
+}
+
diff --git a/Build/source/texk/web2c/tangle-sh.in b/Build/source/texk/web2c/tangle-sh.in
index 724e0805f4f..6af8991f042 100644
--- a/Build/source/texk/web2c/tangle-sh.in
+++ b/Build/source/texk/web2c/tangle-sh.in
@@ -38,7 +38,7 @@ do_tangle () {
   else
     case $base in
       aleph | xetex) echo "  OTANGLE " $base;;
-      *tex | mf) echo "  TANGLE  " $base;;
+      *tex | mf*) echo "  TANGLE  " $base;;
       *) echo "  CTANGLE " $base;;
     esac
     $tangle "$@" >$base.out 2>&1; rc=$?
diff --git a/Build/source/texk/web2c/texmfmp-help.h b/Build/source/texk/web2c/texmfmp-help.h
index b2699cb2cc5..6a0dba4b676 100644
--- a/Build/source/texk/web2c/texmfmp-help.h
+++ b/Build/source/texk/web2c/texmfmp-help.h
@@ -1,6 +1,6 @@
 /* The help messages for TeX & MF family of programs.
 
-Copyright 1995, 1996, 2008 - 2011 Karl Berry.
+Copyright 1995, 1996, 2008-2015 Karl Berry.
 Copyright 2001-05 Olaf Weber.
 
 This program is free software; you can redistribute it and/or modify
@@ -269,7 +269,7 @@ const_string EUPTEXHELP[] = {
 };
 #endif /* eupTeX */
 
-#ifdef MF
+#ifdef onlyMF
 const_string MFHELP[] = {
     "Usage: mf [OPTION]... [MFNAME[.mf]] [COMMANDS]",
     "   or: mf [OPTION]... \\FIRST-LINE",
@@ -312,7 +312,97 @@ const_string MFHELP[] = {
     "-version                output version information and exit",
     NULL
 };
-#endif /* MF */
+#endif /* onlyMF */
+
+#ifdef MFLua
+const_string MFLUAHELP[] = {
+    "Usage: mflua [OPTION]... [MFNAME[.mf]] [COMMANDS]",
+    "   or: mflua [OPTION]... \\FIRST-LINE",
+    "   or: mflua [OPTION]... &BASE ARGS",
+    "  Run MFLua on MFNAME, usually creating MFNAME.tfm and MFNAME.NNNNgf,",
+    "  where NNNN is the resolution of the specified mode (2602 by default).",
+    "  Any following COMMANDS are processed as Metafont input,",
+    "  after MFNAME is read.",
+    "  If the first line of MFNAME is %&BASE, and BASE is an existing .base file,",
+    "  use it.  Else use `NAME.base', where NAME is the program invocation name,",
+    "  most commonly `mf'.",
+    "",
+    "  Alternatively, if the first non-option argument begins with a backslash,",
+    "  interpret all non-option arguments as a line of Metafont input.",
+    "",
+    "  Alternatively, if the first non-option argument begins with a &, the",
+    "  next word is taken as the BASE to read, overriding all else. Any",
+    "  remaining arguments are processed as above.",
+    "",
+    "  If no arguments or options are specified, prompt for input.",
+    "",
+    "-base=BASENAME          use BASENAME instead of program name or a %& line",
+    "[-no]-file-line-error   disable/enable file:line:error style messages",
+    "-halt-on-error          stop processing at the first error",
+    "-ini                    be inimf, for dumping bases; this is implicitly",
+    "                          true if the program name is `inimf'",
+    "-interaction=STRING     set interaction mode (STRING=batchmode/nonstopmode/",
+    "                          scrollmode/errorstopmode)",
+    "-jobname=STRING         set the job name to STRING",
+    "-kpathsea-debug=NUMBER  set path searching debugging flags according to",
+    "                          the bits of NUMBER",
+    "[-no]-mktex=FMT         disable/enable mktexFMT generation (FMT=mflua)",
+    "-output-directory=DIR   use existing DIR as the directory to write files in",
+    "[-no]-parse-first-line  disable/enable parsing of first line of input file",
+    "-progname=STRING        set program (and base) name to STRING",
+    "-recorder               enable filename recorder",
+    "-translate-file=TCXNAME use the TCX file TCXNAME",
+    "-8bit                   make all characters printable by default",
+    "-help                   display this help and exit",
+    "-version                output version information and exit",
+    NULL
+};
+#endif /* MFLua */
+
+#ifdef MFLuaJIT
+const_string MFLUAJITHELP[] = {
+    "Usage: mfluajit [OPTION]... [MFNAME[.mf]] [COMMANDS]",
+    "   or: mfluajit [OPTION]... \\FIRST-LINE",
+    "   or: mfluajit [OPTION]... &BASE ARGS",
+    "  Run MFLuaJIT on MFNAME, usually creating MFNAME.tfm and MFNAME.NNNNgf,",
+    "  where NNNN is the resolution of the specified mode (2602 by default).",
+    "  Any following COMMANDS are processed as Metafont input,",
+    "  after MFNAME is read.",
+    "  If the first line of MFNAME is %&BASE, and BASE is an existing .base file,",
+    "  use it.  Else use `NAME.base', where NAME is the program invocation name,",
+    "  most commonly `mf'.",
+    "",
+    "  Alternatively, if the first non-option argument begins with a backslash,",
+    "  interpret all non-option arguments as a line of Metafont input.",
+    "",
+    "  Alternatively, if the first non-option argument begins with a &, the",
+    "  next word is taken as the BASE to read, overriding all else. Any",
+    "  remaining arguments are processed as above.",
+    "",
+    "  If no arguments or options are specified, prompt for input.",
+    "",
+    "-base=BASENAME          use BASENAME instead of program name or a %& line",
+    "[-no]-file-line-error   disable/enable file:line:error style messages",
+    "-halt-on-error          stop processing at the first error",
+    "-ini                    be inimf, for dumping bases; this is implicitly",
+    "                          true if the program name is `inimf'",
+    "-interaction=STRING     set interaction mode (STRING=batchmode/nonstopmode/",
+    "                          scrollmode/errorstopmode)",
+    "-jobname=STRING         set the job name to STRING",
+    "-kpathsea-debug=NUMBER  set path searching debugging flags according to",
+    "                          the bits of NUMBER",
+    "[-no]-mktex=FMT         disable/enable mktexFMT generation (FMT=mflua)",
+    "-output-directory=DIR   use existing DIR as the directory to write files in",
+    "[-no]-parse-first-line  disable/enable parsing of first line of input file",
+    "-progname=STRING        set program (and base) name to STRING",
+    "-recorder               enable filename recorder",
+    "-translate-file=TCXNAME use the TCX file TCXNAME",
+    "-8bit                   make all characters printable by default",
+    "-help                   display this help and exit",
+    "-version                output version information and exit",
+    NULL
+};
+#endif /* MFLuaJIT */
 
 #ifdef pdfTeX
 const_string PDFTEXHELP[] = {
diff --git a/Build/source/texk/web2c/texmfmp.h b/Build/source/texk/web2c/texmfmp.h
index a4cd5f28cc8..26eae5648fb 100644
--- a/Build/source/texk/web2c/texmfmp.h
+++ b/Build/source/texk/web2c/texmfmp.h
@@ -1,4 +1,4 @@
-/* texmf.h: Main include file for TeX and Metafont in C. This file is
+/* texmf.h: Main include file for TeX and MF in C. This file is
    included by {tex,mf}d.h, which is the first include in the C files
    output by web2c.  */
 
@@ -89,8 +89,16 @@ typedef void* voidpointer;
 #define OUT_BUF dvibuf
 #endif /* TeX */
 #ifdef MF
+#if defined(MFLua)
+#define TEXMFPOOLNAME "mflua.pool"
+#define TEXMFENGINENAME "mflua"
+#elif defined(MFLua)
+#define TEXMFPOOLNAME "mfluajit.pool"
+#define TEXMFENGINENAME "mfluajit"
+#else
 #define TEXMFPOOLNAME "mf.pool"
 #define TEXMFENGINENAME "metafont"
+#endif
 #define DUMP_FILE basefile
 #define DUMP_FORMAT kpse_base_format
 #define writegf WRITE_OUT
diff --git a/Build/source/texk/web2c/triptrap-sh b/Build/source/texk/web2c/triptrap-sh
index 67ee48d4eaf..7683cffd954 100755
--- a/Build/source/texk/web2c/triptrap-sh
+++ b/Build/source/texk/web2c/triptrap-sh
@@ -1,7 +1,7 @@
 #! /bin/sh
 # shell script to run TRIP and TRAP tests and create diffs.
 #
-#   Copyright (C) 2010-2014 Peter Breitenlohner <tex-live@tug.org>
+#   Copyright (C) 2010-2015 Peter Breitenlohner <tex-live@tug.org>
 #
 #   This file is free software; the copyright holder
 #   gives unlimited permission to copy and/or distribute it,
@@ -22,6 +22,8 @@ do
   case $file in
   trip.diffs) tst=triptest; msg='TRIP test for TeX';;
   mftrap.diffs) tst=mftraptest; msg='TRAP test for Metafont';;
+  mfluatrap.diffs) tst=mfluadir/mfluatraptest; msg='TRAP test for MFLua';;
+  mfluajittrap.diffs) tst=mfluajitdir/mfluajittraptest; msg='TRAP test for MFLuaJIT';;
   mptrap.diffs) tst=mplibdir/mptraptest; msg='MPTRAP test for MetaPost';;
   etrip.diffs) tst=etexdir/etriptest; msg='e-TRIP test for e-TeX';;
   ptrip.diffs) tst=ptexdir/ptriptest; msg='TRIP test for pTeX';;
diff --git a/Build/source/texk/web2c/web2c/ChangeLog b/Build/source/texk/web2c/web2c/ChangeLog
index e43657a3a20..3bf48558545 100644
--- a/Build/source/texk/web2c/web2c/ChangeLog
+++ b/Build/source/texk/web2c/web2c/ChangeLog
@@ -1,3 +1,8 @@
+2015-06-12  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Integrate MFLua and MFLuaJIT.
+	* coerce.h, convert, splitup.c: Adapted.
+
 2015-04-17  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* configure.ac: Test if isascii is declared.
diff --git a/Build/source/texk/web2c/web2c/coerce.h b/Build/source/texk/web2c/web2c/coerce.h
index 6b36130ad21..c309dcccf95 100644
--- a/Build/source/texk/web2c/web2c/coerce.h
+++ b/Build/source/texk/web2c/web2c/coerce.h
@@ -36,6 +36,9 @@ extern void calledit (packedASCIIcode *, poolpointer, integer, integer);
 #ifdef MF
 extern void blankrectangle (screencol, screencol, screenrow, screenrow);
 extern void paintrow (screenrow, pixelcolor, transspec, screencol);
+#if defined(MFLua) || defined(MFLuaJIT)
+#include <mfluadir/mfluac.h>
+#endif
 #endif
 
 extern strnumber makefullnamestring(void);
diff --git a/Build/source/texk/web2c/web2c/configure b/Build/source/texk/web2c/web2c/configure
index 37613c1771b..ebed28d902d 100755
--- a/Build/source/texk/web2c/web2c/configure
+++ b/Build/source/texk/web2c/web2c/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Web2C Tools 2015.
+# Generated by GNU Autoconf 2.69 for Web2C Tools 2016/dev.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='Web2C Tools'
 PACKAGE_TARNAME='web2c-tools'
-PACKAGE_VERSION='2015'
-PACKAGE_STRING='Web2C Tools 2015'
+PACKAGE_VERSION='2016/dev'
+PACKAGE_STRING='Web2C Tools 2016/dev'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
@@ -1328,7 +1328,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures Web2C Tools 2015 to adapt to many kinds of systems.
+\`configure' configures Web2C Tools 2016/dev to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1398,7 +1398,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Web2C Tools 2015:";;
+     short | recursive ) echo "Configuration of Web2C Tools 2016/dev:";;
    esac
   cat <<\_ACEOF
 
@@ -1521,7 +1521,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Web2C Tools configure 2015
+Web2C Tools configure 2016/dev
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2071,6 +2071,52 @@ $as_echo "$ac_res" >&6; }
 
 } # ac_fn_c_find_uintX_t
 
+# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
+# ---------------------------------------------
+# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
+# accordingly.
+ac_fn_c_check_decl ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  as_decl_name=`echo $2|sed 's/ *(.*//'`
+  as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
+$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+#ifndef $as_decl_name
+#ifdef __cplusplus
+  (void) $as_decl_use;
+#else
+  (void) $as_decl_name;
+#endif
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_decl
+
 # ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES
 # ----------------------------------------------------
 # Tries to find if the field MEMBER exists in type AGGR, after including
@@ -2310,57 +2356,11 @@ rm -f conftest.val
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_compute_int
-
-# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
-# ---------------------------------------------
-# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
-# accordingly.
-ac_fn_c_check_decl ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  as_decl_name=`echo $2|sed 's/ *(.*//'`
-  as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
-$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-#ifndef $as_decl_name
-#ifdef __cplusplus
-  (void) $as_decl_use;
-#else
-  (void) $as_decl_name;
-#endif
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$3=yes"
-else
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_decl
 cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Web2C Tools $as_me 2015, which was
+It was created by Web2C Tools $as_me 2016/dev, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -8045,7 +8045,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='web2c-tools'
- VERSION='2015'
+ VERSION='2016/dev'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -8200,13 +8200,13 @@ else
 if test "x$enable_compiler_warnings" != xno; then
   kpse_cv_warning_cflags="-Wimplicit -Wreturn-type"
   case `$CC -dumpversion` in #(
-  3.4.* | 4.*) :
+  3.4.* | 4.* | 5.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wdeclaration-after-statement" ;; #(
   *) :
      ;;
 esac
   case `$CC -dumpversion` in #(
-  3.[234].* | 4.*) :
+  3.[234].* | 4.* | 5.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wno-unknown-pragmas" ;; #(
   *) :
      ;;
@@ -8218,7 +8218,7 @@ esac
       kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
       kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
       case `$CC -dumpversion` in #(
-  3.4.* | 4.*) :
+  3.4.* | 4.* | 5.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wold-style-definition" ;; #(
   *) :
      ;;
@@ -13625,6 +13625,18 @@ case :$ac_cv_c_int64_t:$ac_cv_c_int64_t: in #(
   *) :
      ;;
 esac
+ac_fn_c_check_decl "$LINENO" "isascii" "ac_cv_have_decl_isascii" "#include <ctype.h>
+"
+if test "x$ac_cv_have_decl_isascii" = xyes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_ISASCII $ac_have_decl
+_ACEOF
+
 ac_fn_c_check_member "$LINENO" "struct stat" "st_mtim" "ac_cv_member_struct_stat_st_mtim" "$ac_includes_default"
 if test "x$ac_cv_member_struct_stat_st_mtim" = xyes; then :
 
@@ -14562,7 +14574,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Web2C Tools $as_me 2015, which was
+This file was extended by Web2C Tools $as_me 2016/dev, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14628,7 +14640,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-Web2C Tools config.status 2015
+Web2C Tools config.status 2016/dev
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/Build/source/texk/web2c/web2c/convert b/Build/source/texk/web2c/web2c/convert
index 4e3c2cdfd68..36c5c13c94c 100755
--- a/Build/source/texk/web2c/web2c/convert
+++ b/Build/source/texk/web2c/web2c/convert
@@ -64,9 +64,9 @@ case $basefile in
     midcmd="| sed -f $srcdir/web2c/cvtbib.sed"
     ;;
 
-  mf|tex|aleph|etex|pdftex|ptex|eptex|euptex|uptex|xetex)
+  mf|mflua|mfluajit|tex|aleph|etex|pdftex|ptex|eptex|euptex|uptex|xetex)
     case $basefile in
-      mf)
+      mf*)
         more_defines="$srcdir/web2c/texmf.defines $srcdir/web2c/mfmp.defines"
         precmd="| sed -f $srcdir/web2c/cvtmf1.sed"
         web2c_options="-m -c${basefile}coerce"
@@ -75,14 +75,14 @@ case $basefile in
 
       *)
         more_defines="$srcdir/web2c/texmf.defines $srcdir/synctexdir/synctex.defines"
-        prog_defines="$srcdir/${basefile}dir/$basefile.defines"
-        if test -f $prog_defines; then
-          more_defines="$more_defines $prog_defines"
-        fi
         web2c_options="-t -c${basefile}coerce"
         fixwrites_options=-t
         ;;
     esac
+    prog_defines="$srcdir/${basefile}dir/$basefile.defines"
+    if test -f $prog_defines; then
+      more_defines="$more_defines $prog_defines"
+    fi
     hfile=texmfmp.h
     postcmd="| ./web2c/splitup $splitup_options $basefile"
     cfile=${basefile}0.c # last output file, or thereabouts
@@ -121,7 +121,7 @@ case $basefile in
     sed -e 's/(buftype)//g' -e 's/(pdstype)//g' <$basefile.h >x$basefile.h
     mv x$basefile.h $basefile.h
     ;;
-  mf|tex|aleph|etex|pdftex|ptex|eptex|euptex|uptex|xetex)
+  mf|mflua|mfluajit|tex|aleph|etex|pdftex|ptex|eptex|euptex|uptex|xetex)
     sleep 2 # so timestamps are definitely later, to avoid make weirdness
     cat $srcdir/web2c/coerce.h >>${basefile}coerce.h
     touch ${basefile}d.h
diff --git a/Build/source/texk/web2c/web2c/splitup.c b/Build/source/texk/web2c/web2c/splitup.c
index eb3442eacf9..8288a516cf7 100644
--- a/Build/source/texk/web2c/web2c/splitup.c
+++ b/Build/source/texk/web2c/web2c/splitup.c
@@ -118,8 +118,14 @@ main (int argc, string *argv)
   fputs ("#define STAT\n#define INI\n", out);
   
   if (STREQ (output_name, "mf")) {
-    fputs ("#define INIMF\n#define MF\n", out);
+    fputs ("#define INIMF\n#define MF\n#define onlyMF\n", out);
     coerce = "mfcoerce.h";
+  } else if (STREQ (output_name, "mflua")) {
+    fputs ("#define INIMF\n#define MF\n#define MFLua\n", out);
+    coerce = "mfluacoerce.h";
+  } else if (STREQ (output_name, "mfluajit")) {
+    fputs ("#define INIMF\n#define MF\n#define MFLuaJIT\n", out);
+    coerce = "mfluajitcoerce.h";
   } else if (STREQ (output_name, "tex")) {
     fputs ("#define INITEX\n#define TeX\n#define onlyTeX\n", out);
     coerce = "texcoerce.h";