[latex3-commits] [latex3/latex2e] UF-latex-lab-tikz: extend tagging recipes, correct alt text handling (3a912290)

github at latex-project.org github at latex-project.org
Sat Oct 12 17:29:47 CEST 2024


Repository : https://github.com/latex3/latex2e
On branch  : UF-latex-lab-tikz
Link       : https://github.com/latex3/latex2e/commit/3a9122907391c777679a5954380426065e80cc46

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

commit 3a9122907391c777679a5954380426065e80cc46
Author: Ulrike Fischer <fischer at troubleshooting-tex.de>
Date:   Sat Oct 12 17:29:47 2024 +0200

    extend tagging recipes, correct alt text handling


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

3a9122907391c777679a5954380426065e80cc46
 required/latex-lab/latex-lab-tikz.dtx              | 145 ++++++++++++++++++---
 .../testfiles-graphic/tikz-001.luatex.tpf          |  58 ++++-----
 required/latex-lab/testfiles-graphic/tikz-001.tpf  |  46 +++----
 .../testfiles-graphic/tikz-002.luatex.tpf          |  52 ++++----
 required/latex-lab/testfiles-graphic/tikz-002.pvt  |   2 +-
 required/latex-lab/testfiles-graphic/tikz-002.tpf  |  40 +++---
 .../testfiles-graphic/tikz-003.luatex.tpf          |  82 ++++++------
 required/latex-lab/testfiles-graphic/tikz-003.pvt  |   2 +-
 required/latex-lab/testfiles-graphic/tikz-003.tpf  |  70 +++++-----
 .../testfiles-graphic/tikz-004.luatex.tpf          |  88 ++++++-------
 required/latex-lab/testfiles-graphic/tikz-004.pvt  |   2 +-
 required/latex-lab/testfiles-graphic/tikz-004.tpf  |  76 +++++------
 12 files changed, 385 insertions(+), 278 deletions(-)

diff --git a/required/latex-lab/latex-lab-tikz.dtx b/required/latex-lab/latex-lab-tikz.dtx
index 49d3d657..7e5fbc8d 100644
--- a/required/latex-lab/latex-lab-tikz.dtx
+++ b/required/latex-lab/latex-lab-tikz.dtx
@@ -87,6 +87,41 @@
 % purpose of the \tikzname\ picture. This must be done before the actual environment as
 % \tikzname\ processes the keys too late to allow to do this in the optional argument.
 % 
+% \subsection{Tagging recipes}
+% 
+% As \tikzname\ pictures have so varied purposes there are a number of 
+% \enquote{tagging recipes}. Currently the recipe must be set before the 
+% \tikzname\ picture with \verb+\tagpdfsetup{graphic/tagging=+\meta{recipe name}\verb+}+. 
+% The following recipes exist:
+% 
+% \begin{description}
+% \item[figure] This surrounds the picture with a \texttt{Figure} tag and adds a BBox.
+% Such a figure should have an alternative text which describes the content. This alternative
+% text can be set with the \texttt{alt} key:
+% \begin{verbatim}
+% \begin{tikzpicture}[alt=A duck]
+% \duck
+% \end{tikzpicture}
+% \end{verbatim}
+% This recipe is meant for meaningful pictures. It is the default setting.
+% 
+% \item[text] This surrounds the graphical parts with an artifact MC and activates
+% tagging on node texts. It is meant for small pictures containing text in a node
+% that should be part of the text flow, e.g. a todo.
+% 
+% \item[artifact] This marks the picture as an artifact. This is meant for 
+% decorations. 
+% 
+% \item[symbol] This is meant for pictures where the drawing should 
+% represent a single symbol. Such pictures should then add an actualtext:
+%  
+% \begin{verbatim}
+% \begin{tikzpicture}[actualtext=A]
+% % drawing of a A
+% \end{tikzpicture}
+% \end{verbatim}
+% 
+% \end{description}
 % \section{Todos}
 % \begin{enumerate}
 % \item Does it make sense that with figure plug all content is an artifact or should
@@ -123,10 +158,11 @@
 %    \end{macrocode}
 % \end{socketdecl}
 % 
-% \begin{socketdecl}{tagsupport/tikzpicture/alt}
+% \begin{socketdecl}{tagsupport/tikzpicture/alt,tagsupport/tikzpicture/actualtext}
 % This socket takes as argument an alt text and will add it to the Figure structure.
 %    \begin{macrocode}
 \NewSocket{tagsupport/tikzpicture/alt}{1}
+\NewSocket{tagsupport/tikzpicture/actualtext}{1}
 %    \end{macrocode}
 % \end{socketdecl}
 % 
@@ -167,11 +203,11 @@
     {
       \bool_if:NT\l__tag_tikzpicture_usetext_bool
         {\ResumeTagging{\tikzpicture}} 
-      \UseTaggingSocket{tikzpicture/textbegin}
+      \tag_socket_use:n{tikzpicture/textbegin}
     }
    \def\pgfsys at end@text
     {
-      \UseTaggingSocket{tikzpicture/textend}
+      \tag_socket_use:n{tikzpicture/textend}
       \bool_if:NT\l__tag_tikzpicture_usetext_bool
         {\SuspendTagging{\tikzpicture} } 
     }       
