[latex3-commits] [git/LaTeX3-latex3-latex3] master: Move \__chk_if_free_cs:N to kernel-reserved (c674d1f)
Joseph Wright
joseph.wright at morningstar2.co.uk
Sat Mar 31 20:54:42 CEST 2018
Repository : https://github.com/latex3/latex3
On branch : master
Link : https://github.com/latex3/latex3/commit/c674d1fc0ba52ccad83ae6ee29457ee2646e906f
>---------------------------------------------------------------
commit c674d1fc0ba52ccad83ae6ee29457ee2646e906f
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Fri Mar 30 17:52:02 2018 +0100
Move \__chk_if_free_cs:N to kernel-reserved
This one really is 'just for us'.
>---------------------------------------------------------------
c674d1fc0ba52ccad83ae6ee29457ee2646e906f
l3kernel/l3alloc.dtx | 2 +-
l3kernel/l3basics.dtx | 16 ++++++++--------
l3kernel/l3box.dtx | 2 +-
l3kernel/l3candidates.dtx | 2 +-
l3kernel/l3int.dtx | 4 ++--
l3kernel/l3intarray.dtx | 2 +-
l3kernel/l3msg.dtx | 2 +-
l3kernel/l3prop.dtx | 2 +-
l3kernel/l3quark.dtx | 2 +-
l3kernel/l3seq.dtx | 2 +-
l3kernel/l3skip.dtx | 6 +++---
l3kernel/l3tl.dtx | 6 +++---
l3kernel/l3token.dtx | 8 ++++----
l3trial/l3check/l3check.dtx | 8 ++++----
l3trial/l3trace/l3trace.dtx | 2 +-
l3trial/xfont/l3font.dtx | 10 +++++-----
16 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/l3kernel/l3alloc.dtx b/l3kernel/l3alloc.dtx
index e492841..f1140ef 100644
--- a/l3kernel/l3alloc.dtx
+++ b/l3kernel/l3alloc.dtx
@@ -164,7 +164,7 @@
% \begin{macrocode}
\cs_new_protected:Npn \@@_reg:nNnN #1#2#3#4
{
- \__chk_if_free_cs:N #4
+ \__kernel_chk_if_free_cs:N #4
\int_compare:nNnTF { \int_use:c { g_@@_ #1 _int } } < {#3}
{
\int_gincr:c { g_@@_ #1 _int }
diff --git a/l3kernel/l3basics.dtx b/l3kernel/l3basics.dtx
index 22d1525..8085495 100644
--- a/l3kernel/l3basics.dtx
+++ b/l3kernel/l3basics.dtx
@@ -1150,9 +1150,9 @@
%
% \section{Internal kernel functions}
%
-% \begin{function}{\__chk_if_free_cs:N, \__chk_if_free_cs:c}
+% \begin{function}{\__kernel_chk_if_free_cs:N, \__kernel_chk_if_free_cs:c}
% \begin{syntax}
-% \cs{__chk_if_free_cs:N} \meta{cs}
+% \cs{__kernel_chk_if_free_cs:N} \meta{cs}
% \end{syntax}
% This function checks that \meta{cs} is free according to the
% criteria for \cs{cs_if_free_p:N}, and if not raises a kernel-level
@@ -2948,7 +2948,7 @@
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\__chk_if_free_cs:N, \__chk_if_free_cs:c}
+% \begin{macro}{\__kernel_chk_if_free_cs:N, \__kernel_chk_if_free_cs:c}
% This command is called by \cs{cs_new_nopar:Npn} and \cs{cs_new_eq:NN}
% \emph{etc.}\
% to make sure that the argument sequence is not already in use. If
@@ -2959,7 +2959,7 @@
% \begin{macrocode}
\__kernel_patch:nnNNpn { }
{ \__kernel_debug_log:x { Defining~\token_to_str:N #1~ \msg_line_context: } }
-\cs_set_protected:Npn \__chk_if_free_cs:N #1
+\cs_set_protected:Npn \__kernel_chk_if_free_cs:N #1
{
\cs_if_free:NF #1
{
@@ -2967,8 +2967,8 @@
{ \token_to_str:N #1 } { \token_to_meaning:N #1 }
}
}
-\cs_set_protected:Npn \__chk_if_free_cs:c
- { \exp_args:Nc \__chk_if_free_cs:N }
+\cs_set_protected:Npn \__kernel_chk_if_free_cs:c
+ { \exp_args:Nc \__kernel_chk_if_free_cs:N }
% \end{macrocode}
% \end{macro}
%
@@ -2993,7 +2993,7 @@
{
\cs_set_protected:Npn #1 ##1
{
- \__chk_if_free_cs:N ##1
+ \__kernel_chk_if_free_cs:N ##1
#2 ##1
}
}
@@ -3122,7 +3122,7 @@
\cs_new_protected:Npn \cs_gset_eq:cc { \exp_args:Ncc \cs_gset_eq:NN }
\cs_new_protected:Npn \cs_new_eq:NN #1
{
- \__chk_if_free_cs:N #1
+ \__kernel_chk_if_free_cs:N #1
\tex_global:D \cs_set_eq:NN #1
}
\cs_new_protected:Npn \cs_new_eq:cN { \exp_args:Nc \cs_new_eq:NN }
diff --git a/l3kernel/l3box.dtx b/l3kernel/l3box.dtx
index 0ae3b45..5eec1bc 100644
--- a/l3kernel/l3box.dtx
+++ b/l3kernel/l3box.dtx
@@ -856,7 +856,7 @@
%<*package>
\cs_new_protected:Npn \box_new:N #1
{
- \__chk_if_free_cs:N #1
+ \__kernel_chk_if_free_cs:N #1
\cs:w newbox \cs_end: #1
}
%</package>
diff --git a/l3kernel/l3candidates.dtx b/l3kernel/l3candidates.dtx
index 355bf44..8673bff 100644
--- a/l3kernel/l3candidates.dtx
+++ b/l3kernel/l3candidates.dtx
@@ -2075,7 +2075,7 @@
\__kernel_patch:nnNNpn { \__kernel_chk_var_scope:NN c #1 } { }
\cs_new_protected:Npn \bool_const:Nn #1#2
{
- \__chk_if_free_cs:N #1
+ \__kernel_chk_if_free_cs:N #1
\tex_global:D \tex_chardef:D #1 = \bool_if_p:n {#2}
}
\cs_generate_variant:Nn \bool_const:Nn { c }
diff --git a/l3kernel/l3int.dtx b/l3kernel/l3int.dtx
index 95ccfc8..3c939eb 100644
--- a/l3kernel/l3int.dtx
+++ b/l3kernel/l3int.dtx
@@ -1162,7 +1162,7 @@
%<*package>
\cs_new_protected:Npn \int_new:N #1
{
- \__chk_if_free_cs:N #1
+ \__kernel_chk_if_free_cs:N #1
\cs:w newcount \cs_end: #1
}
%</package>
@@ -1199,7 +1199,7 @@
\tex_global:D
}
{
- \__chk_if_free_cs:N #1
+ \__kernel_chk_if_free_cs:N #1
\tex_global:D \@@_constdef:Nw
}
}
diff --git a/l3kernel/l3intarray.dtx b/l3kernel/l3intarray.dtx
index 382ffff..d5128f6 100644
--- a/l3kernel/l3intarray.dtx
+++ b/l3kernel/l3intarray.dtx
@@ -162,7 +162,7 @@
% \begin{macrocode}
\cs_new_protected:Npn \intarray_new:Nn #1#2
{
- \__chk_if_free_cs:N #1
+ \__kernel_chk_if_free_cs:N #1
\int_gincr:N \g_@@_font_int
\tex_global:D \tex_font:D #1
= cmr10~at~ \g_@@_font_int \c_@@_sp_dim \scan_stop:
diff --git a/l3kernel/l3msg.dtx b/l3kernel/l3msg.dtx
index c744b28..3bc3b95 100644
--- a/l3kernel/l3msg.dtx
+++ b/l3kernel/l3msg.dtx
@@ -738,7 +738,7 @@
% \end{macro}
%
% \begin{macro}{\__chk_if_free_msg:nn}
-% This auxiliary is similar to \cs{__chk_if_free_cs:N}, and is used when
+% This auxiliary is similar to \cs{__kernel_chk_if_free_cs:N}, and is used when
% defining messages with \cs{msg_new:nnnn}.
% \begin{macrocode}
\__kernel_patch:nnNNpn { }
diff --git a/l3kernel/l3prop.dtx b/l3kernel/l3prop.dtx
index a2b5d08..496c860 100644
--- a/l3kernel/l3prop.dtx
+++ b/l3kernel/l3prop.dtx
@@ -561,7 +561,7 @@
% \begin{macrocode}
\cs_new_protected:Npn \prop_new:N #1
{
- \__chk_if_free_cs:N #1
+ \__kernel_chk_if_free_cs:N #1
\cs_gset_eq:NN #1 \c_empty_prop
}
\cs_generate_variant:Nn \prop_new:N { c }
diff --git a/l3kernel/l3quark.dtx b/l3kernel/l3quark.dtx
index 2679e5c..69efece 100644
--- a/l3kernel/l3quark.dtx
+++ b/l3kernel/l3quark.dtx
@@ -378,7 +378,7 @@
\__kernel_patch:nnNNpn { \__kernel_chk_var_scope:NN q #1 } { }
\cs_new_protected:Npn \quark_new:N #1
{
- \__chk_if_free_cs:N #1
+ \__kernel_chk_if_free_cs:N #1
\cs_gset_nopar:Npn #1 {#1}
}
% \end{macrocode}
diff --git a/l3kernel/l3seq.dtx b/l3kernel/l3seq.dtx
index d01057c..614285f 100644
--- a/l3kernel/l3seq.dtx
+++ b/l3kernel/l3seq.dtx
@@ -962,7 +962,7 @@
% \begin{macrocode}
\cs_new_protected:Npn \seq_new:N #1
{
- \__chk_if_free_cs:N #1
+ \__kernel_chk_if_free_cs:N #1
\cs_gset_eq:NN #1 \c_empty_seq
}
\cs_generate_variant:Nn \seq_new:N { c }
diff --git a/l3kernel/l3skip.dtx b/l3kernel/l3skip.dtx
index 86d2b3c..28e1e3d 100644
--- a/l3kernel/l3skip.dtx
+++ b/l3kernel/l3skip.dtx
@@ -1106,7 +1106,7 @@
%<*package>
\cs_new_protected:Npn \dim_new:N #1
{
- \__chk_if_free_cs:N #1
+ \__kernel_chk_if_free_cs:N #1
\cs:w newdimen \cs_end: #1
}
%</package>
@@ -1814,7 +1814,7 @@
%<*package>
\cs_new_protected:Npn \skip_new:N #1
{
- \__chk_if_free_cs:N #1
+ \__kernel_chk_if_free_cs:N #1
\cs:w newskip \cs_end: #1
}
%</package>
@@ -2102,7 +2102,7 @@
%<*package>
\cs_new_protected:Npn \muskip_new:N #1
{
- \__chk_if_free_cs:N #1
+ \__kernel_chk_if_free_cs:N #1
\cs:w newmuskip \cs_end: #1
}
%</package>
diff --git a/l3kernel/l3tl.dtx b/l3kernel/l3tl.dtx
index 32f16a1..a2d0299 100644
--- a/l3kernel/l3tl.dtx
+++ b/l3kernel/l3tl.dtx
@@ -1115,7 +1115,7 @@
% \begin{macrocode}
\cs_new_protected:Npn \tl_new:N #1
{
- \__chk_if_free_cs:N #1
+ \__kernel_chk_if_free_cs:N #1
\cs_gset_eq:NN #1 \c_empty_tl
}
\cs_generate_variant:Nn \tl_new:N { c }
@@ -1128,13 +1128,13 @@
\__kernel_patch:nnNNpn { \__kernel_chk_var_scope:NN c #1 } { }
\cs_new_protected:Npn \tl_const:Nn #1#2
{
- \__chk_if_free_cs:N #1
+ \__kernel_chk_if_free_cs:N #1
\cs_gset_nopar:Npx #1 { \exp_not:n {#2} }
}
\__kernel_patch:nnNNpn { \__kernel_chk_var_scope:NN c #1 } { }
\cs_new_protected:Npn \tl_const:Nx #1#2
{
- \__chk_if_free_cs:N #1
+ \__kernel_chk_if_free_cs:N #1
\cs_gset_nopar:Npx #1 {#2}
}
\cs_generate_variant:Nn \tl_const:Nn { c }
diff --git a/l3kernel/l3token.dtx b/l3kernel/l3token.dtx
index e4956b3..c4763e9 100644
--- a/l3kernel/l3token.dtx
+++ b/l3kernel/l3token.dtx
@@ -1617,12 +1617,12 @@
% \emph{work} with \cs{cs_new_eq:NN} but that's not really a great idea to
% show off: we want people to stick to the defined interfaces and that
% includes us.) So that these few odd names go into the log when appropriate
-% there is a need to hand-apply the \cs{__chk_if_free_cs:N} check.
+% there is a need to hand-apply the \cs{__kernel_chk_if_free_cs:N} check.
% \begin{macrocode}
\group_begin:
- \__chk_if_free_cs:N \c_group_begin_token
+ \__kernel_chk_if_free_cs:N \c_group_begin_token
\tex_global:D \tex_let:D \c_group_begin_token {
- \__chk_if_free_cs:N \c_group_end_token
+ \__kernel_chk_if_free_cs:N \c_group_end_token
\tex_global:D \tex_let:D \c_group_end_token }
\char_set_catcode_math_toggle:N \*
\cs_new_eq:NN \c_math_toggle_token *
@@ -1632,7 +1632,7 @@
\cs_new_eq:NN \c_math_superscript_token ^
\char_set_catcode_math_subscript:N \*
\cs_new_eq:NN \c_math_subscript_token *
- \__chk_if_free_cs:N \c_space_token
+ \__kernel_chk_if_free_cs:N \c_space_token
\use:n { \tex_global:D \tex_let:D \c_space_token = ~ } ~
\cs_new_eq:NN \c_catcode_letter_token a
\cs_new_eq:NN \c_catcode_other_token 1
diff --git a/l3trial/l3check/l3check.dtx b/l3trial/l3check/l3check.dtx
index 9f9f955..8c9a73a 100644
--- a/l3trial/l3check/l3check.dtx
+++ b/l3trial/l3check/l3check.dtx
@@ -1173,7 +1173,7 @@
% than defining them in terms of \cs{cs_set_eq:NN}
% \begin{macrocode}
\cs_gset_protected:Npn \cs_gset_eq:NN #1 { \tex_global:D \tex_let:D #1 = ~ }
- \cs_gset_protected:Npn \cs_new_eq:NN #1 { \__chk_if_free_cs:N #1 \tex_global:D \tex_let:D #1 = ~ }
+ \cs_gset_protected:Npn \cs_new_eq:NN #1 { \__kernel_chk_if_free_cs:N #1 \tex_global:D \tex_let:D #1 = ~ }
% \end{macrocode}
%
% We could change \cs{group_begin:}, \cs{group_end:},
@@ -1380,20 +1380,20 @@
}
% \end{macrocode}
%
-% In \cs{int_new:N} etc., there appears \cs{__chk_if_free_cs:N}, which
+% In \cs{int_new:N} etc., there appears \cs{__kernel_chk_if_free_cs:N}, which
% calls \cs{cs_if_free:NF}. Replace that by \cs{@@_old_cs_if_free:NF}
% to avoid balking at variables.
% \begin{macrocode}
\use:x
{
- \exp_not:n { \cs_gset_protected:Npn \__chk_if_free_cs:N #1 }
+ \exp_not:n { \cs_gset_protected:Npn \__kernel_chk_if_free_cs:N #1 }
{
\exp_not:f
{
\exp_after:wN \use_i_ii:nnn
\exp_after:wN \exp_stop_f:
\exp_after:wN \@@_old_cs_if_free:NF
- \__chk_if_free_cs:N {#1}
+ \__kernel_chk_if_free_cs:N {#1}
}
}
}
diff --git a/l3trial/l3trace/l3trace.dtx b/l3trial/l3trace/l3trace.dtx
index 29a3f4f..0ca9481 100644
--- a/l3trial/l3trace/l3trace.dtx
+++ b/l3trial/l3trace/l3trace.dtx
@@ -356,7 +356,7 @@
\int_compare:nNnT \l_trace_internal_int > \c_zero
{
\group_begin:
- \cs_set_eq:NN \__chk_if_free_cs:N \use_none:n
+ \cs_set_eq:NN \__kernel_chk_if_free_cs:N \use_none:n
\cs_set_eq:NN \chk_if_free_msg:nn \use_none:nn
\file_if_exist:nTF { \l_keys_key_tl -trace.sty }
{ \RequirePackage { \l_keys_key_tl -trace } }
diff --git a/l3trial/xfont/l3font.dtx b/l3trial/xfont/l3font.dtx
index 7e49d80..f6bfcd0 100644
--- a/l3trial/xfont/l3font.dtx
+++ b/l3trial/xfont/l3font.dtx
@@ -302,7 +302,7 @@
% \begin{macrocode}
\cs_new_protected:Npn \fontface_new:Nn #1#2
{
- \__chk_if_free_cs:N #1
+ \__kernel_chk_if_free_cs:N #1
\fontface_gset:Nn #1 {#2}
}
\cs_generate_variant:Nn \fontface_new:Nn {c}
@@ -510,7 +510,7 @@
% \begin{macrocode}
\cs_new_protected:Npn \math_new_accent:NNnn #1
{
- \__chk_if_free_cs:N #1
+ \__kernel_chk_if_free_cs:N #1
\math_gset_accent:NNnn #1
}
\cs_new_protected:Npn \math_gset_accent:NNnn #1#2#3#4
@@ -530,7 +530,7 @@
% \begin{macrocode}
\cs_new_protected:Npn \math_new_symbol:NNnn #1
{
- \__chk_if_free_cs:N #1
+ \__kernel_chk_if_free_cs:N #1
\math_gset_symbol:NNnn #1
}
\cs_new_protected:Npn \math_gset_symbol:NNnn #1#2#3#4
@@ -561,7 +561,7 @@
% \begin{macrocode}
\cs_new_protected:Npn \math_new_delimiter:NNnn #1
{
- \__chk_if_free_cs:N #1
+ \__kernel_chk_if_free_cs:N #1
\math_gset_delimiter:NNnn #1
}
\cs_new_protected:Npn \math_gset_delimiter:NNnnnn #1#2#3#4#5#6
@@ -601,7 +601,7 @@
% \begin{macrocode}
\cs_new_protected:Npn \math_new_radical:NNnn #1
{
- \__chk_if_free_cs:N #1
+ \__kernel_chk_if_free_cs:N #1
\math_gset_radical:NNnn #1
}
\cs_new_protected:Npn \math_gset_radical:Nnnnn #1#2#3#4#5
More information about the latex3-commits
mailing list