Adapting (pdf)lua(la)tex.ini for LuaTeX 0.39.0 and newer.

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

6 files changed, 16 insertions, 0 deletions

diff --git a/Master/texmf-dist/tex/latex/latexconfig/lualatex.ini b/Master/texmf-dist/tex/latex/latexconfig/lualatex.ini
index 0def0e2fea3..378680cee89 100644
--- a/Master/texmf-dist/tex/latex/latexconfig/lualatex.ini
+++ b/Master/texmf-dist/tex/latex/latexconfig/lualatex.ini
@@ -1,6 +1,7 @@
 % $Id$
 % Karl Berry, 2008. public domain.
 %
+\input luatexiniconfig.tex
 \input pdftexconfig
 \pdfoutput=0  % dvi output by default
 %
diff --git a/Master/texmf-dist/tex/latex/latexconfig/pdflualatex.ini b/Master/texmf-dist/tex/latex/latexconfig/pdflualatex.ini
index 165740e6276..ef6dc9dc69f 100644
--- a/Master/texmf-dist/tex/latex/latexconfig/pdflualatex.ini
+++ b/Master/texmf-dist/tex/latex/latexconfig/pdflualatex.ini
@@ -1,4 +1,5 @@
 % Karl Berry, 2008. public domain.
+\input luatexiniconfig.tex
 \input pdftexconfig.tex
 \scrollmode
 \input latex.ltx
diff --git a/Master/texmf-dist/tex/plain/config/luatex.ini b/Master/texmf-dist/tex/plain/config/luatex.ini
index 3d7f2b843ed..f14b595317e 100644
--- a/Master/texmf-dist/tex/plain/config/luatex.ini
+++ b/Master/texmf-dist/tex/plain/config/luatex.ini
@@ -1,3 +1,4 @@
 % Karl Berry, 2008.  Public domain.
 % DVI-output plain luatex.
+\input luatexiniconfig.tex
 \input etex.ini
diff --git a/Master/texmf-dist/tex/plain/config/pdfluatex.ini b/Master/texmf-dist/tex/plain/config/pdfluatex.ini
index 5c640a864ba..7a334590db5 100644
--- a/Master/texmf-dist/tex/plain/config/pdfluatex.ini
+++ b/Master/texmf-dist/tex/plain/config/pdfluatex.ini
@@ -1,4 +1,5 @@
 % Karl Berry, 2008. Public domain.
+\input luatexiniconfig.tex
 \input pdftexconfig.tex
 \input plain
 \dump
diff --git a/Master/texmf/ls-R b/Master/texmf/ls-R
index 5224cefdb3f..7d0f504f400 100644
--- a/Master/texmf/ls-R
+++ b/Master/texmf/ls-R
@@ -1046,6 +1046,7 @@ language.dat
 language.def
 language.us
 language.us.def
+luatexiniconfig.tex
 pdftex-dvi.tex
 pdftexconfig.tex
 
diff --git a/Master/texmf/tex/generic/config/luatexiniconfig.tex b/Master/texmf/tex/generic/config/luatexiniconfig.tex
new file mode 100644
index 00000000000..a6d8f1baaa4
--- /dev/null
+++ b/Master/texmf/tex/generic/config/luatexiniconfig.tex
@@ -0,0 +1,11 @@
+% Enable LuaTeX primitives for INI mode (needed since 0.39.0)
+% Élie Roux & Manuel Pégourié-Gonnard, 2009. Public domain.
+\begingroup
+\catcode`\{=1
+\catcode`\}=2
+\expandafter\ifx\csname luatexversion\endcsname\relax
+  \let\luatexversion\undefined
+  \directlua{tex.enableprimitives('', tex.extraprimitives())}
+\fi
+\endgroup
+\endinput