Update use tagging socket (#1409)

* fixing broken tests * clarification UseTaggingSocket * wording
latex3 · Jul 10, 2024 · 61db86e · 61db86e
1 parent 4328def
commit 61db86e
Show file tree

Hide file tree

Showing 5 changed files with 169 additions and 12 deletions.
diff --git a/base/lttagging.dtx b/base/lttagging.dtx
@@ -33,7 +33,7 @@
 %<*driver>
 % \fi
 \ProvidesFile{lttagging.dtx}
-             [2024/06/29 v1.0b LaTeX Kernel (tagging support)]
+             [2024/07/10 v1.0b LaTeX Kernel (tagging support)]
 % \iffalse
 \documentclass{l3doc}
 \GetFileInfo{lttagging.dtx}
@@ -125,10 +125,16 @@
 %  suspended with \cs{SuspendTagging} instead of changing the plugs of
 %  the tagging support sockets back and forth.
 %
+%  This means that with \cs{SuspendTagging} in force all socket
+%  arguments are ignored (including the case when there is a single
+%  one), i.e., all sockets used with \cs{UseTaggingSocket} behave as
+%  if the \text{noop} plug is assigned.
+%
 %  It is possible to use the tagging support sockets with
-%  \cs{UseSocket} directly, but in this case the socket remains active
-%  if \cs{SuspendTagging} is in force. There my be reasons for doing
-%  that but in general we expect to always use \cs{UseTaggingSocket}.
+%  \cs{UseSocket} instead of \cs{UseTaggingSocket}, but in this case
+%  the socket remains active if \cs{SuspendTagging} is in force. There
+%  may be reasons for doing that, but in general we expect to always
+%  use \cs{UseTaggingSocket}.
 %
 %  The L3 programming layer versions \cs{tag_socket_use:n} and
 %  \cs{tag_socket_use:nn} are slightly more efficient than

diff --git a/required/latex-lab/testfiles-table-luatex/table-013-longtable-hyperref.lvt b/required/latex-lab/testfiles-table-luatex/table-013-longtable-hyperref.lvt
@@ -1,4 +1,4 @@
-\DocumentMetadata{uncompress,testphase={testphase=phase-III,table}}
+\DocumentMetadata{uncompress,testphase={phase-III,table}}
 \input{regression-test}
 \documentclass{article}
 \usepackage{longtable}

diff --git a/required/latex-lab/testfiles-table-luatex/table-013-longtable-hyperref.tlg b/required/latex-lab/testfiles-table-luatex/table-013-longtable-hyperref.tlg
@@ -9,6 +9,7 @@ Completed box being shipped out [1]
 ..\vbox(0.0+0.0)x0.0, glue set 72.26999fil, direction TLT
 ...\kern-72.26999
 ...\hbox(0.0+0.0)x0.0, direction TLT
+....\pdfliteral page <lua data reference ...>
 ....\latelua0{ltx.__pdf.backend_ThisPage_gpush(tex.count["g_shipout_readonly_int"])}
 ....\glue 0.0 plus 1.0fil minus 1.0fil
 ...\glue 0.0 plus 1.0fil minus 1.0fil
@@ -21,6 +22,7 @@ Completed box being shipped out [1]
 ...\kern62.0
 ...\kern-1.00374
 ...\pdfdest name{page.1} xyz
+...\pdfdest name{page.1} xyz
 ...\penalty 10000
 ...\glue 0.0 plus 1.0fil minus 1.0fil
 ..\glue 0.0 plus 1.0fil minus 1.0fil
@@ -30,15 +32,19 @@ Completed box being shipped out [1]
 ..\vbox(617.0+0.0)x345.0, shifted 62.0, direction TLT
 ...\vbox(12.0+0.0)x345.0, glue set 12.0fil, direction TLT
 ....\glue 0.0 plus 1.0fil
+....\pdflinkstate 1
 ....\hbox(0.0+0.0)x345.0, direction TLT
 .....\hbox(0.0+0.0)x345.0, direction TLT
+....\pdflinkstate 0
 ...\glue 25.0
 ...\glue(\lineskip) 0.0
 ...\vbox(550.0+0.0)x345.0, glue set 491.94745fil, direction TLT
 ....\latelua0{ltx.__pdf.Page.Resources.ExtGState=true}
 ....\latelua0{ltx.pdf.Page_Resources_gpush(tex.count["g_shipout_readonly_int"])}
 ....\write-{}
 ....\pdfdest name{Doc-Start} xyz
+....\pdfdest name{Doc-Start} xyz
+....\pdfdest name{table.1} xyz
 ....\pdfdest name{table.1} xyz
 ....\glue(\topskip) 1.60004
 ....\hbox(8.39996+12.0)x345.0, glue set 155.2222fill, direction TLT
@@ -53,6 +59,8 @@ Completed box being shipped out [1]
 .......\vbox(6.94444+12.0)x289.07999, direction TLT
 ........\hbox(6.94444+0.0)x289.07999, glue set 114.9566fil, direction TLT
 .........\glue 0.0 plus 1.0fil
+.........\pdfliteral page <lua data reference ...>
+.........\pdfliteral page <lua data reference ...>
 .........\OT1/cmr/m/n/10 T
 .........\kern-0.83334 (font)
 .........\OT1/cmr/m/n/10 a
@@ -62,10 +70,12 @@ Completed box being shipped out [1]
 .........\OT1/cmr/m/n/10 l
 .........\OT1/cmr/m/n/10 e
 .........\penalty 10000
-.........\glue(\spaceskip) 3.33333 plus 1.66666 minus 1.11111
+.........\TU/lmr/m/n/10  
+.........\glue(\spaceskip) 0.00333 plus 1.66666 minus 1.11111
 .........\OT1/cmr/m/n/10 1
 .........\OT1/cmr/m/n/10 :
-.........\glue(\spaceskip) 4.44444 plus 3.33331 minus 0.55556
+.........\TU/lmr/m/n/10  
+.........\glue(\spaceskip) 1.11444 plus 3.33331 minus 0.55556
 .........\OT1/cmr/m/n/10 b
 .........\OT1/cmr/m/n/10 l
 .........\OT1/cmr/m/n/10 u
@@ -76,6 +86,8 @@ Completed box being shipped out [1]
 ......\glue 0.0 plus 1.0fil
 ......\glue 6.0
 ......\hbox(0.0+0.0)x0.0, direction TLT
+......\pdfliteral page <lua data reference ...>
+......\pdfliteral page <lua data reference ...>
 ......\write1{\@writefile{lot}{\protect \contentsline {table}{\protect \numberline {1}{blub}}{\thepage }{table.1}\protected@file@percent }}
 ......\write1{\newlabel{blub}{{1}{\thepage }{blub}{table.1}{}}}
 .....\glue(\tabskip) 0.0
@@ -87,14 +99,22 @@ Completed box being shipped out [1]
 .....\hbox(8.39996+3.60004)x17.00003, direction TLT
 ......\rule(8.39996+3.60004)x0.0
 ......\glue 6.0
-......\glue 0.00002
+......\TU/lmr/m/n/10  
+......\glue -3.32999
+......\pdfliteral page <lua data reference ...>
+......\pdfliteral page <lua data reference ...>
 ......\OT1/cmr/m/n/10 a
 ......\glue 0.0 plus 1.0fil
 ......\glue 6.0
 .....\glue(\tabskip) 0.0
 .....\hbox(8.39996+3.60004)x17.55559, direction TLT
 ......\glue 6.0
-......\glue 0.00002
+......\pdfliteral page <lua data reference ...>
+......\pdfliteral page <lua data reference ...>
+......\TU/lmr/m/n/10  
+......\glue -3.32999
+......\pdfliteral page <lua data reference ...>
+......\pdfliteral page <lua data reference ...>
 ......\OT1/cmr/m/n/10 b
 ......\glue 0.0 plus 1.0fil
 ......\glue 6.0
@@ -112,24 +132,50 @@ Completed box being shipped out [1]
 ......\localleftbox=null
 ......\localrightbox=null
 .....\hbox(0.0+0.0)x15.0, direction TLT
-.....\pdfstartlink(*+*)x* attr{/Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /Contents <FEFF0047006F00200074006F002000640065007300740069006E006100740069006F006E0020007400610062006C0065002E0031> } action goto name{table.1}
+.....\pdfliteral page <lua data reference ...>
+.....\pdfliteral page <lua data reference ...>
+.....\pdfstartlink(*+*)x* attr{/Contents <FEFF0047006F00200074006F002000640065007300740069006E006100740069006F006E0020007400610062006C0065002E0031> /Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /StructParent 1 } action struct name{table.1} goto name{table.1}
 .....\OT1/cmr/m/n/10 1
 .....\pdfendlink
+.....\write1{\new@label@record{@tag@objr@page@1}{{tagabspage}{\__property_code_tagabspage: }}}
 .....\penalty 10000
 .....\glue(\parfillskip) 0.0 plus 1.0fil
 .....\glue(\rightskip) 0.0
 ....\glue 0.0 plus 1.0fil
+....\glue 0.0 plus -1.0fil
+....\glue 0.0 plus 1.0fil
 ....\glue 0.0
 ....\glue 0.0 plus 0.0001fil
+...\pdfliteral page <lua data reference ...>
+...\pdfliteral page <lua data reference ...>
+...\pdflinkstate 1
 ...\glue(\baselineskip) 23.55556
 ...\hbox(6.44444+0.0)x345.0, direction TLT
 ....\hbox(6.44444+0.0)x345.0, glue set 170.0fil, direction TLT
 .....\glue 0.0 plus 1.0fil
+.....\pdfliteral page <lua data reference ...>
+.....\pdfliteral page <lua data reference ...>
 .....\OT1/cmr/m/n/10 1
 .....\glue 0.0 plus 1.0fil
+...\pdfliteral page <lua data reference ...>
+...\pdfliteral page <lua data reference ...>
+...\pdflinkstate 0
 .\kern0.0
 .\kern0.0
 .\kern-633.0
 .\hbox(0.0+0.0)x0.0, direction TLT
 .\kern633.0
+.\pdfliteral page <lua data reference ...>
 (table-013-longtable-hyperref.aux)
+LaTeX Warning: Label(s) may have changed. Rerun to get cross-references right.
+Package tagpdf Info: Finalizing the tagging structure:
+(tagpdf)             Writing out ~13 structure objects
+(tagpdf)             with ~10 '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/latex-lab/testfiles-table-pdftex/table-013-longtable-hyperref.lvt b/required/latex-lab/testfiles-table-pdftex/table-013-longtable-hyperref.lvt
@@ -1,4 +1,4 @@
-\DocumentMetadata{uncompress,testphase={testphase=phase-III,table}}
+\DocumentMetadata{uncompress,testphase={phase-III,table}}
 \input{regression-test}
 \documentclass{article}
 \usepackage{longtable}

diff --git a/required/latex-lab/testfiles-table-pdftex/table-013-longtable-hyperref.tlg b/required/latex-lab/testfiles-table-pdftex/table-013-longtable-hyperref.tlg
@@ -2,13 +2,21 @@ This is a generated file for the l3build validation system.
 Don't change this file in any respect.
 ==> Table has 2 columns
 --longtable--> chunk row: 0 row: 0 column: 0
+==> current cell data: 1,1,\LT@cols 
 label
+==> (@arraycr) This row needs 0 additional cell(s)
 --longtable--> chunk row: 1 row: 1 column: 1
+==> structure stored for row 1: 7,-7
+==> current cell data: 2,1,1
+==> current cell data: 2,2,1
+==> (endlongtable) This row needs 0 additional cell(s)
 --longtable--> chunk row: 1 row: 2 column: 2
+==> structure stored for row 2: 9,10
 --longtable--> chunk row: 1 row: 3 column: 0
 Completed box being shipped out [1]
 \vbox(633.0+0.0)x407.0
 .\hbox(0.0+0.0)x0.0
+..\pdfinterwordspaceon
 .\hbox(0.0+0.0)x0.0
 ..\kern -72.26999
 ..\vbox(0.0+0.0)x0.0, glue set 72.26999fil
@@ -25,6 +33,7 @@ Completed box being shipped out [1]
 ...\kern 62.0
 ...\kern -1.00374
 ...\pdfdest name{page.1} xyz
+...\pdfdest struct10 name{page.1} xyz
 ...\penalty 10000
 ...\glue 0.0 plus 1.0fil minus 1.0fil
 ..\glue 0.0 plus 1.0fil minus 1.0fil
@@ -34,14 +43,31 @@ Completed box being shipped out [1]
 ..\vbox(617.0+0.0)x345.0, shifted 62.0
 ...\vbox(12.0+0.0)x345.0, glue set 12.0fil
 ....\glue 0.0 plus 1.0fil
+....\pdfrunninglinkoff
+....\pdfliteral page{/Artifact BMC}
+....\marks4{b-,9,-1,}
+....\marks4{b+,9,-1,}
 ....\hbox(0.0+0.0)x345.0
 .....\hbox(0.0+0.0)x345.0
+....\pdfliteral page{EMC}
+....\marks4{e-,9,2,}
+....\marks4{e+,9,2,}
+....\pdfrunninglinkon
 ...\glue 25.0
 ...\glue(\lineskip) 0.0
 ...\vbox(550.0+0.0)x345.0, glue set 491.94745fil
+....\hbox(0.0+0.0)x0.0
 ....\write-{}
 ....\pdfdest name{Doc-Start} xyz
+....\pdfdest struct10 name{Doc-Start} xyz
 ....\pdfdest name{table.1} xyz
+....\pdfdest struct13 name{table.1} xyz
+....\pdfliteral page{/Artifact BMC}
+....\marks4{b-,4,-1,}
+....\marks4{b+,4,-1,}
+....\pdfliteral page{EMC}
+....\marks4{e-,4,5,}
+....\marks4{e+,4,5,}
 ....\glue(\topskip) 1.60004
 ....\hbox(8.39996+12.0)x345.0, glue set 155.2222fill
 .....\glue(\tabskip) 0.0 plus 1.0fill
@@ -50,6 +76,10 @@ Completed box being shipped out [1]
 ......\glue 6.0
 ......\glue 0.0 plus 1.0fil
 ......\glue 0.00002
+......\write1{\new@label@record{mcid-1}{{tagabspage}{\__property_code_tagabspage: }{tagmcabs}{1}{tagmcid}{\__property_code_tagmcid: }}}
+......\penalty 10000
+......\glue 0.0
+......\pdfliteral shipout page{/TD <</MCID \flag_height:n {__tag/mcid}\flag_raise:n {__tag/mcid} >> BDC}
 ......\hbox(6.94444+12.0)x0.0, glue set - 144.54fil
 .......\glue 0.0 plus 1.0fil minus 1.0fil
 .......\vbox(6.94444+12.0)x289.07999
@@ -73,6 +103,7 @@ Completed box being shipped out [1]
 .........\glue 0.0 plus 1.0fil
 ........\glue 12.0
 .......\glue 0.0 plus 1.0fil minus 1.0fil
+......\pdfliteral page{EMC}
 ......\glue 0.0 plus 1.0fil
 ......\glue 6.0
 ......\hbox(0.0+0.0)x0.0
@@ -81,50 +112,124 @@ Completed box being shipped out [1]
 .....\glue(\tabskip) 0.0
 .....\hbox(0.0+0.0)x17.55559
 .....\glue(\tabskip) 0.0 plus 1.0fill
+....\marks4{b-,1,7,TD,,,}
+....\marks4{b+,1,7,TD,,,}
+....\marks4{e-,1,7,}
+....\marks4{e+,1,7,}
 ....\glue(\lineskip) 0.0
 ....\hbox(8.39996+3.60004)x345.0, glue set 155.2222fill
 .....\glue(\tabskip) 0.0 plus 1.0fill
 .....\hbox(8.39996+3.60004)x17.00003
 ......\rule(8.39996+3.60004)x0.0
 ......\glue 6.0
 ......\glue 0.00002
+......\write1{\new@label@record{mcid-2}{{tagabspage}{\__property_code_tagabspage: }{tagmcabs}{2}{tagmcid}{\__property_code_tagmcid: }}}
+......\penalty 10000
+......\glue 0.0
+......\pdfliteral shipout page{/TD <</MCID \flag_height:n {__tag/mcid}\flag_raise:n {__tag/mcid} >> BDC}
 ......\OT1/cmr/m/n/10 a
+......\pdfliteral page{EMC}
 ......\glue 0.0 plus 1.0fil
 ......\glue 6.0
 .....\glue(\tabskip) 0.0
 .....\hbox(8.39996+3.60004)x17.55559
 ......\glue 6.0
 ......\glue 0.00002
+......\write1{\new@label@record{mcid-3}{{tagabspage}{\__property_code_tagabspage: }{tagmcabs}{3}{tagmcid}{\__property_code_tagmcid: }}}
+......\penalty 10000
+......\glue 0.0
+......\pdfliteral shipout page{/TD <</MCID \flag_height:n {__tag/mcid}\flag_raise:n {__tag/mcid} >> BDC}
 ......\OT1/cmr/m/n/10 b
+......\pdfliteral page{EMC}
 ......\glue 0.0 plus 1.0fil
 ......\glue 6.0
 .....\glue(\tabskip) 0.0 plus 1.0fill
+....\marks4{b-,2,9,TD,,,}
+....\marks4{b+,2,9,TD,,,}
+....\marks4{e-,2,9,}
+....\marks4{e+,2,9,}
+....\marks4{b-,3,10,TD,,,}
+....\marks4{b+,3,10,TD,,,}
+....\marks4{e-,3,10,}
+....\marks4{e+,3,10,}
+....\pdfliteral page{/Artifact BMC}
+....\marks4{b-,5,-1,}
+....\marks4{b+,5,-1,}
+....\pdfliteral page{EMC}
+....\marks4{e-,5,5,}
+....\marks4{e+,5,5,}
 ....\penalty 10000
 ....\penalty 0
 ....\glue 12.0 plus 4.0 minus 4.0
 ....\glue(\parskip) 0.0 plus 1.0
 ....\glue(\parskip) 0.0
 ....\glue(\baselineskip) 5.55556
 ....\hbox(6.44444+0.0)x345.0, glue set 324.99998fil
+.....\write1{\new@label@record{mcid-6}{{tagabspage}{\__property_code_tagabspage: }{tagmcabs}{6}{tagmcid}{\__property_code_tagmcid: }}}
+.....\pdfliteral shipout page{/text <</MCID \flag_height:n {__tag/mcid}\flag_raise:n {__tag/mcid} >> BDC}
 .....\hbox(0.0+0.0)x15.0
-.....\pdfstartlink(*+*)x* attr{/Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /Contents <FEFF0047006F00200074006F002000640065007300740069006E006100740069006F006E0020007400610062006C0065002E0031> } action goto name{table.1}
+.....\pdfliteral page{EMC}
+.....\write1{\new@label@record{mcid-7}{{tagabspage}{\__property_code_tagabspage: }{tagmcabs}{7}{tagmcid}{\__property_code_tagmcid: }}}
+.....\pdfliteral shipout page{/Link <</MCID \flag_height:n {__tag/mcid}\flag_raise:n {__tag/mcid} >> BDC}
+.....\pdfstartlink(*+*)x* attr{/Contents <FEFF0047006F00200074006F002000640065007300740069006E006100740069006F006E0020007400610062006C0065002E0031> /Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /StructParent 1 } action goto name{table.1}
 .....\OT1/cmr/m/n/10 1
 .....\pdfendlink
+.....\write1{\new@label@record{@tag@objr@page@1}{{tagabspage}{\__property_code_tagabspage: }}}
+.....\pdfliteral page{EMC}
+.....\write1{\new@label@record{mcid-8}{{tagabspage}{\__property_code_tagabspage: }{tagmcabs}{8}{tagmcid}{\__property_code_tagmcid: }}}
+.....\pdfliteral shipout page{/text <</MCID \flag_height:n {__tag/mcid}\flag_raise:n {__tag/mcid} >> BDC}
+.....\pdfliteral page{EMC}
 .....\penalty 10000
 .....\glue(\parfillskip) 0.0 plus 1.0fil
 .....\glue(\rightskip) 0.0
+....\marks4{b-,6,12,text,,,}
+....\marks4{b+,6,12,text,,,}
+....\marks4{e-,6,12,}
+....\marks4{e+,6,12,}
+....\marks4{b-,7,13,Link,,,}
+....\marks4{b+,7,13,Link,,,}
+....\marks4{e-,7,13,}
+....\marks4{e+,7,13,}
+....\marks4{b-,8,12,text,,,}
+....\marks4{b+,8,12,text,,,}
+....\marks4{e-,8,12,}
+....\marks4{e+,8,12,}
+....\glue 0.0 plus 1.0fil
+....\glue 0.0 plus -1.0fil
+....\kern 0.0
+....\hbox(0.0+0.0)x0.0
 ....\glue 0.0 plus 1.0fil
 ....\glue 0.0
 ....\glue 0.0 plus 0.0001fil
+...\pdfrunninglinkoff
+...\pdfliteral page{/Artifact BMC}
+...\marks4{b-,10,-1,}
+...\marks4{b+,10,-1,}
 ...\glue(\baselineskip) 23.55556
 ...\hbox(6.44444+0.0)x345.0
 ....\hbox(6.44444+0.0)x345.0, glue set 170.0fil
 .....\glue 0.0 plus 1.0fil
 .....\OT1/cmr/m/n/10 1
 .....\glue 0.0 plus 1.0fil
+...\pdfliteral page{EMC}
+...\marks4{e-,10,2,}
+...\marks4{e+,10,2,}
+...\pdfrunninglinkon
 .\kern 0.0
 .\kern 0.0
 .\kern -633.0
 .\hbox(0.0+0.0)x0.0
 .\kern 633.0
 (table-013-longtable-hyperref.aux)
+LaTeX Warning: Label(s) may have changed. Rerun to get cross-references right.
+Package tagpdf Info: Finalizing the tagging structure:
+(tagpdf)             Writing out ~13 structure objects
+(tagpdf)             with ~10 '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