summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/l3kernel/l3prop.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'macros/latex/contrib/l3kernel/l3prop.dtx')
-rw-r--r--macros/latex/contrib/l3kernel/l3prop.dtx19
1 files changed, 9 insertions, 10 deletions
diff --git a/macros/latex/contrib/l3kernel/l3prop.dtx b/macros/latex/contrib/l3kernel/l3prop.dtx
index 5cdd55d178..88c60018f4 100644
--- a/macros/latex/contrib/l3kernel/l3prop.dtx
+++ b/macros/latex/contrib/l3kernel/l3prop.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-07-12}
+% \date{Released 2021-08-27}
%
% \maketitle
%
@@ -124,7 +124,7 @@
% \}
% \end{syntax}
% Sets \meta{prop~var} to contain key--value pairs given in the second
-% argument. If duplicate keys appear only one of the values is kept.
+% argument. If duplicate keys appear only the last of the values is kept.
%
% Spaces are trimmed around every \meta{key} and every \meta{value},
% and if the result of trimming spaces consists of a single brace
@@ -146,7 +146,7 @@
% name is already taken. The \meta{prop~var} is set globally to
% contain key--value pairs given in the second argument, processed in
% the way described for \cs{prop_set_from_keyval:Nn}. If duplicate
-% keys appear only one of the values is kept.
+% keys appear only the last of the values is kept.
% \end{function}
%
% \section{Adding and updating property list entries}
@@ -202,8 +202,7 @@
% Combines the key--value pairs of \meta{prop~var_2} and
% \meta{prop~var_3}, and saves the result in \meta{prop~var_1}. If a
% key appears in both \meta{prop~var_2} and \meta{prop~var_3} then the
-% last value, namely the value in \meta{prop~var_3} is kept while the
-% other is discarded.
+% last value, namely the value in \meta{prop~var_3} is kept.
% \end{function}
%
% \begin{function}[added = 2021-05-16]
@@ -223,7 +222,7 @@
% \cs{prop_put:Nnn}, hence if the \meta{prop~var} already contains
% some of the keys, the corresponding values are discarded and
% replaced by those given in the key--value list. If duplicate keys
-% appear in the key--value list then only one of the values is kept.
+% appear in the key--value list then only the last of the values is kept.
%
% The function is equivalent to storing the key--value pairs in a
% temporary property variable using \cs{prop_set_from_keyval:Nn}, then
@@ -649,7 +648,7 @@
% error and removes its argument.
% \begin{macrocode}
\cs_new:Npn \@@_pair:wn #1 \s_@@ #2
- { \__kernel_msg_expandable_error:nn { prop } { misused } }
+ { \msg_expandable_error:nn { prop } { misused } }
% \end{macrocode}
% \end{macro}
%
@@ -903,7 +902,7 @@
{
\tl_if_empty:nF { #3 #1 #2 }
{
- \__kernel_msg_error:nnx { prop } { prop-keyval }
+ \msg_error:nnx { prop } { prop-keyval }
{ \exp_not:o {#4} }
}
}
@@ -1433,9 +1432,9 @@
% 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 \__kernel_msg_show:nnxxxx }
+\cs_new_protected:Npn \prop_show:N { \@@_show:NN \msg_show:nnxxxx }
\cs_generate_variant:Nn \prop_show:N { c }
-\cs_new_protected:Npn \prop_log:N { \@@_show:NN \__kernel_msg_log:nnxxxx }
+\cs_new_protected:Npn \prop_log:N { \@@_show:NN \msg_log:nnxxxx }
\cs_generate_variant:Nn \prop_log:N { c }
\cs_new_protected:Npn \@@_show:NN #1#2
{