update tagpdf to 0.99i

latex3 · Nov 19, 2024 · b274b5f · b274b5f
1 parent c66f467
commit b274b5f
Show file tree

Hide file tree

Showing 16 changed files with 40 additions and 33 deletions.
diff --git a/texmf/tex/latex/tagpdf/tagpdf-base.sty b/texmf/tex/latex/tagpdf/tagpdf-base.sty
@@ -25,7 +25,7 @@
 %% and all files in that bundle must be distributed together.
 %% 
 %% File: tagpdf.dtx
-\ProvidesExplPackage {tagpdf-base} {2024-10-27} {0.99g}
+\ProvidesExplPackage {tagpdf-base} {2024-11-19} {0.99i}
   {part of tagpdf - provide base, no-op versions of the user commands }
 \cs_new_protected:Npn \__tag_whatsits: {}
 \AddToHook{begindocument}
@@ -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-generic.sty b/texmf/tex/latex/tagpdf/tagpdf-debug-generic.sty
@@ -19,7 +19,7 @@
 %% and all files in that bundle must be distributed together.
 %% 
 %% File: tagpdf-mc-generic.dtx
-\ProvidesExplPackage {tagpdf-debug-generic} {2024-10-27} {0.99g}
+\ProvidesExplPackage {tagpdf-debug-generic} {2024-11-19} {0.99i}
  {part of tagpdf - debugging code related to marking chunks - generic mode}
 \cs_set_protected:Npn \tag_mc_begin:n #1 %#1 keyval
   {

diff --git a/texmf/tex/latex/tagpdf/tagpdf-debug-lua.sty b/texmf/tex/latex/tagpdf/tagpdf-debug-lua.sty
@@ -19,7 +19,7 @@
 %% and all files in that bundle must be distributed together.
 %% 
 %% File: tagpdf-mc-luacode.dtx
-\ProvidesExplPackage {tagpdf-debug-lua} {2024-10-27} {0.99g}
+\ProvidesExplPackage {tagpdf-debug-lua} {2024-11-19} {0.99i}
  {part of tagpdf - debugging code related to marking chunks - lua mode}
 \cs_set_protected:Npn \__tag_mc_handle_stash:n #1 %1 mcidnum
   {

diff --git a/texmf/tex/latex/tagpdf/tagpdf-debug.sty b/texmf/tex/latex/tagpdf/tagpdf-debug.sty
@@ -26,7 +26,7 @@
 %% and all files in that bundle must be distributed together.
 %% 
 %% File: tagpdf.dtx
-\ProvidesExplPackage {tagpdf-debug} {2024-10-27} {0.99g}
+\ProvidesExplPackage {tagpdf-debug} {2024-11-19} {0.99i}
   { debug code for tagpdf }
 \@ifpackageloaded{tagpdf}{}{\PackageWarning{tagpdf-debug}{tagpdf~not~loaded,~quitting}\endinput}
 \prop_gput:Nnn \g_msg_module_type_prop { tag / debug} {}
@@ -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-luatex.def b/texmf/tex/latex/tagpdf/tagpdf-luatex.def
@@ -19,7 +19,7 @@
 %% and all files in that bundle must be distributed together.
 %% 
 %% File: tagpdf-backend.dtx
-\ProvidesExplFile {tagpdf-luatex.def} {2024-10-27} {0.99g}
+\ProvidesExplFile {tagpdf-luatex.def} {2024-11-19} {0.99i}
   {tagpdf~driver~for~luatex}
 {
   \fontencoding{TU}\fontfamily{lmr}\fontseries{m}\fontshape{n}\fontsize{10pt}{10pt}\selectfont

diff --git a/texmf/tex/latex/tagpdf/tagpdf-mc-code-generic.sty b/texmf/tex/latex/tagpdf/tagpdf-mc-code-generic.sty
@@ -19,7 +19,7 @@
 %% and all files in that bundle must be distributed together.
 %% 
 %% File: tagpdf-mc-generic.dtx
-\ProvidesExplPackage {tagpdf-mc-code-generic} {2024-10-27} {0.99g}
+\ProvidesExplPackage {tagpdf-mc-code-generic} {2024-11-19} {0.99i}
  {part of tagpdf - code related to marking chunks - generic mode}
 \tl_new:N \l__tag_mc_ref_abspage_tl
 
@@ -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
@@ -19,7 +19,7 @@
 %% and all files in that bundle must be distributed together.
 %% 
 %% File: tagpdf-mc-luacode.dtx
-\ProvidesExplPackage {tagpdf-mc-code-lua} {2024-10-27} {0.99g}
+\ProvidesExplPackage {tagpdf-mc-code-lua} {2024-11-19} {0.99i}
   {tagpdf - mc code only for the luamode }
 \hook_gput_code:nnn{begindocument}{tagpdf/mc}
   {
@@ -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-ns-latex-book.def b/texmf/tex/latex/tagpdf/tagpdf-ns-latex-book.def
@@ -19,7 +19,7 @@
 %% and all files in that bundle must be distributed together.
 %% 
 %% File: tagpdf-data.dtx
-%% \ProvidesExplFile {tagpdf-ns-latex-book.def} {2024-10-27} {0.99g}
+%% \ProvidesExplFile {tagpdf-ns-latex-book.def} {2024-11-19} {0.99i}
 %% {latex-book} {https://www.latex-project.org/ns/book/2022}{}
 chapter,       H1,pdf2,
 section,       H2,pdf2,

diff --git a/texmf/tex/latex/tagpdf/tagpdf-ns-latex.def b/texmf/tex/latex/tagpdf/tagpdf-ns-latex.def
@@ -19,7 +19,7 @@
 %% and all files in that bundle must be distributed together.
 %% 
 %% File: tagpdf-data.dtx
-%% \ProvidesExplFile {tagpdf-ns-latex.def} {2024-10-27} {0.99g}
+%% \ProvidesExplFile {tagpdf-ns-latex.def} {2024-11-19} {0.99i}
 %% {latex} {https://www.latex-project.org/ns/dflt/2022}{}
 title,        Title,    pdf2,
 part,         Title,    pdf2,

diff --git a/texmf/tex/latex/tagpdf/tagpdf-ns-mathml.def b/texmf/tex/latex/tagpdf/tagpdf-ns-mathml.def
@@ -19,7 +19,7 @@
 %% and all files in that bundle must be distributed together.
 %% 
 %% File: tagpdf-data.dtx
-%% \ProvidesExplFile {tagpdf-ns-mathml.def} {2024-10-27} {0.99g}
+%% \ProvidesExplFile {tagpdf-ns-mathml.def} {2024-11-19} {0.99i}
 abs,abs,mathml,
 and,and,mathml,
 annotation,annotation,mathml,

diff --git a/texmf/tex/latex/tagpdf/tagpdf-ns-pdf.def b/texmf/tex/latex/tagpdf/tagpdf-ns-pdf.def
@@ -19,7 +19,7 @@
 %% and all files in that bundle must be distributed together.
 %% 
 %% File: tagpdf-data.dtx
-%% \ProvidesExplFile {tagpdf-ns-pdf.def} {2024-10-27} {0.99g}
+%% \ProvidesExplFile {tagpdf-ns-pdf.def} {2024-11-19} {0.99i}
 %%  {pdf}   {http://iso.org/pdf/ssn}{}
 StructTreeRoot,StructTreeRoot,pdf,D,
 Document,Document,pdf,D,

diff --git a/texmf/tex/latex/tagpdf/tagpdf-ns-pdf2.def b/texmf/tex/latex/tagpdf/tagpdf-ns-pdf2.def
@@ -19,7 +19,7 @@
 %% and all files in that bundle must be distributed together.
 %% 
 %% File: tagpdf-data.dtx
-%% \ProvidesExplFile {tagpdf-ns-pdf2.def} {2024-10-27} {0.99g}
+%% \ProvidesExplFile {tagpdf-ns-pdf2.def} {2024-11-19} {0.99i}
 %%  {pdf2}  {http://iso.org/pdf2/ssn}{}
 StructTreeRoot,StructTreeRoot,pdf2,D,
 Document,Document,pdf2,D,

diff --git a/texmf/tex/latex/tagpdf/tagpdf-parent-child-2.csv b/texmf/tex/latex/tagpdf/tagpdf-parent-child-2.csv
@@ -19,7 +19,7 @@
 %% and all files in that bundle must be distributed together.
 %% 
 %% File: tagpdf-data.dtx
-%% \ProvidesExplFile {tagpdf-parent-child-2.csv} {2024-10-27} {0.99g}
+%% \ProvidesExplFile {tagpdf-parent-child-2.csv} {2024-11-19} {0.99i}
 ,,,StructTreeRoot,Document,DocumentFragment,Art,Part,Div,Sect,Aside,BlockQuote,NonStruct,TOC,TOCI,Index,Private,Title,Sub,Quote,Note,Reference,BibEntry,P,Hn,H,Lbl,Code,Em,Strong,Span,Link,Annot,Form,Ruby,RB,RT,RP,Warichu,WT,WP,FENote,L,LI,LBody,Table,TR,TH,TD,THead,TBody,TFoot,Caption,Figure,Formula,math,mathml,Artifact,MC
 Document,both,document level,1,0..n,0..n,∅,‡,‡,∅,0..n,0..n,‡,∅,∅,∅,0..n,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,0..n,∅
 DocumentFragment,2.0,document level,∅,0..n,0..n,0..n,‡,‡,0..n,0..n,0..n,‡,∅,∅,∅,0..n,∅,∅,∅,∅*,∅,∅,∅,∅,∅,∅,∅*,∅,∅,∅,∅*,∅*,∅,∅,∅,∅,∅,∅,∅,∅,∅*,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅*,∅,∅,∅,∅,0..n,∅

diff --git a/texmf/tex/latex/tagpdf/tagpdf-parent-child.csv b/texmf/tex/latex/tagpdf/tagpdf-parent-child.csv
@@ -19,7 +19,7 @@
 %% and all files in that bundle must be distributed together.
 %% 
 %% File: tagpdf-data.dtx
-%% \ProvidesExplFile {tagpdf-parent-child.csv} {2024-10-27} {0.99g}
+%% \ProvidesExplFile {tagpdf-parent-child.csv} {2024-11-19} {0.99i}
 ,,,StructTreeRoot,Document,Art,Part,Div,Sect,BlockQuote,NonStruct,TOC,TOCI,Index,Private,Quote,Note,Reference,BibEntry,P,Hn,H,Lbl,Code,Span,Link,Annot,Form,Ruby,RB,RT,RP,Warichu,WT,WP,L,LI,LBody,Table,TR,TH,TD,THead,TBody,TFoot,Caption,Figure,Formula,MC
 Document,both,document level,1,0..n,∅,‡,‡,∅,0..n,‡,∅,∅,∅,0..n,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅
 Art,1.7,grouping,∅,0..n,∅,‡,‡,0..n,0..n,‡,∅,∅,∅,0..n,∅,0..n,∅,∅,∅,0..1,0..1,∅,∅,∅,0..n,0..n,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,0..n,∅,∅,0..n,0..n,∅,∅,∅,0..n,0..n,∅,∅

diff --git a/texmf/tex/latex/tagpdf/tagpdf.lua b/texmf/tex/latex/tagpdf/tagpdf.lua
@@ -24,8 +24,8 @@
 
 local ProvidesLuaModule = {
     name          = "tagpdf",
-    version       = "0.99g",       --TAGVERSION
-    date          = "2024-10-27", --TAGDATE
+    version       = "0.99i",       --TAGVERSION
+    date          = "2024-11-19", --TAGDATE
     description   = "tagpdf lua code",
     license       = "The LATEX Project Public License 1.3c"
 }

diff --git a/texmf/tex/latex/tagpdf/tagpdf.sty b/texmf/tex/latex/tagpdf/tagpdf.sty
@@ -28,7 +28,7 @@
 %% and all files in that bundle must be distributed together.
 %% 
 %% File: tagpdf.dtx
-\ProvidesExplPackage {tagpdf} {2024-10-27} {0.99g}
+\ProvidesExplPackage {tagpdf} {2024-11-19} {0.99i}
   { LaTeX kernel code for PDF tagging }
 
 \bool_if:nF
@@ -624,7 +624,6 @@
      }
   }
 %% File: tagpdf-mc-shared.dtx
-
 \cs_new:Npn \__tag_get_mc_abs_cnt: { \int_use:N \c@g__tag_MCID_abs_int }
 \bool_new:N \g__tag_in_mc_bool
 \__tag_prop_new_linked:N \g__tag_mc_parenttree_prop
@@ -3283,8 +3282,9 @@ firstkid .code:n = { \tl_set:Nn \l__tag_struct_addkid_tl {left} },
   }
 \cs_set_protected:Npn \tag_socket_use:nnn #1#2#3
   {
-    \bool_if:NT \l__tag_active_socket_bool
-       { \socket_use:nnn {tagsupport/#1} {#2} {#3} }
+    \bool_if:NTF \l__tag_active_socket_bool
+      { \socket_use:nnn {tagsupport/#1} {#2} {#3} }
+      { #3 }
   }
 \cs_set:Npn \tag_socket_use_expandable:n #1
   {
@@ -3763,26 +3763,29 @@ firstkid .code:n = { \tl_set:Nn \l__tag_struct_addkid_tl {left} },
         \cs_if_exist:NT \@kernel@before@footins
          {
            \tl_put_right:Nn \@kernel@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@before@cclv
              {
                \__tag_check_typeout_v:n {====>~In~\token_to_str:N \@makecol\c_space_tl\the\c@page}
-               \__tag_add_missing_mcs_to_stream:Nn \@cclv {main}
+               \tag_mc_add_missing_to_stream:Nn \@cclv {main}
              }
            \tl_put_right:Nn \@kernel@tagsupport@@makecol
              {
                \__tag_check_typeout_v:n {====>~In~\token_to_str:N \@makecol\c_space_tl\the\c@page}
-               \__tag_add_missing_mcs_to_stream:Nn \@outputbox {main}
+               \tag_mc_add_missing_to_stream:Nn \@outputbox {main}
              }
-           \tl_put_right:Nn \@mult@ptagging@hook
-             {
-               \__tag_check_typeout_v:n {====>~In~\string\page@sofar}
-               \process@cols\mult@firstbox
+           \tl_if_exist:NT \@mult@ptagging@hook
+            {
+              \tl_put_right:Nn \@mult@ptagging@hook
                 {
-                  \__tag_add_missing_mcs_to_stream:Nn \count@ {multicol}
+                  \__tag_check_typeout_v:n {====>~In~\string\page@sofar}
+                  \process@cols\mult@firstbox
+                   {
+                     \tag_mc_add_missing_to_stream:Nn \count@ {multicol}
+                   }
+                  \tag_mc_add_missing_to_stream:Nn \mult@rightbox {multicol}
                 }
-               \__tag_add_missing_mcs_to_stream:Nn \mult@rightbox {multicol}
-             }
+            }
          }
      }
   }