diff options
author | Karl Berry <karl@freefriends.org> | 2020-10-26 21:06:19 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2020-10-26 21:06:19 +0000 |
commit | 96de461e38a742f09261863e2a94007fe4532205 (patch) | |
tree | ea52d8f04f1026b7a652946153649f9d833b22b3 /Master/texmf-dist/tex/latex/base | |
parent | 3b6712112858f1def3b95f5d4ce48503cc6a84b3 (diff) |
latex (26oct20)
git-svn-id: svn://tug.org/texlive/trunk@56775 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/base')
-rw-r--r-- | Master/texmf-dist/tex/latex/base/atveryend-ltx.sty | 4 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/base/latex.ltx | 42 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/base/latexrelease.sty | 42 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/base/structuredlog.sty | 4 |
4 files changed, 52 insertions, 40 deletions
diff --git a/Master/texmf-dist/tex/latex/base/atveryend-ltx.sty b/Master/texmf-dist/tex/latex/base/atveryend-ltx.sty index 87e7ae35868..b0ee689e5c8 100644 --- a/Master/texmf-dist/tex/latex/base/atveryend-ltx.sty +++ b/Master/texmf-dist/tex/latex/base/atveryend-ltx.sty @@ -45,8 +45,8 @@ %% File: ltfilehook.dtx (C) Copyright 2020 Frank Mittelbach, %% Phelype Oleinik & LaTeX Team %%% From File: ltfilehook.dtx -\providecommand\ltfilehookversion{v1.0b} -\providecommand\ltfilehookdate{2020/09/26} +\providecommand\ltfilehookversion{v1.0c} +\providecommand\ltfilehookdate{2020/10/18} \ProvidesPackage{atveryend-ltx} [2020/08/19 v1.0a Emulation of the original atvery package^^Jwith kernel methods] diff --git a/Master/texmf-dist/tex/latex/base/latex.ltx b/Master/texmf-dist/tex/latex/base/latex.ltx index 8e2f0b1d0c9..dbcb91450cc 100644 --- a/Master/texmf-dist/tex/latex/base/latex.ltx +++ b/Master/texmf-dist/tex/latex/base/latex.ltx @@ -710,7 +710,7 @@ \def\fmtname{LaTeX2e} \edef\fmtversion {2020-10-01} -\def\patch@level{1} +\def\patch@level{2} \edef\development@branch@name{} \iffalse \def\reserved@a#1/#2/#3\@nil{% @@ -1628,8 +1628,8 @@ %% File: lthooks.dtx (C) Copyright 2020 Frank Mittelbach, %% Phelype Oleinik & LaTeX Team %%% From File: lthooks.dtx -\def\lthooksversion{v1.0d} -\def\lthooksdate{2020/10/09} +\def\lthooksversion{v1.0e} +\def\lthooksdate{2020/10/23} \ExplSyntaxOn \bool_new:N \g__hook_debug_bool \cs_new_eq:NN \__hook_debug:n \use_none:n @@ -2258,7 +2258,7 @@ \cs_new_protected:Npn \__hook_log:nN #1 #2 { \__hook_preamble_hook:n {#1} - \iow_term:x { ^^J ->~The~hook~'#1': } + \__hook_log_cmd:x { ^^J ->~The~hook~'#1': } \hook_if_exist:nF {#1} { \__hook_log_line:x { is~not~declared! } } \__hook_if_exist:nTF {#1} @@ -7140,7 +7140,7 @@ Type H <return> for immediate help.}% \@tempswafalse \makeatletter \@@input\jobname.aux \fi - \UseHook{enddocument/afteraux}% + \UseOneTimeHook{enddocument/afteraux}% \UseOneTimeHook{enddocument/info}% \endgroup \UseOneTimeHook{enddocument/end}% @@ -9739,8 +9739,9 @@ Type H <return> for immediate help.}% \def\@pr@videpackage[#1]{% \expandafter\protected@xdef % <-- protected... \csname ver@\@currname.\@currext\endcsname{#1}% Loaded package - \expandafter\protected@xdef % <-- protected... - \csname ver@\@currpkg@reqd\endcsname{#1}% Requested package + \expandafter\let + \csname ver@\@currpkg@reqd\expandafter\endcsname % Requested package + \csname ver@\@currname.\@currext\endcsname \ifx\@currext\@clsextension \typeout{Document Class: \@gtempa\space#1}% \else @@ -9764,7 +9765,9 @@ Type H <return> for immediate help.}% \@makeother\&% \kernel@ifnextchar[{\@providesfile{#1}}{\@providesfile{#1}[]}} \def\@pass@ptions#1#2#3{% - \edef\reserved@a{\@expl@@@filehook@resolve@file@subst@@w #3.#1\@nil}% + \@expl@@@filehook@set@curr@file@@nNN + {\@expl@@@filehook@resolve@file@subst@@w #3.#1\@nil}% + \reserved@a\reserved@b \expandafter\xdef\csname opt@\reserved@a\endcsname{% \@ifundefined{opt@\reserved@a}\@empty {\csname opt@\reserved@a\endcsname,}% @@ -9993,6 +9996,9 @@ Type H <return> for immediate help.}% {\@expl@@@filehook@file@push@@ \set@curr@file{\@currname.\@currext}% \@filehook@set@CurrentFile + \expandafter\@swaptwoargs\expandafter + {\expandafter{\@currpkg@reqd}}% + {% < \edef\@currpkg@reqd{\@currname.\@currext}% \ifx\CurrentFile\CurrentFileUsed \else @@ -10001,6 +10007,8 @@ Type H <return> for immediate help.}% \edef\@currext{\string@makeletter\filename@ext}% \fi \load@onefile@withoptions{#2}% + \def\@currpkg@reqd%{\@currpkg@reqd} + }% > \@expl@@@filehook@file@pop@@}% \expandafter\@firstofone \fi}% @@ -10015,6 +10023,7 @@ Type H <return> for immediate help.}% \ifx\@currext\@clsextension\let\LoadClass\@twoloadclasserror\fi}% \@popfilename \@reset@ptions} +\let\@currpkg@reqd\@empty \@onlypreamble\@onefilewithoptions \let\@unprocessedoptions\@undefined \def\@missing@onefilewithoptions#1{% @@ -10465,8 +10474,8 @@ Type H <return> for immediate help.}% %% File: ltfilehook.dtx (C) Copyright 2020 Frank Mittelbach, %% Phelype Oleinik & LaTeX Team %%% From File: ltfilehook.dtx -\providecommand\ltfilehookversion{v1.0b} -\providecommand\ltfilehookdate{2020/09/26} +\providecommand\ltfilehookversion{v1.0c} +\providecommand\ltfilehookdate{2020/10/18} \ExplSyntaxOn \tl_new:N \CurrentFile \tl_new:N \CurrentFilePath @@ -10612,21 +10621,19 @@ Type H <return> for immediate help.}% \expandafter\ifx\csname\endcsname#1% .tex\else\string#1\fi} \def\@filehook@set@CurrentFile{% - \@expl@@@filehook@set@curr@file@@N{\@curr@file}% + \@expl@@@filehook@set@curr@file@@nNN{\@curr@file}% \CurrentFileUsed\CurrentFilePathUsed \ifx\@curr@file@reqd\@curr@file \let\CurrentFile\CurrentFileUsed \let\CurrentFilePath\CurrentFilePathUsed \else - \@expl@@@filehook@set@curr@file@@N{\@curr@file@reqd}% + \@expl@@@filehook@set@curr@file@@nNN{\@curr@file@reqd}% \CurrentFile\CurrentFilePath \fi} \ExplSyntaxOn -\cs_new_protected:Npn \__filehook_set_curr_file:N #1 - { \exp_args:NV \__filehook_set_curr_file:nNN #1 } \cs_new_protected:Npn \__filehook_set_curr_file:nNN #1 { - \__filehook_file_parse_full_name:nN {#1} + \exp_args:Nf \__filehook_file_parse_full_name:nN {#1} \__filehook_set_curr_file_assign:nnnNN } \cs_new_protected:Npn \__filehook_set_curr_file_assign:nnnNN #1 #2 #3 #4 #5 @@ -10700,15 +10707,14 @@ Type H <return> for immediate help.}% \ExplSyntaxOn \cs_new_eq:NN \@expl@@@filehook@if@no@extension@@nTF \__filehook_if_no_extension:nTF -\cs_new_eq:NN \@expl@@@filehook@set@curr@file@@N - \__filehook_set_curr_file:N +\cs_new_eq:NN \@expl@@@filehook@set@curr@file@@nNN + \__filehook_set_curr_file:nNN \cs_new_eq:NN \@expl@@@filehook@resolve@file@subst@@w \__filehook_resolve_file_subst:w \cs_new_eq:NN \@expl@@@filehook@normalize@file@name@@w \__filehook_normalize_file_name:w \cs_new_eq:NN \@expl@@@filehook@if@file@replaced@@TF \__filehook_if_file_replaced:TF - \cs_new_eq:NN \@expl@@@filehook@drop@extension@@N \__filehook_drop_extension:N \cs_new_eq:NN \@expl@@@filehook@file@push@@ diff --git a/Master/texmf-dist/tex/latex/base/latexrelease.sty b/Master/texmf-dist/tex/latex/base/latexrelease.sty index 899bc1bb917..9f825c010bf 100644 --- a/Master/texmf-dist/tex/latex/base/latexrelease.sty +++ b/Master/texmf-dist/tex/latex/base/latexrelease.sty @@ -1011,8 +1011,8 @@ of this package available from CTAN} %% File: lthooks.dtx (C) Copyright 2020 Frank Mittelbach, %% Phelype Oleinik & LaTeX Team %%% From File: lthooks.dtx -\def\lthooksversion{v1.0d} -\def\lthooksdate{2020/10/09} +\def\lthooksversion{v1.0e} +\def\lthooksdate{2020/10/23} \IncludeInRelease{2020/10/01}% {\NewHook}{The hook management}% \ExplSyntaxOn @@ -1643,7 +1643,7 @@ of this package available from CTAN} \cs_new_protected:Npn \__hook_log:nN #1 #2 { \__hook_preamble_hook:n {#1} - \iow_term:x { ^^J ->~The~hook~'#1': } + \__hook_log_cmd:x { ^^J ->~The~hook~'#1': } \hook_if_exist:nF {#1} { \__hook_log_line:x { is~not~declared! } } \__hook_if_exist:nTF {#1} @@ -4047,8 +4047,8 @@ of this package available from CTAN} %% File: ltfilehook.dtx (C) Copyright 2020 Frank Mittelbach, %% Phelype Oleinik & LaTeX Team %%% From File: ltfilehook.dtx -\providecommand\ltfilehookversion{v1.0b} -\providecommand\ltfilehookdate{2020/09/26} +\providecommand\ltfilehookversion{v1.0c} +\providecommand\ltfilehookdate{2020/10/18} \IncludeInRelease{2020/10/01}% {\CurrentFile}{Hook management file}% \ExplSyntaxOn @@ -4261,24 +4261,22 @@ of this package available from CTAN} \expandafter\ifx\csname\endcsname#1% .tex\else\string#1\fi} \def\@filehook@set@CurrentFile{% - \@expl@@@filehook@set@curr@file@@N{\@curr@file}% + \@expl@@@filehook@set@curr@file@@nNN{\@curr@file}% \CurrentFileUsed\CurrentFilePathUsed \ifx\@curr@file@reqd\@curr@file \let\CurrentFile\CurrentFileUsed \let\CurrentFilePath\CurrentFilePathUsed \else - \@expl@@@filehook@set@curr@file@@N{\@curr@file@reqd}% + \@expl@@@filehook@set@curr@file@@nNN{\@curr@file@reqd}% \CurrentFile\CurrentFilePath \fi} \EndIncludeInRelease \IncludeInRelease{2020/10/01}% - {@@_set_curr_file:N}{Set curr file}% + {@@_set_curr_file:nNN}{Set curr file}% \ExplSyntaxOn -\cs_new_protected:Npn \__filehook_set_curr_file:N #1 - { \exp_args:NV \__filehook_set_curr_file:nNN #1 } \cs_new_protected:Npn \__filehook_set_curr_file:nNN #1 { - \__filehook_file_parse_full_name:nN {#1} + \exp_args:Nf \__filehook_file_parse_full_name:nN {#1} \__filehook_set_curr_file_assign:nnnNN } \cs_new_protected:Npn \__filehook_set_curr_file_assign:nnnNN #1 #2 #3 #4 #5 @@ -4371,15 +4369,14 @@ of this package available from CTAN} \ExplSyntaxOn \cs_new_eq:NN \@expl@@@filehook@if@no@extension@@nTF \__filehook_if_no_extension:nTF -\cs_new_eq:NN \@expl@@@filehook@set@curr@file@@N - \__filehook_set_curr_file:N +\cs_new_eq:NN \@expl@@@filehook@set@curr@file@@nNN + \__filehook_set_curr_file:nNN \cs_new_eq:NN \@expl@@@filehook@resolve@file@subst@@w \__filehook_resolve_file_subst:w \cs_new_eq:NN \@expl@@@filehook@normalize@file@name@@w \__filehook_normalize_file_name:w \cs_new_eq:NN \@expl@@@filehook@if@file@replaced@@TF \__filehook_if_file_replaced:TF - \cs_new_eq:NN \@expl@@@filehook@drop@extension@@N \__filehook_drop_extension:N \cs_new_eq:NN \@expl@@@filehook@file@push@@ @@ -5710,8 +5707,9 @@ of this package available from CTAN} \def\@pr@videpackage[#1]{% \expandafter\protected@xdef % <-- protected... \csname ver@\@currname.\@currext\endcsname{#1}% Loaded package - \expandafter\protected@xdef % <-- protected... - \csname ver@\@currpkg@reqd\endcsname{#1}% Requested package + \expandafter\let + \csname ver@\@currpkg@reqd\expandafter\endcsname % Requested package + \csname ver@\@currname.\@currext\endcsname \ifx\@currext\@clsextension \typeout{Document Class: \@gtempa\space#1}% \else @@ -5750,7 +5748,9 @@ of this package available from CTAN} \IncludeInRelease{2020/10/01}{\@pass@ptions} {Add file replacement in \@pass@ptions}% \def\@pass@ptions#1#2#3{% - \edef\reserved@a{\@expl@@@filehook@resolve@file@subst@@w #3.#1\@nil}% + \@expl@@@filehook@set@curr@file@@nNN + {\@expl@@@filehook@resolve@file@subst@@w #3.#1\@nil}% + \reserved@a\reserved@b \expandafter\xdef\csname opt@\reserved@a\endcsname{% \@ifundefined{opt@\reserved@a}\@empty {\csname opt@\reserved@a\endcsname,}% @@ -5920,6 +5920,9 @@ of this package available from CTAN} {\@expl@@@filehook@file@push@@ \set@curr@file{\@currname.\@currext}% \@filehook@set@CurrentFile + \expandafter\@swaptwoargs\expandafter + {\expandafter{\@currpkg@reqd}}% + {% < \edef\@currpkg@reqd{\@currname.\@currext}% \ifx\CurrentFile\CurrentFileUsed \else @@ -5928,6 +5931,8 @@ of this package available from CTAN} \edef\@currext{\string@makeletter\filename@ext}% \fi \load@onefile@withoptions{#2}% + \def\@currpkg@reqd%{\@currpkg@reqd} + }% > \@expl@@@filehook@file@pop@@}% \expandafter\@firstofone \fi}% @@ -5942,6 +5947,7 @@ of this package available from CTAN} \ifx\@currext\@clsextension\let\LoadClass\@twoloadclasserror\fi}% \@popfilename \@reset@ptions} +\let\@currpkg@reqd\@empty \@onlypreamble\@onefilewithoptions \let\@unprocessedoptions\@undefined \def\@missing@onefilewithoptions#1{% @@ -9693,7 +9699,7 @@ of this package available from CTAN} \@tempswafalse \makeatletter \@@input\jobname.aux \fi - \UseHook{enddocument/afteraux}% + \UseOneTimeHook{enddocument/afteraux}% \UseOneTimeHook{enddocument/info}% \endgroup \UseOneTimeHook{enddocument/end}% diff --git a/Master/texmf-dist/tex/latex/base/structuredlog.sty b/Master/texmf-dist/tex/latex/base/structuredlog.sty index 0f6e34d85bb..ea2faf6fb0f 100644 --- a/Master/texmf-dist/tex/latex/base/structuredlog.sty +++ b/Master/texmf-dist/tex/latex/base/structuredlog.sty @@ -45,8 +45,8 @@ %% File: ltfilehook.dtx (C) Copyright 2020 Frank Mittelbach, %% Phelype Oleinik & LaTeX Team %%% From File: ltfilehook.dtx -\providecommand\ltfilehookversion{v1.0b} -\providecommand\ltfilehookdate{2020/09/26} +\providecommand\ltfilehookversion{v1.0c} +\providecommand\ltfilehookdate{2020/10/18} \ProvidesExplPackage {structuredlog}{\ltfilehookdate}{\ltfilehookversion} {Structuring the TeX transcript file} |