[latex3-commits] [git/LaTeX3-latex3-latex2e] hotfix/bigfoot: slightly different implementation (c5e856d2)

Frank Mittelbach frank.mittelbach at latex-project.org
Tue Mar 16 11:05:24 CET 2021 

Repository : https://github.com/latex3/latex2e
On branch  : hotfix/bigfoot
Link       : https://github.com/latex3/latex2e/commit/c5e856d200598866eb12febaeaaa964b72188968

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

commit c5e856d200598866eb12febaeaaa964b72188968
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date:   Tue Mar 16 11:05:24 2021 +0100

    slightly different implementation


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

c5e856d200598866eb12febaeaaa964b72188968
 base/testfiles-lthooks/lthooks-000.tlg                     | 2 +-
 base/testfiles-lthooks/lthooks-001.tlg                     | 6 +++---
 base/testfiles-lthooks/lthooks-002.tlg                     | 6 +++---
 base/testfiles-lthooks/lthooks-003.tlg                     | 4 ++--
 base/testfiles-lthooks/lthooks-004.tlg                     | 4 ++--
 base/testfiles-lthooks/lthooks-005.tlg                     | 4 ++--
 base/testfiles-lthooks/lthooks-006.tlg                     | 4 ++--
 base/testfiles-lthooks/lthooks-007.tlg                     | 6 +++---
 base/testfiles-lthooks/lthooks-008.tlg                     | 4 ++--
 base/testfiles-lthooks/lthooks-009.tlg                     | 2 +-
 base/testfiles-lthooks/lthooks-011.tlg                     | 8 ++++----
 base/testfiles-lthooks/lthooks-013.tlg                     | 2 +-
 base/testfiles-lthooks/lthooks-021.tlg                     | 2 +-
 base/testfiles-lthooks/lthooks-legacy.tlg                  | 2 +-
 base/testfiles-lthooks2/lthooks2-002.tlg                   | 2 +-
 base/testfiles-lthooks2/lthooks2-005.tlg                   | 4 ++--
 required/firstaid/latex2e-first-aid-for-external-files.dtx | 9 +++------
 17 files changed, 34 insertions(+), 37 deletions(-)

diff --git a/base/testfiles-lthooks/lthooks-000.tlg b/base/testfiles-lthooks/lthooks-000.tlg
index ebbccf82..0314f6e7 100644
--- a/base/testfiles-lthooks/lthooks-000.tlg
+++ b/base/testfiles-lthooks/lthooks-000.tlg
@@ -59,7 +59,7 @@ Code labels for sorting:
 Data structure for label rules:
  firstaid = 0 -> 
 Handled code for firstaid
-Update code for hook 'file/before/bigfoot.sty' on input line ...:
+Update code for hook 'file/after/bigfoot.sty' 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 --git a/base/testfiles-lthooks/lthooks-001.tlg b/base/testfiles-lthooks/lthooks-001.tlg
index d39987f6..bd031bba 100644
--- a/base/testfiles-lthooks/lthooks-001.tlg
+++ b/base/testfiles-lthooks/lthooks-001.tlg
@@ -65,7 +65,7 @@ Code labels for sorting:
 Data structure for label rules:
  firstaid = 0 -> 
 Handled code for firstaid
-Update code for hook 'file/before/bigfoot.sty' on input line ...:
+Update code for hook 'file/after/bigfoot.sty' on input line ...:
 Update code for hook 'xxx' on input line ...:
 Code labels for sorting:
  label1 and label2
@@ -112,7 +112,7 @@ The sequence \g__hook_all_seq contains the items (without outer braces):
 >  {file/after/dinbrief.cls}
 >  {file/after/pgfpages.sty}
 >  {file/after/pgfmorepages.sty}
->  {file/before/bigfoot.sty}
+>  {file/after/bigfoot.sty}
 >  {xxx}.
 Update code for hook 'begindocument' on input line ...:
 Update code for hook 'begindocument/before' on input line ...:
