[latex3-commits] [git/LaTeX3-latex3-latex2e] firstaid: filehook doesn't need first aid any longer (dd948b9a)
Frank Mittelbach
frank.mittelbach at latex-project.org
Tue Sep 29 10:23:26 CEST 2020
Repository : https://github.com/latex3/latex2e
On branch : firstaid
Link : https://github.com/latex3/latex2e/commit/dd948b9ac715fa759cfba807a100ad49d230c46a
>---------------------------------------------------------------
commit dd948b9ac715fa759cfba807a100ad49d230c46a
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date: Tue Sep 29 10:23:26 2020 +0200
filehook doesn't need first aid any longer
>---------------------------------------------------------------
dd948b9ac715fa759cfba807a100ad49d230c46a
required/firstaid/changes.txt | 5 +
.../latex2e-first-aid-for-external-files.dtx | 143 +--------------------
.../testfiles/firstaid-filehook.luatex.tlg | 25 ----
required/firstaid/testfiles/firstaid-filehook.tlg | 13 +-
.../firstaid/testfiles/firstaid-filehook.xetex.tlg | 25 ----
5 files changed, 13 insertions(+), 198 deletions(-)
diff --git a/required/firstaid/changes.txt b/required/firstaid/changes.txt
index 472f752e..0b34d6d0 100644
--- a/required/firstaid/changes.txt
+++ b/required/firstaid/changes.txt
@@ -1,3 +1,8 @@
+2020-09-29 Frank Mittelbach <Frank.Mittelbach at latex-project.org>
+
+ * latex2e-first-aid-for-external-files.dtx:
+ filehook doesn't need first aid any longer.
+
2020-09-27 Frank Mittelbach <Frank.Mittelbach at latex-project.org>
* latex2e-first-aid-for-external-files.dtx:
diff --git a/required/firstaid/latex2e-first-aid-for-external-files.dtx b/required/firstaid/latex2e-first-aid-for-external-files.dtx
index a4cefca2..e8c23d2b 100644
--- a/required/firstaid/latex2e-first-aid-for-external-files.dtx
+++ b/required/firstaid/latex2e-first-aid-for-external-files.dtx
@@ -99,8 +99,8 @@
% \end{macrocode}
%
% \begin{macrocode}
-\def\LaTeXFirstAidDate{2020/09/28}
-\def\LaTeXFirstAidVersion{v1.0b}
+\def\LaTeXFirstAidDate{2020/09/29}
+\def\LaTeXFirstAidVersion{v1.0c}
% \end{macrocode}
%
% \begin{macrocode}
@@ -129,149 +129,10 @@
% \end{macro}
%
%
-%
-% \subsection{The \pkg{filehook} package first aid}
-%
-% The \pkg{filehook} package implements hooks into file loading
-% commands. These days this is already provided by the kernel
-% albeit not with the same user interface. Until that package gets
-% updated (to use the kernel interfaces) we provide a
-% substitution. This does not offer all hooks from \pkg{filehook}
-% but all that have been used in packages available in \TeX{} Live.
-%
-% Note that this doesn't fix \pkg{currfile} because that package
-% uses \pkg{filehook} but relies on the internals of the old
-% implementation.
-%
-% \begin{macrocode}
-\declare at file@substitution{filehook.sty}{filehook-ltx.sty}
-% \end{macrocode}
-%
-% If a new filehook package becomes available it can be tested
-% simply by undoing the above substitution via
-% \begin{verbatim}
-% \undeclare at file@substitution{filehook.sty}
-% \end{verbatim}
-% Once ready this will then taken out of the first aid file.
-%
% \begin{macrocode}
%</kernel>
% \end{macrocode}
%
-% What follows is a partial implementation of the \pkg{filehook}
-% interfaces.
-%
-% Not implemented are:
-%\begin{verbatim}
-% \AtBeginOfFiles
-% \AtEndOfFiles
-% \AtBeginOfInputs
-% \AtEndOfInputs
-% \AtBeginOfInputFile
-% \AtEndOfInputFile
-%\end{verbatim}
-%
-% \begin{macrocode}
-%<*filehook>
-% \end{macrocode}
-%
-% \begin{macrocode}
-\newcommand\AtBeginOfEveryFile [1]
- {\AddToHook{file/before}{#1}}
-\newcommand\AtEndOfEveryFile [1]
- {\AddToHook{file/after}{#1}}
-% \end{macrocode}
-%
-% \begin{macrocode}
-\newcommand\AtBeginOfIncludes [1]
- {\AddToHook{include/before}{#1}}
-\newcommand\AtEndOfIncludes [1]
- {\AddToHook{include/end}{#1}}
-\newcommand\AfterIncludes [1]
- {\AddToHook{include/after}{#1}}
-% \end{macrocode}
-%
-% \begin{macrocode}
-\newcommand\AtBeginOfPackages [1]
- {\AddToHook{package/before}{#1}}
-\newcommand\AtEndOfPackages [1]
- {\AddToHook{package/after}{#1}}
-% \end{macrocode}
-%
-% \begin{macrocode}
-\newcommand\AtBeginOfClasses [1]
- {\AddToHook{class/before}{#1}}
-\newcommand\AtEndOfClasses [1]
- {\AddToHook{class/after}{#1}}
-% \end{macrocode}
-%
-% For normal files we drop the \texttt{.tex} extension for now:
-% \begin{macrocode}
-\newcommand\AtBeginOfFile [2]
- {\AddToHook{file/before/#1}{#2}}
-\newcommand\AtEndOfFile [2]
- {\AddToHook{file/after/#1}{#2}}
-% \end{macrocode}
-%
-% \begin{macrocode}
-\DeclareDocumentCommand \AtBeginOfPackageFile {smm}
- {\IfBooleanTF{#1}%
- {\@ifpackageloaded{#2}%
- {#3}%
- {\AddToHook{package/before/#2}{#3}}}%
- {\AddToHook{package/before/#2}{#3}}%
- }
-\DeclareDocumentCommand \AtEndOfPackageFile {smm}
- {\IfBooleanTF{#1}%
- {\@ifpackageloaded{#2}%
- {#3}%
- {\AddToHook{package/after/#2}{#3}}}%
- {\AddToHook{package/after/#2}{#3}}%
- }
-% \end{macrocode}
-%
-% Are the * forms here of any use? I know they are use 3--4 times
-% on CTAN but I wonder if those are real or mistaken usages.
-% \begin{macrocode}
-\DeclareDocumentCommand \AtBeginOfClassFile {smm}
- {\IfBooleanTF{#1}%
- {\@ifclassloaded{#2}%
- {#3}%
- {\AddToHook{class/before/#2}{#3}}}%
- {\AddToHook{class/before/#2}{#3}}%
- }
-\DeclareDocumentCommand \AtEndOfClassFile {smm}
- {\IfBooleanTF{#1}%
- {\@ifclassloaded{#2}%
- {#3}%
- {\AddToHook{class/after/#2}{#3}}}%
- {\AddToHook{class/after/#2}{#3}}%
- }
-% \end{macrocode}
-%
-% \begin{macrocode}
-\newcommand\AtBeginOfIncludeFile [2]
- {\AddToHook{include/before/#1}{#2}}
-\newcommand\AtEndOfIncludeFile [2]
- {\AddToHook{include/end/#1}{#2}}
-\newcommand\AfterIncludeFile [2]
- {\AddToHook{include/after/#1}{#2}}
-% \end{macrocode}
-%
-%
-% This is missing some interfaces so disabling the package isn't
-% really correct, but then this code above is not supposed to stay
-% like this anyway.
-% \begin{macrocode}
-\expandafter\let\csname ver at filehook.sty\endcsname\fmtversion
-\@namedef {ver at filehook.sty}{2020/10/01}
-% \end{macrocode}
-%
-%
-% \begin{macrocode}
-%</filehook>
-% \end{macrocode}
-%
%
%
% \subsection{The \pkg{bidi} package first aid}
diff --git a/required/firstaid/testfiles/firstaid-filehook.luatex.tlg b/required/firstaid/testfiles/firstaid-filehook.luatex.tlg
deleted file mode 100644
index 354ec247..00000000
--- a/required/firstaid/testfiles/firstaid-filehook.luatex.tlg
+++ /dev/null
@@ -1,25 +0,0 @@
-This is a generated file for the l3build validation system.
-Don't change this file in any respect.
-(filehook-ltx.sty
-LaTeX3 Info: Defining command \AtBeginOfPackageFile with sig. 'smm' on line
-(LaTeX3) 64.
-LaTeX3 Info: Defining command \AtEndOfPackageFile with sig. 'smm' on line ...
-LaTeX3 Info: Defining command \AtBeginOfClassFile with sig. 'smm' on line ...
-LaTeX3 Info: Defining command \AtEndOfClassFile with sig. 'smm' on line ...
-) (firstaid-filehook.aux)
-LaTeX Font Info: Checking defaults for OML/cmm/m/it on input line ....
-LaTeX Font Info: ... okay on input line ....
-LaTeX Font Info: Checking defaults for OMS/cmsy/m/n on input line ....
-LaTeX Font Info: ... okay on input line ....
-LaTeX Font Info: Checking defaults for OT1/cmr/m/n on input line ....
-LaTeX Font Info: ... okay on input line ....
-LaTeX Font Info: Checking defaults for T1/cmr/m/n on input line ....
-LaTeX Font Info: ... okay on input line ....
-LaTeX Font Info: Checking defaults for TS1/cmr/m/n on input line ....
-LaTeX Font Info: ... okay on input line ....
-LaTeX Font Info: Checking defaults for OMX/cmex/m/n on input line ....
-LaTeX Font Info: ... okay on input line ....
-LaTeX Font Info: Checking defaults for U/cmr/m/n on input line ....
-LaTeX Font Info: ... okay on input line ....
-[1
-] (firstaid-filehook.aux)
diff --git a/required/firstaid/testfiles/firstaid-filehook.tlg b/required/firstaid/testfiles/firstaid-filehook.tlg
index 354ec247..83f7f795 100644
--- a/required/firstaid/testfiles/firstaid-filehook.tlg
+++ b/required/firstaid/testfiles/firstaid-filehook.tlg
@@ -1,12 +1,11 @@
This is a generated file for the l3build validation system.
Don't change this file in any respect.
-(filehook-ltx.sty
-LaTeX3 Info: Defining command \AtBeginOfPackageFile with sig. 'smm' on line
-(LaTeX3) 64.
-LaTeX3 Info: Defining command \AtEndOfPackageFile with sig. 'smm' on line ...
-LaTeX3 Info: Defining command \AtBeginOfClassFile with sig. 'smm' on line ...
-LaTeX3 Info: Defining command \AtEndOfClassFile with sig. 'smm' on line ...
-) (firstaid-filehook.aux)
+(../filehook.sty
+Package: filehook ....-..-.. v... Hooks for input files
+(../filehook-2020.sty
+Package: filehook-2020 ....-..-.. v... Hooks for input files
+))
+(firstaid-filehook.aux)
LaTeX Font Info: Checking defaults for OML/cmm/m/it on input line ....
LaTeX Font Info: ... okay on input line ....
LaTeX Font Info: Checking defaults for OMS/cmsy/m/n on input line ....
diff --git a/required/firstaid/testfiles/firstaid-filehook.xetex.tlg b/required/firstaid/testfiles/firstaid-filehook.xetex.tlg
deleted file mode 100644
index 354ec247..00000000
--- a/required/firstaid/testfiles/firstaid-filehook.xetex.tlg
+++ /dev/null
@@ -1,25 +0,0 @@
-This is a generated file for the l3build validation system.
-Don't change this file in any respect.
-(filehook-ltx.sty
-LaTeX3 Info: Defining command \AtBeginOfPackageFile with sig. 'smm' on line
-(LaTeX3) 64.
-LaTeX3 Info: Defining command \AtEndOfPackageFile with sig. 'smm' on line ...
-LaTeX3 Info: Defining command \AtBeginOfClassFile with sig. 'smm' on line ...
-LaTeX3 Info: Defining command \AtEndOfClassFile with sig. 'smm' on line ...
-) (firstaid-filehook.aux)
-LaTeX Font Info: Checking defaults for OML/cmm/m/it on input line ....
-LaTeX Font Info: ... okay on input line ....
-LaTeX Font Info: Checking defaults for OMS/cmsy/m/n on input line ....
-LaTeX Font Info: ... okay on input line ....
-LaTeX Font Info: Checking defaults for OT1/cmr/m/n on input line ....
-LaTeX Font Info: ... okay on input line ....
-LaTeX Font Info: Checking defaults for T1/cmr/m/n on input line ....
-LaTeX Font Info: ... okay on input line ....
-LaTeX Font Info: Checking defaults for TS1/cmr/m/n on input line ....
-LaTeX Font Info: ... okay on input line ....
-LaTeX Font Info: Checking defaults for OMX/cmex/m/n on input line ....
-LaTeX Font Info: ... okay on input line ....
-LaTeX Font Info: Checking defaults for U/cmr/m/n on input line ....
-LaTeX Font Info: ... okay on input line ....
-[1
-] (firstaid-filehook.aux)
More information about the latex3-commits
mailing list.