[latex3-commits] [git/LaTeX3-latex3-latex2e] lthooks: fix for tabularx hack (b0e9ccde)

[Frank Mittelbach]

Repository : https://github.com/latex3/latex2e
On branch  : lthooks
Link       : https://github.com/latex3/latex2e/commit/b0e9ccded00a85867f3b82f4c874bb113036a4a4

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

commit b0e9ccded00a85867f3b82f4c874bb113036a4a4
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date:   Wed Jul 8 18:24:52 2020 +0200

    fix for tabularx hack


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

b0e9ccded00a85867f3b82f4c874bb113036a4a4
 base/lthooks.dtx                                         | 16 +++++++++++++---
 .../{testfiles-broken => testfiles}/tlb-tabularx-002.lvt |  0
 .../{testfiles-broken => testfiles}/tlb-tabularx-002.tlg |  0
 .../tools/{testfiles-broken => testfiles}/tlb3722.lvt    |  0
 .../tools/{testfiles-broken => testfiles}/tlb3722.tlg    |  0
 5 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/base/lthooks.dtx b/base/lthooks.dtx
index ff743d55..4a9866a6 100644
--- a/base/lthooks.dtx
+++ b/base/lthooks.dtx
@@ -17,8 +17,8 @@
 % for those people who are interested or want to report an issue.
 %
 %    \begin{macrocode}
-\providecommand\lthooksversion{v0.8p}
-\providecommand\lthooksdate{2020/07/07}
+\providecommand\lthooksversion{v0.8q}
+\providecommand\lthooksdate{2020/07/08}
 %    \end{macrocode}
 %
 %<*driver>
@@ -2960,6 +2960,16 @@
   \UseHook{env/#1/after}%
   \if at ignore\@ignorefalse\ignorespaces\fi}%
 %    \end{macrocode}
+%    Version that fixes tlb3722 but the change should perhaps be made in
+%    \pkg{tabularx} instead.
+%    \begin{macrocode}
+\@namedef{end~}#1{%
+  \romannumeral-`f\UseHook{env/#1/end}\expandafter\space
+  \csname end#1\endcsname\@checkend{#1}%
+  \expandafter\endgroup\if at endpe\@doendpe\fi
+  \UseHook{env/#1/after}%
+  \if at ignore\@ignorefalse\ignorespaces\fi}
+%    \end{macrocode}
 %    
 %    
 %
@@ -3030,7 +3040,7 @@
 %    \end{macrocode}
 %    
 %    \begin{macrocode}
-  \expandafter\let\csname g_hook_document_code_tl\endcsname\@empty
+  \expandafter\let\csname g_hook_env/document/begin_code_tl\endcsname\@empty
 %    \end{macrocode}
 %    
 %    \begin{macrocode}
diff --git a/required/tools/testfiles-broken/tlb-tabularx-002.lvt b/required/tools/testfiles/tlb-tabularx-002.lvt
similarity index 100%
rename from required/tools/testfiles-broken/tlb-tabularx-002.lvt
rename to required/tools/testfiles/tlb-tabularx-002.lvt
diff --git a/required/tools/testfiles-broken/tlb-tabularx-002.tlg b/required/tools/testfiles/tlb-tabularx-002.tlg
similarity index 100%
rename from required/tools/testfiles-broken/tlb-tabularx-002.tlg
rename to required/tools/testfiles/tlb-tabularx-002.tlg
diff --git a/required/tools/testfiles-broken/tlb3722.lvt b/required/tools/testfiles/tlb3722.lvt
similarity index 100%
rename from required/tools/testfiles-broken/tlb3722.lvt
rename to required/tools/testfiles/tlb3722.lvt
diff --git a/required/tools/testfiles-broken/tlb3722.tlg b/required/tools/testfiles/tlb3722.tlg
similarity index 100%
rename from required/tools/testfiles-broken/tlb3722.tlg
rename to required/tools/testfiles/tlb3722.tlg