[latex3-commits] [latex3/latex2e] tagging/gh767: getting closer (2cbe6400b)
github at latex-project.org
github at latex-project.org
Sat Nov 23 17:09:53 CET 2024
Repository : https://github.com/latex3/latex2e
On branch : tagging/gh767
Link : https://github.com/latex3/latex2e/commit/2cbe6400bbc7c4eaf5463c5e5a5de0b1de9e5589
>---------------------------------------------------------------
commit 2cbe6400bbc7c4eaf5463c5e5a5de0b1de9e5589
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date: Sat Nov 23 17:09:53 2024 +0100
getting closer
>---------------------------------------------------------------
2cbe6400bbc7c4eaf5463c5e5a5de0b1de9e5589
required/latex-lab/changes.txt | 14 ++
required/latex-lab/latex-lab-block.dtx | 16 +-
required/latex-lab/latex-lab-firstaid.dtx | 49 +++--
.../testfiles-firstaid/test-amsart-733.lvt | 10 +-
.../testfiles-firstaid/test-amsart-733.tlg | 232 +++++++++++++++------
.../testfiles-firstaid/test-amsthm-736.lvt | 7 +-
.../testfiles-firstaid/test-amsthm-736.tlg | 179 +++++++++++++---
7 files changed, 380 insertions(+), 127 deletions(-)
diff --git a/required/latex-lab/changes.txt b/required/latex-lab/changes.txt
index effd0b35f..8ba3e8d66 100644
--- a/required/latex-lab/changes.txt
+++ b/required/latex-lab/changes.txt
@@ -1,3 +1,17 @@
+2024-11-23 Frank Mittelbach <Frank.Mittelbach at latex-project.org>
+
+ * latex-lab-block.dtx (subsubsection{Implementation of block templates \ldots}):
+ Use private storage bin for parindent and not \listparindent to decouple block
+ and list templates (tagging/762)
+
+ (subsubsection{Blockquote instances}):
+ Theorems use their own block-instance and not displayblock to allow for
+ customization (tagging/762)
+
+ * latex-lab-firstaid.dtx (subsection{ams classes and amsthm}):
+ Move the theorem link target later to not have to force hmode with \leavevmode.
+ Otherwise theorems get always an indentation.
+
2024-11-21 Ulrike Fischer <Ulrike.Fischer at latex-project.org>
* latex-lab-float.dtx: Correct socket declaration.
diff --git a/required/latex-lab/latex-lab-block.dtx b/required/latex-lab/latex-lab-block.dtx
index e46ee2fc1..818ef4d35 100644
--- a/required/latex-lab/latex-lab-block.dtx
+++ b/required/latex-lab/latex-lab-block.dtx
@@ -1915,8 +1915,13 @@
%
% \begin{template}{block display}
%
+% In contrast to the \LaTeXe{} implementation we do not directly
+% use \cs{listparindent} here but a private register of the
+% template. The reason is that block template instances are also
+% used outside of lists.
% \changes{v0.8s}{2024/10/03}{Offer item-skip key also on block templates}
-% \changes{v0.8w}{2024/11/23}{}
+% \changes{v0.8w}{2024/11/23}{Use private storage bin for parindent
+% and not \cs{listparindent} to decouple block and list templates (tagging/762)}
% \begin{macrocode}
\DeclareTemplateCode{block}{display}{1}
{
@@ -2020,8 +2025,8 @@
\skip_set_eq:NN \@outerparskip \parskip
\skip_set_eq:NN \parskip \parsep
% \end{macrocode}
-%
-% \changes{v0.8w}{2024/11/23}{}
+% \changes{v0.8w}{2024/11/23}{Use private storage bin for parindent
+% and not \cs{listparindent} to decouple block and list templates (tagging/762)}
% \begin{macrocode}
\dim_set_eq:NN \parindent \l_@@block_parindent_dim
\dim_add:Nn \linewidth { - \rightmargin - \leftmargin }
@@ -3103,7 +3108,8 @@
%
%
-% \changes{v0.8w}{2024/11/23}{}
+% \changes{v0.8w}{2024/11/23}{Theorems use their own block-instance
+% and not displayblock to allow for customization (tagging/762)}
% \begin{macrocode}
\DeclareInstance{blockenv}{theorem}{display}
{
@@ -3367,7 +3373,7 @@
% Theorems do not support nesting, so we have only one to set up.
% The \LaTeX{} default reused the general value of \cs{parindent}
% and \cs{parskip} and, of course, they start at the outer margin.
-% \changes{v0.8w}{2024/11/23}{}
+% \changes{v0.8w}{2024/11/23}{Add block instance for theorems}
% \begin{macrocode}
\DeclareInstance{block}{theoremblock-0}{display}
{
diff --git a/required/latex-lab/latex-lab-firstaid.dtx b/required/latex-lab/latex-lab-firstaid.dtx
index 118baccd7..a5c44b824 100644
--- a/required/latex-lab/latex-lab-firstaid.dtx
+++ b/required/latex-lab/latex-lab-firstaid.dtx
@@ -16,8 +16,8 @@
%
% for those people who are interested or want to report an issue.
%
-\def\ltlabfirstaiddate{2024-10-16}
-\def\ltlabfirstaidversion{0.85h}
+\def\ltlabfirstaiddate{2024-11-23}
+\def\ltlabfirstaidversion{0.85i}
%<*driver>
\documentclass{l3doc}
\EnableCrossrefs
@@ -179,35 +179,38 @@
% While create the caption/label we disable para-tagging.
% \begin{macrocode}
\tagpdfparaOff
- \mode_leave_vertical:
-% \end{macrocode}
-% The anchor for links. amsthm allows for unnumbered theorems so we have to test
-% for an empty counter.
-% \changes{v0.85h}{2024/10/16}{add test if counter is empty tagging/736}
-% \begin{macrocode}
- \tl_if_empty:NTF \l__block_thm_current_counter_tl
- {\MakeLinkTarget[theorem]{}}
- {\MakeLinkTarget{\l__block_thm_current_counter_tl}}
\group_begin:
- \normalfont
- \the\thm at headfont \thm at indent
+ \normalfont
+ \the\thm at headfont \thm at indent
+% \end{macrocode}
+% The anchor for links. It must be inserted when we have started hmode
+% (which happens with \cs{thm at indent}). \pkg{amsthm} allows for unnumbered
+% theorems so we have to test for an empty counter.
+% \changes{v0.85h}{2024/10/16}{add test if counter is empty
+% tagging/736}
+% \changes{v0.85i}{2024/11/23}{Do not use \cs{leavevmode} but wait
+% for hmode to add the link target}
+% \begin{macrocode}
+ \tl_if_empty:NTF \l__block_thm_current_counter_tl
+ {\MakeLinkTarget[theorem]{}}
+ {\MakeLinkTarget{\l__block_thm_current_counter_tl}}
\@ifempty{##1}
- {\let\thmname\@gobble}
+ {\let\thmname\@gobble}
% \end{macrocode}
% we insert the MC and the Lbl structure into \cs{thmname},
% \cs{thmnumber} and \cs{thmnote}. This will also work
% with new theorem style as long as they use these command.
% \begin{macrocode}
- {\def\thmname####1{\tag_mc_begin:n {}####1\tag_mc_end:}}%
+ {\def\thmname####1{\tag_mc_begin:n {}####1\tag_mc_end:}}%
\@ifempty{##2}
- {\let\thmnumber\@gobble}
- {\def\thmnumber####1
- {\tag_struct_begin:n{tag=Lbl}\tag_mc_begin:n {}
- ####1
- \tag_mc_end:\tag_struct_end:}}%
+ {\let\thmnumber\@gobble}
+ {\def\thmnumber####1
+ {\tag_struct_begin:n{tag=Lbl}\tag_mc_begin:n {}
+ ####1
+ \tag_mc_end:\tag_struct_end:}}%
\@ifempty{##3}
- {\let\thmnote\@gobble}
- {\def\thmnote####1{\tag_mc_begin:n{}####1\tag_mc_end:}}%
+ {\let\thmnote\@gobble}
+ {\def\thmnote####1{\tag_mc_begin:n{}####1\tag_mc_end:}}%
\tag_struct_begin:n{tag=Caption}
\thm at swap\swappedhead\thmhead{##1}{##2}{##3}%
\tag_mc_begin:n{}\the\thm at headpunct\tag_mc_end:
@@ -221,7 +224,7 @@
% be used if tagging is active!
% \begin{macrocode}
\tagpdfparaOn
- \UseTaggingSocket{para/begin} %
+ \UseTaggingSocket{para/begin}
\ignorespaces}
% \end{macrocode}
% This redefines the standard styles for the theorem heads.
diff --git a/required/latex-lab/testfiles-firstaid/test-amsart-733.lvt b/required/latex-lab/testfiles-firstaid/test-amsart-733.lvt
index 73fe403d4..dfb207983 100644
--- a/required/latex-lab/testfiles-firstaid/test-amsart-733.lvt
+++ b/required/latex-lab/testfiles-firstaid/test-amsart-733.lvt
@@ -14,6 +14,8 @@
% \newline = linebreak
{\thmnumber{#2 }\thmname{#1}\thmnote{: #3}}% Thm head spec
+
+
\theoremstyle{citing}
\newtheorem{theorem}{Theorem}
@@ -22,14 +24,18 @@
xxxx
\begin{theorem}
-text
+para 1 \\ para1
+
+para 2 \\ para2
\end{theorem}
xxxx
xxxx
\begin{theorem}
-text
+para 1 \\ para1
+
+para 2 \\ para2
\end{theorem}
xxxx
diff --git a/required/latex-lab/testfiles-firstaid/test-amsart-733.tlg b/required/latex-lab/testfiles-firstaid/test-amsart-733.tlg
index 9662a65d8..616b71507 100644
--- a/required/latex-lab/testfiles-firstaid/test-amsart-733.tlg
+++ b/required/latex-lab/testfiles-firstaid/test-amsart-733.tlg
@@ -17,17 +17,17 @@ Completed box being shipped out [1]
...\glue 0.0 plus 1.0fil
...\pdfrunninglinkoff
...\pdfliteral page{/Artifact BMC}
-...\marks4{b-,13,-1,}
-...\marks4{b+,13,-1,}
+...\marks4{b-,15,-1,}
+...\marks4{b+,15,-1,}
...\hbox(0.0+0.0)x360.0
....\hbox(0.0+0.0)x360.0
...\pdfliteral page{EMC}
-...\marks4{e-,13,2,}
-...\marks4{e+,13,2,}
+...\marks4{e-,15,2,}
+...\marks4{e+,15,2,}
...\pdfrunninglinkon
..\glue 14.0
..\glue(\lineskip) 0.0
-..\vbox(584.0+0.0)x360.0, glue set 354.0fil
+..\vbox(584.0+0.0)x360.0, glue set 282.0fil
...\hbox(0.0+0.0)x0.0
...\glue(\topskip) 5.6955
...\hbox(4.3045+0.0)x360.0, glue set 326.89404fil
@@ -51,8 +51,7 @@ Completed box being shipped out [1]
...\glue(\parskip) 0.0
...\glue(\parskip) 0.0
...\glue(\baselineskip) 5.0989
-...\hbox(6.9011+0.0)x360.0, glue set 281.24706fil
-....\hbox(0.0+0.0)x0.0
+...\hbox(6.9011+1.94397)x360.0, glue set 269.91647fil
....\hbox(0.0+0.0)x0.0
....\write1{\new at label@record{mcid-2}{{tagabspage}{\__property_code_tagabspage: }{tagmcabs}{2}{tagmcid}{\__property_code_tagmcid: }}}
....\pdfliteral shipout page{/Lbl <</MCID \flag_height:n {__tag/mcid}\flag_raise:n {__tag/mcid} >> BDC}
@@ -78,13 +77,17 @@ Completed box being shipped out [1]
....\penalty 10000
....\glue 0.0
....\pdfliteral shipout page{/text <</MCID \flag_height:n {__tag/mcid}\flag_raise:n {__tag/mcid} >> BDC}
-....\T1/cmr/m/it/10 t
-....\T1/cmr/m/it/10 e
-....\T1/cmr/m/it/10 x
-....\T1/cmr/m/it/10 t
-....\pdfliteral page{EMC}
+....\T1/cmr/m/it/10 p
+....\kern-0.511
+....\T1/cmr/m/it/10 a
+....\T1/cmr/m/it/10 r
+....\kern-0.511
+....\T1/cmr/m/it/10 a
+....\glue 3.5769 plus 1.53294 minus 1.02197
+....\T1/cmr/m/it/10 1
....\penalty 10000
-....\glue(\parfillskip) 0.0 plus 1.0fil
+....\glue 0.0 plus 1.0fil
+....\penalty -10000
....\glue(\rightskip) 0.0
...\marks4{b-,2,9,Lbl,,,}
...\marks4{b+,2,9,Lbl,,,}
@@ -100,32 +103,64 @@ Completed box being shipped out [1]
...\marks4{e+,4,8,}
...\marks4{b-,5,11,text,,,}
...\marks4{b+,5,11,text,,,}
+...\penalty 20000
+...\glue(\baselineskip) 3.64093
+...\hbox(6.4151+1.94397)x360.0, glue set 336.36691fil
+....\T1/cmr/m/it/10 p
+....\kern-0.511
+....\T1/cmr/m/it/10 a
+....\T1/cmr/m/it/10 r
+....\kern-0.511
+....\T1/cmr/m/it/10 a
+....\T1/cmr/m/it/10 1
+....\pdfliteral page{EMC}
+....\penalty 10000
+....\glue(\parfillskip) 0.0 plus 1.0fil
+....\glue(\rightskip) 0.0
...\marks4{e-,5,11,}
...\marks4{e+,5,11,}
-...\penalty -51
-...\glue 50.0
...\glue(\parskip) 0.0
...\glue(\parskip) 0.0
-...\glue(\baselineskip) 7.6955
-...\hbox(4.3045+0.0)x360.0, glue set 326.89404fil
+...\glue(\baselineskip) 3.64093
+...\hbox(6.4151+1.94397)x360.0, glue set 320.79001fil
....\write1{\new at label@record{mcid-6}{{tagabspage}{\__property_code_tagabspage: }{tagmcabs}{6}{tagmcid}{\__property_code_tagmcid: }}}
....\pdfliteral shipout page{/text <</MCID \flag_height:n {__tag/mcid}\flag_raise:n {__tag/mcid} >> BDC}
....\hbox(0.0+0.0)x12.0
-....\T1/cmr/m/n/10 x
-....\T1/cmr/m/n/10 x
-....\T1/cmr/m/n/10 x
-....\T1/cmr/m/n/10 x
-....\pdfliteral page{EMC}
+....\T1/cmr/m/it/10 p
+....\kern-0.511
+....\T1/cmr/m/it/10 a
+....\T1/cmr/m/it/10 r
+....\kern-0.511
+....\T1/cmr/m/it/10 a
+....\glue 3.5769 plus 1.53294 minus 1.02197
+....\T1/cmr/m/it/10 2
....\penalty 10000
-....\glue(\parfillskip) 0.0 plus 1.0fil
+....\glue 0.0 plus 1.0fil
+....\penalty -10000
....\glue(\rightskip) 0.0
...\marks4{b-,6,13,text,,,}
...\marks4{b+,6,13,text,,,}
+...\penalty 20000
+...\glue(\baselineskip) 3.64093
+...\hbox(6.4151+1.94397)x360.0, glue set 336.36691fil
+....\T1/cmr/m/it/10 p
+....\kern-0.511
+....\T1/cmr/m/it/10 a
+....\T1/cmr/m/it/10 r
+....\kern-0.511
+....\T1/cmr/m/it/10 a
+....\T1/cmr/m/it/10 2
+....\pdfliteral page{EMC}
+....\penalty 10000
+....\glue(\parfillskip) 0.0 plus 1.0fil
+....\glue(\rightskip) 0.0
...\marks4{e-,6,13,}
...\marks4{e+,6,13,}
+...\penalty -51
+...\glue 50.0
...\glue(\parskip) 0.0
...\glue(\parskip) 0.0
-...\glue(\baselineskip) 7.6955
+...\glue(\baselineskip) 5.75153
...\hbox(4.3045+0.0)x360.0, glue set 326.89404fil
....\write1{\new at label@record{mcid-7}{{tagabspage}{\__property_code_tagabspage: }{tagmcabs}{7}{tagmcid}{\__property_code_tagmcid: }}}
....\pdfliteral shipout page{/text <</MCID \flag_height:n {__tag/mcid}\flag_raise:n {__tag/mcid} >> BDC}
@@ -142,20 +177,38 @@ Completed box being shipped out [1]
...\marks4{b+,7,15,text,,,}
...\marks4{e-,7,15,}
...\marks4{e+,7,15,}
+...\glue(\parskip) 0.0
+...\glue(\parskip) 0.0
+...\glue(\baselineskip) 7.6955
+...\hbox(4.3045+0.0)x360.0, glue set 326.89404fil
+....\write1{\new at label@record{mcid-8}{{tagabspage}{\__property_code_tagabspage: }{tagmcabs}{8}{tagmcid}{\__property_code_tagmcid: }}}
+....\pdfliteral shipout page{/text <</MCID \flag_height:n {__tag/mcid}\flag_raise:n {__tag/mcid} >> BDC}
+....\hbox(0.0+0.0)x12.0
+....\T1/cmr/m/n/10 x
+....\T1/cmr/m/n/10 x
+....\T1/cmr/m/n/10 x
+....\T1/cmr/m/n/10 x
+....\pdfliteral page{EMC}
+....\penalty 10000
+....\glue(\parfillskip) 0.0 plus 1.0fil
+....\glue(\rightskip) 0.0
+...\marks4{b-,8,17,text,,,}
+...\marks4{b+,8,17,text,,,}
+...\marks4{e-,8,17,}
+...\marks4{e+,8,17,}
...\penalty -51
...\glue 30.0
...\glue(\parskip) 0.0
...\glue(\parskip) 0.0
...\glue(\baselineskip) 5.0989
-...\hbox(6.9011+0.0)x360.0, glue set 281.24706fil
-....\hbox(0.0+0.0)x0.0
+...\hbox(6.9011+1.94397)x360.0, glue set 269.91647fil
....\hbox(0.0+0.0)x0.0
-....\write1{\new at label@record{mcid-8}{{tagabspage}{\__property_code_tagabspage: }{tagmcabs}{8}{tagmcid}{\__property_code_tagmcid: }}}
+....\write1{\new at label@record{mcid-9}{{tagabspage}{\__property_code_tagabspage: }{tagmcabs}{9}{tagmcid}{\__property_code_tagmcid: }}}
....\pdfliteral shipout page{/Lbl <</MCID \flag_height:n {__tag/mcid}\flag_raise:n {__tag/mcid} >> BDC}
....\T1/cmr/bx/n/10 2
....\glue 3.8324 plus 1.9162 minus 1.27747
....\pdfliteral page{EMC}
-....\write1{\new at label@record{mcid-9}{{tagabspage}{\__property_code_tagabspage: }{tagmcabs}{9}{tagmcid}{\__property_code_tagmcid: }}}
+....\write1{\new at label@record{mcid-10}{{tagabspage}{\__property_code_tagabspage: }{tagmcabs}{10}{tagmcid}{\__property_code_tagmcid: }}}
....\pdfliteral shipout page{/Caption <</MCID \flag_height:n {__tag/mcid}\flag_raise:n {__tag/mcid} >> BDC}
....\T1/cmr/bx/n/10 T
....\T1/cmr/bx/n/10 h
@@ -165,46 +218,101 @@ Completed box being shipped out [1]
....\T1/cmr/bx/n/10 e
....\T1/cmr/bx/n/10 m
....\pdfliteral page{EMC}
-....\write1{\new at label@record{mcid-10}{{tagabspage}{\__property_code_tagabspage: }{tagmcabs}{10}{tagmcid}{\__property_code_tagmcid: }}}
+....\write1{\new at label@record{mcid-11}{{tagabspage}{\__property_code_tagabspage: }{tagmcabs}{11}{tagmcid}{\__property_code_tagmcid: }}}
....\pdfliteral shipout page{/Caption <</MCID \flag_height:n {__tag/mcid}\flag_raise:n {__tag/mcid} >> BDC}
....\T1/cmr/bx/n/10 .
....\pdfliteral page{EMC}
....\glue 5.10986
-....\write1{\new at label@record{mcid-11}{{tagabspage}{\__property_code_tagabspage: }{tagmcabs}{11}{tagmcid}{\__property_code_tagmcid: }}}
+....\write1{\new at label@record{mcid-12}{{tagabspage}{\__property_code_tagabspage: }{tagmcabs}{12}{tagmcid}{\__property_code_tagmcid: }}}
....\penalty 10000
....\glue 0.0
....\pdfliteral shipout page{/text <</MCID \flag_height:n {__tag/mcid}\flag_raise:n {__tag/mcid} >> BDC}
-....\T1/cmr/m/it/10 t
-....\T1/cmr/m/it/10 e
-....\T1/cmr/m/it/10 x
-....\T1/cmr/m/it/10 t
+....\T1/cmr/m/it/10 p
+....\kern-0.511
+....\T1/cmr/m/it/10 a
+....\T1/cmr/m/it/10 r
+....\kern-0.511
+....\T1/cmr/m/it/10 a
+....\glue 3.5769 plus 1.53294 minus 1.02197
+....\T1/cmr/m/it/10 1
+....\penalty 10000
+....\glue 0.0 plus 1.0fil
+....\penalty -10000
+....\glue(\rightskip) 0.0
+...\marks4{b-,9,20,Lbl,,,}
+...\marks4{b+,9,20,Lbl,,,}
+...\marks4{e-,9,20,}
+...\marks4{e+,9,20,}
+...\marks4{b-,10,19,Caption,,,}
+...\marks4{b+,10,19,Caption,,,}
+...\marks4{e-,10,19,}
+...\marks4{e+,10,19,}
+...\marks4{b-,11,19,Caption,,,}
+...\marks4{b+,11,19,Caption,,,}
+...\marks4{e-,11,19,}
+...\marks4{e+,11,19,}
+...\marks4{b-,12,22,text,,,}
+...\marks4{b+,12,22,text,,,}
+...\penalty 20000
+...\glue(\baselineskip) 3.64093
+...\hbox(6.4151+1.94397)x360.0, glue set 336.36691fil
+....\T1/cmr/m/it/10 p
+....\kern-0.511
+....\T1/cmr/m/it/10 a
+....\T1/cmr/m/it/10 r
+....\kern-0.511
+....\T1/cmr/m/it/10 a
+....\T1/cmr/m/it/10 1
....\pdfliteral page{EMC}
....\penalty 10000
....\glue(\parfillskip) 0.0 plus 1.0fil
....\glue(\rightskip) 0.0
-...\marks4{b-,8,18,Lbl,,,}
-...\marks4{b+,8,18,Lbl,,,}
-...\marks4{e-,8,18,}
-...\marks4{e+,8,18,}
-...\marks4{b-,9,17,Caption,,,}
-...\marks4{b+,9,17,Caption,,,}
-...\marks4{e-,9,17,}
-...\marks4{e+,9,17,}
-...\marks4{b-,10,17,Caption,,,}
-...\marks4{b+,10,17,Caption,,,}
-...\marks4{e-,10,17,}
-...\marks4{e+,10,17,}
-...\marks4{b-,11,20,text,,,}
-...\marks4{b+,11,20,text,,,}
-...\marks4{e-,11,20,}
-...\marks4{e+,11,20,}
+...\marks4{e-,12,22,}
+...\marks4{e+,12,22,}
+...\glue(\parskip) 0.0
+...\glue(\parskip) 0.0
+...\glue(\baselineskip) 3.64093
+...\hbox(6.4151+1.94397)x360.0, glue set 320.79001fil
+....\write1{\new at label@record{mcid-13}{{tagabspage}{\__property_code_tagabspage: }{tagmcabs}{13}{tagmcid}{\__property_code_tagmcid: }}}
+....\pdfliteral shipout page{/text <</MCID \flag_height:n {__tag/mcid}\flag_raise:n {__tag/mcid} >> BDC}
+....\hbox(0.0+0.0)x12.0
+....\T1/cmr/m/it/10 p
+....\kern-0.511
+....\T1/cmr/m/it/10 a
+....\T1/cmr/m/it/10 r
+....\kern-0.511
+....\T1/cmr/m/it/10 a
+....\glue 3.5769 plus 1.53294 minus 1.02197
+....\T1/cmr/m/it/10 2
+....\penalty 10000
+....\glue 0.0 plus 1.0fil
+....\penalty -10000
+....\glue(\rightskip) 0.0
+...\marks4{b-,13,24,text,,,}
+...\marks4{b+,13,24,text,,,}
+...\penalty 20000
+...\glue(\baselineskip) 3.64093
+...\hbox(6.4151+1.94397)x360.0, glue set 336.36691fil
+....\T1/cmr/m/it/10 p
+....\kern-0.511
+....\T1/cmr/m/it/10 a
+....\T1/cmr/m/it/10 r
+....\kern-0.511
+....\T1/cmr/m/it/10 a
+....\T1/cmr/m/it/10 2
+....\pdfliteral page{EMC}
+....\penalty 10000
+....\glue(\parfillskip) 0.0 plus 1.0fil
+....\glue(\rightskip) 0.0
+...\marks4{e-,13,24,}
+...\marks4{e+,13,24,}
...\penalty -51
...\glue 50.0
...\glue(\parskip) 0.0
...\glue(\parskip) 0.0
-...\glue(\baselineskip) 7.6955
+...\glue(\baselineskip) 5.75153
...\hbox(4.3045+0.0)x360.0, glue set 326.89404fil
-....\write1{\new at label@record{mcid-12}{{tagabspage}{\__property_code_tagabspage: }{tagmcabs}{12}{tagmcid}{\__property_code_tagmcid: }}}
+....\write1{\new at label@record{mcid-14}{{tagabspage}{\__property_code_tagabspage: }{tagmcabs}{14}{tagmcid}{\__property_code_tagmcid: }}}
....\pdfliteral shipout page{/text <</MCID \flag_height:n {__tag/mcid}\flag_raise:n {__tag/mcid} >> BDC}
....\hbox(0.0+0.0)x12.0
....\T1/cmr/m/n/10 x
@@ -215,18 +323,18 @@ Completed box being shipped out [1]
....\penalty 10000
....\glue(\parfillskip) 0.0 plus 1.0fil
....\glue(\rightskip) 0.0
-...\marks4{b-,12,22,text,,,}
-...\marks4{b+,12,22,text,,,}
-...\marks4{e-,12,22,}
-...\marks4{e+,12,22,}
+...\marks4{b-,14,26,text,,,}
+...\marks4{b+,14,26,text,,,}
+...\marks4{e-,14,26,}
+...\marks4{e+,14,26,}
...\glue 0.0 plus 1.0fil
...\kern 0.0
...\hbox(0.0+0.0)x0.0
...\glue 0.0
..\pdfrunninglinkoff
..\pdfliteral page{/Artifact BMC}
-..\marks4{b-,14,-1,}
-..\marks4{b+,14,-1,}
+..\marks4{b-,16,-1,}
+..\marks4{b+,16,-1,}
..\glue(\baselineskip) 7.46777
..\hbox(4.53223+0.0)x360.0
...\hbox(4.53223+0.0)x360.0, glue set 178.00743fil
@@ -234,8 +342,8 @@ Completed box being shipped out [1]
....\T1/cmr/m/n/7 1
....\glue 0.0 plus 1.0fil
..\pdfliteral page{EMC}
-..\marks4{e-,14,2,}
-..\marks4{e+,14,2,}
+..\marks4{e-,16,2,}
+..\marks4{e+,16,2,}
..\pdfrunninglinkon
.\kern 0.0
.\kern 0.0
@@ -244,8 +352,8 @@ Completed box being shipped out [1]
.\kern 640.215
(test-amsart-733.aux)
Package tagpdf Info: Finalizing the tagging structure:
-(tagpdf) Writing out ~22 structure objects
-(tagpdf) with ~14 'MC' leaf nodes.
+(tagpdf) Writing out ~26 structure objects
+(tagpdf) with ~16 'MC' leaf nodes.
(tagpdf) Be patient if there are lots of objects!
Package tagpdf Info: writing ParentTree
Package tagpdf Info: writing IDTree
diff --git a/required/latex-lab/testfiles-firstaid/test-amsthm-736.lvt b/required/latex-lab/testfiles-firstaid/test-amsthm-736.lvt
index 8d7d0b68b..ffd28509d 100644
--- a/required/latex-lab/testfiles-firstaid/test-amsthm-736.lvt
+++ b/required/latex-lab/testfiles-firstaid/test-amsthm-736.lvt
@@ -13,8 +13,13 @@
\begin{document}
\START\showoutput
+xxx
\begin{theorem}
-text
+para 1 \\ para1
+
+para 2 \\ para2
\end{theorem}
+xxx
+yyy
\end{document}
diff --git a/required/latex-lab/testfiles-firstaid/test-amsthm-736.tlg b/required/latex-lab/testfiles-firstaid/test-amsthm-736.tlg
index 39ad16f35..18c236290 100644
--- a/required/latex-lab/testfiles-firstaid/test-amsthm-736.tlg
+++ b/required/latex-lab/testfiles-firstaid/test-amsthm-736.tlg
@@ -32,31 +32,50 @@ Completed box being shipped out [1]
....\glue 0.0 plus 1.0fil
....\pdfrunninglinkoff
....\pdfliteral page{/Artifact BMC}
-....\marks4{b-,4,-1,}
-....\marks4{b+,4,-1,}
+....\marks4{b-,8,-1,}
+....\marks4{b+,8,-1,}
....\hbox(0.0+0.0)x345.0
.....\hbox(0.0+0.0)x345.0
....\pdfliteral page{EMC}
-....\marks4{e-,4,2,}
-....\marks4{e+,4,2,}
+....\marks4{e-,8,2,}
+....\marks4{e+,8,2,}
....\pdfrunninglinkon
...\glue 25.0
...\glue(\lineskip) 0.0
-...\vbox(550.0+0.0)x345.0, glue set 531.94318fil
+...\vbox(550.0+0.0)x345.0, glue set 449.95193fil
....\hbox(0.0+0.0)x0.0
....\write-{}
....\pdfdest name{Doc-Start} xyz
....\pdfdest struct10 name{Doc-Start} xyz
-....\glue(\topskip) 3.0989
-....\hbox(6.9011+0.0)x345.0, glue set 275.93791fil
-.....\hbox(0.0+0.0)x0.0
+....\glue(\topskip) 5.6955
+....\hbox(4.3045+0.0)x345.0, glue set 314.17053fil
+.....\write1{\new at label@record{mcid-1}{{tagabspage}{\__property_code_tagabspage: }{tagmcabs}{1}{tagmcid}{\__property_code_tagmcid: }}}
+.....\pdfliteral shipout page{/text <</MCID \flag_height:n {__tag/mcid}\flag_raise:n {__tag/mcid} >> BDC}
+.....\hbox(0.0+0.0)x15.0
+.....\T1/cmr/m/n/10 x
+.....\T1/cmr/m/n/10 x
+.....\T1/cmr/m/n/10 x
+.....\pdfliteral page{EMC}
+.....\penalty 10000
+.....\glue(\parfillskip) 0.0 plus 1.0fil
+.....\glue(\rightskip) 0.0
+....\marks4{b-,1,6,text,,,}
+....\marks4{b+,1,6,text,,,}
+....\marks4{e-,1,6,}
+....\marks4{e+,1,6,}
+....\penalty -51
+....\glue 10.0 plus 4.0 minus 5.0
+....\glue(\parskip) 0.0 plus 1.0
+....\glue(\parskip) 0.0
+....\glue(\baselineskip) 5.0989
+....\hbox(6.9011+1.94397)x345.0, glue set 264.60733fil
.....\penalty 10000
.....\hbox(0.0+0.0)x0.0
......\hbox(0.0+0.0)x0.0, shifted -12.0
.......\pdfdest name{theorem*.1} xyz
-.......\pdfdest struct13 name{theorem*.1} xyz
+.......\pdfdest struct15 name{theorem*.1} xyz
.......\penalty 10000
-.....\write1{\new at label@record{mcid-1}{{tagabspage}{\__property_code_tagabspage: }{tagmcabs}{1}{tagmcid}{\__property_code_tagmcid: }}}
+.....\write1{\new at label@record{mcid-2}{{tagabspage}{\__property_code_tagabspage: }{tagmcabs}{2}{tagmcid}{\__property_code_tagmcid: }}}
.....\pdfliteral shipout page{/Caption <</MCID \flag_height:n {__tag/mcid}\flag_raise:n {__tag/mcid} >> BDC}
.....\T1/cmr/bx/n/10 T
.....\T1/cmr/bx/n/10 h
@@ -66,37 +85,129 @@ Completed box being shipped out [1]
.....\T1/cmr/bx/n/10 e
.....\T1/cmr/bx/n/10 m
.....\pdfliteral page{EMC}
-.....\write1{\new at label@record{mcid-2}{{tagabspage}{\__property_code_tagabspage: }{tagmcabs}{2}{tagmcid}{\__property_code_tagmcid: }}}
+.....\write1{\new at label@record{mcid-3}{{tagabspage}{\__property_code_tagabspage: }{tagmcabs}{3}{tagmcid}{\__property_code_tagmcid: }}}
.....\pdfliteral shipout page{/Caption <</MCID \flag_height:n {__tag/mcid}\flag_raise:n {__tag/mcid} >> BDC}
.....\T1/cmr/bx/n/10 .
.....\pdfliteral page{EMC}
.....\glue 5.0 plus 1.0 minus 1.0
-.....\write1{\new at label@record{mcid-3}{{tagabspage}{\__property_code_tagabspage: }{tagmcabs}{3}{tagmcid}{\__property_code_tagmcid: }}}
+.....\write1{\new at label@record{mcid-4}{{tagabspage}{\__property_code_tagabspage: }{tagmcabs}{4}{tagmcid}{\__property_code_tagmcid: }}}
.....\penalty 10000
.....\glue 0.0
.....\pdfliteral shipout page{/text <</MCID \flag_height:n {__tag/mcid}\flag_raise:n {__tag/mcid} >> BDC}
-.....\T1/cmr/m/it/10 t
-.....\T1/cmr/m/it/10 e
-.....\T1/cmr/m/it/10 x
-.....\T1/cmr/m/it/10 t
-.....\pdfliteral page{EMC}
+.....\T1/cmr/m/it/10 p
+.....\kern-0.511
+.....\T1/cmr/m/it/10 a
+.....\T1/cmr/m/it/10 r
+.....\kern-0.511
+.....\T1/cmr/m/it/10 a
+.....\glue 3.5769 plus 1.53294 minus 1.02197
+.....\T1/cmr/m/it/10 1
.....\penalty 10000
-.....\glue(\parfillskip) 0.0 plus 1.0fil
+.....\glue 0.0 plus 1.0fil
+.....\penalty -10000
.....\glue(\rightskip) 0.0
-....\marks4{b-,1,6,Caption,,,}
-....\marks4{b+,1,6,Caption,,,}
-....\marks4{e-,1,6,}
-....\marks4{e+,1,6,}
-....\marks4{b-,2,6,Caption,,,}
-....\marks4{b+,2,6,Caption,,,}
-....\marks4{e-,2,6,}
-....\marks4{e+,2,6,}
-....\marks4{b-,3,8,text,,,}
-....\marks4{b+,3,8,text,,,}
+....\marks4{b-,2,8,Caption,,,}
+....\marks4{b+,2,8,Caption,,,}
+....\marks4{e-,2,8,}
+....\marks4{e+,2,8,}
+....\marks4{b-,3,8,Caption,,,}
+....\marks4{b+,3,8,Caption,,,}
....\marks4{e-,3,8,}
....\marks4{e+,3,8,}
+....\marks4{b-,4,10,text,,,}
+....\marks4{b+,4,10,text,,,}
+....\penalty 300
+....\glue(\baselineskip) 3.64093
+....\hbox(6.4151+1.94397)x345.0, glue set 321.36691fil
+.....\T1/cmr/m/it/10 p
+.....\kern-0.511
+.....\T1/cmr/m/it/10 a
+.....\T1/cmr/m/it/10 r
+.....\kern-0.511
+.....\T1/cmr/m/it/10 a
+.....\T1/cmr/m/it/10 1
+.....\pdfliteral page{EMC}
+.....\penalty 10000
+.....\glue(\parfillskip) 0.0 plus 1.0fil
+.....\glue(\rightskip) 0.0
+....\marks4{e-,4,10,}
+....\marks4{e+,4,10,}
+....\glue(\parskip) 0.0 plus 1.0
+....\glue(\parskip) 0.0
+....\glue(\baselineskip) 3.64093
+....\hbox(6.4151+1.94397)x345.0, glue set 302.79001fil
+.....\write1{\new at label@record{mcid-5}{{tagabspage}{\__property_code_tagabspage: }{tagmcabs}{5}{tagmcid}{\__property_code_tagmcid: }}}
+.....\pdfliteral shipout page{/text <</MCID \flag_height:n {__tag/mcid}\flag_raise:n {__tag/mcid} >> BDC}
+.....\hbox(0.0+0.0)x15.0
+.....\T1/cmr/m/it/10 p
+.....\kern-0.511
+.....\T1/cmr/m/it/10 a
+.....\T1/cmr/m/it/10 r
+.....\kern-0.511
+.....\T1/cmr/m/it/10 a
+.....\glue 3.5769 plus 1.53294 minus 1.02197
+.....\T1/cmr/m/it/10 2
+.....\penalty 10000
+.....\glue 0.0 plus 1.0fil
+.....\penalty -10000
+.....\glue(\rightskip) 0.0
+....\marks4{b-,5,12,text,,,}
+....\marks4{b+,5,12,text,,,}
+....\penalty 300
+....\glue(\baselineskip) 3.64093
+....\hbox(6.4151+1.94397)x345.0, glue set 321.36691fil
+.....\T1/cmr/m/it/10 p
+.....\kern-0.511
+.....\T1/cmr/m/it/10 a
+.....\T1/cmr/m/it/10 r
+.....\kern-0.511
+.....\T1/cmr/m/it/10 a
+.....\T1/cmr/m/it/10 2
+.....\pdfliteral page{EMC}
+.....\penalty 10000
+.....\glue(\parfillskip) 0.0 plus 1.0fil
+.....\glue(\rightskip) 0.0
+....\marks4{e-,5,12,}
+....\marks4{e+,5,12,}
....\penalty -51
....\glue 8.0 plus 2.0 minus 4.0
+....\glue(\parskip) 0.0 plus 1.0
+....\glue(\parskip) 0.0
+....\glue(\baselineskip) 5.75153
+....\hbox(4.3045+0.0)x345.0, glue set 314.17053fil
+.....\write1{\new at label@record{mcid-6}{{tagabspage}{\__property_code_tagabspage: }{tagmcabs}{6}{tagmcid}{\__property_code_tagmcid: }}}
+.....\pdfliteral shipout page{/text <</MCID \flag_height:n {__tag/mcid}\flag_raise:n {__tag/mcid} >> BDC}
+.....\hbox(0.0+0.0)x15.0
+.....\T1/cmr/m/n/10 x
+.....\T1/cmr/m/n/10 x
+.....\T1/cmr/m/n/10 x
+.....\pdfliteral page{EMC}
+.....\penalty 10000
+.....\glue(\parfillskip) 0.0 plus 1.0fil
+.....\glue(\rightskip) 0.0
+....\marks4{b-,6,14,text,,,}
+....\marks4{b+,6,14,text,,,}
+....\marks4{e-,6,14,}
+....\marks4{e+,6,14,}
+....\glue(\parskip) 0.0 plus 1.0
+....\glue(\parskip) 0.0
+....\glue(\baselineskip) 7.6955
+....\hbox(4.3045+1.94397)x345.0, glue set 314.17053fil
+.....\write1{\new at label@record{mcid-7}{{tagabspage}{\__property_code_tagabspage: }{tagmcabs}{7}{tagmcid}{\__property_code_tagmcid: }}}
+.....\pdfliteral shipout page{/text <</MCID \flag_height:n {__tag/mcid}\flag_raise:n {__tag/mcid} >> BDC}
+.....\hbox(0.0+0.0)x15.0
+.....\T1/cmr/m/n/10 y
+.....\T1/cmr/m/n/10 y
+.....\T1/cmr/m/n/10 y
+.....\pdfliteral page{EMC}
+.....\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,}
+....\glue -1.94397
....\glue 0.0 plus 1.0fil
....\glue 0.0 plus -1.0fil
....\kern 0.0
@@ -106,8 +217,8 @@ Completed box being shipped out [1]
....\glue 0.0 plus 0.0001fil
...\pdfrunninglinkoff
...\pdfliteral page{/Artifact BMC}
-...\marks4{b-,5,-1,}
-...\marks4{b+,5,-1,}
+...\marks4{b-,9,-1,}
+...\marks4{b+,9,-1,}
...\glue(\baselineskip) 23.5849
...\hbox(6.4151+0.0)x345.0
....\hbox(6.4151+0.0)x345.0, glue set 170.00061fil
@@ -115,8 +226,8 @@ Completed box being shipped out [1]
.....\T1/cmr/m/n/10 1
.....\glue 0.0 plus 1.0fil
...\pdfliteral page{EMC}
-...\marks4{e-,5,2,}
-...\marks4{e+,5,2,}
+...\marks4{e-,9,2,}
+...\marks4{e+,9,2,}
...\pdfrunninglinkon
.\kern 0.0
.\kern 0.0
@@ -125,8 +236,8 @@ Completed box being shipped out [1]
.\kern 633.0
(test-amsthm-736.aux)
Package tagpdf Info: Finalizing the tagging structure:
-(tagpdf) Writing out ~8 structure objects
-(tagpdf) with ~5 'MC' leaf nodes.
+(tagpdf) Writing out ~16 structure objects
+(tagpdf) with ~9 'MC' leaf nodes.
(tagpdf) Be patient if there are lots of objects!
Package tagpdf Info: writing ParentTree
Package tagpdf Info: writing IDTree
More information about the latex3-commits
mailing list.