@@ -173,7 +173,7 @@ Code labels for sorting:
 Data structure for label rules:
  firstaid = 0 -> 
 Handled code for firstaid
-Update code for hook 'file/before/bigfoot.sty' on input line ...:
+Update code for hook 'file/after/bigfoot.sty' on input line ...:
 Update code for hook 'xxx' on input line ...:
 Code labels for sorting:
  label1
diff --git a/base/testfiles-lthooks/lthooks-002.tlg b/base/testfiles-lthooks/lthooks-002.tlg
index 1c76279b..a285197d 100644
--- a/base/testfiles-lthooks/lthooks-002.tlg
+++ b/base/testfiles-lthooks/lthooks-002.tlg
@@ -65,7 +65,7 @@ Code labels for sorting:
 Data structure for label rules:
  firstaid = 0 -> 
 Handled code for firstaid
-Update code for hook 'file/before/bigfoot.sty' on input line ...:
+Update code for hook 'file/after/bigfoot.sty' on input line ...:
 Update code for hook 'xxx' on input line ...:
 Code labels for sorting:
  label1 and label2
@@ -114,7 +114,7 @@ The sequence \g__hook_all_seq contains the items (without outer braces):
 >  {file/after/dinbrief.cls}
 >  {file/after/pgfpages.sty}
 >  {file/after/pgfmorepages.sty}
->  {file/before/bigfoot.sty}
+>  {file/after/bigfoot.sty}
 >  {xxx}.
 Update code for hook 'begindocument' on input line ...:
 Update code for hook 'begindocument/before' on input line ...:
@@ -175,7 +175,7 @@ Code labels for sorting:
 Data structure for label rules:
  firstaid = 0 -> 
 Handled code for firstaid
-Update code for hook 'file/before/bigfoot.sty' on input line ...:
+Update code for hook 'file/after/bigfoot.sty' on input line ...:
 Update code for hook 'xxx' on input line ...:
 Code labels for sorting:
  label1
diff --git a/base/testfiles-lthooks/lthooks-003.tlg b/base/testfiles-lthooks/lthooks-003.tlg
index 4754dfa3..7fb59e6e 100644
--- a/base/testfiles-lthooks/lthooks-003.tlg
+++ b/base/testfiles-lthooks/lthooks-003.tlg
@@ -47,7 +47,7 @@ The sequence \g__hook_all_seq contains the items (without outer braces):
 >  {file/after/dinbrief.cls}
 >  {file/after/pgfpages.sty}
 >  {file/after/pgfmorepages.sty}
->  {file/before/bigfoot.sty}
+>  {file/after/bigfoot.sty}
 >  {xxx}.
 The hook xxx contains the rules:
 >  {label3|label1}  =>  {>}
@@ -119,7 +119,7 @@ Code labels for sorting:
 Data structure for label rules:
  firstaid = 0 -> 
 Handled code for firstaid
-Update code for hook 'file/before/bigfoot.sty' on input line ...:
+Update code for hook 'file/after/bigfoot.sty' on input line ...:
 Update code for hook 'xxx' on input line ...:
   normal rule label3|label1: > found
   normal rule label6|label4: > found
diff --git a/base/testfiles-lthooks/lthooks-004.tlg b/base/testfiles-lthooks/lthooks-004.tlg
index 60d06f8b..8d991319 100644
--- a/base/testfiles-lthooks/lthooks-004.tlg
+++ b/base/testfiles-lthooks/lthooks-004.tlg
@@ -37,7 +37,7 @@ The sequence \g__hook_all_seq contains the items (without outer braces):
 >  {file/after/dinbrief.cls}
 >  {file/after/pgfpages.sty}
 >  {file/after/pgfmorepages.sty}
->  {file/before/bigfoot.sty}
+>  {file/after/bigfoot.sty}
 >  {xxx}.
 The hook xxx contains the rules:
 >  {label2|label1}  =>  {>}
@@ -103,7 +103,7 @@ Code labels for sorting:
 Data structure for label rules:
  firstaid = 0 -> 
 Handled code for firstaid
