From 7a87410e74a9d342265d947c079f532ff0f087ad Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 16 Jun 2022 20:24:21 +0000 Subject: latex2e (16jun22) git-svn-id: svn://tug.org/texlive/trunk@63613 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/base/latex.ltx | 31 +++++++++++++---------- Master/texmf-dist/tex/latex/base/latexrelease.sty | 5 ++-- Master/texmf-dist/tex/latex/base/ltxdoc.cfg | 2 +- Master/texmf-dist/tex/latex/base/ltxdoc.cls | 14 +++++----- 4 files changed, 29 insertions(+), 23 deletions(-) (limited to 'Master/texmf-dist/tex/latex/base') diff --git a/Master/texmf-dist/tex/latex/base/latex.ltx b/Master/texmf-dist/tex/latex/base/latex.ltx index 3eba2430337..945ad0d79b9 100644 --- a/Master/texmf-dist/tex/latex/base/latex.ltx +++ b/Master/texmf-dist/tex/latex/base/latex.ltx @@ -706,8 +706,8 @@ \def\fmtname{LaTeX2e} \edef\fmtversion {2022-06-01} -\def\patch@level{0} -\edef\development@branch@name{develop \the\year-\the\month-\the\day} +\def\patch@level{1} +\edef\development@branch@name{} \iffalse \def\reserved@a#1/#2/#3\@nil{% \count@\year @@ -4350,8 +4350,8 @@ \ExplSyntaxOff %%% From File: lthooks.dtx -\def\lthooksversion{v1.0u} -\def\lthooksdate{2022/05/19} +\def\lthooksversion{v1.0v} +\def\lthooksdate{2022/06/15} \ExplSyntaxOn \bool_new:N \g__hook_debug_bool \cs_new_eq:NN \__hook_debug:n \use_none:n @@ -4498,6 +4498,7 @@ \__hook_make_usable:n {#1} \tl_gset:cx { g__hook_#1_reversed_tl } { \__hook_if_generic_reversed:nT {#1} { - } } + \__hook_update_hook_code:n {#1} } } } @@ -14870,23 +14871,27 @@ Type H for immediate help.}% { \clist_map_inline:cn { opt@ \@currname . \@currext } { - \keys_if_exist:neTF - {#1} { \__keys_remove_equals:n {##1} } - { \clist_put_right:Nn \l__keys_options_clist {##1} } - { \clist_put_right:Nn \@unusedoptionlist {##1} } + \__keys_options_remove:enn + { \__keys_remove_equals:n {##1} } + {##1} {#1} } } } } +\cs_new_protected:Npn \__keys_options_remove:nnn #1#2#3 + { + \keys_if_exist:nnTF {#3} {#1} + { \clist_put_right:Nn \l__keys_options_clist {#2} } + { \clist_put_right:Nn \@unusedoptionlist {#1} } + } +\cs_generate_variant:Nn \__keys_options_remove:nnn { e } \cs_new_protected:Npn \__keys_options_package:n #1 { \clist_map_inline:Nn \@classoptionslist { - \keys_if_exist:neT {#1} { \__keys_remove_equals:n {##1} } - { - \clist_put_right:Nn \l__keys_options_clist {##1} - \clist_remove_all:Nn \@unusedoptionlist {##1} - } + \__keys_options_remove:enn + { \__keys_remove_equals:n {##1} } + {##1} {#1} } } \cs_new_protected:Npn \__keys_options_local: diff --git a/Master/texmf-dist/tex/latex/base/latexrelease.sty b/Master/texmf-dist/tex/latex/base/latexrelease.sty index 558d4177c49..3979ee773b4 100644 --- a/Master/texmf-dist/tex/latex/base/latexrelease.sty +++ b/Master/texmf-dist/tex/latex/base/latexrelease.sty @@ -4545,8 +4545,8 @@ of this package available from CTAN} \catcode`\^^@=\@latexrelease@catcode@null\relax %%% From File: lthooks.dtx -\def\lthooksversion{v1.0u} -\def\lthooksdate{2022/05/19} +\def\lthooksversion{v1.0v} +\def\lthooksdate{2022/06/15} \ExplSyntaxOn \NewModuleRelease{2020/10/01}{lthooks} {The~hook~management~system} @@ -4706,6 +4706,7 @@ of this package available from CTAN} \__hook_make_usable:n {#1} \tl_gset:cx { g__hook_#1_reversed_tl } { \__hook_if_generic_reversed:nT {#1} { - } } + \__hook_update_hook_code:n {#1} } } } diff --git a/Master/texmf-dist/tex/latex/base/ltxdoc.cfg b/Master/texmf-dist/tex/latex/base/ltxdoc.cfg index 4b040df5dce..84131c3da6a 100644 --- a/Master/texmf-dist/tex/latex/base/ltxdoc.cfg +++ b/Master/texmf-dist/tex/latex/base/ltxdoc.cfg @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. \ProvidesFile{ltxdoc.cfg}% - [2021/12/07 v2.0c ltxdoc.cls configuration (LaTeX Project)] + [2022/06/14 v2.0d ltxdoc.cls configuration (LaTeX Project)] \PassOptionsToClass{a4paper}{article} diff --git a/Master/texmf-dist/tex/latex/base/ltxdoc.cls b/Master/texmf-dist/tex/latex/base/ltxdoc.cls index e438aa6a9cf..e66d2c91adf 100644 --- a/Master/texmf-dist/tex/latex/base/ltxdoc.cls +++ b/Master/texmf-dist/tex/latex/base/ltxdoc.cls @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltxdoc} - [2022/06/03 v2.1f Standard LaTeX documentation class] + [2022/06/14 v2.1g Standard LaTeX documentation class] \DeclareOption{a5paper}{\@latexerr{Option not supported}% {}} \newif\ifltxdoc@load@cfg@ \ltxdoc@load@cfg@true @@ -262,16 +262,16 @@ Bug reports can be opened (category \texttt{#1}) at\\% \end{center}% \par \vskip 1.5em} -\providecommand\url{\texttt} \def\task#1#2{} -\providecommand\LuaTeX{Lua\TeX} -\providecommand\cls{\textsf} -\providecommand\pkg{\textsf} -\providecommand\enquote[1]{``#1''} \DeclareRobustCommand\cs[1]{\texttt{\bslash\detokenize{#1}}}% \AtBeginDocument{% \renewcommand\PrintMacroName[1]{\MacroFont\detokenize{#1}}% - } + \providecommand\LuaTeX{Lua\TeX} + \providecommand\cls{\textsf} + \providecommand\pkg{\textsf} + \providecommand\enquote[1]{``#1''} + \providecommand\url{\texttt} +} \endinput %% %% End of file `ltxdoc.cls'. -- cgit v1.2.3