[latex3-commits] [git/LaTeX3-latex3-latex2e] testnewpara: test for several blockenvs in a row (a5ed8145)
Frank Mittelbach
frank.mittelbach at latex-project.org
Mon Mar 6 16:46:30 CET 2023
Repository : https://github.com/latex3/latex2e
On branch : testnewpara
Link : https://github.com/latex3/latex2e/commit/a5ed81457d2e88c33101cc9b98f571200d0cff17
>---------------------------------------------------------------
commit a5ed81457d2e88c33101cc9b98f571200d0cff17
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date: Mon Mar 6 16:46:30 2023 +0100
test for several blockenvs in a row
>---------------------------------------------------------------
a5ed81457d2e88c33101cc9b98f571200d0cff17
required/latex-lab/latex-lab-block-tagging.dtx | 4 +-
...-03.luatex.tlg => blocks-itemize-02.luatex.tlg} | 121 ++++++++-------------
.../testfiles-block-tagging/blocks-itemize-02.lvt | 33 ++++++
...ks-description-03.tlg => blocks-itemize-02.tlg} | 121 ++++++++-------------
required/latex-lab/update-blocks-all.sh | 1 +
5 files changed, 128 insertions(+), 152 deletions(-)
diff --git a/required/latex-lab/latex-lab-block-tagging.dtx b/required/latex-lab/latex-lab-block-tagging.dtx
index b69c35eb..1dd4abfd 100644
--- a/required/latex-lab/latex-lab-block-tagging.dtx
+++ b/required/latex-lab/latex-lab-block-tagging.dtx
@@ -3082,10 +3082,10 @@
% a paragraph, we have to start a paragraph
% structure. However, this is not the case if we are already
% flattening paragraphs, thus in this case we do nothing.
-% We also do nothing if \textt{@endpe} is currently true, because
+% We also do nothing if \texttt{@endpe} is currently true, because
% that means we are right now just after the end of a
% \texttt{blockenv} and in the process of looking if we have to end
-% the current \textt{tpara}, i.e., it is alreay open.
+% the current \texttt{tpara}, i.e., it is already open.
% \begin{macrocode}
\cs_set:Npn \@@_beginpar_vmode: {
\@@_debug_typeout:n
diff --git a/required/latex-lab/testfiles-block-tagging/blocks-description-03.luatex.tlg b/required/latex-lab/testfiles-block-tagging/blocks-itemize-02.luatex.tlg
similarity index 65%
copy from required/latex-lab/testfiles-block-tagging/blocks-description-03.luatex.tlg
copy to required/latex-lab/testfiles-block-tagging/blocks-itemize-02.luatex.tlg
index 52d5bd28..99e9b428 100644
--- a/required/latex-lab/testfiles-block-tagging/blocks-description-03.luatex.tlg
+++ b/required/latex-lab/testfiles-block-tagging/blocks-itemize-02.luatex.tlg
@@ -1,54 +1,22 @@
This is a generated file for the l3build validation system.
Don't change this file in any respect.
-==> description-env-start
-==> use instance: list-1
==> @endpe=false on input line ...
Package tagpdf Info: The rule between parent 'Document'
(tagpdf) and child 'Part (from tpara)' is '1 (0..n)'
-Package tagpdf Info: The rule between parent 'Part (inherited from Document)'
-(tagpdf) and child 'L (from description)' is '1 (0..n)'
-==> use instance: description
-==> template:list:std
-==> template:list:std end
-Package tagpdf Info: The rule between parent 'L (from description)'
-(tagpdf) and child 'LI' is '1 (0..n)'
-==> template:item:std
-==> item with optional
-Package tagpdf Info: The rule between parent 'LI'
-(tagpdf) and child 'Lbl' is '1 (0..n)'
-Package tagpdf Info: The rule between parent 'Lbl'
-(tagpdf) and child 'MC' is '1 (0..n)'
-Package tagpdf Info: closing structure 5 tagged /Lbl
-Package tagpdf Info: The rule between parent 'LI'
-(tagpdf) and child 'LBody' is '1 (0..n)'
-==> item everypar on input line ...
-Package tagpdf Info: The rule between parent 'LBody'
-(tagpdf) and child 'Part (from tpara)' is '1 (0..n)'
==> increment P on input line ...
-Package tagpdf Info: The rule between parent 'Part (inherited from LBody)'
-(tagpdf) and child 'P' is '1 (0..n)'
-Package tagpdf Info: The rule between parent 'P'
-(tagpdf) and child 'MC' is '1 (0..n)'
-==> increment /P on input line ...
-Package tagpdf Info: closing structure 8 tagged /P
-Package tagpdf Info: closing structure 7 tagged /tpara
-==> @endpe=false on input line ...
-Package tagpdf Info: The rule between parent 'LBody'
-(tagpdf) and child 'Part (from tpara)' is '1 (0..n)'
-==> increment P on input line ...
-Package tagpdf Info: The rule between parent 'Part (inherited from LBody)'
+Package tagpdf Info: The rule between parent 'Part (inherited from Document)'
(tagpdf) and child 'P' is '1 (0..n)'
Package tagpdf Info: The rule between parent 'P'
(tagpdf) and child 'MC' is '1 (0..n)'
==> increment /P on input line ...
-Package tagpdf Info: closing structure 10 tagged /P
-Package tagpdf Info: closing structure 9 tagged /tpara
+Package tagpdf Info: closing structure 3 tagged /P
+Package tagpdf Info: closing structure 2 tagged /tpara
==> itemize-env-start
-==> use instance: list-2
+==> use instance: list-1
==> @endpe=false on input line ...
-Package tagpdf Info: The rule between parent 'LBody'
+Package tagpdf Info: The rule between parent 'Document'
(tagpdf) and child 'Part (from tpara)' is '1 (0..n)'
-Package tagpdf Info: The rule between parent 'Part (inherited from LBody)'
+Package tagpdf Info: The rule between parent 'Part (inherited from Document)'
(tagpdf) and child 'L (from itemize)' is '1 (0..n)'
==> use instance: itemize-1
==> template:list:std
@@ -60,7 +28,7 @@ Package tagpdf Info: The rule between parent 'LI'
(tagpdf) and child 'Lbl' is '1 (0..n)'
Package tagpdf Info: The rule between parent 'Lbl'
(tagpdf) and child 'MC' is '1 (0..n)'
-Package tagpdf Info: closing structure 14 tagged /Lbl
+Package tagpdf Info: closing structure 7 tagged /Lbl
Package tagpdf Info: The rule between parent 'LI'
(tagpdf) and child 'LBody' is '1 (0..n)'
==> item everypar on input line ...
@@ -73,56 +41,59 @@ Package tagpdf Info: The rule between parent 'P'
(tagpdf) and child 'MC' is '1 (0..n)'
==> blockenv common ending on input line ...
==> increment /P on input line ...
-Package tagpdf Info: closing structure 17 tagged /P
-Package tagpdf Info: closing structure 16 tagged /tpara
-Package tagpdf Info: closing structure 15 tagged /LBody
-Package tagpdf Info: closing structure 13 tagged /LI
-Package tagpdf Info: closing structure 12 tagged /itemize
--->B
+Package tagpdf Info: closing structure 10 tagged /P
+Package tagpdf Info: closing structure 9 tagged /tpara
+Package tagpdf Info: closing structure 8 tagged /LBody
+Package tagpdf Info: closing structure 6 tagged /LI
+Package tagpdf Info: closing structure 5 tagged /itemize
+-->A
The sequence \g__tag_struct_tag_stack_seq contains the items (without outer
braces):
> {{tpara}{Part}}
-> {{LBody}{LBody}}
-> {{LI}{LI}}
-> {{description}{L}}
-> {{tpara}{Part}}
> {{Document}{Document}}
> {{Root}{StructTreeRoot}}.
<recently read> }
-l. ... \typeout{-->B}\ShowTagging{struct-stack}
- \show\par
+l. ...\typeout{-->A}\ShowTagging{struct-stack}
+ \show\par\makeatletter\typeout{==...
> \par=macro:
->\@restorepar \clubpenalty \@clubpenalty \__kernel_displayblock_doendpe: \@endpefalse \everypar {}\par .
-l. ......out{-->B}\ShowTagging{struct-stack}\show\par
-==> flattened=false on input line ...
-==> Structure-end tpara after list on input line ...
-Package tagpdf Info: closing structure 11 tagged /tpara
--->C
+l. ......out{-->A}\ShowTagging{struct-stack}\show\par
+ \makeatletter\typeout{==>@...
+==>@endpe true
+Package tagpdf Info: closing structure 4 tagged /tpara
+==> itemize-env-start
+==> use instance: list-1
+==> @endpe=false on input line ...
+Package tagpdf Info: The rule between parent 'Document'
+(tagpdf) and child 'Part (from tpara)' is '1 (0..n)'
+Package tagpdf Info: The rule between parent 'Part (inherited from Document)'
+(tagpdf) and child 'L (from itemize)' is '1 (0..n)'
+==> use instance: itemize-1
+==> template:list:std
+==> template:list:std end
+-->B
The sequence \g__tag_struct_tag_stack_seq contains the items (without outer
braces):
-> {{LBody}{LBody}}
-> {{LI}{LI}}
-> {{description}{L}}
+> {{itemize}{L}}
> {{tpara}{Part}}
> {{Document}{Document}}
> {{Root}{StructTreeRoot}}.
<recently read> }
-l. ... \typeout{-->C}\ShowTagging{struct-stack}
- \show\par
+l. ...\typeout{-->B}\ShowTagging{struct-stack}
+ \show\par\makeatletter\typeout{==...
> \par=macro:
-->\@par .
-l. ......out{-->C}\ShowTagging{struct-stack}\show\par
-Package tagpdf Info: closing structure 6 tagged /LBody
-Package tagpdf Info: closing structure 4 tagged /LI
-Package tagpdf Info: The rule between parent 'L (from description)'
+->\legacy_if:nTF {@newlist}{\int_incr:N \par at deathcycles \int_compare:nNnTF \par at deathcycles >{1000}{\@noitemerr {\para_end: }}}{{\para_end: }}.
+l. ......out{-->B}\ShowTagging{struct-stack}\show\par
+ \makeatletter\typeout{==>@...
+==>@endpe false
+Package tagpdf Info: The rule between parent 'L (from itemize)'
(tagpdf) and child 'LI' is '1 (0..n)'
==> template:item:std
-==> item with optional
Package tagpdf Info: The rule between parent 'LI'
(tagpdf) and child 'Lbl' is '1 (0..n)'
Package tagpdf Info: The rule between parent 'Lbl'
(tagpdf) and child 'MC' is '1 (0..n)'
-Package tagpdf Info: closing structure 19 tagged /Lbl
+Package tagpdf Info: closing structure 14 tagged /Lbl
Package tagpdf Info: The rule between parent 'LI'
(tagpdf) and child 'LBody' is '1 (0..n)'
==> item everypar on input line ...
@@ -135,14 +106,14 @@ Package tagpdf Info: The rule between parent 'P'
(tagpdf) and child 'MC' is '1 (0..n)'
==> blockenv common ending on input line ...
==> increment /P on input line ...
-Package tagpdf Info: closing structure 22 tagged /P
-Package tagpdf Info: closing structure 21 tagged /tpara
-Package tagpdf Info: closing structure 20 tagged /LBody
-Package tagpdf Info: closing structure 18 tagged /LI
-Package tagpdf Info: closing structure 3 tagged /description
+Package tagpdf Info: closing structure 17 tagged /P
+Package tagpdf Info: closing structure 16 tagged /tpara
+Package tagpdf Info: closing structure 15 tagged /LBody
+Package tagpdf Info: closing structure 13 tagged /LI
+Package tagpdf Info: closing structure 12 tagged /itemize
==> flattened=false on input line ...
==> Structure-end tpara after list on input line ...
-Package tagpdf Info: closing structure 2 tagged /tpara
+Package tagpdf Info: closing structure 11 tagged /tpara
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
@@ -150,5 +121,5 @@ Package tagpdf Info: -1 has been removed from the mc stack
tagpdf: INFO TAG-NOT-TAGGED: this has not been tagged, using artifact
tagpdf: INFO TAG-NOT-TAGGED: this has not been tagged, using artifact
tagpdf: INFO TAG-NOT-TAGGED: this has not been tagged, using artifact [1
-] (blocks-description-03.aux)
+] (blocks-itemize-02.aux)
Package tagpdf Info: closing structure 1 tagged /Document
diff --git a/required/latex-lab/testfiles-block-tagging/blocks-itemize-02.lvt b/required/latex-lab/testfiles-block-tagging/blocks-itemize-02.lvt
new file mode 100644
index 00000000..d9ef51a3
--- /dev/null
+++ b/required/latex-lab/testfiles-block-tagging/blocks-itemize-02.lvt
@@ -0,0 +1,33 @@
+
+\DocumentMetadata{
+ testphase=phase-II
+ ,uncompress
+ ,testphase=block-tagging,
+% ,pdfversion=2.0
+ ,debug={
+% para,
+ log=vv}
+}
+
+\input{regression-test}
+
+\documentclass{article}
+ \begin{document}
+
+\START
+
+Case of consecutive blockenvs without any intervening material
+
+\begin{itemize}
+ \item abc
+ \end{itemize}
+\typeout{-->A}\ShowTagging{struct-stack}\show\par\makeatletter\typeout{==>@endpe \if at endpe true\else false\fi}\makeatother
+\begin{itemize}
+\typeout{-->B}\ShowTagging{struct-stack}\show\par\makeatletter\typeout{==>@endpe \if at endpe true\else false\fi}\makeatother
+ \item abc
+ \end{itemize}
+
+\end{document}
+
+
+
diff --git a/required/latex-lab/testfiles-block-tagging/blocks-description-03.tlg b/required/latex-lab/testfiles-block-tagging/blocks-itemize-02.tlg
similarity index 63%
copy from required/latex-lab/testfiles-block-tagging/blocks-description-03.tlg
copy to required/latex-lab/testfiles-block-tagging/blocks-itemize-02.tlg
index d0297617..d104fe52 100644
--- a/required/latex-lab/testfiles-block-tagging/blocks-description-03.tlg
+++ b/required/latex-lab/testfiles-block-tagging/blocks-itemize-02.tlg
@@ -1,54 +1,22 @@
This is a generated file for the l3build validation system.
Don't change this file in any respect.
-==> description-env-start
-==> use instance: list-1
==> @endpe=false on input line ...
Package tagpdf Info: The rule between parent 'Document'
(tagpdf) and child 'Part (from tpara)' is '1 (0..n)'
-Package tagpdf Info: The rule between parent 'Part (inherited from Document)'
-(tagpdf) and child 'L (from description)' is '1 (0..n)'
-==> use instance: description
-==> template:list:std
-==> template:list:std end
-Package tagpdf Info: The rule between parent 'L (from description)'
-(tagpdf) and child 'LI' is '1 (0..n)'
-==> template:item:std
-==> item with optional
-Package tagpdf Info: The rule between parent 'LI'
-(tagpdf) and child 'Lbl' is '1 (0..n)'
-Package tagpdf Info: The rule between parent 'Lbl'
-(tagpdf) and child 'MC' is '1 (0..n)'
-Package tagpdf Info: closing structure 5 tagged /Lbl
-Package tagpdf Info: The rule between parent 'LI'
-(tagpdf) and child 'LBody' is '1 (0..n)'
-==> item everypar on input line ...
-Package tagpdf Info: The rule between parent 'LBody'
-(tagpdf) and child 'Part (from tpara)' is '1 (0..n)'
==> increment P on input line ...
-Package tagpdf Info: The rule between parent 'Part (inherited from LBody)'
-(tagpdf) and child 'P' is '1 (0..n)'
-Package tagpdf Info: The rule between parent 'P'
-(tagpdf) and child 'MC' is '1 (0..n)'
-==> increment /P on input line ...
-Package tagpdf Info: closing structure 8 tagged /P
-Package tagpdf Info: closing structure 7 tagged /tpara
-==> @endpe=false on input line ...
-Package tagpdf Info: The rule between parent 'LBody'
-(tagpdf) and child 'Part (from tpara)' is '1 (0..n)'
-==> increment P on input line ...
-Package tagpdf Info: The rule between parent 'Part (inherited from LBody)'
+Package tagpdf Info: The rule between parent 'Part (inherited from Document)'
(tagpdf) and child 'P' is '1 (0..n)'
Package tagpdf Info: The rule between parent 'P'
(tagpdf) and child 'MC' is '1 (0..n)'
==> increment /P on input line ...
-Package tagpdf Info: closing structure 10 tagged /P
-Package tagpdf Info: closing structure 9 tagged /tpara
+Package tagpdf Info: closing structure 3 tagged /P
+Package tagpdf Info: closing structure 2 tagged /tpara
==> itemize-env-start
-==> use instance: list-2
+==> use instance: list-1
==> @endpe=false on input line ...
-Package tagpdf Info: The rule between parent 'LBody'
+Package tagpdf Info: The rule between parent 'Document'
(tagpdf) and child 'Part (from tpara)' is '1 (0..n)'
-Package tagpdf Info: The rule between parent 'Part (inherited from LBody)'
+Package tagpdf Info: The rule between parent 'Part (inherited from Document)'
(tagpdf) and child 'L (from itemize)' is '1 (0..n)'
==> use instance: itemize-1
==> template:list:std
@@ -60,7 +28,7 @@ Package tagpdf Info: The rule between parent 'LI'
(tagpdf) and child 'Lbl' is '1 (0..n)'
Package tagpdf Info: The rule between parent 'Lbl'
(tagpdf) and child 'MC' is '1 (0..n)'
-Package tagpdf Info: closing structure 14 tagged /Lbl
+Package tagpdf Info: closing structure 7 tagged /Lbl
Package tagpdf Info: The rule between parent 'LI'
(tagpdf) and child 'LBody' is '1 (0..n)'
==> item everypar on input line ...
@@ -73,56 +41,59 @@ Package tagpdf Info: The rule between parent 'P'
(tagpdf) and child 'MC' is '1 (0..n)'
==> blockenv common ending on input line ...
==> increment /P on input line ...
-Package tagpdf Info: closing structure 17 tagged /P
-Package tagpdf Info: closing structure 16 tagged /tpara
-Package tagpdf Info: closing structure 15 tagged /LBody
-Package tagpdf Info: closing structure 13 tagged /LI
-Package tagpdf Info: closing structure 12 tagged /itemize
--->B
+Package tagpdf Info: closing structure 10 tagged /P
+Package tagpdf Info: closing structure 9 tagged /tpara
+Package tagpdf Info: closing structure 8 tagged /LBody
+Package tagpdf Info: closing structure 6 tagged /LI
+Package tagpdf Info: closing structure 5 tagged /itemize
+-->A
The sequence \g__tag_struct_tag_stack_seq contains the items (without outer
braces):
> {{tpara}{Part}}
-> {{LBody}{LBody}}
-> {{LI}{LI}}
-> {{description}{L}}
-> {{tpara}{Part}}
> {{Document}{Document}}
> {{Root}{StructTreeRoot}}.
<recently read> }
-l. ... \typeout{-->B}\ShowTagging{struct-stack}
- \show\par
+l. ...\typeout{-->A}\ShowTagging{struct-stack}
+ \show\par\makeatletter\typeout{...
> \par=macro:
->\@restorepar \clubpenalty \@clubpenalty \__kernel_displayblock_doendpe: \@endpefalse \everypar {}\par .
-l. ......t{-->B}\ShowTagging{struct-stack}\show\par
-==> flattened=false on input line ...
-==> Structure-end tpara after list on input line ...
-Package tagpdf Info: closing structure 11 tagged /tpara
--->C
+l. ......t{-->A}\ShowTagging{struct-stack}\show\par
+ \makeatletter\typeout{==>@...
+==>@endpe true
+Package tagpdf Info: closing structure 4 tagged /tpara
+==> itemize-env-start
+==> use instance: list-1
+==> @endpe=false on input line ...
+Package tagpdf Info: The rule between parent 'Document'
+(tagpdf) and child 'Part (from tpara)' is '1 (0..n)'
+Package tagpdf Info: The rule between parent 'Part (inherited from Document)'
+(tagpdf) and child 'L (from itemize)' is '1 (0..n)'
+==> use instance: itemize-1
+==> template:list:std
+==> template:list:std end
+-->B
The sequence \g__tag_struct_tag_stack_seq contains the items (without outer
braces):
-> {{LBody}{LBody}}
-> {{LI}{LI}}
-> {{description}{L}}
+> {{itemize}{L}}
> {{tpara}{Part}}
> {{Document}{Document}}
> {{Root}{StructTreeRoot}}.
<recently read> }
-l. ... \typeout{-->C}\ShowTagging{struct-stack}
- \show\par
+l. ...\typeout{-->B}\ShowTagging{struct-stack}
+ \show\par\makeatletter\typeout{...
> \par=macro:
-->\@par .
-l. ......t{-->C}\ShowTagging{struct-stack}\show\par
-Package tagpdf Info: closing structure 6 tagged /LBody
-Package tagpdf Info: closing structure 4 tagged /LI
-Package tagpdf Info: The rule between parent 'L (from description)'
+->\legacy_if:nTF {@newlist}{\int_incr:N \par at deathcycles \int_compare:nNnTF \par at deathcycles >{1000}{\@noitemerr {\para_end: }}}{{\para_end: }}.
+l. ......t{-->B}\ShowTagging{struct-stack}\show\par
+ \makeatletter\typeout{==>@...
+==>@endpe false
+Package tagpdf Info: The rule between parent 'L (from itemize)'
(tagpdf) and child 'LI' is '1 (0..n)'
==> template:item:std
-==> item with optional
Package tagpdf Info: The rule between parent 'LI'
(tagpdf) and child 'Lbl' is '1 (0..n)'
Package tagpdf Info: The rule between parent 'Lbl'
(tagpdf) and child 'MC' is '1 (0..n)'
-Package tagpdf Info: closing structure 19 tagged /Lbl
+Package tagpdf Info: closing structure 14 tagged /Lbl
Package tagpdf Info: The rule between parent 'LI'
(tagpdf) and child 'LBody' is '1 (0..n)'
==> item everypar on input line ...
@@ -135,16 +106,16 @@ Package tagpdf Info: The rule between parent 'P'
(tagpdf) and child 'MC' is '1 (0..n)'
==> blockenv common ending on input line ...
==> increment /P on input line ...
-Package tagpdf Info: closing structure 22 tagged /P
-Package tagpdf Info: closing structure 21 tagged /tpara
-Package tagpdf Info: closing structure 20 tagged /LBody
-Package tagpdf Info: closing structure 18 tagged /LI
-Package tagpdf Info: closing structure 3 tagged /description
+Package tagpdf Info: closing structure 17 tagged /P
+Package tagpdf Info: closing structure 16 tagged /tpara
+Package tagpdf Info: closing structure 15 tagged /LBody
+Package tagpdf Info: closing structure 13 tagged /LI
+Package tagpdf Info: closing structure 12 tagged /itemize
==> flattened=false on input line ...
==> Structure-end tpara after list on input line ...
-Package tagpdf Info: closing structure 2 tagged /tpara
+Package tagpdf Info: closing structure 11 tagged /tpara
The sequence \g__tag_mc_main_marks_seq is empty
> .
[1
-] (blocks-description-03.aux)
+] (blocks-itemize-02.aux)
Package tagpdf Info: closing structure 1 tagged /Document
diff --git a/required/latex-lab/update-blocks-all.sh b/required/latex-lab/update-blocks-all.sh
index bd0b92fc..7c6c1549 100644
--- a/required/latex-lab/update-blocks-all.sh
+++ b/required/latex-lab/update-blocks-all.sh
@@ -12,6 +12,7 @@ l3build save -cconfig-block-tagging -epdftex,luatex \
blocks-enumerate-05 \
blocks-itemize-01 \
blocks-itemize-01b \
+ blocks-itemize-02 \
blocks-list-01 \
blocks-list-01b \
blocks-list-02 \
More information about the latex3-commits
mailing list.