-Update code for hook 'file/before/bigfoot.sty' on input line ...:
+Update code for hook 'file/after/bigfoot.sty' on input line ...:
 Update code for hook 'xxx' on input line ...:
   normal rule label2|label1: > found
   normal rule label3|label1: < found
diff --git a/base/testfiles-lthooks/lthooks-005.tlg b/base/testfiles-lthooks/lthooks-005.tlg
index 45f269dc..0d95c45c 100644
--- a/base/testfiles-lthooks/lthooks-005.tlg
+++ b/base/testfiles-lthooks/lthooks-005.tlg
@@ -54,7 +54,7 @@ The sequence \g__hook_all_seq contains the items (without outer braces):
 >  {file/after/dinbrief.cls}
 >  {file/after/pgfpages.sty}
 >  {file/after/pgfmorepages.sty}
->  {file/before/bigfoot.sty}
+>  {file/after/bigfoot.sty}
 >  {xxx}.
 The hook xxx contains the rules:
 >  {label3|label1}  =>  {>}
@@ -126,7 +126,7 @@ Code labels for sorting:
 Data structure for label rules:
  firstaid = 0 -> 
 Handled code for firstaid
-Update code for hook 'file/before/bigfoot.sty' on input line ...:
+Update code for hook 'file/after/bigfoot.sty' on input line ...:
 Update code for hook 'xxx' on input line ...:
   normal rule label3|label1: > found
   normal rule label6|label4: > found
diff --git a/base/testfiles-lthooks/lthooks-006.tlg b/base/testfiles-lthooks/lthooks-006.tlg
index 30b15bfd..9858eab5 100644
--- a/base/testfiles-lthooks/lthooks-006.tlg
+++ b/base/testfiles-lthooks/lthooks-006.tlg
@@ -35,7 +35,7 @@ The sequence \g__hook_all_seq contains the items (without outer braces):
 >  {file/after/dinbrief.cls}
 >  {file/after/pgfpages.sty}
 >  {file/after/pgfmorepages.sty}
->  {file/before/bigfoot.sty}
+>  {file/after/bigfoot.sty}
 >  {xxx}.
 The hook xxx contains the rules:
 >  {label2|label1}  =>  {xW}
@@ -99,7 +99,7 @@ Code labels for sorting:
 Data structure for label rules:
  firstaid = 0 -> 
 Handled code for firstaid
-Update code for hook 'file/before/bigfoot.sty' on input line ...:
+Update code for hook 'file/after/bigfoot.sty' 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 --git a/base/testfiles-lthooks/lthooks-007.tlg b/base/testfiles-lthooks/lthooks-007.tlg
index a35f0cbe..76379ba4 100644
--- a/base/testfiles-lthooks/lthooks-007.tlg
+++ b/base/testfiles-lthooks/lthooks-007.tlg
@@ -35,7 +35,7 @@ The sequence \g__hook_all_seq contains the items (without outer braces):
 >  {file/after/dinbrief.cls}
 >  {file/after/pgfpages.sty}
 >  {file/after/pgfmorepages.sty}
->  {file/before/bigfoot.sty}
+>  {file/after/bigfoot.sty}
 >  {xxx}.
 The hook xxx contains the rules:
 >  {label2|label1}  =>  {<-}
@@ -100,7 +100,7 @@ Code labels for sorting:
 Data structure for label rules:
  firstaid = 0 -> 
 Handled code for firstaid
-Update code for hook 'file/before/bigfoot.sty' on input line ...:
+Update code for hook 'file/after/bigfoot.sty' 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'
@@ -182,7 +182,7 @@ Code labels for sorting:
 Data structure for label rules:
  firstaid = 0 -> 
 Handled code for firstaid
