[latex3-commits] [latex3/latex2e] develop: Fix #1243 (#1254) (aa691a7a)

[github at latex-project.org]

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

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

commit aa691a7a6529319708861d3df03e1627dc30fd4b
Author: LAURENS Jérôme <jerome.laurens at u-bourgogne.fr>
Date:   Tue Jan 30 19:44:31 2024 +0100

    Fix #1243 (#1254)
    
    * Test file to demonstrate the #1243 issue
    
    * Fixed


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

aa691a7a6529319708861d3df03e1627dc30fd4b
 base/changes.txt                        |  4 ++++
 base/lthooks.dtx                        | 12 ++++++++----
 base/testfiles-lthooks/github-1243a.lvt | 12 ++++++++++++
 base/testfiles-lthooks/github-1243a.tlg |  7 +++++++
 base/testfiles-lthooks/github-1243b.lvt | 12 ++++++++++++
 base/testfiles-lthooks/github-1243b.tlg |  7 +++++++
 6 files changed, 50 insertions(+), 4 deletions(-)

diff --git a/base/changes.txt b/base/changes.txt
index 595ce18a..5e5efb6c 100644
--- a/base/changes.txt
+++ b/base/changes.txt
@@ -6,6 +6,10 @@ to completeness or accuracy and it contains some references to files that are
 not part of the distribution.
 ================================================================================
 
+2024-01-30  Jérôme Laurens  <jerome.laurens at u-bourgogn.fr>
+	* lthooks.dtx:
+	Fix rollback to 2020-10-01.
+
 2024-01-29  Frank Mittelbach  <Frank.Mittelbach at latex-project.org>
 
 	* ltmarks.dtx:
diff --git a/base/lthooks.dtx b/base/lthooks.dtx
index 117cc724..08f0d9ea 100644
--- a/base/lthooks.dtx
+++ b/base/lthooks.dtx
@@ -31,8 +31,8 @@
 %%% From File: lthooks.dtx
 %
 %    \begin{macrocode}
-\def\lthooksversion{v1.1g}
-\def\lthooksdate{2024/01/17}
+\def\lthooksversion{v1.1h}
+\def\lthooksdate{2024/01/24}
 %    \end{macrocode}
 %
 %<*driver>
@@ -3942,10 +3942,12 @@
 %
 % \changes{v1.0s}{2021/09/28}
 %                {Correct usage of older \cs{@@_if_file_hook:wTF} (gh/675)}
+% \changes{v1.1h}{2024/01/24}
+%                {Correct usage of older \cs{@@_if_file_hook:wTF} (gh/1243)}
 %    \begin{macrocode}
 %<latexrelease>\cs_new_protected:Npn \@@_try_declaring_generic_hook:nNNnn #1
 %<latexrelease>  {
-%<latexrelease>    \@@_if_file_hook:wTF #1 / \s_@@_mark
+%<latexrelease>    \@@_if_file_hook:wTF #1 / / \s_@@_mark
 %<latexrelease>      {
 %<latexrelease>        \exp_args:Ne
 %<latexrelease>        \@@_try_declaring_generic_hook_split:nNNnn
@@ -6785,10 +6787,12 @@
 %
 % \changes{v1.0s}{2021/09/28}
 %                {Correct usage of older \cs{@@_if_file_hook:wTF} (gh/675)}
+% \changes{v1.1h}{2024/01/24}
+%                {Correct usage of older \cs{@@_if_file_hook:wTF} (gh/1243)}
 %    \begin{macrocode}
 %<latexrelease>\cs_new_protected:Npn \@@_try_file_hook:n #1
 %<latexrelease>  {
-%<latexrelease>    \@@_if_file_hook:wTF #1 / \s_@@_mark
+%<latexrelease>    \@@_if_file_hook:wTF #1 / / \s_@@_mark
 %<latexrelease>      {
 %<latexrelease>        \exp_args:Ne \@@_if_usable_use:n
 %<latexrelease>          { \exp_args:Ne \@@_file_hook_normalize:n {#1} }
diff --git a/base/testfiles-lthooks/github-1243a.lvt b/base/testfiles-lthooks/github-1243a.lvt
new file mode 100644
index 00000000..6ae72ff5
--- /dev/null
+++ b/base/testfiles-lthooks/github-1243a.lvt
@@ -0,0 +1,12 @@
+\RequirePackage[2020-10-01]{latexrelease}
+
+\input{regression-test}
+
+\START
+
+\BEGINTEST{Broken in 2020//10//01 release}
+\AddToHook{Undeclared hook}{...}
+\TYPE{PASSED}
+\ENDTEST
+
+\END
diff --git a/base/testfiles-lthooks/github-1243a.tlg b/base/testfiles-lthooks/github-1243a.tlg
new file mode 100644
index 00000000..53d77844
--- /dev/null
+++ b/base/testfiles-lthooks/github-1243a.tlg
@@ -0,0 +1,7 @@
+This is a generated file for the l3build validation system.
+Don't change this file in any respect.
+============================================================
+TEST 1: Broken in 2020//10//01 release
+============================================================
+PASSED
+============================================================
diff --git a/base/testfiles-lthooks/github-1243b.lvt b/base/testfiles-lthooks/github-1243b.lvt
new file mode 100644
index 00000000..9a3f557b
--- /dev/null
+++ b/base/testfiles-lthooks/github-1243b.lvt
@@ -0,0 +1,12 @@
+\RequirePackage[2021/09/28]{latexrelease}
+
+\input{regression-test}
+
+\START
+
+\BEGINTEST{Broken in 2021//09//28 release}
+\UseHook{file}
+\TYPE{PASSED}
+\ENDTEST
+
+\END
diff --git a/base/testfiles-lthooks/github-1243b.tlg b/base/testfiles-lthooks/github-1243b.tlg
new file mode 100644
index 00000000..d6dcd917
--- /dev/null
+++ b/base/testfiles-lthooks/github-1243b.tlg
@@ -0,0 +1,7 @@
+This is a generated file for the l3build validation system.
+Don't change this file in any respect.
+============================================================
+TEST 1: Broken in 2021//09//28 release
+============================================================
+PASSED
+============================================================