summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/expl3/l3msg.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-03-31 00:04:47 +0000
committerKarl Berry <karl@freefriends.org>2010-03-31 00:04:47 +0000
commit3ab55a61f6f8d2218a8f3175bc7481ce162b60d3 (patch)
treef606e0c2117a8058213441400e50ba25400ba94a /Master/texmf-dist/tex/latex/expl3/l3msg.sty
parent035ea73193af75f6ade46e306603e61d82b24950 (diff)
expl3 1881 (30mar10)
git-svn-id: svn://tug.org/texlive/trunk@17631 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/expl3/l3msg.sty')
-rw-r--r--Master/texmf-dist/tex/latex/expl3/l3msg.sty168
1 files changed, 79 insertions, 89 deletions
diff --git a/Master/texmf-dist/tex/latex/expl3/l3msg.sty b/Master/texmf-dist/tex/latex/expl3/l3msg.sty
index 04d32519912..6ed3dad14c1 100644
--- a/Master/texmf-dist/tex/latex/expl3/l3msg.sty
+++ b/Master/texmf-dist/tex/latex/expl3/l3msg.sty
@@ -49,36 +49,40 @@
%% -----------------------------------------------------------------------
%%
\RequirePackage{l3names}
-\GetIdInfo$Id: l3msg.dtx 1722 2009-11-06 13:22:12Z joseph $
+\GetIdInfo$Id: l3msg.dtx 1866 2010-03-23 08:29:27Z joseph $
{L3 Experimental LaTeX Messages module}
\ProvidesExplPackage
{\filename}{\filedate}{\fileversion}{\filedescription}
\package_check_loaded_expl:
\int_set:Nn \tex_errorcontextlines:D { \c_minus_one }
-\tl_new:Nn \c_msg_fatal_tl { Fatal~Error }
-\tl_new:Nn \c_msg_error_tl { Error }
-\tl_new:Nn \c_msg_warning_tl { Warning }
-\tl_new:Nn \c_msg_info_tl { Info }
-\tl_new:Nn \c_msg_fatal_text_tl {
+\tl_const:Nn \c_msg_fatal_tl { Fatal~Error }
+\tl_const:Nn \c_msg_error_tl { Error }
+\tl_const:Nn \c_msg_warning_tl { Warning }
+\tl_const:Nn \c_msg_info_tl { Info }
+\tl_const:Nn \c_msg_coding_error_text_tl {
+ This~is~a~coding~error.
+ \msg_two_newlines:
+}
+\tl_const:Nn \c_msg_fatal_text_tl {
This~is~a~fatal~error:~LaTeX~will~abort
}
-\tl_new:Nn \c_msg_help_text_tl {
+\tl_const:Nn \c_msg_help_text_tl {
For~immediate~help~type~H~<return>
}
-\tl_new:Nn \c_msg_kernel_bug_text_tl {
+\tl_const:Nn \c_msg_kernel_bug_text_tl {
This~is~a~LaTeX~bug:~check~coding!
}
-\tl_new:Nn \c_msg_kernel_bug_more_text_tl {
+\tl_const:Nn \c_msg_kernel_bug_more_text_tl {
There~is~a~coding~bug~somewhere~around~here.
\msg_newline:
This~probably~needs~examining~by~an~expert.
\c_msg_return_text_tl
}
-\tl_new:Nn \c_msg_no_info_text_tl {
+\tl_const:Nn \c_msg_no_info_text_tl {
LaTeX~does~not~know~anything~more~about~this~error,~sorry.
\c_msg_return_text_tl
}
-\tl_new:Nn \c_msg_return_text_tl {
+\tl_const:Nn \c_msg_return_text_tl {
\msg_two_newlines:
Try~typing~<return>~to~proceed.
\msg_newline:
@@ -88,67 +92,54 @@
\char_make_letter:N\ %
\tl_to_lowercase:n{%
\group_end:%
-\tl_new:Nn%
+\tl_const:Nn%
\c_msg_hide_tl %
{}%
}%
-\tl_new:Nn \c_msg_on_line_tl { on~line }
-\tl_new:Nn \c_msg_text_prefix_tl { msg_text ~>~ }
-\tl_new:Nn \c_msg_more_text_prefix_tl { msg_text_more ~>~ }
+\tl_const:Nn \c_msg_on_line_tl { on~line }
+\tl_const:Nn \c_msg_text_prefix_tl { msg_text ~>~ }
+\tl_const:Nn \c_msg_more_text_prefix_tl { msg_text_more ~>~ }
\tl_new:N \l_msg_class_tl
\tl_new:N \l_msg_current_class_tl
+\tl_new:N \l_msg_current_module_tl
\clist_new:N \l_msg_names_clist
\prop_new:N \l_msg_redirect_classes_prop
\prop_new:N \l_msg_redirect_names_prop
\clist_new:N \l_msg_redirect_classes_clist
+\tl_new:N \l_msg_tmp_tl
\cs_new_nopar:Npn \msg_line_number: {
\toks_use:N \tex_inputlineno:D
}
\cs_new_nopar:Npn \msg_line_context: {
\c_msg_on_line_tl
- \msg_space:
+ \c_space_tl
\msg_line_number:
}
\cs_new_nopar:Npn \msg_newline: { ^^J }
\cs_new_nopar:Npn \msg_two_newlines: { ^^J ^^J }
-\cs_new_nopar:Npn \msg_space: { ~ }
-\cs_new_nopar:Npn \msg_two_spaces: { \msg_space: \msg_space: }
-\cs_new_nopar:Npn \msg_four_spaces: {
- \msg_two_spaces: \msg_two_spaces:
-}
-\cs_new_nopar:Npn \msg_generic_new:nnn #1 {
+\cs_new_protected_nopar:Npn \msg_generic_new:nnn #1 {
\chk_if_free_cs:c { \c_msg_text_prefix_tl #1 :xxxx }
\msg_generic_set:nnn {#1}
}
-\cs_new_nopar:Npn \msg_generic_new:nn #1 {
+\cs_new_protected_nopar:Npn \msg_generic_new:nn #1 {
\chk_if_free_cs:c { \c_msg_text_prefix_tl #1 :xxxx }
\msg_generic_set:nn {#1}
}
-\cs_new_nopar:Npn \msg_generic_set:nnn #1 {
+\cs_new_protected_nopar:Npn \msg_generic_set:nnn #1#2#3 {
\msg_generic_set_clist:n {#1}
- \char_make_space:N \
- \msg_generic_set_more_text:nnn {#1}
+ \cs_set:cpn { \c_msg_text_prefix_tl #1 :xxxx } ##1##2##3##4 {#2}
+ \cs_set:cpn { \c_msg_more_text_prefix_tl #1 :xxxx } ##1##2##3##4 {#3}
}
-\cs_new_nopar:Npn \msg_generic_set:nn #1 {
+\cs_new_protected_nopar:Npn \msg_generic_set:nn #1#2 {
\msg_generic_set_clist:n {#1}
- \char_make_space:N \
- \msg_generic_set_text:nn {#1}
+ \cs_set:cpn { \c_msg_text_prefix_tl #1 :xxxx } ##1##2##3##4 {#2}
+ \cs_set_eq:cN { \c_msg_more_text_prefix_tl #1 :xxxx } \c_undefined
}
-\cs_new_nopar:Npn \msg_generic_set_clist:n #1 {
+\cs_new_protected_nopar:Npn \msg_generic_set_clist:n #1 {
\clist_if_in:NnF \l_msg_names_clist { // #1 / } {
\clist_put_right:Nn \l_msg_names_clist { // #1 / }
}
}
-\cs_new:Npn \msg_generic_set_text:nn #1#2 {
- \cs_set:cpn { \c_msg_text_prefix_tl #1 :xxxx } ##1##2##3##4 {#2}
- \cs_set_eq:cN { \c_msg_more_text_prefix_tl #1 :xxxx } \c_undefined
- \char_make_ignore:N \
-}
-\cs_new:Npn \msg_generic_set_more_text:nnn #1#2#3 {
- \cs_set:cpn { \c_msg_text_prefix_tl #1 :xxxx } ##1##2##3##4 {#2}
- \cs_set:cpn { \c_msg_more_text_prefix_tl #1 :xxxx } ##1##2##3##4 {#3}
- \char_make_ignore:N \
-}
\group_begin:
\char_set_lccode:nn {`\&} {`\ } % {
\char_set_lccode:w `\} = `\ \scan_stop:
@@ -159,7 +150,7 @@
\cs_new_protected:Npn\msg_direct_interrupt:xxxx#1#2#3#4{%
\group_begin:%
\cs_set_eq:NN\\\msg_newline:%
-\cs_set_eq:NN\ \msg_space:%
+\cs_set_eq:NN\ \c_space_tl%
\msg_direct_interrupt_aux:n{#4}%
\cs_set_nopar:Npn\\{\msg_newline:#3}%
\tex_errhelp:D\l_msg_tmp_tl%
@@ -175,7 +166,7 @@
\group_end:%
}%
}%
-\cs_new:Npn \msg_direct_interrupt_aux:n #1 {
+\cs_new_protected:Npn \msg_direct_interrupt_aux:n #1 {
\tl_if_empty:nTF {#1} {
\tl_set:Nx \l_msg_tmp_tl { { \c_msg_no_info_text_tl } }
}{
@@ -185,35 +176,35 @@
\cs_new_protected:Npn \msg_direct_log:xx #1#2 {
\group_begin:
\cs_set:Npn \\ { \msg_newline: #2 }
- \cs_set_eq:NN \ \msg_space:
+ \cs_set_eq:NN \ \c_space_tl
\iow_log:x { #1 \msg_newline: }
\group_end:
}
\cs_new_protected:Npn \msg_direct_term:xx #1#2 {
\group_begin:
\cs_set:Npn \\ { \msg_newline: #2 }
- \cs_set_eq:NN \ \msg_space:
+ \cs_set_eq:NN \ \c_space_tl
\iow_term:x { #1 \msg_newline: }
\group_end:
}
-\cs_new_nopar:Npn \msg_new:nnnn #1#2 {
+\cs_new_protected_nopar:Npn \msg_new:nnnn #1#2 {
\msg_generic_new:nnn { #1 / #2 }
}
-\cs_new_nopar:Npn \msg_new:nnn #1#2 {
+\cs_new_protected_nopar:Npn \msg_new:nnn #1#2 {
\msg_generic_new:nn { #1 / #2 }
}
-\cs_new_nopar:Npn \msg_set:nnnn #1#2 {
+\cs_new_protected_nopar:Npn \msg_set:nnnn #1#2 {
\msg_generic_set:nnn { #1 / #2 }
}
-\cs_new_nopar:Npn \msg_set:nnn #1#2 {
+\cs_new_protected_nopar:Npn \msg_set:nnn #1#2 {
\msg_generic_set:nn { #1 / #2 }
}
-\cs_new_nopar:Npn \msg_class_new:nn #1 {
+\cs_new_protected_nopar:Npn \msg_class_new:nn #1 {
\chk_if_free_cs:c { msg_ #1 :nnxxxx }
\prop_new:c { l_msg_redirect_ #1 _prop }
\msg_class_set:nn {#1}
}
-\cs_new_nopar:Npn \msg_class_set:nn #1#2 {
+\cs_new_protected_nopar:Npn \msg_class_set:nn #1#2 {
\prop_clear:c { l_msg_redirect_ #1 _prop }
\cs_set_protected:cpn { msg_ #1 :nnxxxx } ##1##2##3##4##5##6 {
\msg_use:nnnnxxxx {#1} {#2} {##1} {##2} {##3} {##4} {##5} {##6}
@@ -231,7 +222,7 @@
\exp_not:c { msg_ #1 :nnxxxx } {##1} {##2} { } { } { } { }
}
}
-\cs_new:Npn \msg_use:nnnnxxxx #1#2#3#4#5#6#7#8 {
+\cs_new_protected:Npn \msg_use:nnnnxxxx #1#2#3#4#5#6#7#8 {
\cs_set_nopar:Npn \msg_use_code: {
\clist_clear:N \l_msg_redirect_classes_clist
#2
@@ -256,7 +247,7 @@
}
\cs_new_nopar:Npn \msg_use_code: { }
\cs_new:Npn \msg_use_loop:n #1 { }
-\cs_new_nopar:Npn \msg_use_aux:nnn #1#2#3 {
+\cs_new_protected_nopar: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}
\prop_if_in:NnTF \l_msg_redirect_names_prop { // #2 / #3 / } {
@@ -265,7 +256,7 @@
\msg_use_aux:nn {#1} {#2}
}
}
-\cs_new_nopar:Npn \msg_use_aux:nn #1#2 {
+\cs_new_protected_nopar:Npn \msg_use_aux:nn #1#2 {
\prop_if_in:cnTF { l_msg_redirect_ #1 _prop } {#2} {
\msg_use_loop_check:nn {#1} {#2}
}{
@@ -276,7 +267,7 @@
}
}
}
-\cs_new:Npn \msg_use_loop_check:nn #1#2 {
+\cs_new_protected:Npn \msg_use_loop_check:nn #1#2 {
\prop_get:cnN { l_msg_redirect_ #1 _prop } {#2} \l_msg_class_tl
\tl_if_eq:NNTF \l_msg_current_class_tl \l_msg_class_tl {
\msg_use_code:
@@ -288,10 +279,10 @@
\msg_direct_interrupt:xxxx
{ \c_msg_fatal_tl \msg_two_newlines: }
{
- ( \c_msg_fatal_tl ) \msg_space:
+ ( \c_msg_fatal_tl ) \c_space_tl
\use:c { \c_msg_text_prefix_tl #1 / #2 :xxxx } {#3} {#4} {#5} {#6}
}
- { ( \c_msg_fatal_tl ) \msg_space: }
+ { ( \c_msg_fatal_tl ) \c_space_tl }
{ \c_msg_fatal_text_tl }
\tex_end:D
}
@@ -299,10 +290,10 @@
\msg_direct_interrupt:xxxx
{ #1~\c_msg_error_tl \msg_newline: }
{
- ( #1 ) \msg_space:
+ ( #1 ) \c_space_tl
\use:c { \c_msg_text_prefix_tl #1 / #2 :xxxx } {#3} {#4} {#5} {#6}
}
- { ( #1 ) \msg_space: }
+ { ( #1 ) \c_space_tl }
{
\cs_if_exist:cTF { \c_msg_more_text_prefix_tl #1 / #2 :xxxx }
{
@@ -314,17 +305,17 @@
}
\msg_class_new:nn { warning } {
\msg_direct_term:xx {
- \msg_space: #1 ~ \c_msg_warning_tl :~
+ \c_space_tl #1 ~ \c_msg_warning_tl :~
\use:c { \c_msg_text_prefix_tl #1 / #2 :xxxx } {#3} {#4} {#5} {#6}
}
- { ( #1 ) \msg_two_spaces: }
+ { ( #1 ) \c_space_tl \c_space_tl }
}
\msg_class_new:nn { info } {
\msg_direct_log:xx {
- \msg_space: #1~\c_msg_info_tl :~
+ \c_space_tl #1~\c_msg_info_tl :~
\use:c { \c_msg_text_prefix_tl #1 / #2 :xxxx } {#3} {#4} {#5} {#6}
}
- { ( #1 ) \msg_two_spaces: }
+ { ( #1 ) \c_space_tl \c_space_tl }
}
\msg_class_new:nn { log } {
\msg_direct_log:xx {
@@ -339,28 +330,28 @@
{ }
}
\msg_class_new:nn { none } { }
-\cs_new_nopar:Npn \msg_redirect_class:nn #1#2 {
+\cs_new_protected_nopar:Npn \msg_redirect_class:nn #1#2 {
\prop_put:cnn { l_msg_redirect_ #1 _prop } { * } {#2}
}
-\cs_new_nopar:Npn \msg_redirect_module:nnn #1#2#3 {
+\cs_new_protected_nopar:Npn \msg_redirect_module:nnn #1#2#3 {
\prop_put:cnn { l_msg_redirect_ #2 _prop } {#1} {#3}
}
-\cs_new_nopar:Npn \msg_redirect_name:nnn #1#2#3 {
+\cs_new_protected_nopar:Npn \msg_redirect_name:nnn #1#2#3 {
\prop_put:Nnn \l_msg_redirect_names_prop { // #1 / #2 / } {#3}
}
-\cs_new_nopar:Npn \msg_kernel_new:nnnn #1#2 {
+\cs_new_protected_nopar:Npn \msg_kernel_new:nnnn #1#2 {
\msg_new:nnnn { LaTeX } { #1 / #2 }
}
-\cs_new_nopar:Npn \msg_kernel_new:nnn #1#2 {
+\cs_new_protected_nopar:Npn \msg_kernel_new:nnn #1#2 {
\msg_new:nnn { LaTeX } { #1 / #2 }
}
-\cs_new_nopar:Npn \msg_kernel_set:nnnn #1#2 {
+\cs_new_protected_nopar:Npn \msg_kernel_set:nnnn #1#2 {
\msg_set:nnnn { LaTeX } { #1 / #2 }
}
-\cs_new_nopar:Npn \msg_kernel_set:nnn #1#2 {
+\cs_new_protected_nopar:Npn \msg_kernel_set:nnn #1#2 {
\msg_set:nnn { LaTeX } { #1 / #2 }
}
-\cs_new_nopar:Npn \msg_kernel_classes_new:n #1 {
+\cs_new_protected_nopar:Npn \msg_kernel_classes_new:n #1 {
\cs_new_protected:cpx { msg_kernel_ #1 :nnxxx } ##1##2##3##4##5
{
\exp_not:c { msg_kernel_ #1 :nnxxxx }
@@ -384,11 +375,11 @@
\msg_direct_interrupt:xxxx
{ \c_msg_fatal_tl \msg_two_newlines: }
{
- ( LaTeX ) \msg_space:
+ ( LaTeX ) \c_space_tl
\use:c { \c_msg_text_prefix_tl LaTeX / #1 / #2 :xxxx }
{#3} {#4} {#5} {#6}
}
- { ( LaTeX ) \msg_space: }
+ { ( LaTeX ) \c_space_tl}
{ \c_msg_fatal_text_tl }
\tex_end:D
}
@@ -397,11 +388,11 @@
\msg_direct_interrupt:xxxx
{ LaTeX~\c_msg_error_tl \msg_newline: }
{
- ( LaTeX ) \msg_space:
+ ( LaTeX ) \c_space_tl
\use:c { \c_msg_text_prefix_tl LaTeX / #1 / #2 :xxxx }
{#3} {#4} {#5} {#6}
}
- { ( LaTeX ) \msg_space: }
+ { ( LaTeX ) \c_space_tl }
{
\cs_if_exist:cTF
{ \c_msg_more_text_prefix_tl LaTeX / #1 / #2 :xxxx }
@@ -422,27 +413,26 @@
}
\msg_kernel_classes_new:n { info }
\msg_kernel_new:nnnn { msg } { message-unknown }
- {Unknown message `#2' for module `#1'.}
- {%
- LaTeX was asked to display a message by the `#1' module.\\%
- The message was supposed to be called `#2', but I can't\\%
- find a message with that name.%
+ { Unknown~message~'#2'~for~module~'#1'.}
+ {
+ \c_msg_coding_error_text_tl
+ LaTeX~was~asked~to~display~a~message~called~'#2'\\
+ by~the~module~'#1'~module:~this~message~does~not~exist.
\c_msg_return_text_tl
}
\msg_kernel_new:nnnn { msg } { message-class-unknown }
- {Unknown message class `#1'.}
- {%
- You have asked for a message to be redirected to class `#1'.\\%
- The message class `#1' has not been set up:\\%
- perhaps this is a typing error.%
+ { Unknown~message~class~'#1'. }
+ {
+ LaTeX~has~been~asked~to~redirect~messages~to~a~class~'#1':\\
+ this~was~never~defined.
+
\c_msg_return_text_tl
}
\msg_kernel_new:nnnn { msg } { redirect-loop }
- {Message redirection loop for message class `#1'.}
- {%
- You have asked for a message to be redirected,\\%
- but the redirection instructions form a loop:\\%
- you've lost the message.%
+ { Message~redirection~loop~for~message~class~'#1'. }
+ {
+ LaTeX~has~been~asked~to~redirect~messages~in~an~infinite~loop.\\
+ The~original~message~here~has~been~lost.
\c_msg_return_text_tl
}
\cs_set_protected:Npn \msg_kernel_bug:x #1 {