[latex3-commits] [git/LaTeX3-latex3-latex2e] lthooks2: move \NewHook out of 2020/02 includeinrelease added ltexpl.dtx to latexrelease (that was never included!) updated overlooked tests for lthooks (f2cdb3a7)
Frank Mittelbach
frank.mittelbach at latex-project.org
Tue Aug 18 12:11:28 CEST 2020
Repository : https://github.com/latex3/latex2e
On branch : lthooks2
Link : https://github.com/latex3/latex2e/commit/f2cdb3a7fa95cffc4cba3bee8b349cc7ebbc29f3
>---------------------------------------------------------------
commit f2cdb3a7fa95cffc4cba3bee8b349cc7ebbc29f3
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date: Tue Aug 18 12:11:28 2020 +0200
move \NewHook out of 2020/02 includeinrelease
added ltexpl.dtx to latexrelease (that was never included!)
updated overlooked tests for lthooks
>---------------------------------------------------------------
f2cdb3a7fa95cffc4cba3bee8b349cc7ebbc29f3
base/ltfssini.dtx | 19 ++++++++++---------
base/testfiles-lthooks2/lthooks2-002.tlg | 7 +++----
base/testfiles-lthooks2/lthooks2-005.tlg | 14 ++++++--------
.../tlb-latexrelease-rollback-003-often.luatex.tlg | 16 ++++++++++++----
.../testfiles/tlb-latexrelease-rollback-003-often.tlg | 16 ++++++++++++----
.../tlb-latexrelease-rollback-003-often.xetex.tlg | 16 ++++++++++++----
base/testfiles/tlb-rollback-004-often.luatex.tlg | 14 +++++++++-----
base/testfiles/tlb-rollback-004-often.tlg | 14 +++++++++-----
base/testfiles/tlb-rollback-004-often.xetex.tlg | 14 +++++++++-----
9 files changed, 82 insertions(+), 48 deletions(-)
diff --git a/base/ltfssini.dtx b/base/ltfssini.dtx
index 1b5e941f..0575da02 100644
--- a/base/ltfssini.dtx
+++ b/base/ltfssini.dtx
@@ -696,14 +696,6 @@
\let\@setmdseriesdefaultshook\@empty
% \end{macrocode}
%
-% FMi: proper integration needed: these are now already declared
-% hooks (move from lthooks here).
-% \begin{macrocode}
-\NewHook{rmfamily}
-\NewHook{sffamily}
-\NewHook{ttfamily}
-\NewHook{defaultfamily} % that name needs changing?
-% \end{macrocode}
% \end{macro}
% \end{macro}
% \end{macro}
@@ -1075,6 +1067,15 @@
% \end{macrocode}
%
%
+% FMi: proper integration needed: these are now already declared
+% hooks (move from lthooks here).
+% \begin{macrocode}
+\NewHook{rmfamily}
+\NewHook{sffamily}
+\NewHook{ttfamily}
+\NewHook{defaultfamily} % that name needs changing?
+% \end{macrocode}
+%
%
% \begin{macro}{\IfFontSeriesContextTF}
%
@@ -1687,7 +1688,7 @@
% By default the hooks do nothing.
% \changes{v3.1h}{2020/02/10}{Add \cs{@defaultfamilyhook} to \cs{normalfont} (gh/269)}
% \begin{macrocode}
-\let\@defaultfamilyhook\@empty
+\let\@defaultfamilyhook\@empty %FMi sort out
% \end{macrocode}
% \end{macro}
%
diff --git a/base/testfiles-lthooks2/lthooks2-002.tlg b/base/testfiles-lthooks2/lthooks2-002.tlg
index 7a51c5b5..9a1aae11 100644
--- a/base/testfiles-lthooks2/lthooks2-002.tlg
+++ b/base/testfiles-lthooks2/lthooks2-002.tlg
@@ -14,14 +14,13 @@ The hook 'begindocument':
Rules:
---
Update code for hook 'begindocument' on input line ...:
-Update code for hook 'enddocument' on input line ...:
+Update code for hook 'begindocument/before' on input line ...:
+Update code for hook 'begindocument/end' on input line ...:
Update code for hook 'rmfamily' on input line ...:
Update code for hook 'sffamily' on input line ...:
Update code for hook 'ttfamily' on input line ...:
Update code for hook 'defaultfamily' on input line ...:
-Update code for hook 'documentclass' on input line ...:
-Update code for hook 'begindocument/before' on input line ...:
-Update code for hook 'begindocument/end' on input line ...:
+Update code for hook 'enddocument' on input line ...:
Update code for hook 'enddocument/afterlastpage' on input line ...:
Update code for hook 'enddocument/afteraux' on input line ...:
Update code for hook 'enddocument/info' on input line ...:
diff --git a/base/testfiles-lthooks2/lthooks2-005.tlg b/base/testfiles-lthooks2/lthooks2-005.tlg
index 3a58c671..f124941c 100644
--- a/base/testfiles-lthooks2/lthooks2-005.tlg
+++ b/base/testfiles-lthooks2/lthooks2-005.tlg
@@ -2,14 +2,13 @@ This is a generated file for the l3build validation system.
Don't change this file in any respect.
**** Add to undeclared hook some-hook (my-package) on input line ... <- code to run when other-package is loaded,
Update code for hook 'begindocument' on input line ...:
-Update code for hook 'enddocument' on input line ...:
+Update code for hook 'begindocument/before' on input line ...:
+Update code for hook 'begindocument/end' on input line ...:
Update code for hook 'rmfamily' on input line ...:
Update code for hook 'sffamily' on input line ...:
Update code for hook 'ttfamily' on input line ...:
Update code for hook 'defaultfamily' on input line ...:
-Update code for hook 'documentclass' on input line ...:
-Update code for hook 'begindocument/before' on input line ...:
-Update code for hook 'begindocument/end' on input line ...:
+Update code for hook 'enddocument' on input line ...:
Update code for hook 'enddocument/afterlastpage' on input line ...:
Update code for hook 'enddocument/afteraux' on input line ...:
Update code for hook 'enddocument/info' on input line ...:
@@ -31,14 +30,13 @@ All initialized (non-empty) hooks:
enddocument/info -> \@dofilelist \@enddocument at kernel@warnings \g__hook_enddocument/info_next_code_tl
**** Add to hook some-hook (other-package) on input line ... <- code from other-package,
Update code for hook 'begindocument' on input line ...:
-Update code for hook 'enddocument' on input line ...:
+Update code for hook 'begindocument/before' on input line ...:
+Update code for hook 'begindocument/end' on input line ...:
Update code for hook 'rmfamily' on input line ...:
Update code for hook 'sffamily' on input line ...:
Update code for hook 'ttfamily' on input line ...:
Update code for hook 'defaultfamily' on input line ...:
-Update code for hook 'documentclass' on input line ...:
-Update code for hook 'begindocument/before' on input line ...:
-Update code for hook 'begindocument/end' on input line ...:
+Update code for hook 'enddocument' on input line ...:
Update code for hook 'enddocument/afterlastpage' on input line ...:
Update code for hook 'enddocument/afteraux' on input line ...:
Update code for hook 'enddocument/info' on input line ...:
diff --git a/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg b/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg
index e1d7b127..e8bc7fe0 100644
--- a/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg
+++ b/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg
@@ -10,6 +10,10 @@ Skipping: [....-..-..] LuaTeX (prefixed names) on input line ....
Applying: [....-..-..] LuaTeX (prefixed names) on input line ....
Skipping: [....-..-..] Final dot for extension on input line ....
Applying: [....-..-..] Final dot for extension on input line ....
+Skipping: [....-..-..] Pre-load expl3 on input line ....
+Skipping: [....-..-..] Pre-load expl3 on input line ....
+Skipping: [....-..-..] l3 macro for use in include on input line ....
+Applying: [....-..-..] l3 macro for use in include on input line ....
Skipping: [....-..-..] Allow "par" in \typeout on input line ....
Applying: [....-..-..] Allow "par" in \typeout on input line ....
Skipping: [....-..-..] \MakeRobust on input line ....
@@ -322,8 +326,8 @@ Skipping: [....-..-..] TU in everyjob on input line ....
Applying: [....-..-..] TU in everyjob on input line ....
Skipping: [....-..-..] Pre-load expl3 on input line ....
Skipping: [....-..-..] Pre-load expl3 on input line ....
-Skipping: [....-..-..] l3 macro for use in include on input line ....
-Applying: [....-..-..] l3 macro for use in include on input line ....
+Already applied: [....-..-..] l3 macro for use in include on input line ...
+Already applied: [....-..-..] l3 macro for use in include on input line ...
Skipping: [....-..-..] Extended Allocation on input line ....
Applying: [....-..-..] Extended Allocation on input line ....
Skipping: [....-..-..] Extended Allocation on input line ....
@@ -351,6 +355,10 @@ Applying: [....-..-..] LuaTeX (prefixed names) on input line ....
Already applied: [....-..-..] LuaTeX (prefixed names) on input line ....
Applying: [....-..-..] Final dot for extension on input line ....
Already applied: [....-..-..] Final dot for extension on input line ....
+Skipping: [....-..-..] Pre-load expl3 on input line ....
+Skipping: [....-..-..] Pre-load expl3 on input line ....
+Skipping: [....-..-..] l3 macro for use in include on input line ....
+Applying: [....-..-..] l3 macro for use in include on input line ....
Skipping: [....-..-..] Allow "par" in \typeout on input line ....
Applying: [....-..-..] Allow "par" in \typeout on input line ....
Applying: [....-..-..] \MakeRobust on input line ....
@@ -749,8 +757,8 @@ Applying: [....-..-..] TU in everyjob on input line ....
Already applied: [....-..-..] TU in everyjob on input line ....
Skipping: [....-..-..] Pre-load expl3 on input line ....
Skipping: [....-..-..] Pre-load expl3 on input line ....
-Skipping: [....-..-..] l3 macro for use in include on input line ....
-Applying: [....-..-..] l3 macro for use in include on input line ....
+Already applied: [....-..-..] l3 macro for use in include on input line ...
+Already applied: [....-..-..] l3 macro for use in include on input line ...
Applying: [....-..-..] Extended Allocation on input line ....
Already applied: [....-..-..] Extended Allocation on input line ....
Applying: [....-..-..] Extended Allocation on input line ....
diff --git a/base/testfiles/tlb-latexrelease-rollback-003-often.tlg b/base/testfiles/tlb-latexrelease-rollback-003-often.tlg
index 8262c921..639cacae 100644
--- a/base/testfiles/tlb-latexrelease-rollback-003-often.tlg
+++ b/base/testfiles/tlb-latexrelease-rollback-003-often.tlg
@@ -8,6 +8,10 @@ LaTeX Info: Redefining \IfTargetDateBefore on input line ...
Package: latexrelease ....-..-.. v... LaTeX release emulation and tests (including releases up to ....-..-..)
Skipping: [....-..-..] Final dot for extension on input line ....
Applying: [....-..-..] Final dot for extension on input line ....
+Skipping: [....-..-..] Pre-load expl3 on input line ....
+Skipping: [....-..-..] Pre-load expl3 on input line ....
+Skipping: [....-..-..] l3 macro for use in include on input line ....
+Applying: [....-..-..] l3 macro for use in include on input line ....
Skipping: [....-..-..] Allow "par" in \typeout on input line ....
Applying: [....-..-..] Allow "par" in \typeout on input line ....
Skipping: [....-..-..] \MakeRobust on input line ....
@@ -316,8 +320,8 @@ Skipping: [....-..-..] Disable hyphenation in verb on input line ....
Applying: [....-..-..] Disable hyphenation in verb on input line ....
Skipping: [....-..-..] Pre-load expl3 on input line ....
Skipping: [....-..-..] Pre-load expl3 on input line ....
-Skipping: [....-..-..] l3 macro for use in include on input line ....
-Applying: [....-..-..] l3 macro for use in include on input line ....
+Already applied: [....-..-..] l3 macro for use in include on input line ...
+Already applied: [....-..-..] l3 macro for use in include on input line ...
Skipping: [....-..-..] Extended Allocation on input line ....
Applying: [....-..-..] Extended Allocation on input line ....
Skipping: [....-..-..] Extended Allocation on input line ....
@@ -343,6 +347,10 @@ LaTeX Info: Redefining \IfTargetDateBefore on input line ....
Package: latexrelease ....-..-.. v... LaTeX release emulation and tests (including releases up to ....-..-..)
Applying: [....-..-..] Final dot for extension on input line ....
Already applied: [....-..-..] Final dot for extension on input line ....
+Skipping: [....-..-..] Pre-load expl3 on input line ....
+Skipping: [....-..-..] Pre-load expl3 on input line ....
+Skipping: [....-..-..] l3 macro for use in include on input line ....
+Applying: [....-..-..] l3 macro for use in include on input line ....
Skipping: [....-..-..] Allow "par" in \typeout on input line ....
Applying: [....-..-..] Allow "par" in \typeout on input line ....
Applying: [....-..-..] \MakeRobust on input line ....
@@ -733,8 +741,8 @@ Applying: [....-..-..] Disable hyphenation in verb on input line ....
Already applied: [....-..-..] Disable hyphenation in verb on input line ...
Skipping: [....-..-..] Pre-load expl3 on input line ....
Skipping: [....-..-..] Pre-load expl3 on input line ....
-Skipping: [....-..-..] l3 macro for use in include on input line ....
-Applying: [....-..-..] l3 macro for use in include on input line ....
+Already applied: [....-..-..] l3 macro for use in include on input line ...
+Already applied: [....-..-..] l3 macro for use in include on input line ...
Applying: [....-..-..] Extended Allocation on input line ....
Already applied: [....-..-..] Extended Allocation on input line ....
Applying: [....-..-..] Extended Allocation on input line ....
diff --git a/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg b/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg
index cc2a4725..5d5c0da5 100644
--- a/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg
+++ b/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg
@@ -8,6 +8,10 @@ LaTeX Info: Redefining \IfTargetDateBefore on input line ...
Package: latexrelease ....-..-.. v... LaTeX release emulation and tests (including releases up to ....-..-..)
Skipping: [....-..-..] Final dot for extension on input line ....
Applying: [....-..-..] Final dot for extension on input line ....
+Skipping: [....-..-..] Pre-load expl3 on input line ....
+Skipping: [....-..-..] Pre-load expl3 on input line ....
+Skipping: [....-..-..] l3 macro for use in include on input line ....
+Applying: [....-..-..] l3 macro for use in include on input line ....
Skipping: [....-..-..] Allow "par" in \typeout on input line ....
Applying: [....-..-..] Allow "par" in \typeout on input line ....
Skipping: [....-..-..] \MakeRobust on input line ....
@@ -316,8 +320,8 @@ Skipping: [....-..-..] Disable hyphenation in verb on input line ....
Applying: [....-..-..] Disable hyphenation in verb on input line ....
Skipping: [....-..-..] Pre-load expl3 on input line ....
Skipping: [....-..-..] Pre-load expl3 on input line ....
-Skipping: [....-..-..] l3 macro for use in include on input line ....
-Applying: [....-..-..] l3 macro for use in include on input line ....
+Already applied: [....-..-..] l3 macro for use in include on input line ...
+Already applied: [....-..-..] l3 macro for use in include on input line ...
Skipping: [....-..-..] Extended Allocation on input line ....
Applying: [....-..-..] Extended Allocation on input line ....
Skipping: [....-..-..] Extended Allocation on input line ....
@@ -352,6 +356,10 @@ LaTeX Info: Redefining \IfTargetDateBefore on input line ....
Package: latexrelease ....-..-.. v... LaTeX release emulation and tests (including releases up to ....-..-..)
Applying: [....-..-..] Final dot for extension on input line ....
Already applied: [....-..-..] Final dot for extension on input line ....
+Skipping: [....-..-..] Pre-load expl3 on input line ....
+Skipping: [....-..-..] Pre-load expl3 on input line ....
+Skipping: [....-..-..] l3 macro for use in include on input line ....
+Applying: [....-..-..] l3 macro for use in include on input line ....
Skipping: [....-..-..] Allow "par" in \typeout on input line ....
Applying: [....-..-..] Allow "par" in \typeout on input line ....
Applying: [....-..-..] \MakeRobust on input line ....
@@ -742,8 +750,8 @@ Applying: [....-..-..] Disable hyphenation in verb on input line ....
Already applied: [....-..-..] Disable hyphenation in verb on input line ...
Skipping: [....-..-..] Pre-load expl3 on input line ....
Skipping: [....-..-..] Pre-load expl3 on input line ....
-Skipping: [....-..-..] l3 macro for use in include on input line ....
-Applying: [....-..-..] l3 macro for use in include on input line ....
+Already applied: [....-..-..] l3 macro for use in include on input line ...
+Already applied: [....-..-..] l3 macro for use in include on input line ...
Applying: [....-..-..] Extended Allocation on input line ....
Already applied: [....-..-..] Extended Allocation on input line ....
Applying: [....-..-..] Extended Allocation on input line ....
diff --git a/base/testfiles/tlb-rollback-004-often.luatex.tlg b/base/testfiles/tlb-rollback-004-often.luatex.tlg
index d2da3fe0..e3ef8789 100644
--- a/base/testfiles/tlb-rollback-004-often.luatex.tlg
+++ b/base/testfiles/tlb-rollback-004-often.luatex.tlg
@@ -7,6 +7,11 @@ Applying: [....-..-..] LuaTeX (prefixed names) on input line ....
Already applied: [....-..-..] LuaTeX (prefixed names) on input line ....
Applying: [....-..-..] Final dot for extension on input line ....
Already applied: [....-..-..] Final dot for extension on input line ....
+Skipping: [....-..-..] Pre-load expl3 on input line ....
+Applying: [....-..-..] Pre-load expl3 on input line ....
+(../expl3.ltx)
+Skipping: [....-..-..] l3 macro for use in include on input line ....
+Applying: [....-..-..] l3 macro for use in include on input line ....
Skipping: [....-..-..] Allow "par" in \typeout on input line ....
Applying: [....-..-..] Allow "par" in \typeout on input line ....
Applying: [....-..-..] \MakeRobust on input line ....
@@ -730,11 +735,10 @@ Already applied: [....-..-..] LuaTeX on input line ...
Applying: [....-..-..] TU in everyjob on input line ....
luaotfload | load : Luaotfload initialization requested but is already loaded, ignoring.
Already applied: [....-..-..] TU in everyjob on input line ....
-Skipping: [....-..-..] Pre-load expl3 on input line ....
-Applying: [....-..-..] Pre-load expl3 on input line ....
-(../expl3.ltx)
-Skipping: [....-..-..] l3 macro for use in include on input line ....
-Applying: [....-..-..] l3 macro for use in include on input line ....
+Already applied: [....-..-..] Pre-load expl3 on input line ....
+Already applied: [....-..-..] Pre-load expl3 on input line ....
+Already applied: [....-..-..] l3 macro for use in include on input line ...
+Already applied: [....-..-..] l3 macro for use in include on input line ...
Applying: [....-..-..] Extended Allocation on input line ....
Already applied: [....-..-..] Extended Allocation on input line ....
Applying: [....-..-..] Extended Allocation on input line ....
diff --git a/base/testfiles/tlb-rollback-004-often.tlg b/base/testfiles/tlb-rollback-004-often.tlg
index 9894b2cb..05f37735 100644
--- a/base/testfiles/tlb-rollback-004-often.tlg
+++ b/base/testfiles/tlb-rollback-004-often.tlg
@@ -5,6 +5,11 @@ LaTeX Info: Redefining \IfTargetDateBefore on input line ...
Package: latexrelease ....-..-.. v... LaTeX release emulation and tests (including releases up to ....-..-..)
Applying: [....-..-..] Final dot for extension on input line ....
Already applied: [....-..-..] Final dot for extension on input line ....
+Skipping: [....-..-..] Pre-load expl3 on input line ....
+Applying: [....-..-..] Pre-load expl3 on input line ....
+(../expl3.ltx)
+Skipping: [....-..-..] l3 macro for use in include on input line ....
+Applying: [....-..-..] l3 macro for use in include on input line ....
Skipping: [....-..-..] Allow "par" in \typeout on input line ....
Applying: [....-..-..] Allow "par" in \typeout on input line ....
Applying: [....-..-..] \MakeRobust on input line ....
@@ -718,11 +723,10 @@ Applying: [....-..-..] Setup visible space for \verb on input line ....
Already applied: [....-..-..] Setup visible space for \verb on input line ....
Applying: [....-..-..] Disable hyphenation in verb on input line ....
Already applied: [....-..-..] Disable hyphenation in verb on input line ...
-Skipping: [....-..-..] Pre-load expl3 on input line ....
-Applying: [....-..-..] Pre-load expl3 on input line ....
-(../expl3.ltx)
-Skipping: [....-..-..] l3 macro for use in include on input line ....
-Applying: [....-..-..] l3 macro for use in include on input line ....
+Already applied: [....-..-..] Pre-load expl3 on input line ....
+Already applied: [....-..-..] Pre-load expl3 on input line ....
+Already applied: [....-..-..] l3 macro for use in include on input line ...
+Already applied: [....-..-..] l3 macro for use in include on input line ...
Applying: [....-..-..] Extended Allocation on input line ....
Already applied: [....-..-..] Extended Allocation on input line ....
Applying: [....-..-..] Extended Allocation on input line ....
diff --git a/base/testfiles/tlb-rollback-004-often.xetex.tlg b/base/testfiles/tlb-rollback-004-often.xetex.tlg
index a561fd9f..bdd06a18 100644
--- a/base/testfiles/tlb-rollback-004-often.xetex.tlg
+++ b/base/testfiles/tlb-rollback-004-often.xetex.tlg
@@ -5,6 +5,11 @@ LaTeX Info: Redefining \IfTargetDateBefore on input line ...
Package: latexrelease ....-..-.. v... LaTeX release emulation and tests (including releases up to ....-..-..)
Applying: [....-..-..] Final dot for extension on input line ....
Already applied: [....-..-..] Final dot for extension on input line ....
+Skipping: [....-..-..] Pre-load expl3 on input line ....
+Applying: [....-..-..] Pre-load expl3 on input line ....
+(../expl3.ltx)
+Skipping: [....-..-..] l3 macro for use in include on input line ....
+Applying: [....-..-..] l3 macro for use in include on input line ....
Skipping: [....-..-..] Allow "par" in \typeout on input line ....
Applying: [....-..-..] Allow "par" in \typeout on input line ....
Applying: [....-..-..] \MakeRobust on input line ....
@@ -719,11 +724,10 @@ Applying: [....-..-..] Setup visible space for \verb on input line ....
Already applied: [....-..-..] Setup visible space for \verb on input line ....
Applying: [....-..-..] Disable hyphenation in verb on input line ....
Already applied: [....-..-..] Disable hyphenation in verb on input line ...
-Skipping: [....-..-..] Pre-load expl3 on input line ....
-Applying: [....-..-..] Pre-load expl3 on input line ....
-(../expl3.ltx)
-Skipping: [....-..-..] l3 macro for use in include on input line ....
-Applying: [....-..-..] l3 macro for use in include on input line ....
+Already applied: [....-..-..] Pre-load expl3 on input line ....
+Already applied: [....-..-..] Pre-load expl3 on input line ....
+Already applied: [....-..-..] l3 macro for use in include on input line ...
+Already applied: [....-..-..] l3 macro for use in include on input line ...
Applying: [....-..-..] Extended Allocation on input line ....
Already applied: [....-..-..] Extended Allocation on input line ....
Applying: [....-..-..] Extended Allocation on input line ....
More information about the latex3-commits
mailing list.