[latex3-commits] [git/LaTeX3-latex3-latex3] msg: Move 'show' messages to kernel (64b9675ad)
Joseph Wright
joseph.wright at morningstar2.co.uk
Wed Feb 17 17:14:41 CET 2021
Repository : https://github.com/latex3/latex3
On branch : msg
Link : https://github.com/latex3/latex3/commit/64b9675ada6ada82536e9e1d344c6ead3b359dee
>---------------------------------------------------------------
commit 64b9675ada6ada82536e9e1d344c6ead3b359dee
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Wed Feb 17 14:35:39 2021 +0000
Move 'show' messages to kernel
>---------------------------------------------------------------
64b9675ada6ada82536e9e1d344c6ead3b359dee
l3kernel/l3clist.dtx | 12 ++++++------
l3kernel/l3coffins.dtx | 6 +++---
l3kernel/l3color.dtx | 2 +-
l3kernel/l3file.dtx | 18 +++++++++---------
l3kernel/l3intarray.dtx | 6 +++---
l3kernel/l3keys.dtx | 6 +++---
l3kernel/l3msg.dtx | 16 ++++++++++++++++
l3kernel/l3prop.dtx | 6 +++---
l3kernel/l3regex.dtx | 4 ++--
l3kernel/l3seq.dtx | 6 +++---
l3kernel/l3tl-analysis.dtx | 4 ++--
11 files changed, 51 insertions(+), 35 deletions(-)
diff --git a/l3kernel/l3clist.dtx b/l3kernel/l3clist.dtx
index c93abed43..2c1bb1415 100644
--- a/l3kernel/l3clist.dtx
+++ b/l3kernel/l3clist.dtx
@@ -2012,15 +2012,15 @@
% Apply the general \cs{__kernel_chk_defined:NT} and
% \cs{msg_show:nnnnnn}.
% \begin{macrocode}
-\cs_new_protected:Npn \clist_show:N { \@@_show:NN \msg_show:nnxxxx }
+\cs_new_protected:Npn \clist_show:N { \@@_show:NN \__kernel_msg_show:nnxxxx }
\cs_generate_variant:Nn \clist_show:N { c }
-\cs_new_protected:Npn \clist_log:N { \@@_show:NN \msg_log:nnxxxx }
+\cs_new_protected:Npn \clist_log:N { \@@_show:NN \__kernel_msg_log:nnxxxx }
\cs_generate_variant:Nn \clist_log:N { c }
\cs_new_protected:Npn \@@_show:NN #1#2
{
\__kernel_chk_defined:NT #2
{
- #1 { LaTeX / clist } { show }
+ #1 { clist } { show }
{ \token_to_str:N #2 }
{ \clist_map_function:NN #2 \msg_show_item:n }
{ } { }
@@ -2033,11 +2033,11 @@
% A variant of the above: no existence check, empty first argument for
% the message.
% \begin{macrocode}
-\cs_new_protected:Npn \clist_show:n { \@@_show:Nn \msg_show:nnxxxx }
-\cs_new_protected:Npn \clist_log:n { \@@_show:Nn \msg_log:nnxxxx }
+\cs_new_protected:Npn \clist_show:n { \@@_show:Nn \__kernel_msg_show:nnxxxx }
+\cs_new_protected:Npn \clist_log:n { \@@_show:Nn \__kernel_msg_log:nnxxxx }
\cs_new_protected:Npn \@@_show:Nn #1#2
{
- #1 { LaTeX / clist } { show }
+ #1 { clist } { show }
{ } { \clist_map_function:nN {#2} \msg_show_item:n } { } { }
}
% \end{macrocode}
diff --git a/l3kernel/l3coffins.dtx b/l3kernel/l3coffins.dtx
index 76f1beaca..ac14fb603 100644
--- a/l3kernel/l3coffins.dtx
+++ b/l3kernel/l3coffins.dtx
@@ -2454,16 +2454,16 @@
% structure then the code complains.
% \begin{macrocode}
\cs_new_protected:Npn \coffin_show_structure:N
- { \@@_show_structure:NN \msg_show:nnxxxx }
+ { \@@_show_structure:NN \__kernel_msg_show:nnxxxx }
\cs_generate_variant:Nn \coffin_show_structure:N { c }
\cs_new_protected:Npn \coffin_log_structure:N
- { \@@_show_structure:NN \msg_log:nnxxxx }
+ { \@@_show_structure:NN \__kernel_msg_log:nnxxxx }
\cs_generate_variant:Nn \coffin_log_structure:N { c }
\cs_new_protected:Npn \@@_show_structure:NN #1#2
{
\@@_if_exist:NT #2
{
- #1 { LaTeX / coffins } { show-coffin }
+ #1 { coffins } { show-coffin }
{ \token_to_str:N #2 }
{
\iow_newline: >~ ht ~=~ \dim_eval:n { \coffin_ht:N #2 }
diff --git a/l3kernel/l3color.dtx b/l3kernel/l3color.dtx
index c73cbd571..c246cd5e2 100644
--- a/l3kernel/l3color.dtx
+++ b/l3kernel/l3color.dtx
@@ -2499,7 +2499,7 @@
% \begin{macrocode}
\cs_new_protected:Npn \color_show:n #1
{
- \msg_show:nnxxxx { LaTeX / color } { show }
+ \__kernel_msg_show:nnxxxx { color } { show }
{#1}
{
\@@_if_defined:nT {#1}
diff --git a/l3kernel/l3file.dtx b/l3kernel/l3file.dtx
index 0fbe0df22..a9075c3fc 100644
--- a/l3kernel/l3file.dtx
+++ b/l3kernel/l3file.dtx
@@ -1128,11 +1128,11 @@
% \texttt{show-streams} takes care of translating |ior|/|iow| to
% English.
% \begin{macrocode}
-\cs_new_protected:Npn \ior_show_list: { \@@_list:N \msg_show:nnxxxx }
-\cs_new_protected:Npn \ior_log_list: { \@@_list:N \msg_log:nnxxxx }
+\cs_new_protected:Npn \ior_show_list: { \@@_list:N \__kernel_msg_show:nnxxxx }
+\cs_new_protected:Npn \ior_log_list: { \@@_list:N \__kernel_msg_log:nnxxxx }
\cs_new_protected:Npn \@@_list:N #1
{
- #1 { LaTeX / kernel } { show-streams }
+ #1 { kernel } { show-streams }
{ ior }
{
\prop_map_function:NN \g_@@_streams_prop
@@ -1524,11 +1524,11 @@
% \begin{macro}{\@@_list:N}
% Done as for input, but with a copy of the auxiliary so the name is correct.
% \begin{macrocode}
-\cs_new_protected:Npn \iow_show_list: { \@@_list:N \msg_show:nnxxxx }
-\cs_new_protected:Npn \iow_log_list: { \@@_list:N \msg_log:nnxxxx }
+\cs_new_protected:Npn \iow_show_list: { \@@_list:N \__kernel_msg_show:nnxxxx }
+\cs_new_protected:Npn \iow_log_list: { \@@_list:N \__kernel_msg_log:nnxxxx }
\cs_new_protected:Npn \@@_list:N #1
{
- #1 { LaTeX / kernel } { show-streams }
+ #1 { kernel } { show-streams }
{ iow }
{
\prop_map_function:NN \g_@@_streams_prop
@@ -3360,8 +3360,8 @@
% \cs{AtBeginDocument} into \cs{g_@@_record_seq}), turning it to a
% string (this does not affect the commas of this comma list).
% \begin{macrocode}
-\cs_new_protected:Npn \file_show_list: { \@@_list:N \msg_show:nnxxxx }
-\cs_new_protected:Npn \file_log_list: { \@@_list:N \msg_log:nnxxxx }
+\cs_new_protected:Npn \file_show_list: { \@@_list:N \__kernel_msg_show:nnxxxx }
+\cs_new_protected:Npn \file_log_list: { \@@_list:N \__kernel_msg_log:nnxxxx }
\cs_new_protected:Npn \@@_list:N #1
{
\seq_clear:N \l_@@_tmp_seq
@@ -3372,7 +3372,7 @@
}
\seq_concat:NNN \l_@@_tmp_seq \l_@@_tmp_seq \g_@@_record_seq
\seq_remove_duplicates:N \l_@@_tmp_seq
- #1 { LaTeX / kernel } { file-list }
+ #1 { kernel } { file-list }
{ \seq_map_function:NN \l_@@_tmp_seq \@@_list_aux:n }
{ } { } { }
}
diff --git a/l3kernel/l3intarray.dtx b/l3kernel/l3intarray.dtx
index 54438a194..8fb6d2f1d 100644
--- a/l3kernel/l3intarray.dtx
+++ b/l3kernel/l3intarray.dtx
@@ -509,15 +509,15 @@
% \begin{macro}{\intarray_show:N, \intarray_show:c, \intarray_log:N, \intarray_log:c}
% Convert the list to a comma list (with spaces after each comma)
% \begin{macrocode}
-\cs_new_protected:Npn \intarray_show:N { \@@_show:NN \msg_show:nnxxxx }
+\cs_new_protected:Npn \intarray_show:N { \@@_show:NN \__kernel_msg_show:nnxxxx }
\cs_generate_variant:Nn \intarray_show:N { c }
-\cs_new_protected:Npn \intarray_log:N { \@@_show:NN \msg_log:nnxxxx }
+\cs_new_protected:Npn \intarray_log:N { \@@_show:NN \__kernel_msg_log:nnxxxx }
\cs_generate_variant:Nn \intarray_log:N { c }
\cs_new_protected:Npn \@@_show:NN #1#2
{
\__kernel_chk_defined:NT #2
{
- #1 { LaTeX / intarray } { show }
+ #1 { intarray } { show }
{ \token_to_str:N #2 }
{ \intarray_count:N #2 }
{ >~ \@@_to_clist:Nn #2 { , ~ } }
diff --git a/l3kernel/l3keys.dtx b/l3kernel/l3keys.dtx
index 17ffbec15..985a2fa55 100644
--- a/l3kernel/l3keys.dtx
+++ b/l3kernel/l3keys.dtx
@@ -3119,12 +3119,12 @@
% To show a key, show its code using a message.
% \begin{macrocode}
\cs_new_protected:Npn \keys_show:nn
- { \@@_show:Nnn \msg_show:nnxxxx }
+ { \@@_show:Nnn \__kernel_msg_show:nnxxxx }
\cs_new_protected:Npn \keys_log:nn
- { \@@_show:Nnn \msg_log:nnxxxx }
+ { \@@_show:Nnn \__kernel_msg_log:nnxxxx }
\cs_new_protected:Npn \@@_show:Nnn #1#2#3
{
- #1 { LaTeX / keys } { show-key }
+ #1 { keys } { show-key }
{ \@@_trim_spaces:n { #2 / #3 } }
{
\keys_if_exist:nnT {#2} {#3}
diff --git a/l3kernel/l3msg.dtx b/l3kernel/l3msg.dtx
index d4fe14268..ac5abf3a2 100644
--- a/l3kernel/l3msg.dtx
+++ b/l3kernel/l3msg.dtx
@@ -1756,6 +1756,22 @@
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}
+% {
+% \__kernel_msg_log:nnnnnn, \__kernel_msg_log:nnxxxx,
+% \__kernel_msg_show:nnnnnn, \__kernel_msg_show:nnxxxx
+% }
+% For showing messages.
+% \begin{macrocode}
+\cs_new_protected:Npn \__kernel_msg_log:nnnnnn #1
+ { \msg_log:nnnnnn { LaTeX / #1 } }
+\cs_generate_variant:Nn \__kernel_msg_log:nnnnnn { nnxxxx }
+\cs_new_protected:Npn \__kernel_msg_show:nnnnnn #1
+ { \msg_show:nnnnnn { LaTeX / #1 } }
+\cs_generate_variant:Nn \__kernel_msg_show:nnnnnn { nnxxxx }
+% \end{macrocode}
+% \end{macro}
+%
% End the group to eliminate \cs{@@_kernel_class_new:nN}.
% \begin{macrocode}
\group_end:
diff --git a/l3kernel/l3prop.dtx b/l3kernel/l3prop.dtx
index 9dc5ab20d..575f5c9a2 100644
--- a/l3kernel/l3prop.dtx
+++ b/l3kernel/l3prop.dtx
@@ -1351,15 +1351,15 @@
% we use \cs{msg_show_item:nn} to format both the key and the value
% for each pair.
% \begin{macrocode}
-\cs_new_protected:Npn \prop_show:N { \@@_show:NN \msg_show:nnxxxx }
+\cs_new_protected:Npn \prop_show:N { \@@_show:NN \__kernel_msg_show:nnxxxx }
\cs_generate_variant:Nn \prop_show:N { c }
-\cs_new_protected:Npn \prop_log:N { \@@_show:NN \msg_log:nnxxxx }
+\cs_new_protected:Npn \prop_log:N { \@@_show:NN \__kernel_msg_log:nnxxxx }
\cs_generate_variant:Nn \prop_log:N { c }
\cs_new_protected:Npn \@@_show:NN #1#2
{
\__kernel_chk_defined:NT #2
{
- #1 { LaTeX / prop } { show }
+ #1 { prop } { show }
{ \token_to_str:N #2 }
{ \prop_map_function:NN #2 \msg_show_item:nn }
{ } { }
diff --git a/l3kernel/l3regex.dtx b/l3kernel/l3regex.dtx
index f24b4942a..855d45918 100644
--- a/l3kernel/l3regex.dtx
+++ b/l3kernel/l3regex.dtx
@@ -5814,7 +5814,7 @@
{
\@@_compile:n {#1}
\@@_show:N \l_@@_internal_regex
- \msg_show:nnxxxx { LaTeX / regex } { show }
+ \__kernel_msg_show:nnxxxx { regex } { show }
{ \tl_to_str:n {#1} } { }
{ \l_@@_internal_a_tl } { }
}
@@ -5823,7 +5823,7 @@
\__kernel_chk_defined:NT #1
{
\@@_show:N #1
- \msg_show:nnxxxx { LaTeX / regex } { show }
+ \__kernel_msg_show:nnxxxx { regex } { show }
{ } { \token_to_str:N #1 }
{ \l_@@_internal_a_tl } { }
}
diff --git a/l3kernel/l3seq.dtx b/l3kernel/l3seq.dtx
index cb72d19e4..d838a410d 100644
--- a/l3kernel/l3seq.dtx
+++ b/l3kernel/l3seq.dtx
@@ -2327,15 +2327,15 @@
% \UnitTested
% Apply the general \cs{msg_show:nnnnnn}.
% \begin{macrocode}
-\cs_new_protected:Npn \seq_show:N { \@@_show:NN \msg_show:nnxxxx }
+\cs_new_protected:Npn \seq_show:N { \@@_show:NN \__kernel_msg_show:nnxxxx }
\cs_generate_variant:Nn \seq_show:N { c }
-\cs_new_protected:Npn \seq_log:N { \@@_show:NN \msg_log:nnxxxx }
+\cs_new_protected:Npn \seq_log:N { \@@_show:NN \__kernel_msg_log:nnxxxx }
\cs_generate_variant:Nn \seq_log:N { c }
\cs_new_protected:Npn \@@_show:NN #1#2
{
\__kernel_chk_defined:NT #2
{
- #1 { LaTeX / seq } { show }
+ #1 { seq } { show }
{ \token_to_str:N #2 }
{ \seq_map_function:NN #2 \msg_show_item:n }
{ } { }
diff --git a/l3kernel/l3tl-analysis.dtx b/l3kernel/l3tl-analysis.dtx
index 4ad586a49..131bb54ee 100644
--- a/l3kernel/l3tl-analysis.dtx
+++ b/l3kernel/l3tl-analysis.dtx
@@ -990,7 +990,7 @@
\tl_if_exist:NTF #1
{
\exp_args:No \@@_analysis:n {#1}
- \msg_show:nnxxxx { LaTeX / tl } { show-tl-analysis }
+ \__kernel_msg_show:nnxxxx { tl } { show-tl-analysis }
{ \token_to_str:N #1 } { \@@_analysis_show: } { } { }
}
{ \tl_show:N #1 }
@@ -998,7 +998,7 @@
\cs_new_protected:Npn \tl_analysis_show:n #1
{
\@@_analysis:n {#1}
- \msg_show:nnxxxx { LaTeX / tl } { show-tl-analysis }
+ \__kernel_msg_show:nnxxxx { tl } { show-tl-analysis }
{ } { \@@_analysis_show: } { } { }
}
% \end{macrocode}
More information about the latex3-commits
mailing list.