From Akira: in LuaTeX 0.81.1, primitives \pdfpage{width,height} are

renamed to \page{width,height}, and also reclassified from pdftex to
luatex.  So:

* pdftexconfig.tex: check and set \luatexpage{width,height} as well as
\pdfpage{width,height} and \page{width,height}, just for completeness.

* lualatex.ini,
* dvilualatex.ini: enable luatex primitives so pdftexconfig.tex can set
them, and enable etex primitives to work with current latex.ltx.

* luatexiniconfig.tex: doc changes only.


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

4 files changed, 39 insertions, 34 deletions

diff --git a/Master/texmf-dist/tex/generic/config/luatexiniconfig.tex b/Master/texmf-dist/tex/generic/config/luatexiniconfig.tex
index fd70863e21d..caf56638c3c 100644
--- a/Master/texmf-dist/tex/generic/config/luatexiniconfig.tex
+++ b/Master/texmf-dist/tex/generic/config/luatexiniconfig.tex
@@ -1,18 +1,19 @@
 % $Id$
-% Enable and prefix LuaTeX primitives for Plain-based formats
+% Read for plain luatex formats (luatex.ini, dviluatex.ini).
 % Assumes LuaTeX 0.39.x or greater.
-% Manuel Pégourié-Gonnard, 2009. Public domain.
+% Originally written 2009 by Manuel P\'egouri\'e-Gonnard. Public domain.
+
 \begingroup
-\catcode`\{=1
-\catcode`\}=2
-\directlua{
-  % all primitives are enabled without prefixing
-  tex.enableprimitives('', 
-    tex.extraprimitives())
-  % for compatibility with LaTeX-based formats, also provide a prefixed version
-  % of some primitives too (see lualatexiniconfig.tex)
-  tex.enableprimitives('luatex', 
-    tex.extraprimitives('core', 'omega', 'aleph', 'luatex'))
+  \catcode`\{=1
+  \catcode`\}=2
+  %
+  \directlua{
+    % enable all primitives without prefixing
+    tex.enableprimitives('', tex.extraprimitives())
+    %
+    % for compatibility with older LaTeX formats, also provide a
+    % prefixed version of some primitives.
+    tex.enableprimitives('luatex',
+      tex.extraprimitives('core', 'omega', 'aleph', 'luatex'))
   }
 \endgroup
-\endinput
diff --git a/Master/texmf-dist/tex/generic/config/pdftexconfig.tex b/Master/texmf-dist/tex/generic/config/pdftexconfig.tex
index cca13327ab0..074f55145f7 100644
--- a/Master/texmf-dist/tex/generic/config/pdftexconfig.tex
+++ b/Master/texmf-dist/tex/generic/config/pdftexconfig.tex
@@ -4,10 +4,13 @@
 \pdfoutput=1
 %
 % In 2015, a new luatex replaced \pdfpage{width,height} with just
-% \page{width,height}.  So set any that's defined.
+% \page{width,height}, and it might be prefixed with \luatex.  So set
+% any that may be defined.
+\ifx\luatexpagewidth\undefined\else \luatexpagewidth=210 true mm \fi
 \ifx\pdfpagewidth\undefined\else \pdfpagewidth=210 true mm \fi
 \ifx\pagewidth\undefined\else \pagewidth=210 true mm \fi
 %
+\ifx\luatexpageheight\undefined\else \luatexpageheight=297 true mm \fi
 \ifx\pdfpageheight\undefined\else \pdfpageheight=297 true mm \fi
 \ifx\pageheight\undefined\else \pageheight=297 true mm \fi
 %
diff --git a/Master/texmf-dist/tex/latex/latexconfig/dvilualatex.ini b/Master/texmf-dist/tex/latex/latexconfig/dvilualatex.ini
index 2e81233ee41..27678c42859 100644
--- a/Master/texmf-dist/tex/latex/latexconfig/dvilualatex.ini
+++ b/Master/texmf-dist/tex/latex/latexconfig/dvilualatex.ini
@@ -1,15 +1,16 @@
 % $Id$
 % Originally written 2008 by Karl Berry. Public domain.
-% same as lualatex.ini (extra comments there) except for \pdfoutput=0.
+% Except for \pdfoutput=0, same as lualatex.ini (extra comments there).
+% That is, changes here must also go into lualatex.ini.
 
 \begingroup
-  \catcode`\{=1 %
-  \catcode`\}=2 %
-    \directlua{tex.enableprimitives('',tex.extraprimitives('pdftex'))}
+  \catcode`\{=1
+  \catcode`\}=2
+  \directlua{tex.enableprimitives('',
+    tex.extraprimitives('pdftex', 'etex', 'luatex'))}
   \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 68e2a59b1cc..ea243659515 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 %
-% 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")}}
+  \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")}}
 \endgroup
 
-% settings inherited from pdftex
+% Settings for pdftex.
 \input pdftexconfig.tex
 % pdf output by default
 
+% Read the latex format definitions.
 \input latex.ltx