summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/lib
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2015-06-12 08:45:07 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2015-06-12 08:45:07 +0000
commit4403160cd26a0ba4eb014d69bfb9dcd568f64fc6 (patch)
tree0a036c9b3654e6e7b2e73753225598980d25c54f /Build/source/texk/web2c/lib
parent1dde8ab4578f370c597332ff3421097d7cb39a1a (diff)
Integrate MFLua and MFLuaJIT
git-svn-id: svn://tug.org/texlive/trunk@37504 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/lib')
-rw-r--r--Build/source/texk/web2c/lib/ChangeLog5
-rw-r--r--Build/source/texk/web2c/lib/texmfmp.c6
2 files changed, 11 insertions, 0 deletions
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 */