[latex3-commits] [latex3/latex2e] testmergearray: enable math tagging in tabular if table code is loaded (ff431758)

[github at latex-project.org]

Repository : https://github.com/latex3/latex2e
On branch  : testmergearray
Link       : https://github.com/latex3/latex2e/commit/ff43175890c3a16c2d65fcf7f5ff196f73a751c8

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

commit ff43175890c3a16c2d65fcf7f5ff196f73a751c8
Author: Ulrike Fischer <fischer at troubleshooting-tex.de>
Date:   Sat Dec 16 01:26:23 2023 +0100

    enable math tagging in tabular if table code is loaded


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

ff43175890c3a16c2d65fcf7f5ff196f73a751c8
 required/latex-lab/latex-lab-math.dtx | 12 ++++++++++++
 required/tools/array.dtx              |  5 +++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/required/latex-lab/latex-lab-math.dtx b/required/latex-lab/latex-lab-math.dtx
index 6a699392..b3ae57c4 100644
--- a/required/latex-lab/latex-lab-math.dtx
+++ b/required/latex-lab/latex-lab-math.dtx
@@ -1342,6 +1342,18 @@
       { \bool_set_true:N \l_@@_collected_bool }
   }
 %    \end{macrocode}
+% if latex-lab-testphase-table is loaded (and so also the new
+% array) it will handle the fakemath, so we can undo the hooks again:
+%    \begin{macrocode}
+\AddToHook{package/latex-lab-testphase-table/after}
+ {
+   \clist_map_inline:nn
+  { tabular , tabular* }
+  {
+    \RemoveFromHook{ env / #1 / begin }[latex-lab-testphase-math]
+  }
+ }
+%    \end{macrocode}
 %
 % \begin{macro}{\@@_m at th:, \m at th}
 %   Handle non-math use of math mode. At present nesting isn't supported as
diff --git a/required/tools/array.dtx b/required/tools/array.dtx
index 222376c0..c11b7a3f 100644
--- a/required/tools/array.dtx
+++ b/required/tools/array.dtx
@@ -2313,11 +2313,12 @@ Bug reports can be opened (category \texttt{#1}) at\\%
 %     the parameter =\mathsurround= should
 %    also be set to \textsf{0pt}. This prevents additional space between
 %    the rows. The
-%    \PlainTeX--macro =\m at th= does this.
+%    \PlainTeX--macro =\m at th= does this but we don't use here as
+%    it perhaps disables math tagging which is not wanted here.
 %    \begin{macrocode}
   \lineskip \z@
   \baselineskip \z@
-  \m at th
+  \mathsurround\z@ 
 %    \end{macrocode}
 %    Beside, we have to assign a special meaning (which we still have
 %    to specify) to the line separator =\\=. We also have to