summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex-dev/base/latex.ltx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-10-28 20:35:26 +0000
committerKarl Berry <karl@freefriends.org>2020-10-28 20:35:26 +0000
commit62cf1eaa95c7ba58202f5dc2bf73d696571ba4ba (patch)
tree558f7f8c43402460a351450404d10eb95d8ab240 /Master/texmf-dist/tex/latex-dev/base/latex.ltx
parentd13ad981b2b59dceaa311340f367af1b82e2ddaf (diff)
latex-dev (28oct20)
git-svn-id: svn://tug.org/texlive/trunk@56791 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex-dev/base/latex.ltx')
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/latex.ltx73
1 files changed, 39 insertions, 34 deletions
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 <return> 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 <return> 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 <return> 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 <return> 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 <return> 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 <return> 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 <return> 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 <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,}%
@@ -9994,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
@@ -10002,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}%
@@ -10016,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{%
@@ -10466,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.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 <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
@@ -10701,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@@
@@ -10725,8 +10730,8 @@ Type H <return> 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 <return> 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 <return> 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 <return> 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 <return> 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 <return> 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 <return> 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