From 6fd8c9571dcfc189cd15a9ce50888e2e7abb2b83 Mon Sep 17 00:00:00 2001 From: Ulrike Fischer Date: Tue, 24 Sep 2024 14:46:42 +0200 Subject: [PATCH] Tagging of floats and suspend/resume (#1472) (merge tagging705-float branch) * switch to tagging sockets in float module, WIP * use tagging socket in multicol, latex3/tagging-project#705 * luatex test * improve autoref compability * WIP, use sockets for caption * better documentation of plugs * use sockets for caption, WIP * small corrections, flattened par * update testfiles * correct brace * caption sockets * switch to tag_suspend/tag_resume * some more docu * testfile latex3/tagging-project#13 * correct date * correct wording * wrong number * extend todos --- base/changes.txt | 3 + base/lttagging.dtx | 99 ++++-- required/latex-lab/changes.txt | 9 + required/latex-lab/latex-lab-amsmath.dtx | 6 +- required/latex-lab/latex-lab-float.dtx | 286 +++++++++++++---- required/latex-lab/latex-lab-footnotes.dtx | 2 +- required/latex-lab/latex-lab-graphic.dtx | 10 +- required/latex-lab/latex-lab-marginpar.dtx | 20 +- required/latex-lab/latex-lab-math.dtx | 8 +- required/latex-lab/latex-lab-mathtools.dtx | 10 +- required/latex-lab/latex-lab-minipage.dtx | 8 +- required/latex-lab/latex-lab-sec.dtx | 8 +- required/latex-lab/latex-lab-table.dtx | 8 +- required/latex-lab/latex-lab-text.dtx | 8 +- .../testfiles-float/float-001.luatex.tlg | 38 ++- .../latex-lab/testfiles-float/float-001.tlg | 82 ++--- .../testfiles-float/float-002.luatex.tlg | 110 ++++--- .../latex-lab/testfiles-float/float-002.tlg | 262 ++++++++-------- .../testfiles-float/float-003.luatex.tlg | 114 ++++--- .../latex-lab/testfiles-float/float-003.tlg | 266 ++++++++-------- .../testfiles-float/float-004.luatex.tlg | 136 ++++---- .../latex-lab/testfiles-float/float-004.tlg | 296 ++++++++++-------- .../float-005-double.luatex.tlg | 13 +- .../testfiles-float/float-005-double.tlg | 23 +- .../float-006-spacing.luatex.tlg | 8 +- .../testfiles-float/float-006-spacing.tlg | 18 +- .../testfiles-float/float-007-gh55.luatex.tlg | 6 +- .../testfiles-float/float-007-gh55.tlg | 16 +- .../float-010-outside.luatex.tlg | 36 ++- .../testfiles-float/float-010-outside.tlg | 38 ++- .../float-011-multicol.luatex.tlg | 18 ++ .../testfiles-float/float-011-multicol.lvt | 24 ++ .../testfiles-float/float-011-multicol.tlg | 17 + .../testfiles-float/float-012-gh13.lvt | 17 + .../testfiles-float/float-012-gh13.tlg | 0 required/tools/changes.txt | 17 +- required/tools/multicol.dtx | 15 +- 37 files changed, 1270 insertions(+), 785 deletions(-) create mode 100644 required/latex-lab/testfiles-float/float-011-multicol.luatex.tlg create mode 100644 required/latex-lab/testfiles-float/float-011-multicol.lvt create mode 100644 required/latex-lab/testfiles-float/float-011-multicol.tlg create mode 100644 required/latex-lab/testfiles-float/float-012-gh13.lvt create mode 100644 required/latex-lab/testfiles-float/float-012-gh13.tlg diff --git a/base/changes.txt b/base/changes.txt index f859015c1..033a538f8 100644 --- a/base/changes.txt +++ b/base/changes.txt @@ -5,6 +5,9 @@ hotfixes). It is provided for convenience only. It therefore makes no claims to completeness or accuracy and it contains some references to files that are not part of the distribution. ================================================================================ +2024-09-17 Ulrike Fischer + * lttagging.dtx: dummy for \tag_suspend:n and \tag_resume:n + * lttagging.dtx: declare tagging sockets for floats and caption. 2024-09-15 Joseph Wright diff --git a/base/lttagging.dtx b/base/lttagging.dtx index f4d237783..2e489f8f4 100644 --- a/base/lttagging.dtx +++ b/base/lttagging.dtx @@ -33,7 +33,7 @@ %<*driver> % \fi \ProvidesFile{lttagging.dtx} - [2024/08/10 v1.0g LaTeX Kernel (tagging support)] + [2024/09/17 v1.0h LaTeX Kernel (tagging support)] % \iffalse \documentclass{l3doc} \GetFileInfo{lttagging.dtx} @@ -75,6 +75,9 @@ % % \DescribeMacro\SuspendTagging % \DescribeMacro\ResumeTagging +% \DescribeMacro\tag_suspend:n +% \DescribeMacro\tag_resume:n + % % The are places in code where it is import top stop any tagging % activities, e.g., when we are doing trial typesetting that it is @@ -88,10 +91,8 @@ % both take string argument that is used for debugging to easily % identify why tagging was suspended or restarted, for example, in % \pkg{tabularx} you find \verb=\SuspendTagging{tabularx}=. By default -% they two commands do nothing. +% these four commands do nothing. % -% TODO: the corresponding L3 layer commands should also have a dummy -% definition in the kernel! % % \DescribeMacro\UseTaggingSocket % \DescribeMacro\tag_socket_use:n @@ -144,34 +145,16 @@ % % % -% \begin{macro}{\SuspendTagging,\ResumeTagging} +% \begin{macro}{\tag_suspend:n,\tag_resume:n,\SuspendTagging,\ResumeTagging} % -% In the kernel, these two commands get dummy definitions so that +% In the kernel, these commands get dummy definitions so that % they can be used without harm in packages. The real definition is % used when tagging gets enabled. % \begin{macrocode} -\cs_new_eq:NN \SuspendTagging \use_none:n -\cs_new_eq:NN \ResumeTagging \use_none:n -% \end{macrocode} -% -% A simplified version of this definition should move to -% \pkg{tagpdf} and dropped here, eventually. -% \begin{macrocode} -\AddToHook{begindocument/before}{ - \cs_if_exist:NT \tag_stop:n - { - \cs_set:Npn \SuspendTagging #1 { -% \end{macrocode}% -% This stops tagging and also disables all tagging sockets so we are done. -% \begin{macrocode} - \tag_stop:n {#1} - } -% \end{macrocode} -% -% \begin{macrocode} - \cs_set:Npn \ResumeTagging #1 { \tag_start:n {#1} } - } -} +\cs_new_eq:NN \tag_suspend:n \use_none:n +\cs_new_eq:NN \tag_resume:n \use_none:n +\cs_new_protected:Npn \SuspendTagging #1 { \tag_suspend:n {#1} } +\cs_new_protected:Npn \ResumeTagging #1 { \tag_resume:n {#1} } % \end{macrocode} % \end{macro} % @@ -261,6 +244,13 @@ \ExplSyntaxOff % \end{macrocode} % \end{plugdecl} +% +% \begin{socketdecl}{tagsupport/para/begin,tagsupport/para/end} +% These sockets are currently defined in tagpdf. They overwrite +% definitions in the latex-lab-block code. There is also a simpler +% definition that probably should be a general socket too. +% TODO: move this into lttagging. +% \end{socketdecl} % \subsubsection{Tagging sockets for toc} @@ -295,7 +285,7 @@ % \end{macrocode} % \end{socketdecl} % -% \subsection{Tagging support for table/tabular packages} +% \subsubsection{Tagging support for table/tabular packages} % % The code uses a number of sockets to inject the tagging % commands. These can be easily set to a noop-plug in case the @@ -433,10 +423,57 @@ % \end{macrocode} % \end{socketdecl} % +% \subsubsection{Tagging Support for floats} +% +% \begin{socketdecl}{tagsupport/float/hmode/begin, +% tagsupport/float/hmode/end} +% These sockets are used if the float is called in +% hmode. +% \changes{v1.0h}{2024/09/13}{Sockets for floats added} +% \begin{macrocode} +\NewSocket{tagsupport/float/hmode/begin}{0} +\NewSocket{tagsupport/float/hmode/end}{0} +% \end{macrocode} +% \end{socketdecl} % +% \begin{socketdecl}{tagsupport/float/begin, +% tagsupport/float/end} +% These sockets start and stop the float structure. +% \begin{macrocode} +\NewSocket{tagsupport/float/begin}{0} +\NewSocket{tagsupport/float/end}{0} +% \end{macrocode} +% \end{socketdecl} % -% -% +% +% \begin{socketdecl}{tagsupport/caption/begin, +% tagsupport/caption/end} +% These sockets are used in \cs{@makecaption}. +% They open and close the \texttt{Caption} structure. +% Their default plugs assume that they are used in +% vmode. The argument of the begin socket is +% the structure number of the parent float. If it is +% empty the current structure number is used. +% \begin{macrocode} +\NewSocket{tagsupport/caption/begin}{1} +\NewSocket{tagsupport/caption/end}{0} +% \end{macrocode} +% \end{socketdecl} +% +% \begin{socketdecl}{tagsupport/caption/label/begin, +% tagsupport/caption/label/end} +% These sockets are used in \cs{@makecaption} around the +% label. Their default plugs ensure that +% the label is outside the paragraph and that +% the rest of the caption uses flattened para mode. If the +% caption is not in a hbox, the \texttt{para/begin} +% socket should follow to properly start the paragraph. +% \begin{macrocode} +\NewSocket{tagsupport/caption/label/begin}{0} +\NewSocket{tagsupport/caption/label/end}{0} +% \end{macrocode} +% \end{socketdecl} +% % \section{For lttab.dtx parked here for now} % % diff --git a/required/latex-lab/changes.txt b/required/latex-lab/changes.txt index f55d02d1e..eb8d6300a 100644 --- a/required/latex-lab/changes.txt +++ b/required/latex-lab/changes.txt @@ -1,3 +1,12 @@ +2024-09-18 Ulrike Fischer + * latex-lab-amsmath.dtx,latex-lab-graphic.dtc, + latex-lab-marginpar.dtx,latex-lab-math.dtx,latex-lab-mathtools.dtx, + latex-lab-minipage.dtx,latex-lab-sec.dtx,latex-lab-table.dtx,latex-lab-text.dtx: + switch to \tag_suspend:n and \tag_resume:n + +2024-09-17 Ulrike Fischer + * latex-lab-float.dtx: switch to tagging sockets + 2024-09-13 Ulrike Fischer * documentmetadata-support.dtx: change warning to error if pdfstandard is unknown, see https://github.com/latex3/pdfresources/issues/77#issuecomment-2329522654. diff --git a/required/latex-lab/latex-lab-amsmath.dtx b/required/latex-lab/latex-lab-amsmath.dtx index 1b6302bb3..8591b39b3 100644 --- a/required/latex-lab/latex-lab-amsmath.dtx +++ b/required/latex-lab/latex-lab-amsmath.dtx @@ -66,7 +66,7 @@ % \subsection{File declaration} % \begin{macrocode} \ProvidesFile{latex-lab-amsmath.ltx} - [2024-07-05 v0.1b amsmath adaptions] + [2024-09-18 v0.1c amsmath adaptions] % \end{macrocode} % \subsection{Tagpdf support} % To make the code independent from tagging being loaded and active @@ -99,7 +99,7 @@ % \end{macrocode} % Stop tagging when measuring: % \begin{macrocode} - \ifmeasuring@\tag_stop:\fi + \ifmeasuring@\tag_suspend:n{\measuring}\fi \normalbaselines \ifdim\linewidth=\columnwidth \else \parshape\@ne \@totalleftmargin \linewidth @@ -174,7 +174,7 @@ \def\text@#1 {{ \int_gincr:N\g__math_mathchoice_int - \tag_stop: + \tag_suspend:n{\text@} \mathchoice { \@@_tag_if_mathstyle:en{mathchoice-\int_use:N\g__math_mathchoice_int}{0} diff --git a/required/latex-lab/latex-lab-float.dtx b/required/latex-lab/latex-lab-float.dtx index 25ae805cf..ccdc0c97e 100644 --- a/required/latex-lab/latex-lab-float.dtx +++ b/required/latex-lab/latex-lab-float.dtx @@ -43,6 +43,9 @@ % customizations}} % % \providecommand\hook[1]{\texttt{#1}} +% \ProvideDocElement[printtype=\textit{plug},idxtype=plug,idxgroup=Plugs]{Plug}{plugdecl} +% \ProvideDocElement[printtype=\textit{socket},idxtype=socket,idxgroup=Sockets]{Socket}{socketdecl} +% % \begin{documentation} % \begin{abstract} % The following code implements a first draft for the tagging of float @@ -125,7 +128,10 @@ % % \section{Kernel commands} % \begin{function}{\@current@float@struct} -% This variable holds the structure number of current float structure. +% This variable holds the number of the current float structure. With tagging +% this is the structure number, without tagging a unique counter. A float +% can contain more than one float structure (e.g. if there is more than one +% caption). % \end{function} % % \begin{function}{\@makecaption} @@ -146,22 +152,28 @@ {Code related to the tagging of floats} % \end{macrocode} % \subsection{Variables} -% We rolemap to float to Aside, and float sections to Sect. +% We rolemap floats to Aside, and float sections to Sect. % % \begin{variable}{ % \g_@@_float_sect_prop, % \g_@@_float_types_seq, -% \@current@float@struct +% \@current@float@struct, +% \g_@@_float_int % } % These variables will hold the structure number for the float container % and the list of float types. Currently only figure and table are supported % TODO: interface to declare new float types. +% To set the target for links we need also a unique counter. +% With tagging we could use the structure number, but +% the structure commands now are hidden inside tagging sockets +% so we use a dedicated counter. % \begin{macrocode} \prop_new:N \g_@@_float_sect_prop \seq_new:N \g_@@_float_types_seq \seq_gput_right:Nn \g_@@_float_types_seq {figure} \seq_gput_right:Nn \g_@@_float_types_seq {table} \tl_new:N\@current@float@struct +\int_new:N\g_@@_float_int % \end{macrocode} % \end{variable} % @@ -176,6 +188,19 @@ % \end{macrocode} % \end{variable} % +% \begin{macro}{\@@_float_init:} +% To be able to set unique targets for links, we +% need a counter outside the tagging sockets. +% TODO: check if this command should be public or +% a socket or a hook. +% \begin{macrocode} +\cs_new_protected:Npn \@@_float_init: + { + \int_gincr:N \g_@@_float_int + \tl_set:Ne \@current@float@struct { \int_use:N \g_@@_float_int} + } +% \end{macrocode} +% \end{macro} % %\subsection{Moving float structures} % @@ -260,15 +285,71 @@ { split-float .code:n = { - \@@_float_end: - \@@_float_begin: - \MakeLinkTarget*{floatstructure.\int_use:N\c@g__tag_struct_abs_int} + \UseTaggingSocket{float/end} + \@@_float_init: + \UseTaggingSocket{float/begin} + \MakeLinkTarget*{floatstructure.\@current@float@struct} } } % \end{macrocode} % \end{macro} - -% \subsection{Patching} +% +% \subsection{Tagging sockets} +% For now we test if the sockets are already defined +% \begin{macrocode} +\str_if_exist:cF { l__socket_tagsupport/float/begin_plug_str } + { + \NewSocket{tagsupport/float/hmode/begin}{0} + \NewSocket{tagsupport/float/hmode/end}{0} + \NewSocket{tagsupport/float/begin}{0} + \NewSocket{tagsupport/float/end}{0} + } +% \end{macrocode} +% +% \begin{plugdecl}{default (tagsupport/float/hmode/begin)} +% This plug should be used if a float is called in hmode. +% In then closes the MC-chunks and starts the structure. +% \begin{macrocode} +\NewSocketPlug {tagsupport/float/hmode/begin}{default} + { + \@@_float_stop_par: + } +\AssignSocketPlug{tagsupport/float/hmode/begin}{default} +% \end{macrocode} +% \end{plugdecl} +% +% \begin{plugdecl}{default (tagsupport/float/hmode/end)} +% This plug should be used if a float is called in hmode +% and the end of the float it then restarts the MC. +% \begin{macrocode} +\NewSocketPlug{tagsupport/float/hmode/end}{default} + { + \@@_float_start_par: + } +\AssignSocketPlug{tagsupport/float/hmode/end}{default} +% \end{macrocode} +% \end{plugdecl} +% +% \begin{plugdecl}{default (tagsupport/float/begin)} +% \begin{macrocode} +\NewSocketPlug{tagsupport/float/begin}{default} + { + \@@_float_begin: + } +\AssignSocketPlug{tagsupport/float/begin}{default} +% \end{macrocode} +% \end{plugdecl} +% +% \begin{plugdecl}{default (tagsupport/float/end)} +% \begin{macrocode} +\NewSocketPlug{tagsupport/float/end}{default} + { + \@@_float_end: + } +\AssignSocketPlug{tagsupport/float/end}{default} +% \end{macrocode} +% \end{plugdecl} +% % \begin{macro}{\@@_float_stop_par:,\@@_float_start_par:} % if a float is in a par, we need commands to stop and restart the P-mc % \begin{macrocode} @@ -287,8 +368,7 @@ \tag_struct_begin:n{tag=text}% } \tag_mc_begin:n{tag=P} - } - + } % \end{macrocode} % \end{macro} % These commands are the main commands to start and end the float tagging. @@ -315,6 +395,7 @@ \cs_new_protected:Npn\@@_float_end:{\tag_struct_end:} %end Aside % \end{macrocode} +% \subsection{Patching} % This patches the main command \cs{@xfloat}. % There is a : in the code, so we disable expl3 syntax % \begin{macrocode} @@ -337,7 +418,7 @@ % \end{macrocode} % If the float is in hmode we have to interrupt the P % \begin{macrocode} - \@nameuse{@@_float_stop_par:}% <---end P + \UseTaggingSocket{float/hmode/begin}% \@floatpenalty -\@Mii \else \@floatpenalty-\@Miii @@ -383,7 +464,8 @@ % \end{macrocode} % This starts the structure for the float. % \begin{macrocode} - \@nameuse{@@_float_begin:}% + \csname @@_float_init:\endcsname + \UseTaggingSocket{float/begin}% \global \setbox\@currbox \color@vbox \normalcolor @@ -394,14 +476,14 @@ % \end{macrocode} % We add a target for links. TODO: check that it doesn't affect spacing!! % \begin{macrocode} - \MakeLinkTarget*{floatstructure.\number\value{g__tag_struct_abs_int}}% + \MakeLinkTarget*{\@captype.struct.\@current@float@struct}% }% % \end{macrocode} % The end code of the float ... % \begin{macrocode} \def\end@float{% \@endfloatbox - \@nameuse{@@_float_end:}% + \UseTaggingSocket{float/end}% \ifnum\@floatpenalty <\z@ \@largefloatcheck \@cons\@currlist\@currbox @@ -413,7 +495,7 @@ \penalty\@floatpenalty \else \vadjust{\penalty -\@Miv \vbox{}\penalty\@floatpenalty}\@Esphack - \@nameuse{@@_float_start_par:}% restart P safe here?? + \UseTaggingSocket{float/hmode/end}% \fi \fi } @@ -423,7 +505,7 @@ \def\end@dblfloat{% \if@twocolumn \@endfloatbox - \@nameuse{@@_float_end:}% + \UseTaggingSocket{float/end}% \ifnum\@floatpenalty <\z@ \@largefloatcheck \global\dp\@currbox1sp % @@ -436,7 +518,7 @@ \penalty\@floatpenalty \else \vadjust{\penalty -\@Miv \vbox{}\penalty\@floatpenalty}\@Esphack - \@nameuse{@@_float_start_par:}% restart P safe here?? + \UseTaggingSocket{float/hmode/end}% \fi \fi \else @@ -453,10 +535,113 @@ \def\hyper@nopatch@caption{} % \end{macrocode} % +% \subsubsection{(Tagging) sockets} +% +% First some temporary sockets. +% These sockets are in lttagging. +% \begin{macrocode} +\str_if_exist:cF { l__socket_tagsupport/caption/begin_plug_str } + { + \NewSocket{tagsupport/caption/begin}{1} + \NewSocket{tagsupport/caption/end}{0} + \NewSocket{tagsupport/caption/label/begin}{0} + \NewSocket{tagsupport/caption/label/end}{0} + } +% \end{macrocode} +% These socket are currently defined in tagpdf. +% \begin{macrocode} +\str_if_exist:cF { l__socket_tagsupport/para/begin_plug_str } + { + \NewSocket{tagsupport/para/begin} + \NewSocket{tagsupport/para/end} + } +% \end{macrocode} +% +% \begin{socketdecl}{caption/label} +% This socket is a lightweight start for +% some interface to format the label or add a font command. +% The argument is the label text. +% The default plug \texttt{kernel} adds a colon +% and a space. +% TODO: revisit after checking float and caption packages +% to identify which sockets and hooks are needed. +% \begin{macrocode} +\NewSocket{caption/label}{1} +% \end{macrocode} +% \end{socketdecl} +% +% \begin{plugdecl}{kernel (caption/label)} +% The standard label formatting from the kernel. +% \begin{macrocode} +\NewSocketPlug{caption/label}{kernel} + { + #1:~ + } +\AssignSocketPlug{caption/label}{kernel} +% \end{macrocode} +% \end{plugdecl} +% \begin{plugdecl}{default} +% The caption begin socket takes an argument: the structure number of +% the parent float. If the argument is empty, the current structure is used. +% TODO: a tagpdf key that moves a structure to the begin of the parent. +% The caption is moved to the first position with the firstkid option. +% \begin{macrocode} +\NewSocketPlug {tagsupport/caption/begin}{default} + { + \tl_if_empty:eTF {#1} + { + \tag_struct_begin:n{tag=Caption,firstkid} + } + { + \tag_struct_begin:n{tag=Caption,parent=#1,firstkid} + } + \bool_set_true:N \l__tag_para_flattened_bool + } +\AssignSocketPlug{tagsupport/caption/begin}{default} +% \end{macrocode} +% \end{plugdecl} +% \begin{plugdecl}{default} +% \begin{macrocode} +\NewSocketPlug {tagsupport/caption/end}{default} + { + \tag_struct_end: + } +\AssignSocketPlug{tagsupport/caption/end}{default} +% \end{macrocode} +% \end{plugdecl} +% +% \begin{plugdecl}{default (tagsupport/caption/label/begin)} +% \begin{macrocode} +\NewSocketPlug {tagsupport/caption/label/begin}{default} + { +% \end{macrocode} +% suppress para tagging at the begin. +% \begin{macrocode} + \tagpdfparaOff + \tag_struct_begin:n{tag=Lbl} + \tag_mc_begin:n{} + } +\AssignSocketPlug{tagsupport/caption/label/begin}{default} +% \end{macrocode} +% \end{plugdecl} +% +% \begin{plugdecl}{default (tagsupport/caption/label/end)} +% \begin{macrocode} +\NewSocketPlug {tagsupport/caption/label/end}{default} + { + \tag_mc_end: + \tag_struct_end: + \tagpdfparaOn + } +\AssignSocketPlug{tagsupport/caption/label/end}{default} +% \end{macrocode} +% \end{plugdecl} +% +% \subsubsection{Redefinitions} +% % With hyperref that means that the \cs{refstepcounter} now can affect spacing so we % change that to the kernel refstepcounter: % \begin{macrocode} -\let\@kernel@refstepcounter\refstepcounter %as long it is not in the kernel \def\caption{% \ifx\@captype\@undefined \@latex@error{\noexpand\caption\c_space_tl outside~float}\@ehd @@ -474,22 +659,16 @@ \@kernel@refstepcounter\@captype % \end{macrocode} % we need to reset the target for \cs{addcontentsline}. +% We use \cs{@captype} to support autoref. % \begin{macrocode} - \xdef\@currentHref{floatstructure.\@current@float@struct}% + \xdef\@currentHref{\@captype.struct.\@current@float@struct}% } \expandafter\@firstofone \fi {\@dblarg{\@caption\@captype}}% } % \end{macrocode} -% As we will use the structure number in the target, we need to provide a -% theH-representation. (Once the kernel will create -% theH-representation generally this will be provided automatically, as tagpdf uses -% \cs{newcounter}) -% \begin{macrocode} -\providecommand\theHg__tag_struct_abs_int{\int_use:N\c@g__tag_struct_abs_int} -% \end{macrocode} - +% % \begin{macro}{\@makecaption} % \cs{@makecaption} is defined by the classes so we overwrite it for now % at begin document. @@ -501,53 +680,36 @@ % \end{macrocode} % we don't want tagging when storing the caption for the singleline check % \begin{macrocode} - \tag_stop:n{caption} + \SuspendTagging{\@makecaption} \sbox\@tempboxa{#1:~#2}% - \tag_start:n{caption} + \ResumeTagging{\@makecaption} % \end{macrocode} -% we stop paratagging. TODO: check +% We pass \cs{@current@float@struct} as parent structure +% number. If that is empty the socket will use the parent structure and hope ... % \begin{macrocode} - \tagtool{para=false} -% \end{macrocode} -% if caption is used outside a float there is perhaps no number, then we use -% the parent structure and hope ... -% \begin{macrocode} - \tl_if_empty:NT \@current@float@struct - { \tl_set:Ne \@current@float@struct {\tag_get:n{struct_num}} } - \tag_struct_begin:n{tag=Caption,parent=\@current@float@struct} -% \end{macrocode} -% move the caption to the begin of the float structure: -% \begin{macrocode} - \tag_if_active:T - { - \seq_gpop_right:cN {g__tag_struct_kids_\@current@float@struct _seq}\l_@@_tmpa_tl - \seq_gput_left:cV {g__tag_struct_kids_\@current@float@struct _seq}\l_@@_tmpa_tl - } + \UseTaggingSocket{caption/begin}{\@current@float@struct} \ifdim \wd\@tempboxa >\hsize - \tag_struct_begin:n{tag=Lbl} - \tag_mc_begin:n{} - #1:~ - \tag_mc_end: - \tag_struct_end: - \tag_mc_begin:n{} - #2\par - \tag_mc_end: + \UseTaggingSocket{caption/label/begin} + \UseSocket{caption/label}{#1} + \UseTaggingSocket{caption/label/end} + \UseTaggingSocket{para/begin} + #2 + \par \else % \end{macrocode} % we don't reuse the box as it doesn't contain tagging, but set the text explicitly. % \begin{macrocode} \global \@minipagefalse \hb@xt@\hsize{\hfil - \tag_struct_begin:n{tag=Lbl} - \tag_mc_begin:n{} - #1:~ - \tag_mc_end: - \tag_struct_end: - \tag_mc_begin:n{} + \UseTaggingSocket{caption/label/begin} + \UseSocket{caption/label}{#1} + \UseTaggingSocket{caption/label/end} + \UseTaggingSocket{para/begin} #2 - \tag_mc_end:\hfil}% + \UseTaggingSocket{para/end} + \hfil}% \fi - \tag_struct_end: %caption + \UseTaggingSocket{caption/end} \vskip\belowcaptionskip} } % \end{macrocode} diff --git a/required/latex-lab/latex-lab-footnotes.dtx b/required/latex-lab/latex-lab-footnotes.dtx index 039d8554f..8b594a029 100644 --- a/required/latex-lab/latex-lab-footnotes.dtx +++ b/required/latex-lab/latex-lab-footnotes.dtx @@ -1969,7 +1969,7 @@ % % \begin{macrocode} \tl_new:N \l_@@_dflt_struct_tl -\tl_set:Nn \l_@@_dflt_struct_tl {1} +\tl_set:Nn \l_@@_dflt_struct_tl {2} % \end{macrocode} % kernel hooks for taggin % this sets the structure around the whole text diff --git a/required/latex-lab/latex-lab-graphic.dtx b/required/latex-lab/latex-lab-graphic.dtx index a596366aa..b3ee3eb6c 100644 --- a/required/latex-lab/latex-lab-graphic.dtx +++ b/required/latex-lab/latex-lab-graphic.dtx @@ -15,8 +15,8 @@ % https://github.com/latex3/latex2e/required/latex-lab % % for those people who are interested or want to report an issue. -\def\ltlabgraphicdate{2024-07-05} -\def\ltlabgraphicversion{0.80d} +\def\ltlabgraphicdate{2024-09-18} +\def\ltlabgraphicversion{0.80e} % %<*driver> \documentclass{l3doc} @@ -489,7 +489,7 @@ \bool_set_true:N \l_@@_graphic_artifact_bool \bool_set_false:N \l_@@_graphic_BBox_bool } - {false}{\tag_stop:} + {false}{\tag_suspend:n{Gin}} } {\tl_set:Nn\l_@@_graphic_struct_tl{#1}} } @@ -528,7 +528,7 @@ \bool_set_true:N \l_@@_graphic_artifact_bool \bool_set_false:N \l_@@_graphic_BBox_bool } - {false}{\tag_stop:} + {false}{\tag_suspend:n{picture}} } {\tl_set:Nn\l_@@_graphic_struct_tl{#1}} } @@ -1012,7 +1012,7 @@ \@defaultunitsset\@tempdimc{#1}\unitlength \Gin@tag@struct@begin \setbox\@picbox\hb@xt@\@tempdimc\bgroup - \tag_stop: %do not tag inside the picture box + \tag_suspend:n{\@picture} %do not tag inside the picture box \@defaultunitsset\@tempdimc{#3}\unitlength \hskip -\@tempdimc \@defaultunitsset\@tempdimc{#4}\unitlength diff --git a/required/latex-lab/latex-lab-marginpar.dtx b/required/latex-lab/latex-lab-marginpar.dtx index a57ebaab8..2f293ee49 100644 --- a/required/latex-lab/latex-lab-marginpar.dtx +++ b/required/latex-lab/latex-lab-marginpar.dtx @@ -18,8 +18,8 @@ % % for those people who are interested or want to report an issue. % -\def\ltlabmarginpardate{2024-08-06} -\def\ltlabmarginparversion{0.85c} +\def\ltlabmarginpardate{2024-09-18} +\def\ltlabmarginparversion{0.85d} %<*driver> \documentclass[kernel]{l3doc} @@ -227,9 +227,9 @@ \long\def\@ympar#1{% \@savemarbox\@marbox{#1}% \global\setbox\@currbox\copy\@marbox - \tag_stop: + \tag_suspend:n{\@ympar} \@xympar - \tag_start:} + \tag_resume:n{\@ympar}} % \end{macrocode} % \end{macro} % @@ -248,9 +248,9 @@ \property_record:ee { tag_marginpar-opt-\int_use:N\g__kernel_marginpar_int }{page} }% - \tag_stop: + \tag_suspend:n{\@xmpar} \@savemarbox\@currbox{#2}% - \tag_start: + \tag_resume:n{\@xmpar} } % \end{macrocode} % order matters! the tagged box should be first so that it can pick up @@ -258,15 +258,15 @@ % \begin{macrocode} { \@savemarbox\@currbox{#2}% - \tag_stop: + \tag_suspend:n{\@xmpar} \@savemarbox\@marbox{#1 \property_record:ee { tag_marginpar-opt-\int_use:N\g__kernel_marginpar_int }{page}} - \tag_start: + \tag_resume:n{\@xmpar} } - \tag_stop: + \tag_suspend:n{\@xmpar} \@xympar - \tag_start: + \tag_resume:n{\@xmpar} } % % \end{macrocode} diff --git a/required/latex-lab/latex-lab-math.dtx b/required/latex-lab/latex-lab-math.dtx index 4a3b016c0..8a68e5f51 100644 --- a/required/latex-lab/latex-lab-math.dtx +++ b/required/latex-lab/latex-lab-math.dtx @@ -19,8 +19,8 @@ % for those people who are interested or want to report an issue. % % -\def\ltlabmathdate{2024-08-29} -\def\ltlabmathversion{0.6d} +\def\ltlabmathdate{2024-09-19} +\def\ltlabmathversion{0.6e} % %<*driver> \documentclass{l3doc} @@ -1126,7 +1126,7 @@ \int_set:Nn \l_@@_mathstyle_int {#2} \property_record:nn {#1} { mathstyle } \int_compare:nNnTF { \property_ref:nn {#1}{ mathstyle} } = { #2 } - { \tag_start: }{ \tag_stop: } + { \tag_resume:n{\mathchoice} }{ \tag_suspend:n{\mathchoice} } } \cs_generate_variant:Nn \@@_tag_if_mathstyle:nn {en} % \end{macrocode} @@ -2470,7 +2470,7 @@ % \end{macrocode} % Also for "false?" % \begin{macrocode} -\def\measuring@true{\let\ifmeasuring@\iftrue\tag_stop:} +\def\measuring@true{\let\ifmeasuring@\iftrue\tag_suspend:n{\measuring}} % \end{macrocode} % % \begin{macrocode} diff --git a/required/latex-lab/latex-lab-mathtools.dtx b/required/latex-lab/latex-lab-mathtools.dtx index 79eee7aab..ed8b6e467 100644 --- a/required/latex-lab/latex-lab-mathtools.dtx +++ b/required/latex-lab/latex-lab-mathtools.dtx @@ -18,6 +18,8 @@ % % for those people who are interested or want to report an issue. % +\def\ltlabmathtoolsdate{2024-09-18} +\def\ltlabmathtoolsversion{0.80a} %<*driver> \documentclass{l3doc} \EnableCrossrefs @@ -32,7 +34,7 @@ % % \title{The \texttt{latex-lab-mathtools} code\thanks{}} % \author{\LaTeX{} Project} -% +% \date{v\ltlabmathtoolsversion\ \ltlabmathtoolsdate} % \maketitle % % \newcommand\fmi[1]{\begin{quote} TODO: \itshape #1\end{quote}} @@ -117,7 +119,7 @@ % \end{macrocode} % Stop tagging when measuring: % \begin{macrocode} - \ifmeasuring@\tag_stop:\fi + \ifmeasuring@\tag_suspend:n{\measuring}\fi \normalbaselines \ifdim \ifdim\@totalleftmargin=\z@ @@ -156,7 +158,7 @@ \noalign{% \penalty\postdisplaypenalty\vskip\abovedisplayshortskip \vbox{% - \ifmeasuring@\tag_stop:\fi + \ifmeasuring@\tag_suspend:n{\measuring}\fi \normalbaselines \MH_if_dim:w \MH_if_dim:w \@totalleftmargin=\z@ @@ -185,7 +187,7 @@ \vskip\normallineskiplimit \vskip\l_MT_above_shortintertext_sep \vbox{% - \ifmeasuring@\tag_stop:\fi + \ifmeasuring@\tag_suspend:n{\measuring}\fi \normalbaselines \MH_if_dim:w \MH_if_dim:w \@totalleftmargin=\z@ diff --git a/required/latex-lab/latex-lab-minipage.dtx b/required/latex-lab/latex-lab-minipage.dtx index f5a324fa5..eed595a53 100644 --- a/required/latex-lab/latex-lab-minipage.dtx +++ b/required/latex-lab/latex-lab-minipage.dtx @@ -18,8 +18,8 @@ % % for those people who are interested or want to report an issue. % -\def\ltlabminipagedate{2024-08-08} -\def\ltlabminipageversion{0.81d} +\def\ltlabminipagedate{2024-09-18} +\def\ltlabminipageversion{0.81e} %<*driver> \documentclass{l3doc} \EnableCrossrefs @@ -156,9 +156,9 @@ % As the parbox command is called, we must prevent that it adds its % additional tagging commands: % \begin{macrocode} - \tag_stop:n{minipage} + \tag_suspend:n{minipage} \expandafter\@iiiparbox\@mpargs{\unvbox\@tempboxa}% - \tag_start:n{minipage} + \tag_resume:n{minipage} \UseTaggingSocket{minipage/after} %new end ... } % \end{macrocode} diff --git a/required/latex-lab/latex-lab-sec.dtx b/required/latex-lab/latex-lab-sec.dtx index 231ed1a86..216bbdfa0 100644 --- a/required/latex-lab/latex-lab-sec.dtx +++ b/required/latex-lab/latex-lab-sec.dtx @@ -16,8 +16,8 @@ % % for those people who are interested or want to report an issue. % -\def\ltlabsecdate{2024-07-05} -\def\ltlabsecversion{0.84c} +\def\ltlabsecdate{2024-09-18} +\def\ltlabsecversion{0.84d} %<*driver> \documentclass[kernel]{l3doc} \EnableCrossrefs @@ -689,12 +689,12 @@ % the paratagging. We do not disable paratagging completely, to % avoid that the numbering goes wrong. % \begin{macrocode} - \tag_stop:n{hangfrom} + \tag_suspend:n{hangfrom} \hangindent \wd\@tempboxa\noindent % \end{macrocode} % Restart tagging and insert the box. % \begin{macrocode} - \tag_start:n{hangfrom} + \tag_resume:n{hangfrom} \tagmcbegin{}\box\@tempboxa\tagmcend\tagstructend\tagmcbegin{}} % \end{macrocode} % This command is used to tag the numbers of runin. We do not try diff --git a/required/latex-lab/latex-lab-table.dtx b/required/latex-lab/latex-lab-table.dtx index be0c05a4e..c65667e8e 100644 --- a/required/latex-lab/latex-lab-table.dtx +++ b/required/latex-lab/latex-lab-table.dtx @@ -16,8 +16,8 @@ % % for those people who are interested or want to report an issue. % -\def\ltlabtbldate{2024-08-10} -\def\ltlabtblversion{0.85m} +\def\ltlabtbldate{2024-09-18} +\def\ltlabtblversion{0.85n} %<*driver> \documentclass{l3doc} \EnableCrossrefs @@ -1425,9 +1425,9 @@ } \hbox to\z@{\hss\parbox[t]\LTcapwidth{% \reset@font - \tag_stop:n{caption} + \tag_suspend:n{caption} \sbox\@tempboxa{#1{#2:~}#3}% - \tag_start:n{caption} + \tag_resume:n{caption} \ifdim\wd\@tempboxa>\hsize #1{#2:~}#3% \else diff --git a/required/latex-lab/latex-lab-text.dtx b/required/latex-lab/latex-lab-text.dtx index fe9b6abab..7ca99191d 100644 --- a/required/latex-lab/latex-lab-text.dtx +++ b/required/latex-lab/latex-lab-text.dtx @@ -16,8 +16,8 @@ % % for those people who are interested or want to report an issue. % -\def\ltlabtextdate{2023-07-20} -\def\ltlabtextversion{0.85a} +\def\ltlabtextdate{2024-09-18} +\def\ltlabtextversion{0.85b} %<*driver> \documentclass{l3doc} @@ -78,11 +78,11 @@ \tag_mc_end_push: \tag_struct_begin:n{tag=Span,actualtext=LaTeX} \tag_mc_begin:n{} - \tag_stop:n{LaTeX} + \tag_suspend:n{LaTeX} } \AddToHook{cmd/LaTeX/after} { - \tag_start:n{LaTeX} + \tag_resume:n{LaTeX} \tag_mc_end: \tag_struct_end: \tag_mc_begin_pop:n{} diff --git a/required/latex-lab/testfiles-float/float-001.luatex.tlg b/required/latex-lab/testfiles-float/float-001.luatex.tlg index b1546b35b..171f4ac70 100644 --- a/required/latex-lab/testfiles-float/float-001.luatex.tlg +++ b/required/latex-lab/testfiles-float/float-001.luatex.tlg @@ -56,9 +56,13 @@ Package tagpdf Info: Parent-Child 'Lbl' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from: 'Lbl' --> 'MC' on line ... Package tagpdf Info: closing structure 14 tagged /Lbl -Package tagpdf Info: Parent-Child 'Caption' --> 'MC'. +Package tagpdf Info: Parent-Child 'Caption' --> 'P'. (tagpdf) Relation is 1 (='0..n') -(tagpdf) Rolemapped from: 'Caption' --> 'MC' on line ... +(tagpdf) Rolemapped from: 'Caption' --> 'text' on line ... +Package tagpdf Info: Parent-Child 'P' --> 'MC'. +(tagpdf) Relation is 1 (='0..n') +(tagpdf) Rolemapped from: 'P' --> 'MC' on line ... +Package tagpdf Info: closing structure 15 tagged /text Package tagpdf Info: closing structure 13 tagged /Caption Package tagpdf Info: closing structure 10 tagged /float Package tagpdf Info: Parent-Child 'Sect' --> 'Part'. @@ -70,12 +74,12 @@ Package tagpdf Info: Parent-Child 'Sect' --> 'P'. Package tagpdf Info: Parent-Child 'P' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from: 'P' --> 'MC' on line ... -Package tagpdf Info: closing structure 16 tagged /text -Package tagpdf Info: closing structure 15 tagged /text-unit +Package tagpdf Info: closing structure 17 tagged /text +Package tagpdf Info: closing structure 16 tagged /text-unit Package tagpdf Info: Parent-Child 'Sect' --> 'Note'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from: 'Sect' --> 'float' on line ... -Floatstructure:17 +Floatstructure:18 Package tagpdf Info: Parent-Child 'Note' --> 'Caption'. (tagpdf) Relation is 8 (='∅*') (tagpdf) Rolemapped from: 'Note' --> 'Caption' on line ... @@ -85,11 +89,15 @@ Package tagpdf Info: Parent-Child 'Caption' --> 'Lbl'. Package tagpdf Info: Parent-Child 'Lbl' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from: 'Lbl' --> 'MC' on line ... -Package tagpdf Info: closing structure 19 tagged /Lbl -Package tagpdf Info: Parent-Child 'Caption' --> 'MC'. +Package tagpdf Info: closing structure 20 tagged /Lbl +Package tagpdf Info: Parent-Child 'Caption' --> 'P'. +(tagpdf) Relation is 1 (='0..n') +(tagpdf) Rolemapped from: 'Caption' --> 'text' on line ... +Package tagpdf Info: Parent-Child 'P' --> 'MC'. (tagpdf) Relation is 1 (='0..n') -(tagpdf) Rolemapped from: 'Caption' --> 'MC' on line ... -Package tagpdf Info: closing structure 18 tagged /Caption +(tagpdf) Rolemapped from: 'P' --> 'MC' on line ... +Package tagpdf Info: closing structure 21 tagged /text +Package tagpdf Info: closing structure 19 tagged /Caption Package tagpdf Info: Parent-Child 'Note' --> 'Part'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from: 'Note' --> 'text-unit' on line ... @@ -99,9 +107,9 @@ Package tagpdf Info: Parent-Child 'Note' --> 'P'. Package tagpdf Info: Parent-Child 'P' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from: 'P' --> 'MC' on line ... -Package tagpdf Info: closing structure 21 tagged /text -Package tagpdf Info: closing structure 20 tagged /text-unit -Package tagpdf Info: closing structure 17 tagged /float +Package tagpdf Info: closing structure 23 tagged /text +Package tagpdf Info: closing structure 22 tagged /text-unit +Package tagpdf Info: closing structure 18 tagged /float Package tagpdf Info: -1 has been pushed to the mc stack Package tagpdf Info: -1 has been removed from the mc stack Package tagpdf Info: -1 has been pushed to the mc stack @@ -164,7 +172,7 @@ Completed box being shipped out [1] ......\glue(\rightskip) 0.0 .....\pdfliteral page .....\pdfliteral page -.....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {1}{\ignorespaces This is an example image}}{\thepage }{floatstructure.10}\protected@file@percent }} +.....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {1}{\ignorespaces This is an example image}}{\thepage }{figure.struct.10}\protected@file@percent }} .....\glue 10.0 .....\glue(\baselineskip) 3.11111 .....\hbox(6.94444+1.94444)x345.0, glue set 94.86098fil, direction TLT @@ -231,7 +239,7 @@ Completed box being shipped out [1] .....\pdfliteral page .....\pdfliteral page .....\special{} -.....\write1{\@writefile{lot}{\protect \contentsline {table}{\protect \numberline {1}{\ignorespaces Animals in example images}}{\thepage }{floatstructure.17}\protected@file@percent }} +.....\write1{\@writefile{lot}{\protect \contentsline {table}{\protect \numberline {1}{\ignorespaces Animals in example images}}{\thepage }{table.struct.18}\protected@file@percent }} .....\glue 10.0 .....\hbox(6.94444+1.94444)x345.0, glue set 92.86096fil, direction TLT ......\glue 0.0 plus 1.0fil @@ -534,7 +542,7 @@ Package tagpdf Info: Parent-Child 'Document' --> 'Sect'. (tagpdf) Rolemapped from: 'Document' --> 'Sect' on line ... Package tagpdf Info: closing structure 2 tagged /Document Package tagpdf Info: Finalizing the tagging structure: -(tagpdf) Writing out ~21 structure objects +(tagpdf) Writing out ~23 structure objects (tagpdf) with ~13 'MC' leaf nodes. (tagpdf) Be patient if there are lots of objects! Package tagpdf Info: writing ParentTree diff --git a/required/latex-lab/testfiles-float/float-001.tlg b/required/latex-lab/testfiles-float/float-001.tlg index 3c7db483b..2bf460e4f 100644 --- a/required/latex-lab/testfiles-float/float-001.tlg +++ b/required/latex-lab/testfiles-float/float-001.tlg @@ -53,9 +53,13 @@ Package tagpdf Info: Parent-Child 'Lbl' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from: 'Lbl' --> 'MC' on line ... Package tagpdf Info: closing structure 14 tagged /Lbl -Package tagpdf Info: Parent-Child 'Caption' --> 'MC'. +Package tagpdf Info: Parent-Child 'Caption' --> 'P'. (tagpdf) Relation is 1 (='0..n') -(tagpdf) Rolemapped from: 'Caption' --> 'MC' on line ... +(tagpdf) Rolemapped from: 'Caption' --> 'text' on line ... +Package tagpdf Info: Parent-Child 'P' --> 'MC'. +(tagpdf) Relation is 1 (='0..n') +(tagpdf) Rolemapped from: 'P' --> 'MC' on line ... +Package tagpdf Info: closing structure 15 tagged /text Package tagpdf Info: closing structure 13 tagged /Caption Package tagpdf Info: closing structure 10 tagged /float Package tagpdf Info: Parent-Child 'Sect' --> 'Part'. @@ -67,12 +71,12 @@ Package tagpdf Info: Parent-Child 'Sect' --> 'P'. Package tagpdf Info: Parent-Child 'P' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from: 'P' --> 'MC' on line ... -Package tagpdf Info: closing structure 16 tagged /text -Package tagpdf Info: closing structure 15 tagged /text-unit +Package tagpdf Info: closing structure 17 tagged /text +Package tagpdf Info: closing structure 16 tagged /text-unit Package tagpdf Info: Parent-Child 'Sect' --> 'Note'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from: 'Sect' --> 'float' on line ... -Floatstructure:17 +Floatstructure:18 Package tagpdf Info: Parent-Child 'Note' --> 'Caption'. (tagpdf) Relation is 8 (='^^e2^^88^^85*') (tagpdf) Rolemapped from: 'Note' --> 'Caption' on line ... @@ -82,11 +86,15 @@ Package tagpdf Info: Parent-Child 'Caption' --> 'Lbl'. Package tagpdf Info: Parent-Child 'Lbl' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from: 'Lbl' --> 'MC' on line ... -Package tagpdf Info: closing structure 19 tagged /Lbl -Package tagpdf Info: Parent-Child 'Caption' --> 'MC'. +Package tagpdf Info: closing structure 20 tagged /Lbl +Package tagpdf Info: Parent-Child 'Caption' --> 'P'. +(tagpdf) Relation is 1 (='0..n') +(tagpdf) Rolemapped from: 'Caption' --> 'text' on line ... +Package tagpdf Info: Parent-Child 'P' --> 'MC'. (tagpdf) Relation is 1 (='0..n') -(tagpdf) Rolemapped from: 'Caption' --> 'MC' on line ... -Package tagpdf Info: closing structure 18 tagged /Caption +(tagpdf) Rolemapped from: 'P' --> 'MC' on line ... +Package tagpdf Info: closing structure 21 tagged /text +Package tagpdf Info: closing structure 19 tagged /Caption Package tagpdf Info: Parent-Child 'Note' --> 'Part'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from: 'Note' --> 'text-unit' on line ... @@ -96,9 +104,9 @@ Package tagpdf Info: Parent-Child 'Note' --> 'P'. Package tagpdf Info: Parent-Child 'P' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from: 'P' --> 'MC' on line ... -Package tagpdf Info: closing structure 21 tagged /text -Package tagpdf Info: closing structure 20 tagged /text-unit -Package tagpdf Info: closing structure 17 tagged /float +Package tagpdf Info: closing structure 23 tagged /text +Package tagpdf Info: closing structure 22 tagged /text-unit +Package tagpdf Info: closing structure 18 tagged /float The sequence \g__tag_mc_main_marks_seq is empty > . Completed box being shipped out [1] @@ -153,7 +161,7 @@ Completed box being shipped out [1] .....\marks4{b+,4,12,text,,,} .....\marks4{e-,4,12,} .....\marks4{e+,4,12,} -.....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {1}{\ignorespaces This is an example image}}{\thepage }{floatstructure.10}\protected@file@percent }} +.....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {1}{\ignorespaces This is an example image}}{\thepage }{figure.struct.10}\protected@file@percent }} .....\glue 10.0 .....\glue(\baselineskip) 3.16882 .....\hbox(6.8872+1.94397)x345.0, glue set 94.88007fil @@ -173,7 +181,7 @@ Completed box being shipped out [1] ......\glue 4.44336 plus 3.33252 minus 0.55542 ......\pdfliteral page{EMC} ......\write1{\new@label@record{mcid-6}{{tagabspage}{\__property_code_tagabspage: }{tagmcabs}{6}{tagmcid}{\__property_code_tagmcid: }}} -......\pdfliteral shipout page{/Caption <> BDC} +......\pdfliteral shipout page{/text <> BDC} ......\T1/cmr/m/n/10 T ......\T1/cmr/m/n/10 h ......\T1/cmr/m/n/10 i @@ -204,17 +212,17 @@ Completed box being shipped out [1] .....\marks4{b+,5,14,Lbl,,,} .....\marks4{e-,5,14,} .....\marks4{e+,5,14,} -.....\marks4{b-,6,13,Caption,,,} -.....\marks4{b+,6,13,Caption,,,} -.....\marks4{e-,6,13,} -.....\marks4{e+,6,13,} +.....\marks4{b-,6,15,text,,,} +.....\marks4{b+,6,15,text,,,} +.....\marks4{e-,6,15,} +.....\marks4{e+,6,15,} .....\glue 0.0 .....\glue 0.0 ...\glue 12.0 plus 2.0 minus 2.0 ...\vbox(28.8872+0.0)x345.0 ....\vbox(28.8872+0.0)x345.0 .....\special{} -.....\write1{\@writefile{lot}{\protect \contentsline {table}{\protect \numberline {1}{\ignorespaces Animals in example images}}{\thepage }{floatstructure.17}\protected@file@percent }} +.....\write1{\@writefile{lot}{\protect \contentsline {table}{\protect \numberline {1}{\ignorespaces Animals in example images}}{\thepage }{table.struct.18}\protected@file@percent }} .....\glue 10.0 .....\hbox(6.8872+1.94397)x345.0, glue set 92.88055fil ......\glue 0.0 plus 1.0fil @@ -233,7 +241,7 @@ Completed box being shipped out [1] ......\glue 4.44336 plus 3.33252 minus 0.55542 ......\pdfliteral page{EMC} ......\write1{\new@label@record{mcid-9}{{tagabspage}{\__property_code_tagabspage: }{tagmcabs}{9}{tagmcid}{\__property_code_tagmcid: }}} -......\pdfliteral shipout page{/Caption <> BDC} +......\pdfliteral shipout page{/text <> BDC} ......\T1/cmr/m/n/10 A ......\T1/cmr/m/n/10 n ......\T1/cmr/m/n/10 i @@ -261,14 +269,14 @@ Completed box being shipped out [1] ......\T1/cmr/m/n/10 s ......\pdfliteral page{EMC} ......\glue 0.0 plus 1.0fil -.....\marks4{b-,8,19,Lbl,,,} -.....\marks4{b+,8,19,Lbl,,,} -.....\marks4{e-,8,19,} -.....\marks4{e+,8,19,} -.....\marks4{b-,9,18,Caption,,,} -.....\marks4{b+,9,18,Caption,,,} -.....\marks4{e-,9,18,} -.....\marks4{e+,9,18,} +.....\marks4{b-,8,20,Lbl,,,} +.....\marks4{b+,8,20,Lbl,,,} +.....\marks4{e-,8,20,} +.....\marks4{e+,8,20,} +.....\marks4{b-,9,21,text,,,} +.....\marks4{b+,9,21,text,,,} +.....\marks4{e-,9,21,} +.....\marks4{e+,9,21,} .....\glue 0.0 .....\glue(\parskip) 0.0 .....\glue(\parskip) 0.0 @@ -290,10 +298,10 @@ Completed box being shipped out [1] ......\penalty 10000 ......\glue(\parfillskip) 0.0 plus 1.0fil ......\glue(\rightskip) 0.0 -.....\marks4{b-,10,21,text,,,} -.....\marks4{b+,10,21,text,,,} -.....\marks4{e-,10,21,} -.....\marks4{e+,10,21,} +.....\marks4{b-,10,23,text,,,} +.....\marks4{b+,10,23,text,,,} +.....\marks4{e-,10,23,} +.....\marks4{e+,10,23,} .....\glue 0.0 ...\glue 12.0 plus 2.0 minus 2.0 ...\glue -12.0 plus -2.0 minus -2.0 @@ -441,10 +449,10 @@ Completed box being shipped out [1] ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 -...\marks4{b-,7,16,text,,,} -...\marks4{b+,7,16,text,,,} -...\marks4{e-,7,16,} -...\marks4{e+,7,16,} +...\marks4{b-,7,17,text,,,} +...\marks4{b+,7,17,text,,,} +...\marks4{e-,7,17,} +...\marks4{e+,7,17,} ...\penalty 0 ...\penalty 10000 ...\glue 0.0 plus 1.0fil @@ -483,7 +491,7 @@ Package tagpdf Info: Parent-Child 'Document' --> 'Sect'. (tagpdf) Rolemapped from: 'Document' --> 'Sect' on line ... Package tagpdf Info: closing structure 2 tagged /Document Package tagpdf Info: Finalizing the tagging structure: -(tagpdf) Writing out ~21 structure objects +(tagpdf) Writing out ~23 structure objects (tagpdf) with ~12 'MC' leaf nodes. (tagpdf) Be patient if there are lots of objects! Package tagpdf Info: writing ParentTree diff --git a/required/latex-lab/testfiles-float/float-002.luatex.tlg b/required/latex-lab/testfiles-float/float-002.luatex.tlg index 67db91c13..b309294da 100644 --- a/required/latex-lab/testfiles-float/float-002.luatex.tlg +++ b/required/latex-lab/testfiles-float/float-002.luatex.tlg @@ -67,9 +67,13 @@ Package tagpdf Info: Parent-Child 'Lbl' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from: 'Lbl' --> 'MC' on line ... Package tagpdf Info: closing structure 16 tagged /Lbl -Package tagpdf Info: Parent-Child 'Caption' --> 'MC'. +Package tagpdf Info: Parent-Child 'Caption' --> 'P'. (tagpdf) Relation is 1 (='0..n') -(tagpdf) Rolemapped from: 'Caption' --> 'MC' on line ... +(tagpdf) Rolemapped from: 'Caption' --> 'text' on line ... +Package tagpdf Info: Parent-Child 'P' --> 'MC'. +(tagpdf) Relation is 1 (='0..n') +(tagpdf) Rolemapped from: 'P' --> 'MC' on line ... +Package tagpdf Info: closing structure 17 tagged /text Package tagpdf Info: closing structure 15 tagged /Caption Package tagpdf Info: Parent-Child 'Note' --> 'Part'. (tagpdf) Relation is 1 (='0..n') @@ -80,13 +84,13 @@ Package tagpdf Info: Parent-Child 'Note' --> 'P'. Package tagpdf Info: Parent-Child 'P' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from: 'P' --> 'MC' on line ... -Package tagpdf Info: closing structure 18 tagged /text -Package tagpdf Info: closing structure 17 tagged /text-unit +Package tagpdf Info: closing structure 19 tagged /text +Package tagpdf Info: closing structure 18 tagged /text-unit Package tagpdf Info: closing structure 10 tagged /float Package tagpdf Info: Parent-Child 'Sect' --> 'Note'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from: 'Sect' --> 'float' on line ... -Floatstructure:19 +Floatstructure:20 Package tagpdf Info: Parent-Child 'Note' --> 'Caption'. (tagpdf) Relation is 8 (='∅*') (tagpdf) Rolemapped from: 'Note' --> 'Caption' on line ... @@ -96,11 +100,15 @@ Package tagpdf Info: Parent-Child 'Caption' --> 'Lbl'. Package tagpdf Info: Parent-Child 'Lbl' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from: 'Lbl' --> 'MC' on line ... -Package tagpdf Info: closing structure 21 tagged /Lbl -Package tagpdf Info: Parent-Child 'Caption' --> 'MC'. +Package tagpdf Info: closing structure 22 tagged /Lbl +Package tagpdf Info: Parent-Child 'Caption' --> 'P'. (tagpdf) Relation is 1 (='0..n') -(tagpdf) Rolemapped from: 'Caption' --> 'MC' on line ... -Package tagpdf Info: closing structure 20 tagged /Caption +(tagpdf) Rolemapped from: 'Caption' --> 'text' on line ... +Package tagpdf Info: Parent-Child 'P' --> 'MC'. +(tagpdf) Relation is 1 (='0..n') +(tagpdf) Rolemapped from: 'P' --> 'MC' on line ... +Package tagpdf Info: closing structure 23 tagged /text +Package tagpdf Info: closing structure 21 tagged /Caption Package tagpdf Info: Parent-Child 'Note' --> 'Part'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from: 'Note' --> 'text-unit' on line ... @@ -110,17 +118,17 @@ Package tagpdf Info: Parent-Child 'Note' --> 'P'. Package tagpdf Info: Parent-Child 'P' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from: 'P' --> 'MC' on line ... -Package tagpdf Info: closing structure 23 tagged /text -Package tagpdf Info: closing structure 22 tagged /text-unit -Package tagpdf Info: closing structure 19 tagged /float +Package tagpdf Info: closing structure 25 tagged /text +Package tagpdf Info: closing structure 24 tagged /text-unit +Package tagpdf Info: closing structure 20 tagged /float Package tagpdf Info: Parent-Child 'Sect' --> 'Sect'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from: 'Sect' --> 'Sect' on line ... Package tagpdf Info: Parent-Child 'Sect' --> 'Sect'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from: 'Sect' --> 'Sect' on line ... -Package tagpdf Info: closing structure 24 tagged /figures -Package tagpdf Info: closing structure 25 tagged /tables +Package tagpdf Info: closing structure 26 tagged /figures +Package tagpdf Info: closing structure 27 tagged /tables Package tagpdf Info: closing structure 5 tagged /Sect Package tagpdf Info: Parent-Child 'Document' --> 'Sect'. (tagpdf) Relation is 1 (='0..n') @@ -137,15 +145,15 @@ Package tagpdf Info: Parent-Child 'Lbl' --> 'MC'. Package tagpdf Info: Parent-Child 'Lbl' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from: 'Lbl' --> 'MC' on line ... -Package tagpdf Info: closing structure 28 tagged /Lbl +Package tagpdf Info: closing structure 30 tagged /Lbl Package tagpdf Info: Parent-Child 'H1' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from: 'H1' --> 'MC' on line ... -Package tagpdf Info: closing structure 27 tagged /section +Package tagpdf Info: closing structure 29 tagged /section Package tagpdf Info: Parent-Child 'Sect' --> 'Note'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from: 'Sect' --> 'float' on line ... -Floatstructure:29 +Floatstructure:31 Package tagpdf Info: Parent-Child 'Note' --> 'Part'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from: 'Note' --> 'text-unit' on line ... @@ -155,8 +163,8 @@ Package tagpdf Info: Parent-Child 'Note' --> 'P'. Package tagpdf Info: Parent-Child 'P' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from: 'P' --> 'MC' on line ... -Package tagpdf Info: closing structure 31 tagged /text -Package tagpdf Info: closing structure 30 tagged /text-unit +Package tagpdf Info: closing structure 33 tagged /text +Package tagpdf Info: closing structure 32 tagged /text-unit Package tagpdf Info: Parent-Child 'Note' --> 'Part'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from: 'Note' --> 'text-unit' on line ... @@ -166,8 +174,8 @@ Package tagpdf Info: Parent-Child 'Note' --> 'P'. Package tagpdf Info: Parent-Child 'P' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from: 'P' --> 'MC' on line ... -Package tagpdf Info: closing structure 33 tagged /text -Package tagpdf Info: closing structure 32 tagged /text-unit +Package tagpdf Info: closing structure 35 tagged /text +Package tagpdf Info: closing structure 34 tagged /text-unit Package tagpdf Info: Parent-Child 'Note' --> 'Caption'. (tagpdf) Relation is 8 (='∅*') (tagpdf) Rolemapped from: 'Note' --> 'Caption' on line ... @@ -177,12 +185,16 @@ Package tagpdf Info: Parent-Child 'Caption' --> 'Lbl'. Package tagpdf Info: Parent-Child 'Lbl' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from: 'Lbl' --> 'MC' on line ... -Package tagpdf Info: closing structure 35 tagged /Lbl -Package tagpdf Info: Parent-Child 'Caption' --> 'MC'. +Package tagpdf Info: closing structure 37 tagged /Lbl +Package tagpdf Info: Parent-Child 'Caption' --> 'P'. +(tagpdf) Relation is 1 (='0..n') +(tagpdf) Rolemapped from: 'Caption' --> 'text' on line ... +Package tagpdf Info: Parent-Child 'P' --> 'MC'. (tagpdf) Relation is 1 (='0..n') -(tagpdf) Rolemapped from: 'Caption' --> 'MC' on line ... -Package tagpdf Info: closing structure 34 tagged /Caption -Package tagpdf Info: closing structure 29 tagged /float +(tagpdf) Rolemapped from: 'P' --> 'MC' on line ... +Package tagpdf Info: closing structure 38 tagged /text +Package tagpdf Info: closing structure 36 tagged /Caption +Package tagpdf Info: closing structure 31 tagged /float Package tagpdf Info: Parent-Child 'Sect' --> 'Part'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from: 'Sect' --> 'text-unit' on line ... @@ -192,12 +204,12 @@ Package tagpdf Info: Parent-Child 'Sect' --> 'P'. Package tagpdf Info: Parent-Child 'P' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from: 'P' --> 'MC' on line ... -Package tagpdf Info: closing structure 37 tagged /text -Package tagpdf Info: closing structure 36 tagged /text-unit +Package tagpdf Info: closing structure 40 tagged /text +Package tagpdf Info: closing structure 39 tagged /text-unit Package tagpdf Info: Parent-Child 'Sect' --> 'Note'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from: 'Sect' --> 'float' on line ... -Floatstructure:38 +Floatstructure:41 Package tagpdf Info: Parent-Child 'Note' --> 'Part'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from: 'Note' --> 'text-unit' on line ... @@ -207,8 +219,8 @@ Package tagpdf Info: Parent-Child 'Note' --> 'P'. Package tagpdf Info: Parent-Child 'P' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from: 'P' --> 'MC' on line ... -Package tagpdf Info: closing structure 40 tagged /text -Package tagpdf Info: closing structure 39 tagged /text-unit +Package tagpdf Info: closing structure 43 tagged /text +Package tagpdf Info: closing structure 42 tagged /text-unit Package tagpdf Info: Parent-Child 'Note' --> 'Part'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from: 'Note' --> 'text-unit' on line ... @@ -218,8 +230,8 @@ Package tagpdf Info: Parent-Child 'Note' --> 'P'. Package tagpdf Info: Parent-Child 'P' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from: 'P' --> 'MC' on line ... -Package tagpdf Info: closing structure 42 tagged /text -Package tagpdf Info: closing structure 41 tagged /text-unit +Package tagpdf Info: closing structure 45 tagged /text +Package tagpdf Info: closing structure 44 tagged /text-unit Package tagpdf Info: Parent-Child 'Note' --> 'Caption'. (tagpdf) Relation is 8 (='∅*') (tagpdf) Rolemapped from: 'Note' --> 'Caption' on line ... @@ -229,17 +241,21 @@ Package tagpdf Info: Parent-Child 'Caption' --> 'Lbl'. Package tagpdf Info: Parent-Child 'Lbl' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from: 'Lbl' --> 'MC' on line ... -Package tagpdf Info: closing structure 44 tagged /Lbl -Package tagpdf Info: Parent-Child 'Caption' --> 'MC'. +Package tagpdf Info: closing structure 47 tagged /Lbl +Package tagpdf Info: Parent-Child 'Caption' --> 'P'. (tagpdf) Relation is 1 (='0..n') -(tagpdf) Rolemapped from: 'Caption' --> 'MC' on line ... -Package tagpdf Info: closing structure 43 tagged /Caption -Package tagpdf Info: closing structure 38 tagged /float +(tagpdf) Rolemapped from: 'Caption' --> 'text' on line ... +Package tagpdf Info: Parent-Child 'P' --> 'MC'. +(tagpdf) Relation is 1 (='0..n') +(tagpdf) Rolemapped from: 'P' --> 'MC' on line ... +Package tagpdf Info: closing structure 48 tagged /text +Package tagpdf Info: closing structure 46 tagged /Caption +Package tagpdf Info: closing structure 41 tagged /float Package tagpdf Info: Parent-Child 'Sect' --> 'Sect'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from: 'Sect' --> 'Sect' on line ... -Package tagpdf Info: closing structure 45 tagged /figures -Package tagpdf Info: closing structure 46 tagged /tables +Package tagpdf Info: closing structure 49 tagged /figures +Package tagpdf Info: closing structure 50 tagged /tables Package tagpdf Info: -1 has been pushed to the mc stack Package tagpdf Info: -1 has been removed from the mc stack Package tagpdf Info: -1 has been pushed to the mc stack @@ -322,7 +338,7 @@ Completed box being shipped out [1] ......\glue(\rightskip) 0.0 .....\pdfliteral page .....\pdfliteral page -.....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {1}{\ignorespaces A}}{\thepage }{floatstructure.10}\protected@file@percent }} +.....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {1}{\ignorespaces A}}{\thepage }{figure.struct.10}\protected@file@percent }} .....\glue 10.0 .....\glue(\baselineskip) 3.22224 .....\hbox(6.83331+1.94444)x345.0, glue set 146.86105fil, direction TLT @@ -351,7 +367,7 @@ Completed box being shipped out [1] .....\glue 0.0 .....\pdfliteral page .....\pdfliteral page -.....\write1{\newlabel{fig:1}{{1}{\thepage }{}{floatstructure.10}{}}} +.....\write1{\newlabel{fig:1}{{1}{\thepage }{}{figure.struct.10}{}}} .....\glue(\parskip) 0.0 .....\glue(\parskip) 0.0 .....\glue(\baselineskip) 3.22224 @@ -390,7 +406,7 @@ Completed box being shipped out [1] .....\pdfliteral page .....\pdfliteral page .....\special{} -.....\write1{\@writefile{lot}{\protect \contentsline {table}{\protect \numberline {1}{\ignorespaces Table}}{\thepage }{floatstructure.19}\protected@file@percent }} +.....\write1{\@writefile{lot}{\protect \contentsline {table}{\protect \numberline {1}{\ignorespaces Table}}{\thepage }{table.struct.20}\protected@file@percent }} .....\glue 10.0 .....\hbox(6.94444+0.0)x345.0, glue set 140.55551fil, direction TLT ......\glue 0.0 plus 1.0fil @@ -620,7 +636,7 @@ Completed box being shipped out [1] ......\glue(\rightskip) 0.0 .....\pdfliteral page .....\pdfliteral page -.....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {2}{\ignorespaces B}}{\thepage }{floatstructure.29}\protected@file@percent }} +.....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {2}{\ignorespaces B}}{\thepage }{figure.struct.31}\protected@file@percent }} .....\glue 10.0 .....\glue(\baselineskip) 5.16669 .....\hbox(6.83331+1.94444)x345.0, glue set 147.0694fil, direction TLT @@ -747,7 +763,7 @@ Completed box being shipped out [2] ......\glue(\rightskip) 0.0 .....\pdfliteral page .....\pdfliteral page -.....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {3}{\ignorespaces C}}{\thepage }{floatstructure.38}\protected@file@percent }} +.....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {3}{\ignorespaces C}}{\thepage }{figure.struct.41}\protected@file@percent }} .....\glue 10.0 .....\glue(\baselineskip) 5.16669 .....\hbox(6.83331+1.94444)x345.0, glue set 146.99995fil, direction TLT @@ -796,10 +812,10 @@ Completed box being shipped out [2] .\kern633.0 .\pdfliteral page Non-PDF special ignored! (float-002.aux) -Package tagpdf Info: closing structure 26 tagged /Sect +Package tagpdf Info: closing structure 28 tagged /Sect Package tagpdf Info: closing structure 2 tagged /Document Package tagpdf Info: Finalizing the tagging structure: -(tagpdf) Writing out ~46 structure objects +(tagpdf) Writing out ~50 structure objects (tagpdf) with ~28 'MC' leaf nodes. (tagpdf) Be patient if there are lots of objects! Package tagpdf Info: writing ParentTree diff --git a/required/latex-lab/testfiles-float/float-002.tlg b/required/latex-lab/testfiles-float/float-002.tlg index c1dcc0491..bb53a84d1 100644 --- a/required/latex-lab/testfiles-float/float-002.tlg +++ b/required/latex-lab/testfiles-float/float-002.tlg @@ -64,9 +64,13 @@ Package tagpdf Info: Parent-Child 'Lbl' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from: 'Lbl' --> 'MC' on line ... Package tagpdf Info: closing structure 16 tagged /Lbl -Package tagpdf Info: Parent-Child 'Caption' --> 'MC'. +Package tagpdf Info: Parent-Child 'Caption' --> 'P'. (tagpdf) Relation is 1 (='0..n') -(tagpdf) Rolemapped from: 'Caption' --> 'MC' on line ... +(tagpdf) Rolemapped from: 'Caption' --> 'text' on line ... +Package tagpdf Info: Parent-Child 'P' --> 'MC'. +(tagpdf) Relation is 1 (='0..n') +(tagpdf) Rolemapped from: 'P' --> 'MC' on line ... +Package tagpdf Info: closing structure 17 tagged /text Package tagpdf Info: closing structure 15 tagged /Caption Package tagpdf Info: Parent-Child 'Note' --> 'Part'. (tagpdf) Relation is 1 (='0..n') @@ -77,13 +81,13 @@ Package tagpdf Info: Parent-Child 'Note' --> 'P'. Package tagpdf Info: Parent-Child 'P' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from: 'P' --> 'MC' on line ... -Package tagpdf Info: closing structure 18 tagged /text -Package tagpdf Info: closing structure 17 tagged /text-unit +Package tagpdf Info: closing structure 19 tagged /text +Package tagpdf Info: closing structure 18 tagged /text-unit Package tagpdf Info: closing structure 10 tagged /float Package tagpdf Info: Parent-Child 'Sect' --> 'Note'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from: 'Sect' --> 'float' on line ... -Floatstructure:19 +Floatstructure:20 Package tagpdf Info: Parent-Child 'Note' --> 'Caption'. (tagpdf) Relation is 8 (='^^e2^^88^^85*') (tagpdf) Rolemapped from: 'Note' --> 'Caption' on line ... @@ -93,11 +97,15 @@ Package tagpdf Info: Parent-Child 'Caption' --> 'Lbl'. Package tagpdf Info: Parent-Child 'Lbl' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from: 'Lbl' --> 'MC' on line ... -Package tagpdf Info: closing structure 21 tagged /Lbl -Package tagpdf Info: Parent-Child 'Caption' --> 'MC'. +Package tagpdf Info: closing structure 22 tagged /Lbl +Package tagpdf Info: Parent-Child 'Caption' --> 'P'. (tagpdf) Relation is 1 (='0..n') -(tagpdf) Rolemapped from: 'Caption' --> 'MC' on line ... -Package tagpdf Info: closing structure 20 tagged /Caption +(tagpdf) Rolemapped from: 'Caption' --> 'text' on line ... +Package tagpdf Info: Parent-Child 'P' --> 'MC'. +(tagpdf) Relation is 1 (='0..n') +(tagpdf) Rolemapped from: 'P' --> 'MC' on line ... +Package tagpdf Info: closing structure 23 tagged /text +Package tagpdf Info: closing structure 21 tagged /Caption Package tagpdf Info: Parent-Child 'Note' --> 'Part'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from: 'Note' --> 'text-unit' on line ... @@ -107,17 +115,17 @@ Package tagpdf Info: Parent-Child 'Note' --> 'P'. Package tagpdf Info: Parent-Child 'P' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from: 'P' --> 'MC' on line ... -Package tagpdf Info: closing structure 23 tagged /text -Package tagpdf Info: closing structure 22 tagged /text-unit -Package tagpdf Info: closing structure 19 tagged /float +Package tagpdf Info: closing structure 25 tagged /text +Package tagpdf Info: closing structure 24 tagged /text-unit +Package tagpdf Info: closing structure 20 tagged /float Package tagpdf Info: Parent-Child 'Sect' --> 'Sect'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from: 'Sect' --> 'Sect' on line ... Package tagpdf Info: Parent-Child 'Sect' --> 'Sect'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from: 'Sect' --> 'Sect' on line ... -Package tagpdf Info: closing structure 24 tagged /figures -Package tagpdf Info: closing structure 25 tagged /tables +Package tagpdf Info: closing structure 26 tagged /figures +Package tagpdf Info: closing structure 27 tagged /tables Package tagpdf Info: closing structure 5 tagged /Sect Package tagpdf Info: Parent-Child 'Document' --> 'Sect'. (tagpdf) Relation is 1 (='0..n') @@ -131,15 +139,15 @@ Package tagpdf Info: Parent-Child 'H1' --> 'Lbl'. Package tagpdf Info: Parent-Child 'Lbl' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from: 'Lbl' --> 'MC' on line ... -Package tagpdf Info: closing structure 28 tagged /Lbl +Package tagpdf Info: closing structure 30 tagged /Lbl Package tagpdf Info: Parent-Child 'H1' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from: 'H1' --> 'MC' on line ... -Package tagpdf Info: closing structure 27 tagged /section +Package tagpdf Info: closing structure 29 tagged /section Package tagpdf Info: Parent-Child 'Sect' --> 'Note'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from: 'Sect' --> 'float' on line ... -Floatstructure:29 +Floatstructure:31 Package tagpdf Info: Parent-Child 'Note' --> 'Part'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from: 'Note' --> 'text-unit' on line ... @@ -149,8 +157,8 @@ Package tagpdf Info: Parent-Child 'Note' --> 'P'. Package tagpdf Info: Parent-Child 'P' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from: 'P' --> 'MC' on line ... -Package tagpdf Info: closing structure 31 tagged /text -Package tagpdf Info: closing structure 30 tagged /text-unit +Package tagpdf Info: closing structure 33 tagged /text +Package tagpdf Info: closing structure 32 tagged /text-unit Package tagpdf Info: Parent-Child 'Note' --> 'Part'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from: 'Note' --> 'text-unit' on line ... @@ -160,8 +168,8 @@ Package tagpdf Info: Parent-Child 'Note' --> 'P'. Package tagpdf Info: Parent-Child 'P' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from: 'P' --> 'MC' on line ... -Package tagpdf Info: closing structure 33 tagged /text -Package tagpdf Info: closing structure 32 tagged /text-unit +Package tagpdf Info: closing structure 35 tagged /text +Package tagpdf Info: closing structure 34 tagged /text-unit Package tagpdf Info: Parent-Child 'Note' --> 'Caption'. (tagpdf) Relation is 8 (='^^e2^^88^^85*') (tagpdf) Rolemapped from: 'Note' --> 'Caption' on line ... @@ -171,12 +179,16 @@ Package tagpdf Info: Parent-Child 'Caption' --> 'Lbl'. Package tagpdf Info: Parent-Child 'Lbl' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from: 'Lbl' --> 'MC' on line ... -Package tagpdf Info: closing structure 35 tagged /Lbl -Package tagpdf Info: Parent-Child 'Caption' --> 'MC'. +Package tagpdf Info: closing structure 37 tagged /Lbl +Package tagpdf Info: Parent-Child 'Caption' --> 'P'. +(tagpdf) Relation is 1 (='0..n') +(tagpdf) Rolemapped from: 'Caption' --> 'text' on line ... +Package tagpdf Info: Parent-Child 'P' --> 'MC'. (tagpdf) Relation is 1 (='0..n') -(tagpdf) Rolemapped from: 'Caption' --> 'MC' on line ... -Package tagpdf Info: closing structure 34 tagged /Caption -Package tagpdf Info: closing structure 29 tagged /float +(tagpdf) Rolemapped from: 'P' --> 'MC' on line ... +Package tagpdf Info: closing structure 38 tagged /text +Package tagpdf Info: closing structure 36 tagged /Caption +Package tagpdf Info: closing structure 31 tagged /float Package tagpdf Info: Parent-Child 'Sect' --> 'Part'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from: 'Sect' --> 'text-unit' on line ... @@ -186,12 +198,12 @@ Package tagpdf Info: Parent-Child 'Sect' --> 'P'. Package tagpdf Info: Parent-Child 'P' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from: 'P' --> 'MC' on line ... -Package tagpdf Info: closing structure 37 tagged /text -Package tagpdf Info: closing structure 36 tagged /text-unit +Package tagpdf Info: closing structure 40 tagged /text +Package tagpdf Info: closing structure 39 tagged /text-unit Package tagpdf Info: Parent-Child 'Sect' --> 'Note'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from: 'Sect' --> 'float' on line ... -Floatstructure:38 +Floatstructure:41 Package tagpdf Info: Parent-Child 'Note' --> 'Part'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from: 'Note' --> 'text-unit' on line ... @@ -201,8 +213,8 @@ Package tagpdf Info: Parent-Child 'Note' --> 'P'. Package tagpdf Info: Parent-Child 'P' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from: 'P' --> 'MC' on line ... -Package tagpdf Info: closing structure 40 tagged /text -Package tagpdf Info: closing structure 39 tagged /text-unit +Package tagpdf Info: closing structure 43 tagged /text +Package tagpdf Info: closing structure 42 tagged /text-unit Package tagpdf Info: Parent-Child 'Note' --> 'Part'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from: 'Note' --> 'text-unit' on line ... @@ -212,8 +224,8 @@ Package tagpdf Info: Parent-Child 'Note' --> 'P'. Package tagpdf Info: Parent-Child 'P' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from: 'P' --> 'MC' on line ... -Package tagpdf Info: closing structure 42 tagged /text -Package tagpdf Info: closing structure 41 tagged /text-unit +Package tagpdf Info: closing structure 45 tagged /text +Package tagpdf Info: closing structure 44 tagged /text-unit Package tagpdf Info: Parent-Child 'Note' --> 'Caption'. (tagpdf) Relation is 8 (='^^e2^^88^^85*') (tagpdf) Rolemapped from: 'Note' --> 'Caption' on line ... @@ -223,17 +235,21 @@ Package tagpdf Info: Parent-Child 'Caption' --> 'Lbl'. Package tagpdf Info: Parent-Child 'Lbl' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from: 'Lbl' --> 'MC' on line ... -Package tagpdf Info: closing structure 44 tagged /Lbl -Package tagpdf Info: Parent-Child 'Caption' --> 'MC'. +Package tagpdf Info: closing structure 47 tagged /Lbl +Package tagpdf Info: Parent-Child 'Caption' --> 'P'. (tagpdf) Relation is 1 (='0..n') -(tagpdf) Rolemapped from: 'Caption' --> 'MC' on line ... -Package tagpdf Info: closing structure 43 tagged /Caption -Package tagpdf Info: closing structure 38 tagged /float +(tagpdf) Rolemapped from: 'Caption' --> 'text' on line ... +Package tagpdf Info: Parent-Child 'P' --> 'MC'. +(tagpdf) Relation is 1 (='0..n') +(tagpdf) Rolemapped from: 'P' --> 'MC' on line ... +Package tagpdf Info: closing structure 48 tagged /text +Package tagpdf Info: closing structure 46 tagged /Caption +Package tagpdf Info: closing structure 41 tagged /float Package tagpdf Info: Parent-Child 'Sect' --> 'Sect'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from: 'Sect' --> 'Sect' on line ... -Package tagpdf Info: closing structure 45 tagged /figures -Package tagpdf Info: closing structure 46 tagged /tables +Package tagpdf Info: closing structure 49 tagged /figures +Package tagpdf Info: closing structure 50 tagged /tables The sequence \g__tag_mc_main_marks_seq is empty > . Completed box being shipped out [1] @@ -258,8 +274,8 @@ Completed box being shipped out [1] ...\hbox(0.0+0.0)x345.0 ....\hbox(0.0+0.0)x345.0 ...\pdfliteral page{EMC} -...\marks4{e-,23,26,} -...\marks4{e+,23,26,} +...\marks4{e-,23,28,} +...\marks4{e+,23,28,} ...\pdfrunninglinkon ..\glue 25.0 ..\glue(\lineskip) 0.0 @@ -305,7 +321,7 @@ Completed box being shipped out [1] .....\marks4{b+,5,14,text,,,} .....\marks4{e-,5,14,} .....\marks4{e+,5,14,} -.....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {1}{\ignorespaces A}}{\thepage }{floatstructure.10}\protected@file@percent }} +.....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {1}{\ignorespaces A}}{\thepage }{figure.struct.10}\protected@file@percent }} .....\glue 10.0 .....\glue(\baselineskip) 3.16882 .....\hbox(6.8872+1.94397)x345.0, glue set 146.86737fil @@ -325,7 +341,7 @@ Completed box being shipped out [1] ......\glue 4.44336 plus 3.33252 minus 0.55542 ......\pdfliteral page{EMC} ......\write1{\new@label@record{mcid-7}{{tagabspage}{\__property_code_tagabspage: }{tagmcabs}{7}{tagmcid}{\__property_code_tagmcid: }}} -......\pdfliteral shipout page{/Caption <> BDC} +......\pdfliteral shipout page{/text <> BDC} ......\T1/cmr/m/n/10 A ......\pdfliteral page{EMC} ......\glue 0.0 plus 1.0fil @@ -333,12 +349,12 @@ Completed box being shipped out [1] .....\marks4{b+,6,16,Lbl,,,} .....\marks4{e-,6,16,} .....\marks4{e+,6,16,} -.....\marks4{b-,7,15,Caption,,,} -.....\marks4{b+,7,15,Caption,,,} -.....\marks4{e-,7,15,} -.....\marks4{e+,7,15,} +.....\marks4{b-,7,17,text,,,} +.....\marks4{b+,7,17,text,,,} +.....\marks4{e-,7,17,} +.....\marks4{e+,7,17,} .....\glue 0.0 -.....\write1{\newlabel{fig:1}{{1}{\thepage }{}{floatstructure.10}{}}} +.....\write1{\newlabel{fig:1}{{1}{\thepage }{}{figure.struct.10}{}}} .....\glue(\parskip) 0.0 .....\glue(\parskip) 0.0 .....\glue(\baselineskip) 3.16882 @@ -364,16 +380,16 @@ Completed box being shipped out [1] ......\penalty 10000 ......\glue(\parfillskip) 0.0 plus 1.0fil ......\glue(\rightskip) 0.0 -.....\marks4{b-,8,18,text,,,} -.....\marks4{b+,8,18,text,,,} -.....\marks4{e-,8,18,} -.....\marks4{e+,8,18,} +.....\marks4{b-,8,19,text,,,} +.....\marks4{b+,8,19,text,,,} +.....\marks4{e-,8,19,} +.....\marks4{e+,8,19,} .....\glue 0.0 ...\glue 12.0 plus 2.0 minus 2.0 ...\vbox(28.8872+0.0)x345.0 ....\vbox(28.8872+0.0)x345.0 .....\special{} -.....\write1{\@writefile{lot}{\protect \contentsline {table}{\protect \numberline {1}{\ignorespaces Table}}{\thepage }{floatstructure.19}\protected@file@percent }} +.....\write1{\@writefile{lot}{\protect \contentsline {table}{\protect \numberline {1}{\ignorespaces Table}}{\thepage }{table.struct.20}\protected@file@percent }} .....\glue 10.0 .....\hbox(6.8872+0.0)x345.0, glue set 140.56335fil ......\glue 0.0 plus 1.0fil @@ -392,7 +408,7 @@ Completed box being shipped out [1] ......\glue 4.44336 plus 3.33252 minus 0.55542 ......\pdfliteral page{EMC} ......\write1{\new@label@record{mcid-10}{{tagabspage}{\__property_code_tagabspage: }{tagmcabs}{10}{tagmcid}{\__property_code_tagmcid: }}} -......\pdfliteral shipout page{/Caption <> BDC} +......\pdfliteral shipout page{/text <> BDC} ......\T1/cmr/m/n/10 T ......\kern-0.83313 ......\T1/cmr/m/n/10 a @@ -401,14 +417,14 @@ Completed box being shipped out [1] ......\T1/cmr/m/n/10 e ......\pdfliteral page{EMC} ......\glue 0.0 plus 1.0fil -.....\marks4{b-,9,21,Lbl,,,} -.....\marks4{b+,9,21,Lbl,,,} -.....\marks4{e-,9,21,} -.....\marks4{e+,9,21,} -.....\marks4{b-,10,20,Caption,,,} -.....\marks4{b+,10,20,Caption,,,} -.....\marks4{e-,10,20,} -.....\marks4{e+,10,20,} +.....\marks4{b-,9,22,Lbl,,,} +.....\marks4{b+,9,22,Lbl,,,} +.....\marks4{e-,9,22,} +.....\marks4{e+,9,22,} +.....\marks4{b-,10,23,text,,,} +.....\marks4{b+,10,23,text,,,} +.....\marks4{e-,10,23,} +.....\marks4{e+,10,23,} .....\glue 0.0 .....\glue(\parskip) 0.0 .....\glue(\parskip) 0.0 @@ -428,10 +444,10 @@ Completed box being shipped out [1] ......\penalty 10000 ......\glue(\parfillskip) 0.0 plus 1.0fil ......\glue(\rightskip) 0.0 -.....\marks4{b-,11,23,text,,,} -.....\marks4{b+,11,23,text,,,} -.....\marks4{e-,11,23,} -.....\marks4{e+,11,23,} +.....\marks4{b-,11,25,text,,,} +.....\marks4{b+,11,25,text,,,} +.....\marks4{e-,11,25,} +.....\marks4{e+,11,25,} .....\glue 0.0 ...\glue 12.0 plus 2.0 minus 2.0 ...\glue -12.0 plus -2.0 minus -2.0 @@ -519,14 +535,14 @@ Completed box being shipped out [1] ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 -...\marks4{b-,12,28,Lbl,,,} -...\marks4{b+,12,28,Lbl,,,} -...\marks4{e-,12,28,} -...\marks4{e+,12,28,} -...\marks4{b-,13,27,section,,,} -...\marks4{b+,13,27,section,,,} -...\marks4{e-,13,27,} -...\marks4{e+,13,27,} +...\marks4{b-,12,30,Lbl,,,} +...\marks4{b+,12,30,Lbl,,,} +...\marks4{e-,12,30,} +...\marks4{e+,12,30,} +...\marks4{b-,13,29,section,,,} +...\marks4{b+,13,29,section,,,} +...\marks4{e-,13,29,} +...\marks4{e+,13,29,} ...\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline {2}abc}{\thepage }{target*.2}\protected@file@percent }} ...\penalty 10000 ...\glue 9.90036 plus 0.86089 @@ -551,10 +567,10 @@ Completed box being shipped out [1] ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 -...\marks4{b-,18,37,text,,,} -...\marks4{b+,18,37,text,,,} -...\marks4{e-,18,37,} -...\marks4{e+,18,37,} +...\marks4{b-,18,40,text,,,} +...\marks4{b+,18,40,text,,,} +...\marks4{e-,18,40,} +...\marks4{e+,18,40,} ...\penalty 0 ...\penalty 10000 ...\glue 0.0 plus 1.0fil @@ -579,10 +595,10 @@ Completed box being shipped out [1] ......\penalty 10000 ......\glue(\parfillskip) 0.0 plus 1.0fil ......\glue(\rightskip) 0.0 -.....\marks4{b-,14,31,text,,,} -.....\marks4{b+,14,31,text,,,} -.....\marks4{e-,14,31,} -.....\marks4{e+,14,31,} +.....\marks4{b-,14,33,text,,,} +.....\marks4{b+,14,33,text,,,} +.....\marks4{e-,14,33,} +.....\marks4{e+,14,33,} .....\glue(\parskip) 0.0 .....\glue(\parskip) 0.0 .....\glue(\baselineskip) 5.1128 @@ -598,11 +614,11 @@ Completed box being shipped out [1] ......\penalty 10000 ......\glue(\parfillskip) 0.0 plus 1.0fil ......\glue(\rightskip) 0.0 -.....\marks4{b-,15,33,text,,,} -.....\marks4{b+,15,33,text,,,} -.....\marks4{e-,15,33,} -.....\marks4{e+,15,33,} -.....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {2}{\ignorespaces B}}{\thepage }{floatstructure.29}\protected@file@percent }} +.....\marks4{b-,15,35,text,,,} +.....\marks4{b+,15,35,text,,,} +.....\marks4{e-,15,35,} +.....\marks4{e+,15,35,} +.....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {2}{\ignorespaces B}}{\thepage }{figure.struct.31}\protected@file@percent }} .....\glue 10.0 .....\glue(\baselineskip) 5.1128 .....\hbox(6.8872+1.94397)x345.0, glue set 147.07565fil @@ -622,18 +638,18 @@ Completed box being shipped out [1] ......\glue 4.44336 plus 3.33252 minus 0.55542 ......\pdfliteral page{EMC} ......\write1{\new@label@record{mcid-17}{{tagabspage}{\__property_code_tagabspage: }{tagmcabs}{17}{tagmcid}{\__property_code_tagmcid: }}} -......\pdfliteral shipout page{/Caption <> BDC} +......\pdfliteral shipout page{/text <> BDC} ......\T1/cmr/m/n/10 B ......\pdfliteral page{EMC} ......\glue 0.0 plus 1.0fil -.....\marks4{b-,16,35,Lbl,,,} -.....\marks4{b+,16,35,Lbl,,,} -.....\marks4{e-,16,35,} -.....\marks4{e+,16,35,} -.....\marks4{b-,17,34,Caption,,,} -.....\marks4{b+,17,34,Caption,,,} -.....\marks4{e-,17,34,} -.....\marks4{e+,17,34,} +.....\marks4{b-,16,37,Lbl,,,} +.....\marks4{b+,16,37,Lbl,,,} +.....\marks4{e-,16,37,} +.....\marks4{e+,16,37,} +.....\marks4{b-,17,38,text,,,} +.....\marks4{b+,17,38,text,,,} +.....\marks4{e-,17,38,} +.....\marks4{e+,17,38,} .....\glue 0.0 .....\glue 0.0 ...\glue 12.0 plus 2.0 minus 2.0 @@ -652,8 +668,8 @@ Completed box being shipped out [1] ....\T1/cmr/m/n/10 1 ....\glue 0.0 plus 1.0fil ..\pdfliteral page{EMC} -..\marks4{e-,24,26,} -..\marks4{e+,24,26,} +..\marks4{e-,24,28,} +..\marks4{e+,24,28,} ..\pdfrunninglinkon .\kern 0.0 .\kern 0.0 @@ -677,8 +693,8 @@ Completed box being shipped out [2] ...\hbox(0.0+0.0)x345.0 ....\hbox(0.0+0.0)x345.0 ...\pdfliteral page{EMC} -...\marks4{e-,25,26,} -...\marks4{e+,25,26,} +...\marks4{e-,25,28,} +...\marks4{e+,25,28,} ...\pdfrunninglinkon ..\glue 25.0 ..\glue(\lineskip) 0.0 @@ -703,10 +719,10 @@ Completed box being shipped out [2] ......\penalty 10000 ......\glue(\parfillskip) 0.0 plus 1.0fil ......\glue(\rightskip) 0.0 -.....\marks4{b-,19,40,text,,,} -.....\marks4{b+,19,40,text,,,} -.....\marks4{e-,19,40,} -.....\marks4{e+,19,40,} +.....\marks4{b-,19,43,text,,,} +.....\marks4{b+,19,43,text,,,} +.....\marks4{e-,19,43,} +.....\marks4{e+,19,43,} .....\glue(\parskip) 0.0 .....\glue(\parskip) 0.0 .....\glue(\baselineskip) 5.1128 @@ -722,11 +738,11 @@ Completed box being shipped out [2] ......\penalty 10000 ......\glue(\parfillskip) 0.0 plus 1.0fil ......\glue(\rightskip) 0.0 -.....\marks4{b-,20,42,text,,,} -.....\marks4{b+,20,42,text,,,} -.....\marks4{e-,20,42,} -.....\marks4{e+,20,42,} -.....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {3}{\ignorespaces C}}{\thepage }{floatstructure.38}\protected@file@percent }} +.....\marks4{b-,20,45,text,,,} +.....\marks4{b+,20,45,text,,,} +.....\marks4{e-,20,45,} +.....\marks4{e+,20,45,} +.....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {3}{\ignorespaces C}}{\thepage }{figure.struct.41}\protected@file@percent }} .....\glue 10.0 .....\glue(\baselineskip) 5.1128 .....\hbox(6.8872+1.94397)x345.0, glue set 147.00623fil @@ -746,18 +762,18 @@ Completed box being shipped out [2] ......\glue 4.44336 plus 3.33252 minus 0.55542 ......\pdfliteral page{EMC} ......\write1{\new@label@record{mcid-22}{{tagabspage}{\__property_code_tagabspage: }{tagmcabs}{22}{tagmcid}{\__property_code_tagmcid: }}} -......\pdfliteral shipout page{/Caption <> BDC} +......\pdfliteral shipout page{/text <> BDC} ......\T1/cmr/m/n/10 C ......\pdfliteral page{EMC} ......\glue 0.0 plus 1.0fil -.....\marks4{b-,21,44,Lbl,,,} -.....\marks4{b+,21,44,Lbl,,,} -.....\marks4{e-,21,44,} -.....\marks4{e+,21,44,} -.....\marks4{b-,22,43,Caption,,,} -.....\marks4{b+,22,43,Caption,,,} -.....\marks4{e-,22,43,} -.....\marks4{e+,22,43,} +.....\marks4{b-,21,47,Lbl,,,} +.....\marks4{b+,21,47,Lbl,,,} +.....\marks4{e-,21,47,} +.....\marks4{e+,21,47,} +.....\marks4{b-,22,48,text,,,} +.....\marks4{b+,22,48,text,,,} +.....\marks4{e-,22,48,} +.....\marks4{e+,22,48,} .....\glue 0.0 .....\glue 0.0 ...\glue 0.0 plus 1.0fil @@ -772,18 +788,18 @@ Completed box being shipped out [2] ....\T1/cmr/m/n/10 2 ....\glue 0.0 plus 1.0fil ..\pdfliteral page{EMC} -..\marks4{e-,26,26,} -..\marks4{e+,26,26,} +..\marks4{e-,26,28,} +..\marks4{e+,26,28,} ..\pdfrunninglinkon .\kern 0.0 .\kern -633.0 .\hbox(0.0+0.0)x0.0 .\kern 633.0 (float-002.aux) -Package tagpdf Info: closing structure 26 tagged /Sect +Package tagpdf Info: closing structure 28 tagged /Sect Package tagpdf Info: closing structure 2 tagged /Document Package tagpdf Info: Finalizing the tagging structure: -(tagpdf) Writing out ~46 structure objects +(tagpdf) Writing out ~50 structure objects (tagpdf) with ~26 'MC' leaf nodes. (tagpdf) Be patient if there are lots of objects! Package tagpdf Info: writing ParentTree diff --git a/required/latex-lab/testfiles-float/float-003.luatex.tlg b/required/latex-lab/testfiles-float/float-003.luatex.tlg index 488b88514..8c5484ef9 100644 --- a/required/latex-lab/testfiles-float/float-003.luatex.tlg +++ b/required/latex-lab/testfiles-float/float-003.luatex.tlg @@ -73,9 +73,14 @@ Package tagpdf Info: Parent-Child 'Lbl' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'Lbl/pdf2' --> 'MC' on line ... Package tagpdf Info: closing structure 16 tagged /Lbl -Package tagpdf Info: Parent-Child 'Caption' --> 'MC'. +Package tagpdf Info: Parent-Child 'Caption' --> 'P'. (tagpdf) Relation is 1 (='0..n') -(tagpdf) Rolemapped from 'Caption/pdf2' --> 'MC' on line ... +(tagpdf) Rolemapped from 'Caption/pdf2' --> 'text/latex' on line +(tagpdf) 20 +Package tagpdf Info: Parent-Child 'P' --> 'MC'. +(tagpdf) Relation is 1 (='0..n') +(tagpdf) Rolemapped from 'P/pdf2' --> 'MC' on line ... +Package tagpdf Info: closing structure 17 tagged /text Package tagpdf Info: closing structure 15 tagged /Caption Package tagpdf Info: Parent-Child 'Aside' --> 'Part'. (tagpdf) Relation is 1 (='0..n') @@ -87,13 +92,13 @@ Package tagpdf Info: Parent-Child 'Aside' --> 'P'. Package tagpdf Info: Parent-Child 'P' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'P/pdf2' --> 'MC' on line ... -Package tagpdf Info: closing structure 18 tagged /text -Package tagpdf Info: closing structure 17 tagged /text-unit +Package tagpdf Info: closing structure 19 tagged /text +Package tagpdf Info: closing structure 18 tagged /text-unit Package tagpdf Info: closing structure 10 tagged /float Package tagpdf Info: Parent-Child 'Sect' --> 'Aside'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'Sect/pdf2' --> 'float/latex' on line ... -Floatstructure:19 +Floatstructure:20 Package tagpdf Info: Parent-Child 'Aside' --> 'Caption'. (tagpdf) Relation is 2 (='0..1') (tagpdf) Rolemapped from 'Aside/pdf2' --> 'Caption/pdf2' on line @@ -104,11 +109,16 @@ Package tagpdf Info: Parent-Child 'Caption' --> 'Lbl'. Package tagpdf Info: Parent-Child 'Lbl' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'Lbl/pdf2' --> 'MC' on line ... -Package tagpdf Info: closing structure 21 tagged /Lbl -Package tagpdf Info: Parent-Child 'Caption' --> 'MC'. +Package tagpdf Info: closing structure 22 tagged /Lbl +Package tagpdf Info: Parent-Child 'Caption' --> 'P'. +(tagpdf) Relation is 1 (='0..n') +(tagpdf) Rolemapped from 'Caption/pdf2' --> 'text/latex' on line +(tagpdf) 26 +Package tagpdf Info: Parent-Child 'P' --> 'MC'. (tagpdf) Relation is 1 (='0..n') -(tagpdf) Rolemapped from 'Caption/pdf2' --> 'MC' on line ... -Package tagpdf Info: closing structure 20 tagged /Caption +(tagpdf) Rolemapped from 'P/pdf2' --> 'MC' on line ... +Package tagpdf Info: closing structure 23 tagged /text +Package tagpdf Info: closing structure 21 tagged /Caption Package tagpdf Info: Parent-Child 'Aside' --> 'Part'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'Aside/pdf2' --> 'text-unit/latex' on @@ -119,17 +129,17 @@ Package tagpdf Info: Parent-Child 'Aside' --> 'P'. Package tagpdf Info: Parent-Child 'P' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'P/pdf2' --> 'MC' on line ... -Package tagpdf Info: closing structure 23 tagged /text -Package tagpdf Info: closing structure 22 tagged /text-unit -Package tagpdf Info: closing structure 19 tagged /float +Package tagpdf Info: closing structure 25 tagged /text +Package tagpdf Info: closing structure 24 tagged /text-unit +Package tagpdf Info: closing structure 20 tagged /float Package tagpdf Info: Parent-Child 'Sect' --> 'Sect'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'Sect/pdf2' --> 'Sect/pdf2' on line ... Package tagpdf Info: Parent-Child 'Sect' --> 'Sect'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'Sect/pdf2' --> 'Sect/pdf2' on line ... -Package tagpdf Info: closing structure 24 tagged /figures -Package tagpdf Info: closing structure 25 tagged /tables +Package tagpdf Info: closing structure 26 tagged /figures +Package tagpdf Info: closing structure 27 tagged /tables Package tagpdf Info: closing structure 5 tagged /Sect Package tagpdf Info: Parent-Child 'Document' --> 'Sect'. (tagpdf) Relation is 1 (='0..n') @@ -148,15 +158,15 @@ Package tagpdf Info: Parent-Child 'Lbl' --> 'MC'. Package tagpdf Info: Parent-Child 'Lbl' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'Lbl/pdf2' --> 'MC' on line ... -Package tagpdf Info: closing structure 28 tagged /Lbl +Package tagpdf Info: closing structure 30 tagged /Lbl Package tagpdf Info: Parent-Child 'H1' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'H1/pdf2' --> 'MC' on line ... -Package tagpdf Info: closing structure 27 tagged /section +Package tagpdf Info: closing structure 29 tagged /section Package tagpdf Info: Parent-Child 'Sect' --> 'Aside'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'Sect/pdf2' --> 'float/latex' on line ... -Floatstructure:29 +Floatstructure:31 Package tagpdf Info: Parent-Child 'Aside' --> 'Part'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'Aside/pdf2' --> 'text-unit/latex' on @@ -167,8 +177,8 @@ Package tagpdf Info: Parent-Child 'Aside' --> 'P'. Package tagpdf Info: Parent-Child 'P' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'P/pdf2' --> 'MC' on line ... -Package tagpdf Info: closing structure 31 tagged /text -Package tagpdf Info: closing structure 30 tagged /text-unit +Package tagpdf Info: closing structure 33 tagged /text +Package tagpdf Info: closing structure 32 tagged /text-unit Package tagpdf Info: Parent-Child 'Aside' --> 'Part'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'Aside/pdf2' --> 'text-unit/latex' on @@ -179,8 +189,8 @@ Package tagpdf Info: Parent-Child 'Aside' --> 'P'. Package tagpdf Info: Parent-Child 'P' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'P/pdf2' --> 'MC' on line ... -Package tagpdf Info: closing structure 33 tagged /text -Package tagpdf Info: closing structure 32 tagged /text-unit +Package tagpdf Info: closing structure 35 tagged /text +Package tagpdf Info: closing structure 34 tagged /text-unit Package tagpdf Info: Parent-Child 'Aside' --> 'Caption'. (tagpdf) Relation is 2 (='0..1') (tagpdf) Rolemapped from 'Aside/pdf2' --> 'Caption/pdf2' on line @@ -191,12 +201,17 @@ Package tagpdf Info: Parent-Child 'Caption' --> 'Lbl'. Package tagpdf Info: Parent-Child 'Lbl' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'Lbl/pdf2' --> 'MC' on line ... -Package tagpdf Info: closing structure 35 tagged /Lbl -Package tagpdf Info: Parent-Child 'Caption' --> 'MC'. +Package tagpdf Info: closing structure 37 tagged /Lbl +Package tagpdf Info: Parent-Child 'Caption' --> 'P'. +(tagpdf) Relation is 1 (='0..n') +(tagpdf) Rolemapped from 'Caption/pdf2' --> 'text/latex' on line +(tagpdf) 41 +Package tagpdf Info: Parent-Child 'P' --> 'MC'. (tagpdf) Relation is 1 (='0..n') -(tagpdf) Rolemapped from 'Caption/pdf2' --> 'MC' on line ... -Package tagpdf Info: closing structure 34 tagged /Caption -Package tagpdf Info: closing structure 29 tagged /float +(tagpdf) Rolemapped from 'P/pdf2' --> 'MC' on line ... +Package tagpdf Info: closing structure 38 tagged /text +Package tagpdf Info: closing structure 36 tagged /Caption +Package tagpdf Info: closing structure 31 tagged /float Package tagpdf Info: Parent-Child 'Sect' --> 'Part'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'Sect/pdf2' --> 'text-unit/latex' on line @@ -207,12 +222,12 @@ Package tagpdf Info: Parent-Child 'Sect' --> 'P'. Package tagpdf Info: Parent-Child 'P' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'P/pdf2' --> 'MC' on line ... -Package tagpdf Info: closing structure 37 tagged /text -Package tagpdf Info: closing structure 36 tagged /text-unit +Package tagpdf Info: closing structure 40 tagged /text +Package tagpdf Info: closing structure 39 tagged /text-unit Package tagpdf Info: Parent-Child 'Sect' --> 'Aside'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'Sect/pdf2' --> 'float/latex' on line ... -Floatstructure:38 +Floatstructure:41 Package tagpdf Info: Parent-Child 'Aside' --> 'Part'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'Aside/pdf2' --> 'text-unit/latex' on @@ -223,8 +238,8 @@ Package tagpdf Info: Parent-Child 'Aside' --> 'P'. Package tagpdf Info: Parent-Child 'P' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'P/pdf2' --> 'MC' on line ... -Package tagpdf Info: closing structure 40 tagged /text -Package tagpdf Info: closing structure 39 tagged /text-unit +Package tagpdf Info: closing structure 43 tagged /text +Package tagpdf Info: closing structure 42 tagged /text-unit Package tagpdf Info: Parent-Child 'Aside' --> 'Part'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'Aside/pdf2' --> 'text-unit/latex' on @@ -235,8 +250,8 @@ Package tagpdf Info: Parent-Child 'Aside' --> 'P'. Package tagpdf Info: Parent-Child 'P' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'P/pdf2' --> 'MC' on line ... -Package tagpdf Info: closing structure 42 tagged /text -Package tagpdf Info: closing structure 41 tagged /text-unit +Package tagpdf Info: closing structure 45 tagged /text +Package tagpdf Info: closing structure 44 tagged /text-unit Package tagpdf Info: Parent-Child 'Aside' --> 'Caption'. (tagpdf) Relation is 2 (='0..1') (tagpdf) Rolemapped from 'Aside/pdf2' --> 'Caption/pdf2' on line @@ -247,17 +262,22 @@ Package tagpdf Info: Parent-Child 'Caption' --> 'Lbl'. Package tagpdf Info: Parent-Child 'Lbl' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'Lbl/pdf2' --> 'MC' on line ... -Package tagpdf Info: closing structure 44 tagged /Lbl -Package tagpdf Info: Parent-Child 'Caption' --> 'MC'. +Package tagpdf Info: closing structure 47 tagged /Lbl +Package tagpdf Info: Parent-Child 'Caption' --> 'P'. +(tagpdf) Relation is 1 (='0..n') +(tagpdf) Rolemapped from 'Caption/pdf2' --> 'text/latex' on line +(tagpdf) 52 +Package tagpdf Info: Parent-Child 'P' --> 'MC'. (tagpdf) Relation is 1 (='0..n') -(tagpdf) Rolemapped from 'Caption/pdf2' --> 'MC' on line ... -Package tagpdf Info: closing structure 43 tagged /Caption -Package tagpdf Info: closing structure 38 tagged /float +(tagpdf) Rolemapped from 'P/pdf2' --> 'MC' on line ... +Package tagpdf Info: closing structure 48 tagged /text +Package tagpdf Info: closing structure 46 tagged /Caption +Package tagpdf Info: closing structure 41 tagged /float Package tagpdf Info: Parent-Child 'Sect' --> 'Sect'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'Sect/pdf2' --> 'Sect/pdf2' on line ... -Package tagpdf Info: closing structure 45 tagged /figures -Package tagpdf Info: closing structure 46 tagged /tables +Package tagpdf Info: closing structure 49 tagged /figures +Package tagpdf Info: closing structure 50 tagged /tables Package tagpdf Info: -1 has been pushed to the mc stack Package tagpdf Info: -1 has been removed from the mc stack Package tagpdf Info: -1 has been pushed to the mc stack @@ -340,7 +360,7 @@ Completed box being shipped out [1] ......\glue(\rightskip) 0.0 .....\pdfliteral page .....\pdfliteral page -.....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {1}{\ignorespaces A}}{\thepage }{floatstructure.10}\protected@file@percent }} +.....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {1}{\ignorespaces A}}{\thepage }{figure.struct.10}\protected@file@percent }} .....\glue 10.0 .....\glue(\baselineskip) 3.22224 .....\hbox(6.83331+1.94444)x345.0, glue set 146.86105fil, direction TLT @@ -369,7 +389,7 @@ Completed box being shipped out [1] .....\glue 0.0 .....\pdfliteral page .....\pdfliteral page -.....\write1{\newlabel{fig:1}{{1}{\thepage }{}{floatstructure.10}{}}} +.....\write1{\newlabel{fig:1}{{1}{\thepage }{}{figure.struct.10}{}}} .....\glue(\parskip) 0.0 .....\glue(\parskip) 0.0 .....\glue(\baselineskip) 3.22224 @@ -408,7 +428,7 @@ Completed box being shipped out [1] .....\pdfliteral page .....\pdfliteral page .....\special{} -.....\write1{\@writefile{lot}{\protect \contentsline {table}{\protect \numberline {1}{\ignorespaces Table}}{\thepage }{floatstructure.19}\protected@file@percent }} +.....\write1{\@writefile{lot}{\protect \contentsline {table}{\protect \numberline {1}{\ignorespaces Table}}{\thepage }{table.struct.20}\protected@file@percent }} .....\glue 10.0 .....\hbox(6.94444+0.0)x345.0, glue set 140.55551fil, direction TLT ......\glue 0.0 plus 1.0fil @@ -638,7 +658,7 @@ Completed box being shipped out [1] ......\glue(\rightskip) 0.0 .....\pdfliteral page .....\pdfliteral page -.....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {2}{\ignorespaces B}}{\thepage }{floatstructure.29}\protected@file@percent }} +.....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {2}{\ignorespaces B}}{\thepage }{figure.struct.31}\protected@file@percent }} .....\glue 10.0 .....\glue(\baselineskip) 5.16669 .....\hbox(6.83331+1.94444)x345.0, glue set 147.0694fil, direction TLT @@ -765,7 +785,7 @@ Completed box being shipped out [2] ......\glue(\rightskip) 0.0 .....\pdfliteral page .....\pdfliteral page -.....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {3}{\ignorespaces C}}{\thepage }{floatstructure.38}\protected@file@percent }} +.....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {3}{\ignorespaces C}}{\thepage }{figure.struct.41}\protected@file@percent }} .....\glue 10.0 .....\glue(\baselineskip) 5.16669 .....\hbox(6.83331+1.94444)x345.0, glue set 146.99995fil, direction TLT @@ -814,10 +834,10 @@ Completed box being shipped out [2] .\kern633.0 .\pdfliteral page Non-PDF special ignored! (float-003.aux) -Package tagpdf Info: closing structure 26 tagged /Sect +Package tagpdf Info: closing structure 28 tagged /Sect Package tagpdf Info: closing structure 2 tagged /Document Package tagpdf Info: Finalizing the tagging structure: -(tagpdf) Writing out ~46 structure objects +(tagpdf) Writing out ~50 structure objects (tagpdf) with ~28 'MC' leaf nodes. (tagpdf) Be patient if there are lots of objects! Package tagpdf Info: writing ParentTree diff --git a/required/latex-lab/testfiles-float/float-003.tlg b/required/latex-lab/testfiles-float/float-003.tlg index 9e4ee71ad..03ba95721 100644 --- a/required/latex-lab/testfiles-float/float-003.tlg +++ b/required/latex-lab/testfiles-float/float-003.tlg @@ -70,9 +70,14 @@ Package tagpdf Info: Parent-Child 'Lbl' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'Lbl/pdf2' --> 'MC' on line ... Package tagpdf Info: closing structure 16 tagged /Lbl -Package tagpdf Info: Parent-Child 'Caption' --> 'MC'. +Package tagpdf Info: Parent-Child 'Caption' --> 'P'. (tagpdf) Relation is 1 (='0..n') -(tagpdf) Rolemapped from 'Caption/pdf2' --> 'MC' on line ... +(tagpdf) Rolemapped from 'Caption/pdf2' --> 'text/latex' on line +(tagpdf) 20 +Package tagpdf Info: Parent-Child 'P' --> 'MC'. +(tagpdf) Relation is 1 (='0..n') +(tagpdf) Rolemapped from 'P/pdf2' --> 'MC' on line ... +Package tagpdf Info: closing structure 17 tagged /text Package tagpdf Info: closing structure 15 tagged /Caption Package tagpdf Info: Parent-Child 'Aside' --> 'Part'. (tagpdf) Relation is 1 (='0..n') @@ -84,13 +89,13 @@ Package tagpdf Info: Parent-Child 'Aside' --> 'P'. Package tagpdf Info: Parent-Child 'P' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'P/pdf2' --> 'MC' on line ... -Package tagpdf Info: closing structure 18 tagged /text -Package tagpdf Info: closing structure 17 tagged /text-unit +Package tagpdf Info: closing structure 19 tagged /text +Package tagpdf Info: closing structure 18 tagged /text-unit Package tagpdf Info: closing structure 10 tagged /float Package tagpdf Info: Parent-Child 'Sect' --> 'Aside'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'Sect/pdf2' --> 'float/latex' on line ... -Floatstructure:19 +Floatstructure:20 Package tagpdf Info: Parent-Child 'Aside' --> 'Caption'. (tagpdf) Relation is 2 (='0..1') (tagpdf) Rolemapped from 'Aside/pdf2' --> 'Caption/pdf2' on line @@ -101,11 +106,16 @@ Package tagpdf Info: Parent-Child 'Caption' --> 'Lbl'. Package tagpdf Info: Parent-Child 'Lbl' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'Lbl/pdf2' --> 'MC' on line ... -Package tagpdf Info: closing structure 21 tagged /Lbl -Package tagpdf Info: Parent-Child 'Caption' --> 'MC'. +Package tagpdf Info: closing structure 22 tagged /Lbl +Package tagpdf Info: Parent-Child 'Caption' --> 'P'. (tagpdf) Relation is 1 (='0..n') -(tagpdf) Rolemapped from 'Caption/pdf2' --> 'MC' on line ... -Package tagpdf Info: closing structure 20 tagged /Caption +(tagpdf) Rolemapped from 'Caption/pdf2' --> 'text/latex' on line +(tagpdf) 26 +Package tagpdf Info: Parent-Child 'P' --> 'MC'. +(tagpdf) Relation is 1 (='0..n') +(tagpdf) Rolemapped from 'P/pdf2' --> 'MC' on line ... +Package tagpdf Info: closing structure 23 tagged /text +Package tagpdf Info: closing structure 21 tagged /Caption Package tagpdf Info: Parent-Child 'Aside' --> 'Part'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'Aside/pdf2' --> 'text-unit/latex' on @@ -116,17 +126,17 @@ Package tagpdf Info: Parent-Child 'Aside' --> 'P'. Package tagpdf Info: Parent-Child 'P' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'P/pdf2' --> 'MC' on line ... -Package tagpdf Info: closing structure 23 tagged /text -Package tagpdf Info: closing structure 22 tagged /text-unit -Package tagpdf Info: closing structure 19 tagged /float +Package tagpdf Info: closing structure 25 tagged /text +Package tagpdf Info: closing structure 24 tagged /text-unit +Package tagpdf Info: closing structure 20 tagged /float Package tagpdf Info: Parent-Child 'Sect' --> 'Sect'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'Sect/pdf2' --> 'Sect/pdf2' on line ... Package tagpdf Info: Parent-Child 'Sect' --> 'Sect'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'Sect/pdf2' --> 'Sect/pdf2' on line ... -Package tagpdf Info: closing structure 24 tagged /figures -Package tagpdf Info: closing structure 25 tagged /tables +Package tagpdf Info: closing structure 26 tagged /figures +Package tagpdf Info: closing structure 27 tagged /tables Package tagpdf Info: closing structure 5 tagged /Sect Package tagpdf Info: Parent-Child 'Document' --> 'Sect'. (tagpdf) Relation is 1 (='0..n') @@ -142,15 +152,15 @@ Package tagpdf Info: Parent-Child 'H1' --> 'Lbl'. Package tagpdf Info: Parent-Child 'Lbl' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'Lbl/pdf2' --> 'MC' on line ... -Package tagpdf Info: closing structure 28 tagged /Lbl +Package tagpdf Info: closing structure 30 tagged /Lbl Package tagpdf Info: Parent-Child 'H1' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'H1/pdf2' --> 'MC' on line ... -Package tagpdf Info: closing structure 27 tagged /section +Package tagpdf Info: closing structure 29 tagged /section Package tagpdf Info: Parent-Child 'Sect' --> 'Aside'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'Sect/pdf2' --> 'float/latex' on line ... -Floatstructure:29 +Floatstructure:31 Package tagpdf Info: Parent-Child 'Aside' --> 'Part'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'Aside/pdf2' --> 'text-unit/latex' on @@ -161,8 +171,8 @@ Package tagpdf Info: Parent-Child 'Aside' --> 'P'. Package tagpdf Info: Parent-Child 'P' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'P/pdf2' --> 'MC' on line ... -Package tagpdf Info: closing structure 31 tagged /text -Package tagpdf Info: closing structure 30 tagged /text-unit +Package tagpdf Info: closing structure 33 tagged /text +Package tagpdf Info: closing structure 32 tagged /text-unit Package tagpdf Info: Parent-Child 'Aside' --> 'Part'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'Aside/pdf2' --> 'text-unit/latex' on @@ -173,8 +183,8 @@ Package tagpdf Info: Parent-Child 'Aside' --> 'P'. Package tagpdf Info: Parent-Child 'P' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'P/pdf2' --> 'MC' on line ... -Package tagpdf Info: closing structure 33 tagged /text -Package tagpdf Info: closing structure 32 tagged /text-unit +Package tagpdf Info: closing structure 35 tagged /text +Package tagpdf Info: closing structure 34 tagged /text-unit Package tagpdf Info: Parent-Child 'Aside' --> 'Caption'. (tagpdf) Relation is 2 (='0..1') (tagpdf) Rolemapped from 'Aside/pdf2' --> 'Caption/pdf2' on line @@ -185,12 +195,17 @@ Package tagpdf Info: Parent-Child 'Caption' --> 'Lbl'. Package tagpdf Info: Parent-Child 'Lbl' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'Lbl/pdf2' --> 'MC' on line ... -Package tagpdf Info: closing structure 35 tagged /Lbl -Package tagpdf Info: Parent-Child 'Caption' --> 'MC'. +Package tagpdf Info: closing structure 37 tagged /Lbl +Package tagpdf Info: Parent-Child 'Caption' --> 'P'. +(tagpdf) Relation is 1 (='0..n') +(tagpdf) Rolemapped from 'Caption/pdf2' --> 'text/latex' on line +(tagpdf) 41 +Package tagpdf Info: Parent-Child 'P' --> 'MC'. (tagpdf) Relation is 1 (='0..n') -(tagpdf) Rolemapped from 'Caption/pdf2' --> 'MC' on line ... -Package tagpdf Info: closing structure 34 tagged /Caption -Package tagpdf Info: closing structure 29 tagged /float +(tagpdf) Rolemapped from 'P/pdf2' --> 'MC' on line ... +Package tagpdf Info: closing structure 38 tagged /text +Package tagpdf Info: closing structure 36 tagged /Caption +Package tagpdf Info: closing structure 31 tagged /float Package tagpdf Info: Parent-Child 'Sect' --> 'Part'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'Sect/pdf2' --> 'text-unit/latex' on line @@ -201,12 +216,12 @@ Package tagpdf Info: Parent-Child 'Sect' --> 'P'. Package tagpdf Info: Parent-Child 'P' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'P/pdf2' --> 'MC' on line ... -Package tagpdf Info: closing structure 37 tagged /text -Package tagpdf Info: closing structure 36 tagged /text-unit +Package tagpdf Info: closing structure 40 tagged /text +Package tagpdf Info: closing structure 39 tagged /text-unit Package tagpdf Info: Parent-Child 'Sect' --> 'Aside'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'Sect/pdf2' --> 'float/latex' on line ... -Floatstructure:38 +Floatstructure:41 Package tagpdf Info: Parent-Child 'Aside' --> 'Part'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'Aside/pdf2' --> 'text-unit/latex' on @@ -217,8 +232,8 @@ Package tagpdf Info: Parent-Child 'Aside' --> 'P'. Package tagpdf Info: Parent-Child 'P' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'P/pdf2' --> 'MC' on line ... -Package tagpdf Info: closing structure 40 tagged /text -Package tagpdf Info: closing structure 39 tagged /text-unit +Package tagpdf Info: closing structure 43 tagged /text +Package tagpdf Info: closing structure 42 tagged /text-unit Package tagpdf Info: Parent-Child 'Aside' --> 'Part'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'Aside/pdf2' --> 'text-unit/latex' on @@ -229,8 +244,8 @@ Package tagpdf Info: Parent-Child 'Aside' --> 'P'. Package tagpdf Info: Parent-Child 'P' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'P/pdf2' --> 'MC' on line ... -Package tagpdf Info: closing structure 42 tagged /text -Package tagpdf Info: closing structure 41 tagged /text-unit +Package tagpdf Info: closing structure 45 tagged /text +Package tagpdf Info: closing structure 44 tagged /text-unit Package tagpdf Info: Parent-Child 'Aside' --> 'Caption'. (tagpdf) Relation is 2 (='0..1') (tagpdf) Rolemapped from 'Aside/pdf2' --> 'Caption/pdf2' on line @@ -241,17 +256,22 @@ Package tagpdf Info: Parent-Child 'Caption' --> 'Lbl'. Package tagpdf Info: Parent-Child 'Lbl' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'Lbl/pdf2' --> 'MC' on line ... -Package tagpdf Info: closing structure 44 tagged /Lbl -Package tagpdf Info: Parent-Child 'Caption' --> 'MC'. +Package tagpdf Info: closing structure 47 tagged /Lbl +Package tagpdf Info: Parent-Child 'Caption' --> 'P'. (tagpdf) Relation is 1 (='0..n') -(tagpdf) Rolemapped from 'Caption/pdf2' --> 'MC' on line ... -Package tagpdf Info: closing structure 43 tagged /Caption -Package tagpdf Info: closing structure 38 tagged /float +(tagpdf) Rolemapped from 'Caption/pdf2' --> 'text/latex' on line +(tagpdf) 52 +Package tagpdf Info: Parent-Child 'P' --> 'MC'. +(tagpdf) Relation is 1 (='0..n') +(tagpdf) Rolemapped from 'P/pdf2' --> 'MC' on line ... +Package tagpdf Info: closing structure 48 tagged /text +Package tagpdf Info: closing structure 46 tagged /Caption +Package tagpdf Info: closing structure 41 tagged /float Package tagpdf Info: Parent-Child 'Sect' --> 'Sect'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'Sect/pdf2' --> 'Sect/pdf2' on line ... -Package tagpdf Info: closing structure 45 tagged /figures -Package tagpdf Info: closing structure 46 tagged /tables +Package tagpdf Info: closing structure 49 tagged /figures +Package tagpdf Info: closing structure 50 tagged /tables The sequence \g__tag_mc_main_marks_seq is empty > . Completed box being shipped out [1] @@ -276,8 +296,8 @@ Completed box being shipped out [1] ...\hbox(0.0+0.0)x345.0 ....\hbox(0.0+0.0)x345.0 ...\pdfliteral page{EMC} -...\marks4{e-,23,26,} -...\marks4{e+,23,26,} +...\marks4{e-,23,28,} +...\marks4{e+,23,28,} ...\pdfrunninglinkon ..\glue 25.0 ..\glue(\lineskip) 0.0 @@ -323,7 +343,7 @@ Completed box being shipped out [1] .....\marks4{b+,5,14,text,,,} .....\marks4{e-,5,14,} .....\marks4{e+,5,14,} -.....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {1}{\ignorespaces A}}{\thepage }{floatstructure.10}\protected@file@percent }} +.....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {1}{\ignorespaces A}}{\thepage }{figure.struct.10}\protected@file@percent }} .....\glue 10.0 .....\glue(\baselineskip) 3.16882 .....\hbox(6.8872+1.94397)x345.0, glue set 146.86737fil @@ -343,7 +363,7 @@ Completed box being shipped out [1] ......\glue 4.44336 plus 3.33252 minus 0.55542 ......\pdfliteral page{EMC} ......\write1{\new@label@record{mcid-7}{{tagabspage}{\__property_code_tagabspage: }{tagmcabs}{7}{tagmcid}{\__property_code_tagmcid: }}} -......\pdfliteral shipout page{/Caption <> BDC} +......\pdfliteral shipout page{/text <> BDC} ......\T1/cmr/m/n/10 A ......\pdfliteral page{EMC} ......\glue 0.0 plus 1.0fil @@ -351,12 +371,12 @@ Completed box being shipped out [1] .....\marks4{b+,6,16,Lbl,,,} .....\marks4{e-,6,16,} .....\marks4{e+,6,16,} -.....\marks4{b-,7,15,Caption,,,} -.....\marks4{b+,7,15,Caption,,,} -.....\marks4{e-,7,15,} -.....\marks4{e+,7,15,} +.....\marks4{b-,7,17,text,,,} +.....\marks4{b+,7,17,text,,,} +.....\marks4{e-,7,17,} +.....\marks4{e+,7,17,} .....\glue 0.0 -.....\write1{\newlabel{fig:1}{{1}{\thepage }{}{floatstructure.10}{}}} +.....\write1{\newlabel{fig:1}{{1}{\thepage }{}{figure.struct.10}{}}} .....\glue(\parskip) 0.0 .....\glue(\parskip) 0.0 .....\glue(\baselineskip) 3.16882 @@ -382,16 +402,16 @@ Completed box being shipped out [1] ......\penalty 10000 ......\glue(\parfillskip) 0.0 plus 1.0fil ......\glue(\rightskip) 0.0 -.....\marks4{b-,8,18,text,,,} -.....\marks4{b+,8,18,text,,,} -.....\marks4{e-,8,18,} -.....\marks4{e+,8,18,} +.....\marks4{b-,8,19,text,,,} +.....\marks4{b+,8,19,text,,,} +.....\marks4{e-,8,19,} +.....\marks4{e+,8,19,} .....\glue 0.0 ...\glue 12.0 plus 2.0 minus 2.0 ...\vbox(28.8872+0.0)x345.0 ....\vbox(28.8872+0.0)x345.0 .....\special{} -.....\write1{\@writefile{lot}{\protect \contentsline {table}{\protect \numberline {1}{\ignorespaces Table}}{\thepage }{floatstructure.19}\protected@file@percent }} +.....\write1{\@writefile{lot}{\protect \contentsline {table}{\protect \numberline {1}{\ignorespaces Table}}{\thepage }{table.struct.20}\protected@file@percent }} .....\glue 10.0 .....\hbox(6.8872+0.0)x345.0, glue set 140.56335fil ......\glue 0.0 plus 1.0fil @@ -410,7 +430,7 @@ Completed box being shipped out [1] ......\glue 4.44336 plus 3.33252 minus 0.55542 ......\pdfliteral page{EMC} ......\write1{\new@label@record{mcid-10}{{tagabspage}{\__property_code_tagabspage: }{tagmcabs}{10}{tagmcid}{\__property_code_tagmcid: }}} -......\pdfliteral shipout page{/Caption <> BDC} +......\pdfliteral shipout page{/text <> BDC} ......\T1/cmr/m/n/10 T ......\kern-0.83313 ......\T1/cmr/m/n/10 a @@ -419,14 +439,14 @@ Completed box being shipped out [1] ......\T1/cmr/m/n/10 e ......\pdfliteral page{EMC} ......\glue 0.0 plus 1.0fil -.....\marks4{b-,9,21,Lbl,,,} -.....\marks4{b+,9,21,Lbl,,,} -.....\marks4{e-,9,21,} -.....\marks4{e+,9,21,} -.....\marks4{b-,10,20,Caption,,,} -.....\marks4{b+,10,20,Caption,,,} -.....\marks4{e-,10,20,} -.....\marks4{e+,10,20,} +.....\marks4{b-,9,22,Lbl,,,} +.....\marks4{b+,9,22,Lbl,,,} +.....\marks4{e-,9,22,} +.....\marks4{e+,9,22,} +.....\marks4{b-,10,23,text,,,} +.....\marks4{b+,10,23,text,,,} +.....\marks4{e-,10,23,} +.....\marks4{e+,10,23,} .....\glue 0.0 .....\glue(\parskip) 0.0 .....\glue(\parskip) 0.0 @@ -446,10 +466,10 @@ Completed box being shipped out [1] ......\penalty 10000 ......\glue(\parfillskip) 0.0 plus 1.0fil ......\glue(\rightskip) 0.0 -.....\marks4{b-,11,23,text,,,} -.....\marks4{b+,11,23,text,,,} -.....\marks4{e-,11,23,} -.....\marks4{e+,11,23,} +.....\marks4{b-,11,25,text,,,} +.....\marks4{b+,11,25,text,,,} +.....\marks4{e-,11,25,} +.....\marks4{e+,11,25,} .....\glue 0.0 ...\glue 12.0 plus 2.0 minus 2.0 ...\glue -12.0 plus -2.0 minus -2.0 @@ -537,14 +557,14 @@ Completed box being shipped out [1] ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 -...\marks4{b-,12,28,Lbl,,,} -...\marks4{b+,12,28,Lbl,,,} -...\marks4{e-,12,28,} -...\marks4{e+,12,28,} -...\marks4{b-,13,27,section,,,} -...\marks4{b+,13,27,section,,,} -...\marks4{e-,13,27,} -...\marks4{e+,13,27,} +...\marks4{b-,12,30,Lbl,,,} +...\marks4{b+,12,30,Lbl,,,} +...\marks4{e-,12,30,} +...\marks4{e+,12,30,} +...\marks4{b-,13,29,section,,,} +...\marks4{b+,13,29,section,,,} +...\marks4{e-,13,29,} +...\marks4{e+,13,29,} ...\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline {2}abc}{\thepage }{target*.2}\protected@file@percent }} ...\penalty 10000 ...\glue 9.90036 plus 0.86089 @@ -569,10 +589,10 @@ Completed box being shipped out [1] ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 -...\marks4{b-,18,37,text,,,} -...\marks4{b+,18,37,text,,,} -...\marks4{e-,18,37,} -...\marks4{e+,18,37,} +...\marks4{b-,18,40,text,,,} +...\marks4{b+,18,40,text,,,} +...\marks4{e-,18,40,} +...\marks4{e+,18,40,} ...\penalty 0 ...\penalty 10000 ...\glue 0.0 plus 1.0fil @@ -597,10 +617,10 @@ Completed box being shipped out [1] ......\penalty 10000 ......\glue(\parfillskip) 0.0 plus 1.0fil ......\glue(\rightskip) 0.0 -.....\marks4{b-,14,31,text,,,} -.....\marks4{b+,14,31,text,,,} -.....\marks4{e-,14,31,} -.....\marks4{e+,14,31,} +.....\marks4{b-,14,33,text,,,} +.....\marks4{b+,14,33,text,,,} +.....\marks4{e-,14,33,} +.....\marks4{e+,14,33,} .....\glue(\parskip) 0.0 .....\glue(\parskip) 0.0 .....\glue(\baselineskip) 5.1128 @@ -616,11 +636,11 @@ Completed box being shipped out [1] ......\penalty 10000 ......\glue(\parfillskip) 0.0 plus 1.0fil ......\glue(\rightskip) 0.0 -.....\marks4{b-,15,33,text,,,} -.....\marks4{b+,15,33,text,,,} -.....\marks4{e-,15,33,} -.....\marks4{e+,15,33,} -.....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {2}{\ignorespaces B}}{\thepage }{floatstructure.29}\protected@file@percent }} +.....\marks4{b-,15,35,text,,,} +.....\marks4{b+,15,35,text,,,} +.....\marks4{e-,15,35,} +.....\marks4{e+,15,35,} +.....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {2}{\ignorespaces B}}{\thepage }{figure.struct.31}\protected@file@percent }} .....\glue 10.0 .....\glue(\baselineskip) 5.1128 .....\hbox(6.8872+1.94397)x345.0, glue set 147.07565fil @@ -640,18 +660,18 @@ Completed box being shipped out [1] ......\glue 4.44336 plus 3.33252 minus 0.55542 ......\pdfliteral page{EMC} ......\write1{\new@label@record{mcid-17}{{tagabspage}{\__property_code_tagabspage: }{tagmcabs}{17}{tagmcid}{\__property_code_tagmcid: }}} -......\pdfliteral shipout page{/Caption <> BDC} +......\pdfliteral shipout page{/text <> BDC} ......\T1/cmr/m/n/10 B ......\pdfliteral page{EMC} ......\glue 0.0 plus 1.0fil -.....\marks4{b-,16,35,Lbl,,,} -.....\marks4{b+,16,35,Lbl,,,} -.....\marks4{e-,16,35,} -.....\marks4{e+,16,35,} -.....\marks4{b-,17,34,Caption,,,} -.....\marks4{b+,17,34,Caption,,,} -.....\marks4{e-,17,34,} -.....\marks4{e+,17,34,} +.....\marks4{b-,16,37,Lbl,,,} +.....\marks4{b+,16,37,Lbl,,,} +.....\marks4{e-,16,37,} +.....\marks4{e+,16,37,} +.....\marks4{b-,17,38,text,,,} +.....\marks4{b+,17,38,text,,,} +.....\marks4{e-,17,38,} +.....\marks4{e+,17,38,} .....\glue 0.0 .....\glue 0.0 ...\glue 12.0 plus 2.0 minus 2.0 @@ -670,8 +690,8 @@ Completed box being shipped out [1] ....\T1/cmr/m/n/10 1 ....\glue 0.0 plus 1.0fil ..\pdfliteral page{EMC} -..\marks4{e-,24,26,} -..\marks4{e+,24,26,} +..\marks4{e-,24,28,} +..\marks4{e+,24,28,} ..\pdfrunninglinkon .\kern 0.0 .\kern 0.0 @@ -695,8 +715,8 @@ Completed box being shipped out [2] ...\hbox(0.0+0.0)x345.0 ....\hbox(0.0+0.0)x345.0 ...\pdfliteral page{EMC} -...\marks4{e-,25,26,} -...\marks4{e+,25,26,} +...\marks4{e-,25,28,} +...\marks4{e+,25,28,} ...\pdfrunninglinkon ..\glue 25.0 ..\glue(\lineskip) 0.0 @@ -721,10 +741,10 @@ Completed box being shipped out [2] ......\penalty 10000 ......\glue(\parfillskip) 0.0 plus 1.0fil ......\glue(\rightskip) 0.0 -.....\marks4{b-,19,40,text,,,} -.....\marks4{b+,19,40,text,,,} -.....\marks4{e-,19,40,} -.....\marks4{e+,19,40,} +.....\marks4{b-,19,43,text,,,} +.....\marks4{b+,19,43,text,,,} +.....\marks4{e-,19,43,} +.....\marks4{e+,19,43,} .....\glue(\parskip) 0.0 .....\glue(\parskip) 0.0 .....\glue(\baselineskip) 5.1128 @@ -740,11 +760,11 @@ Completed box being shipped out [2] ......\penalty 10000 ......\glue(\parfillskip) 0.0 plus 1.0fil ......\glue(\rightskip) 0.0 -.....\marks4{b-,20,42,text,,,} -.....\marks4{b+,20,42,text,,,} -.....\marks4{e-,20,42,} -.....\marks4{e+,20,42,} -.....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {3}{\ignorespaces C}}{\thepage }{floatstructure.38}\protected@file@percent }} +.....\marks4{b-,20,45,text,,,} +.....\marks4{b+,20,45,text,,,} +.....\marks4{e-,20,45,} +.....\marks4{e+,20,45,} +.....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {3}{\ignorespaces C}}{\thepage }{figure.struct.41}\protected@file@percent }} .....\glue 10.0 .....\glue(\baselineskip) 5.1128 .....\hbox(6.8872+1.94397)x345.0, glue set 147.00623fil @@ -764,18 +784,18 @@ Completed box being shipped out [2] ......\glue 4.44336 plus 3.33252 minus 0.55542 ......\pdfliteral page{EMC} ......\write1{\new@label@record{mcid-22}{{tagabspage}{\__property_code_tagabspage: }{tagmcabs}{22}{tagmcid}{\__property_code_tagmcid: }}} -......\pdfliteral shipout page{/Caption <> BDC} +......\pdfliteral shipout page{/text <> BDC} ......\T1/cmr/m/n/10 C ......\pdfliteral page{EMC} ......\glue 0.0 plus 1.0fil -.....\marks4{b-,21,44,Lbl,,,} -.....\marks4{b+,21,44,Lbl,,,} -.....\marks4{e-,21,44,} -.....\marks4{e+,21,44,} -.....\marks4{b-,22,43,Caption,,,} -.....\marks4{b+,22,43,Caption,,,} -.....\marks4{e-,22,43,} -.....\marks4{e+,22,43,} +.....\marks4{b-,21,47,Lbl,,,} +.....\marks4{b+,21,47,Lbl,,,} +.....\marks4{e-,21,47,} +.....\marks4{e+,21,47,} +.....\marks4{b-,22,48,text,,,} +.....\marks4{b+,22,48,text,,,} +.....\marks4{e-,22,48,} +.....\marks4{e+,22,48,} .....\glue 0.0 .....\glue 0.0 ...\glue 0.0 plus 1.0fil @@ -790,18 +810,18 @@ Completed box being shipped out [2] ....\T1/cmr/m/n/10 2 ....\glue 0.0 plus 1.0fil ..\pdfliteral page{EMC} -..\marks4{e-,26,26,} -..\marks4{e+,26,26,} +..\marks4{e-,26,28,} +..\marks4{e+,26,28,} ..\pdfrunninglinkon .\kern 0.0 .\kern -633.0 .\hbox(0.0+0.0)x0.0 .\kern 633.0 (float-003.aux) -Package tagpdf Info: closing structure 26 tagged /Sect +Package tagpdf Info: closing structure 28 tagged /Sect Package tagpdf Info: closing structure 2 tagged /Document Package tagpdf Info: Finalizing the tagging structure: -(tagpdf) Writing out ~46 structure objects +(tagpdf) Writing out ~50 structure objects (tagpdf) with ~26 'MC' leaf nodes. (tagpdf) Be patient if there are lots of objects! Package tagpdf Info: writing ParentTree diff --git a/required/latex-lab/testfiles-float/float-004.luatex.tlg b/required/latex-lab/testfiles-float/float-004.luatex.tlg index fce2fedb7..1f9bfa93e 100644 --- a/required/latex-lab/testfiles-float/float-004.luatex.tlg +++ b/required/latex-lab/testfiles-float/float-004.luatex.tlg @@ -114,9 +114,14 @@ Package tagpdf Info: Parent-Child 'Lbl' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'Lbl/pdf2' --> 'MC' on line ... Package tagpdf Info: closing structure 18 tagged /Lbl -Package tagpdf Info: Parent-Child 'Caption' --> 'MC'. +Package tagpdf Info: Parent-Child 'Caption' --> 'P'. (tagpdf) Relation is 1 (='0..n') -(tagpdf) Rolemapped from 'Caption/pdf2' --> 'MC' on line ... +(tagpdf) Rolemapped from 'Caption/pdf2' --> 'text/latex' on line +(tagpdf) 24 +Package tagpdf Info: Parent-Child 'P' --> 'MC'. +(tagpdf) Relation is 1 (='0..n') +(tagpdf) Rolemapped from 'P/pdf2' --> 'MC' on line ... +Package tagpdf Info: closing structure 19 tagged /text Package tagpdf Info: closing structure 17 tagged /Caption Package tagpdf Info: Parent-Child 'Aside' --> 'Part'. (tagpdf) Relation is 1 (='0..n') @@ -128,8 +133,8 @@ Package tagpdf Info: Parent-Child 'Aside' --> 'P'. Package tagpdf Info: Parent-Child 'P' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'P/pdf2' --> 'MC' on line ... -Package tagpdf Info: closing structure 20 tagged /text -Package tagpdf Info: closing structure 19 tagged /text-unit +Package tagpdf Info: closing structure 21 tagged /text +Package tagpdf Info: closing structure 20 tagged /text-unit Package tagpdf Info: closing structure 13 tagged /float Package tagpdf Info: Parent-Child 'Sect' --> 'Part'. (tagpdf) Relation is 1 (='0..n') @@ -148,17 +153,17 @@ Package tagpdf Info: Parent-Child 'P' --> 'Link'. Package tagpdf Info: Parent-Child 'Link' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'Link/pdf2' --> 'MC' on line ... -Package tagpdf Info: closing structure 23 tagged /Link +Package tagpdf Info: closing structure 24 tagged /Link Package tagpdf Info: text has been removed from the mc stack Package tagpdf Info: Parent-Child 'P' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'P/pdf2' --> 'MC' on line ... -Package tagpdf Info: closing structure 22 tagged /text -Package tagpdf Info: closing structure 21 tagged /text-unit +Package tagpdf Info: closing structure 23 tagged /text +Package tagpdf Info: closing structure 22 tagged /text-unit Package tagpdf Info: Parent-Child 'Sect' --> 'Aside'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'Sect/pdf2' --> 'float/latex' on line ... -Floatstructure:24 +Floatstructure:25 Package tagpdf Info: Parent-Child 'Aside' --> 'Caption'. (tagpdf) Relation is 2 (='0..1') (tagpdf) Rolemapped from 'Aside/pdf2' --> 'Caption/pdf2' on line @@ -169,11 +174,16 @@ Package tagpdf Info: Parent-Child 'Caption' --> 'Lbl'. Package tagpdf Info: Parent-Child 'Lbl' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'Lbl/pdf2' --> 'MC' on line ... -Package tagpdf Info: closing structure 26 tagged /Lbl -Package tagpdf Info: Parent-Child 'Caption' --> 'MC'. +Package tagpdf Info: closing structure 27 tagged /Lbl +Package tagpdf Info: Parent-Child 'Caption' --> 'P'. +(tagpdf) Relation is 1 (='0..n') +(tagpdf) Rolemapped from 'Caption/pdf2' --> 'text/latex' on line +(tagpdf) 35 +Package tagpdf Info: Parent-Child 'P' --> 'MC'. (tagpdf) Relation is 1 (='0..n') -(tagpdf) Rolemapped from 'Caption/pdf2' --> 'MC' on line ... -Package tagpdf Info: closing structure 25 tagged /Caption +(tagpdf) Rolemapped from 'P/pdf2' --> 'MC' on line ... +Package tagpdf Info: closing structure 28 tagged /text +Package tagpdf Info: closing structure 26 tagged /Caption Package tagpdf Info: Parent-Child 'Aside' --> 'Part'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'Aside/pdf2' --> 'text-unit/latex' on @@ -184,13 +194,13 @@ Package tagpdf Info: Parent-Child 'Aside' --> 'P'. Package tagpdf Info: Parent-Child 'P' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'P/pdf2' --> 'MC' on line ... -Package tagpdf Info: closing structure 28 tagged /text -Package tagpdf Info: closing structure 27 tagged /text-unit -Package tagpdf Info: closing structure 24 tagged /float +Package tagpdf Info: closing structure 30 tagged /text +Package tagpdf Info: closing structure 29 tagged /text-unit +Package tagpdf Info: closing structure 25 tagged /float Package tagpdf Info: Parent-Child 'Sect' --> 'Aside'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'Sect/pdf2' --> 'float/latex' on line ... -Floatstructure:29 +Floatstructure:31 Package tagpdf Info: Parent-Child 'Aside' --> 'Part'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'Aside/pdf2' --> 'text-unit/latex' on @@ -201,7 +211,7 @@ Package tagpdf Info: Parent-Child 'Aside' --> 'P'. Package tagpdf Info: Parent-Child 'P' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'P/pdf2' --> 'MC' on line ... - + Package tagpdf Info: text has been pushed to the mc stack Package tagpdf Info: Parent-Child 'P' --> 'Figure'. (tagpdf) Relation is 1 (='0..n') @@ -213,13 +223,13 @@ File: example-image-duck.pdf Graphicfile(typepdf) Package luatex.def Info: example-image-duck.pdf , page1 used on input line .... (luatex.def) Requested size: 345.0pt x 213.52757pt. -Package tagpdf Info: closing structure 32 tagged /Figure +Package tagpdf Info: closing structure 34 tagged /Figure Package tagpdf Info: text has been removed from the mc stack Package tagpdf Info: Parent-Child 'P' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'P/pdf2' --> 'MC' on line ... -Package tagpdf Info: closing structure 31 tagged /text -Package tagpdf Info: closing structure 30 tagged /text-unit +Package tagpdf Info: closing structure 33 tagged /text +Package tagpdf Info: closing structure 32 tagged /text-unit Package tagpdf Info: Parent-Child 'Aside' --> 'Caption'. (tagpdf) Relation is 2 (='0..1') (tagpdf) Rolemapped from 'Aside/pdf2' --> 'Caption/pdf2' on line @@ -230,16 +240,21 @@ Package tagpdf Info: Parent-Child 'Caption' --> 'Lbl'. Package tagpdf Info: Parent-Child 'Lbl' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'Lbl/pdf2' --> 'MC' on line ... -Package tagpdf Info: closing structure 34 tagged /Lbl -Package tagpdf Info: Parent-Child 'Caption' --> 'MC'. +Package tagpdf Info: closing structure 36 tagged /Lbl +Package tagpdf Info: Parent-Child 'Caption' --> 'P'. (tagpdf) Relation is 1 (='0..n') -(tagpdf) Rolemapped from 'Caption/pdf2' --> 'MC' on line ... -Package tagpdf Info: closing structure 33 tagged /Caption -Package tagpdf Info: closing structure 29 tagged /float +(tagpdf) Rolemapped from 'Caption/pdf2' --> 'text/latex' on line +(tagpdf) 45 +Package tagpdf Info: Parent-Child 'P' --> 'MC'. +(tagpdf) Relation is 1 (='0..n') +(tagpdf) Rolemapped from 'P/pdf2' --> 'MC' on line ... +Package tagpdf Info: closing structure 37 tagged /text +Package tagpdf Info: closing structure 35 tagged /Caption +Package tagpdf Info: closing structure 31 tagged /float Package tagpdf Info: Parent-Child 'Sect' --> 'Aside'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'Sect/pdf2' --> 'float/latex' on line ... -Floatstructure:35 +Floatstructure:38 Package tagpdf Info: Parent-Child 'Aside' --> 'Part'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'Aside/pdf2' --> 'text-unit/latex' on @@ -250,7 +265,7 @@ Package tagpdf Info: Parent-Child 'Aside' --> 'P'. Package tagpdf Info: Parent-Child 'P' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'P/pdf2' --> 'MC' on line ... - + Package tagpdf Info: text has been pushed to the mc stack Package tagpdf Info: Parent-Child 'P' --> 'Figure'. (tagpdf) Relation is 1 (='0..n') @@ -262,13 +277,13 @@ File: example-image-duck.pdf Graphicfile(typepdf) Package luatex.def Info: example-image-duck.pdf , page2 used on input line .... (luatex.def) Requested size: 345.0pt x 213.52757pt. -Package tagpdf Info: closing structure 38 tagged /Figure +Package tagpdf Info: closing structure 41 tagged /Figure Package tagpdf Info: text has been removed from the mc stack Package tagpdf Info: Parent-Child 'P' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'P/pdf2' --> 'MC' on line ... -Package tagpdf Info: closing structure 37 tagged /text -Package tagpdf Info: closing structure 36 tagged /text-unit +Package tagpdf Info: closing structure 40 tagged /text +Package tagpdf Info: closing structure 39 tagged /text-unit Package tagpdf Info: Parent-Child 'Aside' --> 'Caption'. (tagpdf) Relation is 2 (='0..1') (tagpdf) Rolemapped from 'Aside/pdf2' --> 'Caption/pdf2' on line @@ -279,12 +294,17 @@ Package tagpdf Info: Parent-Child 'Caption' --> 'Lbl'. Package tagpdf Info: Parent-Child 'Lbl' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'Lbl/pdf2' --> 'MC' on line ... -Package tagpdf Info: closing structure 40 tagged /Lbl -Package tagpdf Info: Parent-Child 'Caption' --> 'MC'. +Package tagpdf Info: closing structure 43 tagged /Lbl +Package tagpdf Info: Parent-Child 'Caption' --> 'P'. (tagpdf) Relation is 1 (='0..n') -(tagpdf) Rolemapped from 'Caption/pdf2' --> 'MC' on line ... -Package tagpdf Info: closing structure 39 tagged /Caption -Package tagpdf Info: closing structure 35 tagged /float +(tagpdf) Rolemapped from 'Caption/pdf2' --> 'text/latex' on line +(tagpdf) 52 +Package tagpdf Info: Parent-Child 'P' --> 'MC'. +(tagpdf) Relation is 1 (='0..n') +(tagpdf) Rolemapped from 'P/pdf2' --> 'MC' on line ... +Package tagpdf Info: closing structure 44 tagged /text +Package tagpdf Info: closing structure 42 tagged /Caption +Package tagpdf Info: closing structure 38 tagged /float Package tagpdf Info: Parent-Child 'Sect' --> 'Part'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'Sect/pdf2' --> 'text-unit/latex' on line @@ -295,8 +315,8 @@ Package tagpdf Info: Parent-Child 'Sect' --> 'P'. Package tagpdf Info: Parent-Child 'P' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'P/pdf2' --> 'MC' on line ... -Package tagpdf Info: closing structure 42 tagged /text -Package tagpdf Info: closing structure 41 tagged /text-unit +Package tagpdf Info: closing structure 46 tagged /text +Package tagpdf Info: closing structure 45 tagged /text-unit Package tagpdf Info: -1 has been pushed to the mc stack Package tagpdf Info: -1 has been removed from the mc stack Package tagpdf Info: -1 has been pushed to the mc stack @@ -349,8 +369,8 @@ Completed box being shipped out [1] ...\vbox(550.0+0.0)x345.0, glue set 55.14034fil, direction TLT ....\vbox(305.75659+0.0)x345.0, direction TLT .....\vbox(305.75659+0.0)x345.0, direction TLT -......\pdfdest name{floatstructure.13} xyz -......\pdfdest name{floatstructure.13} xyz +......\pdfdest name{figure.struct.13} xyz +......\pdfdest name{figure.struct.13} xyz ......\penalty 10000 ......\glue(\parskip) 0.0 ......\glue(\parskip) 0.0 @@ -384,7 +404,7 @@ Completed box being shipped out [1] .......\glue(\rightskip) 0.0 ......\pdfliteral page ......\pdfliteral page -......\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {1}{\ignorespaces This is an example image }}{\thepage }{floatstructure.13}\protected@file@percent }} +......\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {1}{\ignorespaces This is an example image }}{\thepage }{figure.struct.13}\protected@file@percent }} ......\glue 10.0 ......\glue(\baselineskip) 5.05556 ......\hbox(6.94444+1.94444)x345.0, glue set 93.1943fil, direction TLT @@ -444,7 +464,7 @@ Completed box being shipped out [1] .......\OT1/cmr/m/n/10 e .......\TU/lmr/m/n/10 .......\glue(\spaceskip) 0.00333 plus 1.66666 minus 1.11111 -.......\write1{\newlabel{a}{{1}{\thepage }{Introduction}{floatstructure.13}{}}} +.......\write1{\newlabel{a}{{1}{\thepage }{Introduction}{figure.struct.13}{}}} .......\penalty 10000 .......\glue 0.0 .......\glue 0.0 plus 1.0fil @@ -760,7 +780,7 @@ Completed box being shipped out [1] .....\glue(\spaceskip) 0.00333 plus 1.66666 minus 1.11111 .....\pdfliteral page .....\pdfliteral page -.....\pdfstartlink(*+*)x* attr{/Contents /Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /StructParent 2 } action struct name{floatstructure.13} goto name{floatstructure.13} +.....\pdfstartlink(*+*)x* attr{/Contents /Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /StructParent 2 } action struct name{figure.struct.13} goto name{figure.struct.13} .....\OT1/cmr/m/n/10 1 .....\pdfendlink .....\write1{\new@label@record{@tag@objr@page@2}{{tagabspage}{\__property_code_tagabspage: }}} @@ -829,7 +849,7 @@ Completed box being shipped out [1] .....\glue(\spaceskip) 0.00333 plus 1.66666 minus 1.11111 .....\pdfliteral page .....\pdfliteral page -.....\pdfstartlink(*+*)x* attr{/Contents /Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /StructParent 3 } action struct name{floatstructure.29} goto name{floatstructure.29} +.....\pdfstartlink(*+*)x* attr{/Contents /Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /StructParent 3 } action struct name{figure.struct.31} goto name{figure.struct.31} .....\OT1/cmr/m/n/10 2 .....\pdfendlink .....\write1{\new@label@record{@tag@objr@page@3}{{tagabspage}{\__property_code_tagabspage: }}} @@ -854,7 +874,7 @@ Completed box being shipped out [1] .....\glue(\spaceskip) 0.00333 plus 1.66666 minus 1.11111 .....\pdfliteral page .....\pdfliteral page -.....\pdfstartlink(*+*)x* attr{/Contents /Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /StructParent 4 } action struct name{floatstructure.35} goto name{floatstructure.35} +.....\pdfstartlink(*+*)x* attr{/Contents /Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /StructParent 4 } action struct name{figure.struct.38} goto name{figure.struct.38} .....\OT1/cmr/m/n/10 3 .....\pdfendlink .....\write1{\new@label@record{@tag@objr@page@4}{{tagabspage}{\__property_code_tagabspage: }}} @@ -1115,7 +1135,7 @@ Completed box being shipped out [1] .....\glue(\spaceskip) 0.00333 plus 1.66666 minus 1.11111 .....\pdfliteral page .....\pdfliteral page -.....\pdfstartlink(*+*)x* attr{/Contents /Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /StructParent 5 } action struct name{floatstructure.24} goto name{floatstructure.24} +.....\pdfstartlink(*+*)x* attr{/Contents /Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /StructParent 5 } action struct name{table.struct.25} goto name{table.struct.25} .....\OT1/cmr/m/n/10 1 .....\pdfendlink .....\write1{\new@label@record{@tag@objr@page@5}{{tagabspage}{\__property_code_tagabspage: }}} @@ -1337,10 +1357,10 @@ Completed box being shipped out [1] .....\vbox(43.24998+0.0)x345.0, direction TLT ......\pdfliteral page ......\pdfliteral page -......\pdfdest name{floatstructure.24} xyz -......\pdfdest name{floatstructure.24} xyz +......\pdfdest name{table.struct.25} xyz +......\pdfdest name{table.struct.25} xyz ......\penalty 10000 -......\write1{\@writefile{lot}{\protect \contentsline {table}{\protect \numberline {1}{\ignorespaces Animals in example images}}{\thepage }{floatstructure.24}\protected@file@percent }} +......\write1{\@writefile{lot}{\protect \contentsline {table}{\protect \numberline {1}{\ignorespaces Animals in example images}}{\thepage }{table.struct.25}\protected@file@percent }} ......\glue 10.0 ......\hbox(6.94444+1.94444)x345.0, glue set 92.86096fil, direction TLT .......\glue 0.0 plus 1.0fil @@ -1405,7 +1425,7 @@ Completed box being shipped out [1] ......\glue 0.0 ......\pdfliteral page ......\pdfliteral page -......\write1{\newlabel{b}{{1}{\thepage }{Introduction}{floatstructure.24}{}}} +......\write1{\newlabel{b}{{1}{\thepage }{Introduction}{table.struct.25}{}}} ......\glue(\parskip) 0.0 ......\glue(\parskip) 0.0 ......\glue(\baselineskip) 7.11113 @@ -1532,8 +1552,8 @@ Completed box being shipped out [2] ....\glue 8.0 plus 2.0fil ....\vbox(481.94403+0.0)x345.0, direction TLT .....\vbox(481.94403+0.0)x345.0, direction TLT -......\pdfdest name{floatstructure.29} xyz -......\pdfdest name{floatstructure.29} xyz +......\pdfdest name{figure.struct.31} xyz +......\pdfdest name{figure.struct.31} xyz ......\penalty 10000 ......\glue(\parskip) 0.0 ......\glue(\parskip) 0.0 @@ -1567,7 +1587,7 @@ Completed box being shipped out [2] .......\glue(\rightskip) 0.0 ......\pdfliteral page ......\pdfliteral page -......\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {2}{\ignorespaces This is an example image from the duckuments package}}{\thepage }{floatstructure.29}\protected@file@percent }} +......\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {2}{\ignorespaces This is an example image from the duckuments package}}{\thepage }{figure.struct.31}\protected@file@percent }} ......\glue 10.0 ......\glue(\baselineskip) 5.05556 ......\hbox(6.94444+1.94444)x345.0, glue set 28.15251fil, direction TLT @@ -1671,11 +1691,11 @@ Completed box being shipped out [2] ......\glue 0.0 ......\pdfliteral page ......\pdfliteral page -......\write1{\newlabel{c}{{2}{\thepage }{Introduction}{floatstructure.29}{}}} +......\write1{\newlabel{c}{{2}{\thepage }{Introduction}{figure.struct.31}{}}} ......\glue 6.0 plus 2.0 minus 2.0 ......\glue 0.0 -......\pdfdest name{floatstructure.35} xyz -......\pdfdest name{floatstructure.35} xyz +......\pdfdest name{floatstructure.38} xyz +......\pdfdest name{floatstructure.38} xyz ......\penalty 10000 ......\glue(\parskip) 0.0 ......\glue(\parskip) 0.0 @@ -1710,7 +1730,7 @@ Completed box being shipped out [2] .......\glue(\rightskip) 0.0 ......\pdfliteral page ......\pdfliteral page -......\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {3}{\ignorespaces The second page from the PDF}}{\thepage }{floatstructure.35}\protected@file@percent }} +......\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {3}{\ignorespaces The second page from the PDF}}{\thepage }{figure.struct.38}\protected@file@percent }} ......\glue 10.0 ......\glue(\baselineskip) 5.05556 ......\hbox(6.94444+1.94444)x345.0, glue set 81.61096fil, direction TLT @@ -1773,7 +1793,7 @@ Completed box being shipped out [2] ......\glue 0.0 ......\pdfliteral page ......\pdfliteral page -......\write1{\newlabel{d}{{3}{\thepage }{Introduction}{floatstructure.35}{}}} +......\write1{\newlabel{d}{{3}{\thepage }{Introduction}{figure.struct.38}{}}} ......\glue 0.0 ....\glue 0.0 plus 1.0fil ...\pdflinkstate 1 @@ -1805,7 +1825,7 @@ Package tagpdf Info: Parent-Child 'Document' --> 'Sect'. (tagpdf) 57 Package tagpdf Info: closing structure 2 tagged /Document Package tagpdf Info: Finalizing the tagging structure: -(tagpdf) Writing out ~42 structure objects +(tagpdf) Writing out ~46 structure objects (tagpdf) with ~37 'MC' leaf nodes. (tagpdf) Be patient if there are lots of objects! Package tagpdf Info: writing ParentTree diff --git a/required/latex-lab/testfiles-float/float-004.tlg b/required/latex-lab/testfiles-float/float-004.tlg index 4408ca490..961ba5423 100644 --- a/required/latex-lab/testfiles-float/float-004.tlg +++ b/required/latex-lab/testfiles-float/float-004.tlg @@ -111,9 +111,14 @@ Package tagpdf Info: Parent-Child 'Lbl' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'Lbl/pdf2' --> 'MC' on line ... Package tagpdf Info: closing structure 18 tagged /Lbl -Package tagpdf Info: Parent-Child 'Caption' --> 'MC'. +Package tagpdf Info: Parent-Child 'Caption' --> 'P'. (tagpdf) Relation is 1 (='0..n') -(tagpdf) Rolemapped from 'Caption/pdf2' --> 'MC' on line ... +(tagpdf) Rolemapped from 'Caption/pdf2' --> 'text/latex' on line +(tagpdf) 24 +Package tagpdf Info: Parent-Child 'P' --> 'MC'. +(tagpdf) Relation is 1 (='0..n') +(tagpdf) Rolemapped from 'P/pdf2' --> 'MC' on line ... +Package tagpdf Info: closing structure 19 tagged /text Package tagpdf Info: closing structure 17 tagged /Caption Package tagpdf Info: Parent-Child 'Aside' --> 'Part'. (tagpdf) Relation is 1 (='0..n') @@ -125,8 +130,8 @@ Package tagpdf Info: Parent-Child 'Aside' --> 'P'. Package tagpdf Info: Parent-Child 'P' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'P/pdf2' --> 'MC' on line ... -Package tagpdf Info: closing structure 20 tagged /text -Package tagpdf Info: closing structure 19 tagged /text-unit +Package tagpdf Info: closing structure 21 tagged /text +Package tagpdf Info: closing structure 20 tagged /text-unit Package tagpdf Info: closing structure 13 tagged /float Package tagpdf Info: Parent-Child 'Sect' --> 'Part'. (tagpdf) Relation is 1 (='0..n') @@ -145,17 +150,17 @@ Package tagpdf Info: Parent-Child 'P' --> 'Link'. Package tagpdf Info: Parent-Child 'Link' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'Link/pdf2' --> 'MC' on line ... -Package tagpdf Info: closing structure 23 tagged /Link +Package tagpdf Info: closing structure 24 tagged /Link Package tagpdf Info: text has been removed from the mc stack Package tagpdf Info: Parent-Child 'P' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'P/pdf2' --> 'MC' on line ... -Package tagpdf Info: closing structure 22 tagged /text -Package tagpdf Info: closing structure 21 tagged /text-unit +Package tagpdf Info: closing structure 23 tagged /text +Package tagpdf Info: closing structure 22 tagged /text-unit Package tagpdf Info: Parent-Child 'Sect' --> 'Aside'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'Sect/pdf2' --> 'float/latex' on line ... -Floatstructure:24 +Floatstructure:25 Package tagpdf Info: Parent-Child 'Aside' --> 'Caption'. (tagpdf) Relation is 2 (='0..1') (tagpdf) Rolemapped from 'Aside/pdf2' --> 'Caption/pdf2' on line @@ -166,11 +171,16 @@ Package tagpdf Info: Parent-Child 'Caption' --> 'Lbl'. Package tagpdf Info: Parent-Child 'Lbl' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'Lbl/pdf2' --> 'MC' on line ... -Package tagpdf Info: closing structure 26 tagged /Lbl -Package tagpdf Info: Parent-Child 'Caption' --> 'MC'. +Package tagpdf Info: closing structure 27 tagged /Lbl +Package tagpdf Info: Parent-Child 'Caption' --> 'P'. +(tagpdf) Relation is 1 (='0..n') +(tagpdf) Rolemapped from 'Caption/pdf2' --> 'text/latex' on line +(tagpdf) 35 +Package tagpdf Info: Parent-Child 'P' --> 'MC'. (tagpdf) Relation is 1 (='0..n') -(tagpdf) Rolemapped from 'Caption/pdf2' --> 'MC' on line ... -Package tagpdf Info: closing structure 25 tagged /Caption +(tagpdf) Rolemapped from 'P/pdf2' --> 'MC' on line ... +Package tagpdf Info: closing structure 28 tagged /text +Package tagpdf Info: closing structure 26 tagged /Caption Package tagpdf Info: Parent-Child 'Aside' --> 'Part'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'Aside/pdf2' --> 'text-unit/latex' on @@ -181,13 +191,13 @@ Package tagpdf Info: Parent-Child 'Aside' --> 'P'. Package tagpdf Info: Parent-Child 'P' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'P/pdf2' --> 'MC' on line ... -Package tagpdf Info: closing structure 28 tagged /text -Package tagpdf Info: closing structure 27 tagged /text-unit -Package tagpdf Info: closing structure 24 tagged /float +Package tagpdf Info: closing structure 30 tagged /text +Package tagpdf Info: closing structure 29 tagged /text-unit +Package tagpdf Info: closing structure 25 tagged /float Package tagpdf Info: Parent-Child 'Sect' --> 'Aside'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'Sect/pdf2' --> 'float/latex' on line ... -Floatstructure:29 +Floatstructure:31 Package tagpdf Info: Parent-Child 'Aside' --> 'Part'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'Aside/pdf2' --> 'text-unit/latex' on @@ -198,7 +208,7 @@ Package tagpdf Info: Parent-Child 'Aside' --> 'P'. Package tagpdf Info: Parent-Child 'P' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'P/pdf2' --> 'MC' on line ... - + Package tagpdf Info: text has been pushed to the mc stack Package tagpdf Info: Parent-Child 'P' --> 'Figure'. (tagpdf) Relation is 1 (='0..n') @@ -210,13 +220,13 @@ File: example-image-duck.pdf Graphicfile(typepdf) Package pdftex.def Info: example-image-duck.pdf , page1 used on input line .... (pdftex.def) Requested size: 345.0pt x 213.52757pt. -Package tagpdf Info: closing structure 32 tagged /Figure +Package tagpdf Info: closing structure 34 tagged /Figure Package tagpdf Info: text has been removed from the mc stack Package tagpdf Info: Parent-Child 'P' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'P/pdf2' --> 'MC' on line ... -Package tagpdf Info: closing structure 31 tagged /text -Package tagpdf Info: closing structure 30 tagged /text-unit +Package tagpdf Info: closing structure 33 tagged /text +Package tagpdf Info: closing structure 32 tagged /text-unit Package tagpdf Info: Parent-Child 'Aside' --> 'Caption'. (tagpdf) Relation is 2 (='0..1') (tagpdf) Rolemapped from 'Aside/pdf2' --> 'Caption/pdf2' on line @@ -227,16 +237,21 @@ Package tagpdf Info: Parent-Child 'Caption' --> 'Lbl'. Package tagpdf Info: Parent-Child 'Lbl' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'Lbl/pdf2' --> 'MC' on line ... -Package tagpdf Info: closing structure 34 tagged /Lbl -Package tagpdf Info: Parent-Child 'Caption' --> 'MC'. +Package tagpdf Info: closing structure 36 tagged /Lbl +Package tagpdf Info: Parent-Child 'Caption' --> 'P'. +(tagpdf) Relation is 1 (='0..n') +(tagpdf) Rolemapped from 'Caption/pdf2' --> 'text/latex' on line +(tagpdf) 45 +Package tagpdf Info: Parent-Child 'P' --> 'MC'. (tagpdf) Relation is 1 (='0..n') -(tagpdf) Rolemapped from 'Caption/pdf2' --> 'MC' on line ... -Package tagpdf Info: closing structure 33 tagged /Caption -Package tagpdf Info: closing structure 29 tagged /float +(tagpdf) Rolemapped from 'P/pdf2' --> 'MC' on line ... +Package tagpdf Info: closing structure 37 tagged /text +Package tagpdf Info: closing structure 35 tagged /Caption +Package tagpdf Info: closing structure 31 tagged /float Package tagpdf Info: Parent-Child 'Sect' --> 'Aside'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'Sect/pdf2' --> 'float/latex' on line ... -Floatstructure:35 +Floatstructure:38 Package tagpdf Info: Parent-Child 'Aside' --> 'Part'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'Aside/pdf2' --> 'text-unit/latex' on @@ -247,7 +262,7 @@ Package tagpdf Info: Parent-Child 'Aside' --> 'P'. Package tagpdf Info: Parent-Child 'P' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'P/pdf2' --> 'MC' on line ... - + Package tagpdf Info: text has been pushed to the mc stack Package tagpdf Info: Parent-Child 'P' --> 'Figure'. (tagpdf) Relation is 1 (='0..n') @@ -259,13 +274,13 @@ File: example-image-duck.pdf Graphicfile(typepdf) Package pdftex.def Info: example-image-duck.pdf , page2 used on input line .... (pdftex.def) Requested size: 345.0pt x 213.52757pt. -Package tagpdf Info: closing structure 38 tagged /Figure +Package tagpdf Info: closing structure 41 tagged /Figure Package tagpdf Info: text has been removed from the mc stack Package tagpdf Info: Parent-Child 'P' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'P/pdf2' --> 'MC' on line ... -Package tagpdf Info: closing structure 37 tagged /text -Package tagpdf Info: closing structure 36 tagged /text-unit +Package tagpdf Info: closing structure 40 tagged /text +Package tagpdf Info: closing structure 39 tagged /text-unit Package tagpdf Info: Parent-Child 'Aside' --> 'Caption'. (tagpdf) Relation is 2 (='0..1') (tagpdf) Rolemapped from 'Aside/pdf2' --> 'Caption/pdf2' on line @@ -276,12 +291,17 @@ Package tagpdf Info: Parent-Child 'Caption' --> 'Lbl'. Package tagpdf Info: Parent-Child 'Lbl' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'Lbl/pdf2' --> 'MC' on line ... -Package tagpdf Info: closing structure 40 tagged /Lbl -Package tagpdf Info: Parent-Child 'Caption' --> 'MC'. +Package tagpdf Info: closing structure 43 tagged /Lbl +Package tagpdf Info: Parent-Child 'Caption' --> 'P'. +(tagpdf) Relation is 1 (='0..n') +(tagpdf) Rolemapped from 'Caption/pdf2' --> 'text/latex' on line +(tagpdf) 52 +Package tagpdf Info: Parent-Child 'P' --> 'MC'. (tagpdf) Relation is 1 (='0..n') -(tagpdf) Rolemapped from 'Caption/pdf2' --> 'MC' on line ... -Package tagpdf Info: closing structure 39 tagged /Caption -Package tagpdf Info: closing structure 35 tagged /float +(tagpdf) Rolemapped from 'P/pdf2' --> 'MC' on line ... +Package tagpdf Info: closing structure 44 tagged /text +Package tagpdf Info: closing structure 42 tagged /Caption +Package tagpdf Info: closing structure 38 tagged /float Package tagpdf Info: Parent-Child 'Sect' --> 'Part'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'Sect/pdf2' --> 'text-unit/latex' on line @@ -292,8 +312,8 @@ Package tagpdf Info: Parent-Child 'Sect' --> 'P'. Package tagpdf Info: Parent-Child 'P' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'P/pdf2' --> 'MC' on line ... -Package tagpdf Info: closing structure 42 tagged /text -Package tagpdf Info: closing structure 41 tagged /text-unit +Package tagpdf Info: closing structure 46 tagged /text +Package tagpdf Info: closing structure 45 tagged /text-unit The sequence \g__tag_mc_main_marks_seq is empty > . Completed box being shipped out [1] @@ -341,8 +361,8 @@ Completed box being shipped out [1] ...\vbox(550.0+0.0)x345.0, glue set 55.20148fil ....\vbox(305.75659+0.0)x345.0 .....\vbox(305.75659+0.0)x345.0 -......\pdfdest name{floatstructure.13} xyz -......\pdfdest struct39 name{floatstructure.13} xyz +......\pdfdest name{figure.struct.13} xyz +......\pdfdest struct39 name{figure.struct.13} xyz ......\penalty 10000 ......\glue(\parskip) 0.0 ......\glue(\parskip) 0.0 @@ -388,7 +408,7 @@ Completed box being shipped out [1] ......\marks4{b+,12,15,text,,,} ......\marks4{e-,12,15,} ......\marks4{e+,12,15,} -......\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {1}{\ignorespaces This is an example image }}{\thepage }{floatstructure.13}\protected@file@percent }} +......\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {1}{\ignorespaces This is an example image }}{\thepage }{figure.struct.13}\protected@file@percent }} ......\glue 10.0 ......\glue(\baselineskip) 5.1128 ......\hbox(6.8872+1.94397)x345.0, glue set 93.2138fil @@ -408,7 +428,7 @@ Completed box being shipped out [1] .......\glue 4.44336 plus 3.33252 minus 0.55542 .......\pdfliteral page{EMC} .......\write1{\new@label@record{mcid-14}{{tagabspage}{\__property_code_tagabspage: }{tagmcabs}{14}{tagmcid}{\__property_code_tagmcid: }}} -.......\pdfliteral shipout page{/Caption <> BDC} +.......\pdfliteral shipout page{/text <> BDC} .......\T1/cmr/m/n/10 T .......\T1/cmr/m/n/10 h .......\T1/cmr/m/n/10 i @@ -434,7 +454,7 @@ Completed box being shipped out [1] .......\T1/cmr/m/n/10 g .......\T1/cmr/m/n/10 e .......\glue 3.33252 plus 1.66626 minus 1.11084 -.......\write1{\newlabel{a}{{1}{\thepage }{Introduction}{floatstructure.13}{}}} +.......\write1{\newlabel{a}{{1}{\thepage }{Introduction}{figure.struct.13}{}}} .......\penalty 10000 .......\glue 0.0 .......\pdfliteral page{EMC} @@ -443,10 +463,10 @@ Completed box being shipped out [1] ......\marks4{b+,13,18,Lbl,,,} ......\marks4{e-,13,18,} ......\marks4{e+,13,18,} -......\marks4{b-,14,17,Caption,,,} -......\marks4{b+,14,17,Caption,,,} -......\marks4{e-,14,17,} -......\marks4{e+,14,17,} +......\marks4{b-,14,19,text,,,} +......\marks4{b+,14,19,text,,,} +......\marks4{e-,14,19,} +......\marks4{e+,14,19,} ......\glue 0.0 ......\glue 6.0 plus 2.0 minus 2.0 ......\glue 0.0 @@ -553,8 +573,8 @@ Completed box being shipped out [1] .......\kern-0.43878 .......\T1/cmr/m/it/8 d .......\glue(\rightskip) 0.0 -......\marks4{b-,15,20,text,,,} -......\marks4{b+,15,20,text,,,} +......\marks4{b-,15,21,text,,,} +......\marks4{b+,15,21,text,,,} ......\penalty 10150 ......\glue(\baselineskip) 2.43506 ......\hbox(5.50977+0.0)x345.0, glue set 321.9473fil @@ -567,8 +587,8 @@ Completed box being shipped out [1] .......\penalty 10000 .......\glue(\parfillskip) 0.0 plus 1.0fil .......\glue(\rightskip) 0.0 -......\marks4{e-,15,20,} -......\marks4{e+,15,20,} +......\marks4{e-,15,21,} +......\marks4{e+,15,21,} ......\glue 0.0 ....\glue 12.0 plus 2.0 minus 2.0 ....\glue -12.0 plus -2.0 minus -2.0 @@ -705,7 +725,7 @@ Completed box being shipped out [1] .....\pdfliteral page{EMC} .....\write1{\new@label@record{mcid-4}{{tagabspage}{\__property_code_tagabspage: }{tagmcabs}{4}{tagmcid}{\__property_code_tagmcid: }}} .....\pdfliteral shipout page{/Link <> BDC} -.....\pdfstartlink(*+*)x* attr{/Contents /Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /StructParent 2 } action goto name{floatstructure.13} +.....\pdfstartlink(*+*)x* attr{/Contents /Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /StructParent 2 } action goto name{figure.struct.13} .....\T1/cmr/m/n/10 1 .....\pdfendlink .....\write1{\new@label@record{@tag@objr@page@2}{{tagabspage}{\__property_code_tagabspage: }}} @@ -774,7 +794,7 @@ Completed box being shipped out [1] .....\pdfliteral page{EMC} .....\write1{\new@label@record{mcid-6}{{tagabspage}{\__property_code_tagabspage: }{tagmcabs}{6}{tagmcid}{\__property_code_tagmcid: }}} .....\pdfliteral shipout page{/Link <> BDC} -.....\pdfstartlink(*+*)x* attr{/Contents /Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /StructParent 3 } action goto name{floatstructure.29} +.....\pdfstartlink(*+*)x* attr{/Contents /Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /StructParent 3 } action goto name{figure.struct.31} .....\T1/cmr/m/n/10 2 .....\pdfendlink .....\write1{\new@label@record{@tag@objr@page@3}{{tagabspage}{\__property_code_tagabspage: }}} @@ -796,7 +816,7 @@ Completed box being shipped out [1] .....\pdfliteral page{EMC} .....\write1{\new@label@record{mcid-8}{{tagabspage}{\__property_code_tagabspage: }{tagmcabs}{8}{tagmcid}{\__property_code_tagmcid: }}} .....\pdfliteral shipout page{/Link <> BDC} -.....\pdfstartlink(*+*)x* attr{/Contents /Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /StructParent 4 } action goto name{floatstructure.35} +.....\pdfstartlink(*+*)x* attr{/Contents /Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /StructParent 4 } action goto name{figure.struct.38} .....\T1/cmr/m/n/10 3 .....\pdfendlink .....\write1{\new@label@record{@tag@objr@page@4}{{tagabspage}{\__property_code_tagabspage: }}} @@ -1025,7 +1045,7 @@ Completed box being shipped out [1] .....\pdfliteral page{EMC} .....\write1{\new@label@record{mcid-17}{{tagabspage}{\__property_code_tagabspage: }{tagmcabs}{17}{tagmcid}{\__property_code_tagmcid: }}} .....\pdfliteral shipout page{/Link <> BDC} -.....\pdfstartlink(*+*)x* attr{/Contents /Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /StructParent 5 } action goto name{floatstructure.24} +.....\pdfstartlink(*+*)x* attr{/Contents /Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /StructParent 5 } action goto name{table.struct.25} .....\T1/cmr/m/n/10 1 .....\pdfendlink .....\write1{\new@label@record{@tag@objr@page@5}{{tagabspage}{\__property_code_tagabspage: }}} @@ -1080,16 +1100,16 @@ Completed box being shipped out [1] .....\T1/cmr/m/n/10 l .....\T1/cmr/m/n/10 y .....\glue(\rightskip) 0.0 -....\marks4{b-,16,22,text,,,} -....\marks4{b+,16,22,text,,,} -....\marks4{e-,16,22,} -....\marks4{e+,16,22,} -....\marks4{b-,17,23,Link,,,} -....\marks4{b+,17,23,Link,,,} -....\marks4{e-,17,23,} -....\marks4{e+,17,23,} -....\marks4{b-,18,22,text,,,} -....\marks4{b+,18,22,text,,,} +....\marks4{b-,16,23,text,,,} +....\marks4{b+,16,23,text,,,} +....\marks4{e-,16,23,} +....\marks4{e+,16,23,} +....\marks4{b-,17,24,Link,,,} +....\marks4{b+,17,24,Link,,,} +....\marks4{e-,17,24,} +....\marks4{e+,17,24,} +....\marks4{b-,18,23,text,,,} +....\marks4{b+,18,23,text,,,} ....\penalty 300 ....\glue(\baselineskip) 3.16882 ....\hbox(6.8872+1.94397)x345.0, glue set 168.93188fil @@ -1140,8 +1160,8 @@ Completed box being shipped out [1] .....\penalty 10000 .....\glue(\parfillskip) 0.0 plus 1.0fil .....\glue(\rightskip) 0.0 -....\marks4{e-,18,22,} -....\marks4{e+,18,22,} +....\marks4{e-,18,23,} +....\marks4{e+,18,23,} ....\penalty 0 ....\penalty 10000 ....\penalty 0 @@ -1207,10 +1227,10 @@ Completed box being shipped out [1] .....\penalty 10000 .....\glue(\parfillskip) 0.0 plus 1.0fil .....\glue(\rightskip) 0.0 -....\marks4{b-,32,42,text,,,} -....\marks4{b+,32,42,text,,,} -....\marks4{e-,32,42,} -....\marks4{e+,32,42,} +....\marks4{b-,32,46,text,,,} +....\marks4{b+,32,46,text,,,} +....\marks4{e-,32,46,} +....\marks4{e+,32,46,} ....\glue 0.0 ....\glue 0.0 plus 1.0fil ....\glue 0.0 plus -1.0fil @@ -1219,10 +1239,10 @@ Completed box being shipped out [1] ....\glue 20.0 plus 2.0 minus 4.0 ....\vbox(43.19171+0.0)x345.0 .....\vbox(43.19171+0.0)x345.0 -......\pdfdest name{floatstructure.24} xyz -......\pdfdest struct53 name{floatstructure.24} xyz +......\pdfdest name{table.struct.25} xyz +......\pdfdest struct54 name{table.struct.25} xyz ......\penalty 10000 -......\write1{\@writefile{lot}{\protect \contentsline {table}{\protect \numberline {1}{\ignorespaces Animals in example images}}{\thepage }{floatstructure.24}\protected@file@percent }} +......\write1{\@writefile{lot}{\protect \contentsline {table}{\protect \numberline {1}{\ignorespaces Animals in example images}}{\thepage }{table.struct.25}\protected@file@percent }} ......\glue 10.0 ......\hbox(6.8872+1.94397)x345.0, glue set 92.88055fil .......\glue 0.0 plus 1.0fil @@ -1241,7 +1261,7 @@ Completed box being shipped out [1] .......\glue 4.44336 plus 3.33252 minus 0.55542 .......\pdfliteral page{EMC} .......\write1{\new@label@record{mcid-20}{{tagabspage}{\__property_code_tagabspage: }{tagmcabs}{20}{tagmcid}{\__property_code_tagmcid: }}} -.......\pdfliteral shipout page{/Caption <> BDC} +.......\pdfliteral shipout page{/text <> BDC} .......\T1/cmr/m/n/10 A .......\T1/cmr/m/n/10 n .......\T1/cmr/m/n/10 i @@ -1269,16 +1289,16 @@ Completed box being shipped out [1] .......\T1/cmr/m/n/10 s .......\pdfliteral page{EMC} .......\glue 0.0 plus 1.0fil -......\marks4{b-,19,26,Lbl,,,} -......\marks4{b+,19,26,Lbl,,,} -......\marks4{e-,19,26,} -......\marks4{e+,19,26,} -......\marks4{b-,20,25,Caption,,,} -......\marks4{b+,20,25,Caption,,,} -......\marks4{e-,20,25,} -......\marks4{e+,20,25,} +......\marks4{b-,19,27,Lbl,,,} +......\marks4{b+,19,27,Lbl,,,} +......\marks4{e-,19,27,} +......\marks4{e+,19,27,} +......\marks4{b-,20,28,text,,,} +......\marks4{b+,20,28,text,,,} +......\marks4{e-,20,28,} +......\marks4{e+,20,28,} ......\glue 0.0 -......\write1{\newlabel{b}{{1}{\thepage }{Introduction}{floatstructure.24}{}}} +......\write1{\newlabel{b}{{1}{\thepage }{Introduction}{table.struct.25}{}}} ......\glue(\parskip) 0.0 ......\glue(\parskip) 0.0 ......\glue(\baselineskip) 7.11476 @@ -1318,10 +1338,10 @@ Completed box being shipped out [1] .......\penalty 10000 .......\glue(\parfillskip) 0.0 .......\glue(\rightskip) 0.0 plus 1.0fil -......\marks4{b-,21,28,text,,,} -......\marks4{b+,21,28,text,,,} -......\marks4{e-,21,28,} -......\marks4{e+,21,28,} +......\marks4{b-,21,30,text,,,} +......\marks4{b+,21,30,text,,,} +......\marks4{e-,21,30,} +......\marks4{e+,21,30,} ......\glue 0.0 ....\glue 12.0 plus 2.0 minus 2.0 ....\glue -12.0 plus -2.0 minus -2.0 @@ -1391,8 +1411,8 @@ Completed box being shipped out [2] ....\glue 8.0 plus 2.0fil ....\vbox(481.94308+0.0)x345.0 .....\vbox(481.94308+0.0)x345.0 -......\pdfdest name{floatstructure.29} xyz -......\pdfdest struct58 name{floatstructure.29} xyz +......\pdfdest name{figure.struct.31} xyz +......\pdfdest struct60 name{figure.struct.31} xyz ......\penalty 10000 ......\glue(\parskip) 0.0 ......\glue(\parskip) 0.0 @@ -1426,19 +1446,19 @@ Completed box being shipped out [2] .......\penalty 10000 .......\glue(\parfillskip) 0.0 plus 1.0fil .......\glue(\rightskip) 0.0 -......\marks4{b-,22,31,text,,,} -......\marks4{b+,22,31,text,,,} -......\marks4{e-,22,31,} -......\marks4{e+,22,31,} -......\marks4{b-,23,32,Figure,,,} -......\marks4{b+,23,32,Figure,,,} -......\marks4{e-,23,32,} -......\marks4{e+,23,32,} -......\marks4{b-,24,31,text,,,} -......\marks4{b+,24,31,text,,,} -......\marks4{e-,24,31,} -......\marks4{e+,24,31,} -......\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {2}{\ignorespaces This is an example image from the duckuments package}}{\thepage }{floatstructure.29}\protected@file@percent }} +......\marks4{b-,22,33,text,,,} +......\marks4{b+,22,33,text,,,} +......\marks4{e-,22,33,} +......\marks4{e+,22,33,} +......\marks4{b-,23,34,Figure,,,} +......\marks4{b+,23,34,Figure,,,} +......\marks4{e-,23,34,} +......\marks4{e+,23,34,} +......\marks4{b-,24,33,text,,,} +......\marks4{b+,24,33,text,,,} +......\marks4{e-,24,33,} +......\marks4{e+,24,33,} +......\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {2}{\ignorespaces This is an example image from the duckuments package}}{\thepage }{figure.struct.31}\protected@file@percent }} ......\glue 10.0 ......\glue(\baselineskip) 5.1128 ......\hbox(6.8872+1.94397)x345.0, glue set 28.18802fil @@ -1458,7 +1478,7 @@ Completed box being shipped out [2] .......\glue 4.44336 plus 3.33252 minus 0.55542 .......\pdfliteral page{EMC} .......\write1{\new@label@record{mcid-26}{{tagabspage}{\__property_code_tagabspage: }{tagmcabs}{26}{tagmcid}{\__property_code_tagmcid: }}} -.......\pdfliteral shipout page{/Caption <> BDC} +.......\pdfliteral shipout page{/text <> BDC} .......\T1/cmr/m/n/10 T .......\T1/cmr/m/n/10 h .......\T1/cmr/m/n/10 i @@ -1517,20 +1537,20 @@ Completed box being shipped out [2] .......\T1/cmr/m/n/10 e .......\pdfliteral page{EMC} .......\glue 0.0 plus 1.0fil -......\marks4{b-,25,34,Lbl,,,} -......\marks4{b+,25,34,Lbl,,,} -......\marks4{e-,25,34,} -......\marks4{e+,25,34,} -......\marks4{b-,26,33,Caption,,,} -......\marks4{b+,26,33,Caption,,,} -......\marks4{e-,26,33,} -......\marks4{e+,26,33,} +......\marks4{b-,25,36,Lbl,,,} +......\marks4{b+,25,36,Lbl,,,} +......\marks4{e-,25,36,} +......\marks4{e+,25,36,} +......\marks4{b-,26,37,text,,,} +......\marks4{b+,26,37,text,,,} +......\marks4{e-,26,37,} +......\marks4{e+,26,37,} ......\glue 0.0 -......\write1{\newlabel{c}{{2}{\thepage }{Introduction}{floatstructure.29}{}}} +......\write1{\newlabel{c}{{2}{\thepage }{Introduction}{figure.struct.31}{}}} ......\glue 6.0 plus 2.0 minus 2.0 ......\glue 0.0 -......\pdfdest name{floatstructure.35} xyz -......\pdfdest struct66 name{floatstructure.35} xyz +......\pdfdest name{floatstructure.38} xyz +......\pdfdest struct69 name{floatstructure.38} xyz ......\penalty 10000 ......\glue(\parskip) 0.0 ......\glue(\parskip) 0.0 @@ -1565,19 +1585,19 @@ Completed box being shipped out [2] .......\penalty 10000 .......\glue(\parfillskip) 0.0 plus 1.0fil .......\glue(\rightskip) 0.0 -......\marks4{b-,27,37,text,,,} -......\marks4{b+,27,37,text,,,} -......\marks4{e-,27,37,} -......\marks4{e+,27,37,} -......\marks4{b-,28,38,Figure,,,} -......\marks4{b+,28,38,Figure,,,} -......\marks4{e-,28,38,} -......\marks4{e+,28,38,} -......\marks4{b-,29,37,text,,,} -......\marks4{b+,29,37,text,,,} -......\marks4{e-,29,37,} -......\marks4{e+,29,37,} -......\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {3}{\ignorespaces The second page from the PDF}}{\thepage }{floatstructure.35}\protected@file@percent }} +......\marks4{b-,27,40,text,,,} +......\marks4{b+,27,40,text,,,} +......\marks4{e-,27,40,} +......\marks4{e+,27,40,} +......\marks4{b-,28,41,Figure,,,} +......\marks4{b+,28,41,Figure,,,} +......\marks4{e-,28,41,} +......\marks4{e+,28,41,} +......\marks4{b-,29,40,text,,,} +......\marks4{b+,29,40,text,,,} +......\marks4{e-,29,40,} +......\marks4{e+,29,40,} +......\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {3}{\ignorespaces The second page from the PDF}}{\thepage }{figure.struct.38}\protected@file@percent }} ......\glue 10.0 ......\glue(\baselineskip) 5.1128 ......\hbox(6.8872+1.94397)x345.0, glue set 81.6333fil @@ -1597,7 +1617,7 @@ Completed box being shipped out [2] .......\glue 4.44336 plus 3.33252 minus 0.55542 .......\pdfliteral page{EMC} .......\write1{\new@label@record{mcid-31}{{tagabspage}{\__property_code_tagabspage: }{tagmcabs}{31}{tagmcid}{\__property_code_tagmcid: }}} -.......\pdfliteral shipout page{/Caption <> BDC} +.......\pdfliteral shipout page{/text <> BDC} .......\T1/cmr/m/n/10 T .......\T1/cmr/m/n/10 h .......\T1/cmr/m/n/10 e @@ -1628,16 +1648,16 @@ Completed box being shipped out [2] .......\T1/cmr/m/n/10 F .......\pdfliteral page{EMC} .......\glue 0.0 plus 1.0fil -......\marks4{b-,30,40,Lbl,,,} -......\marks4{b+,30,40,Lbl,,,} -......\marks4{e-,30,40,} -......\marks4{e+,30,40,} -......\marks4{b-,31,39,Caption,,,} -......\marks4{b+,31,39,Caption,,,} -......\marks4{e-,31,39,} -......\marks4{e+,31,39,} +......\marks4{b-,30,43,Lbl,,,} +......\marks4{b+,30,43,Lbl,,,} +......\marks4{e-,30,43,} +......\marks4{e+,30,43,} +......\marks4{b-,31,44,text,,,} +......\marks4{b+,31,44,text,,,} +......\marks4{e-,31,44,} +......\marks4{e+,31,44,} ......\glue 0.0 -......\write1{\newlabel{d}{{3}{\thepage }{Introduction}{floatstructure.35}{}}} +......\write1{\newlabel{d}{{3}{\thepage }{Introduction}{figure.struct.38}{}}} ......\glue 0.0 ....\glue 0.0 plus 1.0fil ...\pdfrunninglinkoff @@ -1670,7 +1690,7 @@ Package tagpdf Info: Parent-Child 'Document' --> 'Sect'. (tagpdf) 57 Package tagpdf Info: closing structure 2 tagged /Document Package tagpdf Info: Finalizing the tagging structure: -(tagpdf) Writing out ~42 structure objects +(tagpdf) Writing out ~46 structure objects (tagpdf) with ~36 'MC' leaf nodes. (tagpdf) Be patient if there are lots of objects! Package tagpdf Info: writing ParentTree diff --git a/required/latex-lab/testfiles-float/float-005-double.luatex.tlg b/required/latex-lab/testfiles-float/float-005-double.luatex.tlg index a5ecbb52d..46daa4a69 100644 --- a/required/latex-lab/testfiles-float/float-005-double.luatex.tlg +++ b/required/latex-lab/testfiles-float/float-005-double.luatex.tlg @@ -59,9 +59,14 @@ Package tagpdf Info: Parent-Child 'Lbl' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'Lbl/pdf2' --> 'MC' on line ... Package tagpdf Info: closing structure 14 tagged /Lbl -Package tagpdf Info: Parent-Child 'Caption' --> 'MC'. +Package tagpdf Info: Parent-Child 'Caption' --> 'P'. (tagpdf) Relation is 1 (='0..n') -(tagpdf) Rolemapped from 'Caption/pdf2' --> 'MC' on line ... +(tagpdf) Rolemapped from 'Caption/pdf2' --> 'text/latex' on line +(tagpdf) 19 +Package tagpdf Info: Parent-Child 'P' --> 'MC'. +(tagpdf) Relation is 1 (='0..n') +(tagpdf) Rolemapped from 'P/pdf2' --> 'MC' on line ... +Package tagpdf Info: closing structure 15 tagged /text Package tagpdf Info: closing structure 13 tagged /Caption Package tagpdf Info: closing structure 10 tagged /float Package tagpdf Info: Parent-Child 'P' --> 'MC'. @@ -1436,7 +1441,7 @@ Completed box being shipped out [2] ......\glue(\rightskip) 0.0 .....\pdfliteral page .....\pdfliteral page -.....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {1}{\ignorespaces a wide figure}}{\thepage }{floatstructure.10}\protected@file@percent }} +.....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {1}{\ignorespaces a wide figure}}{\thepage }{figure.struct.10}\protected@file@percent }} .....\glue 10.0 .....\glue(\baselineskip) 3.11111 .....\hbox(6.94444+1.94444)x469.0, glue set 184.54158fil, direction TLT @@ -1507,7 +1512,7 @@ Package tagpdf Info: Parent-Child 'Document' --> 'Sect'. (tagpdf) 23 Package tagpdf Info: closing structure 2 tagged /Document Package tagpdf Info: Finalizing the tagging structure: -(tagpdf) Writing out ~14 structure objects +(tagpdf) Writing out ~15 structure objects (tagpdf) with ~12 'MC' leaf nodes. (tagpdf) Be patient if there are lots of objects! Package tagpdf Info: writing ParentTree diff --git a/required/latex-lab/testfiles-float/float-005-double.tlg b/required/latex-lab/testfiles-float/float-005-double.tlg index f47aed102..02cc4b555 100644 --- a/required/latex-lab/testfiles-float/float-005-double.tlg +++ b/required/latex-lab/testfiles-float/float-005-double.tlg @@ -56,9 +56,14 @@ Package tagpdf Info: Parent-Child 'Lbl' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from 'Lbl/pdf2' --> 'MC' on line ... Package tagpdf Info: closing structure 14 tagged /Lbl -Package tagpdf Info: Parent-Child 'Caption' --> 'MC'. +Package tagpdf Info: Parent-Child 'Caption' --> 'P'. (tagpdf) Relation is 1 (='0..n') -(tagpdf) Rolemapped from 'Caption/pdf2' --> 'MC' on line ... +(tagpdf) Rolemapped from 'Caption/pdf2' --> 'text/latex' on line +(tagpdf) 19 +Package tagpdf Info: Parent-Child 'P' --> 'MC'. +(tagpdf) Relation is 1 (='0..n') +(tagpdf) Rolemapped from 'P/pdf2' --> 'MC' on line ... +Package tagpdf Info: closing structure 15 tagged /text Package tagpdf Info: closing structure 13 tagged /Caption Package tagpdf Info: closing structure 10 tagged /float Package tagpdf Info: Parent-Child 'P' --> 'MC'. @@ -1319,7 +1324,7 @@ Completed box being shipped out [2] .....\marks4{b+,4,12,text,,,} .....\marks4{e-,4,12,} .....\marks4{e+,4,12,} -.....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {1}{\ignorespaces a wide figure}}{\thepage }{floatstructure.10}\protected@file@percent }} +.....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {1}{\ignorespaces a wide figure}}{\thepage }{figure.struct.10}\protected@file@percent }} .....\glue 10.0 .....\glue(\baselineskip) 3.16882 .....\hbox(6.8872+1.94397)x469.0, glue set 184.55386fil @@ -1339,7 +1344,7 @@ Completed box being shipped out [2] ......\glue 4.44336 plus 3.33252 minus 0.55542 ......\pdfliteral page{EMC} ......\write1{\new@label@record{mcid-6}{{tagabspage}{\__property_code_tagabspage: }{tagmcabs}{6}{tagmcid}{\__property_code_tagmcid: }}} -......\pdfliteral shipout page{/Caption <> BDC} +......\pdfliteral shipout page{/text <> BDC} ......\T1/cmr/m/n/10 a ......\glue 3.33252 plus 1.66626 minus 1.11084 ......\T1/cmr/m/n/10 w @@ -1358,10 +1363,10 @@ Completed box being shipped out [2] .....\marks4{b+,5,14,Lbl,,,} .....\marks4{e-,5,14,} .....\marks4{e+,5,14,} -.....\marks4{b-,6,13,Caption,,,} -.....\marks4{b+,6,13,Caption,,,} -.....\marks4{e-,6,13,} -.....\marks4{e+,6,13,} +.....\marks4{b-,6,15,text,,,} +.....\marks4{b+,6,15,text,,,} +.....\marks4{e-,6,15,} +.....\marks4{e+,6,15,} .....\glue 0.0 .....\glue 0.0 ...\glue 0.0 plus 1.0fil @@ -1391,7 +1396,7 @@ Package tagpdf Info: Parent-Child 'Document' --> 'Sect'. (tagpdf) 23 Package tagpdf Info: closing structure 2 tagged /Document Package tagpdf Info: Finalizing the tagging structure: -(tagpdf) Writing out ~14 structure objects +(tagpdf) Writing out ~15 structure objects (tagpdf) with ~11 'MC' leaf nodes. (tagpdf) Be patient if there are lots of objects! Package tagpdf Info: writing ParentTree diff --git a/required/latex-lab/testfiles-float/float-006-spacing.luatex.tlg b/required/latex-lab/testfiles-float/float-006-spacing.luatex.tlg index bd5799e73..d72856706 100644 --- a/required/latex-lab/testfiles-float/float-006-spacing.luatex.tlg +++ b/required/latex-lab/testfiles-float/float-006-spacing.luatex.tlg @@ -44,8 +44,8 @@ Completed box being shipped out [1] ....\glue 8.0 plus 2.0fil ....\vbox(80.84995+0.0)x345.0, direction TLT .....\vbox(80.84995+0.0)x345.0, direction TLT -......\pdfdest name{floatstructure.5} xyz -......\pdfdest name{floatstructure.5} xyz +......\pdfdest name{figure.struct.5} xyz +......\pdfdest name{figure.struct.5} xyz ......\penalty 10000 ......\glue(\parskip) 0.0 ......\glue(\parskip) 0.0 @@ -66,7 +66,7 @@ Completed box being shipped out [1] .......\glue(\rightskip) 0.0 plus 1.0fil ......\pdfliteral page ......\pdfliteral page -......\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {1}{\ignorespaces a caption}}{\thepage }{floatstructure.5}\protected@file@percent }} +......\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {1}{\ignorespaces a caption}}{\thepage }{figure.struct.5}\protected@file@percent }} ......\glue 10.0 ......\glue(\baselineskip) 5.16669 ......\hbox(6.83331+1.94444)x345.0, glue set 130.33325fil, direction TLT @@ -128,7 +128,7 @@ Completed box being shipped out [1] .\pdfliteral page (float-006-spacing.aux) Package tagpdf Info: Finalizing the tagging structure: -(tagpdf) Writing out ~9 structure objects +(tagpdf) Writing out ~10 structure objects (tagpdf) with ~5 'MC' leaf nodes. (tagpdf) Be patient if there are lots of objects! Package tagpdf Info: writing ParentTree diff --git a/required/latex-lab/testfiles-float/float-006-spacing.tlg b/required/latex-lab/testfiles-float/float-006-spacing.tlg index 783976cc5..682aceda3 100644 --- a/required/latex-lab/testfiles-float/float-006-spacing.tlg +++ b/required/latex-lab/testfiles-float/float-006-spacing.tlg @@ -49,8 +49,8 @@ Completed box being shipped out [1] ....\glue 8.0 plus 2.0fil ....\vbox(80.84947+0.0)x345.0 .....\vbox(80.84947+0.0)x345.0 -......\pdfdest name{floatstructure.5} xyz -......\pdfdest struct13 name{floatstructure.5} xyz +......\pdfdest name{figure.struct.5} xyz +......\pdfdest struct13 name{figure.struct.5} xyz ......\penalty 10000 ......\glue(\parskip) 0.0 ......\glue(\parskip) 0.0 @@ -69,7 +69,7 @@ Completed box being shipped out [1] ......\marks4{b+,1,7,text,,,} ......\marks4{e-,1,7,} ......\marks4{e+,1,7,} -......\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {1}{\ignorespaces a caption}}{\thepage }{floatstructure.5}\protected@file@percent }} +......\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {1}{\ignorespaces a caption}}{\thepage }{figure.struct.5}\protected@file@percent }} ......\glue 10.0 ......\glue(\baselineskip) 5.1128 ......\hbox(6.8872+1.94397)x345.0, glue set 130.34363fil @@ -89,7 +89,7 @@ Completed box being shipped out [1] .......\glue 4.44336 plus 3.33252 minus 0.55542 .......\pdfliteral page{EMC} .......\write1{\new@label@record{mcid-3}{{tagabspage}{\__property_code_tagabspage: }{tagmcabs}{3}{tagmcid}{\__property_code_tagmcid: }}} -.......\pdfliteral shipout page{/Caption <> BDC} +.......\pdfliteral shipout page{/text <> BDC} .......\T1/cmr/m/n/10 a .......\glue 3.33252 plus 1.66626 minus 1.11084 .......\T1/cmr/m/n/10 c @@ -105,10 +105,10 @@ Completed box being shipped out [1] ......\marks4{b+,2,9,Lbl,,,} ......\marks4{e-,2,9,} ......\marks4{e+,2,9,} -......\marks4{b-,3,8,Caption,,,} -......\marks4{b+,3,8,Caption,,,} -......\marks4{e-,3,8,} -......\marks4{e+,3,8,} +......\marks4{b-,3,10,text,,,} +......\marks4{b+,3,10,text,,,} +......\marks4{e-,3,10,} +......\marks4{e+,3,10,} ......\glue 0.0 ......\glue 0.0 ....\glue 0.0 plus 1.0fil @@ -133,7 +133,7 @@ Completed box being shipped out [1] .\kern 633.0 (float-006-spacing.aux) Package tagpdf Info: Finalizing the tagging structure: -(tagpdf) Writing out ~9 structure objects +(tagpdf) Writing out ~10 structure objects (tagpdf) with ~5 'MC' leaf nodes. (tagpdf) Be patient if there are lots of objects! Package tagpdf Info: writing ParentTree diff --git a/required/latex-lab/testfiles-float/float-007-gh55.luatex.tlg b/required/latex-lab/testfiles-float/float-007-gh55.luatex.tlg index ebe69dd88..8e9c5b844 100644 --- a/required/latex-lab/testfiles-float/float-007-gh55.luatex.tlg +++ b/required/latex-lab/testfiles-float/float-007-gh55.luatex.tlg @@ -242,7 +242,7 @@ Completed box being shipped out [1] ......\glue(\rightskip) 0.0 plus 1.0fil .....\pdfliteral page .....\pdfliteral page -.....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {1}{\ignorespaces figure1}}{\thepage }{floatstructure.17}\protected@file@percent }} +.....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {1}{\ignorespaces figure1}}{\thepage }{figure.struct.17}\protected@file@percent }} .....\glue 10.0 .....\glue(\baselineskip) 3.11111 .....\hbox(6.94444+1.94444)x345.0, glue set 135.87492fil, direction TLT @@ -278,7 +278,7 @@ Completed box being shipped out [1] .....\glue 0.0 .....\pdfliteral page .....\pdfliteral page -.....\write1{\newlabel{figure1}{{1}{\thepage }{}{floatstructure.17}{}}} +.....\write1{\newlabel{figure1}{{1}{\thepage }{}{figure.struct.17}{}}} .....\glue 0.0 ...\penalty 0 ...\glue 12.0 plus 2.0 minus 2.0 @@ -308,7 +308,7 @@ Completed box being shipped out [1] .\pdfliteral page Non-PDF special ignored! (float-007-gh55.aux) Package tagpdf Info: Finalizing the tagging structure: -(tagpdf) Writing out ~21 structure objects +(tagpdf) Writing out ~22 structure objects (tagpdf) with ~17 'MC' leaf nodes. (tagpdf) Be patient if there are lots of objects! Package tagpdf Info: writing ParentTree diff --git a/required/latex-lab/testfiles-float/float-007-gh55.tlg b/required/latex-lab/testfiles-float/float-007-gh55.tlg index 7a32f7d7a..fa554a074 100644 --- a/required/latex-lab/testfiles-float/float-007-gh55.tlg +++ b/required/latex-lab/testfiles-float/float-007-gh55.tlg @@ -259,7 +259,7 @@ Completed box being shipped out [1] .....\marks4{b+,11,19,text,,,} .....\marks4{e-,11,19,} .....\marks4{e+,11,19,} -.....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {1}{\ignorespaces figure1}}{\thepage }{floatstructure.17}\protected@file@percent }} +.....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline {1}{\ignorespaces figure1}}{\thepage }{figure.struct.17}\protected@file@percent }} .....\glue 10.0 .....\glue(\baselineskip) 3.16882 .....\hbox(6.8872+1.94397)x345.0, glue set 135.88394fil @@ -279,7 +279,7 @@ Completed box being shipped out [1] ......\glue 4.44336 plus 3.33252 minus 0.55542 ......\pdfliteral page{EMC} ......\write1{\new@label@record{mcid-13}{{tagabspage}{\__property_code_tagabspage: }{tagmcabs}{13}{tagmcid}{\__property_code_tagmcid: }}} -......\pdfliteral shipout page{/Caption <> BDC} +......\pdfliteral shipout page{/text <> BDC} ......\T1/cmr/m/n/10 ^^\ (ligature fi) ......\T1/cmr/m/n/10 g ......\T1/cmr/m/n/10 u @@ -292,12 +292,12 @@ Completed box being shipped out [1] .....\marks4{b+,12,21,Lbl,,,} .....\marks4{e-,12,21,} .....\marks4{e+,12,21,} -.....\marks4{b-,13,20,Caption,,,} -.....\marks4{b+,13,20,Caption,,,} -.....\marks4{e-,13,20,} -.....\marks4{e+,13,20,} +.....\marks4{b-,13,22,text,,,} +.....\marks4{b+,13,22,text,,,} +.....\marks4{e-,13,22,} +.....\marks4{e+,13,22,} .....\glue 0.0 -.....\write1{\newlabel{figure1}{{1}{\thepage }{}{floatstructure.17}{}}} +.....\write1{\newlabel{figure1}{{1}{\thepage }{}{figure.struct.17}{}}} .....\glue 0.0 ...\penalty 0 ...\glue 12.0 plus 2.0 minus 2.0 @@ -331,7 +331,7 @@ Completed box being shipped out [1] .\kern 633.0 (float-007-gh55.aux) Package tagpdf Info: Finalizing the tagging structure: -(tagpdf) Writing out ~21 structure objects +(tagpdf) Writing out ~22 structure objects (tagpdf) with ~15 'MC' leaf nodes. (tagpdf) Be patient if there are lots of objects! Package tagpdf Info: writing ParentTree diff --git a/required/latex-lab/testfiles-float/float-010-outside.luatex.tlg b/required/latex-lab/testfiles-float/float-010-outside.luatex.tlg index 7681166bb..abfec33f3 100644 --- a/required/latex-lab/testfiles-float/float-010-outside.luatex.tlg +++ b/required/latex-lab/testfiles-float/float-010-outside.luatex.tlg @@ -1,17 +1,16 @@ This is a generated file for the l3build validation system. Don't change this file in any respect. tagpdf DEBUG Info: Tagging suspended -(tagpdf DEBUG) level: 0 ==> 1, label: caption [on line ...] +(tagpdf DEBUG) level: 0 ==> 1, label: \@makecaption [on line ...] tagpdf DEBUG Info: Tagging resumed -(tagpdf DEBUG) level: 1 ==> 0, label: caption [on line ...] +(tagpdf DEBUG) level: 1 ==> 0, label: \@makecaption [on line ...] Package tagpdf Info: Parent-Child 'Document' --> 'Caption'. (tagpdf) Relation is -1 (='∅') (tagpdf) Rolemapped from: 'Document' --> 'Caption' on line ... Package tagpdf Warning: Parent-Child 'Document/' --> 'Caption/pdf2'. (tagpdf) Relation is not allowed (struct 2, /Document --> (tagpdf) struct 5) on line ... -tagpdf DEBUG Info: Struct 5 begin inserted with options: -(tagpdf DEBUG) tag=Caption,parent=\@current@float@struct +tagpdf DEBUG Info: Struct 5 begin inserted with options: tag=Caption,firstkid (tagpdf DEBUG) [on line ...] The sequence \g__tag_struct_tag_stack_seq contains the items (without outer braces): @@ -39,9 +38,32 @@ braces): > {{Caption}{Caption}} > {{Document}{Document}} > {{Root}{StructTreeRoot}}. -Package tagpdf Info: Parent-Child 'Caption' --> 'MC'. +==> @endpe=false on input line ... +==> increment P on input line ... +Package tagpdf Info: Parent-Child 'Caption' --> 'P'. (tagpdf) Relation is 1 (='0..n') -(tagpdf) Rolemapped from: 'Caption' --> 'MC' on line ... +(tagpdf) Rolemapped from: 'Caption' --> 'text' on line ... +tagpdf DEBUG Info: Struct 7 begin inserted with options: +(tagpdf DEBUG) tag=\l__tag_para_tag_tl +(tagpdf DEBUG) ,attribute-class=\l__tag_para_attr_class_tl +(tagpdf DEBUG) [on line ...] +The sequence \g__tag_struct_tag_stack_seq contains the items (without outer +braces): +> {{text}{P}} +> {{Caption}{Caption}} +> {{Document}{Document}} +> {{Root}{StructTreeRoot}}. +Package tagpdf Info: Parent-Child 'P' --> 'MC'. +(tagpdf) Relation is 1 (='0..n') +(tagpdf) Rolemapped from: 'P' --> 'MC' on line ... +==> increment /P on input line ... +Package tagpdf Info: closing structure 7 tagged /text +tagpdf DEBUG Info: Struct end inserted [on line ...] +The sequence \g__tag_struct_tag_stack_seq contains the items (without outer +braces): +> {{Caption}{Caption}} +> {{Document}{Document}} +> {{Root}{StructTreeRoot}}. Package tagpdf Info: closing structure 5 tagged /Caption tagpdf DEBUG Info: Struct end inserted [on line ...] The sequence \g__tag_struct_tag_stack_seq contains the items (without outer @@ -64,7 +86,7 @@ The sequence \g__tag_struct_tag_stack_seq contains the items (without outer braces): > {{Root}{StructTreeRoot}}. Package tagpdf Info: Finalizing the tagging structure: -(tagpdf) Writing out ~6 structure objects +(tagpdf) Writing out ~7 structure objects (tagpdf) with ~4 'MC' leaf nodes. (tagpdf) Be patient if there are lots of objects! Package tagpdf Info: writing ParentTree diff --git a/required/latex-lab/testfiles-float/float-010-outside.tlg b/required/latex-lab/testfiles-float/float-010-outside.tlg index 6a80ca9df..af2d4893d 100644 --- a/required/latex-lab/testfiles-float/float-010-outside.tlg +++ b/required/latex-lab/testfiles-float/float-010-outside.tlg @@ -1,17 +1,16 @@ This is a generated file for the l3build validation system. Don't change this file in any respect. tagpdf DEBUG Info: Tagging suspended -(tagpdf DEBUG) level: 0 ==> 1, label: caption [on line ...] +(tagpdf DEBUG) level: 0 ==> 1, label: \@makecaption [on line ...] tagpdf DEBUG Info: Tagging resumed -(tagpdf DEBUG) level: 1 ==> 0, label: caption [on line ...] +(tagpdf DEBUG) level: 1 ==> 0, label: \@makecaption [on line ...] Package tagpdf Info: Parent-Child 'Document' --> 'Caption'. (tagpdf) Relation is -1 (='^^e2^^88^^85') (tagpdf) Rolemapped from: 'Document' --> 'Caption' on line ... Package tagpdf Warning: Parent-Child 'Document/' --> 'Caption/pdf2'. (tagpdf) Relation is not allowed (struct 2, /Document --> (tagpdf) struct 5) on line ... -tagpdf DEBUG Info: Struct 5 begin inserted with options: -(tagpdf DEBUG) tag=Caption,parent=\@current@float@struct +tagpdf DEBUG Info: Struct 5 begin inserted with options: tag=Caption,firstkid (tagpdf DEBUG) [on line ...] The sequence \g__tag_struct_tag_stack_seq contains the items (without outer braces): @@ -41,11 +40,34 @@ braces): > {{Caption}{Caption}} > {{Document}{Document}} > {{Root}{StructTreeRoot}}. +==> @endpe=false on input line ... +==> increment P on input line ... +Package tagpdf Info: Parent-Child 'Caption' --> 'P'. +(tagpdf) Relation is 1 (='0..n') +(tagpdf) Rolemapped from: 'Caption' --> 'text' on line ... +tagpdf DEBUG Info: Struct 7 begin inserted with options: +(tagpdf DEBUG) tag=\l__tag_para_tag_tl +(tagpdf DEBUG) ,attribute-class=\l__tag_para_attr_class_tl +(tagpdf DEBUG) [on line ...] +The sequence \g__tag_struct_tag_stack_seq contains the items (without outer +braces): +> {{text}{P}} +> {{Caption}{Caption}} +> {{Document}{Document}} +> {{Root}{StructTreeRoot}}. tagpdf DEBUG Info: MC begin inserted with options: [on line ...] -Package tagpdf Info: Parent-Child 'Caption' --> 'MC'. +Package tagpdf Info: Parent-Child 'P' --> 'MC'. (tagpdf) Relation is 1 (='0..n') -(tagpdf) Rolemapped from: 'Caption' --> 'MC' on line ... +(tagpdf) Rolemapped from: 'P' --> 'MC' on line ... +==> increment /P on input line ... tagpdf DEBUG Info: MC end inserted [on line ...] +Package tagpdf Info: closing structure 7 tagged /text +tagpdf DEBUG Info: Struct end inserted [on line ...] +The sequence \g__tag_struct_tag_stack_seq contains the items (without outer +braces): +> {{Caption}{Caption}} +> {{Document}{Document}} +> {{Root}{StructTreeRoot}}. Package tagpdf Info: closing structure 5 tagged /Caption tagpdf DEBUG Info: Struct end inserted [on line ...] The sequence \g__tag_struct_tag_stack_seq contains the items (without outer @@ -55,7 +77,7 @@ braces): ====> In \@makecol 1 Pick up new bot mark! => first b-, 1, 6, Lbl -=> bot e+, 2, 5 +=> bot e+, 2, 7 => TMB not missing => TME not missing The sequence \g__tag_mc_main_marks_seq is empty @@ -80,7 +102,7 @@ The sequence \g__tag_struct_tag_stack_seq contains the items (without outer braces): > {{Root}{StructTreeRoot}}. Package tagpdf Info: Finalizing the tagging structure: -(tagpdf) Writing out ~6 structure objects +(tagpdf) Writing out ~7 structure objects (tagpdf) with ~4 'MC' leaf nodes. (tagpdf) Be patient if there are lots of objects! Package tagpdf Info: writing ParentTree diff --git a/required/latex-lab/testfiles-float/float-011-multicol.luatex.tlg b/required/latex-lab/testfiles-float/float-011-multicol.luatex.tlg new file mode 100644 index 000000000..2d5fe35ff --- /dev/null +++ b/required/latex-lab/testfiles-float/float-011-multicol.luatex.tlg @@ -0,0 +1,18 @@ +This is a generated file for the l3build validation system. +Don't change this file in any respect. +Floatstructure:7 +[1 +] +[2 +Non-PDF special ignored!] (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/latex-lab/testfiles-float/float-011-multicol.lvt b/required/latex-lab/testfiles-float/float-011-multicol.lvt new file mode 100644 index 000000000..4e9b675c9 --- /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 000000000..b9d0a3c98 --- /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/latex-lab/testfiles-float/float-012-gh13.lvt b/required/latex-lab/testfiles-float/float-012-gh13.lvt new file mode 100644 index 000000000..4d170e4b6 --- /dev/null +++ b/required/latex-lab/testfiles-float/float-012-gh13.lvt @@ -0,0 +1,17 @@ +% see https://github.com/latex3/tagging-project/issues/13 +\DocumentMetadata{testphase={phase-III}} +\input{regression-test} +\documentclass{article} +\NewSocketPlug{caption/label}{TUB/sansserif} + { + \sffamily #1:~ + } +\AssignSocketPlug{caption/label}{TUB/sansserif} + +\begin{document} +\showoutput +\begin{figure} +(Figure) +\caption{Caption.} +\end{figure} +\end{document} \ No newline at end of file diff --git a/required/latex-lab/testfiles-float/float-012-gh13.tlg b/required/latex-lab/testfiles-float/float-012-gh13.tlg new file mode 100644 index 000000000..e69de29bb diff --git a/required/tools/changes.txt b/required/tools/changes.txt index 4f4c60d7b..e0d4b4793 100644 --- a/required/tools/changes.txt +++ b/required/tools/changes.txt @@ -1,3 +1,13 @@ +======================================================================= +This file lists changes to the LaTeX2e files in reverse chronological order. +It is provided for convenience only. It therefore makes no claims to +completeness or accuracy and it contains some references to files that +are not part of the distribution. +======================================================================= + +2024-09-17 Ulrike Fischer + * multicol.dtx: add tagging support (tagging/705) + 2024-09-12 David Carlisle * build.lua, tools.ins: @@ -16,13 +26,6 @@ * array.dtx (subsection{Handling \cs{cline}}): Support for tagging \cline (tagging/134) -======================================================================= -This file lists changes to the LaTeX2e files in reverse chronological order. -It is provided for convenience only. It therefore makes no claims to -completeness or accuracy and it contains some references to files that -are not part of the distribution. -======================================================================= - 2024-07-04 Ulrike Fischer * longtable.dtx: diff --git a/required/tools/multicol.dtx b/required/tools/multicol.dtx index 99f513097..90decb3bb 100644 --- a/required/tools/multicol.dtx +++ b/required/tools/multicol.dtx @@ -98,7 +98,7 @@ % \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@floatcmds{% \let\@dblfloat\@dbflt \def\end@dblfloat{\@endfloatbox + \UseTaggingSocket{float/end}% \@largefloatcheck \outer@nobreak % \end{macrocode} @@ -3657,6 +3667,7 @@ \fi \ifnum\@floatpenalty=-\@Mii \@Esphack + \UseTaggingSocket{float/hmode/end}% \fi}} % \end{macrocode} % \end{macro}