2 files changed, 20 insertions, 21 deletions
diff --git a/Master/texmf-dist/tex/latex/latexconfig/dvilualatex.ini b/Master/texmf-dist/tex/latex/latexconfig/dvilualatex.ini
index 27678c42859..2e81233ee41 100644
--- a/Master/texmf-dist/tex/latex/latexconfig/dvilualatex.ini
+++ b/Master/texmf-dist/tex/latex/latexconfig/dvilualatex.ini
@@ -1,16 +1,15 @@
 % $Id$
 % Originally written 2008 by Karl Berry. Public domain.
-% Except for \pdfoutput=0, same as lualatex.ini (extra comments there).
-% That is, changes here must also go into lualatex.ini.
+% same as lualatex.ini (extra comments there) except for \pdfoutput=0.
 
 \begingroup
-  \catcode`\{=1
-  \catcode`\}=2
-  \directlua{tex.enableprimitives('',
-    tex.extraprimitives('pdftex', 'etex', 'luatex'))}
+  \catcode`\{=1 %
+  \catcode`\}=2 %
+    \directlua{tex.enableprimitives('',tex.extraprimitives('pdftex'))}
   \global\everyjob{\directlua{require("lualatexquotejobname.lua")}}
 \endgroup
 
+% settings inherited from pdftex
 \input pdftexconfig.tex
 \pdfoutput=0 % dvi output by default
 
diff --git a/Master/texmf-dist/tex/latex/latexconfig/lualatex.ini b/Master/texmf-dist/tex/latex/latexconfig/lualatex.ini
index ea243659515..68e2a59b1cc 100644
--- a/Master/texmf-dist/tex/latex/latexconfig/lualatex.ini
+++ b/Master/texmf-dist/tex/latex/latexconfig/lualatex.ini
@@ -1,25 +1,25 @@
 % $Id$
 % Originally written 2008 by Karl Berry. Public domain.
-% Changes here must also go into dvilualatex.ini.
 
 \begingroup
-  \catcode`\{=1
-  \catcode`\}=2
-  %
-  \directlua{
-    % Enable the primitives needed for pdftexconfig.tex to do its job.
-    tex.enableprimitives('',
-      tex.extraprimitives('pdftex', 'etex', 'luatex'))}
-    %
-    % Web2c pdfTeX/XeTeX quote job names containing spaces, but LuaTeX does
-    % does not do this by default; we change it via a callback, since users
-    % want consistency.
-    \global\everyjob{\directlua{require("lualatexquotejobname.lua")}}
+  \catcode`\{=1 %
+  \catcode`\}=2 %
+% JAW: Enable 'extra' pdfTeX primitives only in .ini file
+% latex.ltx enables the extra primitives bu a subset of those from
+% pdfTeX are needed to do the configuration below (pdftexconfig.tex).
+% Rather than list them all, just enable those classed as 'pdftex'.
+    \directlua{tex.enableprimitives('',tex.extraprimitives('pdftex'))}
+% JAW: Set up job name quoting before latex.ltx
+% Web2c pdfTeX/XeTeX quote job names containing spaces, but LuaTeX does
+% not do this at the engine level. The behaviour can be changed using
+% a callback. Originally this code was loaded via lualatexquotejobname.tex
+% but that required a hack around latex.ltx: the behaviour has been altered
+% to allow the callback route to be used directly.
+  \global\everyjob{\directlua{require("lualatexquotejobname.lua")}}
 \endgroup
 
-% Settings for pdftex.
+% settings inherited from pdftex
 \input pdftexconfig.tex
 % pdf output by default
 
-% Read the latex format definitions.
 \input latex.ltx