[latex3-commits] [latex3/latex2e] latex-lab/uf-review-05: handle para counter, issue latex3/tagging-project#34 (36d02854)
github at latex-project.org
github at latex-project.org
Sat Nov 18 00:41:14 CET 2023
Repository : https://github.com/latex3/latex2e
On branch : latex-lab/uf-review-05
Link : https://github.com/latex3/latex2e/commit/36d02854d86b53542e8f663c7eea2c0ccb4b6075
>---------------------------------------------------------------
commit 36d02854d86b53542e8f663c7eea2c0ccb4b6075
Author: Ulrike Fischer <fischer at troubleshooting-tex.de>
Date: Sat Nov 18 00:41:14 2023 +0100
handle para counter, issue latex3/tagging-project#34
>---------------------------------------------------------------
36d02854d86b53542e8f663c7eea2c0ccb4b6075
required/latex-lab/latex-lab-block.dtx | 32 ++++---
required/latex-lab/latex-lab-sec.dtx | 5 +-
required/latex-lab/testfiles/tagging-gh34.lvt | 21 +++++
required/latex-lab/testfiles/tagging-gh34.tlg | 119 ++++++++++++++++++++++++++
4 files changed, 158 insertions(+), 19 deletions(-)
diff --git a/required/latex-lab/latex-lab-block.dtx b/required/latex-lab/latex-lab-block.dtx
index 8ed73325..5279c121 100644
--- a/required/latex-lab/latex-lab-block.dtx
+++ b/required/latex-lab/latex-lab-block.dtx
@@ -9,8 +9,8 @@
%
% https://www.latex-project.org/lppl.txt
%
-\def\ltlabblockdate{2023-09-01}
-\def\ltlabblockversion{0.8h}
+\def\ltlabblockdate{2023-11-18}
+\def\ltlabblockversion{0.8i}
%<*driver>
\documentclass{l3doc}
\usepackage{amstext}
@@ -3390,8 +3390,6 @@
% In this section we provide code to the various kernel hooks to support
% the tagging of the different displayblock environments.
%
-%
-%
% All of the following definitions should only be made if tagging
% is active!
% \begin{macrocode}
@@ -3424,7 +3422,7 @@
{
\int_compare:nNnT \l_@@_flattened_level_int < 2
{
- \int_gincr:N \g__tag_para_main_begin_int
+ \__tag_gincr_para_main_begin_int:
\tagstructbegin{tag=\l__tag_para_main_tag_tl}
}
}
@@ -3445,7 +3443,7 @@
\cs_set:Npn \@@_beginpar_hmode:N #1
{
\tag_mc_end:
- \int_gincr:N \g__tag_para_end_int
+ \__tag_gincr_para_end_int:
\@@_debug_typeout:n{increment~ /P \on at line }
\bool_if:NT \l__tag_para_show_bool
{ \tag_mc_begin:n{artifact}
@@ -3492,7 +3490,7 @@
{
\@@_debug_typeout:n{Structure-end~
\l__tag_para_main_tag_tl\space after~ displayblock \on at line }
- \int_gincr:N \g__tag_para_main_end_int
+ \__tag_gincr_para_main_end_int:
\tag_struct_end: %text-unit
}
}
@@ -3551,11 +3549,11 @@
{
\bool_if:NF \l__tag_para_flattened_bool
{
- \int_gincr:N \g__tag_para_main_begin_int
+ \__tag_gincr_para_main_begin_int:
\tag_struct_begin:n{tag=\l__tag_para_main_tag_tl}
}
}
- \int_gincr:N \g__tag_para_begin_int
+ \__tag_gincr_para_begin_int:
\@@_debug_typeout:n{increment~ P \on at line }
\tag_struct_begin:n
{
@@ -3572,10 +3570,10 @@
\cs_new_protected:Npn \@@_start_para_structure_unconditionally:n #1 {
\bool_if:NF \l__tag_para_flattened_bool
{
- \int_gincr:N \g__tag_para_main_begin_int
+ \__tag_gincr_para_main_begin_int:
\tag_struct_begin:n{tag=\l__tag_para_main_tag_tl}
}
- \int_gincr:N \g__tag_para_begin_int
+ \__tag_gincr_para_begin_int:
\@@_debug_typeout:n{increment~ P \on at line }
\tag_struct_begin:n
{
@@ -3594,14 +3592,14 @@
{
\bool_if:NT \l__tag_para_bool
{
- \int_gincr:N \g__tag_para_end_int
+ \__tag_gincr_para_end_int:
\@@_debug_typeout:n{increment~ /P \on at line }
\tag_mc_end:
\__tag_check_para_end_show:nn {red}{}
\tag_struct_end:
\bool_if:NF \l__tag_para_flattened_bool
{
- \int_gincr:N \g__tag_para_main_end_int
+ \__tag_gincr_para_main_end_int:
\tag_struct_end:
}
}
@@ -3680,7 +3678,7 @@
{
\bool_if:NF \l__tag_para_flattened_bool
{
- \int_gincr:N \g__tag_para_main_end_int
+ \__tag_gincr_para_main_end_int:
\tag_struct_end:
}
\@endpefalse
@@ -3722,7 +3720,7 @@
\@@_debug_typeout:n{block-end \on at line}
\legacy_if:nT { @endpe }
{
- \int_gincr:N \g__tag_para_main_end_int
+ \__tag_gincr_para_main_end_int:
\@@_debug_typeout:n{close~ /text-unit \on at line}
\tagstructend
}
@@ -3835,7 +3833,7 @@
\cs_set:Npn \@@_list_item_end: {
\legacy_if:nT { @endpe }
{
- \int_gincr:N \g__tag_para_main_end_int
+ \__tag_gincr_para_main_end_int:
\tagstructend % text-unit
% \@@_debug_typeout:n{Structure-end~ P~ at~ item-end \on at line }
}
@@ -3854,7 +3852,7 @@
\cs_set:Npn \@@_list_end: {
\legacy_if:nT { @endpe }
{
- \int_gincr:N \g__tag_para_main_end_int
+ \__tag_gincr_para_main_end_int:
\tagstructend % text-unit
\@@_debug_typeout:n{Structure-end~ P~ at~ list-end \on at line }
}
diff --git a/required/latex-lab/latex-lab-sec.dtx b/required/latex-lab/latex-lab-sec.dtx
index 77fa2039..3522cca5 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{2023-10-16}
-\def\ltlabsecversion{0.84b}
+\def\ltlabsecdate{2023-11-18}
+\def\ltlabsecversion{0.84c}
%<*driver>
\documentclass{l3doc}
\EnableCrossrefs
@@ -670,6 +670,7 @@
\cs_new_protected:Npn \@kernel at tag@hangfrom #1
{
\tagstructbegin{tag=\l__tag_para_tag_tl}
+ \cs_if_exist_use:N \__tag_gincr_para_begin_int:
\tagstructbegin{tag=Lbl}
\setbox\@tempboxa
\hbox
diff --git a/required/latex-lab/testfiles/tagging-gh34.lvt b/required/latex-lab/testfiles/tagging-gh34.lvt
new file mode 100644
index 00000000..97542961
--- /dev/null
+++ b/required/latex-lab/testfiles/tagging-gh34.lvt
@@ -0,0 +1,21 @@
+\ExplSyntaxOn
+\debug_on:n { check-declarations , deprecation }
+\ExplSyntaxOff
+\DocumentMetadata{testphase={phase-III}}
+\input{regression-test}
+\documentclass{article}
+
+\begin{document}
+\START \showoutput
+ abc
+
+\tagstop
+
+\begin{itemize}
+\item abc
+\end{itemize}
+
+\tagstart
+
+abc
+\end{document}
diff --git a/required/latex-lab/testfiles/tagging-gh34.tlg b/required/latex-lab/testfiles/tagging-gh34.tlg
new file mode 100644
index 00000000..0f63ddbd
--- /dev/null
+++ b/required/latex-lab/testfiles/tagging-gh34.tlg
@@ -0,0 +1,119 @@
+This is a generated file for the l3build validation system.
+Don't change this file in any respect.
+Completed box being shipped out [1]
+\vbox(633.0+0.0)x407.0
+.\hbox(0.0+0.0)x0.0
+..\kern -72.26999
+..\vbox(0.0+0.0)x0.0, glue set 72.26999fil
+...\kern -72.26999
+...\hbox(0.0+0.0)x0.0
+....\glue 0.0 plus 1.0fil minus 1.0fil
+...\glue 0.0 plus 1.0fil minus 1.0fil
+.\glue 16.0
+.\vbox(617.0+0.0)x345.0, shifted 62.0
+..\vbox(12.0+0.0)x345.0, glue set 12.0fil
+...\glue 0.0 plus 1.0fil
+...\pdfrunninglinkoff
+...\pdfliteral page{/Artifact BMC}
+...\marks4{b-,3,-1,}
+...\marks4{b+,3,-1,}
+...\hbox(0.0+0.0)x345.0
+....\hbox(0.0+0.0)x345.0
+...\pdfliteral page{EMC}
+...\marks4{e-,3,1,}
+...\marks4{e+,3,1,}
+...\pdfrunninglinkon
+..\glue 25.0
+..\glue(\lineskip) 0.0
+..\vbox(550.0+0.0)x345.0, glue set 495.94702fil
+...\hbox(0.0+0.0)x0.0
+...\pdfinterwordspaceon
+...\write-{}
+...\glue(\topskip) 3.05556
+...\hbox(6.94444+0.0)x345.0, glue set 314.72218fil
+....\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
+....\OT1/cmr/m/n/10 a
+....\OT1/cmr/m/n/10 b
+....\kern0.27779
+....\OT1/cmr/m/n/10 c
+....\pdfliteral page{EMC}
+....\penalty 10000
+....\glue(\parfillskip) 0.0 plus 1.0fil
+....\glue(\rightskip) 0.0
+...\marks4{b-,1,5,text,,,}
+...\marks4{b+,1,5,text,,,}
+...\marks4{e-,1,5,}
+...\marks4{e+,1,5,}
+...\penalty -51
+...\glue 10.0 plus 4.0 minus 5.0
+...\glue -10.0 plus -4.0 minus -5.0
+...\glue 6.0 plus 2.0 minus 4.0
+...\glue(\parskip) 4.0 plus 2.0 minus 1.0
+...\glue(\parskip) 0.0
+...\glue(\baselineskip) 5.05556
+...\hbox(6.94444+0.0)x319.99997, glue set 304.72215fil, shifted 25.00003
+....\hbox(4.37393+0.0)x0.0
+.....\glue -25.00003
+.....\hbox(4.37393+0.0)x20.00003, glue set 15.00125fil
+......\glue 0.0 plus 1.0fil minus 1.0fil
+......\hbox(4.37393+0.0)x4.99878
+.......\hbox(0.0+0.0)x0.0
+.......\TS1/cmr/m/n/10 ^^88
+.....\glue 5.0
+....\penalty 0
+....\OT1/cmr/m/n/10 a
+....\OT1/cmr/m/n/10 b
+....\kern0.27779
+....\OT1/cmr/m/n/10 c
+....\penalty 10000
+....\glue(\parfillskip) 0.0 plus 1.0fil
+....\glue(\rightskip) 0.0
+...\penalty -51
+...\glue 10.0 plus 3.0 minus 5.0
+...\glue(\parskip) 0.0 plus 1.0
+...\glue(\parskip) 0.0
+...\glue(\baselineskip) 5.05556
+...\hbox(6.94444+0.0)x345.0, glue set 314.72218fil
+....\write1{\new at label@record{mcid-2}{{tagabspage}{\__property_code_tagabspage: }{tagmcabs}{2}{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
+....\OT1/cmr/m/n/10 a
+....\OT1/cmr/m/n/10 b
+....\kern0.27779
+....\OT1/cmr/m/n/10 c
+....\pdfliteral page{EMC}
+....\penalty 10000
+....\glue(\parfillskip) 0.0 plus 1.0fil
+....\glue(\rightskip) 0.0
+...\marks4{b-,2,7,text,,,}
+...\marks4{b+,2,7,text,,,}
+...\marks4{e-,2,7,}
+...\marks4{e+,2,7,}
+...\glue 0.0 plus 1.0fil
+...\glue 0.0 plus -1.0fil
+...\kern 0.0
+...\hbox(0.0+0.0)x0.0
+...\glue 0.0 plus 1.0fil
+...\glue 0.0
+...\glue 0.0 plus 0.0001fil
+..\pdfrunninglinkoff
+..\pdfliteral page{/Artifact BMC}
+..\marks4{b-,4,-1,}
+..\marks4{b+,4,-1,}
+..\glue(\baselineskip) 23.55556
+..\hbox(6.44444+0.0)x345.0
+...\hbox(6.44444+0.0)x345.0, glue set 170.0fil
+....\glue 0.0 plus 1.0fil
+....\OT1/cmr/m/n/10 1
+....\glue 0.0 plus 1.0fil
+..\pdfliteral page{EMC}
+..\marks4{e-,4,1,}
+..\marks4{e+,4,1,}
+..\pdfrunninglinkon
+.\kern 0.0
+.\kern -633.0
+.\hbox(0.0+0.0)x0.0
+.\kern 633.0
+(tagging-gh34.aux)
More information about the latex3-commits
mailing list.