summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/latexconfig
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-10-12 22:45:39 +0000
committerKarl Berry <karl@freefriends.org>2015-10-12 22:45:39 +0000
commitbb3578641d00574ac8f3ccc81d08a11005da255b (patch)
tree23632464b0445a03313f46da195bdd2e2089c671 /Master/texmf-dist/tex/latex/latexconfig
parent98f1f46eb83fd925943d70923b53bd3ce785565a (diff)
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
Diffstat (limited to 'Master/texmf-dist/tex/latex/latexconfig')
-rw-r--r--Master/texmf-dist/tex/latex/latexconfig/dvilualatex.ini11
-rw-r--r--Master/texmf-dist/tex/latex/latexconfig/lualatex.ini30
2 files changed, 21 insertions, 20 deletions
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