[latex3-commits] [latex3/latex2e] tagging705-float: use tagging socket in multicol, latex3/tagging-project#705 (b542db20)

[github at latex-project.org]

Repository : https://github.com/latex3/latex2e
On branch  : tagging705-float
Link       : https://github.com/latex3/latex2e/commit/b542db205fe505ae1586b92b98236988761dfcde

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

commit b542db205fe505ae1586b92b98236988761dfcde
Author: Ulrike Fischer <fischer at troubleshooting-tex.de>
Date:   Sat Sep 14 01:11:03 2024 +0200

    use tagging socket in multicol, latex3/tagging-project#705


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

b542db205fe505ae1586b92b98236988761dfcde
 .../testfiles-float/float-011-multicol.lvt         | 24 ++++++++++++++++++++++
 .../testfiles-float/float-011-multicol.tlg         | 17 +++++++++++++++
 required/tools/changes.txt                         |  3 +++
 required/tools/multicol.dtx                        | 15 ++++++++++++--
 4 files changed, 57 insertions(+), 2 deletions(-)

diff --git a/required/latex-lab/testfiles-float/float-011-multicol.lvt b/required/latex-lab/testfiles-float/float-011-multicol.lvt
new file mode 100644
index 00000000..4e9b675c
--- /dev/null
+++ b/required/latex-lab/testfiles-float/float-011-multicol.lvt
@@ -0,0 +1,24 @@
+\ExplSyntaxOn
+\sys_gset_rand_seed:n{1000} 
+\ExplSyntaxOff
+\DocumentMetadata{%
+	%pdfstandard=A-4f,
+	pdfversion=2.0,
+	lang=en,
+	testphase={phase-III},
+    uncompress
+}
+\input{regression-test}
+\documentclass{article}
+\usepackage{multicol}
+\begin{document}
+\START
+\begin{multicols}{2}
+hallo
+
+\begin{table*}
+a large table
+\end{table*}
+Welt
+\end{multicols}
+\end{document}
diff --git a/required/latex-lab/testfiles-float/float-011-multicol.tlg b/required/latex-lab/testfiles-float/float-011-multicol.tlg
new file mode 100644
index 00000000..b9d0a3c9
--- /dev/null
+++ b/required/latex-lab/testfiles-float/float-011-multicol.tlg
@@ -0,0 +1,17 @@
+This is a generated file for the l3build validation system.
+Don't change this file in any respect.
+Floatstructure:7
+[1
+]
+[2] (float-011-multicol.aux)
+Package tagpdf Info: Finalizing the tagging structure:
+(tagpdf)             Writing out ~11 structure objects
+(tagpdf)             with ~7 'MC' leaf nodes.
+(tagpdf)             Be patient if there are lots of objects!
+Package tagpdf Info: writing ParentTree
+Package tagpdf Info: writing IDTree
+Package tagpdf Info: writing RoleMap
+Package tagpdf Info: writing ClassMap
+Package tagpdf Info: writing NameSpaces
+Package tagpdf Info: writing StructElems
+Package tagpdf Info: writing Root
diff --git a/required/tools/changes.txt b/required/tools/changes.txt
index 31292d1b..8e11704d 100644
--- a/required/tools/changes.txt
+++ b/required/tools/changes.txt
@@ -1,3 +1,6 @@
+2024-09-14  Ulrike Fischer  <Ulrike.Fischer at latex-project.org>
+	* multicol.dtx: add tagging support  (tagging/705)
+
 2024-08-13  Ulrike Fischer  <Ulrike.Fischer at latex-project.org>
 
 	* longtable.dtx:
diff --git a/required/tools/multicol.dtx b/required/tools/multicol.dtx
index 99f51309..90decb3b 100644
--- a/required/tools/multicol.dtx
+++ b/required/tools/multicol.dtx
@@ -98,7 +98,7 @@
 %<driver> \ProvidesFile{multicol.drv}
 % \fi
 %         \ProvidesFile{multicol.dtx}
-          [2024/07/01 v1.9h  multicolumn formatting (FMi)]
+          [2024/09/14 v1.9i  multicolumn formatting (FMi)]
 %
 %
 %
@@ -3630,12 +3630,22 @@
 % \changes{v1.6g}{2006/02/23}{Added \cs{@minipagefalse}}
 % \changes{v1.6h}{2008/12/05}{Use \cs{@endfloatbox} to better support
 %   the modifications done by the float package}
+% \changes{v1.9i}{2024/09/14}{Added tagging support}   
 %    Even if this should be used as a hook we use a |@| in the
 %    name since it is more for experts.
-%    \begin{macrocode}
+%  For now we test if the socket is already defined
+%    \begin{macrocode}
+\ExplSyntaxOn
+\str_if_exist:cF { l__socket_tagsupport/float/end_plug_str }
+  {
+    \NewSocket{tagsupport/float/end}{0}
+    \NewSocket{tagsupport/float/hmode/end}{0}
+  }
+\ExplSyntaxOff  
 \def\set at floatcmds{%
  \let\@dblfloat\@dbflt
  \def\end at dblfloat{\@endfloatbox
+   \UseTaggingSocket{float/end}%
    \@largefloatcheck
    \outer at nobreak
 %    \end{macrocode}
@@ -3657,6 +3667,7 @@
    \fi
    \ifnum\@floatpenalty=-\@Mii
      \@Esphack
+     \UseTaggingSocket{float/hmode/end}%
    \fi}}
 %    \end{macrocode}
 % \end{macro}