diff options
18 files changed, 43 insertions, 78 deletions
diff --git a/Master/texmf-dist/doc/generic/tex-ini-files/README.md b/Master/texmf-dist/doc/generic/tex-ini-files/README.md index 3a7b94b0bdd..298a404c9b1 100644 --- a/Master/texmf-dist/doc/generic/tex-ini-files/README.md +++ b/Master/texmf-dist/doc/generic/tex-ini-files/README.md @@ -46,9 +46,11 @@ Major changes: - 2016-02-27 First version of bundle - 2016-04-14 Do not assume e-TeX availability in `pdftexconfig.tex` - 2016-04-15 New approach to loading shared pdfTeX/LuaTeX data +- 2023-11-15 Align setting of interaction mode across LaTeX .ini files +- 2023-11-17 Add luatexiniconfig.tex A full history of this bundle is available from -https://github.com/josephwright/tex-ini-files +https://github.com/latex3/tex-ini-files ## Legal diff --git a/Master/texmf-dist/tex/generic/tex-ini-files/dvilualatex.ini b/Master/texmf-dist/tex/generic/tex-ini-files/dvilualatex.ini deleted file mode 100644 index 476ee45f45b..00000000000 --- a/Master/texmf-dist/tex/generic/tex-ini-files/dvilualatex.ini +++ /dev/null @@ -1,4 +0,0 @@ -% tex-ini-files 2016-04-15: dvilualatex.ini - -\let\dvimode\relax -\input lualatex.ini diff --git a/Master/texmf-dist/tex/generic/tex-ini-files/dviluatex.ini b/Master/texmf-dist/tex/generic/tex-ini-files/dviluatex.ini index abe93aa343b..957950e8faa 100644 --- a/Master/texmf-dist/tex/generic/tex-ini-files/dviluatex.ini +++ b/Master/texmf-dist/tex/generic/tex-ini-files/dviluatex.ini @@ -1,4 +1,4 @@ -% tex-ini-files 2016-04-15: dvilualatex.ini +% tex-ini-files 20223-11-17: dvilualatex.ini \let\dvimode\relax \input luatex.ini diff --git a/Master/texmf-dist/tex/generic/tex-ini-files/luatex.ini b/Master/texmf-dist/tex/generic/tex-ini-files/luatex.ini index 1a592cf15d2..0dbd95744a8 100644 --- a/Master/texmf-dist/tex/generic/tex-ini-files/luatex.ini +++ b/Master/texmf-dist/tex/generic/tex-ini-files/luatex.ini @@ -1,4 +1,4 @@ -% tex-ini-files 2016-04-15: luatex.ini +% tex-ini-files 20223-11-17: luatex.ini % Karl Berry, originally written 2008. Public domain. % PDF output by default. diff --git a/Master/texmf-dist/tex/generic/tex-ini-files/luatexconfig.tex b/Master/texmf-dist/tex/generic/tex-ini-files/luatexconfig.tex index 5ad8913b65a..28fbc6644e3 100644 --- a/Master/texmf-dist/tex/generic/tex-ini-files/luatexconfig.tex +++ b/Master/texmf-dist/tex/generic/tex-ini-files/luatexconfig.tex @@ -1,4 +1,4 @@ -% tex-ini-files 2016-04-15: luatexconfig.tex +% tex-ini-files 20223-11-17: luatexconfig.tex % Load shared (PDF) settings in LuaTeX diff --git a/Master/texmf-dist/tex/generic/config/luatexiniconfig.tex b/Master/texmf-dist/tex/generic/tex-ini-files/luatexiniconfig.tex index caf56638c3c..1a832e09a5c 100644 --- a/Master/texmf-dist/tex/generic/config/luatexiniconfig.tex +++ b/Master/texmf-dist/tex/generic/tex-ini-files/luatexiniconfig.tex @@ -1,4 +1,5 @@ -% $Id$ +% tex-ini-files 20223-11-17: luatexiniconfig.tex + % Read for plain luatex formats (luatex.ini, dviluatex.ini). % Assumes LuaTeX 0.39.x or greater. % Originally written 2009 by Manuel P\'egouri\'e-Gonnard. Public domain. diff --git a/Master/texmf-dist/tex/generic/tex-ini-files/pdftexconfig.tex b/Master/texmf-dist/tex/generic/tex-ini-files/pdftexconfig.tex index 44c25abcbd4..7a66e1f614f 100644 --- a/Master/texmf-dist/tex/generic/tex-ini-files/pdftexconfig.tex +++ b/Master/texmf-dist/tex/generic/tex-ini-files/pdftexconfig.tex @@ -1,4 +1,4 @@ -% tex-ini-files 2016-04-15: pdftexconfig.tex +% tex-ini-files 20223-11-17: pdftexconfig.tex % Load shared (PDF) settings in pdfTeX diff --git a/Master/texmf-dist/tex/generic/tex-ini-files/pdfxmltex.ini b/Master/texmf-dist/tex/generic/tex-ini-files/pdfxmltex.ini new file mode 100644 index 00000000000..d951032d257 --- /dev/null +++ b/Master/texmf-dist/tex/generic/tex-ini-files/pdfxmltex.ini @@ -0,0 +1,10 @@ +% tex-ini-files 20223-11-17: pdfxmltex.ini + +% public domain. +\let\primitivedump=\dump +\let\dump=\relax +\input pdflatex.ini +\let\dump=\primitivedump + +% then read jadetex. pdf output must be set first, since it needs hyperref. +\input xmltex.tex diff --git a/Master/texmf-dist/tex/generic/tex-ini-files/xetex.ini b/Master/texmf-dist/tex/generic/tex-ini-files/xetex.ini index 717589b4693..32ccad222ba 100644 --- a/Master/texmf-dist/tex/generic/tex-ini-files/xetex.ini +++ b/Master/texmf-dist/tex/generic/tex-ini-files/xetex.ini @@ -1,4 +1,4 @@ -% tex-ini-files 2016-04-15: xetex.ini +% tex-ini-files 20223-11-17: xetex.ini % Public domain. Originally by Jonathan Kew. diff --git a/Master/texmf-dist/tex/generic/tex-ini-files/xmltex.ini b/Master/texmf-dist/tex/generic/tex-ini-files/xmltex.ini new file mode 100644 index 00000000000..bdefa95c6e6 --- /dev/null +++ b/Master/texmf-dist/tex/generic/tex-ini-files/xmltex.ini @@ -0,0 +1,9 @@ +% tex-ini-files 20223-11-17: xmltex.ini + +% public domain. +\let\primitivedump=\dump +\let\dump=\relax +\input latex.ini +\let\dump=\primitivedump + +\input xmltex.tex diff --git a/Master/texmf-dist/tex/latex/latexconfig/lualatexquotejobname.tex b/Master/texmf-dist/tex/latex/latexconfig/lualatexquotejobname.tex deleted file mode 100644 index cea56d72bcd..00000000000 --- a/Master/texmf-dist/tex/latex/latexconfig/lualatexquotejobname.tex +++ /dev/null @@ -1,63 +0,0 @@ -% $Id$ -% Manuel Pegourie-Gonnard, originally written 2010. WTFPL v2. -% -% Quote \jobname if it contains spaces, similarly to what other engines do. -% -% Recent versions of luatex kindly provide a process_jobname callback for -% this. Detect if it is available and use a fallback in pure TeX otherwise. -% If using the callback, register it at \everyjob time since callbacks are not -% dumped in formats currently. -% -% The TeX version fails (jobname is set to texput) with invocations like -% luatex '\input foo' -% but work correctly with the following: -% luatex foo\ bar -% luatex -jobname foo\ bar '\input "foo bar"' -% It is is not possible to support all this case without the callback. It is -% debatable if supporting another set cases would be better, but this is the -% historical (TL 2010) behaviour, so just keep it. -% -% \jobname quoting is normalized in the same way as in web2c's -% normalize_quotes() function (see lib/texmfmp.c, non-XeTeX case), that is: -% - remove quotes -% - complain if quotes are not "balanced" (ie not in even number) -% - enclose the result in quotes iff it contains spaces -% -% This file is inputed after latex.ltx. -% -\makeatletter -\everyjob\expandafter{\the\everyjob - \ifcase\directlua{ - tex.sprint(callback.list().process_jobname == nil and 0 or 1)}\relax - % no callback, do what we can in TeX - \begingroup - % strip quotes from job name and count them - \def\stripquotes#1"#2\@nil{% - \edef\clean{\clean#1}% - \ifx\empty#2\empty \else - \advance\count@\@ne - \stripquotes#2\@nil - \fi}% - \count@\z@ - \def\clean{}% - \expandafter\stripquotes\jobname"\@nil - % complain if their was not an even ("balanced") number of quotes - \ifodd\count@ - \errmessage{Unbalanced quotes in jobname: \jobname}% - \fi - % now check if their are spaces and quote if necessary - \def\testsp#1 #2\@nil{% - \ifx\empty#2\empty - \edef\fixjobname{\def\noexpand\jobname{\clean}}% - \else - \edef\fixjobname{\def\noexpand\jobname{"\clean"}}% - \fi}% - \edef\dotest{\noexpand\testsp\clean\space\noexpand\@nil}\dotest - % do it after closing the group - \expandafter\endgroup\fixjobname - \or % callback available, use it - % function in a separate file for convenience (uses %, ~, etc) - \directlua{dofile(assert(kpse.find_file("lualatexquotejobname.lua")))} - \fi} -\makeatother -\endinput diff --git a/Master/texmf-dist/tex/latex/tex-ini-files/dvilualatex.ini b/Master/texmf-dist/tex/latex/tex-ini-files/dvilualatex.ini new file mode 100644 index 00000000000..dcb75e3f534 --- /dev/null +++ b/Master/texmf-dist/tex/latex/tex-ini-files/dvilualatex.ini @@ -0,0 +1,4 @@ +% tex-ini-files 20223-11-17: dvilualatex.ini + +\let\dvimode\relax +\input lualatex.ini diff --git a/Master/texmf-dist/tex/latex/latexconfig/latex.ini b/Master/texmf-dist/tex/latex/tex-ini-files/latex.ini index 984b8e96ce2..665dda30364 100644 --- a/Master/texmf-dist/tex/latex/latexconfig/latex.ini +++ b/Master/texmf-dist/tex/latex/tex-ini-files/latex.ini @@ -1,3 +1,5 @@ +% tex-ini-files 20223-11-17: latex.ini + % Thomas Esser, 1998. public domain. % \ifx\pdfoutput\undefined \else diff --git a/Master/texmf-dist/tex/generic/tex-ini-files/lualatex.ini b/Master/texmf-dist/tex/latex/tex-ini-files/lualatex.ini index 1f7a49813a8..a23534c094d 100644 --- a/Master/texmf-dist/tex/generic/tex-ini-files/lualatex.ini +++ b/Master/texmf-dist/tex/latex/tex-ini-files/lualatex.ini @@ -1,4 +1,4 @@ -% tex-ini-files 2016-04-15: lualatex.ini +% tex-ini-files 20223-11-17: lualatex.ini % Originally written 2008 by Karl Berry. Public domain. diff --git a/Master/texmf-dist/tex/latex/latexconfig/lualatexquotejobname.lua b/Master/texmf-dist/tex/latex/tex-ini-files/lualatexquotejobname.lua index 1809a67874d..2980c78e264 100644 --- a/Master/texmf-dist/tex/latex/latexconfig/lualatexquotejobname.lua +++ b/Master/texmf-dist/tex/latex/tex-ini-files/lualatexquotejobname.lua @@ -1,4 +1,5 @@ --- $Id: lualatexquotejobname.tex 22957 2011-06-13 20:49:26Z mpg $ +-- tex-ini-files 20223-11-17: lualatexquotejobname.tex + -- Manuel Pegourie-Gonnard, originally written 2010. WTFPL v2. -- -- Goal: see lualatexquotejobname.tex diff --git a/Master/texmf-dist/tex/latex/latexconfig/mllatex.ini b/Master/texmf-dist/tex/latex/tex-ini-files/mllatex.ini index 3ae01d135c2..727b702a862 100644 --- a/Master/texmf-dist/tex/latex/latexconfig/mllatex.ini +++ b/Master/texmf-dist/tex/latex/tex-ini-files/mllatex.ini @@ -1,3 +1,5 @@ +% tex-ini-files 20223-11-17: mllatex.ini + % Thomas Esser, 1998. public domain. \scrollmode \input latex.ltx diff --git a/Master/texmf-dist/tex/latex/latexconfig/pdflatex.ini b/Master/texmf-dist/tex/latex/tex-ini-files/pdflatex.ini index f868629c086..6e89d697d64 100644 --- a/Master/texmf-dist/tex/latex/latexconfig/pdflatex.ini +++ b/Master/texmf-dist/tex/latex/tex-ini-files/pdflatex.ini @@ -1,5 +1,6 @@ +% tex-ini-files 20223-11-17: pdflatex.ini + % Thomas Esser, 1998. public domain. \input pdftexconfig.tex -\scrollmode \input latex.ltx \endinput diff --git a/Master/texmf-dist/tex/generic/tex-ini-files/xelatex.ini b/Master/texmf-dist/tex/latex/tex-ini-files/xelatex.ini index ef0432c241c..902392407ba 100644 --- a/Master/texmf-dist/tex/generic/tex-ini-files/xelatex.ini +++ b/Master/texmf-dist/tex/latex/tex-ini-files/xelatex.ini @@ -1,4 +1,4 @@ -% tex-ini-files 2016-04-15: xelatex.ini +% tex-ini-files 20223-11-17: xelatex.ini % Public domain. Originally by Jonathan Kew. |