-Update code for hook 'file/before/bigfoot.sty' on input line ...:
+Update code for hook 'file/after/bigfoot.sty' 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 --git a/base/testfiles-lthooks/lthooks-008.tlg b/base/testfiles-lthooks/lthooks-008.tlg
index 558f8146..fe901850 100644
--- a/base/testfiles-lthooks/lthooks-008.tlg
+++ b/base/testfiles-lthooks/lthooks-008.tlg
@@ -37,7 +37,7 @@ The sequence \g__hook_all_seq contains the items (without outer braces):
 >  {file/after/dinbrief.cls}
 >  {file/after/pgfpages.sty}
 >  {file/after/pgfmorepages.sty}
->  {file/before/bigfoot.sty}.
+>  {file/after/bigfoot.sty}.
 The hook enddocument contains the rules:
 Update code for hook 'begindocument' on input line ...:
 Update code for hook 'begindocument/before' on input line ...:
@@ -107,7 +107,7 @@ Code labels for sorting:
 Data structure for label rules:
  firstaid = 0 -> 
 Handled code for firstaid
-Update code for hook 'file/before/bigfoot.sty' on input line ...:
+Update code for hook 'file/after/bigfoot.sty' 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 --git a/base/testfiles-lthooks/lthooks-009.tlg b/base/testfiles-lthooks/lthooks-009.tlg
index 32b5bf49..1bbeed0d 100644
--- a/base/testfiles-lthooks/lthooks-009.tlg
+++ b/base/testfiles-lthooks/lthooks-009.tlg
@@ -65,7 +65,7 @@ Code labels for sorting:
 Data structure for label rules:
  firstaid = 0 -> 
 Handled code for firstaid
-Update code for hook 'file/before/bigfoot.sty' on input line ...:
+Update code for hook 'file/after/bigfoot.sty' 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 --git a/base/testfiles-lthooks/lthooks-011.tlg b/base/testfiles-lthooks/lthooks-011.tlg
index d90763a4..ada581e8 100644
--- a/base/testfiles-lthooks/lthooks-011.tlg
+++ b/base/testfiles-lthooks/lthooks-011.tlg
@@ -60,7 +60,7 @@ Code labels for sorting:
 Data structure for label rules:
  firstaid = 0 -> 
 Handled code for firstaid
-Update code for hook 'file/before/bigfoot.sty' on input line ...:
+Update code for hook 'file/after/bigfoot.sty' on input line ...:
 Update code for hook 'xxx' on input line ...:
 Code labels for sorting:
  front
@@ -140,7 +140,7 @@ Code labels for sorting:
 Data structure for label rules:
  firstaid = 0 -> 
 Handled code for firstaid
-Update code for hook 'file/before/bigfoot.sty' on input line ...:
+Update code for hook 'file/after/bigfoot.sty' on input line ...:
 Update code for hook 'xxx' on input line ...:
 Code labels for sorting:
  front and rear
@@ -222,7 +222,7 @@ Code labels for sorting:
 Data structure for label rules:
  firstaid = 0 -> 
 Handled code for firstaid
-Update code for hook 'file/before/bigfoot.sty' on input line ...:
+Update code for hook 'file/after/bigfoot.sty' on input line ...:
 Update code for hook 'xxx' on input line ...:
 Code labels for sorting:
  front, rear and labels
@@ -306,7 +306,7 @@ Code labels for sorting:
 Data structure for label rules:
  firstaid = 0 -> 
 Handled code for firstaid
-Update code for hook 'file/before/bigfoot.sty' on input line ...:
+Update code for hook 'file/after/bigfoot.sty' on input line ...:
 Update code for hook 'xxx' on input line ...:
 Code labels for sorting:
  front, rear, labels and return
diff --git a/base/testfiles-lthooks/lthooks-013.tlg b/base/testfiles-lthooks/lthooks-013.tlg
index 6c60c865..84f72e69 100644
--- a/base/testfiles-lthooks/lthooks-013.tlg
+++ b/base/testfiles-lthooks/lthooks-013.tlg
@@ -114,7 +114,7 @@ Code labels for sorting:
 Data structure for label rules:
  firstaid = 0 -> 
 Handled code for firstaid
