Ensure all fun. and var. are defined globally

latex3 · Feb 27, 2024 · 2eab9a8 · 2eab9a8
1 parent 40b79bc
commit 2eab9a8
Show file tree

Hide file tree

Showing 10 changed files with 270 additions and 270 deletions.
diff --git a/l3kernel/CHANGELOG.md b/l3kernel/CHANGELOG.md
@@ -9,7 +9,7 @@ this project uses date-based 'snapshot' version identifiers.
 
 ### Fixed
 - Typeset `TF` of internal conditionals in current color (issue \#730)
-
+- Some functions and variables were defined locally
 ## [2024-02-20]
 
 ### Changed

diff --git a/l3kernel/l3basics.dtx b/l3kernel/l3basics.dtx
diff --git a/l3kernel/l3bootstrap.dtx b/l3kernel/l3bootstrap.dtx
@@ -302,7 +302,7 @@ Type  H <return>  for immediate help}\def~{\errmessage{%
 % \begin{variable}{\l_@@_expl_bool}
 %   The status for code syntax: this is on at present.
 %    \begin{macrocode}
-\chardef\l_@@_expl_bool = 1\relax
+\global\chardef\l_@@_expl_bool = 1\relax
 %    \end{macrocode}
 %\end{variable}
 %

diff --git a/l3kernel/l3coffins.dtx b/l3kernel/l3coffins.dtx
@@ -1302,7 +1302,7 @@
 %     y = s ( x - a ) + b
 %   \]
 %    \begin{macrocode}
-\cs_set_protected:Npn \@@_calculate_intersection:nnnnnn #1#2#3#4#5#6
+\cs_new_protected:Npn \@@_calculate_intersection:nnnnnn #1#2#3#4#5#6
   {
     \fp_compare:nNnTF {#1} = {#2}
       { \bool_set_true:N \l_@@_error_bool }

diff --git a/l3kernel/l3deprecation.dtx b/l3kernel/l3deprecation.dtx
@@ -300,13 +300,13 @@
 %   too long.
 %    \begin{macrocode}
 %\__kernel_patch_deprecation:nnNNpn { 2024-01-10 } { \keys_set_exclude_groups:nnn }
-\cs_set_protected:Npn \keys_set_filter:nnn { \keys_set_exclude_groups:nnn }
+\cs_new_protected:Npn \keys_set_filter:nnn { \keys_set_exclude_groups:nnn }
 \cs_generate_variant:Nn \keys_set_filter:nnn { nnV , nnv , nno }
 %\__kernel_patch_deprecation:nnNNpn { 2024-01-10 } { \keys_set_exclude_groups:nnnN }
-\cs_set_protected:Npn  \keys_set_filter:nnnN { \keys_set_exclude_groups:nnnN }
+\cs_new_protected:Npn  \keys_set_filter:nnnN { \keys_set_exclude_groups:nnnN }
 \cs_generate_variant:Nn \keys_set_filter:nnnN { nnV , nnv , nno }
 %\__kernel_patch_deprecation:nnNNpn { 2024-01-10 } { \keys_set_exclude_groups:nnnnN }
-\cs_set_protected:Npn  \keys_set_filter:nnnnN { \keys_set_exclude_groups:nnnnN }
+\cs_new_protected:Npn  \keys_set_filter:nnnnN { \keys_set_exclude_groups:nnnnN }
 \cs_generate_variant:Nn \keys_set_filter:nnnnN { nnV , nnv , nno }
 %    \end{macrocode}
 % \end{macro}

diff --git a/l3kernel/l3int.dtx b/l3kernel/l3int.dtx
@@ -1215,15 +1215,15 @@
   }
 \cs_new:Npn \@@_abs:N #1
   { \if_meaning:w - #1 \else: \exp_after:wN #1 \fi: }
-\cs_set:Npn \int_max:nn #1#2
+\cs_new:Npn \int_max:nn #1#2
   {
     \int_value:w \exp_after:wN \@@_maxmin:wwN
       \int_value:w \@@_eval:w #1 \exp_after:wN ;
       \int_value:w \@@_eval:w #2 ;
       >
     \exp_stop_f:
   }
-\cs_set:Npn \int_min:nn #1#2
+\cs_new:Npn \int_min:nn #1#2
   {
     \int_value:w \exp_after:wN \@@_maxmin:wwN
       \int_value:w \@@_eval:w #1 \exp_after:wN ;
@@ -1395,10 +1395,10 @@
     \cs_if_exist:NTF \tex_omathchardef:D
       { \cs_new_eq:NN \@@_constdef:Nw \tex_omathchardef:D }
       { \cs_new_eq:NN \@@_constdef:Nw \tex_chardef:D }
-    \@@_constdef:Nw \c_@@_max_constdef_int 1114111 ~
+    \tex_global:D \@@_constdef:Nw \c_@@_max_constdef_int 1114111 ~
 \else:
   \cs_new_eq:NN \@@_constdef:Nw \tex_mathchardef:D
-  \tex_mathchardef:D \c_@@_max_constdef_int 32767 ~
+  \tex_global:D \@@_constdef:Nw \c_@@_max_constdef_int 32767 ~
 \fi:
 %    \end{macrocode}
 % \end{variable}

diff --git a/l3kernel/l3luatex.dtx b/l3kernel/l3luatex.dtx
@@ -267,7 +267,7 @@
         \lua_now:n , \lua_now:e
       }
       {
-        \cs_set:Npn #1 ##1
+        \cs_gset:Npn #1 ##1
           {
             \msg_expandable_error:nnn
               { luatex } { luatex-required } { #1 }
@@ -276,7 +276,7 @@
     \clist_map_inline:nn
       { \lua_shipout_e:n , \lua_shipout:n, \lua_load_module:n }
       {
-        \cs_set_protected:Npn #1 ##1
+        \cs_gset_protected:Npn #1 ##1
           {
             \msg_error:nnn
               { luatex } { luatex-required } { #1 }

diff --git a/l3kernel/l3regex.dtx b/l3kernel/l3regex.dtx
@@ -4155,7 +4155,7 @@
 %   incorrect). That's clunky, but not too expensive, since it's only
 %   one test.
 %    \begin{macrocode}
-\cs_set:Npn \@@_show_class:NnnnN #1#2#3#4#5
+\cs_new:Npn \@@_show_class:NnnnN #1#2#3#4#5
   {
     \group_begin:
       \tl_build_begin:N \l_@@_build_tl

diff --git a/l3kernel/l3text.dtx b/l3kernel/l3text.dtx
@@ -889,12 +889,12 @@
 %   {\c_@@_chardef_group_end_token, \c_@@_mathchardef_group_end_token}
 %   Markers for implict char handling.
 %    \begin{macrocode}
-\tex_chardef:D \c_@@_chardef_space_token = `\  %
-\tex_mathchardef:D \c_@@_mathchardef_space_token = `\  %
-\tex_chardef:D \c_@@_chardef_group_begin_token = `\{ % `\}
-\tex_mathchardef:D \c_@@_mathchardef_group_begin_token = `\{ % `\} `\{
-\tex_chardef:D \c_@@_chardef_group_end_token = `\} % `\{
-\tex_mathchardef:D \c_@@_mathchardef_group_end_token = `\} %
+\tex_global:D \tex_chardef:D \c_@@_chardef_space_token = `\  %
+\tex_global:D \tex_mathchardef:D \c_@@_mathchardef_space_token = `\  %
+\tex_global:D \tex_chardef:D \c_@@_chardef_group_begin_token = `\{ % `\}
+\tex_global:D \tex_mathchardef:D \c_@@_mathchardef_group_begin_token = `\{ % `\} `\{
+\tex_global:D \tex_chardef:D \c_@@_chardef_group_end_token = `\} % `\{
+\tex_global:D \tex_mathchardef:D \c_@@_mathchardef_group_end_token = `\} %
 %    \end{macrocode}
 % \end{variable}
 % \end{variable}

diff --git a/l3kernel/l3token.dtx b/l3kernel/l3token.dtx
@@ -2376,7 +2376,7 @@ end
       }
   }
   {
-    \tex_chardef:D \c_@@_A_int = `A ~ %
+    \tex_global:D \tex_chardef:D \c_@@_A_int = `A ~ %
     \use:e
       {
         \prg_new_conditional:Npnn \exp_not:N \token_if_primitive:N #1