[latex3-commits] [git/LaTeX3-latex3-latex3] main: Drop kernel_msg from l3experimental (a2bb278a6)
Joseph Wright
joseph.wright at morningstar2.co.uk
Thu Aug 26 14:06:30 CEST 2021
Repository : https://github.com/latex3/latex3
On branch : main
Link : https://github.com/latex3/latex3/commit/a2bb278a6ceef07e88e47cc654c89e05cc913701
>---------------------------------------------------------------
commit a2bb278a6ceef07e88e47cc654c89e05cc913701
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Thu Aug 26 13:06:30 2021 +0100
Drop kernel_msg from l3experimental
>---------------------------------------------------------------
a2bb278a6ceef07e88e47cc654c89e05cc913701
l3experimental/l3bitset/l3bitset.dtx | 15 ++++++++-------
l3experimental/l3graphics/l3graphics.dtx | 16 ++++++++--------
l3experimental/l3str/l3str-format.dtx | 26 ++++++++++++++------------
l3experimental/xgalley/l3galley.dtx | 4 ++--
4 files changed, 32 insertions(+), 29 deletions(-)
diff --git a/l3experimental/l3bitset/l3bitset.dtx b/l3experimental/l3bitset/l3bitset.dtx
index 54baedadf..81f403904 100644
--- a/l3experimental/l3bitset/l3bitset.dtx
+++ b/l3experimental/l3bitset/l3bitset.dtx
@@ -434,7 +434,7 @@
\prop_gput:cnn { g_@@_ \cs_to_str:N #2 _name_prop } {#3} {#3}
}
{
- \__kernel_msg_warning:nnxx { bitset } { bitset-unknown-name }
+ \msg_warning:nnxx { bitset } { unknown-name }
{ \token_to_str:N #2 }
{ \tl_to_str:n {#3} }
}
@@ -541,7 +541,7 @@
{
\__kernel_chk_defined:NT #2
{
- #1 { LaTeX/bitset } { show-bitset }
+ #1 { bitset } { show }
{ \token_to_str:N #2 }
{ \bitset_to_bin:N #2 }
{ \bitset_to_arabic:N #2 }
@@ -552,7 +552,7 @@
{
\__kernel_chk_defined:NT #2
{
- #1 { LaTeX/bitset } { show-names }
+ #1 { bitset } { show-names }
{ \token_to_str:N #2 }
{ \prop_map_function:cN { g_@@_ \cs_to_str:N #2 _name_prop } \msg_show_item:nn }
{ }
@@ -564,22 +564,23 @@
%
% \subsection{Messages}
% \begin{macrocode}
- \__kernel_msg_new:nnn { bitset } { show-bitset }
+ \msg_new:nnn { bitset } { show }
{
The~bitset~#1~has~the~representation: \\
>~binary:~#2 \\
>~arabic:~#3 .
}
-\__kernel_msg_new:nnn { bitset } { show-names }
+\msg_new:nnn { bitset } { show-names }
{
The~bitset~#1~
\tl_if_empty:nTF {#2}
{ knows~no~names~yet \\>~ . }
{ knows~the~name/index~pairs~(without~outer~braces): #2 . }
}
-\__kernel_msg_new:nnn { bitset } { bitset-unknown-name }
+\msg_new:nnn { bitset } { unknown-name }
{ The~name~'#2'~is~unknown~for~bitset~\tl_to_str:n {#1} }
-
+\prop_gput:Nnn \g_msg_module_name_prop { bitset } { LaTeX3 }
+\prop_gput:Nnn \g_msg_module_type_prop { bitset } { }
% \end{macrocode}
% \begin{macrocode}
%</package>
diff --git a/l3experimental/l3graphics/l3graphics.dtx b/l3experimental/l3graphics/l3graphics.dtx
index 6f631cd71..265b5de73 100644
--- a/l3experimental/l3graphics/l3graphics.dtx
+++ b/l3experimental/l3graphics/l3graphics.dtx
@@ -306,7 +306,7 @@
\cs_new_protected:Npn \graphics_bb_save:n #1
{
\dim_if_exist:cTF { c_@@_ #1 _urx_dim }
- { \__kernel_msg_error:nnn { graphic } { bb-already-cached } {#1} }
+ { \msg_error:nnn { graphic } { bb-already-cached } {#1} }
{
\dim_compare:nNnF \l_graphics_llx_dim = { 0pt }
{ \dim_const:cn { c_@@_ #1 _llx_dim } { \l_graphics_llx_dim } }
@@ -408,7 +408,7 @@
{
#1
\exp_not:N \ior_if_eof:NTF \exp_not:N \l_@@_tmp_ior
- { \__kernel_msg_error:nnn { graphics } {#2} {#3} }
+ { \msg_error:nnn { graphics } {#2} {#3} }
{
\ior_str_map_inline:Nn \exp_not:N \l_@@_tmp_ior
{
@@ -573,7 +573,7 @@
{ \seq_map_break:n { \use_i:nnn \@@_include: } }
}
\use:n
- { \__kernel_msg_error:nnn { graphics } { graphic-not-found } {#1} }
+ { \msg_error:nnn { graphics } { graphic-not-found } {#1} }
}
\cs_new_protected:Npn \@@_include:
{
@@ -594,7 +594,7 @@
\exp_args:Ne \@@_include_auxi:n
{ \str_foldcase:n {#1} }
}
- { \__kernel_msg_error:nnn { graphics } { graphic-not-found } {#1} }
+ { \msg_error:nnn { graphics } { graphic-not-found } {#1} }
\group_end:
}
\cs_new_protected:Npn \@@_include_auxi:n #1
@@ -621,7 +621,7 @@
{ \@@_include_auxiv:n }
{#1}
}
- { \__kernel_msg_error:nnn { graphics } { unsupported-graphic-type } {#1} }
+ { \msg_error:nnn { graphics } { unsupported-graphic-type } {#1} }
}
\cs_new_protected:Npn \@@_include_auxiii:n #1
{
@@ -692,19 +692,19 @@
% \subsection{Messages}
%
% \begin{macrocode}
-\__kernel_msg_new:nnnn { graphics } { graphic-not-found }
+\msg_new:nnnn { graphics } { graphic-not-found }
{ Image~file~'#1'~not~found. }
{
LaTeX~tried~to~open~graphic~file~'#1',
~but~the~file~could~not~be~read.
}
-\__kernel_msg_new:nnnn { graphics } { pipe-failed }
+\msg_new:nnnn { graphics } { pipe-failed }
{ Cannot~run~piped~system~commands. }
{
LaTeX~tried~to~call~a~system~process~but~this~was~not~possible.\\
Try~the~"--shell-escape"~(or~"--enable-pipes")~option.
}
-\__kernel_msg_new:nnnn { graphics } { unsupported-graphic-type }
+\msg_new:nnnn { graphics } { unsupported-graphic-type }
{ Image~type~'#1'~not~supported~by~current~driver. }
{
LaTeX~was~asked~to~include~an~graphic~of~type~'#1',~
diff --git a/l3experimental/l3str/l3str-format.dtx b/l3experimental/l3str/l3str-format.dtx
index 2f11898e8..57fa3b603 100644
--- a/l3experimental/l3str/l3str-format.dtx
+++ b/l3experimental/l3str/l3str-format.dtx
@@ -306,7 +306,7 @@
\cs_new:Npn \@@_format_parse_end:nwn #1 #2 \s_@@_stop \s_@@_stop #3
{
\tl_if_empty:nF {#2}
- { \__kernel_msg_expandable_error:nnn { str } { invalid-format } {#3} }
+ { \msg_expandable_error:nnn { str } { invalid-format } {#3} }
#1
}
% \end{macrocode}
@@ -466,7 +466,7 @@
{
\token_if_eq_charcode:NNTF #2 =
{
- \__kernel_msg_expandable_error:nnnn
+ \msg_expandable_error:nnnn
{ str } { invalid-align-format } {#2} {tl}
\@@_format_put:nw { #1 < }
}
@@ -477,7 +477,7 @@
}
\token_if_eq_charcode:NNF #3 ?
{
- \__kernel_msg_expandable_error:nnnn
+ \msg_expandable_error:nnnn
{ str } { invalid-sign-format } {#3} {tl}
}
\@@_format_put:nw { {#4} }
@@ -488,7 +488,7 @@
{
\token_if_eq_charcode:NNF #6 ?
{
- \__kernel_msg_expandable_error:nnnn
+ \msg_expandable_error:nnnn
{ str } { invalid-style-format } {#6} {tl}
}
}
@@ -642,7 +642,7 @@
\@@_format_put:nw { {#4} }
\tl_if_empty:nF {#5}
{
- \__kernel_msg_expandable_error:nnnn
+ \msg_expandable_error:nnnn
{ str } { invalid-precision-format } {#5} {int}
}
\str_case:nnF {#6}
@@ -654,7 +654,7 @@
{ X } { \@@_format_int:NwnnNNn \int_to_Hex:n }
}
{
- \__kernel_msg_expandable_error:nnnn
+ \msg_expandable_error:nnnn
{ str } { invalid-style-format } {#6} { int }
\@@_format_int:NwnnNNn \use:n
}
@@ -770,7 +770,7 @@
{ ? } { \@@_format_fp:wnnnNNn \@@_format_fp_g:nn }
}
{
- \__kernel_msg_expandable_error:nnnn
+ \msg_expandable_error:nnnn
{ str } { invalid-style-format } {#6} { fp }
\@@_format_fp:wnnnNNn \@@_format_fp_g:nn
}
@@ -959,16 +959,18 @@
% All of the messages are produced expandably, so there is no need for
% an extra-text.
% \begin{macrocode}
-\__kernel_msg_new:nnn { str } { invalid-format }
+\msg_new:nnn { str } { invalid-format }
{ Invalid~format~'#1'. }
-\__kernel_msg_new:nnn { str } { invalid-align-format }
+\msg_new:nnn { str } { invalid-align-format }
{ Invalid~alignment~'#1'~for~type~'#2'. }
-\__kernel_msg_new:nnn { str } { invalid-sign-format }
+\msg_new:nnn { str } { invalid-sign-format }
{ Invalid~sign~'#1'~for~type~'#2'. }
-\__kernel_msg_new:nnn { str } { invalid-precision-format }
+\msg_new:nnn { str } { invalid-precision-format }
{ Invalid~precision~'#1'~for~type~'#2'. }
-\__kernel_msg_new:nnn { str } { invalid-style-format }
+\msg_new:nnn { str } { invalid-style-format }
{ Invalid~style~'#1'~for~type~'#2'. }
+\prop_gput:Nnn \g_msg_module_name_prop { str } { LaTeX3 }
+\prop_gput:Nnn \g_msg_module_type_prop { str } { }
% \end{macrocode}
%
% \begin{macrocode}
diff --git a/l3experimental/xgalley/l3galley.dtx b/l3experimental/xgalley/l3galley.dtx
index d1da19f38..3192c7f93 100644
--- a/l3experimental/xgalley/l3galley.dtx
+++ b/l3experimental/xgalley/l3galley.dtx
@@ -2126,7 +2126,7 @@
\cs_new_protected:Npn \galley_break_line:Nn #1#2
{
\mode_if_vertical:TF
- { \__kernel_msg_error:nn { galley } { no-line-to-end } }
+ { \msg_error:nn { galley } { no-line-to-end } }
{
\tex_unskip:D
\bool_if:NF #1
@@ -2458,7 +2458,7 @@
% \subsection{Messages}
%
% \begin{macrocode}
-\__kernel_msg_new:nnn { galley } { no-line-to-end }
+\msg_new:nnn { galley } { no-line-to-end }
{ There's~no~line~here~to~end. }
% \end{macrocode}
%
More information about the latex3-commits
mailing list.