[latex3-commits] [git/LaTeX3-latex3-latex3] master: Use a kernel-specific counter for mappings (c2932bf)
Joseph Wright
joseph.wright at morningstar2.co.uk
Tue Mar 27 12:02:30 CEST 2018
Repository : https://github.com/latex3/latex3
On branch : master
Link : https://github.com/latex3/latex3/commit/c2932bf7a0df5f601ecdce0987bebfe147813b03
>---------------------------------------------------------------
commit c2932bf7a0df5f601ecdce0987bebfe147813b03
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Tue Mar 27 11:02:30 2018 +0100
Use a kernel-specific counter for mappings
We could use one per module, but that is a bit of a waste.
>---------------------------------------------------------------
c2932bf7a0df5f601ecdce0987bebfe147813b03
l3kernel/l3clist.dtx | 10 +++++-----
l3kernel/l3file.dtx | 6 +++---
l3kernel/l3fp-logic.dtx | 10 +++++-----
l3kernel/l3int.dtx | 12 ++++++------
l3kernel/l3prg.dtx | 8 ++++----
l3kernel/l3prop.dtx | 10 +++++-----
l3kernel/l3seq.dtx | 10 +++++-----
l3kernel/l3skip.dtx | 12 ++++++------
l3kernel/l3str.dtx | 8 ++++----
l3kernel/l3tl-analysis.dtx | 8 ++++----
l3kernel/l3tl.dtx | 10 +++++-----
l3kernel/testfiles/m3expl001.luatex.tlg | 4 ++--
l3kernel/testfiles/m3expl001.ptex.tlg | 4 ++--
l3kernel/testfiles/m3expl001.tlg | 4 ++--
l3kernel/testfiles/m3expl001.uptex.tlg | 4 ++--
l3kernel/testfiles/m3expl001.xetex.tlg | 4 ++--
l3kernel/testfiles/m3expl002.luatex.tlg | 2 +-
l3kernel/testfiles/m3expl002.ptex.tlg | 2 +-
l3kernel/testfiles/m3expl002.tlg | 2 +-
l3kernel/testfiles/m3expl002.uptex.tlg | 2 +-
l3kernel/testfiles/m3expl002.xetex.tlg | 2 +-
l3kernel/testfiles/m3expl003.luatex.tlg | 4 ++--
l3kernel/testfiles/m3expl003.ptex.tlg | 4 ++--
l3kernel/testfiles/m3expl003.tlg | 4 ++--
l3kernel/testfiles/m3expl003.uptex.tlg | 4 ++--
l3kernel/testfiles/m3expl003.xetex.tlg | 4 ++--
l3kernel/testfiles/m3expl004.luatex.tlg | 2 +-
l3kernel/testfiles/m3expl004.ptex.tlg | 2 +-
l3kernel/testfiles/m3expl004.tlg | 2 +-
l3kernel/testfiles/m3expl004.uptex.tlg | 2 +-
l3kernel/testfiles/m3expl004.xetex.tlg | 2 +-
l3kernel/testfiles/m3expl006.luatex.tlg | 2 +-
l3kernel/testfiles/m3expl006.ptex.tlg | 2 +-
l3kernel/testfiles/m3expl006.tlg | 2 +-
l3kernel/testfiles/m3expl006.uptex.tlg | 2 +-
l3kernel/testfiles/m3expl006.xetex.tlg | 2 +-
36 files changed, 87 insertions(+), 87 deletions(-)
diff --git a/l3kernel/l3clist.dtx b/l3kernel/l3clist.dtx
index fdf52f1..b8ce007 100644
--- a/l3kernel/l3clist.dtx
+++ b/l3kernel/l3clist.dtx
@@ -2,7 +2,7 @@
%
%% File: l3clist.dtx Copyright (C) 2004-2011 Frank Mittelbach,
%% The LaTeX3 project
-%% (C) 2012-2017 The LaTeX3 Project
+%% (C) 2012-2018 The LaTeX3 Project
%
% It may be distributed and/or modified under the conditions of the
% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -1538,14 +1538,14 @@
{
\clist_if_empty:NF #1
{
- \int_gincr:N \g__prg_map_int
+ \int_gincr:N \g__kernel_prg_map_int
\cs_gset_protected:cpn
- { @@_map_ \int_use:N \g__prg_map_int :w } ##1 {#2}
+ { @@_map_ \int_use:N \g__kernel_prg_map_int :w } ##1 {#2}
\exp_last_unbraced:Nco \@@_map_function:Nw
- { @@_map_ \int_use:N \g__prg_map_int :w }
+ { @@_map_ \int_use:N \g__kernel_prg_map_int :w }
#1 , \q_recursion_tail ,
\prg_break_point:Nn \clist_map_break:
- { \int_gdecr:N \g__prg_map_int }
+ { \int_gdecr:N \g__kernel_prg_map_int }
}
}
\cs_new_protected:Npn \clist_map_inline:nn #1
diff --git a/l3kernel/l3file.dtx b/l3kernel/l3file.dtx
index bfbc67f..4d7fdfe 100644
--- a/l3kernel/l3file.dtx
+++ b/l3kernel/l3file.dtx
@@ -1453,16 +1453,16 @@
{ \@@_map_inline:NNn \ior_str_get:NN }
\cs_new_protected:Npn \@@_map_inline:NNn
{
- \int_gincr:N \g__prg_map_int
+ \int_gincr:N \g__kernel_prg_map_int
\exp_args:Nc \@@_map_inline:NNNn
- { @@_map_ \int_use:N \g__prg_map_int :n }
+ { @@_map_ \int_use:N \g__kernel_prg_map_int :n }
}
\cs_new_protected:Npn \@@_map_inline:NNNn #1#2#3#4
{
\cs_gset_protected:Npn #1 ##1 {#4}
\ior_if_eof:NF #3 { \@@_map_inline_loop:NNN #1#2#3 }
\prg_break_point:Nn \ior_map_break:
- { \int_gdecr:N \g__prg_map_int }
+ { \int_gdecr:N \g__kernel_prg_map_int }
}
\cs_new_protected:Npn \@@_map_inline_loop:NNN #1#2#3
{
diff --git a/l3kernel/l3fp-logic.dtx b/l3kernel/l3fp-logic.dtx
index f83bb77..1d8809b 100644
--- a/l3kernel/l3fp-logic.dtx
+++ b/l3kernel/l3fp-logic.dtx
@@ -457,17 +457,17 @@
% \begin{macrocode}
\cs_new_protected:Npn \fp_step_inline:nnnn
{
- \int_gincr:N \g__prg_map_int
+ \int_gincr:N \g__kernel_prg_map_int
\exp_args:NNc \@@_step:NNnnnn
\cs_gset_protected:Npn
- { @@_map_ \int_use:N \g__prg_map_int :w }
+ { @@_map_ \int_use:N \g__kernel_prg_map_int :w }
}
\cs_new_protected:Npn \fp_step_variable:nnnNn #1#2#3#4#5
{
- \int_gincr:N \g__prg_map_int
+ \int_gincr:N \g__kernel_prg_map_int
\exp_args:NNc \@@_step:NNnnnn
\cs_gset_protected:Npx
- { @@_map_ \int_use:N \g__prg_map_int :w }
+ { @@_map_ \int_use:N \g__kernel_prg_map_int :w }
{#1} {#2} {#3}
{
\tl_set:Nn \exp_not:N #4 {##1}
@@ -478,7 +478,7 @@
{
#1 #2 ##1 {#6}
\fp_step_function:nnnN {#3} {#4} {#5} #2
- \prg_break_point:Nn \scan_stop: { \int_gdecr:N \g__prg_map_int }
+ \prg_break_point:Nn \scan_stop: { \int_gdecr:N \g__kernel_prg_map_int }
}
% \end{macrocode}
% \end{macro}
diff --git a/l3kernel/l3int.dtx b/l3kernel/l3int.dtx
index 52ec899..4660093 100644
--- a/l3kernel/l3int.dtx
+++ b/l3kernel/l3int.dtx
@@ -1845,24 +1845,24 @@
% required to make the nesting safe (as seen in other in line
% functions), and map that function using \cs{int_step_function:nnnN}.
% We put a \cs{prg_break_point:Nn} so that \texttt{map_break}
-% functions from other modules correctly decrement \cs{g__prg_map_int}
+% functions from other modules correctly decrement \cs{g__kernel_prg_map_int}
% before looking for their own break point. The first argument is
% \cs{scan_stop:}, so that no breaking function recognizes this break
% point as its own.
% \begin{macrocode}
\cs_new_protected:Npn \int_step_inline:nnnn
{
- \int_gincr:N \g__prg_map_int
+ \int_gincr:N \g__kernel_prg_map_int
\exp_args:NNc \@@_step:NNnnnn
\cs_gset_protected:Npn
- { @@_map_ \int_use:N \g__prg_map_int :w }
+ { @@_map_ \int_use:N \g__kernel_prg_map_int :w }
}
\cs_new_protected:Npn \int_step_variable:nnnNn #1#2#3#4#5
{
- \int_gincr:N \g__prg_map_int
+ \int_gincr:N \g__kernel_prg_map_int
\exp_args:NNc \@@_step:NNnnnn
\cs_gset_protected:Npx
- { @@_map_ \int_use:N \g__prg_map_int :w }
+ { @@_map_ \int_use:N \g__kernel_prg_map_int :w }
{#1}{#2}{#3}
{
\tl_set:Nn \exp_not:N #4 {##1}
@@ -1873,7 +1873,7 @@
{
#1 #2 ##1 {#6}
\int_step_function:nnnN {#3} {#4} {#5} #2
- \prg_break_point:Nn \scan_stop: { \int_gdecr:N \g__prg_map_int }
+ \prg_break_point:Nn \scan_stop: { \int_gdecr:N \g__kernel_prg_map_int }
}
% \end{macrocode}
% \end{macro}
diff --git a/l3kernel/l3prg.dtx b/l3kernel/l3prg.dtx
index ff70cc1..59cc1ea 100644
--- a/l3kernel/l3prg.dtx
+++ b/l3kernel/l3prg.dtx
@@ -712,12 +712,12 @@
% within the same function.
% \end{function}
%
-% \begin{variable}{\g__prg_map_int}
+% \begin{variable}{\g__kernel_prg_map_int}
% This integer is used by non-expandable mapping functions to track
% the level of nesting in force. The functions
% \cs[no-index]{\meta{type}_map_1:w},
% \cs[no-index]{\meta{type}_map_2:w}, \emph{etc.}, labelled by
-% \cs{g__prg_map_int}
+% \cs{g__kernel_prg_map_int}
% hold functions to be mapped over various list datatypes in inline
% and variable mappings.
% \end{variable}
@@ -1535,10 +1535,10 @@
%<@@=prg>
% \end{macrocode}
%
-% \begin{variable}{\g_@@_map_int}
+% \begin{variable}{\g__kernel_prg_map_int}
% A nesting counter for mapping.
% \begin{macrocode}
-\int_new:N \g_@@_map_int
+\int_new:N \g__kernel_prg_map_int
% \end{macrocode}
% \end{variable}
%
diff --git a/l3kernel/l3prop.dtx b/l3kernel/l3prop.dtx
index 9bf27bf..13ff8d1 100644
--- a/l3kernel/l3prop.dtx
+++ b/l3kernel/l3prop.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-%% File: l3prop.dtx Copyright (C) 1990-2017 The LaTeX3 Project
+%% File: l3prop.dtx Copyright (C) 1990-2018 The LaTeX3 Project
%
% It may be distributed and/or modified under the conditions of the
% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -1145,15 +1145,15 @@
\cs_new_protected:Npn \prop_map_inline:Nn #1#2
{
\cs_gset_eq:cN
- { @@_map_ \int_use:N \g__prg_map_int :wn } \@@_pair:wn
- \int_gincr:N \g__prg_map_int
+ { @@_map_ \int_use:N \g__kernel_prg_map_int :wn } \@@_pair:wn
+ \int_gincr:N \g__kernel_prg_map_int
\cs_gset_protected:Npn \@@_pair:wn ##1 \s_@@ ##2 {#2}
#1
\prg_break_point:Nn \prop_map_break:
{
- \int_gdecr:N \g__prg_map_int
+ \int_gdecr:N \g__kernel_prg_map_int
\cs_gset_eq:Nc \@@_pair:wn
- { @@_map_ \int_use:N \g__prg_map_int :wn }
+ { @@_map_ \int_use:N \g__kernel_prg_map_int :wn }
}
}
\cs_generate_variant:Nn \prop_map_inline:Nn { c }
diff --git a/l3kernel/l3seq.dtx b/l3kernel/l3seq.dtx
index ae93a34..0d30750 100644
--- a/l3kernel/l3seq.dtx
+++ b/l3kernel/l3seq.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-%% File: l3seq.dtx Copyright (C) 1990-2017 The LaTeX3 Project
+%% File: l3seq.dtx Copyright (C) 1990-2018 The LaTeX3 Project
%
% It may be distributed and/or modified under the conditions of the
% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -1766,15 +1766,15 @@
}
\cs_new_protected:Npn \@@_push_item_def:
{
- \int_gincr:N \g__prg_map_int
- \cs_gset_eq:cN { @@_map_ \int_use:N \g__prg_map_int :w }
+ \int_gincr:N \g__kernel_prg_map_int
+ \cs_gset_eq:cN { @@_map_ \int_use:N \g__kernel_prg_map_int :w }
\@@_item:n
}
\cs_new_protected:Npn \@@_pop_item_def:
{
\cs_gset_eq:Nc \@@_item:n
- { @@_map_ \int_use:N \g__prg_map_int :w }
- \int_gdecr:N \g__prg_map_int
+ { @@_map_ \int_use:N \g__kernel_prg_map_int :w }
+ \int_gdecr:N \g__kernel_prg_map_int
}
% \end{macrocode}
% \end{macro}
diff --git a/l3kernel/l3skip.dtx b/l3kernel/l3skip.dtx
index b992724..8cfda68 100644
--- a/l3kernel/l3skip.dtx
+++ b/l3kernel/l3skip.dtx
@@ -1609,24 +1609,24 @@
% required to make the nesting safe (as seen in other in line
% functions), and map that function using \cs{dim_step_function:nnnN}.
% We put a \cs{prg_break_point:Nn} so that \texttt{map_break}
-% functions from other modules correctly decrement \cs{g__prg_map_int}
+% functions from other modules correctly decrement \cs{g__kernel_prg_map_int}
% before looking for their own break point. The first argument is
% \cs{scan_stop:}, so that no breaking function recognizes this break
% point as its own.
% \begin{macrocode}
\cs_new_protected:Npn \dim_step_inline:nnnn
{
- \int_gincr:N \g__prg_map_int
+ \int_gincr:N \g__kernel_prg_map_int
\exp_args:NNc \@@_step:NNnnnn
\cs_gset_protected:Npn
- { @@_map_ \int_use:N \g__prg_map_int :w }
+ { @@_map_ \int_use:N \g__kernel_prg_map_int :w }
}
\cs_new_protected:Npn \dim_step_variable:nnnNn #1#2#3#4#5
{
- \int_gincr:N \g__prg_map_int
+ \int_gincr:N \g__kernel_prg_map_int
\exp_args:NNc \@@_step:NNnnnn
\cs_gset_protected:Npx
- { @@_map_ \int_use:N \g__prg_map_int :w }
+ { @@_map_ \int_use:N \g__kernel_prg_map_int :w }
{#1}{#2}{#3}
{
\tl_set:Nn \exp_not:N #4 {##1}
@@ -1637,7 +1637,7 @@
{
#1 #2 ##1 {#6}
\dim_step_function:nnnN {#3} {#4} {#5} #2
- \prg_break_point:Nn \scan_stop: { \int_gdecr:N \g__prg_map_int }
+ \prg_break_point:Nn \scan_stop: { \int_gdecr:N \g__kernel_prg_map_int }
}
% \end{macrocode}
% \end{macro}
diff --git a/l3kernel/l3str.dtx b/l3kernel/l3str.dtx
index d19983a..f4b92d1 100644
--- a/l3kernel/l3str.dtx
+++ b/l3kernel/l3str.dtx
@@ -1345,17 +1345,17 @@
\cs_generate_variant:Nn \str_map_function:NN { c }
\cs_new_protected:Npn \str_map_inline:nn #1#2
{
- \int_gincr:N \g__prg_map_int
+ \int_gincr:N \g__kernel_prg_map_int
\cs_gset_protected:cpn
- { @@_map_ \int_use:N \g__prg_map_int :w } ##1 {#2}
+ { @@_map_ \int_use:N \g__kernel_prg_map_int :w } ##1 {#2}
\use:x
{
\exp_not:N \@@_map_inline:NN
- \exp_not:c { @@_map_ \int_use:N \g__prg_map_int :w }
+ \exp_not:c { @@_map_ \int_use:N \g__kernel_prg_map_int :w }
\@@_to_other_fast:n {#1}
}
\q_recursion_tail
- \prg_break_point:Nn \str_map_break: { \int_gdecr:N \g__prg_map_int }
+ \prg_break_point:Nn \str_map_break: { \int_gdecr:N \g__kernel_prg_map_int }
}
\cs_new_protected:Npn \str_map_inline:Nn
{ \exp_args:No \str_map_inline:nn }
diff --git a/l3kernel/l3tl-analysis.dtx b/l3kernel/l3tl-analysis.dtx
index 39a8092..24ad677 100644
--- a/l3kernel/l3tl-analysis.dtx
+++ b/l3kernel/l3tl-analysis.dtx
@@ -900,7 +900,7 @@
% \begin{macro}{\@@_map_inline_aux:Nn}
% First obtain the analysis of the token list into
% \cs{g_@@_result_tl}. To allow nested mappings, increase the
-% nesting depth \cs{g__prg_map_int} (shared between all modules), then
+% nesting depth \cs{g__kernel_prg_map_int} (shared between all modules), then
% define the looping macro, which has a name specific to that nesting
% depth. That looping grabs the \meta{tokens}, \meta{catcode} and
% \meta{char code}; it checks for the end of the loop with
@@ -912,9 +912,9 @@
\cs_new_protected:Npn \@@_map_inline:nn #1
{
\@@:n {#1}
- \int_gincr:N \g__prg_map_int
+ \int_gincr:N \g__kernel_prg_map_int
\exp_args:Nc \@@_map_inline_aux:Nn
- { @@_map_inline_ \int_use:N \g__prg_map_int :wNw }
+ { @@_map_inline_ \int_use:N \g__kernel_prg_map_int :wNw }
}
\cs_new_protected:Npn \@@_map_inline_aux:Nn #1#2
{
@@ -927,7 +927,7 @@
\exp_after:wN #1
\g_@@_result_tl
\s__tl { ? \tl_map_break: } \s__tl
- \prg_break_point:Nn \tl_map_break: { \int_gdecr:N \g__prg_map_int }
+ \prg_break_point:Nn \tl_map_break: { \int_gdecr:N \g__kernel_prg_map_int }
}
% \end{macrocode}
% \end{macro}
diff --git a/l3kernel/l3tl.dtx b/l3kernel/l3tl.dtx
index 6af759d..653b487 100644
--- a/l3kernel/l3tl.dtx
+++ b/l3kernel/l3tl.dtx
@@ -2225,19 +2225,19 @@
% \begin{macro}{\tl_map_inline:nn}
% \begin{macro}{\tl_map_inline:Nn, \tl_map_inline:cn}
% The inline functions are straight forward by now. We use a little
-% trick with the counter \cs{g__prg_map_int} to make
+% trick with the counter \cs{g__kernel_prg_map_int} to make
% them nestable. We can also make use of \cs{@@_map_function:Nn}
% from before.
% \begin{macrocode}
\cs_new_protected:Npn \tl_map_inline:nn #1#2
{
- \int_gincr:N \g__prg_map_int
+ \int_gincr:N \g__kernel_prg_map_int
\cs_gset_protected:cpn
- { @@_map_ \int_use:N \g__prg_map_int :w } ##1 {#2}
+ { @@_map_ \int_use:N \g__kernel_prg_map_int :w } ##1 {#2}
\exp_args:Nc \@@_map_function:Nn
- { @@_map_ \int_use:N \g__prg_map_int :w }
+ { @@_map_ \int_use:N \g__kernel_prg_map_int :w }
#1 \q_recursion_tail
- \prg_break_point:Nn \tl_map_break: { \int_gdecr:N \g__prg_map_int }
+ \prg_break_point:Nn \tl_map_break: { \int_gdecr:N \g__kernel_prg_map_int }
}
\cs_new_protected:Npn \tl_map_inline:Nn
{ \exp_args:No \tl_map_inline:nn }
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index 3d4a030..3b52152 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -2082,8 +2082,8 @@ Defining \mode_if_math:F on line ...
Defining \mode_if_math:TF on line ...
Defining \group_align_safe_begin: on line ...
Defining \group_align_safe_end: on line ...
-Defining \g__prg_map_int on line ...
-\g__prg_map_int=\count...
+Defining \g__kernel_prg_map_int on line ...
+\g__kernel_prg_map_int=\count...
Defining \__prg_break_point:Nn on line ...
Defining \__prg_map_break:Nn on line ...
Defining \c_empty_clist on line ...
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index dfbee6e..39166c3 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -1763,8 +1763,8 @@ Defining \mode_if_math:F on line ...
Defining \mode_if_math:TF on line ...
Defining \group_align_safe_begin: on line ...
Defining \group_align_safe_end: on line ...
-Defining \g__prg_map_int on line ...
-\g__prg_map_int=\count...
+Defining \g__kernel_prg_map_int on line ...
+\g__kernel_prg_map_int=\count...
Defining \__prg_break_point:Nn on line ...
Defining \__prg_map_break:Nn on line ...
Defining \c_empty_clist on line ...
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index 5c5e490..60d620b 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -1763,8 +1763,8 @@ Defining \mode_if_math:F on line ...
Defining \mode_if_math:TF on line ...
Defining \group_align_safe_begin: on line ...
Defining \group_align_safe_end: on line ...
-Defining \g__prg_map_int on line ...
-\g__prg_map_int=\count...
+Defining \g__kernel_prg_map_int on line ...
+\g__kernel_prg_map_int=\count...
Defining \__prg_break_point:Nn on line ...
Defining \__prg_map_break:Nn on line ...
Defining \c_empty_clist on line ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index f511991..b47a864 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -1763,8 +1763,8 @@ Defining \mode_if_math:F on line ...
Defining \mode_if_math:TF on line ...
Defining \group_align_safe_begin: on line ...
Defining \group_align_safe_end: on line ...
-Defining \g__prg_map_int on line ...
-\g__prg_map_int=\count...
+Defining \g__kernel_prg_map_int on line ...
+\g__kernel_prg_map_int=\count...
Defining \__prg_break_point:Nn on line ...
Defining \__prg_map_break:Nn on line ...
Defining \c_empty_clist on line ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index 9670d1f..7226d64 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -2080,8 +2080,8 @@ Defining \mode_if_math:F on line ...
Defining \mode_if_math:TF on line ...
Defining \group_align_safe_begin: on line ...
Defining \group_align_safe_end: on line ...
-Defining \g__prg_map_int on line ...
-\g__prg_map_int=\count...
+Defining \g__kernel_prg_map_int on line ...
+\g__kernel_prg_map_int=\count...
Defining \__prg_break_point:Nn on line ...
Defining \__prg_map_break:Nn on line ...
Defining \c_empty_clist on line ...
diff --git a/l3kernel/testfiles/m3expl002.luatex.tlg b/l3kernel/testfiles/m3expl002.luatex.tlg
index 4206147..40ae512 100644
--- a/l3kernel/testfiles/m3expl002.luatex.tlg
+++ b/l3kernel/testfiles/m3expl002.luatex.tlg
@@ -9,7 +9,7 @@ Don't change this file in any respect.
\g_tmpa_int=\count...
\g_tmpb_int=\count...
\g__intarray_font_int=\count...
-\g__prg_map_int=\count...
+\g__kernel_prg_map_int=\count...
\c_log_iow=\count...
\l_iow_line_count_int=\count...
\l__iow_line_target_int=\count...
diff --git a/l3kernel/testfiles/m3expl002.ptex.tlg b/l3kernel/testfiles/m3expl002.ptex.tlg
index 1dceea0..925b57d 100644
--- a/l3kernel/testfiles/m3expl002.ptex.tlg
+++ b/l3kernel/testfiles/m3expl002.ptex.tlg
@@ -8,7 +8,7 @@ Don't change this file in any respect.
\g_tmpa_int=\count...
\g_tmpb_int=\count...
\g__intarray_font_int=\count...
-\g__prg_map_int=\count...
+\g__kernel_prg_map_int=\count...
\c_log_iow=\count...
\l_iow_line_count_int=\count...
\l__iow_line_target_int=\count...
diff --git a/l3kernel/testfiles/m3expl002.tlg b/l3kernel/testfiles/m3expl002.tlg
index ff75d7c..089ed0c 100644
--- a/l3kernel/testfiles/m3expl002.tlg
+++ b/l3kernel/testfiles/m3expl002.tlg
@@ -8,7 +8,7 @@ Don't change this file in any respect.
\g_tmpa_int=\count...
\g_tmpb_int=\count...
\g__intarray_font_int=\count...
-\g__prg_map_int=\count...
+\g__kernel_prg_map_int=\count...
\c_log_iow=\count...
\l_iow_line_count_int=\count...
\l__iow_line_target_int=\count...
diff --git a/l3kernel/testfiles/m3expl002.uptex.tlg b/l3kernel/testfiles/m3expl002.uptex.tlg
index dc5b2f6..c7d1c2e 100644
--- a/l3kernel/testfiles/m3expl002.uptex.tlg
+++ b/l3kernel/testfiles/m3expl002.uptex.tlg
@@ -8,7 +8,7 @@ Don't change this file in any respect.
\g_tmpa_int=\count...
\g_tmpb_int=\count...
\g__intarray_font_int=\count...
-\g__prg_map_int=\count...
+\g__kernel_prg_map_int=\count...
\c_log_iow=\count...
\l_iow_line_count_int=\count...
\l__iow_line_target_int=\count...
diff --git a/l3kernel/testfiles/m3expl002.xetex.tlg b/l3kernel/testfiles/m3expl002.xetex.tlg
index 84d827d..9714709 100644
--- a/l3kernel/testfiles/m3expl002.xetex.tlg
+++ b/l3kernel/testfiles/m3expl002.xetex.tlg
@@ -8,7 +8,7 @@ Don't change this file in any respect.
\g_tmpa_int=\count...
\g_tmpb_int=\count...
\g__intarray_font_int=\count...
-\g__prg_map_int=\count...
+\g__kernel_prg_map_int=\count...
\c_log_iow=\count...
\l_iow_line_count_int=\count...
\l__iow_line_target_int=\count...
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index 3d4a030..3b52152 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -2082,8 +2082,8 @@ Defining \mode_if_math:F on line ...
Defining \mode_if_math:TF on line ...
Defining \group_align_safe_begin: on line ...
Defining \group_align_safe_end: on line ...
-Defining \g__prg_map_int on line ...
-\g__prg_map_int=\count...
+Defining \g__kernel_prg_map_int on line ...
+\g__kernel_prg_map_int=\count...
Defining \__prg_break_point:Nn on line ...
Defining \__prg_map_break:Nn on line ...
Defining \c_empty_clist on line ...
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index dfbee6e..39166c3 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -1763,8 +1763,8 @@ Defining \mode_if_math:F on line ...
Defining \mode_if_math:TF on line ...
Defining \group_align_safe_begin: on line ...
Defining \group_align_safe_end: on line ...
-Defining \g__prg_map_int on line ...
-\g__prg_map_int=\count...
+Defining \g__kernel_prg_map_int on line ...
+\g__kernel_prg_map_int=\count...
Defining \__prg_break_point:Nn on line ...
Defining \__prg_map_break:Nn on line ...
Defining \c_empty_clist on line ...
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index 5c5e490..60d620b 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -1763,8 +1763,8 @@ Defining \mode_if_math:F on line ...
Defining \mode_if_math:TF on line ...
Defining \group_align_safe_begin: on line ...
Defining \group_align_safe_end: on line ...
-Defining \g__prg_map_int on line ...
-\g__prg_map_int=\count...
+Defining \g__kernel_prg_map_int on line ...
+\g__kernel_prg_map_int=\count...
Defining \__prg_break_point:Nn on line ...
Defining \__prg_map_break:Nn on line ...
Defining \c_empty_clist on line ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index f511991..b47a864 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -1763,8 +1763,8 @@ Defining \mode_if_math:F on line ...
Defining \mode_if_math:TF on line ...
Defining \group_align_safe_begin: on line ...
Defining \group_align_safe_end: on line ...
-Defining \g__prg_map_int on line ...
-\g__prg_map_int=\count...
+Defining \g__kernel_prg_map_int on line ...
+\g__kernel_prg_map_int=\count...
Defining \__prg_break_point:Nn on line ...
Defining \__prg_map_break:Nn on line ...
Defining \c_empty_clist on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index 9670d1f..7226d64 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -2080,8 +2080,8 @@ Defining \mode_if_math:F on line ...
Defining \mode_if_math:TF on line ...
Defining \group_align_safe_begin: on line ...
Defining \group_align_safe_end: on line ...
-Defining \g__prg_map_int on line ...
-\g__prg_map_int=\count...
+Defining \g__kernel_prg_map_int on line ...
+\g__kernel_prg_map_int=\count...
Defining \__prg_break_point:Nn on line ...
Defining \__prg_map_break:Nn on line ...
Defining \c_empty_clist on line ...
diff --git a/l3kernel/testfiles/m3expl004.luatex.tlg b/l3kernel/testfiles/m3expl004.luatex.tlg
index 4206147..40ae512 100644
--- a/l3kernel/testfiles/m3expl004.luatex.tlg
+++ b/l3kernel/testfiles/m3expl004.luatex.tlg
@@ -9,7 +9,7 @@ Don't change this file in any respect.
\g_tmpa_int=\count...
\g_tmpb_int=\count...
\g__intarray_font_int=\count...
-\g__prg_map_int=\count...
+\g__kernel_prg_map_int=\count...
\c_log_iow=\count...
\l_iow_line_count_int=\count...
\l__iow_line_target_int=\count...
diff --git a/l3kernel/testfiles/m3expl004.ptex.tlg b/l3kernel/testfiles/m3expl004.ptex.tlg
index 1dceea0..925b57d 100644
--- a/l3kernel/testfiles/m3expl004.ptex.tlg
+++ b/l3kernel/testfiles/m3expl004.ptex.tlg
@@ -8,7 +8,7 @@ Don't change this file in any respect.
\g_tmpa_int=\count...
\g_tmpb_int=\count...
\g__intarray_font_int=\count...
-\g__prg_map_int=\count...
+\g__kernel_prg_map_int=\count...
\c_log_iow=\count...
\l_iow_line_count_int=\count...
\l__iow_line_target_int=\count...
diff --git a/l3kernel/testfiles/m3expl004.tlg b/l3kernel/testfiles/m3expl004.tlg
index ff75d7c..089ed0c 100644
--- a/l3kernel/testfiles/m3expl004.tlg
+++ b/l3kernel/testfiles/m3expl004.tlg
@@ -8,7 +8,7 @@ Don't change this file in any respect.
\g_tmpa_int=\count...
\g_tmpb_int=\count...
\g__intarray_font_int=\count...
-\g__prg_map_int=\count...
+\g__kernel_prg_map_int=\count...
\c_log_iow=\count...
\l_iow_line_count_int=\count...
\l__iow_line_target_int=\count...
diff --git a/l3kernel/testfiles/m3expl004.uptex.tlg b/l3kernel/testfiles/m3expl004.uptex.tlg
index dc5b2f6..c7d1c2e 100644
--- a/l3kernel/testfiles/m3expl004.uptex.tlg
+++ b/l3kernel/testfiles/m3expl004.uptex.tlg
@@ -8,7 +8,7 @@ Don't change this file in any respect.
\g_tmpa_int=\count...
\g_tmpb_int=\count...
\g__intarray_font_int=\count...
-\g__prg_map_int=\count...
+\g__kernel_prg_map_int=\count...
\c_log_iow=\count...
\l_iow_line_count_int=\count...
\l__iow_line_target_int=\count...
diff --git a/l3kernel/testfiles/m3expl004.xetex.tlg b/l3kernel/testfiles/m3expl004.xetex.tlg
index 84d827d..9714709 100644
--- a/l3kernel/testfiles/m3expl004.xetex.tlg
+++ b/l3kernel/testfiles/m3expl004.xetex.tlg
@@ -8,7 +8,7 @@ Don't change this file in any respect.
\g_tmpa_int=\count...
\g_tmpb_int=\count...
\g__intarray_font_int=\count...
-\g__prg_map_int=\count...
+\g__kernel_prg_map_int=\count...
\c_log_iow=\count...
\l_iow_line_count_int=\count...
\l__iow_line_target_int=\count...
diff --git a/l3kernel/testfiles/m3expl006.luatex.tlg b/l3kernel/testfiles/m3expl006.luatex.tlg
index 8dfb5a8..3107683 100644
--- a/l3kernel/testfiles/m3expl006.luatex.tlg
+++ b/l3kernel/testfiles/m3expl006.luatex.tlg
@@ -10,7 +10,7 @@ Author: Bruno Le Floch and Joseph Wright
\g_tmpa_int=\count...
\g_tmpb_int=\count...
\g__intarray_font_int=\count...
-\g__prg_map_int=\count...
+\g__kernel_prg_map_int=\count...
\c_log_iow=\count...
\l_iow_line_count_int=\count...
\l__iow_line_target_int=\count...
diff --git a/l3kernel/testfiles/m3expl006.ptex.tlg b/l3kernel/testfiles/m3expl006.ptex.tlg
index db53dd5..c2be7dd 100644
--- a/l3kernel/testfiles/m3expl006.ptex.tlg
+++ b/l3kernel/testfiles/m3expl006.ptex.tlg
@@ -9,7 +9,7 @@ Author: Bruno Le Floch and Joseph Wright
\g_tmpa_int=\count...
\g_tmpb_int=\count...
\g__intarray_font_int=\count...
-\g__prg_map_int=\count...
+\g__kernel_prg_map_int=\count...
\c_log_iow=\count...
\l_iow_line_count_int=\count...
\l__iow_line_target_int=\count...
diff --git a/l3kernel/testfiles/m3expl006.tlg b/l3kernel/testfiles/m3expl006.tlg
index ea3da54..5662368 100644
--- a/l3kernel/testfiles/m3expl006.tlg
+++ b/l3kernel/testfiles/m3expl006.tlg
@@ -9,7 +9,7 @@ Author: Bruno Le Floch and Joseph Wright
\g_tmpa_int=\count...
\g_tmpb_int=\count...
\g__intarray_font_int=\count...
-\g__prg_map_int=\count...
+\g__kernel_prg_map_int=\count...
\c_log_iow=\count...
\l_iow_line_count_int=\count...
\l__iow_line_target_int=\count...
diff --git a/l3kernel/testfiles/m3expl006.uptex.tlg b/l3kernel/testfiles/m3expl006.uptex.tlg
index 3e9e116..8706458 100644
--- a/l3kernel/testfiles/m3expl006.uptex.tlg
+++ b/l3kernel/testfiles/m3expl006.uptex.tlg
@@ -9,7 +9,7 @@ Author: Bruno Le Floch and Joseph Wright
\g_tmpa_int=\count...
\g_tmpb_int=\count...
\g__intarray_font_int=\count...
-\g__prg_map_int=\count...
+\g__kernel_prg_map_int=\count...
\c_log_iow=\count...
\l_iow_line_count_int=\count...
\l__iow_line_target_int=\count...
diff --git a/l3kernel/testfiles/m3expl006.xetex.tlg b/l3kernel/testfiles/m3expl006.xetex.tlg
index 0adedb8..dd75440 100644
--- a/l3kernel/testfiles/m3expl006.xetex.tlg
+++ b/l3kernel/testfiles/m3expl006.xetex.tlg
@@ -9,7 +9,7 @@ Author: Bruno Le Floch and Joseph Wright
\g_tmpa_int=\count...
\g_tmpb_int=\count...
\g__intarray_font_int=\count...
-\g__prg_map_int=\count...
+\g__kernel_prg_map_int=\count...
\c_log_iow=\count...
\l_iow_line_count_int=\count...
\l__iow_line_target_int=\count...
More information about the latex3-commits
mailing list