firstaid (12nov21)

git-svn-id: svn://tug.org/texlive/trunk@61042 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 22 insertions, 62 deletions

diff --git a/Master/texmf-dist/tex/latex/firstaid/filehook-ltx.sty b/Master/texmf-dist/tex/latex/firstaid/filehook-ltx.sty
index 2c80f60003b..8ae26decc4f 100644
--- a/Master/texmf-dist/tex/latex/firstaid/filehook-ltx.sty
+++ b/Master/texmf-dist/tex/latex/firstaid/filehook-ltx.sty
@@ -53,43 +53,43 @@
 \newcommand\AtEndOfClasses [1]
   {\AddToHook{class/after}{#1}}
 \newcommand\AtBeginOfFile [2]
-  {\AddToHook{file/before/#1}{#2}}
+  {\AddToHook{file/#1/before}{#2}}
 \newcommand\AtEndOfFile [2]
-  {\AddToHook{file/after/#1}{#2}}
+  {\AddToHook{file/#1/after}{#2}}
 \DeclareDocumentCommand \AtBeginOfPackageFile {smm}
    {\IfBooleanTF{#1}%
      {\@ifpackageloaded{#2}%
          {#3}%
-         {\AddToHook{package/before/#2}{#3}}}%
-     {\AddToHook{package/before/#2}{#3}}%
+         {\AddToHook{package/#2/before}{#3}}}%
+     {\AddToHook{package/#2/before}{#3}}%
    }
 \DeclareDocumentCommand \AtEndOfPackageFile {smm}
    {\IfBooleanTF{#1}%
      {\@ifpackageloaded{#2}%
          {#3}%
-         {\AddToHook{package/after/#2}{#3}}}%
-     {\AddToHook{package/after/#2}{#3}}%
+         {\AddToHook{package/#2/after}{#3}}}%
+     {\AddToHook{package/#2/after}{#3}}%
    }
 \DeclareDocumentCommand \AtBeginOfClassFile {smm}
    {\IfBooleanTF{#1}%
      {\@ifclassloaded{#2}%
          {#3}%
-         {\AddToHook{class/before/#2}{#3}}}%
-     {\AddToHook{class/before/#2}{#3}}%
+         {\AddToHook{class/#2/before}{#3}}}%
+     {\AddToHook{class/#2/before}{#3}}%
    }
 \DeclareDocumentCommand \AtEndOfClassFile {smm}
    {\IfBooleanTF{#1}%
      {\@ifclassloaded{#2}%
          {#3}%
-         {\AddToHook{class/after/#2}{#3}}}%
-     {\AddToHook{class/after/#2}{#3}}%
+         {\AddToHook{class/#2/after}{#3}}}%
+     {\AddToHook{class/#2/after}{#3}}%
    }
 \newcommand\AtBeginOfIncludeFile [2]
-  {\AddToHook{include/before/#1}{#2}}
+  {\AddToHook{include/#1/before}{#2}}
 \newcommand\AtEndOfIncludeFile [2]
-  {\AddToHook{include/end/#1}{#2}}
+  {\AddToHook{include/#1/end}{#2}}
 \newcommand\AfterIncludeFile [2]
-  {\AddToHook{include/after/#1}{#2}}
+  {\AddToHook{include/#1/after}{#2}}
 \endinput
 %%
 %% End of file `filehook-ltx.sty'.
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 249c312b517..cf96c582e7e 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
@@ -34,8 +34,8 @@
 %%
 %% The LaTeX Project and any individual authors listed elsewhere
 %% in this file.
-\def\LaTeXFirstAidDate{2021/06/28}
-\def\LaTeXFirstAidVersion{v1.0o}
+\def\LaTeXFirstAidDate{2021/11/11}
+\def\LaTeXFirstAidVersion{v1.0q}
 \ProvidesFile{latex2e-first-aid-for-external-files.ltx}
              [\LaTeXFirstAidDate\space \LaTeXFirstAidVersion\space
                LaTeX kernel fixes to external files and packages]
@@ -52,7 +52,7 @@
   \exp_args:Ncx\str_if_eq:onT{ver@#1.#2}{#3}
 }
 \ExplSyntaxOff
-\AddToHook{file/after/biditools.sty}[firstaid]{%
+\AddToHook{file/biditools.sty/after}[firstaid]{%
   \FirstAidNeededT{biditools}{sty}%
                   {2020/05/13 v2 Programming tools for bidi package}%
   {%
@@ -66,41 +66,26 @@
               \bidi@afterenddocumentchecklabelsrerunhook}%
   }%
 }
-\AddToHook{file/after/dinbrief.cls}[firstaid]{%
+\AddToHook{file/dinbrief.cls/after}[firstaid]{%
   \FirstAidNeededT{dinbrief}{cls}{2000/03/02 LaTeX2e class}%
                   {\AddToHook{env/document/begin}{\begingroup}}%
 }
 \ExplSyntaxOn
-\AddToHook{file/after/pgfpages.sty}[firstaid]{%
+\AddToHook{file/pgfpages.sty/after}[firstaid]{%
   \cs_gset_eq:NN \shipout \pgfpages@originalshipout
   \cs_set_eq:NN \pgfpages@originalshipout \tex_shipout:D
   \cs_set_eq:NN \tex_shipout:D \pgfpages@interceptshipout
 }
 \ExplSyntaxOff
 \ExplSyntaxOn
-\AddToHook{file/after/pgfmorepages.sty}[firstaid]{
+\AddToHook{file/pgfmorepages.sty/after}[firstaid]{
   \cs_set_nopar:Npn \pgfhookintoshipout {
     \cs_set_eq:NN \pgfpages@originalshipout \tex_shipout:D
     \cs_set_eq:NN \tex_shipout:D \pgfpages@interceptshipout
   }
 }
 \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/bigfoot.sty}{%
+\AddToHook{file/bigfoot.sty/after}{%
    \ifnum\count10<\insc@unt
      \global\count10=\insc@unt
    \fi
@@ -109,11 +94,11 @@
         \expandafter\FN@allmarks\expandafter{\number\numexpr#1+\@ne}%
         \fi}%
 }
-\AddToHook{file/after/ulem.sty}[firstaid]{%
+\AddToHook{file/ulem.sty/after}[firstaid]{%
    \def\@hspace#1{\begingroup\setlength\skip@{#1}%
                   \edef\x{\endgroup\hskip\the\skip@\relax}\x}%
    }
-\AddToHook{file/after/varwidth.sty}[firstaid]{%
+\AddToHook{file/varwidth.sty/after}[firstaid]{%
   \FirstAidNeededT{varwidth}{sty}%
        {2009/03/30 ver 0.92; \space Variable-width minipages}%
      {%
@@ -191,31 +176,6 @@
     \group_end:
   }
 \ExplSyntaxOff
-\ExplSyntaxOn
-\cs_set_protected:Npn \para_end: {
-  \scan_stop:
-  \mode_if_horizontal:TF {
-    \mode_if_inner:F {
-         \tex_unskip:D
-         \hook_use:n{para/end}
-         \@kernel@after@para@end
-         \mode_if_horizontal:TF {
-           \if_int_compare:w 0 < \tex_lastnodetype:D
-             \tex_kern:D \c_zero_dim
-           \fi:
-           \tex_par:D
-           \hook_use:n{para/after}
-           \@kernel@after@para@after
-         }
-         { \msg_error:nnnn { hooks }{ para-mode }{end}{horizontal} }
-    }
-  }
-  \tex_par:D
-}
-\cs_set_eq:NN \par     \para_end:
-\cs_set_eq:NN \@@par   \para_end:
-\cs_set_eq:NN \endgraf \para_end:
-\ExplSyntaxOff
 \endinput
 %%
 %% End of file `latex2e-first-aid-for-external-files.ltx'.