Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #1243 #1254

Merged
merged 3 commits into from
Jan 30, 2024
Merged

Fix #1243 #1254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c23d36f
Test file to demonstrate the #1243 issue
jlaurens Jan 24, 2024
e064f55
Fixed
jlaurens Jan 24, 2024
4733374
Merge branch 'develop' into Fix-#1243
jlaurens Jan 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions base/changes.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>
* lthooks.dtx:
Fix rollback to 2020-10-01.

2024-01-29 Frank Mittelbach <[email protected]>

* ltmarks.dtx:
Expand Down
12 changes: 8 additions & 4 deletions base/lthooks.dtx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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} }
Expand Down
12 changes: 12 additions & 0 deletions base/testfiles-lthooks/github-1243a.lvt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
7 changes: 7 additions & 0 deletions base/testfiles-lthooks/github-1243a.tlg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
============================================================
12 changes: 12 additions & 0 deletions base/testfiles-lthooks/github-1243b.lvt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
7 changes: 7 additions & 0 deletions base/testfiles-lthooks/github-1243b.tlg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
============================================================