-Update code for hook 'file/before/bigfoot.sty' on input line ...:
+Update code for hook 'file/after/bigfoot.sty' on input line ...:
 Update code for hook 'env/itemize/begin' on input line ...:
 Code labels for sorting:
  foo
diff --git a/base/testfiles-lthooks/lthooks-021.tlg b/base/testfiles-lthooks/lthooks-021.tlg
index bba917b9..406dc2a9 100644
--- a/base/testfiles-lthooks/lthooks-021.tlg
+++ b/base/testfiles-lthooks/lthooks-021.tlg
@@ -59,7 +59,7 @@ Code labels for sorting:
 Data structure for label rules:
  firstaid = 0 -> 
 Handled code for firstaid
-Update code for hook 'file/before/bigfoot.sty' on input line ...:
+Update code for hook 'file/after/bigfoot.sty' 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 --git a/base/testfiles-lthooks/lthooks-legacy.tlg b/base/testfiles-lthooks/lthooks-legacy.tlg
index 166f4dcf..c46a4c63 100644
--- a/base/testfiles-lthooks/lthooks-legacy.tlg
+++ b/base/testfiles-lthooks/lthooks-legacy.tlg
@@ -84,7 +84,7 @@ Code labels for sorting:
 Data structure for label rules:
  firstaid = 0 -> 
 Handled code for firstaid
-Update code for hook 'file/before/bigfoot.sty' on input line ...:
+Update code for hook 'file/after/bigfoot.sty' 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 --git a/base/testfiles-lthooks2/lthooks2-002.tlg b/base/testfiles-lthooks2/lthooks2-002.tlg
index 131167d1..7a2a433b 100644
--- a/base/testfiles-lthooks2/lthooks2-002.tlg
+++ b/base/testfiles-lthooks2/lthooks2-002.tlg
@@ -67,7 +67,7 @@ Code labels for sorting:
 Data structure for label rules:
  firstaid = 0 -> 
 Handled code for firstaid
-Update code for hook 'file/before/bigfoot.sty' on input line ...:
+Update code for hook 'file/after/bigfoot.sty' 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 --git a/base/testfiles-lthooks2/lthooks2-005.tlg b/base/testfiles-lthooks2/lthooks2-005.tlg
index 9189bdf0..b8c5f2bd 100644
--- a/base/testfiles-lthooks2/lthooks2-005.tlg
+++ b/base/testfiles-lthooks2/lthooks2-005.tlg
@@ -60,7 +60,7 @@ Code labels for sorting:
 Data structure for label rules:
  firstaid = 0 -> 
 Handled code for firstaid
-Update code for hook 'file/before/bigfoot.sty' on input line ...:
+Update code for hook 'file/after/bigfoot.sty' 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  
@@ -128,7 +128,7 @@ Code labels for sorting:
 Data structure for label rules:
  firstaid = 0 -> 
 Handled code for firstaid
-Update code for hook 'file/before/bigfoot.sty' on input line ...:
+Update code for hook 'file/after/bigfoot.sty' on input line ...:
 Update code for hook 'some-hook' on input line ...:
 Code labels for sorting:
  my-package and other-package
diff --git a/required/firstaid/latex2e-first-aid-for-external-files.dtx b/required/firstaid/latex2e-first-aid-for-external-files.dtx
index dd844590..f2a3b4e9 100644
--- a/required/firstaid/latex2e-first-aid-for-external-files.dtx
+++ b/required/firstaid/latex2e-first-aid-for-external-files.dtx
@@ -412,10 +412,9 @@
 %    This firstaid therefore jumps over the problematical point by
 %    pushing the count allocation to a safe value if necessary.
 %    \begin{macrocode}
-\AddToHook{file/before/bigfoot.sty}{%
-   \ifnum\count10>188 %
-   \else
-     \global\count10=189 %
+\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
@@ -423,12 +422,10 @@
 %    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}
-  \AtEndOfPackage{%
     \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}
 %

More information about the latex3-commits mailing list.