[latex3-commits] [latex3/latex2e] latexlab/tagging-9: use block code throught Documentmetadata (eb242738)
github at latex-project.org
github at latex-project.org
Mon Sep 4 13:16:45 CEST 2023
Repository : https://github.com/latex3/latex2e
On branch : latexlab/tagging-9
Link : https://github.com/latex3/latex2e/commit/eb2427383d8d2d15a25b1ff939b12719b0da6249
>---------------------------------------------------------------
commit eb2427383d8d2d15a25b1ff939b12719b0da6249
Author: Ulrike Fischer <fischer at troubleshooting-tex.de>
Date: Mon Sep 4 13:16:45 2023 +0200
use block code throught Documentmetadata
>---------------------------------------------------------------
eb2427383d8d2d15a25b1ff939b12719b0da6249
required/latex-lab/latex-lab-block.dtx | 4 ---
.../testfiles-block/blocks-000.luatex.tlg | 12 +++-----
required/latex-lab/testfiles-block/blocks-000.lvt | 10 ++++---
required/latex-lab/testfiles-block/blocks-000.tlg | 12 +++-----
.../testfiles-block/blocks-enumerate-02.lvt | 4 +--
.../testfiles-block/blocks-enumerate-05.lvt | 6 +---
.../testfiles-block/blocks-list-01.luatex.tlg | 33 ++++++++++++++++++++++
.../latex-lab/testfiles-block/blocks-list-01.lvt | 4 +--
.../latex-lab/testfiles-block/blocks-list-01.tlg | 33 ++++++++++++++++++++++
.../latex-lab/testfiles-block/blocks-list-02.lvt | 4 +--
.../testfiles-block/blocks-trivlist-00.lvt | 3 +-
required/latex-lab/testfiles-math/mtag-001.lvt | 2 +-
12 files changed, 90 insertions(+), 37 deletions(-)
diff --git a/required/latex-lab/latex-lab-block.dtx b/required/latex-lab/latex-lab-block.dtx
index 0d0929d0..a4a028db 100644
--- a/required/latex-lab/latex-lab-block.dtx
+++ b/required/latex-lab/latex-lab-block.dtx
@@ -682,10 +682,6 @@
% \begin{macrocode}
\RequirePackage{latex-lab-kernel-changes}
% \end{macrocode}
-% We ensure that the core tagging commands are defined:
-% \begin{macrocode}
-\RequirePackage{tagpdf-base}
-% \end{macrocode}
% \begin{macrocode}
\ExplSyntaxOn
% \end{macrocode}
diff --git a/required/latex-lab/testfiles-block/blocks-000.luatex.tlg b/required/latex-lab/testfiles-block/blocks-000.luatex.tlg
index b2641dae..83925a97 100644
--- a/required/latex-lab/testfiles-block/blocks-000.luatex.tlg
+++ b/required/latex-lab/testfiles-block/blocks-000.luatex.tlg
@@ -12,21 +12,17 @@ Package: xtemplate ....-..-.. L3 Experimental prototype document functions
Package: latex-lab-kernel-changes ....-..-.. v... General kernel and class changes
(glyphtounicode.tex) (glyphtounicode-cmex.tex)
\g__kernel_target_int=\count...
-) (../tagpdf-base.sty
-Package: tagpdf-base ....-..-.. v... part of tagpdf - provide base, no-op versions of the user commands
-\c at g__tag_MCID_abs_int=\count...
-\c at g__tag_struct_abs_int=\count...
)
Package xtemplate Info: Declaring object type 'blockenv' taking 1 argument(s)
(xtemplate) on line ....
Package xtemplate Info: Declaring object type 'block' taking 1 argument(s) on
-(xtemplate) line 67.
+(xtemplate) line 66.
Package xtemplate Info: Declaring object type 'para' taking 1 argument(s) on
-(xtemplate) line 68.
+(xtemplate) line 67.
Package xtemplate Info: Declaring object type 'list' taking 1 argument(s) on
-(xtemplate) line 69.
+(xtemplate) line 68.
Package xtemplate Info: Declaring object type 'item' taking 1 argument(s) on
-(xtemplate) line 70.
+(xtemplate) line 69.
\l__block_flattened_level_int=\count...
\c at maxblocklevels=\count...
\l__par_start_skip=\skip...
diff --git a/required/latex-lab/testfiles-block/blocks-000.lvt b/required/latex-lab/testfiles-block/blocks-000.lvt
index f6bf3ee8..331b7004 100644
--- a/required/latex-lab/testfiles-block/blocks-000.lvt
+++ b/required/latex-lab/testfiles-block/blocks-000.lvt
@@ -1,12 +1,14 @@
-\documentclass{article}
-
-\input{regression-test}
-
\RequirePackage[enable-debug,check-declarations]{expl3}
\ExplSyntaxOn
\debug_on:n { deprecation }
\ExplSyntaxOff
+\DocumentMetadata{}
+\documentclass{article}
+
+\input{regression-test}
+
+
\START
\usepackage{latex-lab-testphase-block}
diff --git a/required/latex-lab/testfiles-block/blocks-000.tlg b/required/latex-lab/testfiles-block/blocks-000.tlg
index 77f1065f..a9ecd1a2 100644
--- a/required/latex-lab/testfiles-block/blocks-000.tlg
+++ b/required/latex-lab/testfiles-block/blocks-000.tlg
@@ -12,21 +12,17 @@ Package: xtemplate ....-..-.. L3 Experimental prototype document functions
Package: latex-lab-kernel-changes ....-..-.. v... General kernel and class changes
(glyphtounicode-cmex.tex)
\g__kernel_target_int=\count...
-) (../tagpdf-base.sty
-Package: tagpdf-base ....-..-.. v... part of tagpdf - provide base, no-op versions of the user commands
-\c at g__tag_MCID_abs_int=\count...
-\c at g__tag_struct_abs_int=\count...
)
Package xtemplate Info: Declaring object type 'blockenv' taking 1 argument(s)
(xtemplate) on line ....
Package xtemplate Info: Declaring object type 'block' taking 1 argument(s) on
-(xtemplate) line 67.
+(xtemplate) line 66.
Package xtemplate Info: Declaring object type 'para' taking 1 argument(s) on
-(xtemplate) line 68.
+(xtemplate) line 67.
Package xtemplate Info: Declaring object type 'list' taking 1 argument(s) on
-(xtemplate) line 69.
+(xtemplate) line 68.
Package xtemplate Info: Declaring object type 'item' taking 1 argument(s) on
-(xtemplate) line 70.
+(xtemplate) line 69.
\l__block_flattened_level_int=\count...
\c at maxblocklevels=\count...
\l__par_start_skip=\skip...
diff --git a/required/latex-lab/testfiles-block/blocks-enumerate-02.lvt b/required/latex-lab/testfiles-block/blocks-enumerate-02.lvt
index f51a47f1..e3e0e61b 100644
--- a/required/latex-lab/testfiles-block/blocks-enumerate-02.lvt
+++ b/required/latex-lab/testfiles-block/blocks-enumerate-02.lvt
@@ -1,9 +1,9 @@
-
+\DocumentMetadata{testphase=block}
\documentclass{article}
\input{regression-test}
-\usepackage{latex-lab-testphase-block}
+
\DebugBlocksOn
diff --git a/required/latex-lab/testfiles-block/blocks-enumerate-05.lvt b/required/latex-lab/testfiles-block/blocks-enumerate-05.lvt
index b5db5141..55407be7 100644
--- a/required/latex-lab/testfiles-block/blocks-enumerate-05.lvt
+++ b/required/latex-lab/testfiles-block/blocks-enumerate-05.lvt
@@ -1,12 +1,8 @@
-
+\DocumentMetadata{testphase=block}
\documentclass{article}
\input{regression-test}
-\usepackage{xtemplate}
-
-
-\usepackage{latex-lab-testphase-block}
\DebugBlocksOn
diff --git a/required/latex-lab/testfiles-block/blocks-list-01.luatex.tlg b/required/latex-lab/testfiles-block/blocks-list-01.luatex.tlg
index 41a6b3db..5e451a96 100644
--- a/required/latex-lab/testfiles-block/blocks-list-01.luatex.tlg
+++ b/required/latex-lab/testfiles-block/blocks-list-01.luatex.tlg
@@ -1,4 +1,37 @@
This is a generated file for the l3build validation system.
Don't change this file in any respect.
+==> @endpe=false on input line ...
+==> increment P on input line ...
+==> increment /P on input line ...
+==> @endpe=false on input line ...
+==> increment P on input line ...
+==> increment /P on input line ...
+==> @endpe=false on input line ...
+==> increment P on input line ...
+==> list-env-start
+==> use instance: list-1
+==> increment /P on input line ...
+==> use instance: legacy
+==> template:list:std
+==> template:list:std end
+==> template:item:std
+==> item everypar on input line ...
+==> increment P on input line ...
+==> increment /P on input line ...
+==> @endpe=false on input line ...
+==> increment P on input line ...
+==> item everypar on input line ...
+==> increment /P on input line ...
+==> @endpe=false on input line ...
+==> increment P on input line ...
+==> item everypar on input line ...
+==> increment /P on input line ...
+==> @endpe=false on input line ...
+==> increment P on input line ...
+==> blockenv common ending on input line ...
+==> increment /P on input line ...
+==> @endpe=true on input line ...
+==> increment P on input line ...
+==> increment /P on input line ...
[1
] (blocks-list-01.aux)
diff --git a/required/latex-lab/testfiles-block/blocks-list-01.lvt b/required/latex-lab/testfiles-block/blocks-list-01.lvt
index 14c120c2..bfe4a470 100644
--- a/required/latex-lab/testfiles-block/blocks-list-01.lvt
+++ b/required/latex-lab/testfiles-block/blocks-list-01.lvt
@@ -1,6 +1,6 @@
\DocumentMetadata{
-% testphase=phase-II,uncompress,
+ testphase=phase-III
% debug={para,log=vv}
}
@@ -11,7 +11,7 @@
\input{regression-test}
-%\usepackage{latex-lab-testphase-block}
+
\usepackage{kantlipsum}
%\showoutput
diff --git a/required/latex-lab/testfiles-block/blocks-list-01.tlg b/required/latex-lab/testfiles-block/blocks-list-01.tlg
index 41a6b3db..5e451a96 100644
--- a/required/latex-lab/testfiles-block/blocks-list-01.tlg
+++ b/required/latex-lab/testfiles-block/blocks-list-01.tlg
@@ -1,4 +1,37 @@
This is a generated file for the l3build validation system.
Don't change this file in any respect.
+==> @endpe=false on input line ...
+==> increment P on input line ...
+==> increment /P on input line ...
+==> @endpe=false on input line ...
+==> increment P on input line ...
+==> increment /P on input line ...
+==> @endpe=false on input line ...
+==> increment P on input line ...
+==> list-env-start
+==> use instance: list-1
+==> increment /P on input line ...
+==> use instance: legacy
+==> template:list:std
+==> template:list:std end
+==> template:item:std
+==> item everypar on input line ...
+==> increment P on input line ...
+==> increment /P on input line ...
+==> @endpe=false on input line ...
+==> increment P on input line ...
+==> item everypar on input line ...
+==> increment /P on input line ...
+==> @endpe=false on input line ...
+==> increment P on input line ...
+==> item everypar on input line ...
+==> increment /P on input line ...
+==> @endpe=false on input line ...
+==> increment P on input line ...
+==> blockenv common ending on input line ...
+==> increment /P on input line ...
+==> @endpe=true on input line ...
+==> increment P on input line ...
+==> increment /P on input line ...
[1
] (blocks-list-01.aux)
diff --git a/required/latex-lab/testfiles-block/blocks-list-02.lvt b/required/latex-lab/testfiles-block/blocks-list-02.lvt
index 9f316a06..c75fb7ba 100644
--- a/required/latex-lab/testfiles-block/blocks-list-02.lvt
+++ b/required/latex-lab/testfiles-block/blocks-list-02.lvt
@@ -1,6 +1,6 @@
\DocumentMetadata{
-% testphase=phase-II,uncompress,
+ testphase=block
% debug={para,log=vv}
}
@@ -9,7 +9,7 @@
\input{regression-test}
-\usepackage{latex-lab-testphase-block}
+
\DebugBlocksOn
\usepackage{kantlipsum}
diff --git a/required/latex-lab/testfiles-block/blocks-trivlist-00.lvt b/required/latex-lab/testfiles-block/blocks-trivlist-00.lvt
index fcba66e9..e51d1999 100644
--- a/required/latex-lab/testfiles-block/blocks-trivlist-00.lvt
+++ b/required/latex-lab/testfiles-block/blocks-trivlist-00.lvt
@@ -1,6 +1,7 @@
\DocumentMetadata{uncompress,
% testphase=phase-II,
+ testphase=block,
debug={ para, log=vv}
}
@@ -11,7 +12,7 @@
\input{regression-test}
-\usepackage{latex-lab-testphase-block}
+
\DebugBlocksOn
diff --git a/required/latex-lab/testfiles-math/mtag-001.lvt b/required/latex-lab/testfiles-math/mtag-001.lvt
index 0bd07171..4c1cc7f9 100644
--- a/required/latex-lab/testfiles-math/mtag-001.lvt
+++ b/required/latex-lab/testfiles-math/mtag-001.lvt
@@ -26,7 +26,7 @@
%\usepackage{hyperref}
-%\usepackage{latex-lab-testphase-block}
+
\input{regression-test}
More information about the latex3-commits
mailing list.