diff options
Diffstat (limited to 'Master/texmf-dist/source/latex/l3kernel/l3msg.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/l3kernel/l3msg.dtx | 43 |
1 files changed, 26 insertions, 17 deletions
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3msg.dtx b/Master/texmf-dist/source/latex/l3kernel/l3msg.dtx index 36d9e6d9d48..89b6953da83 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3msg.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3msg.dtx @@ -35,7 +35,7 @@ % %<*driver|package> \RequirePackage{l3names} -\GetIdInfo$Id: l3msg.dtx 3029 2011-12-06 22:47:30Z joseph $ +\GetIdInfo$Id: l3msg.dtx 3086 2011-12-22 17:55:46Z bruno $ {L3 Experimental messages} %</driver|package> %<*driver> @@ -1024,18 +1024,18 @@ % A function for issuing messages: both the text and order could % in principal vary. % \begin{macrocode} -\cs_new_nopar:Npn \msg_fatal_text:n #1 { Fatal~#1~error } -\cs_new_nopar:Npn \msg_critical_text:n #1 { Critical~#1~error } -\cs_new_nopar:Npn \msg_error_text:n #1 { #1~error } -\cs_new_nopar:Npn \msg_warning_text:n #1 { #1~warning } -\cs_new_nopar:Npn \msg_info_text:n #1 { #1~info } +\cs_new:Npn \msg_fatal_text:n #1 { Fatal~#1~error } +\cs_new:Npn \msg_critical_text:n #1 { Critical~#1~error } +\cs_new:Npn \msg_error_text:n #1 { #1~error } +\cs_new:Npn \msg_warning_text:n #1 { #1~warning } +\cs_new:Npn \msg_info_text:n #1 { #1~info } % \end{macrocode} % \end{macro} % % \begin{macro}{\msg_see_documentation_text:n} % Contextual footer information. % \begin{macrocode} -\cs_new_nopar:Npn \msg_see_documentation_text:n #1 +\cs_new:Npn \msg_see_documentation_text:n #1 { \\ \\ See~the~#1~documentation~for~further~information. } % \end{macrocode} % \end{macro} @@ -1054,7 +1054,7 @@ % is cleared, and the various message functions are created % to simply use the code stored for the message. % \begin{macrocode} -\cs_new_protected_nopar:Npn \msg_class_set:nn #1#2 +\cs_new_protected:Npn \msg_class_set:nn #1#2 { \prop_clear_new:c { l_msg_redirect_ #1 _prop } \cs_set_protected:cpn { msg_ #1 :nnxxxx } ##1##2##3##4##5##6 @@ -1308,7 +1308,7 @@ % The first auxiliary macro looks for a match by name: the most % restrictive check. % \begin{macrocode} -\cs_new_protected_nopar:Npn \msg_use_aux:nnn #1#2#3 +\cs_new_protected:Npn \msg_use_aux:nnn #1#2#3 { \tl_set:Nn \l_msg_current_class_tl {#1} \tl_set:Nn \l_msg_current_module_tl {#2} @@ -1320,7 +1320,7 @@ % The second function checks for general matches by module or for % all modules. % \begin{macrocode} -\cs_new_protected_nopar:Npn \msg_use_aux:nn #1#2 +\cs_new_protected:Npn \msg_use_aux:nn #1#2 { \prop_if_in:cnTF { l_msg_redirect_ #1 _prop } {#2} { \msg_use_loop_check:nn {#1} {#2} } @@ -1357,7 +1357,7 @@ % \begin{macro}{\msg_redirect_class:nn} % Converts class one into class two. % \begin{macrocode} -\cs_new_protected_nopar:Npn \msg_redirect_class:nn #1#2 +\cs_new_protected:Npn \msg_redirect_class:nn #1#2 { \prop_put:cnn { l_msg_redirect_ #1 _prop } { * } {#2} } % \end{macrocode} % \end{macro} @@ -1365,7 +1365,7 @@ % \begin{macro}{\msg_redirect_module:nnn} % For when all messages of a class should be altered for a given module. % \begin{macrocode} -\cs_new_protected_nopar:Npn \msg_redirect_module:nnn #1#2#3 +\cs_new_protected:Npn \msg_redirect_module:nnn #1#2#3 { \prop_put:cnn { l_msg_redirect_ #2 _prop } {#1} {#3} } % \end{macrocode} % \end{macro} @@ -1373,7 +1373,7 @@ % \begin{macro}{\msg_redirect_name:nnn} % Named message will always use the given class. % \begin{macrocode} -\cs_new_protected_nopar:Npn \msg_redirect_name:nnn #1#2#3 +\cs_new_protected:Npn \msg_redirect_name:nnn #1#2#3 { \prop_put:Nnn \l_msg_redirect_names_prop { // #1 / #2 / } {#3} } % \end{macrocode} % \end{macro} @@ -1388,13 +1388,13 @@ % pre-built functions. Two functions are provided: one more general % and one which only has the short text part. % \begin{macrocode} -\cs_new_protected_nopar:Npn \msg_kernel_new:nnnn #1#2 +\cs_new_protected:Npn \msg_kernel_new:nnnn #1#2 { \msg_new:nnnn { LaTeX } { #1 / #2 } } -\cs_new_protected_nopar:Npn \msg_kernel_new:nnn #1#2 +\cs_new_protected:Npn \msg_kernel_new:nnn #1#2 { \msg_new:nnn { LaTeX } { #1 / #2 } } -\cs_new_protected_nopar:Npn \msg_kernel_set:nnnn #1#2 +\cs_new_protected:Npn \msg_kernel_set:nnnn #1#2 { \msg_set:nnnn { LaTeX } { #1 / #2 } } -\cs_new_protected_nopar:Npn \msg_kernel_set:nnn #1#2 +\cs_new_protected:Npn \msg_kernel_set:nnn #1#2 { \msg_set:nnn { LaTeX } { #1 / #2 } } % \end{macrocode} % \end{macro} @@ -1635,6 +1635,13 @@ LaTeX~has~been~asked~to~replace~an~empty~pattern~by~'#1':~that~% would~lead~to~an~infinite~loop! } +\msg_kernel_new:nnnn { scan } { already-defined } + { Scan~mark~#1~already~defined. } + { + \c_msg_coding_error_text_tl + LaTeX~has~been~asked~to~create~a~new~scan~mark~'#1'~ + but~this~name~has~already~been~used~for~a~scan~mark. + } % \end{macrocode} % % Some errors only appear in expandable settings, @@ -1646,6 +1653,8 @@ { Erroneous~variable~#1 used! } \msg_kernel_new:nnn { prg } { zero-step } { Zero~step~size~for~stepwise~function~#1. } +\msg_kernel_new:nnn { prg } { replicate-neg } + { Negative~argument~for~\prg_replicate:nn. } % \end{macrocode} % % Messages used by the \enquote{\texttt{show}} functions. |