[latex3-commits] [git/LaTeX3-latex3-latex2e] ltpara: add paragraph tagging hooks (bce8da63)
Frank Mittelbach
frank.mittelbach at latex-project.org
Mon Feb 1 20:55:35 CET 2021
Repository : https://github.com/latex3/latex2e
On branch : ltpara
Link : https://github.com/latex3/latex2e/commit/bce8da63f98a496e9b59823b18b5f19e23d91a18
>---------------------------------------------------------------
commit bce8da63f98a496e9b59823b18b5f19e23d91a18
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date: Mon Feb 1 20:55:35 2021 +0100
add paragraph tagging hooks
>---------------------------------------------------------------
bce8da63f98a496e9b59823b18b5f19e23d91a18
base/build.lua | 1 +
base/ltfinal.dtx | 1 +
base/ltpara.ltx | 106 ++++++++++++++++++++++++++++++
base/testfiles-lthooks/lthooks-000.tlg | 2 +
base/testfiles-lthooks/lthooks-001.tlg | 6 ++
base/testfiles-lthooks/lthooks-002.tlg | 6 ++
base/testfiles-lthooks/lthooks-003.tlg | 4 ++
base/testfiles-lthooks/lthooks-004.tlg | 4 ++
base/testfiles-lthooks/lthooks-005.tlg | 4 ++
base/testfiles-lthooks/lthooks-006.tlg | 4 ++
base/testfiles-lthooks/lthooks-007.tlg | 6 ++
base/testfiles-lthooks/lthooks-008.tlg | 6 +-
base/testfiles-lthooks/lthooks-009.tlg | 2 +
base/testfiles-lthooks/lthooks-011.tlg | 8 +++
base/testfiles-lthooks/lthooks-013.tlg | 2 +
base/testfiles-lthooks/lthooks-021.tlg | 2 +
base/testfiles-lthooks/lthooks-legacy.tlg | 2 +
base/testfiles-lthooks2/lthooks2-002.tlg | 2 +
base/testfiles-lthooks2/lthooks2-005.tlg | 4 ++
base/testfiles/tlb-ealloc-001.luatex.tlg | 4 +-
base/testfiles/tlb-ealloc-001.tlg | 4 +-
base/testfiles/tlb0406.luatex.tlg | 2 +-
base/testfiles/tlb0406.tlg | 2 +-
base/testfiles/tlb0942.luatex.tlg | 2 +-
base/testfiles/tlb0942.tlg | 2 +-
base/testfiles/tlb1903.xetex.tlg | 7 +-
base/testfiles/tlb2558.luatex.tlg | 2 +-
base/testfiles/tlb2558.tlg | 2 +-
base/testfiles/tlb2558.xetex.tlg | 2 +-
base/testfiles/vlatex02.luatex.tlg | 1 +
base/testfiles/vlatex02.lvt | 3 +-
base/testfiles/vlatex02.tlg | 1 +
base/testfiles/vtl2e02.luatex.tlg | 1 +
base/testfiles/vtl2e02.lvt | 3 +-
base/testfiles/vtl2e02.tlg | 1 +
35 files changed, 191 insertions(+), 20 deletions(-)
diff --git a/base/build.lua b/base/build.lua
index cde31b50..c53b77c8 100644
--- a/base/build.lua
+++ b/base/build.lua
@@ -52,6 +52,7 @@ sourcefiles =
"sample2e.tex",
"small2e.tex",
"testpage.tex",
+ "ltpara.ltx", -- temp
"source2edoc.cls", -- temp
"*-????-??-??.sty"
}
diff --git a/base/ltfinal.dtx b/base/ltfinal.dtx
index dd68e1de..b4037baf 100644
--- a/base/ltfinal.dtx
+++ b/base/ltfinal.dtx
@@ -1148,6 +1148,7 @@
% {Load first aid file if existing}
% \begin{macrocode}
\@input{latex2e-first-aid-for-external-files.ltx}
+\@input{ltpara.ltx}
% \end{macrocode}
%
%
diff --git a/base/ltpara.ltx b/base/ltpara.ltx
new file mode 100644
index 00000000..33d48800
--- /dev/null
+++ b/base/ltpara.ltx
@@ -0,0 +1,106 @@
+%%
+%% This is file `ltpara.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% ltpara.dtx (with options: `package')
+%%
+%% This is a generated file.
+%%
+%% Copyright 2020-2021 Frank Mittelbach
+%%
+%% This file was generated from file(s) of the LaTeX `ltpara Bundle'.
+%% --------------------------------------------------------------------------
+%%
+%% It may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+%%
+%% This file may only be distributed together with a copy of the LaTeX
+%% `ltpara Bundle'. You may however distribute the `ltpara Bundle'
+%% without such generated files.
+%%
+%% The newest sources can be found below
+%%
+%% https://github.com/FrankMittelbach/fmitex/
+%%
+%% where one can also log issues in case there are any.
+%%
+%%
+%% File: ltpara.dtx (C) Copyright 2020-2021 Frank Mittelbach
+
+\ExplSyntaxOn
+
+\hook_new_pair:nn{para/begin}{para/end}
+\let \@kernel at before@para at begin \@empty
+\let \@kernel at after@para at end \@empty
+\tex_everypar:D {
+ \box_set_to_last:N \l_para_indent_box
+ \cs_set_eq:NN \__para_handle_indent: \__para_add_indent_box:
+ \@kernel at before@para at begin
+ \hook_use:n {para/begin}
+ \mode_if_horizontal:F { \ERROR }
+ \__para_handle_indent:
+ \the \everypar
+}
+\newtoks \everypar
+\box_new:N \l_para_indent_box
+
+\cs_new:Npn \__para_add_indent_box: {
+ \box_use_drop:N \l_para_indent_box
+}
+\cs_new_eq:NN \__para_handle_indent: \__para_add_indent_box:
+\cs_new:Npn \para_indent_discard: {
+ \cs_set_eq:NN \__para_handle_indent: \prg_do_nothing:
+}
+\cs_set_eq:NN \IndentationBox \l_para_indent_box
+\cs_set_eq:NN \DiscardIndentationBox \para_indent_discard:
+\cs_new_protected:Npn \__para_end: {
+ \if_mode_horizontal:
+ \if_mode_inner: \else:
+ \tex_unskip:D
+ \hook_use:n{para/end}
+ \@kernel at after@para at end
+ \mode_if_horizontal:F { \ERROR }
+ \ifnum\lastnodetype>0 \tex_hskip:D \c_zero_dim \fi
+ \fi: \fi:
+ \tex_par:D
+}
+\cs_set_eq:NN \par \__para_end:
+\cs_set_eq:NN \@@par \__para_end:
+\cs_set_eq:NN \endgraf \__para_end:
+\ExplSyntaxOff
+
+% we have to redo that one
+\everypar{\@nodocument} %% To get an error if text appears before the
+
+\long\def \@savemarbox #1#2{%
+ \global\setbox #1%
+ \color at vbox
+ \vtop{%
+ \hsize\marginparwidth
+ \@parboxrestore
+ \@marginparreset
+ #2\par % <-- needed
+ \@minipagefalse
+ \outer at nobreak
+ }%
+ \color at endbox
+}
+
+
+%\let\color at begingroup\begingroup
+%\def\color at endgroup{\endgraf\endgroup}
+%\def\color at setgroup{\color at begingroup} % \def\color at setgroup{\color at begingroup\set at color}
+%\def\color at hbox{\hbox\bgroup\color at begingroup}
+%\def\color at vbox{\vbox\bgroup\color at begingroup}
+%\def\color at endbox{\color at endgroup\egroup}
+
+\endinput
+%%
+%% End of file `ltpara.sty'.
diff --git a/base/testfiles-lthooks/lthooks-000.tlg b/base/testfiles-lthooks/lthooks-000.tlg
index 5e9d23f9..15344a3b 100644
--- a/base/testfiles-lthooks/lthooks-000.tlg
+++ b/base/testfiles-lthooks/lthooks-000.tlg
@@ -67,6 +67,8 @@ Code labels for sorting:
Data structure for label rules:
firstaid = 0 ->
Handled code for firstaid
+Update code for hook 'para/begin' on input line ...:
+Update code for hook 'para/end' on input line ...:
All initialized (non-empty) hooks:
enddocument/info -> \@dofilelist \@enddocument at kernel@warnings \__hook_toplevel enddocument/info \__hook_next enddocument/info
shipout/firstpage -> \__kernel_backend_literal:n {header=l3backend-dvips.pro}\__hook_toplevel shipout/firstpage \__hook_next shipout/firstpage
diff --git a/base/testfiles-lthooks/lthooks-001.tlg b/base/testfiles-lthooks/lthooks-001.tlg
index 824cb965..b33d8395 100644
--- a/base/testfiles-lthooks/lthooks-001.tlg
+++ b/base/testfiles-lthooks/lthooks-001.tlg
@@ -73,6 +73,8 @@ Code labels for sorting:
Data structure for label rules:
firstaid = 0 ->
Handled code for firstaid
+Update code for hook 'para/begin' on input line ...:
+Update code for hook 'para/end' on input line ...:
Update code for hook 'xxx' on input line ...:
Code labels for sorting:
label1 and label2
@@ -123,6 +125,8 @@ The sequence \g__hook_all_seq contains the items (without outer braces):
> {file/after/pgfpages.sty}
> {file/after/pgfmorepages.sty}
> {file/after/CJK.sty}
+> {para/begin}
+> {para/end}
> {xxx}.
Update code for hook 'begindocument' on input line ...:
Update code for hook 'begindocument/before' on input line ...:
@@ -191,6 +195,8 @@ Code labels for sorting:
Data structure for label rules:
firstaid = 0 ->
Handled code for firstaid
+Update code for hook 'para/begin' on input line ...:
+Update code for hook 'para/end' on input line ...:
Update code for hook 'xxx' on input line ...:
Code labels for sorting:
label1
diff --git a/base/testfiles-lthooks/lthooks-002.tlg b/base/testfiles-lthooks/lthooks-002.tlg
index 68b52410..3378106a 100644
--- a/base/testfiles-lthooks/lthooks-002.tlg
+++ b/base/testfiles-lthooks/lthooks-002.tlg
@@ -73,6 +73,8 @@ Code labels for sorting:
Data structure for label rules:
firstaid = 0 ->
Handled code for firstaid
+Update code for hook 'para/begin' on input line ...:
+Update code for hook 'para/end' on input line ...:
Update code for hook 'xxx' on input line ...:
Code labels for sorting:
label1 and label2
@@ -125,6 +127,8 @@ The sequence \g__hook_all_seq contains the items (without outer braces):
> {file/after/pgfpages.sty}
> {file/after/pgfmorepages.sty}
> {file/after/CJK.sty}
+> {para/begin}
+> {para/end}
> {xxx}.
Update code for hook 'begindocument' on input line ...:
Update code for hook 'begindocument/before' on input line ...:
@@ -193,6 +197,8 @@ Code labels for sorting:
Data structure for label rules:
firstaid = 0 ->
Handled code for firstaid
+Update code for hook 'para/begin' on input line ...:
+Update code for hook 'para/end' on input line ...:
Update code for hook 'xxx' on input line ...:
Code labels for sorting:
label1
diff --git a/base/testfiles-lthooks/lthooks-003.tlg b/base/testfiles-lthooks/lthooks-003.tlg
index 9a49b641..829f782d 100644
--- a/base/testfiles-lthooks/lthooks-003.tlg
+++ b/base/testfiles-lthooks/lthooks-003.tlg
@@ -50,6 +50,8 @@ The sequence \g__hook_all_seq contains the items (without outer braces):
> {file/after/pgfpages.sty}
> {file/after/pgfmorepages.sty}
> {file/after/CJK.sty}
+> {para/begin}
+> {para/end}
> {xxx}.
The hook xxx contains the rules:
> {label3|label1} => {>}
@@ -129,6 +131,8 @@ Code labels for sorting:
Data structure for label rules:
firstaid = 0 ->
Handled code for firstaid
+Update code for hook 'para/begin' on input line ...:
+Update code for hook 'para/end' on input line ...:
Update code for hook 'xxx' on input line ...:
normal rule label3|label1: > found
normal rule label6|label4: > found
diff --git a/base/testfiles-lthooks/lthooks-004.tlg b/base/testfiles-lthooks/lthooks-004.tlg
index 952f4bbf..42789336 100644
--- a/base/testfiles-lthooks/lthooks-004.tlg
+++ b/base/testfiles-lthooks/lthooks-004.tlg
@@ -40,6 +40,8 @@ The sequence \g__hook_all_seq contains the items (without outer braces):
> {file/after/pgfpages.sty}
> {file/after/pgfmorepages.sty}
> {file/after/CJK.sty}
+> {para/begin}
+> {para/end}
> {xxx}.
The hook xxx contains the rules:
> {label2|label1} => {>}
@@ -113,6 +115,8 @@ Code labels for sorting:
Data structure for label rules:
firstaid = 0 ->
Handled code for firstaid
+Update code for hook 'para/begin' on input line ...:
+Update code for hook 'para/end' on input line ...:
Update code for hook 'xxx' on input line ...:
normal rule label2|label1: > found
normal rule label3|label1: < found
diff --git a/base/testfiles-lthooks/lthooks-005.tlg b/base/testfiles-lthooks/lthooks-005.tlg
index f213c66c..6223d789 100644
--- a/base/testfiles-lthooks/lthooks-005.tlg
+++ b/base/testfiles-lthooks/lthooks-005.tlg
@@ -57,6 +57,8 @@ The sequence \g__hook_all_seq contains the items (without outer braces):
> {file/after/pgfpages.sty}
> {file/after/pgfmorepages.sty}
> {file/after/CJK.sty}
+> {para/begin}
+> {para/end}
> {xxx}.
The hook xxx contains the rules:
> {label3|label1} => {>}
@@ -136,6 +138,8 @@ Code labels for sorting:
Data structure for label rules:
firstaid = 0 ->
Handled code for firstaid
+Update code for hook 'para/begin' on input line ...:
+Update code for hook 'para/end' on input line ...:
Update code for hook 'xxx' on input line ...:
normal rule label3|label1: > found
normal rule label6|label4: > found
diff --git a/base/testfiles-lthooks/lthooks-006.tlg b/base/testfiles-lthooks/lthooks-006.tlg
index 5ac0fc3f..ed95de13 100644
--- a/base/testfiles-lthooks/lthooks-006.tlg
+++ b/base/testfiles-lthooks/lthooks-006.tlg
@@ -38,6 +38,8 @@ The sequence \g__hook_all_seq contains the items (without outer braces):
> {file/after/pgfpages.sty}
> {file/after/pgfmorepages.sty}
> {file/after/CJK.sty}
+> {para/begin}
+> {para/end}
> {xxx}.
The hook xxx contains the rules:
> {label2|label1} => {xW}
@@ -109,6 +111,8 @@ Code labels for sorting:
Data structure for label rules:
firstaid = 0 ->
Handled code for firstaid
+Update code for hook 'para/begin' on input line ...:
+Update code for hook 'para/end' on input line ...:
Update code for hook 'xxx' on input line ...:
normal rule label2|label1: xW found
Package hooks Warning: Labels `label2' and `label1' are incompatible in hook
diff --git a/base/testfiles-lthooks/lthooks-007.tlg b/base/testfiles-lthooks/lthooks-007.tlg
index 16112b22..b0e3d766 100644
--- a/base/testfiles-lthooks/lthooks-007.tlg
+++ b/base/testfiles-lthooks/lthooks-007.tlg
@@ -38,6 +38,8 @@ The sequence \g__hook_all_seq contains the items (without outer braces):
> {file/after/pgfpages.sty}
> {file/after/pgfmorepages.sty}
> {file/after/CJK.sty}
+> {para/begin}
+> {para/end}
> {xxx}.
The hook xxx contains the rules:
> {label2|label1} => {<-}
@@ -110,6 +112,8 @@ Code labels for sorting:
Data structure for label rules:
firstaid = 0 ->
Handled code for firstaid
+Update code for hook 'para/begin' on input line ...:
+Update code for hook 'para/end' on input line ...:
Update code for hook 'xxx' on input line ...:
normal rule label2|label1: <- found
---> Drop 'label2' code from \g__hook_xxx_code_prop because of 'label1'
@@ -200,6 +204,8 @@ Code labels for sorting:
Data structure for label rules:
firstaid = 0 ->
Handled code for firstaid
+Update code for hook 'para/begin' on input line ...:
+Update code for hook 'para/end' on input line ...:
Update code for hook 'xxx' on input line ...:
normal rule label2|label1: <- found
---> Drop 'label2' code from \g__hook_xxx_code_prop because of 'label1'
diff --git a/base/testfiles-lthooks/lthooks-008.tlg b/base/testfiles-lthooks/lthooks-008.tlg
index e516f3d8..4c7992e8 100644
--- a/base/testfiles-lthooks/lthooks-008.tlg
+++ b/base/testfiles-lthooks/lthooks-008.tlg
@@ -39,7 +39,9 @@ The sequence \g__hook_all_seq contains the items (without outer braces):
> {file/after/dinbrief.cls}
> {file/after/pgfpages.sty}
> {file/after/pgfmorepages.sty}
-> {file/after/CJK.sty}.
+> {file/after/CJK.sty}
+> {para/begin}
+> {para/end}.
The hook enddocument contains the rules:
Update code for hook 'begindocument' on input line ...:
Update code for hook 'begindocument/before' on input line ...:
@@ -117,6 +119,8 @@ Code labels for sorting:
Data structure for label rules:
firstaid = 0 ->
Handled code for firstaid
+Update code for hook 'para/begin' on input line ...:
+Update code for hook 'para/end' on input line ...:
All initialized (non-empty) hooks:
enddocument -> \typeout {foo}\typeout {bar}\typeout {from my package}\__hook_toplevel enddocument \__hook_next enddocument
enddocument/info -> \@dofilelist \@enddocument at kernel@warnings \__hook_toplevel enddocument/info \__hook_next enddocument/info
diff --git a/base/testfiles-lthooks/lthooks-009.tlg b/base/testfiles-lthooks/lthooks-009.tlg
index 4e746263..0ccfc3c6 100644
--- a/base/testfiles-lthooks/lthooks-009.tlg
+++ b/base/testfiles-lthooks/lthooks-009.tlg
@@ -73,6 +73,8 @@ Code labels for sorting:
Data structure for label rules:
firstaid = 0 ->
Handled code for firstaid
+Update code for hook 'para/begin' on input line ...:
+Update code for hook 'para/end' on input line ...:
All initialized (non-empty) hooks:
sffamily -> \typeout {Std sffamily code}\__hook_toplevel sffamily \__hook_next sffamily
enddocument/info -> \@dofilelist \@enddocument at kernel@warnings \__hook_toplevel enddocument/info \__hook_next enddocument/info
diff --git a/base/testfiles-lthooks/lthooks-011.tlg b/base/testfiles-lthooks/lthooks-011.tlg
index 1e697ed7..7b806236 100644
--- a/base/testfiles-lthooks/lthooks-011.tlg
+++ b/base/testfiles-lthooks/lthooks-011.tlg
@@ -68,6 +68,8 @@ Code labels for sorting:
Data structure for label rules:
firstaid = 0 ->
Handled code for firstaid
+Update code for hook 'para/begin' on input line ...:
+Update code for hook 'para/end' on input line ...:
Update code for hook 'xxx' on input line ...:
Code labels for sorting:
front
@@ -156,6 +158,8 @@ Code labels for sorting:
Data structure for label rules:
firstaid = 0 ->
Handled code for firstaid
+Update code for hook 'para/begin' on input line ...:
+Update code for hook 'para/end' on input line ...:
Update code for hook 'xxx' on input line ...:
Code labels for sorting:
front and rear
@@ -246,6 +250,8 @@ Code labels for sorting:
Data structure for label rules:
firstaid = 0 ->
Handled code for firstaid
+Update code for hook 'para/begin' on input line ...:
+Update code for hook 'para/end' on input line ...:
Update code for hook 'xxx' on input line ...:
Code labels for sorting:
front, rear and labels
@@ -338,6 +344,8 @@ Code labels for sorting:
Data structure for label rules:
firstaid = 0 ->
Handled code for firstaid
+Update code for hook 'para/begin' on input line ...:
+Update code for hook 'para/end' on input line ...:
Update code for hook 'xxx' on input line ...:
Code labels for sorting:
front, rear, labels and return
diff --git a/base/testfiles-lthooks/lthooks-013.tlg b/base/testfiles-lthooks/lthooks-013.tlg
index 0b7bef7e..c2150837 100644
--- a/base/testfiles-lthooks/lthooks-013.tlg
+++ b/base/testfiles-lthooks/lthooks-013.tlg
@@ -122,6 +122,8 @@ Code labels for sorting:
Data structure for label rules:
firstaid = 0 ->
Handled code for firstaid
+Update code for hook 'para/begin' on input line ...:
+Update code for hook 'para/end' on input line ...:
Update code for hook 'env/itemize/begin' on input line ...:
Code labels for sorting:
foo
diff --git a/base/testfiles-lthooks/lthooks-021.tlg b/base/testfiles-lthooks/lthooks-021.tlg
index 0464f775..afdf5e52 100644
--- a/base/testfiles-lthooks/lthooks-021.tlg
+++ b/base/testfiles-lthooks/lthooks-021.tlg
@@ -67,6 +67,8 @@ Code labels for sorting:
Data structure for label rules:
firstaid = 0 ->
Handled code for firstaid
+Update code for hook 'para/begin' on input line ...:
+Update code for hook 'para/end' on input line ...:
All initialized (non-empty) hooks:
enddocument/info -> \@dofilelist \@enddocument at kernel@warnings \__hook_toplevel enddocument/info \__hook_next enddocument/info
shipout/firstpage -> \__kernel_backend_literal:n {header=l3backend-dvips.pro}\__hook_toplevel shipout/firstpage \__hook_next shipout/firstpage
diff --git a/base/testfiles-lthooks/lthooks-legacy.tlg b/base/testfiles-lthooks/lthooks-legacy.tlg
index f22a7228..e944993a 100644
--- a/base/testfiles-lthooks/lthooks-legacy.tlg
+++ b/base/testfiles-lthooks/lthooks-legacy.tlg
@@ -92,6 +92,8 @@ Code labels for sorting:
Data structure for label rules:
firstaid = 0 ->
Handled code for firstaid
+Update code for hook 'para/begin' on input line ...:
+Update code for hook 'para/end' on input line ...:
All initialized (non-empty) hooks:
begindocument -> \typeout {legacy begindocument\on at line }\__hook_toplevel begindocument \__hook_next begindocument
rmfamily -> \typeout {legacy rmfamily\on at line }\__hook_toplevel rmfamily \__hook_next rmfamily
diff --git a/base/testfiles-lthooks2/lthooks2-002.tlg b/base/testfiles-lthooks2/lthooks2-002.tlg
index d1292666..65f06bbb 100644
--- a/base/testfiles-lthooks2/lthooks2-002.tlg
+++ b/base/testfiles-lthooks2/lthooks2-002.tlg
@@ -75,6 +75,8 @@ Code labels for sorting:
Data structure for label rules:
firstaid = 0 ->
Handled code for firstaid
+Update code for hook 'para/begin' on input line ...:
+Update code for hook 'para/end' on input line ...:
All initialized (non-empty) hooks:
enddocument/info -> \@dofilelist \@enddocument at kernel@warnings \__hook_toplevel enddocument/info \__hook_next enddocument/info
shipout/firstpage -> \__kernel_backend_literal:n {header=l3backend-dvips.pro}\__hook_toplevel shipout/firstpage \__hook_next shipout/firstpage
diff --git a/base/testfiles-lthooks2/lthooks2-005.tlg b/base/testfiles-lthooks2/lthooks2-005.tlg
index 234e0f55..7c90648e 100644
--- a/base/testfiles-lthooks2/lthooks2-005.tlg
+++ b/base/testfiles-lthooks2/lthooks2-005.tlg
@@ -68,6 +68,8 @@ Code labels for sorting:
Data structure for label rules:
firstaid = 0 ->
Handled code for firstaid
+Update code for hook 'para/begin' on input line ...:
+Update code for hook 'para/end' on input line ...:
All initialized (non-empty) hooks:
enddocument/info -> \@dofilelist \@enddocument at kernel@warnings \__hook_toplevel enddocument/info \__hook_next enddocument/info
shipout/firstpage -> \__kernel_backend_literal:n {header=l3backend-dvips.pro}\__hook_toplevel shipout/firstpage \__hook_next shipout/firstpage
@@ -144,6 +146,8 @@ Code labels for sorting:
Data structure for label rules:
firstaid = 0 ->
Handled code for firstaid
+Update code for hook 'para/begin' on input line ...:
+Update code for hook 'para/end' on input line ...:
Update code for hook 'some-hook' on input line ...:
Code labels for sorting:
my-package and other-package
diff --git a/base/testfiles/tlb-ealloc-001.luatex.tlg b/base/testfiles/tlb-ealloc-001.luatex.tlg
index e58909c2..298b88be 100644
--- a/base/testfiles/tlb-ealloc-001.luatex.tlg
+++ b/base/testfiles/tlb-ealloc-001.luatex.tlg
@@ -1,10 +1,10 @@
This is a generated file for the LaTeX2e validation system.
Don't change this file in any respect.
\z=\toks...
-> \z=\toks15.
+> \z=\toks16.
l. ...\show\z
\z=\toks...
-> \z=\toks16.
+> \z=\toks17.
l. ...\show\z
\z=\toks...
> \z=\toks255.
diff --git a/base/testfiles/tlb-ealloc-001.tlg b/base/testfiles/tlb-ealloc-001.tlg
index 338320c8..d3fb582f 100644
--- a/base/testfiles/tlb-ealloc-001.tlg
+++ b/base/testfiles/tlb-ealloc-001.tlg
@@ -1,10 +1,10 @@
This is a generated file for the LaTeX2e validation system.
Don't change this file in any respect.
\z=\toks...
-> \z=\toks15.
+> \z=\toks16.
l. ...\show\z
\z=\toks...
-> \z=\toks16.
+> \z=\toks17.
l. ...\show\z
\z=\toks...
> \z=\toks255.
diff --git a/base/testfiles/tlb0406.luatex.tlg b/base/testfiles/tlb0406.luatex.tlg
index 49f36d20..ad3fef19 100644
--- a/base/testfiles/tlb0406.luatex.tlg
+++ b/base/testfiles/tlb0406.luatex.tlg
@@ -17,5 +17,5 @@ l. ...\DeclareMathSymbol{a}{7}{operators}{`\a}
l. ...\DeclareMathSymbol{a}{7}{letters}{`\a}
> 31457377.
<to be read again>
-\par
+\tex_par:D
l. ...
diff --git a/base/testfiles/tlb0406.tlg b/base/testfiles/tlb0406.tlg
index f2a45fd0..9f32b6aa 100644
--- a/base/testfiles/tlb0406.tlg
+++ b/base/testfiles/tlb0406.tlg
@@ -17,5 +17,5 @@ l. ...\DeclareMathSymbol{a}{7}{operators}{`\a}
l. ...\DeclareMathSymbol{a}{7}{letters}{`\a}
> 29025.
<to be read again>
- \par
+ \tex_par:D
l. ...
diff --git a/base/testfiles/tlb0942.luatex.tlg b/base/testfiles/tlb0942.luatex.tlg
index b1368f29..b1e0a6be 100644
--- a/base/testfiles/tlb0942.luatex.tlg
+++ b/base/testfiles/tlb0942.luatex.tlg
@@ -737,5 +737,5 @@ l. ...\showthe
\mathcode`\z
> 31457402.
<to be read again>
-\par
+\tex_par:D
l. ...
diff --git a/base/testfiles/tlb0942.tlg b/base/testfiles/tlb0942.tlg
index 8a5765ed..3ffcf8a2 100644
--- a/base/testfiles/tlb0942.tlg
+++ b/base/testfiles/tlb0942.tlg
@@ -737,5 +737,5 @@ l. ...\showthe
\mathcode`\z
> 29050.
<to be read again>
- \par
+ \tex_par:D
l. ...
diff --git a/base/testfiles/tlb1903.xetex.tlg b/base/testfiles/tlb1903.xetex.tlg
index 613e9869..b22a9ee3 100644
--- a/base/testfiles/tlb1903.xetex.tlg
+++ b/base/testfiles/tlb1903.xetex.tlg
@@ -47,7 +47,7 @@ Completed box being shipped out [1]
...\hbox(0.0+0.0)x345.0
..\glue 25.0
..\glue(\lineskip) 0.0
-..\vbox(550.0+0.0)x345.0, glue set 316.02191fil
+..\vbox(550.0+0.0)x345.0, glue set 328.02063fil
...\write-{}
...\glue(\topskip) 0.12001
...\hbox(9.87999+0.0)x345.0, glue set 281.71843fil
@@ -184,11 +184,6 @@ Completed box being shipped out [1]
...\penalty 10000
...\glue 9.90276 plus 0.86108
...\glue(\parskip) 0.0 plus 1.0
-...\glue(\baselineskip) 12.0
-...\hbox(0.0+0.0)x345.0, glue set 345.0fil
-....\penalty 10000
-....\glue(\parfillskip) 0.0 plus 1.0fil
-....\glue(\rightskip) 0.0
...\penalty -300
...\glue 15.0694 plus 4.30554 minus 0.86108
...\glue(\parskip) 0.0 plus 1.0
diff --git a/base/testfiles/tlb2558.luatex.tlg b/base/testfiles/tlb2558.luatex.tlg
index 62c4eed3..93d53e38 100644
--- a/base/testfiles/tlb2558.luatex.tlg
+++ b/base/testfiles/tlb2558.luatex.tlg
@@ -25,7 +25,7 @@ For xelatex or lualatex save the document in UTF-8 encoding
and do not use inputenc, or use the [utf8] option.
> 11.
<to be read again>
-\par
+\tex_par:D
l. ...
! Package inputenc Error: inputenc is not designed for xetex or luatex.
(inputenc) only UTF-8 supported.
diff --git a/base/testfiles/tlb2558.tlg b/base/testfiles/tlb2558.tlg
index a6eecccc..59af759f 100644
--- a/base/testfiles/tlb2558.tlg
+++ b/base/testfiles/tlb2558.tlg
@@ -20,7 +20,7 @@ File: latin1.def ....-..-.. v... Input encoding file
)
> 11.
<to be read again>
- \par
+ \tex_par:D
l. ...
> 12.
l. ...\showthe\catcode`\@
diff --git a/base/testfiles/tlb2558.xetex.tlg b/base/testfiles/tlb2558.xetex.tlg
index d41e00ed..74bb3eae 100644
--- a/base/testfiles/tlb2558.xetex.tlg
+++ b/base/testfiles/tlb2558.xetex.tlg
@@ -25,7 +25,7 @@ For xelatex or lualatex save the document in UTF-8 encoding
and do not use inputenc, or use the [utf8] option.
> 11.
<to be read again>
- \par
+ \tex_par:D
l. ...
! Package inputenc Error: inputenc is not designed for xetex or luatex.
(inputenc) only UTF-8 supported.
diff --git a/base/testfiles/vlatex02.luatex.tlg b/base/testfiles/vlatex02.luatex.tlg
index bbe708df..e78882dd 100644
--- a/base/testfiles/vlatex02.luatex.tlg
+++ b/base/testfiles/vlatex02.luatex.tlg
@@ -175,6 +175,7 @@ Completed box being shipped out [1]
.....\localbrokenpenalty=0
.....\localleftbox=null
.....\localrightbox=null
+....\hbox(0.0+0.0)x0.0, direction TLT
....\penalty 10000
....\glue(\parfillskip) 0.0 plus 1.0fil
....\glue(\rightskip) 0.0
diff --git a/base/testfiles/vlatex02.lvt b/base/testfiles/vlatex02.lvt
index 7607d951..b23d5f12 100644
--- a/base/testfiles/vlatex02.lvt
+++ b/base/testfiles/vlatex02.lvt
@@ -54,7 +54,8 @@ and \LaTeX{} enable to number equations:
\begin{equation}
e^{i\pi}=-1\label{Euler}
\end{equation}%
-}
+}\mbox{} %<--- 2021-02-01 the brace resulted in an empty line (bug really which is now gone)
+ % to retain the page breaking we mimic it
%179. Changed \output to reset \par to its default value. This avoids
diff --git a/base/testfiles/vlatex02.tlg b/base/testfiles/vlatex02.tlg
index f942418a..fd0fb818 100644
--- a/base/testfiles/vlatex02.tlg
+++ b/base/testfiles/vlatex02.tlg
@@ -151,6 +151,7 @@ Completed box being shipped out [1]
...\glue(\belowdisplayskip) 10.0 plus 2.0 minus 5.0
...\glue(\baselineskip) 9.5
...\hbox(0.0+0.0)x345.0, glue set 345.0fil
+....\hbox(0.0+0.0)x0.0
....\penalty 10000
....\glue(\parfillskip) 0.0 plus 1.0fil
....\glue(\rightskip) 0.0
diff --git a/base/testfiles/vtl2e02.luatex.tlg b/base/testfiles/vtl2e02.luatex.tlg
index f561fa9b..b4a31f3f 100644
--- a/base/testfiles/vtl2e02.luatex.tlg
+++ b/base/testfiles/vtl2e02.luatex.tlg
@@ -151,6 +151,7 @@ Completed box being shipped out [1]
.....\localbrokenpenalty=0
.....\localleftbox=null
.....\localrightbox=null
+....\hbox(0.0+0.0)x0.0, direction TLT
....\penalty 10000
....\glue(\parfillskip) 0.0 plus 1.0fil
....\glue(\rightskip) 0.0
diff --git a/base/testfiles/vtl2e02.lvt b/base/testfiles/vtl2e02.lvt
index adbd897f..8aa97fd1 100644
--- a/base/testfiles/vtl2e02.lvt
+++ b/base/testfiles/vtl2e02.lvt
@@ -54,7 +54,8 @@ enables to number equations:
\begin{equation}
e^{i\pi}=-1\label{Euler}
\end{equation}%
-}
+}\mbox{} %<--- 2021-02-01 the brace resulted in an empty line (bug really which is now gone)
+ % to retain the page breaking we mimic it
%179. Changed \output to reset \par to its default value. This avoids
diff --git a/base/testfiles/vtl2e02.tlg b/base/testfiles/vtl2e02.tlg
index 298ae2e6..c188ecda 100644
--- a/base/testfiles/vtl2e02.tlg
+++ b/base/testfiles/vtl2e02.tlg
@@ -128,6 +128,7 @@ Completed box being shipped out [1]
...\glue(\belowdisplayskip) 10.0 plus 2.0 minus 5.0
...\glue(\baselineskip) 9.5
...\hbox(0.0+0.0)x345.0, glue set 345.0fil
+....\hbox(0.0+0.0)x0.0
....\penalty 10000
....\glue(\parfillskip) 0.0 plus 1.0fil
....\glue(\rightskip) 0.0
More information about the latex3-commits
mailing list.