[latex3-commits] [git/LaTeX3-latex3-latex2e] develop: Merge branch 'main' into develop (b7773d23)
Frank Mittelbach
frank.mittelbach at latex-project.org
Tue Mar 16 17:55:18 CET 2021
Repository : https://github.com/latex3/latex2e
On branch : develop
Link : https://github.com/latex3/latex2e/commit/b7773d232dcfb0e91ec6db5c5b0ec9e5d6f5d698
>---------------------------------------------------------------
commit b7773d232dcfb0e91ec6db5c5b0ec9e5d6f5d698
Merge: a2bd7de6 b1cd7541
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date: Tue Mar 16 17:55:18 2021 +0100
Merge branch 'main' into develop
# Conflicts:
# base/testfiles-lthooks/lthooks-000.tlg
# base/testfiles-lthooks/lthooks-001.tlg
# base/testfiles-lthooks/lthooks-002.tlg
# base/testfiles-lthooks/lthooks-003.tlg
# base/testfiles-lthooks/lthooks-004.tlg
# base/testfiles-lthooks/lthooks-005.tlg
# base/testfiles-lthooks/lthooks-006.tlg
# base/testfiles-lthooks/lthooks-007.tlg
# base/testfiles-lthooks/lthooks-008.tlg
# base/testfiles-lthooks/lthooks-009.tlg
# base/testfiles-lthooks/lthooks-011.tlg
# base/testfiles-lthooks/lthooks-013.tlg
# base/testfiles-lthooks/lthooks-021.tlg
# base/testfiles-lthooks/lthooks-legacy.tlg
# base/testfiles-lthooks2/lthooks2-002.tlg
# base/testfiles-lthooks2/lthooks2-005.tlg
# required/firstaid/changes.txt
# required/firstaid/firstaid.ins
# required/firstaid/latex2e-first-aid-for-external-files.dtx
>---------------------------------------------------------------
b7773d232dcfb0e91ec6db5c5b0ec9e5d6f5d698
base/testfiles-lthooks/lthooks-000.tlg | 1 +
base/testfiles-lthooks/lthooks-001.tlg | 3 ++
base/testfiles-lthooks/lthooks-002.tlg | 3 ++
base/testfiles-lthooks/lthooks-003.tlg | 2 +
base/testfiles-lthooks/lthooks-004.tlg | 2 +
base/testfiles-lthooks/lthooks-005.tlg | 2 +
base/testfiles-lthooks/lthooks-006.tlg | 2 +
base/testfiles-lthooks/lthooks-007.tlg | 3 ++
base/testfiles-lthooks/lthooks-008.tlg | 2 +
base/testfiles-lthooks/lthooks-009.tlg | 1 +
base/testfiles-lthooks/lthooks-011.tlg | 4 ++
base/testfiles-lthooks/lthooks-013.tlg | 1 +
base/testfiles-lthooks/lthooks-021.tlg | 1 +
base/testfiles-lthooks/lthooks-legacy.tlg | 1 +
base/testfiles-lthooks2/lthooks2-002.tlg | 1 +
base/testfiles-lthooks2/lthooks2-005.tlg | 2 +
required/firstaid/changes.txt | 8 ++++
required/firstaid/firstaid.ins | 2 +-
.../latex2e-first-aid-for-external-files.dtx | 45 ++++++++++++++++++++--
required/firstaid/testfiles/firstaid-bigfoot.lvt | 38 ++++++++++++++++++
.../firstaid/testfiles/firstaid-bigfoot.tlg | 22 +++++++----
support/texlive.sh | 2 +
22 files changed, 136 insertions(+), 12 deletions(-)
diff --cc base/testfiles-lthooks/lthooks-000.tlg
index e7bedb23,0314f6e7..cbd24a6b
--- a/base/testfiles-lthooks/lthooks-000.tlg
+++ b/base/testfiles-lthooks/lthooks-000.tlg
@@@ -61,28 -59,7 +61,29 @@@ Code labels for sorting
Data structure for label rules:
firstaid = 0 ->
Handled code for firstaid
+Update code for hook 'file/after/CJK.sty' on input line ...:
+Code labels for sorting:
+ firstaid
+Data structure for label rules:
+ firstaid = 0 ->
+Handled code for firstaid
+Update code for hook 'file/after/scrkbase.sty' on input line ...:
+Code labels for sorting:
+ firstaid
+Data structure for label rules:
+ firstaid = 0 ->
+Handled code for firstaid
+Update code for hook 'class/before/memoir' on input line ...:
+Code labels for sorting:
+ firstaid
+Data structure for label rules:
+ firstaid = 0 ->
+Handled code for firstaid
+ Update code for hook 'file/after/bigfoot.sty' on input line ...:
+Update code for hook 'para/before' on input line ...:
+Update code for hook 'para/after' on input line ...:
+Update code for hook 'para/begin' on input line ...:
+Update code for hook 'para/end' on input line ...:
All initialized (non-empty) hooks:
enddocument/info -> \@dofilelist \@enddocument at kernel@warnings \__hook_toplevel enddocument/info \__hook_next enddocument/info
shipout/firstpage -> \__kernel_backend_literal:n {header=l3backend-dvips.pro}\__hook_toplevel shipout/firstpage \__hook_next shipout/firstpage
diff --cc base/testfiles-lthooks/lthooks-001.tlg
index e3ab41ca,bd031bba..54fc15d3
--- a/base/testfiles-lthooks/lthooks-001.tlg
+++ b/base/testfiles-lthooks/lthooks-001.tlg
@@@ -67,28 -65,7 +67,29 @@@ Code labels for sorting
Data structure for label rules:
firstaid = 0 ->
Handled code for firstaid
+Update code for hook 'file/after/CJK.sty' on input line ...:
+Code labels for sorting:
+ firstaid
+Data structure for label rules:
+ firstaid = 0 ->
+Handled code for firstaid
+Update code for hook 'file/after/scrkbase.sty' on input line ...:
+Code labels for sorting:
+ firstaid
+Data structure for label rules:
+ firstaid = 0 ->
+Handled code for firstaid
+Update code for hook 'class/before/memoir' on input line ...:
+Code labels for sorting:
+ firstaid
+Data structure for label rules:
+ firstaid = 0 ->
+Handled code for firstaid
+ Update code for hook 'file/after/bigfoot.sty' on input line ...:
+Update code for hook 'para/before' on input line ...:
+Update code for hook 'para/after' on input line ...:
+Update code for hook 'para/begin' on input line ...:
+Update code for hook 'para/end' on input line ...:
Update code for hook 'xxx' on input line ...:
Code labels for sorting:
label1 and label2
@@@ -140,13 -112,7 +141,14 @@@ The sequence \g__hook_all_seq contains
> {file/after/dinbrief.cls}
> {file/after/pgfpages.sty}
> {file/after/pgfmorepages.sty}
+> {file/after/CJK.sty}
+> {file/after/scrkbase.sty}
+> {class/before/memoir}
+ > {file/after/bigfoot.sty}
+> {para/before}
+> {para/after}
+> {para/begin}
+> {para/end}
> {xxx}.
Update code for hook 'begindocument' on input line ...:
Update code for hook 'begindocument/before' on input line ...:
@@@ -209,28 -173,7 +211,29 @@@ Code labels for sorting
Data structure for label rules:
firstaid = 0 ->
Handled code for firstaid
+Update code for hook 'file/after/CJK.sty' on input line ...:
+Code labels for sorting:
+ firstaid
+Data structure for label rules:
+ firstaid = 0 ->
+Handled code for firstaid
+Update code for hook 'file/after/scrkbase.sty' on input line ...:
+Code labels for sorting:
+ firstaid
+Data structure for label rules:
+ firstaid = 0 ->
+Handled code for firstaid
+Update code for hook 'class/before/memoir' on input line ...:
+Code labels for sorting:
+ firstaid
+Data structure for label rules:
+ firstaid = 0 ->
+Handled code for firstaid
+ Update code for hook 'file/after/bigfoot.sty' on input line ...:
+Update code for hook 'para/before' on input line ...:
+Update code for hook 'para/after' on input line ...:
+Update code for hook 'para/begin' on input line ...:
+Update code for hook 'para/end' on input line ...:
Update code for hook 'xxx' on input line ...:
Code labels for sorting:
label1
diff --cc base/testfiles-lthooks/lthooks-002.tlg
index 4e8051b6,a285197d..4c23b411
--- a/base/testfiles-lthooks/lthooks-002.tlg
+++ b/base/testfiles-lthooks/lthooks-002.tlg
@@@ -67,28 -65,7 +67,29 @@@ Code labels for sorting
Data structure for label rules:
firstaid = 0 ->
Handled code for firstaid
+Update code for hook 'file/after/CJK.sty' on input line ...:
+Code labels for sorting:
+ firstaid
+Data structure for label rules:
+ firstaid = 0 ->
+Handled code for firstaid
+Update code for hook 'file/after/scrkbase.sty' on input line ...:
+Code labels for sorting:
+ firstaid
+Data structure for label rules:
+ firstaid = 0 ->
+Handled code for firstaid
+Update code for hook 'class/before/memoir' on input line ...:
+Code labels for sorting:
+ firstaid
+Data structure for label rules:
+ firstaid = 0 ->
+Handled code for firstaid
+ Update code for hook 'file/after/bigfoot.sty' on input line ...:
+Update code for hook 'para/before' on input line ...:
+Update code for hook 'para/after' on input line ...:
+Update code for hook 'para/begin' on input line ...:
+Update code for hook 'para/end' on input line ...:
Update code for hook 'xxx' on input line ...:
Code labels for sorting:
label1 and label2
@@@ -142,13 -114,7 +143,14 @@@ The sequence \g__hook_all_seq contains
> {file/after/dinbrief.cls}
> {file/after/pgfpages.sty}
> {file/after/pgfmorepages.sty}
+> {file/after/CJK.sty}
+> {file/after/scrkbase.sty}
+> {class/before/memoir}
+ > {file/after/bigfoot.sty}
+> {para/before}
+> {para/after}
+> {para/begin}
+> {para/end}
> {xxx}.
Update code for hook 'begindocument' on input line ...:
Update code for hook 'begindocument/before' on input line ...:
@@@ -211,28 -175,7 +213,29 @@@ Code labels for sorting
Data structure for label rules:
firstaid = 0 ->
Handled code for firstaid
+Update code for hook 'file/after/CJK.sty' on input line ...:
+Code labels for sorting:
+ firstaid
+Data structure for label rules:
+ firstaid = 0 ->
+Handled code for firstaid
+Update code for hook 'file/after/scrkbase.sty' on input line ...:
+Code labels for sorting:
+ firstaid
+Data structure for label rules:
+ firstaid = 0 ->
+Handled code for firstaid
+Update code for hook 'class/before/memoir' on input line ...:
+Code labels for sorting:
+ firstaid
+Data structure for label rules:
+ firstaid = 0 ->
+Handled code for firstaid
+ Update code for hook 'file/after/bigfoot.sty' on input line ...:
+Update code for hook 'para/before' on input line ...:
+Update code for hook 'para/after' on input line ...:
+Update code for hook 'para/begin' on input line ...:
+Update code for hook 'para/end' on input line ...:
Update code for hook 'xxx' on input line ...:
Code labels for sorting:
label1
diff --cc base/testfiles-lthooks/lthooks-003.tlg
index cdc54cd9,7fb59e6e..bb5eae5c
--- a/base/testfiles-lthooks/lthooks-003.tlg
+++ b/base/testfiles-lthooks/lthooks-003.tlg
@@@ -49,13 -47,7 +49,14 @@@ The sequence \g__hook_all_seq contains
> {file/after/dinbrief.cls}
> {file/after/pgfpages.sty}
> {file/after/pgfmorepages.sty}
+> {file/after/CJK.sty}
+> {file/after/scrkbase.sty}
+> {class/before/memoir}
+ > {file/after/bigfoot.sty}
+> {para/before}
+> {para/after}
+> {para/begin}
+> {para/end}
> {xxx}.
The hook xxx contains the rules:
> {label3|label1} => {>}
@@@ -129,28 -119,7 +130,29 @@@ Code labels for sorting
Data structure for label rules:
firstaid = 0 ->
Handled code for firstaid
+Update code for hook 'file/after/CJK.sty' on input line ...:
+Code labels for sorting:
+ firstaid
+Data structure for label rules:
+ firstaid = 0 ->
+Handled code for firstaid
+Update code for hook 'file/after/scrkbase.sty' on input line ...:
+Code labels for sorting:
+ firstaid
+Data structure for label rules:
+ firstaid = 0 ->
+Handled code for firstaid
+Update code for hook 'class/before/memoir' on input line ...:
+Code labels for sorting:
+ firstaid
+Data structure for label rules:
+ firstaid = 0 ->
+Handled code for firstaid
+ Update code for hook 'file/after/bigfoot.sty' on input line ...:
+Update code for hook 'para/before' on input line ...:
+Update code for hook 'para/after' on input line ...:
+Update code for hook 'para/begin' on input line ...:
+Update code for hook 'para/end' on input line ...:
Update code for hook 'xxx' on input line ...:
normal rule label3|label1: > found
normal rule label6|label4: > found
diff --cc base/testfiles-lthooks/lthooks-004.tlg
index 85dbbbfd,8d991319..c3de9f28
--- a/base/testfiles-lthooks/lthooks-004.tlg
+++ b/base/testfiles-lthooks/lthooks-004.tlg
@@@ -39,13 -37,7 +39,14 @@@ The sequence \g__hook_all_seq contains
> {file/after/dinbrief.cls}
> {file/after/pgfpages.sty}
> {file/after/pgfmorepages.sty}
+> {file/after/CJK.sty}
+> {file/after/scrkbase.sty}
+> {class/before/memoir}
+ > {file/after/bigfoot.sty}
+> {para/before}
+> {para/after}
+> {para/begin}
+> {para/end}
> {xxx}.
The hook xxx contains the rules:
> {label2|label1} => {>}
@@@ -113,28 -103,7 +114,29 @@@ Code labels for sorting
Data structure for label rules:
firstaid = 0 ->
Handled code for firstaid
+Update code for hook 'file/after/CJK.sty' on input line ...:
+Code labels for sorting:
+ firstaid
+Data structure for label rules:
+ firstaid = 0 ->
+Handled code for firstaid
+Update code for hook 'file/after/scrkbase.sty' on input line ...:
+Code labels for sorting:
+ firstaid
+Data structure for label rules:
+ firstaid = 0 ->
+Handled code for firstaid
+Update code for hook 'class/before/memoir' on input line ...:
+Code labels for sorting:
+ firstaid
+Data structure for label rules:
+ firstaid = 0 ->
+Handled code for firstaid
+ Update code for hook 'file/after/bigfoot.sty' on input line ...:
+Update code for hook 'para/before' on input line ...:
+Update code for hook 'para/after' on input line ...:
+Update code for hook 'para/begin' on input line ...:
+Update code for hook 'para/end' on input line ...:
Update code for hook 'xxx' on input line ...:
normal rule label2|label1: > found
normal rule label3|label1: < found
diff --cc base/testfiles-lthooks/lthooks-005.tlg
index 73e4513e,0d95c45c..54afeb81
--- a/base/testfiles-lthooks/lthooks-005.tlg
+++ b/base/testfiles-lthooks/lthooks-005.tlg
@@@ -56,13 -54,7 +56,14 @@@ The sequence \g__hook_all_seq contains
> {file/after/dinbrief.cls}
> {file/after/pgfpages.sty}
> {file/after/pgfmorepages.sty}
+> {file/after/CJK.sty}
+> {file/after/scrkbase.sty}
+> {class/before/memoir}
+ > {file/after/bigfoot.sty}
+> {para/before}
+> {para/after}
+> {para/begin}
+> {para/end}
> {xxx}.
The hook xxx contains the rules:
> {label3|label1} => {>}
@@@ -136,28 -126,7 +137,29 @@@ Code labels for sorting
Data structure for label rules:
firstaid = 0 ->
Handled code for firstaid
+Update code for hook 'file/after/CJK.sty' on input line ...:
+Code labels for sorting:
+ firstaid
+Data structure for label rules:
+ firstaid = 0 ->
+Handled code for firstaid
+Update code for hook 'file/after/scrkbase.sty' on input line ...:
+Code labels for sorting:
+ firstaid
+Data structure for label rules:
+ firstaid = 0 ->
+Handled code for firstaid
+Update code for hook 'class/before/memoir' on input line ...:
+Code labels for sorting:
+ firstaid
+Data structure for label rules:
+ firstaid = 0 ->
+Handled code for firstaid
+ Update code for hook 'file/after/bigfoot.sty' on input line ...:
+Update code for hook 'para/before' on input line ...:
+Update code for hook 'para/after' on input line ...:
+Update code for hook 'para/begin' on input line ...:
+Update code for hook 'para/end' on input line ...:
Update code for hook 'xxx' on input line ...:
normal rule label3|label1: > found
normal rule label6|label4: > found
diff --cc base/testfiles-lthooks/lthooks-006.tlg
index 5ce3ca03,9858eab5..d33ea00a
--- a/base/testfiles-lthooks/lthooks-006.tlg
+++ b/base/testfiles-lthooks/lthooks-006.tlg
@@@ -37,13 -35,7 +37,14 @@@ The sequence \g__hook_all_seq contains
> {file/after/dinbrief.cls}
> {file/after/pgfpages.sty}
> {file/after/pgfmorepages.sty}
+> {file/after/CJK.sty}
+> {file/after/scrkbase.sty}
+> {class/before/memoir}
+ > {file/after/bigfoot.sty}
+> {para/before}
+> {para/after}
+> {para/begin}
+> {para/end}
> {xxx}.
The hook xxx contains the rules:
> {label2|label1} => {xW}
@@@ -109,28 -99,7 +110,29 @@@ Code labels for sorting
Data structure for label rules:
firstaid = 0 ->
Handled code for firstaid
+Update code for hook 'file/after/CJK.sty' on input line ...:
+Code labels for sorting:
+ firstaid
+Data structure for label rules:
+ firstaid = 0 ->
+Handled code for firstaid
+Update code for hook 'file/after/scrkbase.sty' on input line ...:
+Code labels for sorting:
+ firstaid
+Data structure for label rules:
+ firstaid = 0 ->
+Handled code for firstaid
+Update code for hook 'class/before/memoir' on input line ...:
+Code labels for sorting:
+ firstaid
+Data structure for label rules:
+ firstaid = 0 ->
+Handled code for firstaid
+ Update code for hook 'file/after/bigfoot.sty' on input line ...:
+Update code for hook 'para/before' on input line ...:
+Update code for hook 'para/after' on input line ...:
+Update code for hook 'para/begin' on input line ...:
+Update code for hook 'para/end' on input line ...:
Update code for hook 'xxx' on input line ...:
normal rule label2|label1: xW found
Package hooks Warning: Labels `label2' and `label1' are incompatible in hook
diff --cc base/testfiles-lthooks/lthooks-007.tlg
index 5d5ea030,76379ba4..c7e13ce0
--- a/base/testfiles-lthooks/lthooks-007.tlg
+++ b/base/testfiles-lthooks/lthooks-007.tlg
@@@ -37,13 -35,7 +37,14 @@@ The sequence \g__hook_all_seq contains
> {file/after/dinbrief.cls}
> {file/after/pgfpages.sty}
> {file/after/pgfmorepages.sty}
+> {file/after/CJK.sty}
+> {file/after/scrkbase.sty}
+> {class/before/memoir}
+ > {file/after/bigfoot.sty}
+> {para/before}
+> {para/after}
+> {para/begin}
+> {para/end}
> {xxx}.
The hook xxx contains the rules:
> {label2|label1} => {<-}
@@@ -110,28 -100,7 +111,29 @@@ Code labels for sorting
Data structure for label rules:
firstaid = 0 ->
Handled code for firstaid
+Update code for hook 'file/after/CJK.sty' on input line ...:
+Code labels for sorting:
+ firstaid
+Data structure for label rules:
+ firstaid = 0 ->
+Handled code for firstaid
+Update code for hook 'file/after/scrkbase.sty' on input line ...:
+Code labels for sorting:
+ firstaid
+Data structure for label rules:
+ firstaid = 0 ->
+Handled code for firstaid
+Update code for hook 'class/before/memoir' on input line ...:
+Code labels for sorting:
+ firstaid
+Data structure for label rules:
+ firstaid = 0 ->
+Handled code for firstaid
+ Update code for hook 'file/after/bigfoot.sty' on input line ...:
+Update code for hook 'para/before' on input line ...:
+Update code for hook 'para/after' on input line ...:
+Update code for hook 'para/begin' on input line ...:
+Update code for hook 'para/end' on input line ...:
Update code for hook 'xxx' on input line ...:
normal rule label2|label1: <- found
---> Drop 'label2' code from \g__hook_xxx_code_prop because of 'label1'
@@@ -218,28 -182,7 +220,29 @@@ Code labels for sorting
Data structure for label rules:
firstaid = 0 ->
Handled code for firstaid
+Update code for hook 'file/after/CJK.sty' on input line ...:
+Code labels for sorting:
+ firstaid
+Data structure for label rules:
+ firstaid = 0 ->
+Handled code for firstaid
+Update code for hook 'file/after/scrkbase.sty' on input line ...:
+Code labels for sorting:
+ firstaid
+Data structure for label rules:
+ firstaid = 0 ->
+Handled code for firstaid
+Update code for hook 'class/before/memoir' on input line ...:
+Code labels for sorting:
+ firstaid
+Data structure for label rules:
+ firstaid = 0 ->
+Handled code for firstaid
+ Update code for hook 'file/after/bigfoot.sty' on input line ...:
+Update code for hook 'para/before' on input line ...:
+Update code for hook 'para/after' on input line ...:
+Update code for hook 'para/begin' on input line ...:
+Update code for hook 'para/end' on input line ...:
Update code for hook 'xxx' on input line ...:
normal rule label2|label1: <- found
---> Drop 'label2' code from \g__hook_xxx_code_prop because of 'label1'
diff --cc base/testfiles-lthooks/lthooks-008.tlg
index 24fe3f67,fe901850..a6b20fae
--- a/base/testfiles-lthooks/lthooks-008.tlg
+++ b/base/testfiles-lthooks/lthooks-008.tlg
@@@ -39,13 -37,7 +39,14 @@@ The sequence \g__hook_all_seq contains
> {file/after/dinbrief.cls}
> {file/after/pgfpages.sty}
> {file/after/pgfmorepages.sty}
-> {file/after/bigfoot.sty}.
+> {file/after/CJK.sty}
+> {file/after/scrkbase.sty}
+> {class/before/memoir}
++> {file/after/bigfoot.sty}
+> {para/before}
+> {para/after}
+> {para/begin}
+> {para/end}.
The hook enddocument contains the rules:
Update code for hook 'begindocument' on input line ...:
Update code for hook 'begindocument/before' on input line ...:
@@@ -117,28 -107,7 +118,29 @@@ Code labels for sorting
Data structure for label rules:
firstaid = 0 ->
Handled code for firstaid
+Update code for hook 'file/after/CJK.sty' on input line ...:
+Code labels for sorting:
+ firstaid
+Data structure for label rules:
+ firstaid = 0 ->
+Handled code for firstaid
+Update code for hook 'file/after/scrkbase.sty' on input line ...:
+Code labels for sorting:
+ firstaid
+Data structure for label rules:
+ firstaid = 0 ->
+Handled code for firstaid
+Update code for hook 'class/before/memoir' on input line ...:
+Code labels for sorting:
+ firstaid
+Data structure for label rules:
+ firstaid = 0 ->
+Handled code for firstaid
+ Update code for hook 'file/after/bigfoot.sty' on input line ...:
+Update code for hook 'para/before' on input line ...:
+Update code for hook 'para/after' on input line ...:
+Update code for hook 'para/begin' on input line ...:
+Update code for hook 'para/end' on input line ...:
All initialized (non-empty) hooks:
enddocument -> \typeout {foo}\typeout {bar}\typeout {from my package}\__hook_toplevel enddocument \__hook_next enddocument
enddocument/info -> \@dofilelist \@enddocument at kernel@warnings \__hook_toplevel enddocument/info \__hook_next enddocument/info
diff --cc base/testfiles-lthooks/lthooks-009.tlg
index 0a4db88d,1bbeed0d..21ae32ef
--- a/base/testfiles-lthooks/lthooks-009.tlg
+++ b/base/testfiles-lthooks/lthooks-009.tlg
@@@ -67,28 -65,7 +67,29 @@@ Code labels for sorting
Data structure for label rules:
firstaid = 0 ->
Handled code for firstaid
+Update code for hook 'file/after/CJK.sty' on input line ...:
+Code labels for sorting:
+ firstaid
+Data structure for label rules:
+ firstaid = 0 ->
+Handled code for firstaid
+Update code for hook 'file/after/scrkbase.sty' on input line ...:
+Code labels for sorting:
+ firstaid
+Data structure for label rules:
+ firstaid = 0 ->
+Handled code for firstaid
+Update code for hook 'class/before/memoir' on input line ...:
+Code labels for sorting:
+ firstaid
+Data structure for label rules:
+ firstaid = 0 ->
+Handled code for firstaid
+ Update code for hook 'file/after/bigfoot.sty' on input line ...:
+Update code for hook 'para/before' on input line ...:
+Update code for hook 'para/after' on input line ...:
+Update code for hook 'para/begin' on input line ...:
+Update code for hook 'para/end' on input line ...:
All initialized (non-empty) hooks:
sffamily -> \typeout {Std sffamily code}\__hook_toplevel sffamily \__hook_next sffamily
enddocument/info -> \@dofilelist \@enddocument at kernel@warnings \__hook_toplevel enddocument/info \__hook_next enddocument/info
diff --cc base/testfiles-lthooks/lthooks-011.tlg
index 7e051614,ada581e8..c914861a
--- a/base/testfiles-lthooks/lthooks-011.tlg
+++ b/base/testfiles-lthooks/lthooks-011.tlg
@@@ -62,28 -60,7 +62,29 @@@ Code labels for sorting
Data structure for label rules:
firstaid = 0 ->
Handled code for firstaid
+Update code for hook 'file/after/CJK.sty' on input line ...:
+Code labels for sorting:
+ firstaid
+Data structure for label rules:
+ firstaid = 0 ->
+Handled code for firstaid
+Update code for hook 'file/after/scrkbase.sty' on input line ...:
+Code labels for sorting:
+ firstaid
+Data structure for label rules:
+ firstaid = 0 ->
+Handled code for firstaid
+Update code for hook 'class/before/memoir' on input line ...:
+Code labels for sorting:
+ firstaid
+Data structure for label rules:
+ firstaid = 0 ->
+Handled code for firstaid
+ Update code for hook 'file/after/bigfoot.sty' on input line ...:
+Update code for hook 'para/before' on input line ...:
+Update code for hook 'para/after' on input line ...:
+Update code for hook 'para/begin' on input line ...:
+Update code for hook 'para/end' on input line ...:
Update code for hook 'xxx' on input line ...:
Code labels for sorting:
front
@@@ -168,28 -140,7 +169,29 @@@ Code labels for sorting
Data structure for label rules:
firstaid = 0 ->
Handled code for firstaid
+Update code for hook 'file/after/CJK.sty' on input line ...:
+Code labels for sorting:
+ firstaid
+Data structure for label rules:
+ firstaid = 0 ->
+Handled code for firstaid
+Update code for hook 'file/after/scrkbase.sty' on input line ...:
+Code labels for sorting:
+ firstaid
+Data structure for label rules:
+ firstaid = 0 ->
+Handled code for firstaid
+Update code for hook 'class/before/memoir' on input line ...:
+Code labels for sorting:
+ firstaid
+Data structure for label rules:
+ firstaid = 0 ->
+Handled code for firstaid
+ Update code for hook 'file/after/bigfoot.sty' on input line ...:
+Update code for hook 'para/before' on input line ...:
+Update code for hook 'para/after' on input line ...:
+Update code for hook 'para/begin' on input line ...:
+Update code for hook 'para/end' on input line ...:
Update code for hook 'xxx' on input line ...:
Code labels for sorting:
front and rear
@@@ -276,28 -222,7 +278,29 @@@ Code labels for sorting
Data structure for label rules:
firstaid = 0 ->
Handled code for firstaid
+Update code for hook 'file/after/CJK.sty' on input line ...:
+Code labels for sorting:
+ firstaid
+Data structure for label rules:
+ firstaid = 0 ->
+Handled code for firstaid
+Update code for hook 'file/after/scrkbase.sty' on input line ...:
+Code labels for sorting:
+ firstaid
+Data structure for label rules:
+ firstaid = 0 ->
+Handled code for firstaid
+Update code for hook 'class/before/memoir' on input line ...:
+Code labels for sorting:
+ firstaid
+Data structure for label rules:
+ firstaid = 0 ->
+Handled code for firstaid
+ Update code for hook 'file/after/bigfoot.sty' on input line ...:
+Update code for hook 'para/before' on input line ...:
+Update code for hook 'para/after' on input line ...:
+Update code for hook 'para/begin' on input line ...:
+Update code for hook 'para/end' on input line ...:
Update code for hook 'xxx' on input line ...:
Code labels for sorting:
front, rear and labels
@@@ -386,28 -306,7 +389,29 @@@ Code labels for sorting
Data structure for label rules:
firstaid = 0 ->
Handled code for firstaid
+Update code for hook 'file/after/CJK.sty' on input line ...:
+Code labels for sorting:
+ firstaid
+Data structure for label rules:
+ firstaid = 0 ->
+Handled code for firstaid
+Update code for hook 'file/after/scrkbase.sty' on input line ...:
+Code labels for sorting:
+ firstaid
+Data structure for label rules:
+ firstaid = 0 ->
+Handled code for firstaid
+Update code for hook 'class/before/memoir' on input line ...:
+Code labels for sorting:
+ firstaid
+Data structure for label rules:
+ firstaid = 0 ->
+Handled code for firstaid
+ Update code for hook 'file/after/bigfoot.sty' on input line ...:
+Update code for hook 'para/before' on input line ...:
+Update code for hook 'para/after' on input line ...:
+Update code for hook 'para/begin' on input line ...:
+Update code for hook 'para/end' on input line ...:
Update code for hook 'xxx' on input line ...:
Code labels for sorting:
front, rear, labels and return
diff --cc base/testfiles-lthooks/lthooks-013.tlg
index 8410117c,84f72e69..c6f1469a
--- a/base/testfiles-lthooks/lthooks-013.tlg
+++ b/base/testfiles-lthooks/lthooks-013.tlg
@@@ -116,28 -114,7 +116,29 @@@ Code labels for sorting
Data structure for label rules:
firstaid = 0 ->
Handled code for firstaid
+Update code for hook 'file/after/CJK.sty' on input line ...:
+Code labels for sorting:
+ firstaid
+Data structure for label rules:
+ firstaid = 0 ->
+Handled code for firstaid
+Update code for hook 'file/after/scrkbase.sty' on input line ...:
+Code labels for sorting:
+ firstaid
+Data structure for label rules:
+ firstaid = 0 ->
+Handled code for firstaid
+Update code for hook 'class/before/memoir' on input line ...:
+Code labels for sorting:
+ firstaid
+Data structure for label rules:
+ firstaid = 0 ->
+Handled code for firstaid
+ Update code for hook 'file/after/bigfoot.sty' on input line ...:
+Update code for hook 'para/before' on input line ...:
+Update code for hook 'para/after' on input line ...:
+Update code for hook 'para/begin' on input line ...:
+Update code for hook 'para/end' on input line ...:
Update code for hook 'env/itemize/begin' on input line ...:
Code labels for sorting:
foo
diff --cc base/testfiles-lthooks/lthooks-021.tlg
index c8a308e1,406dc2a9..b5470ae6
--- a/base/testfiles-lthooks/lthooks-021.tlg
+++ b/base/testfiles-lthooks/lthooks-021.tlg
@@@ -61,28 -59,7 +61,29 @@@ Code labels for sorting
Data structure for label rules:
firstaid = 0 ->
Handled code for firstaid
+Update code for hook 'file/after/CJK.sty' on input line ...:
+Code labels for sorting:
+ firstaid
+Data structure for label rules:
+ firstaid = 0 ->
+Handled code for firstaid
+Update code for hook 'file/after/scrkbase.sty' on input line ...:
+Code labels for sorting:
+ firstaid
+Data structure for label rules:
+ firstaid = 0 ->
+Handled code for firstaid
+Update code for hook 'class/before/memoir' on input line ...:
+Code labels for sorting:
+ firstaid
+Data structure for label rules:
+ firstaid = 0 ->
+Handled code for firstaid
+ Update code for hook 'file/after/bigfoot.sty' on input line ...:
+Update code for hook 'para/before' on input line ...:
+Update code for hook 'para/after' on input line ...:
+Update code for hook 'para/begin' on input line ...:
+Update code for hook 'para/end' on input line ...:
All initialized (non-empty) hooks:
enddocument/info -> \@dofilelist \@enddocument at kernel@warnings \__hook_toplevel enddocument/info \__hook_next enddocument/info
shipout/firstpage -> \__kernel_backend_literal:n {header=l3backend-dvips.pro}\__hook_toplevel shipout/firstpage \__hook_next shipout/firstpage
diff --cc base/testfiles-lthooks/lthooks-legacy.tlg
index 3355e336,c46a4c63..364a30a8
--- a/base/testfiles-lthooks/lthooks-legacy.tlg
+++ b/base/testfiles-lthooks/lthooks-legacy.tlg
@@@ -86,28 -84,7 +86,29 @@@ Code labels for sorting
Data structure for label rules:
firstaid = 0 ->
Handled code for firstaid
+Update code for hook 'file/after/CJK.sty' on input line ...:
+Code labels for sorting:
+ firstaid
+Data structure for label rules:
+ firstaid = 0 ->
+Handled code for firstaid
+Update code for hook 'file/after/scrkbase.sty' on input line ...:
+Code labels for sorting:
+ firstaid
+Data structure for label rules:
+ firstaid = 0 ->
+Handled code for firstaid
+Update code for hook 'class/before/memoir' on input line ...:
+Code labels for sorting:
+ firstaid
+Data structure for label rules:
+ firstaid = 0 ->
+Handled code for firstaid
+ Update code for hook 'file/after/bigfoot.sty' on input line ...:
+Update code for hook 'para/before' on input line ...:
+Update code for hook 'para/after' on input line ...:
+Update code for hook 'para/begin' on input line ...:
+Update code for hook 'para/end' on input line ...:
All initialized (non-empty) hooks:
begindocument -> \typeout {legacy begindocument\on at line }\__hook_toplevel begindocument \__hook_next begindocument
rmfamily -> \typeout {legacy rmfamily\on at line }\__hook_toplevel rmfamily \__hook_next rmfamily
diff --cc base/testfiles-lthooks2/lthooks2-002.tlg
index ee55c38b,7a2a433b..7f1d5544
--- a/base/testfiles-lthooks2/lthooks2-002.tlg
+++ b/base/testfiles-lthooks2/lthooks2-002.tlg
@@@ -69,28 -67,7 +69,29 @@@ Code labels for sorting
Data structure for label rules:
firstaid = 0 ->
Handled code for firstaid
+Update code for hook 'file/after/CJK.sty' on input line ...:
+Code labels for sorting:
+ firstaid
+Data structure for label rules:
+ firstaid = 0 ->
+Handled code for firstaid
+Update code for hook 'file/after/scrkbase.sty' on input line ...:
+Code labels for sorting:
+ firstaid
+Data structure for label rules:
+ firstaid = 0 ->
+Handled code for firstaid
+Update code for hook 'class/before/memoir' on input line ...:
+Code labels for sorting:
+ firstaid
+Data structure for label rules:
+ firstaid = 0 ->
+Handled code for firstaid
+ Update code for hook 'file/after/bigfoot.sty' on input line ...:
+Update code for hook 'para/before' on input line ...:
+Update code for hook 'para/after' on input line ...:
+Update code for hook 'para/begin' on input line ...:
+Update code for hook 'para/end' on input line ...:
All initialized (non-empty) hooks:
enddocument/info -> \@dofilelist \@enddocument at kernel@warnings \__hook_toplevel enddocument/info \__hook_next enddocument/info
shipout/firstpage -> \__kernel_backend_literal:n {header=l3backend-dvips.pro}\__hook_toplevel shipout/firstpage \__hook_next shipout/firstpage
diff --cc base/testfiles-lthooks2/lthooks2-005.tlg
index 75deb1e7,b8c5f2bd..cea79ea4
--- a/base/testfiles-lthooks2/lthooks2-005.tlg
+++ b/base/testfiles-lthooks2/lthooks2-005.tlg
@@@ -62,28 -60,7 +62,29 @@@ Code labels for sorting
Data structure for label rules:
firstaid = 0 ->
Handled code for firstaid
+Update code for hook 'file/after/CJK.sty' on input line ...:
+Code labels for sorting:
+ firstaid
+Data structure for label rules:
+ firstaid = 0 ->
+Handled code for firstaid
+Update code for hook 'file/after/scrkbase.sty' on input line ...:
+Code labels for sorting:
+ firstaid
+Data structure for label rules:
+ firstaid = 0 ->
+Handled code for firstaid
+Update code for hook 'class/before/memoir' on input line ...:
+Code labels for sorting:
+ firstaid
+Data structure for label rules:
+ firstaid = 0 ->
+Handled code for firstaid
+ Update code for hook 'file/after/bigfoot.sty' on input line ...:
+Update code for hook 'para/before' on input line ...:
+Update code for hook 'para/after' on input line ...:
+Update code for hook 'para/begin' on input line ...:
+Update code for hook 'para/end' on input line ...:
All initialized (non-empty) hooks:
enddocument/info -> \@dofilelist \@enddocument at kernel@warnings \__hook_toplevel enddocument/info \__hook_next enddocument/info
shipout/firstpage -> \__kernel_backend_literal:n {header=l3backend-dvips.pro}\__hook_toplevel shipout/firstpage \__hook_next shipout/firstpage
@@@ -156,28 -128,7 +157,29 @@@ Code labels for sorting
Data structure for label rules:
firstaid = 0 ->
Handled code for firstaid
+Update code for hook 'file/after/CJK.sty' on input line ...:
+Code labels for sorting:
+ firstaid
+Data structure for label rules:
+ firstaid = 0 ->
+Handled code for firstaid
+Update code for hook 'file/after/scrkbase.sty' on input line ...:
+Code labels for sorting:
+ firstaid
+Data structure for label rules:
+ firstaid = 0 ->
+Handled code for firstaid
+Update code for hook 'class/before/memoir' on input line ...:
+Code labels for sorting:
+ firstaid
+Data structure for label rules:
+ firstaid = 0 ->
+Handled code for firstaid
+ Update code for hook 'file/after/bigfoot.sty' on input line ...:
+Update code for hook 'para/before' on input line ...:
+Update code for hook 'para/after' on input line ...:
+Update code for hook 'para/begin' on input line ...:
+Update code for hook 'para/end' on input line ...:
Update code for hook 'some-hook' on input line ...:
Code labels for sorting:
my-package and other-package
diff --cc required/firstaid/changes.txt
index 24b6eae4,c97129e3..d7823c21
--- a/required/firstaid/changes.txt
+++ b/required/firstaid/changes.txt
@@@ -1,10 -1,11 +1,18 @@@
+ 2021-03-15 Frank Mittelbach <Frank.Mittelbach at latex-project.org>
+
+ * latex2e-first-aid-for-external-files.dtx:
+ bigfoot incorrectly assumes insertions being ordered, so this is
+ enforced for now.
+ We also fix \FN at 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 at 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 at latex-project.org>
* latex2e-first-aid-for-external-files.dtx:
diff --cc required/firstaid/firstaid.ins
index 6a1dbaa8,ec0c5c8b..cd5ea200
--- a/required/firstaid/firstaid.ins
+++ b/required/firstaid/firstaid.ins
@@@ -3,8 -3,8 +3,8 @@@
%% driver files from the doc files in this package when run through
%% LaTeX or TeX.
%%
- %% Copyright (C) 2020,2021
+ %% Copyright (C) 2020-2021
-%% The LaTeX3 Project and any individual authors listed elsewhere
+%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
%% This file is part of the Standard LaTeX `First Aid Bundle'.
diff --cc required/firstaid/latex2e-first-aid-for-external-files.dtx
index a74cb79a,1aa86ea8..7eb10841
--- a/required/firstaid/latex2e-first-aid-for-external-files.dtx
+++ b/required/firstaid/latex2e-first-aid-for-external-files.dtx
@@@ -110,8 -111,8 +111,8 @@@
% \end{macrocode}
%
% \begin{macrocode}
- \def\LaTeXFirstAidDate{2021/02/24}
- \def\LaTeXFirstAidVersion{v1.0k}
+ \def\LaTeXFirstAidDate{2021/03/15}
-\def\LaTeXFirstAidVersion{v1.0j}
++\def\LaTeXFirstAidVersion{v1.0l}
% \end{macrocode}
%
% \begin{macrocode}
@@@ -397,116 -398,42 +398,154 @@@
% \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 at 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 at selectfont\selectfont
+% \end{macrocode}
+%
+% \begin{macrocode}
+\AddToHook{file/after/CJK.sty}[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.
+%
+% \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
+ % \cs{newinsert} allocations have a recognisable order in their
+ % numbers, the second one has a lower number. This was correct in
+ % the classic \TeX{} implementation but with the extended
+ % allocation possibilities of all modern engines is no longer the
+ % case and there is a point where the allocations take a ``jump''
+ % breaking the odering assumption. These days we are fairly close
+ % to that point and depending on how many packages are loaded
+ % before \pkg{bigfoot} the package breaks.
+ %
+ % This firstaid therefore jumps over the problematical point by
+ % pushing the count allocation to a safe value if necessary.
+ % \begin{macrocode}
+ \AddToHook{file/after/bigfoot.sty}{%
+ \ifnum\count10<\insc at unt
+ \global\count10=\insc at unt
+ \fi
+ % \end{macrocode}
+ % We also correct a bug that \pkg{bigfoot} tries to shift mark
+ % registers, but in \LaTeX{} (at least since 2015) the allocation
+ % number is not 266, so it does that to a random number of mark
+ % registers (which sometimes blows up depending on the value in 266).
+ % \begin{macrocode}
+ \def\FN at allmarks#1{\@elt{#1}%
+ \ifnum#1<\count256 %<--- problem: 266 isn't the counter for marks
+ \expandafter\FN at allmarks\expandafter{\number\numexpr#1+\@ne}%
+ \fi}%
+ }
+ % \end{macrocode}
+ %
+ %
+ %
+ %
-%
% \subsection[Temporary fixes for the kernel (until the next
% patch-level release)]
% {Temporary fixes for the kernel \\
diff --cc support/texlive.sh
index b1e8914e,2bf9f0c7..c0bd8b74
--- a/support/texlive.sh
+++ b/support/texlive.sh
@@@ -60,11 -60,12 +60,13 @@@ tlmgr install
# special testing
tlmgr install \
bidi \
+ bigfoot \
+ ncctools \
dinbrief \
- pgfmorepages \
+ everyshi \
+ filehook \
pgf \
- filehook
+ pgfmorepages
# Additional support for typesetting
tlmgr install \
More information about the latex3-commits
mailing list.