[latex3-commits] [latex3/latex2e] testtagpdf99h: add next tagpdf (cdad9edc9)

[github at latex-project.org]

Repository : https://github.com/latex3/latex2e
On branch  : testtagpdf99h
Link       : https://github.com/latex3/latex2e/commit/cdad9edc9d8c265e294e686367aa94ceaad0e8bf

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

commit cdad9edc9d8c265e294e686367aa94ceaad0e8bf
Author: Ulrike Fischer <fischer at troubleshooting-tex.de>
Date:   Mon Nov 18 16:58:18 2024 +0100

    add next tagpdf


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

cdad9edc9d8c265e294e686367aa94ceaad0e8bf
 texmf/tex/latex/tagpdf/tagpdf-base.sty            |  1 -
 texmf/tex/latex/tagpdf/tagpdf-debug.sty           |  1 -
 texmf/tex/latex/tagpdf/tagpdf-mc-code-generic.sty |  6 +++++-
 texmf/tex/latex/tagpdf/tagpdf-mc-code-lua.sty     |  2 ++
 texmf/tex/latex/tagpdf/tagpdf.sty                 | 24 ++++++++++++-----------
 5 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/texmf/tex/latex/tagpdf/tagpdf-base.sty b/texmf/tex/latex/tagpdf/tagpdf-base.sty
index bdcfa47bf..f0ee0c21f 100644
--- a/texmf/tex/latex/tagpdf/tagpdf-base.sty
+++ b/texmf/tex/latex/tagpdf/tagpdf-base.sty
@@ -52,7 +52,6 @@
 \cs_new_protected:Nn \tag_mc_end:{ \__tag_whatsits: }
 
 %% File: tagpdf-mc-shared.dtx
-
 \newcounter { g__tag_MCID_abs_int }
 \cs_new:Npn \__tag_get_data_mc_counter:
   {
diff --git a/texmf/tex/latex/tagpdf/tagpdf-debug.sty b/texmf/tex/latex/tagpdf/tagpdf-debug.sty
index 2ad6c2103..ccf1fb03b 100644
--- a/texmf/tex/latex/tagpdf/tagpdf-debug.sty
+++ b/texmf/tex/latex/tagpdf/tagpdf-debug.sty
@@ -248,7 +248,6 @@
     ,debug/structures .default:n = 1
   }
 %% File: tagpdf-mc-shared.dtx
-
 %% File: tagpdf-tree.dtx
 %% File: tagpdf-roles.dtx
 %% File: tagpdf-struct.dtx
diff --git a/texmf/tex/latex/tagpdf/tagpdf-mc-code-generic.sty b/texmf/tex/latex/tagpdf/tagpdf-mc-code-generic.sty
index 716de1a1d..bafa7f442 100644
--- a/texmf/tex/latex/tagpdf/tagpdf-mc-code-generic.sty
+++ b/texmf/tex/latex/tagpdf/tagpdf-mc-code-generic.sty
@@ -29,7 +29,10 @@
 \seq_new:N \g__tag_mc_main_marks_seq
 \seq_new:N \g__tag_mc_footnote_marks_seq
 \seq_new:N \g__tag_mc_multicol_marks_seq
-
+\cs_new_protected:Npn  \tag_mc_new_stream:n #1
+  {
+    \seq_new:c { g__tag_mc_multicol_#1_seq }
+  }
 \seq_new:N  \l__tag_mc_firstmarks_seq
 \seq_new:N  \l__tag_mc_botmarks_seq
 \cs_new_protected:Npn \__tag_mc_begin_marks:nn #1 #2 %#1 tag, #2 label
@@ -233,6 +236,7 @@
 %%
   }
 }
+\cs_set_eq:NN \tag_mc_add_missing_to_stream:Nn \__tag_add_missing_mcs_to_stream:Nn
 \prg_new_conditional:Nnn \__tag_mc_if_in: {p,T,F,TF}
   {
     \bool_if:NTF \g__tag_in_mc_bool
diff --git a/texmf/tex/latex/tagpdf/tagpdf-mc-code-lua.sty b/texmf/tex/latex/tagpdf/tagpdf-mc-code-lua.sty
index 7f0331f89..91c8cec04 100644
--- a/texmf/tex/latex/tagpdf/tagpdf-mc-code-lua.sty
+++ b/texmf/tex/latex/tagpdf/tagpdf-mc-code-lua.sty
@@ -76,6 +76,8 @@
       }
   }
 \cs_new_protected:Npn \__tag_add_missing_mcs_to_stream:Nn #1#2 {}
+\cs_set_eq:NN \tag_mc_add_missing_to_stream:Nn \__tag_add_missing_mcs_to_stream:Nn
+\cs_new_protected:Npn  \tag_mc_new_stream:n #1 {}
 \prg_new_conditional:Nnn \__tag_mc_if_in: {p,T,F,TF}
   {
     \int_compare:nNnTF
diff --git a/texmf/tex/latex/tagpdf/tagpdf.sty b/texmf/tex/latex/tagpdf/tagpdf.sty
index f4451113d..dc42713ca 100644
--- a/texmf/tex/latex/tagpdf/tagpdf.sty
+++ b/texmf/tex/latex/tagpdf/tagpdf.sty
@@ -624,7 +624,6 @@
      }
   }
 %% File: tagpdf-mc-shared.dtx
-
 \cs_new:Npn \__tag_get_mc_abs_cnt: { \int_use:N \c at g__tag_MCID_abs_int }
 \bool_new:N \g__tag_in_mc_bool
 \__tag_prop_new_linked:N \g__tag_mc_parenttree_prop
@@ -3763,26 +3762,29 @@ firstkid .code:n = { \tl_set:Nn \l__tag_struct_addkid_tl {left} },
         \cs_if_exist:NT \@kernel at before@footins
          {
            \tl_put_right:Nn \@kernel at before@footins
-             { \__tag_add_missing_mcs_to_stream:Nn \footins {footnote} }
+             { \tag_mc_add_missing_to_stream:Nn \footins {footnote} }
            \tl_put_right:Nn \@kernel at before@cclv
              {
                \__tag_check_typeout_v:n {====>~In~\token_to_str:N \@makecol\c_space_tl\the\c at page}
-               \__tag_add_missing_mcs_to_stream:Nn \@cclv {main}
+               \tag_mc_add_missing_to_stream:Nn \@cclv {main}
              }
            \tl_put_right:Nn \@kernel at tagsupport@@makecol
              {
                \__tag_check_typeout_v:n {====>~In~\token_to_str:N \@makecol\c_space_tl\the\c at page}
-               \__tag_add_missing_mcs_to_stream:Nn \@outputbox {main}
+               \tag_mc_add_missing_to_stream:Nn \@outputbox {main}
              }
-           \tl_put_right:Nn \@mult at ptagging@hook
-             {
-               \__tag_check_typeout_v:n {====>~In~\string\page at sofar}
-               \process at cols\mult at firstbox
+           \tl_if_exist:NT \@mult at ptagging@hook
+            {
+              \tl_put_right:Nn \@mult at ptagging@hook
                 {
-                  \__tag_add_missing_mcs_to_stream:Nn \count@ {multicol}
+                  \__tag_check_typeout_v:n {====>~In~\string\page at sofar}
+                  \process at cols\mult at firstbox
+                   {
+                     \tag_mc_add_missing_to_stream:Nn \count@ {multicol}
+                   }
+                  \tag_mc_add_missing_to_stream:Nn \mult at rightbox {multicol}
                 }
-               \__tag_add_missing_mcs_to_stream:Nn \mult at rightbox {multicol}
-             }
+            }
          }
      }
   }