@@ -196,21 +232,21 @@
  {
    \ifvmode
     {
-     \UseTaggingSocket{para/begin}   
+     \tag_socket_use:n{para/begin}   
     }     
    \fi
    \tag_mc_end_push: 
-   \tagstructbegin{tag=Figure,
+   \tag_struct_begin:n{tag=Figure,
     alt=a tikz figure%
     }
    \bool_set_false:N\l__tag_tikzpicture_usetext_bool
    \pgfrememberpicturepositiononpagetrue
-   \tagmcbegin{tag=Figure}
+   \tag_mc_begin:n{tag=Figure}
  } 
  
 \NewSocketPlug{tagsupport/tikzpicture/end}{figure}
  {
-   \tagmcend   
+   \tag_mc_end:   
    \cs_set:Npn\pgfqpoint##1##2
     {         
       \dim_to_decimal_in_bp:n {##1+ \pgf at picminx}
@@ -236,13 +272,63 @@
            >>   
         }
      }
-   \tagstructend
+   \tag_struct_end:
    \tag_mc_begin_pop:n{}
   }  
 %    \end{macrocode}
 % \end{plugdecl}
 % 
-%  These are also the default plugs
+% \begin{plugdecl}{symbol (tagsupport/tikzpicture/begin),symbol (tagsupport/tikzpicture/end)}
+% This plug handles the \tikzname\ picture as a symbol. 
+% It tags the content as a Span and expects and actual text.
+% Internally tagging is suspended. 
+%    \begin{macrocode}
+\NewSocketPlug{tagsupport/tikzpicture/begin}{symbol}
+ {
+   \ifvmode
+    {
+     \tag_socket_use:n{para/begin}   
+    }     
+   \fi
+   \tag_mc_end_push: 
+   \tag_struct_begin:n{tag=Span}
+   \bool_set_false:N\l__tag_tikzpicture_usetext_bool
+   \tag_mc_begin:n{}
+ } 
+ 
+\NewSocketPlug{tagsupport/tikzpicture/end}{symbol}
+ {
+   \tag_mc_end:   
+   \tag_struct_end:
+   \tag_mc_begin_pop:n{}
+  }  
+%    \end{macrocode}
+% \end{plugdecl}
+% 
+% \begin{plugdecl}{artifact (tagsupport/tikzpicture/begin),artifact (tagsupport/tikzpicture/end)}
+% This plug handles the \tikzname\ picture as a artifact, as decoration. 
+% So it is surrounded by an artifact MC and internal text do not restart tagging.
+%    \begin{macrocode}
+\NewSocketPlug{tagsupport/tikzpicture/begin}{artifact}
+ {
+   \ifvmode
+    {
+     \tag_socket_use:n{para/begin}   
+    }     
+   \fi
+   \tag_mc_end_push: 
+   \bool_set_false:N\l__tag_tikzpicture_usetext_bool
+   \tag_mc_begin:n{artifact}
+ } 
+ 
+\NewSocketPlug{tagsupport/tikzpicture/end}{artifact}
+ {
+   \tag_mc_end:
+   \tag_mc_begin_pop:n{}
+  }  
+%    \end{macrocode}
+% \end{plugdecl}
+%  By default we use the figure plugs
 %    \begin{macrocode}
 \AssignSocketPlug{tagsupport/tikzpicture/begin}{figure}
 \AssignSocketPlug{tagsupport/tikzpicture/end}{figure}
@@ -253,14 +339,14 @@
 %    \begin{macrocode}
 \AddToHook{cmd/pgfpicture/before}
  {
-  \UseTaggingSocket{tikzpicture/begin}
-  \SuspendTagging{\tikzpicture}
+  \tag_socket_use:n{tikzpicture/begin}
+  \tag_suspend:n{\tikzpicture}
  }
 
 \AddToHook{cmd/endpgfpicture/after}
  {
-  \ResumeTagging{\tikzpicture}
-  \UseTaggingSocket{tikzpicture/end}
+  \tag_resume:n{\tikzpicture}
+  \tag_socket_use:n{tikzpicture/end}
  }
 %    \end{macrocode}
 %
@@ -292,14 +378,26 @@
 %    \end{macrocode}
 % \end{plugdecl}
 % 
+% \begin{plugdecl}{default (tagsupport/tikzpicture/actualtext)}
+% This setups the actualtext key.
+%    \begin{macrocode}
+\NewSocketPlug{tagsupport/tikzpicture/actualtext}{default}
+ { \keys_set:nn { __tag / struct }{actualtext=#1} }
+\AssignSocketPlug{tagsupport/tikzpicture/actualtext}{default}
+%    \end{macrocode}
+% \end{plugdecl}
+% 
 % \subsection{Hooking into \tikzname}
 %    \begin{macrocode}
 \AddToHook{package/tikz/after}
  {
 %    \end{macrocode}
-% at first we add an alt key.
+% at first we add an alt and an actual key.
+% As keys are processed rather late inside the picture and tagging can be suspended
+% we use them always. TODO: check if we can process the key list in the sockets.
 %    \begin{macrocode}
-   \tikzset{alt/.code={\UseTaggingSocket{tikzpicture/alt}{#1}}}
+   \tikzset{alt/.code={\socket_use:nn{tagsupport/tikzpicture/alt}{#1}}}
+   \tikzset{actualtext/.code={\socket_use:nn{tagsupport/tikzpicture/actualtext}{#1}}}
 %    \end{macrocode}
  }
 %
@@ -308,18 +406,27 @@
 %    \begin{macrocode}
 \keys_define:nn { __tag / setup }
  {
-   tikz/type .choice:,
-   tikz/type/figure .code:n = 
+   graphic/tagging .choice:,
+   graphic/tagging/figure .code:n = 
     {
       \AssignSocketPlug{tagsupport/tikzpicture/begin}{figure}
       \AssignSocketPlug{tagsupport/tikzpicture/end}{figure}
     },
-   tikz/type/text .code:n = 
+   graphic/tagging/text .code:n = 
     {
       \AssignSocketPlug{tagsupport/tikzpicture/begin}{text}
       \AssignSocketPlug{tagsupport/tikzpicture/end}{text}
     }, 
-    
+   graphic/tagging/symbol .code:n = 
+    {
+      \AssignSocketPlug{tagsupport/tikzpicture/begin}{symbol}
+      \AssignSocketPlug{tagsupport/tikzpicture/end}{symbol}
+    },     
+   graphic/tagging/artifact .code:n = 
+    {
+      \AssignSocketPlug{tagsupport/tikzpicture/begin}{artifact}
+      \AssignSocketPlug{tagsupport/tikzpicture/end}{artifact}
+    },     
  }
 %    \end{macrocode}
 %    \begin{macrocode}
diff --git a/required/latex-lab/testfiles-graphic/tikz-001.luatex.tpf b/required/latex-lab/testfiles-graphic/tikz-001.luatex.tpf
index 08d2821a..dd2e6ce1 100644
--- a/required/latex-lab/testfiles-graphic/tikz-001.luatex.tpf
+++ b/required/latex-lab/testfiles-graphic/tikz-001.luatex.tpf
@@ -484,7 +484,7 @@ endobj
 <<  /Type /StructElem /C /justify /S /text /P 12 0 R /K [ 14 0 R ] /ID (ID.006) >>
 endobj
 14 0 obj
-<<  /Type /StructElem /Alt <FEFF006100740069006B007A006600690067007500720065> /S /Figure /P 13 0 R /A <</O/Layout/BBox [148.71233 631.87256 190.26447 667.19801]>> /K <</Type /MCR /Pg 26 0 R /MCID 0>>  /ID (ID.007) >>
+<<  /Type /StructElem /Alt <FEFF0072006500640020006C0069006E0065> /S /Figure /P 13 0 R /A <</O/Layout/BBox [148.71233 631.87256 190.26447 667.19801]>> /K <</Type /MCR /Pg 26 0 R /MCID 0>>  /ID (ID.007) >>
 endobj
 15 0 obj
 <<  /Type /StructElem /S /text-unit /P 9 0 R /K 16 0 R /ID (ID.008) >>
@@ -493,7 +493,7 @@ endobj
 <<  /Type /StructElem /C /justify /S /text /P 15 0 R /K [ 17 0 R <</Type /MCR /Pg 26 0 R /MCID 2>> ] /ID (ID.009) >>
 endobj
 17 0 obj
-<<  /Type /StructElem /Alt <FEFF006100740069006B007A006600690067007500720065> /S /Figure /P 16 0 R /A <</O/Layout/BBox [148.71233 595.55083 190.26447 630.87628]>> /K <</Type /MCR /Pg 26 0 R /MCID 1>>  /ID (ID.010) >>
+<<  /Type /StructElem /Alt <FEFF0072006500640020006C0069006E0065> /S /Figure /P 16 0 R /A <</O/Layout/BBox [148.71233 595.55083 190.26447 630.87628]>> /K <</Type /MCR /Pg 26 0 R /MCID 1>>  /ID (ID.010) >>
 endobj
 18 0 obj
 <<  /Type /StructElem /S /text-unit /P 9 0 R /K 19 0 R /ID (ID.011) >>
@@ -502,7 +502,7 @@ endobj
 <<  /Type /StructElem /C /justify /S /text /P 18 0 R /K [<</Type /MCR /Pg 26 0 R /MCID 3>>  20 0 R ] /ID (ID.012) >>
 endobj
 20 0 obj
-<<  /Type /StructElem /Alt <FEFF006100740069006B007A006600690067007500720065> /S /Figure /P 19 0 R /A <</O/Layout/BBox [173.06554 559.2291 214.61768 594.55457]>> /K <</Type /MCR /Pg 26 0 R /MCID 4>>  /ID (ID.013) >>
+<<  /Type /StructElem /Alt <FEFF0072006500640020006C0069006E0065> /S /Figure /P 19 0 R /A <</O/Layout/BBox [173.06554 559.2291 214.61768 594.55457]>> /K <</Type /MCR /Pg 26 0 R /MCID 4>>  /ID (ID.013) >>
 endobj
 21 0 obj
 <<  /Type /StructElem /S /text-unit /P 9 0 R /K 22 0 R /ID (ID.014) >>
@@ -721,7 +721,7 @@ xref
 0000014503 00000 n 
 0000000004 00000 f 
 0000000008 00000 f 
-0000017733 00000 n 
+0000017697 00000 n 
 0000014592 00000 n 
 0000015019 00000 n 
 0000000000 00000 f 
@@ -731,40 +731,40 @@ xref
 0000015922 00000 n 
 0000016009 00000 n 
 0000016108 00000 n 
-0000016341 00000 n 
-0000016428 00000 n 
-0000016561 00000 n 
-0000016794 00000 n 
-0000016881 00000 n 
-0000017014 00000 n 
-0000017246 00000 n 
-0000017333 00000 n 
-0000017500 00000 n 
+0000016329 00000 n 
+0000016416 00000 n 
+0000016549 00000 n 
+0000016770 00000 n 
+0000016857 00000 n 
+0000016990 00000 n 
+0000017210 00000 n 
+0000017297 00000 n 
+0000017464 00000 n 
 0000000020 00000 n 
 0000014340 00000 n 
 0000014205 00000 n 
 0000011800 00000 n 
-0000032141 00000 n 
-0000019534 00000 n 
-0000032299 00000 n 
+0000032105 00000 n 
+0000019498 00000 n 
+0000032263 00000 n 
 0000014556 00000 n 
 0000014684 00000 n 
 0000014982 00000 n 
 0000015598 00000 n 
-0000017851 00000 n 
-0000018546 00000 n 
-0000017883 00000 n 
-0000017956 00000 n 
-0000018782 00000 n 
-0000019688 00000 n 
-0000019888 00000 n 
-0000030124 00000 n 
-0000020069 00000 n 
-0000030357 00000 n 
-0000032361 00000 n 
-0000032476 00000 n 
+0000017815 00000 n 
+0000018510 00000 n 
+0000017847 00000 n 
+0000017920 00000 n 
+0000018746 00000 n 
+0000019652 00000 n 
+0000019852 00000 n 
+0000030088 00000 n 
+0000020033 00000 n 
+0000030321 00000 n 
+0000032325 00000 n 
+0000032440 00000 n 
 trailer
 << /Size 47 /Root 45 0 R /Info 46 0 R /ID [ <2350CAD05F8A7AF0AA4058486855344F> <2350CAD05F8A7AF0AA4058486855344F> ] >>
 startxref
-32608
+32572
 %%EOF
diff --git a/required/latex-lab/testfiles-graphic/tikz-001.tpf b/required/latex-lab/testfiles-graphic/tikz-001.tpf
index f6270817..460b1e41 100644
--- a/required/latex-lab/testfiles-graphic/tikz-001.tpf
+++ b/required/latex-lab/testfiles-graphic/tikz-001.tpf
@@ -483,7 +483,7 @@ endobj
 <<  /Type /StructElem /C /justify /S /text /P 12 0 R /K [<</Type /MCR /Pg 14 0 R/MCID 0>> 15 0 R <</Type /MCR /Pg 14 0 R/MCID 2>>] /ID (ID.006) >>
 endobj
 15 0 obj
-<<  /Type /StructElem /Alt <FEFF006100740069006B007A006600690067007500720065> /S /Figure /P 13 0 R /A <</O/Layout/BBox [148.71233 631.90187 190.26126 667.19801]>> /K <</Type /MCR /Pg 14 0 R/MCID 1>> /ID (ID.007) >>
+<<  /Type /StructElem /Alt <FEFF0072006500640020006C0069006E0065> /S /Figure /P 13 0 R /A <</O/Layout/BBox [148.71233 631.90187 190.26126 667.19801]>> /K <</Type /MCR /Pg 14 0 R/MCID 1>> /ID (ID.007) >>
 endobj
 16 0 obj
 <<  /Type /StructElem /S /text-unit /P 9 0 R /K 17 0 R /ID (ID.008) >>
@@ -492,7 +492,7 @@ endobj
 <<  /Type /StructElem /C /justify /S /text /P 16 0 R /K [<</Type /MCR /Pg 14 0 R/MCID 3>> 18 0 R <</Type /MCR /Pg 14 0 R/MCID 5>>] /ID (ID.009) >>
 endobj
 18 0 obj
-<<  /Type /StructElem /Alt <FEFF006100740069006B007A006600690067007500720065> /S /Figure /P 17 0 R /A <</O/Layout/BBox [148.71233 595.60948 190.26126 630.90561]>> /K <</Type /MCR /Pg 14 0 R/MCID 4>> /ID (ID.010) >>
+<<  /Type /StructElem /Alt <FEFF0072006500640020006C0069006E0065> /S /Figure /P 17 0 R /A <</O/Layout/BBox [148.71233 595.60948 190.26126 630.90561]>> /K <</Type /MCR /Pg 14 0 R/MCID 4>> /ID (ID.010) >>
 endobj
 19 0 obj
 <<  /Type /StructElem /S /text-unit /P 9 0 R /K 20 0 R /ID (ID.011) >>
@@ -501,7 +501,7 @@ endobj
 <<  /Type /StructElem /C /justify /S /text /P 19 0 R /K [<</Type /MCR /Pg 14 0 R/MCID 6>> 21 0 R <</Type /MCR /Pg 14 0 R/MCID 8>>] /ID (ID.012) >>
 endobj
 21 0 obj
-<<  /Type /StructElem /Alt <FEFF006100740069006B007A006600690067007500720065> /S /Figure /P 20 0 R /A <</O/Layout/BBox [173.0595 559.31708 214.60843 594.6132]>> /K <</Type /MCR /Pg 14 0 R/MCID 7>> /ID (ID.013) >>
+<<  /Type /StructElem /Alt <FEFF0072006500640020006C0069006E0065> /S /Figure /P 20 0 R /A <</O/Layout/BBox [173.0595 559.31708 214.60843 594.6132]>> /K <</Type /MCR /Pg 14 0 R/MCID 7>> /ID (ID.013) >>
 endobj
 22 0 obj
 <<  /Type /StructElem /S /text-unit /P 9 0 R /K 23 0 R /ID (ID.014) >>
@@ -733,7 +733,7 @@ xref
 0000014243 00000 n 
 0000000004 00000 f 
 0000000008 00000 f 
-0000017613 00000 n 
+0000017577 00000 n 
 0000014332 00000 n 
 0000014787 00000 n 
 0000000000 00000 f 
@@ -744,36 +744,36 @@ xref
 0000015777 00000 n 
 0000013955 00000 n 
 0000015940 00000 n 
-0000016171 00000 n 
-0000016258 00000 n 
-0000016421 00000 n 
-0000016652 00000 n 
-0000016739 00000 n 
-0000016902 00000 n 
-0000017131 00000 n 
-0000017218 00000 n 
-0000017382 00000 n 
+0000016159 00000 n 
+0000016246 00000 n 
+0000016409 00000 n 
+0000016628 00000 n 
+0000016715 00000 n 
+0000016878 00000 n 
+0000017095 00000 n 
+0000017182 00000 n 
+0000017346 00000 n 
 0000000015 00000 n 
 0000014090 00000 n 
 0000011792 00000 n 
-0000030817 00000 n 
-0000030995 00000 n 
+0000030781 00000 n 
+0000030959 00000 n 
 0000014296 00000 n 
 0000014452 00000 n 
 0000014750 00000 n 
 0000015366 00000 n 
-0000028645 00000 n 
-0000017731 00000 n 
-0000018170 00000 n 
-0000028414 00000 n 
-0000028728 00000 n 
-0000031054 00000 n 
-0000031169 00000 n 
+0000028609 00000 n 
+0000017695 00000 n 
+0000018134 00000 n 
+0000028378 00000 n 
+0000028692 00000 n 
+0000031018 00000 n 
+0000031133 00000 n 
 trailer
 << /Size 41
 /Root 39 0 R
 /Info 40 0 R
 /ID [<9BD18DF3359C1216B83ADB4AA401CC9A> <9BD18DF3359C1216B83ADB4AA401CC9A>] >>
 startxref
-31301
+31265
 %%EOF
diff --git a/required/latex-lab/testfiles-graphic/tikz-002.luatex.tpf b/required/latex-lab/testfiles-graphic/tikz-002.luatex.tpf
index 01c34800..a11e51ae 100644
--- a/required/latex-lab/testfiles-graphic/tikz-002.luatex.tpf
+++ b/required/latex-lab/testfiles-graphic/tikz-002.luatex.tpf
@@ -529,19 +529,19 @@ endobj
 <<  /Type /StructElem /S /text-unit /P 9 0 R /K 13 0 R /ID (ID.005) >>
 endobj
 13 0 obj
-<<  /Type /StructElem /C /justify /S /text /P 12 0 R /K [ <</Type /MCR /Pg 22 0 R /MCID 1>>  <</Type /MCR /Pg 22 0 R /MCID 0>>  ] /ID (ID.006) >>
+<<  /Type /StructElem /C /justify /S /text /P 12 0 R /Alt <FEFF0072006500640020006C0069006E0065> /K [ <</Type /MCR /Pg 22 0 R /MCID 1>>  <</Type /MCR /Pg 22 0 R /MCID 0>>  ] /ID (ID.006) >>
 endobj
 14 0 obj
 <<  /Type /StructElem /S /text-unit /P 9 0 R /K 15 0 R /ID (ID.007) >>
 endobj
 15 0 obj
-<<  /Type /StructElem /C /justify /S /text /P 14 0 R /K [ <</Type /MCR /Pg 22 0 R /MCID 3>>  <</Type /MCR /Pg 22 0 R /MCID 2>>  <</Type /MCR /Pg 22 0 R /MCID 4>> ] /ID (ID.008) >>
+<<  /Type /StructElem /C /justify /S /text /P 14 0 R /Alt <FEFF0072006500640020006C0069006E0065> /K [ <</Type /MCR /Pg 22 0 R /MCID 3>>  <</Type /MCR /Pg 22 0 R /MCID 2>>  <</Type /MCR /Pg 22 0 R /MCID 4>> ] /ID (ID.008) >>
 endobj
 16 0 obj
 <<  /Type /StructElem /S /text-unit /P 9 0 R /K 17 0 R /ID (ID.009) >>
 endobj
 17 0 obj
-<<  /Type /StructElem /C /justify /S /text /P 16 0 R /K [<</Type /MCR /Pg 22 0 R /MCID 5>>  <</Type /MCR /Pg 22 0 R /MCID 7>>  <</Type /MCR /Pg 22 0 R /MCID 6>>  ] /ID (ID.010) >>
+<<  /Type /StructElem /C /justify /S /text /P 16 0 R /Alt <FEFF0072006500640020006C0069006E0065> /K [<</Type /MCR /Pg 22 0 R /MCID 5>>  <</Type /MCR /Pg 22 0 R /MCID 7>>  <</Type /MCR /Pg 22 0 R /MCID 6>>  ] /ID (ID.010) >>
 endobj
 18 0 obj
 <<  /Type /StructElem /S /text-unit /P 9 0 R /K 19 0 R /ID (ID.011) >>
@@ -757,7 +757,7 @@ xref
 0000015053 00000 n 
 0000000004 00000 f 
 0000000008 00000 f 
-0000017570 00000 n 
+0000017702 00000 n 
 0000015142 00000 n 
 0000015533 00000 n 
 0000000000 00000 f 
@@ -766,37 +766,37 @@ xref
 0000016360 00000 n 
 0000016436 00000 n 
 0000016523 00000 n 
-0000016685 00000 n 
-0000016772 00000 n 
-0000016968 00000 n 
-0000017055 00000 n 
-0000017251 00000 n 
-0000017338 00000 n 
+0000016729 00000 n 
+0000016816 00000 n 
+0000017056 00000 n 
+0000017143 00000 n 
+0000017383 00000 n 
+0000017470 00000 n 
 0000000020 00000 n 
 0000014890 00000 n 
 0000014755 00000 n 
 0000011800 00000 n 
-0000031978 00000 n 
-0000019371 00000 n 
-0000032136 00000 n 
+0000032110 00000 n 
+0000019503 00000 n 
+0000032268 00000 n 
 0000015106 00000 n 
 0000015262 00000 n 
 0000015496 00000 n 
 0000016112 00000 n 
-0000017688 00000 n 
-0000018383 00000 n 
-0000017720 00000 n 
-0000017793 00000 n 
-0000018619 00000 n 
-0000019525 00000 n 
-0000019725 00000 n 
-0000029961 00000 n 
-0000019906 00000 n 
-0000030194 00000 n 
-0000032198 00000 n 
-0000032313 00000 n 
+0000017820 00000 n 
+0000018515 00000 n 
+0000017852 00000 n 
+0000017925 00000 n 
+0000018751 00000 n 
+0000019657 00000 n 
+0000019857 00000 n 
+0000030093 00000 n 
+0000020038 00000 n 
+0000030326 00000 n 
+0000032330 00000 n 
+0000032445 00000 n 
 trailer
 << /Size 43 /Root 41 0 R /Info 42 0 R /ID [ <2350CAD05F8A7AF0AA4058486855344F> <2350CAD05F8A7AF0AA4058486855344F> ] >>
 startxref
-32445
+32577
 %%EOF
diff --git a/required/latex-lab/testfiles-graphic/tikz-002.pvt b/required/latex-lab/testfiles-graphic/tikz-002.pvt
index 3dd1ecc9..e6b81577 100644
--- a/required/latex-lab/testfiles-graphic/tikz-002.pvt
+++ b/required/latex-lab/testfiles-graphic/tikz-002.pvt
@@ -11,7 +11,7 @@
 % text paragraph.
 \START 
 
-\tagpdfsetup{tikz/type=text}
+\tagpdfsetup{graphic/tagging=text}
 \begin{tikzpicture}[alt=red line]
 \draw[red] (0,0)--(1,1);
 \node[draw]{blub};
diff --git a/required/latex-lab/testfiles-graphic/tikz-002.tpf b/required/latex-lab/testfiles-graphic/tikz-002.tpf
index 299dd86f..e8848e93 100644
--- a/required/latex-lab/testfiles-graphic/tikz-002.tpf
+++ b/required/latex-lab/testfiles-graphic/tikz-002.tpf
@@ -520,19 +520,19 @@ endobj
 <<  /Type /StructElem /S /text-unit /P 9 0 R /K 13 0 R /ID (ID.005) >>
 endobj
 13 0 obj
-<<  /Type /StructElem /C /justify /S /text /P 12 0 R /K [<</Type /MCR /Pg 14 0 R/MCID 0>> <</Type /MCR /Pg 14 0 R/MCID 2>> <</Type /MCR /Pg 14 0 R/MCID 1>> <</Type /MCR /Pg 14 0 R/MCID 3>>] /ID (ID.006) >>
+<<  /Type /StructElem /C /justify /S /text /P 12 0 R /Alt <FEFF0072006500640020006C0069006E0065> /K [<</Type /MCR /Pg 14 0 R/MCID 0>> <</Type /MCR /Pg 14 0 R/MCID 2>> <</Type /MCR /Pg 14 0 R/MCID 1>> <</Type /MCR /Pg 14 0 R/MCID 3>>] /ID (ID.006) >>
 endobj
 15 0 obj
 <<  /Type /StructElem /S /text-unit /P 9 0 R /K 16 0 R /ID (ID.007) >>
 endobj
 16 0 obj
-<<  /Type /StructElem /C /justify /S /text /P 15 0 R /K [<</Type /MCR /Pg 14 0 R/MCID 4>> <</Type /MCR /Pg 14 0 R/MCID 6>> <</Type /MCR /Pg 14 0 R/MCID 5>> <</Type /MCR /Pg 14 0 R/MCID 7>>] /ID (ID.008) >>
+<<  /Type /StructElem /C /justify /S /text /P 15 0 R /Alt <FEFF0072006500640020006C0069006E0065> /K [<</Type /MCR /Pg 14 0 R/MCID 4>> <</Type /MCR /Pg 14 0 R/MCID 6>> <</Type /MCR /Pg 14 0 R/MCID 5>> <</Type /MCR /Pg 14 0 R/MCID 7>>] /ID (ID.008) >>
 endobj
 17 0 obj
 <<  /Type /StructElem /S /text-unit /P 9 0 R /K 18 0 R /ID (ID.009) >>
 endobj
 18 0 obj
-<<  /Type /StructElem /C /justify /S /text /P 17 0 R /K [<</Type /MCR /Pg 14 0 R/MCID 8>> <</Type /MCR /Pg 14 0 R/MCID 10>> <</Type /MCR /Pg 14 0 R/MCID 9>> <</Type /MCR /Pg 14 0 R/MCID 11>>] /ID (ID.010) >>
+<<  /Type /StructElem /C /justify /S /text /P 17 0 R /Alt <FEFF0072006500640020006C0069006E0065> /K [<</Type /MCR /Pg 14 0 R/MCID 8>> <</Type /MCR /Pg 14 0 R/MCID 10>> <</Type /MCR /Pg 14 0 R/MCID 9>> <</Type /MCR /Pg 14 0 R/MCID 11>>] /ID (ID.010) >>
 endobj
 19 0 obj
 <<  /Type /StructElem /S /text-unit /P 9 0 R /K 20 0 R /ID (ID.011) >>
@@ -761,7 +761,7 @@ xref
 0000014727 00000 n 
 0000000004 00000 f 
 0000000008 00000 f 
-0000017380 00000 n 
+0000017512 00000 n 
 0000014816 00000 n 
 0000015235 00000 n 
 0000000000 00000 f 
@@ -771,33 +771,33 @@ xref
 0000016138 00000 n 
 0000016225 00000 n 
 0000014439 00000 n 
-0000016447 00000 n 
-0000016534 00000 n 
-0000016756 00000 n 
-0000016843 00000 n 
-0000017067 00000 n 
-0000017154 00000 n 
+0000016491 00000 n 
+0000016578 00000 n 
+0000016844 00000 n 
+0000016931 00000 n 
+0000017199 00000 n 
+0000017286 00000 n 
 0000000015 00000 n 
 0000014574 00000 n 
 0000011792 00000 n 
-0000030584 00000 n 
-0000030762 00000 n 
+0000030716 00000 n 
+0000030894 00000 n 
 0000014780 00000 n 
 0000014964 00000 n 
 0000015198 00000 n 
 0000015814 00000 n 
-0000028412 00000 n 
-0000017498 00000 n 
-0000017937 00000 n 
-0000028181 00000 n 
-0000028495 00000 n 
-0000030821 00000 n 
-0000030936 00000 n 
+0000028544 00000 n 
+0000017630 00000 n 
+0000018069 00000 n 
+0000028313 00000 n 
+0000028627 00000 n 
+0000030953 00000 n 
+0000031068 00000 n 
 trailer
 << /Size 37
 /Root 35 0 R
 /Info 36 0 R
 /ID [<9BD18DF3359C1216B83ADB4AA401CC9A> <9BD18DF3359C1216B83ADB4AA401CC9A>] >>
 startxref
-31068
+31200
 %%EOF
diff --git a/required/latex-lab/testfiles-graphic/tikz-003.luatex.tpf b/required/latex-lab/testfiles-graphic/tikz-003.luatex.tpf
index 457ac8d8..8327610d 100644
--- a/required/latex-lab/testfiles-graphic/tikz-003.luatex.tpf
+++ b/required/latex-lab/testfiles-graphic/tikz-003.luatex.tpf
@@ -529,7 +529,7 @@ endobj
 <<  /Type /StructElem /S /text-unit /P 9 0 R /K [13 0 R 14 0 R 17 0 R] /ID (ID.005) >>
 endobj
 13 0 obj
-<<  /Type /StructElem /C /justify /S /text /P 12 0 R /K [ ] /ID (ID.006) >>
+<<  /Type /StructElem /C /justify /S /text /P 12 0 R /Alt <FEFF0072006500640020006C0069006E0065> /K [ ] /ID (ID.006) >>
 endobj
 14 0 obj
 <<  /Type /StructElem /S /Div /P 12 0 R /K 15 0 R /ID (ID.007) >>
@@ -547,7 +547,7 @@ endobj
 <<  /Type /StructElem /S /text-unit /P 9 0 R /K [19 0 R 20 0 R 23 0 R] /ID (ID.011) >>
 endobj
 19 0 obj
-<<  /Type /StructElem /C /justify /S /text /P 18 0 R /K [ ] /ID (ID.012) >>
+<<  /Type /StructElem /C /justify /S /text /P 18 0 R /Alt <FEFF0072006500640020006C0069006E0065> /K [ ] /ID (ID.012) >>
 endobj
 20 0 obj
 <<  /Type /StructElem /S /Div /P 18 0 R /K 21 0 R /ID (ID.013) >>
@@ -565,7 +565,7 @@ endobj
 <<  /Type /StructElem /S /text-unit /P 9 0 R /K [25 0 R 26 0 R 29 0 R] /ID (ID.017) >>
 endobj
 25 0 obj
-<<  /Type /StructElem /C /justify /S /text /P 24 0 R /K [<</Type /MCR /Pg 38 0 R /MCID 5>>  ] /ID (ID.018) >>
+<<  /Type /StructElem /C /justify /S /text /P 24 0 R /Alt <FEFF0072006500640020006C0069006E0065> /K [<</Type /MCR /Pg 38 0 R /MCID 5>>  ] /ID (ID.018) >>
 endobj
 26 0 obj
 <<  /Type /StructElem /S /Div /P 24 0 R /K 27 0 R /ID (ID.019) >>
@@ -805,7 +805,7 @@ xref
 0000015065 00000 n 
 0000000004 00000 f 
 0000000008 00000 f 
-0000019254 00000 n 
+0000019386 00000 n 
 0000015154 00000 n 
 0000015801 00000 n 
 0000000000 00000 f 
@@ -814,53 +814,53 @@ xref
 0000016628 00000 n 
 0000016704 00000 n 
 0000016807 00000 n 
-0000016899 00000 n 
-0000016981 00000 n 
-0000017069 00000 n 
-0000017192 00000 n 
-0000017307 00000 n 
-0000017410 00000 n 
-0000017502 00000 n 
-0000017584 00000 n 
+0000016943 00000 n 
+0000017025 00000 n 
+0000017113 00000 n 
+0000017236 00000 n 
+0000017351 00000 n 
+0000017454 00000 n 
+0000017590 00000 n 
 0000017672 00000 n 
-0000017795 00000 n 
-0000017944 00000 n 
-0000018047 00000 n 
-0000018173 00000 n 
-0000018255 00000 n 
-0000018343 00000 n 
-0000018466 00000 n 
-0000018581 00000 n 
-0000018684 00000 n 
-0000018810 00000 n 
-0000018892 00000 n 
-0000018980 00000 n 
-0000019104 00000 n 
+0000017760 00000 n 
+0000017883 00000 n 
+0000018032 00000 n 
+0000018135 00000 n 
+0000018305 00000 n 
+0000018387 00000 n 
+0000018475 00000 n 
+0000018598 00000 n 
+0000018713 00000 n 
+0000018816 00000 n 
+0000018942 00000 n 
+0000019024 00000 n 
+0000019112 00000 n 
+0000019236 00000 n 
 0000000020 00000 n 
 0000014902 00000 n 
 0000014767 00000 n 
 0000011800 00000 n 
-0000033662 00000 n 
-0000021055 00000 n 
-0000033820 00000 n 
+0000033794 00000 n 
+0000021187 00000 n 
+0000033952 00000 n 
 0000015118 00000 n 
 0000015274 00000 n 
 0000015764 00000 n 
 0000016380 00000 n 
-0000019372 00000 n 
-0000020067 00000 n 
-0000019404 00000 n 
-0000019477 00000 n 
-0000020303 00000 n 
-0000021209 00000 n 
-0000021409 00000 n 
-0000031645 00000 n 
-0000021590 00000 n 
-0000031878 00000 n 
-0000033882 00000 n 
-0000033997 00000 n 
+0000019504 00000 n 
+0000020199 00000 n 
+0000019536 00000 n 
+0000019609 00000 n 
+0000020435 00000 n 
+0000021341 00000 n 
+0000021541 00000 n 
+0000031777 00000 n 
+0000021722 00000 n 
+0000032010 00000 n 
+0000034014 00000 n 
+0000034129 00000 n 
 trailer
 << /Size 59 /Root 57 0 R /Info 58 0 R /ID [ <2350CAD05F8A7AF0AA4058486855344F> <2350CAD05F8A7AF0AA4058486855344F> ] >>
 startxref
-34129
+34261
 %%EOF
diff --git a/required/latex-lab/testfiles-graphic/tikz-003.pvt b/required/latex-lab/testfiles-graphic/tikz-003.pvt
index b3899103..8efffc4c 100644
--- a/required/latex-lab/testfiles-graphic/tikz-003.pvt
+++ b/required/latex-lab/testfiles-graphic/tikz-003.pvt
@@ -11,7 +11,7 @@
 % The text inside the nodes should be visible and be tagged like a minipage
 \START 
 
-\tagpdfsetup{tikz/type=text}
+\tagpdfsetup{graphic/tagging=text}
 \begin{tikzpicture}[alt=red line]
 \draw[red] (0,0)--(1,1);
 \node[draw,text width=1cm]{blub};
diff --git a/required/latex-lab/testfiles-graphic/tikz-003.tpf b/required/latex-lab/testfiles-graphic/tikz-003.tpf
index b44fc6a3..97c9772c 100644
--- a/required/latex-lab/testfiles-graphic/tikz-003.tpf
+++ b/required/latex-lab/testfiles-graphic/tikz-003.tpf
@@ -536,7 +536,7 @@ endobj
 <<  /Type /StructElem /S /text-unit /P 9 0 R /K [13 0 R 15 0 R 18 0 R] /ID (ID.005) >>
 endobj
 13 0 obj
-<<  /Type /StructElem /C /justify /S /text /P 12 0 R /K [<</Type /MCR /Pg 14 0 R/MCID 0>> <</Type /MCR /Pg 14 0 R/MCID 2>>] /ID (ID.006) >>
+<<  /Type /StructElem /C /justify /S /text /P 12 0 R /Alt <FEFF0072006500640020006C0069006E0065> /K [<</Type /MCR /Pg 14 0 R/MCID 0>> <</Type /MCR /Pg 14 0 R/MCID 2>>] /ID (ID.006) >>
 endobj
 15 0 obj
 <<  /Type /StructElem /S /Div /P 12 0 R /K 16 0 R /ID (ID.007) >>
@@ -554,7 +554,7 @@ endobj
 <<  /Type /StructElem /S /text-unit /P 9 0 R /K [20 0 R 21 0 R 24 0 R] /ID (ID.011) >>
 endobj
 20 0 obj
-<<  /Type /StructElem /C /justify /S /text /P 19 0 R /K [<</Type /MCR /Pg 14 0 R/MCID 6>> <</Type /MCR /Pg 14 0 R/MCID 8>>] /ID (ID.012) >>
+<<  /Type /StructElem /C /justify /S /text /P 19 0 R /Alt <FEFF0072006500640020006C0069006E0065> /K [<</Type /MCR /Pg 14 0 R/MCID 6>> <</Type /MCR /Pg 14 0 R/MCID 8>>] /ID (ID.012) >>
 endobj
 21 0 obj
 <<  /Type /StructElem /S /Div /P 19 0 R /K 22 0 R /ID (ID.013) >>
@@ -572,7 +572,7 @@ endobj
 <<  /Type /StructElem /S /text-unit /P 9 0 R /K [26 0 R 27 0 R 30 0 R] /ID (ID.017) >>
 endobj
 26 0 obj
-<<  /Type /StructElem /C /justify /S /text /P 25 0 R /K [<</Type /MCR /Pg 14 0 R/MCID 12>> <</Type /MCR /Pg 14 0 R/MCID 14>>] /ID (ID.018) >>
+<<  /Type /StructElem /C /justify /S /text /P 25 0 R /Alt <FEFF0072006500640020006C0069006E0065> /K [<</Type /MCR /Pg 14 0 R/MCID 12>> <</Type /MCR /Pg 14 0 R/MCID 14>>] /ID (ID.018) >>
 endobj
 27 0 obj
 <<  /Type /StructElem /S /Div /P 25 0 R /K 28 0 R /ID (ID.019) >>
@@ -825,7 +825,7 @@ xref
 0000014966 00000 n 
 0000000004 00000 f 
 0000000008 00000 f 
-0000019611 00000 n 
+0000019743 00000 n 
 0000015055 00000 n 
 0000015786 00000 n 
 0000000000 00000 f 
@@ -835,49 +835,49 @@ xref
 0000016689 00000 n 
 0000016792 00000 n 
 0000014678 00000 n 
-0000016948 00000 n 
-0000017030 00000 n 
-0000017118 00000 n 
-0000017239 00000 n 
-0000017416 00000 n 
-0000017519 00000 n 
-0000017675 00000 n 
-0000017757 00000 n 
+0000016992 00000 n 
+0000017074 00000 n 
+0000017162 00000 n 
+0000017283 00000 n 
+0000017460 00000 n 
+0000017563 00000 n 
+0000017763 00000 n 
 0000017845 00000 n 
-0000017966 00000 n 
-0000018145 00000 n 
-0000018248 00000 n 
-0000018406 00000 n 
-0000018488 00000 n 
-0000018576 00000 n 
-0000018698 00000 n 
-0000018878 00000 n 
-0000018981 00000 n 
-0000019139 00000 n 
-0000019221 00000 n 
-0000019309 00000 n 
-0000019431 00000 n 
+0000017933 00000 n 
+0000018054 00000 n 
+0000018233 00000 n 
+0000018336 00000 n 
+0000018538 00000 n 
+0000018620 00000 n 
+0000018708 00000 n 
+0000018830 00000 n 
+0000019010 00000 n 
+0000019113 00000 n 
+0000019271 00000 n 
+0000019353 00000 n 
+0000019441 00000 n 
+0000019563 00000 n 
 0000000015 00000 n 
 0000014813 00000 n 
 0000011792 00000 n 
-0000032815 00000 n 
-0000032993 00000 n 
+0000032947 00000 n 
+0000033125 00000 n 
 0000015019 00000 n 
 0000015259 00000 n 
 0000015749 00000 n 
 0000016365 00000 n 
-0000030643 00000 n 
-0000019729 00000 n 
-0000020168 00000 n 
-0000030412 00000 n 
-0000030726 00000 n 
-0000033052 00000 n 
-0000033167 00000 n 
+0000030775 00000 n 
+0000019861 00000 n 
+0000020300 00000 n 
+0000030544 00000 n 
+0000030858 00000 n 
+0000033184 00000 n 
+0000033299 00000 n 
 trailer
 << /Size 53
 /Root 51 0 R
 /Info 52 0 R
 /ID [<9BD18DF3359C1216B83ADB4AA401CC9A> <9BD18DF3359C1216B83ADB4AA401CC9A>] >>
 startxref
-33299
+33431
 %%EOF
diff --git a/required/latex-lab/testfiles-graphic/tikz-004.luatex.tpf b/required/latex-lab/testfiles-graphic/tikz-004.luatex.tpf
index 6b357e17..c8738ec3 100644
--- a/required/latex-lab/testfiles-graphic/tikz-004.luatex.tpf
+++ b/required/latex-lab/testfiles-graphic/tikz-004.luatex.tpf
@@ -538,7 +538,7 @@ endobj
 <<  /Type /StructElem /S /text-unit /P 12 0 R /K [14 0 R 15 0 R 18 0 R] /ID (ID.006) >>
 endobj
 14 0 obj
-<<  /Type /StructElem /C /justify /S /text /P 13 0 R /K [ ] /ID (ID.007) >>
+<<  /Type /StructElem /C /justify /S /text /P 13 0 R /Alt <FEFF0072006500640020006C0069006E0065> /K [ ] /ID (ID.007) >>
 endobj
 15 0 obj
 <<  /Type /StructElem /S /Div /P 13 0 R /K 16 0 R /ID (ID.008) >>
@@ -559,7 +559,7 @@ endobj
 <<  /Type /StructElem /S /text-unit /P 19 0 R /K [21 0 R 22 0 R 25 0 R] /ID (ID.013) >>
 endobj
 21 0 obj
-<<  /Type /StructElem /C /justify /S /text /P 20 0 R /K [ ] /ID (ID.014) >>
+<<  /Type /StructElem /C /justify /S /text /P 20 0 R /Alt <FEFF0072006500640020006C0069006E0065> /K [ ] /ID (ID.014) >>
 endobj
 22 0 obj
 <<  /Type /StructElem /S /Div /P 20 0 R /K 23 0 R /ID (ID.015) >>
@@ -580,7 +580,7 @@ endobj
 <<  /Type /StructElem /S /text-unit /P 26 0 R /K [28 0 R 29 0 R 32 0 R] /ID (ID.020) >>
 endobj
 28 0 obj
-<<  /Type /StructElem /C /justify /S /text /P 27 0 R /K [<</Type /MCR /Pg 42 0 R /MCID 5>>  ] /ID (ID.021) >>
+<<  /Type /StructElem /C /justify /S /text /P 27 0 R /Alt <FEFF0072006500640020006C0069006E0065> /K [<</Type /MCR /Pg 42 0 R /MCID 5>>  ] /ID (ID.021) >>
 endobj
 29 0 obj
 <<  /Type /StructElem /S /Div /P 27 0 R /K 30 0 R /ID (ID.022) >>
@@ -823,7 +823,7 @@ xref
 0000015115 00000 n 
 0000000004 00000 f 
 0000000008 00000 f 
-0000019704 00000 n 
+0000019836 00000 n 
 0000015204 00000 n 
 0000015915 00000 n 
 0000000000 00000 f 
@@ -833,56 +833,56 @@ xref
 0000016818 00000 n 
 0000016901 00000 n 
 0000017005 00000 n 
-0000017097 00000 n 
-0000017179 00000 n 
-0000017267 00000 n 
-0000017390 00000 n 
-0000017505 00000 n 
-0000017588 00000 n 
-0000017692 00000 n 
-0000017784 00000 n 
-0000017866 00000 n 
+0000017141 00000 n 
+0000017223 00000 n 
+0000017311 00000 n 
+0000017434 00000 n 
+0000017549 00000 n 
+0000017632 00000 n 
+0000017736 00000 n 
+0000017872 00000 n 
 0000017954 00000 n 
-0000018077 00000 n 
-0000018226 00000 n 
-0000018309 00000 n 
-0000018413 00000 n 
-0000018539 00000 n 
-0000018621 00000 n 
-0000018709 00000 n 
-0000018832 00000 n 
-0000018947 00000 n 
-0000019030 00000 n 
-0000019134 00000 n 
-0000019260 00000 n 
-0000019342 00000 n 
-0000019430 00000 n 
-0000019554 00000 n 
+0000018042 00000 n 
+0000018165 00000 n 
+0000018314 00000 n 
+0000018397 00000 n 
+0000018501 00000 n 
+0000018671 00000 n 
+0000018753 00000 n 
+0000018841 00000 n 
+0000018964 00000 n 
+0000019079 00000 n 
+0000019162 00000 n 
+0000019266 00000 n 
+0000019392 00000 n 
+0000019474 00000 n 
+0000019562 00000 n 
+0000019686 00000 n 
 0000000020 00000 n 
 0000014952 00000 n 
 0000014817 00000 n 
 0000011800 00000 n 
-0000034112 00000 n 
-0000021505 00000 n 
-0000034270 00000 n 
+0000034244 00000 n 
+0000021637 00000 n 
+0000034402 00000 n 
 0000015168 00000 n 
 0000015324 00000 n 
 0000015878 00000 n 
 0000016494 00000 n 
-0000019822 00000 n 
-0000020517 00000 n 
-0000019854 00000 n 
-0000019927 00000 n 
-0000020753 00000 n 
-0000021659 00000 n 
-0000021859 00000 n 
-0000032095 00000 n 
-0000022040 00000 n 
-0000032328 00000 n 
-0000034332 00000 n 
-0000034447 00000 n 
+0000019954 00000 n 
+0000020649 00000 n 
+0000019986 00000 n 
+0000020059 00000 n 
+0000020885 00000 n 
+0000021791 00000 n 
+0000021991 00000 n 
+0000032227 00000 n 
+0000022172 00000 n 
+0000032460 00000 n 
+0000034464 00000 n 
+0000034579 00000 n 
 trailer
 << /Size 63 /Root 61 0 R /Info 62 0 R /ID [ <2350CAD05F8A7AF0AA4058486855344F> <2350CAD05F8A7AF0AA4058486855344F> ] >>
 startxref
-34579
+34711
 %%EOF
diff --git a/required/latex-lab/testfiles-graphic/tikz-004.pvt b/required/latex-lab/testfiles-graphic/tikz-004.pvt
index 4b545b18..e8a470ca 100644
--- a/required/latex-lab/testfiles-graphic/tikz-004.pvt
+++ b/required/latex-lab/testfiles-graphic/tikz-004.pvt
@@ -11,7 +11,7 @@
 % The text inside the nodes should be visible and be tagged like a minipage
 \START 
 
-\tagpdfsetup{tikz/type=text}
+\tagpdfsetup{graphic/tagging=text}
 \marginpar{
 \begin{tikzpicture}[alt=red line]
 \draw[red] (0,0)--(1,1);
diff --git a/required/latex-lab/testfiles-graphic/tikz-004.tpf b/required/latex-lab/testfiles-graphic/tikz-004.tpf
index 5efc0207..ac31cdac 100644
--- a/required/latex-lab/testfiles-graphic/tikz-004.tpf
+++ b/required/latex-lab/testfiles-graphic/tikz-004.tpf
@@ -539,7 +539,7 @@ endobj
 <<  /Type /StructElem /S /text-unit /P 12 0 R /K [14 0 R 16 0 R 19 0 R] /ID (ID.006) >>
 endobj
 14 0 obj
-<<  /Type /StructElem /C /justify /S /text /P 13 0 R /K [<</Type /MCR /Pg 15 0 R/MCID 0>> <</Type /MCR /Pg 15 0 R/MCID 2>>] /ID (ID.007) >>
+<<  /Type /StructElem /C /justify /S /text /P 13 0 R /Alt <FEFF0072006500640020006C0069006E0065> /K [<</Type /MCR /Pg 15 0 R/MCID 0>> <</Type /MCR /Pg 15 0 R/MCID 2>>] /ID (ID.007) >>
 endobj
 16 0 obj
 <<  /Type /StructElem /S /Div /P 13 0 R /K 17 0 R /ID (ID.008) >>
@@ -560,7 +560,7 @@ endobj
 <<  /Type /StructElem /S /text-unit /P 20 0 R /K [22 0 R 23 0 R 26 0 R] /ID (ID.013) >>
 endobj
 22 0 obj
-<<  /Type /StructElem /C /justify /S /text /P 21 0 R /K [<</Type /MCR /Pg 15 0 R/MCID 6>> <</Type /MCR /Pg 15 0 R/MCID 8>>] /ID (ID.014) >>
+<<  /Type /StructElem /C /justify /S /text /P 21 0 R /Alt <FEFF0072006500640020006C0069006E0065> /K [<</Type /MCR /Pg 15 0 R/MCID 6>> <</Type /MCR /Pg 15 0 R/MCID 8>>] /ID (ID.014) >>
 endobj
 23 0 obj
 <<  /Type /StructElem /S /Div /P 21 0 R /K 24 0 R /ID (ID.015) >>
@@ -581,7 +581,7 @@ endobj
 <<  /Type /StructElem /S /text-unit /P 27 0 R /K [29 0 R 30 0 R 33 0 R] /ID (ID.020) >>
 endobj
 29 0 obj
-<<  /Type /StructElem /C /justify /S /text /P 28 0 R /K [<</Type /MCR /Pg 15 0 R/MCID 12>> <</Type /MCR /Pg 15 0 R/MCID 14>>] /ID (ID.021) >>
+<<  /Type /StructElem /C /justify /S /text /P 28 0 R /Alt <FEFF0072006500640020006C0069006E0065> /K [<</Type /MCR /Pg 15 0 R/MCID 12>> <</Type /MCR /Pg 15 0 R/MCID 14>>] /ID (ID.021) >>
 endobj
 30 0 obj
 <<  /Type /StructElem /S /Div /P 28 0 R /K 31 0 R /ID (ID.022) >>
@@ -837,7 +837,7 @@ xref
 0000014972 00000 n 
 0000000004 00000 f 
 0000000008 00000 f 
-0000020017 00000 n 
+0000020149 00000 n 
 0000015061 00000 n 
 0000015856 00000 n 
 0000000000 00000 f 
@@ -848,52 +848,52 @@ xref
 0000016842 00000 n 
 0000016946 00000 n 
 0000014684 00000 n 
-0000017102 00000 n 
-0000017184 00000 n 
-0000017272 00000 n 
-0000017393 00000 n 
-0000017570 00000 n 
-0000017653 00000 n 
-0000017757 00000 n 
-0000017913 00000 n 
-0000017995 00000 n 
+0000017146 00000 n 
+0000017228 00000 n 
+0000017316 00000 n 
+0000017437 00000 n 
+0000017614 00000 n 
+0000017697 00000 n 
+0000017801 00000 n 
+0000018001 00000 n 
 0000018083 00000 n 
-0000018204 00000 n 
-0000018383 00000 n 
-0000018466 00000 n 
-0000018570 00000 n 
-0000018728 00000 n 
-0000018810 00000 n 
-0000018898 00000 n 
-0000019020 00000 n 
-0000019200 00000 n 
-0000019283 00000 n 
-0000019387 00000 n 
-0000019545 00000 n 
-0000019627 00000 n 
-0000019715 00000 n 
-0000019837 00000 n 
+0000018171 00000 n 
+0000018292 00000 n 
+0000018471 00000 n 
+0000018554 00000 n 
+0000018658 00000 n 
+0000018860 00000 n 
+0000018942 00000 n 
+0000019030 00000 n 
+0000019152 00000 n 
+0000019332 00000 n 
+0000019415 00000 n 
+0000019519 00000 n 
+0000019677 00000 n 
+0000019759 00000 n 
+0000019847 00000 n 
+0000019969 00000 n 
 0000000015 00000 n 
 0000014819 00000 n 
 0000011792 00000 n 
-0000033221 00000 n 
-0000033399 00000 n 
+0000033353 00000 n 
+0000033531 00000 n 
 0000015025 00000 n 
 0000015265 00000 n 
 0000015819 00000 n 
 0000016435 00000 n 
-0000031049 00000 n 
-0000020135 00000 n 
-0000020574 00000 n 
-0000030818 00000 n 
-0000031132 00000 n 
-0000033458 00000 n 
-0000033573 00000 n 
+0000031181 00000 n 
+0000020267 00000 n 
+0000020706 00000 n 
+0000030950 00000 n 
+0000031264 00000 n 
+0000033590 00000 n 
+0000033705 00000 n 
 trailer
 << /Size 57
 /Root 55 0 R
 /Info 56 0 R
 /ID [<9BD18DF3359C1216B83ADB4AA401CC9A> <9BD18DF3359C1216B83ADB4AA401CC9A>] >>
 startxref
-33705
+33837
 %%EOF





More information about the latex3-commits mailing list.