[latex3-commits] [git/LaTeX3-latex3-latex2e] apdf161: Update after renames (88200724)
PhelypeOleinik
phelype.oleinik at latex-project.org
Thu Sep 10 16:25:31 CEST 2020
Repository : https://github.com/latex3/latex2e
On branch : apdf161
Link : https://github.com/latex3/latex2e/commit/8820072457c224710bc463d7dd017d961a279855
>---------------------------------------------------------------
commit 8820072457c224710bc463d7dd017d961a279855
Author: PhelypeOleinik <phelype.oleinik at latex-project.org>
Date: Thu Sep 10 11:25:31 2020 -0300
Update after renames
>---------------------------------------------------------------
8820072457c224710bc463d7dd017d961a279855
base/ltfiles.dtx | 2 +-
base/testfiles-disabled/lthooks2-001.tlg | 10 +++++-----
base/testfiles-disabled/lthooks2-007.lvt | 16 ++++++++--------
base/testfiles-disabled/lthooks2-007.tlg | 16 ++++++++--------
base/testfiles-lthooks/lthooks-005.lvt | 2 +-
base/testfiles-lthooks/lthooks-011.lvt | 4 ++++
base/testfiles-lthooks/lthooks-011.tlg | 8 ++++++++
7 files changed, 35 insertions(+), 23 deletions(-)
diff --git a/base/ltfiles.dtx b/base/ltfiles.dtx
index a5ad754b..835f600e 100644
--- a/base/ltfiles.dtx
+++ b/base/ltfiles.dtx
@@ -461,7 +461,7 @@
% \begin{macrocode}
\edef \@kernel at after@begindocument at before {%
\let\expandafter\noexpand\csname
- g__hook_env/document/begin_code_tl\endcsname
+ __hook env/document/begin\endcsname
\noexpand\@empty}
% \end{macrocode}
%
diff --git a/base/testfiles-disabled/lthooks2-001.tlg b/base/testfiles-disabled/lthooks2-001.tlg
index 9058da32..333e07df 100644
--- a/base/testfiles-disabled/lthooks2-001.tlg
+++ b/base/testfiles-disabled/lthooks2-001.tlg
@@ -181,11 +181,11 @@ Handled code for l3backend-dvips
Handled code for hyperref
Update code for hook 'shipout/lastpage' on input line ...:
All initialized (non-empty) hooks:
- begindocument -> \cs_if_exist:cT {ver at color.sty}{\cs_set_protected:Npn \__color_backend_pickup:N ##1{\exp_args:NV \tl_if_head_is_space:nTF \current at color {\tl_set:Nx ##1{{spot}{\exp_after:wN \use:n \current at color \c_space_tl 1}}}{\exp_last_unbraced:Nx \__color_backend_pickup:w {\current at color }\s__color_stop ##1}}\cs_new_protected:Npn \__color_backend_pickup:w ##1 ##2\s__color_stop ##3{\tl_set:Nn ##3{{##1}{##2}}}}\cs_new_eq:NN \__graphics_backend_getbb_eps:n \graphics_read_bb:n \def \@tempa ##1,{\XC at ifxcase \tm {\XC at mod@rgb {\XC at calcN {##1}\@@tmp \edef \@@tmp {\@@tmp ,\@@tmp ,\@@tmp }}\XC at mod@cmy {\XC at calcC {##1}\@@tmp \edef \@@tmp {\@@tmp ,\@@tmp ,\@@tmp }}\XC at mod@cmyk {\XC at calcC {##1}\@@tmp \edef \@@tmp {0,0,0,\@@tmp }}\XC at mod@RGB {\edef \@@scl {\rangeRGB }\XC at calcM {##1}\@@tmp \edef \@@tmp {\@@tmp ,\@@tmp ,\@@tmp }}\XC at mod@HTML {\edef \@@scl {\@cclv }\XC at calcM {##1}\@@tmp \XC at calcH \@@tmp \@@tmp \edef \@@tmp {\@@tmp \@@tmp \@@tmp }}\XC at mod@HSB {\edef \@@scl {\rangeHSB }\XC at calcM {##1}\@@tmp \edef \@@tmp {0,0,\@@tmp }}\XC at mod@Gray {\edef \@@scl {\rangeGray }\XC at calcM {##1}\@@tmp }}{\XC at calcN {##1}\@@tmp \edef \@@tmp {0,0,\@@tmp }}}\ifx \XC at cnv@gray \@tempa \def \XC at cnv@gray ##1,{\XC at ifxcase \tm {\XC at mod@rgb {\XC at calcN {##1}\@@tmp \edef \@@tmp {\@@tmp ,\@@tmp ,\@@tmp }}\XC at mod@gray {}\XC at mod@cmy {\XC at calcC {##1}\@@tmp \edef \@@tmp {\@@tmp ,\@@tmp ,\@@tmp }}\XC at mod@cmyk {\XC at calcC {##1}\@@tmp \edef \@@tmp {0,0,0,\@@tmp }}\XC at mod@RGB {\edef \@@scl {\rangeRGB }\XC at calcM {##1}\@@tmp \edef \@@tmp {\@@tmp ,\@@tmp ,\@@tmp }}\XC at mod@HTML {\edef \@@scl {\@cclv }\XC at calcM {##1}\@@tmp \XC at calcH \@@tmp \@@tmp \edef \@@tmp {\@@tmp \@@tmp \@@tmp }}\XC at mod@HSB {\edef \@@scl {\rangeHSB }\XC at calcM {##1}\@@tmp \edef \@@tmp {0,0,\@@tmp }}\XC at mod@Gray {\edef \@@scl {\rangeGray }\XC at calcM {##1}\@@tmp }}{\XC at calcN {##1}\@@tmp \edef \@@tmp {0,0,\@@tmp }}}\fi \let \@tempa \relax \@ifundefined {pdfstringdefDisableCommands}{\let \pdfstringdefDisableCommands \HyPsd at pdfstringdefDisableCommands }{}\def \Hy at varioref@undefined {{??}{??}{}{}{}} \@ifpackageloaded {varioref}{\def \vref at pagenum ##1##2{\@ifundefined {r@##2}{\expandafter \let \csname r@##2\endcsname \Hy at varioref@undefined }{}\edef ##1{\getpagerefnumber {##2}}}}{} \def \Hy at varioref@refstepcounter ##1{\stepcounter {##1}\protected at edef \@currentlabel {\csname p@##1\expandafter \endcsname \csname the##1\endcsname }} \ifx \refstepcounter \Hy at varioref@refstepcounter \let \H at refstepcounter \refstepcounter \let \refstepcounter \Hy at saved@refstepcounter \fi \Hy at AtBeginDocumentHook {}\let \Hy at AtBeginDocumentHook \@undefined \g__hook_begindocument_next_code_tl
- documentclass -> \ifx \@normalsize \@undefined \let \@normalsize \normalsize \fi \g__hook_documentclass_next_code_tl
- enddocument/info -> \@dofilelist \@enddocument at kernel@warnings \g__hook_enddocument/info_next_code_tl
- shipout/before -> \Hy at EveryPageHook \ifx \Hy at EveryPageBoxHook \ltx at empty \else \setbox \AtBeginShipoutBox =\vbox {\offinterlineskip \Hy at EveryPageBoxHook \box \AtBeginShipoutBox }\fi \g__hook_shipout/before_next_code_tl
- shipout/firstpage -> \bool_lazy_and:nnT {\cs_if_exist_p:N \g__kernel_backend_header_bool }{\g__kernel_backend_header_bool }{\__kernel_backend_literal:n {header=l3backend-dvips.pro}}\Hy at FirstPageHook \ifHy at setpagesize \begingroup \@ifundefined {stockwidth}{\ifdim \paperwidth >\z@ \ifdim \paperheight >\z@ \special {papersize=\the \paperwidth ,\the \paperheight }\fi \fi }{\ifdim \stockwidth >\z@ \ifdim \stockheight >\z@ \special {papersize=\the \stockwidth ,\the \stockheight }\fi \fi }\endgroup \fi \Hy at DisableOption {setpagesize}\g__hook_shipout/firstpage_next_code_tl
+ begindocument -> \cs_if_exist:cT {ver at color.sty}{\cs_set_protected:Npn \__color_backend_pickup:N ##1{\exp_args:NV \tl_if_head_is_space:nTF \current at color {\tl_set:Nx ##1{{spot}{\exp_after:wN \use:n \current at color \c_space_tl 1}}}{\exp_last_unbraced:Nx \__color_backend_pickup:w {\current at color }\s__color_stop ##1}}\cs_new_protected:Npn \__color_backend_pickup:w ##1 ##2\s__color_stop ##3{\tl_set:Nn ##3{{##1}{##2}}}}\cs_new_eq:NN \__graphics_backend_getbb_eps:n \graphics_read_bb:n \def \@tempa ##1,{\XC at ifxcase \tm {\XC at mod@rgb {\XC at calcN {##1}\@@tmp \edef \@@tmp {\@@tmp ,\@@tmp ,\@@tmp }}\XC at mod@cmy {\XC at calcC {##1}\@@tmp \edef \@@tmp {\@@tmp ,\@@tmp ,\@@tmp }}\XC at mod@cmyk {\XC at calcC {##1}\@@tmp \edef \@@tmp {0,0,0,\@@tmp }}\XC at mod@RGB {\edef \@@scl {\rangeRGB }\XC at calcM {##1}\@@tmp \edef \@@tmp {\@@tmp ,\@@tmp ,\@@tmp }}\XC at mod@HTML {\edef \@@scl {\@cclv }\XC at calcM {##1}\@@tmp \XC at calcH \@@tmp \@@tmp \edef \@@tmp {\@@tmp \@@tmp \@@tmp }}\XC at mod@HSB {\edef \@@scl {\rangeHSB }\XC at calcM {##1}\@@tmp \edef \@@tmp {0,0,\@@tmp }}\XC at mod@Gray {\edef \@@scl {\rangeGray }\XC at calcM {##1}\@@tmp }}{\XC at calcN {##1}\@@tmp \edef \@@tmp {0,0,\@@tmp }}}\ifx \XC at cnv@gray \@tempa \def \XC at cnv@gray ##1,{\XC at ifxcase \tm {\XC at mod@rgb {\XC at calcN {##1}\@@tmp \edef \@@tmp {\@@tmp ,\@@tmp ,\@@tmp }}\XC at mod@gray {}\XC at mod@cmy {\XC at calcC {##1}\@@tmp \edef \@@tmp {\@@tmp ,\@@tmp ,\@@tmp }}\XC at mod@cmyk {\XC at calcC {##1}\@@tmp \edef \@@tmp {0,0,0,\@@tmp }}\XC at mod@RGB {\edef \@@scl {\rangeRGB }\XC at calcM {##1}\@@tmp \edef \@@tmp {\@@tmp ,\@@tmp ,\@@tmp }}\XC at mod@HTML {\edef \@@scl {\@cclv }\XC at calcM {##1}\@@tmp \XC at calcH \@@tmp \@@tmp \edef \@@tmp {\@@tmp \@@tmp \@@tmp }}\XC at mod@HSB {\edef \@@scl {\rangeHSB }\XC at calcM {##1}\@@tmp \edef \@@tmp {0,0,\@@tmp }}\XC at mod@Gray {\edef \@@scl {\rangeGray }\XC at calcM {##1}\@@tmp }}{\XC at calcN {##1}\@@tmp \edef \@@tmp {0,0,\@@tmp }}}\fi \let \@tempa \relax \@ifundefined {pdfstringdefDisableCommands}{\let \pdfstringdefDisableCommands \HyPsd at pdfstringdefDisableCommands }{}\def \Hy at varioref@undefined {{??}{??}{}{}{}} \@ifpackageloaded {varioref}{\def \vref at pagenum ##1##2{\@ifundefined {r@##2}{\expandafter \let \csname r@##2\endcsname \Hy at varioref@undefined }{}\edef ##1{\getpagerefnumber {##2}}}}{} \def \Hy at varioref@refstepcounter ##1{\stepcounter {##1}\protected at edef \@currentlabel {\csname p@##1\expandafter \endcsname \csname the##1\endcsname }} \ifx \refstepcounter \Hy at varioref@refstepcounter \let \H at refstepcounter \refstepcounter \let \refstepcounter \Hy at saved@refstepcounter \fi \Hy at AtBeginDocumentHook {}\let \Hy at AtBeginDocumentHook \@undefined \__hook_next begindocument
+ documentclass -> \ifx \@normalsize \@undefined \let \@normalsize \normalsize \fi \__hook_next documentclass
+ enddocument/info -> \@dofilelist \@enddocument at kernel@warnings \__hook_next enddocument/info
+ shipout/before -> \Hy at EveryPageHook \ifx \Hy at EveryPageBoxHook \ltx at empty \else \setbox \AtBeginShipoutBox =\vbox {\offinterlineskip \Hy at EveryPageBoxHook \box \AtBeginShipoutBox }\fi \__hook_next shipout/before
+ shipout/firstpage -> \bool_lazy_and:nnT {\cs_if_exist_p:N \g__kernel_backend_header_bool }{\g__kernel_backend_header_bool }{\__kernel_backend_literal:n {header=l3backend-dvips.pro}}\Hy at FirstPageHook \ifHy at setpagesize \begingroup \@ifundefined {stockwidth}{\ifdim \paperwidth >\z@ \ifdim \paperheight >\z@ \special {papersize=\the \paperwidth ,\the \paperheight }\fi \fi }{\ifdim \stockwidth >\z@ \ifdim \stockheight >\z@ \special {papersize=\the \stockwidth ,\the \stockheight }\fi \fi }\endgroup \fi \Hy at DisableOption {setpagesize}\__hook_next shipout/firstpage
(lthooks2-001.aux
**** Add to hook begindocument (top-level) on input line ... <- \ifx \hyper at anchor \@undefined \global \let \oldcontentsline \contentsline \gdef \contentsline ##1##2##3##4{\oldcontentsline {##1}{##2}{##3}} \global \let \oldnewlabel \newlabel \gdef \newlabel ##1##2{\newlabelxx {##1}##2} \gdef \newlabelxx ##1##2##3##4##5##6{\oldnewlabel {##1}{{##2}{##3}}} \AtEndDocument {\ifx \hyper at anchor \@undefined \let \contentsline \oldcontentsline \let \newlabel \oldnewlabel \fi } \fi
Update code for hook 'begindocument' on input line ...:
diff --git a/base/testfiles-disabled/lthooks2-007.lvt b/base/testfiles-disabled/lthooks2-007.lvt
index d28b043a..74794e22 100644
--- a/base/testfiles-disabled/lthooks2-007.lvt
+++ b/base/testfiles-disabled/lthooks2-007.lvt
@@ -62,8 +62,8 @@
% \hook_log:n {aaa}
-% Then this should contain only \g__hook_aaa_next_code_tl
-\cs_show:c { g__hook_aaa_code_tl }
+% Then this should contain only \__hook_next~aaa
+\cs_show:c { __hook~aaa }
% \tracingnone
% About 219000 lines of .log with `\tracingall` with 50 labels
@@ -92,8 +92,8 @@
% \hook_log:n {bbb}
-% And this should also contain only \g__hook_bbb_next_code_tl
-\cs_show:c { g__hook_bbb_code_tl }
+% And this should also contain only \__hook_next~bbb
+\cs_show:c { __hook~bbb }
% \tracingnone
% About 56000 lines of .log with `\tracingall` with 50 labels
@@ -127,8 +127,8 @@
% \hook_log:n {xxx}
-% Then this should contain only \g__hook_xxx_next_code_tl
-\cs_show:c { g__hook_xxx_code_tl }
+% Then this should contain only \__hook_next~xxx
+\cs_show:c { __hook~xxx }
% \tracingnone
% About 218000 lines of .log with `\tracingall` with 50 labels
@@ -157,8 +157,8 @@
% \hook_log:n {yyy}
-% And this should also contain only \g__hook_yyy_next_code_tl
-\cs_show:c { g__hook_yyy_code_tl }
+% And this should also contain only \__hook_next~yyy
+\cs_show:c { __hook~yyy }
% \tracingnone
% About 35000 lines of .log with `\tracingall` with 50 labels
diff --git a/base/testfiles-disabled/lthooks2-007.tlg b/base/testfiles-disabled/lthooks2-007.tlg
index d175362a..30da5c49 100644
--- a/base/testfiles-disabled/lthooks2-007.tlg
+++ b/base/testfiles-disabled/lthooks2-007.tlg
@@ -1,21 +1,21 @@
This is a generated file for the l3build validation system.
Don't change this file in any respect.
(l3benchmark) + TIC
-> \g__hook_aaa_code_tl=macro:->\g__hook_aaa_next_code_tl .
+> \__hook aaa=macro:->\__hook_next aaa .
<recently read> }
-l. ...\cs_show:c { g__hook_aaa_code_tl }
+l. ...\cs_show:c { __hook~aaa }
(l3benchmark) + TIC
-> \g__hook_bbb_code_tl=macro:->\g__hook_bbb_next_code_tl .
+> \__hook bbb=macro:->\__hook_next bbb .
<recently read> }
-l. ...\cs_show:c { g__hook_bbb_code_tl }
+l. ...\cs_show:c { __hook~bbb }
(l3benchmark) + TIC
-> \g__hook_xxx_code_tl=macro:->\g__hook_xxx_next_code_tl .
+> \__hook xxx=macro:->\__hook_next xxx .
<recently read> }
-l. ...\cs_show:c { g__hook_xxx_code_tl }
+l. ...\cs_show:c { __hook~xxx }
(l3benchmark) + TIC
-> \g__hook_yyy_code_tl=macro:->\g__hook_yyy_next_code_tl .
+> \__hook yyy=macro:->\__hook_next yyy .
<recently read> }
-l. ...\cs_show:c { g__hook_yyy_code_tl }
+l. ...\cs_show:c { __hook~yyy }
(l3benchmark) + TIC
(l3benchmark) + TIC
(l3benchmark) + TIC
diff --git a/base/testfiles-lthooks/lthooks-005.lvt b/base/testfiles-lthooks/lthooks-005.lvt
index 9f297155..a8e76cd0 100644
--- a/base/testfiles-lthooks/lthooks-005.lvt
+++ b/base/testfiles-lthooks/lthooks-005.lvt
@@ -41,7 +41,7 @@
\DeclareHookRule {xxx} {label5} {after} {label9}
\DeclareHookRule {xxx} {label2} {before} {label8}
-% xxx -> foo1 foo2 foo9 foo5 foo7 foo8 foo3 foo4 foo6\g__hook_xxx_next_code_tl
+% xxx -> foo1 foo2 foo9 foo5 foo7 foo8 foo3 foo4 foo6\__hook_next xxx
% rules that should get dropped as not both labels are used in the hook:
\DeclareHookRule {xxx} {label1} {before} {no}
diff --git a/base/testfiles-lthooks/lthooks-011.lvt b/base/testfiles-lthooks/lthooks-011.lvt
index 97147195..11a4b79b 100644
--- a/base/testfiles-lthooks/lthooks-011.lvt
+++ b/base/testfiles-lthooks/lthooks-011.lvt
@@ -25,6 +25,10 @@
\hook_new:n{yyy_next}
\hook_new:n{yyy}
+% This would raise a lower-level 'cs already defined' error
+\hook_new:n{zzz}
+\hook_new:n{next_zzz}
+
% Ensure that unfortunately-named labels don't wreck our code
diff --git a/base/testfiles-lthooks/lthooks-011.tlg b/base/testfiles-lthooks/lthooks-011.tlg
index 6ef804e9..80a451ea 100644
--- a/base/testfiles-lthooks/lthooks-011.tlg
+++ b/base/testfiles-lthooks/lthooks-011.tlg
@@ -45,6 +45,8 @@ Handled code for front
Update code for hook 'xxx_next' on input line ...:
Update code for hook 'yyy_next' on input line ...:
Update code for hook 'yyy' on input line ...:
+Update code for hook 'zzz' on input line ...:
+Update code for hook 'next_zzz' on input line ...:
All initialized (non-empty) hooks:
enddocument/info -> \@dofilelist \@enddocument at kernel@warnings \__hook_next enddocument/info
shipout/firstpage -> \__kernel_backend_literal:n {header=l3backend-dvips.pro}\__hook_next shipout/firstpage
@@ -96,6 +98,8 @@ Handled code for rear
Update code for hook 'xxx_next' on input line ...:
Update code for hook 'yyy_next' on input line ...:
Update code for hook 'yyy' on input line ...:
+Update code for hook 'zzz' on input line ...:
+Update code for hook 'next_zzz' on input line ...:
All initialized (non-empty) hooks:
enddocument/info -> \@dofilelist \@enddocument at kernel@warnings \__hook_next enddocument/info
shipout/firstpage -> \__kernel_backend_literal:n {header=l3backend-dvips.pro}\__hook_next shipout/firstpage
@@ -149,6 +153,8 @@ Handled code for labels
Update code for hook 'xxx_next' on input line ...:
Update code for hook 'yyy_next' on input line ...:
Update code for hook 'yyy' on input line ...:
+Update code for hook 'zzz' on input line ...:
+Update code for hook 'next_zzz' on input line ...:
All initialized (non-empty) hooks:
enddocument/info -> \@dofilelist \@enddocument at kernel@warnings \__hook_next enddocument/info
shipout/firstpage -> \__kernel_backend_literal:n {header=l3backend-dvips.pro}\__hook_next shipout/firstpage
@@ -204,6 +210,8 @@ Handled code for return
Update code for hook 'xxx_next' on input line ...:
Update code for hook 'yyy_next' on input line ...:
Update code for hook 'yyy' on input line ...:
+Update code for hook 'zzz' on input line ...:
+Update code for hook 'next_zzz' on input line ...:
All initialized (non-empty) hooks:
enddocument/info -> \@dofilelist \@enddocument at kernel@warnings \__hook_next enddocument/info
shipout/firstpage -> \__kernel_backend_literal:n {header=l3backend-dvips.pro}\__hook_next shipout/firstpage
More information about the latex3-commits
mailing list.