summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/latexconfig
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-08-25 23:20:13 +0000
committerKarl Berry <karl@freefriends.org>2015-08-25 23:20:13 +0000
commitffec7cdbdeb8d7e0f397b5db1d8ffd26246f5497 (patch)
treeb94f78597448e36220ce5d904686d7e65d8dd1bd /Master/texmf-dist/tex/latex/latexconfig
parent7c0d11d628f2a0eee144816586a8d3704abaa465 (diff)
use simpler require("lualatexquotejobname.lua"), and update dvilualatex.ini per lualatex.ini (carlisle mail 23 Aug 2015 11:00:49)
git-svn-id: svn://tug.org/texlive/trunk@38205 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/latexconfig')
-rw-r--r--Master/texmf-dist/tex/latex/latexconfig/dvilualatex.ini37
-rw-r--r--Master/texmf-dist/tex/latex/latexconfig/lualatex.ini11
2 files changed, 14 insertions, 34 deletions
diff --git a/Master/texmf-dist/tex/latex/latexconfig/dvilualatex.ini b/Master/texmf-dist/tex/latex/latexconfig/dvilualatex.ini
index f4d3925ce88..2e81233ee41 100644
--- a/Master/texmf-dist/tex/latex/latexconfig/dvilualatex.ini
+++ b/Master/texmf-dist/tex/latex/latexconfig/dvilualatex.ini
@@ -1,35 +1,16 @@
% $Id$
-% Karl Berry, originally written 2008. public domain.
+% Originally written 2008 by Karl Berry. Public domain.
+% same as lualatex.ini (extra comments there) except for \pdfoutput=0.
-% must be done first (activation of primitives)
-\input lualatexiniconfig.tex
+\begingroup
+ \catcode`\{=1 %
+ \catcode`\}=2 %
+ \directlua{tex.enableprimitives('',tex.extraprimitives('pdftex'))}
+ \global\everyjob{\directlua{require("lualatexquotejobname.lua")}}
+\endgroup
% settings inherited from pdftex
\input pdftexconfig.tex
-% dvi output by default
-\pdfoutput=0
+\pdfoutput=0 % dvi output by default
-% prevent latex.ltx from \dump-ing
-\let\DUMP\dump
-\let\dump\relax
-
-% the usual format initialization.
-\scrollmode
\input latex.ltx
-
-% some commands in the kernel need patchin to work with luatex
-\input lualatex-patch-kernel.tex
-
-% latex.ltx sets \everyjob, so this must come afterwards
-\input lualatexquotejobname.tex
-
-% latex.ltx sets wrong (T1) \lccodes, \uccodes for the "80-"ff range
-\input lualatex-reset-codes.tex % reset them
-\input luatex-unicode-letters.tex % set codes based on Unicode (full range)
-% Note: unlike xelatex, we don't need to load unicode-letters before latex.ltx
-% (hence hyphenation patterns) due to diferences in \patterns hendling
-
-% restore \dump for derived formats (mylatex, etc) that might use it
-\let\dump\DUMP
-\let\DUMP\undefined
-\dump
diff --git a/Master/texmf-dist/tex/latex/latexconfig/lualatex.ini b/Master/texmf-dist/tex/latex/latexconfig/lualatex.ini
index fe1cfda48ef..68e2a59b1cc 100644
--- a/Master/texmf-dist/tex/latex/latexconfig/lualatex.ini
+++ b/Master/texmf-dist/tex/latex/latexconfig/lualatex.ini
@@ -1,5 +1,5 @@
% $Id$
-% Karl Berry, originally written 2008. public domain.
+% Originally written 2008 by Karl Berry. Public domain.
\begingroup
\catcode`\{=1 %
@@ -15,12 +15,11 @@
% 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{dofile(assert(kpse.find_file("lualatexquotejobname.lua")))}%
- }
+ \global\everyjob{\directlua{require("lualatexquotejobname.lua")}}
\endgroup
+
% settings inherited from pdftex
-% pdf output by default
\input pdftexconfig.tex
+% pdf output by default
-\input latex.ltx \ No newline at end of file
+\input latex.ltx