[latex3-commits] [git/LaTeX3-latex3-latex2e] gh625: Drop rollback for \RemoveFromHook behaviour change (c5115dd4)
PhelypeOleinik
phelype.oleinik at latex-project.org
Thu Aug 5 06:09:36 CEST 2021
Repository : https://github.com/latex3/latex2e
On branch : gh625
Link : https://github.com/latex3/latex2e/commit/c5115dd467ba50ec22e6f346c45a5af27f332fa9
>---------------------------------------------------------------
commit c5115dd467ba50ec22e6f346c45a5af27f332fa9
Author: PhelypeOleinik <phelype.oleinik at latex-project.org>
Date: Thu Aug 5 01:09:36 2021 -0300
Drop rollback for \RemoveFromHook behaviour change
>---------------------------------------------------------------
c5115dd467ba50ec22e6f346c45a5af27f332fa9
base/lthooks.dtx | 142 ---------------------
base/testfiles/github-0479-often.tlg | 4 -
.../tlb-latexrelease-rollback-003-often.tlg | 8 --
base/testfiles/tlb-rollback-004-often.tlg | 4 -
base/testfiles/tlb-rollback-005.tlg | 4 -
5 files changed, 162 deletions(-)
diff --git a/base/lthooks.dtx b/base/lthooks.dtx
index 8c9c0f3e..000d7d41 100644
--- a/base/lthooks.dtx
+++ b/base/lthooks.dtx
@@ -2764,11 +2764,6 @@
% \begin{macro}{\hook_gput_code:nnn}
% \begin{macro}{\@@_gput_code:nnn,\@@_hook_gput_code_do:nnn}
%
-% \begin{macrocode}
-%<latexrelease>\IncludeInRelease{2021/11/15}%
-%<latexrelease> {\hook_gput_code:nnn}{Do~not~queue~removals}
-% \end{macrocode}
-%
% With \cs{hook_gput_code:nnn}\Arg{hook}\Arg{label}\Arg{code} a
% chunk of \meta{code} is added to an existing \meta{hook} labeled
% with \meta{label}.
@@ -2820,45 +2815,6 @@
}
% \end{macrocode}
%
-% \begin{macrocode}
-%<latexrelease>\EndIncludeInRelease
-%
-%<latexrelease>\IncludeInRelease{2020/10/01}%
-%<latexrelease> {\hook_gput_code:nnn}{Do~not~queue~removals}
-% \end{macrocode}
-%
-% \begin{macro}{\g_@@_removal_list_prop}
-% A token list to hold delayed removals.
-% \begin{macrocode}
-%<latexrelease>\tl_new:N \g_@@_removal_list_tl
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macrocode}
-%<latexrelease>\cs_new_protected:Npn \@@_gput_code:nnn #1 #2 #3
-%<latexrelease> {
-%<latexrelease> \prop_if_in:NnTF \g_@@_execute_immediately_prop {#1}
-%<latexrelease> {#3}
-%<latexrelease> {
-%<latexrelease> \@@_if_marked_removal:nnTF {#1} {#2}
-%<latexrelease> { \@@_unmark_removal:nn {#1} {#2} }
-%<latexrelease> {
-%<latexrelease> \@@_if_usable:nTF {#1}
-%<latexrelease> {
-%<latexrelease> \@@_hook_gput_code_do:nnn {#1} {#2} {#3}
-%<latexrelease> \@@_update_hook_code:n {#1}
-%<latexrelease> }
-%<latexrelease> {
-%<latexrelease> \@@_if_disabled:nTF {#1}
-%<latexrelease> { \msg_error:nnn { hooks } { hook-disabled } {#1} }
-%<latexrelease> { \@@_try_declaring_generic_hook:nnn {#1} {#2} {#3} }
-%<latexrelease> }
-%<latexrelease> }
-%<latexrelease> }
-%<latexrelease> }
-%<latexrelease>\EndIncludeInRelease
-% \end{macrocode}
-%
% This macro will unconditionally add a chunk of code to the given hook.
% \begin{macrocode}
\cs_new_protected:Npn \@@_hook_gput_code_do:nnn #1 #2 #3
@@ -3164,11 +3120,6 @@
% \begin{macro}{\hook_gremove_code:nn}
% \begin{macro}{\@@_gremove_code:nn}
%
-% \begin{macrocode}
-%<latexrelease>\IncludeInRelease{2021/11/15}%
-%<latexrelease> {\hook_gremove_code:nn}{Do~not~queue~removals}
-% \end{macrocode}
-%
% With \cs{hook_gremove_code:nn}\Arg{hook}\Arg{label} any code
% for \meta{hook} stored under \meta{label} is removed.
% \changes{v1.0o}{2021/07/22}{Do not queue removals (gh/625)}
@@ -3225,102 +3176,9 @@
{ \msg_warning:nnnn { hooks } { cannot-remove } {#1} {#2} }
}
% \end{macrocode}
-%
-% \begin{macrocode}
-%<latexrelease>\EndIncludeInRelease
-%<latexrelease>
-%<latexrelease>\IncludeInRelease{2020/10/01}%
-%<latexrelease> {\hook_gremove_code:nn}{Do~not~queue~removals}
-%<latexrelease>\cs_gset_protected:Npn \@@_gremove_code:nn #1 #2
-%<latexrelease> {
-%<latexrelease> \@@_if_structure_exist:nTF {#1}
-%<latexrelease> {
-%<latexrelease> \str_if_eq:nnTF {#2} {*}
-%<latexrelease> {
-%<latexrelease> \prop_gclear:c { g_@@_#1_code_prop }
-%<latexrelease> \@@_tl_gclear:c { @@_toplevel~#1 }
-%<latexrelease> \@@_tl_gclear:c { @@_next~#1 }
-%<latexrelease> }
-%<latexrelease> {
-%<latexrelease> \str_if_eq:nnTF {#2} { top-level }
-%<latexrelease> { \@@_tl_gclear:c { @@_toplevel~#1 } }
-%<latexrelease> {
-%<latexrelease> \prop_get:cnNTF { g_@@_#1_code_prop } {#2} \l_@@_return_tl
-%<latexrelease> { \@@_gremove_code_do:nn }
-%<latexrelease> { \@@_mark_removal:nn }
-%<latexrelease> {#1} {#2}
-%<latexrelease> }
-%<latexrelease> }
-%<latexrelease> \@@_if_usable:nT {#1}
-%<latexrelease> { \@@_update_hook_code:n {#1} }
-%<latexrelease> }
-%<latexrelease> { \@@_mark_removal:nn {#1} {#2} }
-%<latexrelease> }
-%<latexrelease>\cs_gset_protected:Npn \@@_gremove_code_do:nn #1 #2
-%<latexrelease> { \prop_gremove:cn { g_@@_#1_code_prop } {#2} }
-% \end{macrocode}
% \end{macro}
% \end{macro}
%
-% \begin{macro}{\@@_mark_removal:nn}
-% Marks \meta{label} (\verb=#2=) to be removed from \meta{hook}
-% (\verb=#1=). The number of removals should be fairly small, and
-% \cs{tl_gremove_once:Nx} is fairly efficient even for longer token
-% lists, so we use a single global token list, rather than one for
-% each hook.
-%
-% A hand-crafted token list is used here because property lists don't
-% hold repeated items, so multiple usages of \cs{@@_mark_removal:nn}
-% would be cancelled by a single \cs{@@_unmark_removal:nn}.
-% \begin{macrocode}
-%<latexrelease>\cs_new_protected:Npn \@@_mark_removal:nn #1 #2
-%<latexrelease> {
-%<latexrelease> \tl_gput_right:Nx \g_@@_removal_list_tl
-%<latexrelease> { \@@_removal_tl:nn {#1} {#2} }
-%<latexrelease> }
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\@@_unmark_removal:nn}
-% Unmarks \meta{label} (\verb=#2=) to be removed from \meta{hook}
-% (\verb=#1=). \cs{tl_gremove_once:Nx} is used rather than
-% \cs{tl_gremove_all:Nx} so that two additions are needed to cancel
-% two marked removals, rather than only one.
-% \begin{macrocode}
-%<latexrelease>\cs_new_protected:Npn \@@_unmark_removal:nn #1 #2
-%<latexrelease> {
-%<latexrelease> \tl_gremove_once:Nx \g_@@_removal_list_tl
-%<latexrelease> { \@@_removal_tl:nn {#1} {#2} }
-%<latexrelease> }
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}[TF]{\@@_if_marked_removal:nn}
-% Checks if the \cs{g_@@_removal_list_tl} contains the current
-% \meta{label} (\verb=#2=) and \meta{hook} (\verb=#1=).
-% \begin{macrocode}
-%<latexrelease>\prg_new_protected_conditional:Npnn \@@_if_marked_removal:nn #1 #2 { TF }
-%<latexrelease> {
-%<latexrelease> \exp_args:NNx \tl_if_in:NnTF \g_@@_removal_list_tl
-%<latexrelease> { \@@_removal_tl:nn {#1} {#2} }
-%<latexrelease> { \prg_return_true: } { \prg_return_false: }
-%<latexrelease> }
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}[rEXP]{\@@_removal_tl:nn}
-% Builds a token list with \verb=#1= and \verb=#2= which can only be
-% matched by \verb=#1= and \verb=#2=. The |&|$_4$ anchors a removal,
-% so that \verb=#1= can't be mistaken by \verb=#2= and vice versa, and
-% the two |$|$_3$ delimit the two arguments
-% \begin{macrocode}
-%<latexrelease>\cs_new:Npn \@@_removal_tl:nn #1 #2
-%<latexrelease> { & \tl_to_str:n {#2} $ \tl_to_str:n {#1} $ }
-%<latexrelease>\EndIncludeInRelease
-% \end{macrocode}
-% \end{macro}
-%
-%
% \begin{macro}{
% \g_@@_??_code_prop,
% \@@~??,
diff --git a/base/testfiles/github-0479-often.tlg b/base/testfiles/github-0479-often.tlg
index 9b1c20b6..59a12e0b 100644
--- a/base/testfiles/github-0479-often.tlg
+++ b/base/testfiles/github-0479-often.tlg
@@ -96,12 +96,8 @@ Skipping: [....-..-..] Disable hooks on input line ....
Applying: [....-..-..] Disable hooks on input line ....
Skipping: [....-..-..] Providing hooks on input line ....
Applying: [....-..-..] Providing hooks on input line ....
-Skipping: [....-..-..] Do not queue removals on input line ....
-Applying: [....-..-..] Do not queue removals on input line ....
Skipping: [....-..-..] Support cmd hooks on input line ....
Applying: [....-..-..] Support cmd hooks on input line ....
-Skipping: [....-..-..] Do not queue removals on input line ....
-Applying: [....-..-..] Do not queue removals on input line ....
Already applied: [....-..-..] Providing hooks on input line ....
Already applied: [....-..-..] Providing hooks on input line ....
Skipping: [....-..-..] The hook management on input line ....
diff --git a/base/testfiles/tlb-latexrelease-rollback-003-often.tlg b/base/testfiles/tlb-latexrelease-rollback-003-often.tlg
index 8cf20852..8b2476db 100644
--- a/base/testfiles/tlb-latexrelease-rollback-003-often.tlg
+++ b/base/testfiles/tlb-latexrelease-rollback-003-often.tlg
@@ -81,12 +81,8 @@ Skipping: [....-..-..] Disable hooks on input line ....
Skipping: [....-..-..] Disable hooks on input line ....
Skipping: [....-..-..] Providing hooks on input line ....
Skipping: [....-..-..] Providing hooks on input line ....
-Skipping: [....-..-..] Do not queue removals on input line ....
-Skipping: [....-..-..] Do not queue removals on input line ....
Skipping: [....-..-..] Support cmd hooks on input line ....
Skipping: [....-..-..] Support cmd hooks on input line ....
-Skipping: [....-..-..] Do not queue removals on input line ....
-Skipping: [....-..-..] Do not queue removals on input line ....
Skipping: [....-..-..] Providing hooks on input line ....
Skipping: [....-..-..] Providing hooks on input line ....
Applying: [....-..-..] The hook management on input line ....
@@ -615,12 +611,8 @@ Skipping: [....-..-..] Disable hooks on input line ....
Skipping: [....-..-..] Disable hooks on input line ....
Skipping: [....-..-..] Providing hooks on input line ....
Skipping: [....-..-..] Providing hooks on input line ....
-Skipping: [....-..-..] Do not queue removals on input line ....
-Skipping: [....-..-..] Do not queue removals on input line ....
Skipping: [....-..-..] Support cmd hooks on input line ....
Skipping: [....-..-..] Support cmd hooks on input line ....
-Skipping: [....-..-..] Do not queue removals on input line ....
-Skipping: [....-..-..] Do not queue removals on input line ....
Skipping: [....-..-..] Providing hooks on input line ....
Skipping: [....-..-..] Providing hooks on input line ....
Applying: [....-..-..] The hook management on input line ....
diff --git a/base/testfiles/tlb-rollback-004-often.tlg b/base/testfiles/tlb-rollback-004-often.tlg
index a94181ac..c211e68e 100644
--- a/base/testfiles/tlb-rollback-004-often.tlg
+++ b/base/testfiles/tlb-rollback-004-often.tlg
@@ -96,12 +96,8 @@ Skipping: [....-..-..] Disable hooks on input line ....
Skipping: [....-..-..] Disable hooks on input line ....
Skipping: [....-..-..] Providing hooks on input line ....
Skipping: [....-..-..] Providing hooks on input line ....
-Skipping: [....-..-..] Do not queue removals on input line ....
-Skipping: [....-..-..] Do not queue removals on input line ....
Skipping: [....-..-..] Support cmd hooks on input line ....
Skipping: [....-..-..] Support cmd hooks on input line ....
-Skipping: [....-..-..] Do not queue removals on input line ....
-Skipping: [....-..-..] Do not queue removals on input line ....
Skipping: [....-..-..] Providing hooks on input line ....
Skipping: [....-..-..] Providing hooks on input line ....
Applying: [....-..-..] The hook management on input line ....
diff --git a/base/testfiles/tlb-rollback-005.tlg b/base/testfiles/tlb-rollback-005.tlg
index 36f7e5e3..62c9bdc5 100644
--- a/base/testfiles/tlb-rollback-005.tlg
+++ b/base/testfiles/tlb-rollback-005.tlg
@@ -100,12 +100,8 @@ Skipping: [....-..-..] Disable hooks on input line ....
Applying: [....-..-..] Disable hooks on input line ....
Skipping: [....-..-..] Providing hooks on input line ....
Applying: [....-..-..] Providing hooks on input line ....
-Skipping: [....-..-..] Do not queue removals on input line ....
-Applying: [....-..-..] Do not queue removals on input line ....
Skipping: [....-..-..] Support cmd hooks on input line ....
Applying: [....-..-..] Support cmd hooks on input line ....
-Skipping: [....-..-..] Do not queue removals on input line ....
-Applying: [....-..-..] Do not queue removals on input line ....
Already applied: [....-..-..] Providing hooks on input line ....
Already applied: [....-..-..] Providing hooks on input line ....
Skipping: [....-..-..] The hook management on input line ....
More information about the latex3-commits
mailing list.