From 62cf1eaa95c7ba58202f5dc2bf73d696571ba4ba Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 28 Oct 2020 20:35:26 +0000 Subject: latex-dev (28oct20) git-svn-id: svn://tug.org/texlive/trunk@56791 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex-dev/base/atbegshi-ltx.sty | 10 +- .../tex/latex-dev/base/atveryend-ltx.sty | 4 +- .../texmf-dist/tex/latex-dev/base/everyshi-ltx.sty | 8 +- .../texmf-dist/tex/latex-dev/base/filehook-ltx.sty | 111 ------------------ Master/texmf-dist/tex/latex-dev/base/latex.ltx | 73 ++++++------ .../texmf-dist/tex/latex-dev/base/latexrelease.sty | 126 +++++++++++++-------- Master/texmf-dist/tex/latex-dev/base/ltluatex.lua | 4 +- Master/texmf-dist/tex/latex-dev/base/ltluatex.tex | 2 +- Master/texmf-dist/tex/latex-dev/base/ltxdoc.cls | 4 +- .../texmf-dist/tex/latex-dev/base/srclfile-ltx.sty | 75 ------------ .../tex/latex-dev/base/structuredlog.sty | 4 +- 11 files changed, 137 insertions(+), 284 deletions(-) delete mode 100644 Master/texmf-dist/tex/latex-dev/base/filehook-ltx.sty delete mode 100644 Master/texmf-dist/tex/latex-dev/base/srclfile-ltx.sty (limited to 'Master/texmf-dist/tex/latex-dev/base') diff --git a/Master/texmf-dist/tex/latex-dev/base/atbegshi-ltx.sty b/Master/texmf-dist/tex/latex-dev/base/atbegshi-ltx.sty index b390284aef3..db9ebd43b60 100644 --- a/Master/texmf-dist/tex/latex-dev/base/atbegshi-ltx.sty +++ b/Master/texmf-dist/tex/latex-dev/base/atbegshi-ltx.sty @@ -45,16 +45,16 @@ %% File: ltshipout.dtx (C) Copyright 2020 Frank Mittelbach, LaTeX Team %% %%% From File: ltshipout.dtx -\providecommand\ltshipoutversion{v1.0b} -\providecommand\ltshipoutdate{2020/09/09} +\providecommand\ltshipoutversion{v1.0c} +\providecommand\ltshipoutdate{2020/09/27} \ProvidesPackage{atbegshi-ltx} [2020/08/17 v1.0a Emulation of the original atbegshi package^^Jwith kernel methods] \let \AtBeginShipoutBox \ShipoutBox \let \AtBeginShipoutInit \@empty -\def \AtBeginShipout {\AddToHook{shipout/before}} -\def \AtBeginShipoutNext {\AddToHookNext{shipout/before}} -\def \AtBeginShipoutFirst +\protected \def \AtBeginShipout {\AddToHook{shipout/before}} +\protected \def \AtBeginShipoutNext {\AddToHookNext{shipout/before}} +\protected \def \AtBeginShipoutFirst {\@expl@@@shipout@add@firstpage@material@@Nn \AtBeginShipoutFirst} \let \AtBeginShipoutDiscard \DiscardShipoutBox \let \AtBeginShipoutAddToBox diff --git a/Master/texmf-dist/tex/latex-dev/base/atveryend-ltx.sty b/Master/texmf-dist/tex/latex-dev/base/atveryend-ltx.sty index f41f42d1401..b0ee689e5c8 100644 --- a/Master/texmf-dist/tex/latex-dev/base/atveryend-ltx.sty +++ b/Master/texmf-dist/tex/latex-dev/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.0a} -\providecommand\ltfilehookdate{2020/08/30} +\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-dev/base/everyshi-ltx.sty b/Master/texmf-dist/tex/latex-dev/base/everyshi-ltx.sty index 2b6f09f0767..2be54dfdc71 100644 --- a/Master/texmf-dist/tex/latex-dev/base/everyshi-ltx.sty +++ b/Master/texmf-dist/tex/latex-dev/base/everyshi-ltx.sty @@ -45,13 +45,13 @@ %% File: ltshipout.dtx (C) Copyright 2020 Frank Mittelbach, LaTeX Team %% %%% From File: ltshipout.dtx -\providecommand\ltshipoutversion{v1.0b} -\providecommand\ltshipoutdate{2020/09/09} +\providecommand\ltshipoutversion{v1.0c} +\providecommand\ltshipoutdate{2020/09/27} \ProvidesPackage{everyshi-ltx} [2020/08/17 v1.0a Emulation of the original everyshi package^^Jwith kernel methods] -\def \EveryShipout {\AddToHook{shipout/before}} -\def \AtNextShipout {\AddToHookNext{shipout/before}} +\protected \def \EveryShipout {\AddToHook{shipout/before}} +\protected \def \AtNextShipout {\AddToHookNext{shipout/before}} %% %% In normal circumstances the above emulation is sufficient and in %% all known packages (we know of) that use everyshi it either works or diff --git a/Master/texmf-dist/tex/latex-dev/base/filehook-ltx.sty b/Master/texmf-dist/tex/latex-dev/base/filehook-ltx.sty deleted file mode 100644 index 8ade09ed909..00000000000 --- a/Master/texmf-dist/tex/latex-dev/base/filehook-ltx.sty +++ /dev/null @@ -1,111 +0,0 @@ -%% -%% This is file `filehook-ltx.sty', -%% generated with the docstrip utility. -%% -%% The original source files were: -%% -%% ltfilehook.dtx (with options: `filehook-draft') -%% -%% This is a generated file. -%% -%% The source is maintained by the LaTeX Project team and bug -%% reports for it can be opened at https://latex-project.org/bugs.html -%% (but please observe conditions on bug reports sent to that address!) -%% -%% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere -%% in this file. -%% -%% This file was generated from file(s) of the LaTeX base system. -%% -------------------------------------------------------------- -%% -%% It may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License, either version 1.3c -%% of this license or (at your option) any later version. -%% The latest version of this license is in -%% https://www.latex-project.org/lppl.txt -%% and version 1.3c or later is part of all distributions of LaTeX -%% version 2008 or later. -%% -%% This file has the LPPL maintenance status "maintained". -%% -%% This file may only be distributed together with a copy of the LaTeX -%% base system. You may however distribute the LaTeX base system without -%% such generated files. -%% -%% The list of all files belonging to the LaTeX base distribution is -%% given in the file `manifest.txt'. See also `legal.txt' for additional -%% information. -%% -%% The list of derived (unpacked) files belonging to the distribution -%% and covered by LPPL is defined by the unpacking scripts (with -%% extension .ins) which are part of the distribution. -%% -%% File: ltfilehook.dtx (C) Copyright 2020 Frank Mittelbach, -%% Phelype Oleinik & LaTeX Team -%%% From File: ltfilehook.dtx -\providecommand\ltfilehookversion{v1.0a} -\providecommand\ltfilehookdate{2020/08/30} -\newcommand\AtBeginOfEveryFile [1] - {\AddToHook{file/before}{#1}} -\newcommand\AtEndOfEveryFile [1] - {\AddToHook{file/after}{#1}} -\newcommand\AtBeginOfIncludes [1] - {\AddToHook{include/before}{#1}} -\newcommand\AtEndOfIncludes [1] - {\AddToHook{include/end}{#1}} -\newcommand\AfterIncludes [1] - {\AddToHook{include/after}{#1}} -\newcommand\AtBeginOfPackages [1] - {\AddToHook{package/before}{#1}} -\newcommand\AtEndOfPackages [1] - {\AddToHook{package/after}{#1}} -\newcommand\AtBeginOfClasses [1] - {\AddToHook{class/before}{#1}} -\newcommand\AtEndOfClasses [1] - {\AddToHook{class/after}{#1}} -\newcommand\AtBeginOfFile [2] - {\AddToHook{file/before/#1}{#2}} -\newcommand\AtEndOfFile [2] - {\AddToHook{file/after/#1}{#2}} -\DeclareDocumentCommand \AtBeginOfPackageFile {smm} - {\IfBooleanTF{#1}% - {\@ifpackageloaded{#2}% - {#3}% - {\AddToHook{package/before/#2}{#3}}}% - {\AddToHook{package/before/#2}{#3}}% - } -\DeclareDocumentCommand \AtEndOfPackageFile {smm} - {\IfBooleanTF{#1}% - {\@ifpackageloaded{#2}% - {#3}% - {\AddToHook{package/after/#2}{#3}}}% - {\AddToHook{package/after/#2}{#3}}% - } -\DeclareDocumentCommand \AtBeginOfClassFile {smm} - {\IfBooleanTF{#1}% - {\@ifclassloaded{#2}% - {#3}% - {\AddToHook{class/before/#2}{#3}}}% - {\AddToHook{class/before/#2}{#3}}% - } -\DeclareDocumentCommand \AtEndOfClassFile {smm} - {\IfBooleanTF{#1}% - {\@ifclassloaded{#2}% - {#3}% - {\AddToHook{class/after/#2}{#3}}}% - {\AddToHook{class/after/#2}{#3}}% - } -\newcommand\AtBeginOfIncludeFile [2] - {\AddToHook{include/before/#1}{#2}} -\newcommand\AtEndOfIncludeFile [2] - {\AddToHook{include/end/#1}{#2}} -\newcommand\AfterIncludeFile [2] - {\AddToHook{include/after/#1}{#2}} -\expandafter\let\csname ver@filehook.sty\endcsname\fmtversion -\@namedef {ver@filehook.sty}{2020/10/01} -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\endinput -%% -%% End of file `filehook-ltx.sty'. diff --git a/Master/texmf-dist/tex/latex-dev/base/latex.ltx b/Master/texmf-dist/tex/latex-dev/base/latex.ltx index af87cdddb8b..f3a554ce25c 100644 --- a/Master/texmf-dist/tex/latex-dev/base/latex.ltx +++ b/Master/texmf-dist/tex/latex-dev/base/latex.ltx @@ -709,8 +709,8 @@ %%% From File: ltvers.dtx \def\fmtname{LaTeX2e} \edef\fmtversion - {2020-10-01} -\def\patch@level{-9} + {2021-05-01} +\def\patch@level{0} \edef\development@branch@name{develop \the\year-\the\month-\the\day} \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.0a} -\def\lthooksdate{2020/09/10} +\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} @@ -2566,10 +2566,8 @@ \@onlypreamble\DeclareDefaultHookRule \NewDocumentCommand \ClearHookRule { m m m } { \hook_gset_rule:nnnn {#1}{#2}{unrelated}{#3} } -\NewExpandableDocumentCommand \IfHookExistsTF { m } - { \hook_if_exist:nTF {#1} } -\NewExpandableDocumentCommand \IfHookEmptyTF { m } - { \hook_if_empty:nTF {#1} } +\cs_new_eq:NN \IfHookExistsTF \hook_if_exist:nTF +\cs_new_eq:NN \IfHookEmptyTF \hook_if_empty:nTF %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%5 \cs_new_eq:NN \@expl@@@initialize@all@@ \__hook_initialize_all: @@ -3250,7 +3248,7 @@ Type H for immediate help.}% \def\@include#1 {% \clearpage \if@filesw - \immediate\write\@mainaux{\string\@input{"#1.aux"}}% + \immediate\write\@mainaux{\string\@input{#1.aux}}% \fi \@tempswatrue \if@partsw @@ -6196,7 +6194,7 @@ Type H for immediate help.}% \ifx\bfdefault\bfdefault@previous\else \expandafter\def\expandafter\bfdefault \expandafter{\bfdefault\@empty}% - \let\bfseries@previous\bfdefault + \let\bfdefault@previous\bfdefault \let\bfseries@rm\bfdef@ult \let\bfseries@sf\bfdef@ult \let\bfseries@tt\bfdef@ult @@ -6216,7 +6214,7 @@ Type H for immediate help.}% \expand@font@defaults \ifx\mddefault\mddefault@previous\else \expandafter\def\expandafter\mddefault\expandafter{\mddefault\@empty}% - \let\mdseries@previous\mddefault + \let\mddefault@previous\mddefault \let\mdseries@rm\mddef@ult \let\mdseries@sf\mddef@ult \let\mdseries@tt\mddef@ult @@ -6258,7 +6256,7 @@ Type H for immediate help.}% \let\@rmfamilyhook\@empty \let\@sffamilyhook\@empty \let\@ttfamilyhook\@empty -\let\@defaulfamilyhook\@empty +\let\@defaultfamilyhook\@empty %FMi sort out \DeclareRobustCommand\IfFontSeriesContextTF[1]{% \expand@font@defaults \@font@series@contextfalse @@ -6372,7 +6370,6 @@ Type H for immediate help.}% \@defaultfamilyhook % hookname from 2020/02 will vanish \selectfont} \let\reset@font\normalfont -\let\@defaultfamilyhook\@empty %FMi sort out \def\not@base#1{\@latex@error {Command \noexpand#1not provided in base LaTeX2e}% {Load the latexsym or the amsfonts package to @@ -7143,7 +7140,7 @@ Type H for immediate help.}% \@tempswafalse \makeatletter \@@input\jobname.aux \fi - \UseHook{enddocument/afteraux}% + \UseOneTimeHook{enddocument/afteraux}% \UseOneTimeHook{enddocument/info}% \endgroup \UseOneTimeHook{enddocument/end}% @@ -9741,7 +9738,10 @@ Type H for immediate help.}% \@onlypreamble\ProvidesPackage \def\@pr@videpackage[#1]{% \expandafter\protected@xdef % <-- protected... - \csname ver@\@currname.\@currext\endcsname{#1}% + \csname ver@\@currname.\@currext\endcsname{#1}% Loaded 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 @@ -9765,7 +9765,9 @@ Type H 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,}% @@ -9994,6 +9996,9 @@ Type H 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 @@ -10002,6 +10007,8 @@ Type H 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}% @@ -10016,6 +10023,7 @@ Type H 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{% @@ -10466,8 +10474,8 @@ Type H for immediate help.}% %% File: ltfilehook.dtx (C) Copyright 2020 Frank Mittelbach, %% Phelype Oleinik & LaTeX Team %%% From File: ltfilehook.dtx -\providecommand\ltfilehookversion{v1.0a} -\providecommand\ltfilehookdate{2020/08/30} +\providecommand\ltfilehookversion{v1.0c} +\providecommand\ltfilehookdate{2020/10/18} \ExplSyntaxOn \tl_new:N \CurrentFile \tl_new:N \CurrentFilePath @@ -10613,21 +10621,19 @@ Type H 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 @@ -10701,15 +10707,14 @@ Type H 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@@ @@ -10725,8 +10730,8 @@ Type H for immediate help.}% %% File: ltshipout.dtx (C) Copyright 2020 Frank Mittelbach, LaTeX Team %% %%% From File: ltshipout.dtx -\providecommand\ltshipoutversion{v1.0b} -\providecommand\ltshipoutdate{2020/09/09} +\providecommand\ltshipoutversion{v1.0c} +\providecommand\ltshipoutdate{2020/09/27} \ExplSyntaxOn \bool_new:N \g__shipout_debug_bool \cs_new_eq:NN \__shipout_debug:n \use_none:n @@ -10747,7 +10752,7 @@ Type H for immediate help.}% } \box_new:N \l_shipout_box \cs_set_eq:NN \ShipoutBox \l_shipout_box -\cs_set:Npn\__shipout_execute: { +\cs_set_protected:Npn \__shipout_execute: { \tl_set:Nx \l__shipout_group_level_tl { \int_value:w \tex_currentgrouplevel:D } \tex_afterassignment:D \__shipout_execute_test_level: @@ -10755,7 +10760,6 @@ Type H for immediate help.}% } \cs_gset_eq:NN \shipout \__shipout_execute: \tl_new:N \l__shipout_group_level_tl - \cs_new:Npn \__shipout_execute_test_level: { \int_compare:nNnT \l__shipout_group_level_tl < \tex_currentgrouplevel:D @@ -10986,7 +10990,7 @@ Type H for immediate help.}% \cs_new:Npn \__shipout_add_foreground_picture:n #1 { \__shipout_add_foreground_box:n { \__shipout_picture_overlay:n {#1} } } -\cs_new:Npn \shipout_discard: { +\cs_new_protected:Npn \shipout_discard: { \bool_gset_true:N \g__shipout_discard_bool } \int_new:N \g_shipout_readonly_int @@ -11046,7 +11050,7 @@ Type H for immediate help.}% {\ifnum\@abspage@last<\maxdimen \xdef\PreviousTotalPages{\@abspage@last}\fi} \cs_new_eq:NN \DiscardShipoutBox \shipout_discard: -\DeclareRobustCommand \AtBeginDvi {\__shipout_add_firstpage_material:Nn \AtBeginDvi} +\cs_new_protected:Npn \AtBeginDvi {\__shipout_add_firstpage_material:Nn \AtBeginDvi} \cs_new_eq:NN \DebugShipoutsOn \shipout_debug_on: \cs_new_eq:NN \DebugShipoutsOff \shipout_debug_off: \cs_set_eq:NN \@expl@@@shipout@add@firstpage@material@@Nn @@ -11061,7 +11065,7 @@ Type H for immediate help.}% \__shipout_add_foreground_picture:n \ExplSyntaxOff \ExplSyntaxOn -\cs_new:Npn \AtEndDvi {\AddToHook{shipout/lastpage}} +\cs_new_protected:Npn \AtEndDvi {\AddToHook{shipout/lastpage}} \ExplSyntaxOff \disable@package@load{atenddvi} {\PackageWarning{atenddvi} @@ -12453,6 +12457,7 @@ Type H for immediate help.}% \endgroup} \let\@filelist\@gobble \def\@addtofilelist#1{\xdef\@filelist{\@filelist,#1}}% +\@input{latex2e-first-aid-for-external-files.ltx} \makeatother \errorstopmode \dump diff --git a/Master/texmf-dist/tex/latex-dev/base/latexrelease.sty b/Master/texmf-dist/tex/latex-dev/base/latexrelease.sty index a96f356e263..7caf477c37d 100644 --- a/Master/texmf-dist/tex/latex-dev/base/latexrelease.sty +++ b/Master/texmf-dist/tex/latex-dev/base/latexrelease.sty @@ -284,7 +284,7 @@ } %%% From File: ltvers.dtx \edef\latexreleaseversion - {2020-10-01} + {2021-05-01} \newif\if@includeinrelease \@includeinreleasefalse \def\IncludeInRelease#1{% @@ -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.0a} -\def\lthooksdate{2020/09/10} +\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} @@ -1951,10 +1951,8 @@ of this package available from CTAN} \@onlypreamble\DeclareDefaultHookRule \NewDocumentCommand \ClearHookRule { m m m } { \hook_gset_rule:nnnn {#1}{#2}{unrelated}{#3} } -\NewExpandableDocumentCommand \IfHookExistsTF { m } - { \hook_if_exist:nTF {#1} } -\NewExpandableDocumentCommand \IfHookEmptyTF { m } - { \hook_if_empty:nTF {#1} } +\cs_new_eq:NN \IfHookExistsTF \hook_if_exist:nTF +\cs_new_eq:NN \IfHookEmptyTF \hook_if_empty:nTF %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%5 \cs_new_eq:NN \@expl@@@initialize@all@@ \__hook_initialize_all: @@ -1967,13 +1965,13 @@ of this package available from CTAN} \IncludeInRelease{0000/00/00}% {\NewHook}{The hook management}% -\def \NewHook#1{} -\def \NewReversedHook#1{} -\def \NewMirroredHookPair#1#2{} +\def\NewHook#1{} +\def\NewReversedHook#1{} +\def\NewMirroredHookPair#1#2{} -\long\def \AddToHook#1#2{} +\long\def\AddToHookNext#1#2{} -\def \AddToHookNext#1{\@gobble@AddToHook@args} +\def\AddToHook#1{\@gobble@AddToHook@args} \providecommand\@gobble@AddToHook@args[2][]{} \def\RemoveFromHook#1{\@gobble@RemoveFromHook@arg} @@ -1985,11 +1983,11 @@ of this package available from CTAN} \let \DebugHooksOn \@empty \let \DebugHooksOff\@empty -\def \DeclareHookRul#1#2#3#4{} +\def \DeclareHookRule #1#2#3#4{} \def \DeclareDefaultHookRule #1#2#3{} -\def \ClearHookRule#1#2#3{} -\def \IfHookExistTF #1#2#3{#3} -\def \IfHookEmptyTF #1#2#3{#2} +\def \ClearHookRule #1#2#3{} +\long\def \IfHookExistsTF #1#2#3{#3} +\long\def \IfHookEmptyTF #1#2#3{#2} \EndIncludeInRelease %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -3302,7 +3300,7 @@ of this package available from CTAN} \def\@include#1 {% \clearpage \if@filesw - \immediate\write\@mainaux{\string\@input{"#1.aux"}}% + \immediate\write\@mainaux{\string\@input{#1.aux}}% \fi \@tempswatrue \if@partsw @@ -4049,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.0a} -\providecommand\ltfilehookdate{2020/08/30} +\providecommand\ltfilehookversion{v1.0c} +\providecommand\ltfilehookdate{2020/10/18} \IncludeInRelease{2020/10/01}% {\CurrentFile}{Hook management file}% \ExplSyntaxOn @@ -4263,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 @@ -4373,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@@ @@ -4397,8 +4392,8 @@ of this package available from CTAN} %% File: ltshipout.dtx (C) Copyright 2020 Frank Mittelbach, LaTeX Team %% %%% From File: ltshipout.dtx -\providecommand\ltshipoutversion{v1.0b} -\providecommand\ltshipoutdate{2020/09/09} +\providecommand\ltshipoutversion{v1.0c} +\providecommand\ltshipoutdate{2020/09/27} \IncludeInRelease{2020/10/01}% {\shipout}{Hook mangement (shipout)}% \ExplSyntaxOn @@ -4421,7 +4416,7 @@ of this package available from CTAN} } \box_new:N \l_shipout_box \cs_set_eq:NN \ShipoutBox \l_shipout_box -\cs_set:Npn\__shipout_execute: { +\cs_set_protected:Npn \__shipout_execute: { \tl_set:Nx \l__shipout_group_level_tl { \int_value:w \tex_currentgrouplevel:D } \tex_afterassignment:D \__shipout_execute_test_level: @@ -4429,7 +4424,6 @@ of this package available from CTAN} } \cs_gset_eq:NN \shipout \__shipout_execute: \tl_new:N \l__shipout_group_level_tl - \cs_new:Npn \__shipout_execute_test_level: { \int_compare:nNnT \l__shipout_group_level_tl < \tex_currentgrouplevel:D @@ -4660,7 +4654,7 @@ of this package available from CTAN} \cs_new:Npn \__shipout_add_foreground_picture:n #1 { \__shipout_add_foreground_box:n { \__shipout_picture_overlay:n {#1} } } -\cs_new:Npn \shipout_discard: { +\cs_new_protected:Npn \shipout_discard: { \bool_gset_true:N \g__shipout_discard_bool } \int_new:N \g_shipout_readonly_int @@ -4720,7 +4714,7 @@ of this package available from CTAN} {\ifnum\@abspage@last<\maxdimen \xdef\PreviousTotalPages{\@abspage@last}\fi} \cs_new_eq:NN \DiscardShipoutBox \shipout_discard: -\DeclareRobustCommand \AtBeginDvi {\__shipout_add_firstpage_material:Nn \AtBeginDvi} +\cs_new_protected:Npn \AtBeginDvi {\__shipout_add_firstpage_material:Nn \AtBeginDvi} \cs_new_eq:NN \DebugShipoutsOn \shipout_debug_on: \cs_new_eq:NN \DebugShipoutsOff \shipout_debug_off: \cs_set_eq:NN \@expl@@@shipout@add@firstpage@material@@Nn @@ -4770,14 +4764,13 @@ of this package available from CTAN} \let \AtBeginShipoutUpperLeftForeground \@undefined - \let \AtEndDvi \@undefined \EndIncludeInRelease \IncludeInRelease{2020/10/01}% {\AtEndDvi}{atenddvi emulation}% \ExplSyntaxOn -\cs_new:Npn \AtEndDvi {\AddToHook{shipout/lastpage}} +\cs_new_protected:Npn \AtEndDvi {\AddToHook{shipout/lastpage}} \ExplSyntaxOff \disable@package@load{atenddvi} {\PackageWarning{atenddvi} @@ -5597,6 +5590,18 @@ of this package available from CTAN} \@expl@push@filename@aux@@} \EndIncludeInRelease +\IncludeInRelease{2020/02/02}{\@pushfilename}% + {Add \@expl@push@filename@@}% +\def\@pushfilename{% + \@expl@push@filename@@ + \xdef\@currnamestack{% + {\@currname}% + {\@currext}% + {\the\catcode`\@}% + \@currnamestack}% + \@expl@push@filename@aux@@} +\EndIncludeInRelease + \IncludeInRelease{0000/00/00}{\@pushfilename}% {Add \@expl@push@filename@@ and \@expl@push@filename@aux@@}% \def\@pushfilename{% @@ -5615,6 +5620,12 @@ of this package available from CTAN} \@expl@pop@filename@@} \EndIncludeInRelease +\IncludeInRelease{2020/02/02}{\@popfilename}% + {Add \@expl@push@filename@@}% +\def\@popfilename{\expandafter\@p@pfilename\@currnamestack\@nil + \@expl@pop@filename@@} +\EndIncludeInRelease + \IncludeInRelease{0000/00/00}{\@popfilename}% {Add \@expl@push@filename@@ and \@expl@push@filename@aux@@}% \def\@popfilename{\expandafter\@p@pfilename\@currnamestack\@nil} @@ -5691,11 +5702,14 @@ of this package available from CTAN} }% \reserved@a} \EndIncludeInRelease -\IncludeInRelease{2020/02/02}% - {\@pr@videpackage}{Protection for package info}% +\IncludeInRelease{2020/10/01}% + {\@pr@videpackage}{Allow for package subsitution}% \def\@pr@videpackage[#1]{% \expandafter\protected@xdef % <-- protected... - \csname ver@\@currname.\@currext\endcsname{#1}% + \csname ver@\@currname.\@currext\endcsname{#1}% Loaded 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 @@ -5705,6 +5719,19 @@ of this package available from CTAN} \set@display@protect \immediate \write \m@ne {#1}\endgroup } \EndIncludeInRelease +\IncludeInRelease{2020/02/02}% + {\@pr@videpackage}{Protection for package info}% + +\def\@pr@videpackage[#1]{% + \expandafter\protected@xdef % <-- protected... + \csname ver@\@currname.\@currext\endcsname{#1}% +\ifx\@currext\@clsextension + \typeout{Document Class: \@gtempa\space#1}% + \else + \protected@wlog{Package: \@gtempa\space#1}% <--- protected + \fi} + +\EndIncludeInRelease \IncludeInRelease{0000/00/00}% {\@pr@videpackage}{Protection for package info}% @@ -5721,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,}% @@ -5891,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 @@ -5899,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}% @@ -5913,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{% @@ -7464,7 +7499,7 @@ of this package available from CTAN} \ifx\bfdefault\bfdefault@previous\else \expandafter\def\expandafter\bfdefault \expandafter{\bfdefault\@empty}% - \let\bfseries@previous\bfdefault + \let\bfdefault@previous\bfdefault \let\bfseries@rm\bfdef@ult \let\bfseries@sf\bfdef@ult \let\bfseries@tt\bfdef@ult @@ -7484,7 +7519,7 @@ of this package available from CTAN} \expand@font@defaults \ifx\mddefault\mddefault@previous\else \expandafter\def\expandafter\mddefault\expandafter{\mddefault\@empty}% - \let\mdseries@previous\mddefault + \let\mddefault@previous\mddefault \let\mdseries@rm\mddef@ult \let\mdseries@sf\mddef@ult \let\mdseries@tt\mddef@ult @@ -7526,7 +7561,7 @@ of this package available from CTAN} \let\@rmfamilyhook\@empty \let\@sffamilyhook\@empty \let\@ttfamilyhook\@empty -\let\@defaulfamilyhook\@empty +\let\@defaultfamilyhook\@empty %FMi sort out \EndIncludeInRelease \IncludeInRelease{2020/02/02}% {\bfseries}{Custom series with hooks}% @@ -7729,7 +7764,6 @@ of this package available from CTAN} \@defaultfamilyhook % hookname from 2020/02 will vanish \selectfont} \let\reset@font\normalfont -\let\@defaultfamilyhook\@empty %FMi sort out \EndIncludeInRelease \IncludeInRelease{0000/00/00}% {\normalfont}{Add hook to \normalfont}% @@ -9665,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-dev/base/ltluatex.lua b/Master/texmf-dist/tex/latex-dev/base/ltluatex.lua index add13f3080c..dcbc5730258 100644 --- a/Master/texmf-dist/tex/latex-dev/base/ltluatex.lua +++ b/Master/texmf-dist/tex/latex-dev/base/ltluatex.lua @@ -357,7 +357,7 @@ local function list_handler(name) "Function `" .. i.description .. "' returned false\n" .. "in callback `" .. name .."'" ) - break + return false end if ret ~= true then alltrue = false @@ -383,7 +383,7 @@ local function reverselist_handler(name) "Function `" .. cb.description .. "' returned false\n" .. "in callback `" .. name .."'" ) - break + return false end if ret ~= true then alltrue = false diff --git a/Master/texmf-dist/tex/latex-dev/base/ltluatex.tex b/Master/texmf-dist/tex/latex-dev/base/ltluatex.tex index 9cd2d436d45..febfbd72510 100644 --- a/Master/texmf-dist/tex/latex-dev/base/ltluatex.tex +++ b/Master/texmf-dist/tex/latex-dev/base/ltluatex.tex @@ -47,7 +47,7 @@ #1#2[#3]{\endgroup\immediate\write-1{File: #1 #3}} \fi \ProvidesFile{ltluatex.tex}% -[2020/08/10 v1.1r +[2020/09/25 v1.1s LuaTeX support for plain TeX (core) ] \edef\etatcatcode{\the\catcode`\@} diff --git a/Master/texmf-dist/tex/latex-dev/base/ltxdoc.cls b/Master/texmf-dist/tex/latex-dev/base/ltxdoc.cls index 897c59b5dc8..d3941b3afde 100644 --- a/Master/texmf-dist/tex/latex-dev/base/ltxdoc.cls +++ b/Master/texmf-dist/tex/latex-dev/base/ltxdoc.cls @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltxdoc} - [2020/08/21 v2.1a Standard LaTeX documentation class] + [2020/10/04 v2.1b Standard LaTeX documentation class] \DeclareOption{a5paper}{\@latexerr{Option not supported}% {}} \DeclareOption*{% @@ -164,7 +164,7 @@ \expandafter\@docinclude\expandafter{\@curr@file} \fi} \def\@docinclude#1 {\clearpage -\if@filesw \immediate\write\@mainaux{\string\@input{"#1.aux"}}\fi +\if@filesw \immediate\write\@mainaux{\string\@input{#1.aux}}\fi \@tempswatrue\if@partsw \@tempswafalse\edef\@tempb{#1}\@for \@tempa:=\@partlist\do{\ifx\@tempa\@tempb\@tempswatrue\fi}\fi \if@tempswa \let\@auxout\@partaux \if@filesw diff --git a/Master/texmf-dist/tex/latex-dev/base/srclfile-ltx.sty b/Master/texmf-dist/tex/latex-dev/base/srclfile-ltx.sty deleted file mode 100644 index 3643c55af23..00000000000 --- a/Master/texmf-dist/tex/latex-dev/base/srclfile-ltx.sty +++ /dev/null @@ -1,75 +0,0 @@ -%% -%% This is file `srclfile-ltx.sty', -%% generated with the docstrip utility. -%% -%% The original source files were: -%% -%% ltfilehook.dtx (with options: `scrlfile-draft') -%% -%% This is a generated file. -%% -%% The source is maintained by the LaTeX Project team and bug -%% reports for it can be opened at https://latex-project.org/bugs.html -%% (but please observe conditions on bug reports sent to that address!) -%% -%% -%% Copyright (C) 1993-2020 -%% The LaTeX3 Project and any individual authors listed elsewhere -%% in this file. -%% -%% This file was generated from file(s) of the LaTeX base system. -%% -------------------------------------------------------------- -%% -%% It may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License, either version 1.3c -%% of this license or (at your option) any later version. -%% The latest version of this license is in -%% https://www.latex-project.org/lppl.txt -%% and version 1.3c or later is part of all distributions of LaTeX -%% version 2008 or later. -%% -%% This file has the LPPL maintenance status "maintained". -%% -%% This file may only be distributed together with a copy of the LaTeX -%% base system. You may however distribute the LaTeX base system without -%% such generated files. -%% -%% The list of all files belonging to the LaTeX base distribution is -%% given in the file `manifest.txt'. See also `legal.txt' for additional -%% information. -%% -%% The list of derived (unpacked) files belonging to the distribution -%% and covered by LPPL is defined by the unpacking scripts (with -%% extension .ins) which are part of the distribution. -%% -%% File: ltfilehook.dtx (C) Copyright 2020 Frank Mittelbach, -%% Phelype Oleinik & LaTeX Team -%%% From File: ltfilehook.dtx -\providecommand\ltfilehookversion{v1.0a} -\providecommand\ltfilehookdate{2020/08/30} -\newcommand\BeforeClass[2] - {\AddToHook{file/before/#1.cls}{#2}} -\newcommand\AfterClass [2] - {\AddToHook{file/after/#1.cls}{#2}} -\newcommand\AfterAtEndOfClass [2] - {\AddToHook{class/after/#1}{#2}} -\newcommand\BeforePackage [2] - {\AddToHook{package/before/#1.sty}{#2}} -\newcommand\AfterPackage [2] - {\AddToHook{file/after/#1.sty}{#2}} -\newcommand\AfterEndOfPackage [2] - {\AddToHook{package/after/#1}{#2}} -\newcommand\BeforeFile [2] - {% - \typeout{BeforeFile: #1!!!}% - \AddToHook{file/before/#1}{#2}} -\newcommand\AfterFile [2] - {% - \typeout{AfterFile: #1!!!}% - \AddToHook{file/after/#1}{#2}} -\expandafter\let\csname ver@scrlfile.sty\endcsname\fmtversion -\@namedef {ver@scrlfile.sty}{2020/10/01} -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\endinput -%% -%% End of file `srclfile-ltx.sty'. diff --git a/Master/texmf-dist/tex/latex-dev/base/structuredlog.sty b/Master/texmf-dist/tex/latex-dev/base/structuredlog.sty index 58fc086af8d..ea2faf6fb0f 100644 --- a/Master/texmf-dist/tex/latex-dev/base/structuredlog.sty +++ b/Master/texmf-dist/tex/latex-dev/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.0a} -\providecommand\ltfilehookdate{2020/08/30} +\providecommand\ltfilehookversion{v1.0c} +\providecommand\ltfilehookdate{2020/10/18} \ProvidesExplPackage {structuredlog}{\ltfilehookdate}{\ltfilehookversion} {Structuring the TeX transcript file} -- cgit v1.2.3