[latex3-commits] [git/LaTeX3-latex3-latex2e] develop: drop first aid no longer needed (5a3de56d)

[Frank Mittelbach]

Repository : https://github.com/latex3/latex2e
On branch  : develop
Link       : https://github.com/latex3/latex2e/commit/5a3de56d5112eee76eb4248099b58520a515988c

>---------------------------------------------------------------

commit 5a3de56d5112eee76eb4248099b58520a515988c
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date:   Thu Nov 11 15:28:43 2021 +0100

    drop first aid no longer needed


>---------------------------------------------------------------

5a3de56d5112eee76eb4248099b58520a515988c
 required/firstaid/changes.txt                      |  5 ++
 .../latex2e-first-aid-for-external-files.dtx       | 95 +---------------------
 2 files changed, 7 insertions(+), 93 deletions(-)

diff --git a/required/firstaid/changes.txt b/required/firstaid/changes.txt
index 595c7505..6f8268c6 100644
--- a/required/firstaid/changes.txt
+++ b/required/firstaid/changes.txt
@@ -1,3 +1,8 @@
+2021-11-11  Frank Mittelbach  <Frank.Mittelbach at latex-project.org>
+
+	* latex2e-first-aid-for-external-files.dtx:
+	Drop first aid no longer needed.
+
 2021-10-22  Frank Mittelbach  <Frank.Mittelbach at latex-project.org>
 
 	* latex2e-first-aid-for-external-files.dtx (subsection{The \pkg{CJK} package first aid}):
diff --git a/required/firstaid/latex2e-first-aid-for-external-files.dtx b/required/firstaid/latex2e-first-aid-for-external-files.dtx
index 93d79140..fb8d3401 100644
--- a/required/firstaid/latex2e-first-aid-for-external-files.dtx
+++ b/required/firstaid/latex2e-first-aid-for-external-files.dtx
@@ -111,8 +111,8 @@
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-\def\LaTeXFirstAidDate{2021/10/22}
-\def\LaTeXFirstAidVersion{v1.0p}
+\def\LaTeXFirstAidDate{2021/11/11}
+\def\LaTeXFirstAidVersion{v1.0q}
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -455,72 +455,10 @@
 %
 %
 %
-%
-%
-% \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.
-%
-%    With its 2021/10/26 update this is fixed in the CJK package and
-%    the firstaid below no longer applied. With the next release it will
-%    therefore  be dropped.
-%    \begin{macrocode}
-%\DeclareCommandCopy\CJK at selectfont\selectfont
-%    \end{macrocode}
-%    
-%    \begin{macrocode}
-%\AddToHook{file/CJK.sty/after}[firstaid]{%
-%  \FirstAidNeededT{CJK}{sty}%
-%                  {2015/04/18 4.8.4}%
-%  {%
-%    \DeclareCommandCopy\selectfont\CJK at selectfont
-%    \end{macrocode}
-%    
-%    \begin{macrocode}
-%    \AddToHook{selectfont}[CJK]{%
-%        \expandafter\ifx\csname CJK@\curr at fontshape\endcsname \relax
-%        \else
-%          \CJK at bold@false
-%          \csname CJK@\curr at 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.
-%
-%    --- This seems to be resolved now ---
-%     
-%    \begin{macrocode}
-%\AddToHook{file/scrkbase.sty/after}[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/memoir/before}[firstaid]{%
-% % for version {2020/10/04 v3.7n configurable book, report, article document class}%
-%  \let\footref\@undefined
-%}
-%    \end{macrocode}
-%
-%
 %
 %
 %
@@ -682,35 +620,6 @@
 \ExplSyntaxOff
 %    \end{macrocode}
 %
-%    The next fixes Github issue 605 (by inserting a \cs{scan\_stop:}
-%    before doing the check for hmode).
-%    \begin{macrocode}
-\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 at after@para at 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 at after@para at 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
-%    \end{macrocode}
 %
 %    \begin{macrocode}
 %</kernel>