diff options
-rw-r--r-- | Master/texmf-dist/doc/latex/firstaid/changes.txt | 7 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/firstaid/latex2e-first-aid-for-external-files.pdf | bin | 205202 -> 228448 bytes | |||
-rw-r--r-- | Master/texmf-dist/source/latex/firstaid/firstaid.ins | 13 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/firstaid/latex2e-first-aid-for-external-files.dtx | 127 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/firstaid/everysel-ltx.sty | 46 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/firstaid/filehook-ltx.sty | 9 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/firstaid/latex2e-first-aid-for-external-files.ltx | 37 |
7 files changed, 217 insertions, 22 deletions
diff --git a/Master/texmf-dist/doc/latex/firstaid/changes.txt b/Master/texmf-dist/doc/latex/firstaid/changes.txt index c97129e31fc..d7823c21a13 100644 --- a/Master/texmf-dist/doc/latex/firstaid/changes.txt +++ b/Master/texmf-dist/doc/latex/firstaid/changes.txt @@ -6,6 +6,13 @@ We also fix \FN@allmarks which can blow as it loops using the wrong counter (so the loops runs a random number of times) +2021-01-06 Frank Mittelbach <Frank.Mittelbach@latex-project.org> + + * latex2e-first-aid-for-external-files.dtx: + Add replacement code for everysel package. + Add first aid for CJK (as it overwrite \selectfont with an + old definition). + 2020-12-14 Frank Mittelbach <Frank.Mittelbach@latex-project.org> * latex2e-first-aid-for-external-files.dtx: diff --git a/Master/texmf-dist/doc/latex/firstaid/latex2e-first-aid-for-external-files.pdf b/Master/texmf-dist/doc/latex/firstaid/latex2e-first-aid-for-external-files.pdf Binary files differindex 1bf28e47609..2e9c812fd0c 100644 --- a/Master/texmf-dist/doc/latex/firstaid/latex2e-first-aid-for-external-files.pdf +++ b/Master/texmf-dist/doc/latex/firstaid/latex2e-first-aid-for-external-files.pdf diff --git a/Master/texmf-dist/source/latex/firstaid/firstaid.ins b/Master/texmf-dist/source/latex/firstaid/firstaid.ins index 9965480f207..cd5ea2006db 100644 --- a/Master/texmf-dist/source/latex/firstaid/firstaid.ins +++ b/Master/texmf-dist/source/latex/firstaid/firstaid.ins @@ -3,8 +3,8 @@ %% driver files from the doc files in this package when run through %% LaTeX or TeX. %% -%% Copyright (C) 2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 2020-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file is part of the Standard LaTeX `First Aid Bundle'. @@ -44,8 +44,8 @@ reports for it can be opened at https://latex-project.org/bugs/ (but please observe conditions on bug reports sent to that address!) -Copyright (C) 2020 -The LaTeX3 Project and any individual authors listed elsewhere +Copyright (C) 2020-2021 +The LaTeX Project and any individual authors listed elsewhere in this file. This file was generated from file(s) of the Standard LaTeX `First Aid Bundle'. @@ -70,6 +70,9 @@ without such generated files. {\from{latex2e-first-aid-for-external-files.dtx}{kernel}}} \generate{\file{filehook-ltx.sty} - {\from{latex2e-first-aid-for-external-files.dtx}{filehook}}} + {\from{latex2e-first-aid-for-external-files.dtx}{filehook-ltx}}} + +\generate{\file{everysel-ltx.sty} + {\from{latex2e-first-aid-for-external-files.dtx}{everysel-ltx}}} \endbatchfile diff --git a/Master/texmf-dist/source/latex/firstaid/latex2e-first-aid-for-external-files.dtx b/Master/texmf-dist/source/latex/firstaid/latex2e-first-aid-for-external-files.dtx index 1ce357d6d37..7eb108418c1 100644 --- a/Master/texmf-dist/source/latex/firstaid/latex2e-first-aid-for-external-files.dtx +++ b/Master/texmf-dist/source/latex/firstaid/latex2e-first-aid-for-external-files.dtx @@ -1,6 +1,7 @@ % \iffalse meta-comment % -%% File: latex2e-first-aid-for-external-files.dtx (C) Copyright 2020 +%% File: latex2e-first-aid-for-external-files.dtx (C) Copyright 2020-2021 +%% %% The LaTeX Project and any individual authors listed elsewhere %% in this file. % @@ -111,7 +112,7 @@ % % \begin{macrocode} \def\LaTeXFirstAidDate{2021/03/15} -\def\LaTeXFirstAidVersion{v1.0j} +\def\LaTeXFirstAidVersion{v1.0l} % \end{macrocode} % % \begin{macrocode} @@ -183,7 +184,7 @@ %\end{verbatim} % % \begin{macrocode} -%<*filehook> +%<*filehook-ltx> % \end{macrocode} % % \begin{macrocode} @@ -273,7 +274,7 @@ % \end{macrocode} % % \begin{macrocode} -%</filehook> +%</filehook-ltx> % \end{macrocode} % % @@ -306,7 +307,7 @@ \AddToHook{file/after/biditools.sty}[firstaid]{% \FirstAidNeededT{biditools}{sty}% {2020/05/13 v2 Programming tools for bidi package}% - { + {% % \end{macrocode} % \pkg{bidi} adds some code to the beginning of \cs{document} which % contains \cs{endgroup} and \cs{begingroup} which is no longer @@ -327,7 +328,7 @@ \AddToHook{enddocument/info}% {\let\bidi@AfterEndDocumentCheckLabelsRerun\@firstofone \bidi@afterenddocumentchecklabelsrerunhook}% - } + }% } % \end{macrocode} % @@ -397,6 +398,119 @@ % \end{macrocode} % % +% \begin{macrocode} +%</kernel> +% \end{macrocode} +% +% +% +% +% +% \subsection{The \pkg{everysel} package first aid} +% +% +% The \cs{selectfont} command got a hook (with the 2021/05 release) which +% was originally provided by the \pkg{everysel} +% package. Now that it is in the kernel this package is no longer +% needed (or only in a simplified manner). +% +% If it is requested we replace it with a simplified package +% (until) it gets updated at which point this line can be removed. +% \changes{v2.2k}{2020/12/04}{Emulate everysel package} +% \begin{macrocode} +%<*kernel> +% this has been updated +%\declare@file@substitution{everysel.sty}{everysel-ltx.sty} +%</kernel> +% \end{macrocode} +% +% +% +% \begin{macrocode} +%<*everysel-ltx> +\ProvidesPackage{everysel-ltx} + [2020/12/04 v1.0a + Emulation of the original everysel^^Jpackage with kernel methods] +% \end{macrocode} +% +% \begin{macrocode} +\newcommand*{\EverySelectfont}[1] + {\AddToHook{selectfont}{#1}} +\newcommand*{\AtNextSelectfont}[1] + {\AddToHookNext{selectfont}{#1}} +% \end{macrocode} +% +% +% \begin{macrocode} +%</everysel-ltx> +% \end{macrocode} +% +% +% +% +% +% \subsection{The \pkg{CJK} package first aid} +% +% \begin{macrocode} +%<*kernel> +% \end{macrocode} +% +% The package redefines \cs{selectfont} to add some code but +% otherwise uses the old definition. So we make a copy of the +% newer kernel definition and restore it after the package got +% loaded. The extra code that the package needs can go into the +% newly provided hook instead. +% +% \begin{macrocode} +\DeclareCommandCopy\CJK@selectfont\selectfont +% \end{macrocode} +% +% \begin{macrocode} +\AddToHook{file/after/CJK.sty}[firstaid]{% + \FirstAidNeededT{CJK}{sty}% + {2015/04/18 4.8.4}% + {% + \DeclareCommandCopy\selectfont\CJK@selectfont +% \end{macrocode} +% +% \begin{macrocode} + \AddToHook{selectfont}[CJK]{% + \expandafter\ifx\csname CJK@\curr@fontshape\endcsname \relax + \else + \CJK@bold@false + \csname CJK@\curr@fontshape\endcsname + \fi + }% + }% +} +% \end{macrocode} +% +% +% +% \subsection{\cs{footref} first aid} +% +% A few classes unconditionally define \cs{footref}. Until that has +% changed we provide some first aid to let them do this. +% +% \begin{macrocode} +\AddToHook{file/after/scrkbase.sty}[firstaid]{% + \FirstAidNeededT{scrkbase}{sty}% + {2020/09/21 v3.32 KOMA-Script package (KOMA-Script-dependent basics and keyval usage)}% + {\let\footref\@undefined} + } +% \end{macrocode} +% +% \begin{macrocode} +\AddToHook{class/before/memoir}[firstaid]{% + % for version {2020/10/04 v3.7n configurable book, report, article document class}% + \let\footref\@undefined +} +% \end{macrocode} +% +% +% +% +% % \subsection{The \pkg{bigfoot} first aid} % % The \pkg{bigfoot} packages makes the assumption that two @@ -432,7 +546,6 @@ % % % -% % \subsection[Temporary fixes for the kernel (until the next % patch-level release)] % {Temporary fixes for the kernel \\ diff --git a/Master/texmf-dist/tex/latex/firstaid/everysel-ltx.sty b/Master/texmf-dist/tex/latex/firstaid/everysel-ltx.sty new file mode 100644 index 00000000000..2480b6db3fa --- /dev/null +++ b/Master/texmf-dist/tex/latex/firstaid/everysel-ltx.sty @@ -0,0 +1,46 @@ +%% +%% This is file `everysel-ltx.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% latex2e-first-aid-for-external-files.dtx (with options: `everysel-ltx') +%% +%% The source is maintained by the LaTeX Project team and bug +%% reports for it can be opened at https://latex-project.org/bugs/ +%% (but please observe conditions on bug reports sent to that address!) +%% +%% +%% Copyright (C) 2020-2021 +%% The LaTeX Project and any individual authors listed elsewhere +%% in this file. +%% +%% This file was generated from file(s) of the Standard LaTeX `First Aid Bundle'. +%% ------------------------------------------------------------------------------ +%% +%% 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 2005/12/01 or later. +%% +%% This file may only be distributed together with a copy of the LaTeX +%% `First Aid Bundle'. You may however distribute the LaTeX `First Aid Bundle' +%% without such generated files. +%% +%% File: latex2e-first-aid-for-external-files.dtx (C) Copyright 2020-2021 +%% +%% The LaTeX Project and any individual authors listed elsewhere +%% in this file. +\ProvidesPackage{everysel-ltx} + [2020/12/04 v1.0a + Emulation of the original everysel^^Jpackage with kernel methods] +\newcommand*{\EverySelectfont}[1] + {\AddToHook{selectfont}{#1}} +\newcommand*{\AtNextSelectfont}[1] + {\AddToHookNext{selectfont}{#1}} +\endinput +%% +%% End of file `everysel-ltx.sty'. diff --git a/Master/texmf-dist/tex/latex/firstaid/filehook-ltx.sty b/Master/texmf-dist/tex/latex/firstaid/filehook-ltx.sty index 6493507a925..2c80f60003b 100644 --- a/Master/texmf-dist/tex/latex/firstaid/filehook-ltx.sty +++ b/Master/texmf-dist/tex/latex/firstaid/filehook-ltx.sty @@ -4,15 +4,15 @@ %% %% The original source files were: %% -%% latex2e-first-aid-for-external-files.dtx (with options: `filehook') +%% latex2e-first-aid-for-external-files.dtx (with options: `filehook-ltx') %% %% The source is maintained by the LaTeX Project team and bug %% reports for it can be opened at https://latex-project.org/bugs/ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 2020-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the Standard LaTeX `First Aid Bundle'. @@ -30,7 +30,8 @@ %% `First Aid Bundle'. You may however distribute the LaTeX `First Aid Bundle' %% without such generated files. %% -%% File: latex2e-first-aid-for-external-files.dtx (C) Copyright 2020 +%% File: latex2e-first-aid-for-external-files.dtx (C) Copyright 2020-2021 +%% %% The LaTeX Project and any individual authors listed elsewhere %% in this file. \newcommand\AtBeginOfEveryFile [1] diff --git a/Master/texmf-dist/tex/latex/firstaid/latex2e-first-aid-for-external-files.ltx b/Master/texmf-dist/tex/latex/firstaid/latex2e-first-aid-for-external-files.ltx index 2f9fcb3158a..101edc715d0 100644 --- a/Master/texmf-dist/tex/latex/firstaid/latex2e-first-aid-for-external-files.ltx +++ b/Master/texmf-dist/tex/latex/firstaid/latex2e-first-aid-for-external-files.ltx @@ -11,8 +11,8 @@ %% (but please observe conditions on bug reports sent to that address!) %% %% -%% Copyright (C) 2020 -%% The LaTeX3 Project and any individual authors listed elsewhere +%% Copyright (C) 2020-2021 +%% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% %% This file was generated from file(s) of the Standard LaTeX `First Aid Bundle'. @@ -30,11 +30,12 @@ %% `First Aid Bundle'. You may however distribute the LaTeX `First Aid Bundle' %% without such generated files. %% -%% File: latex2e-first-aid-for-external-files.dtx (C) Copyright 2020 +%% File: latex2e-first-aid-for-external-files.dtx (C) Copyright 2020-2021 +%% %% The LaTeX Project and any individual authors listed elsewhere %% in this file. \def\LaTeXFirstAidDate{2021/03/15} -\def\LaTeXFirstAidVersion{v1.0j} +\def\LaTeXFirstAidVersion{v1.0l} \ProvidesFile{latex2e-first-aid-for-external-files.ltx} [\LaTeXFirstAidDate\space \LaTeXFirstAidVersion\space LaTeX kernel fixes to external files and packages] @@ -48,7 +49,7 @@ \AddToHook{file/after/biditools.sty}[firstaid]{% \FirstAidNeededT{biditools}{sty}% {2020/05/13 v2 Programming tools for bidi package}% - { + {% \def\firstaid@bidi@document@patch \endgroup#1\begingroup#2\firstaid@bidi@document@patch {\unexpanded{#1#2}}% @@ -57,7 +58,7 @@ \AddToHook{enddocument/info}% {\let\bidi@AfterEndDocumentCheckLabelsRerun\@firstofone \bidi@afterenddocumentchecklabelsrerunhook}% - } + }% } \AddToHook{file/after/dinbrief.cls}[firstaid]{% \FirstAidNeededT{dinbrief}{cls}{2000/03/02 LaTeX2e class}% @@ -78,6 +79,30 @@ } } \ExplSyntaxOff +\DeclareCommandCopy\CJK@selectfont\selectfont +\AddToHook{file/after/CJK.sty}[firstaid]{% + \FirstAidNeededT{CJK}{sty}% + {2015/04/18 4.8.4}% + {% + \DeclareCommandCopy\selectfont\CJK@selectfont + \AddToHook{selectfont}[CJK]{% + \expandafter\ifx\csname CJK@\curr@fontshape\endcsname \relax + \else + \CJK@bold@false + \csname CJK@\curr@fontshape\endcsname + \fi + }% + }% +} +\AddToHook{file/after/scrkbase.sty}[firstaid]{% + \FirstAidNeededT{scrkbase}{sty}% + {2020/09/21 v3.32 KOMA-Script package (KOMA-Script-dependent basics and keyval usage)}% + {\let\footref\@undefined} + } +\AddToHook{class/before/memoir}[firstaid]{% + % for version {2020/10/04 v3.7n configurable book, report, article document class}% + \let\footref\@undefined +} \AddToHook{file/after/bigfoot.sty}{% \ifnum\count10<\insc@unt \global\count10=\insc@unt |