summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/l3kernel/l3msg.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/source/latex/l3kernel/l3msg.dtx')
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3msg.dtx39
1 files changed, 19 insertions, 20 deletions
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3msg.dtx b/Master/texmf-dist/source/latex/l3kernel/l3msg.dtx
index 7ff417961b5..c4cce9a58aa 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3msg.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3msg.dtx
@@ -37,7 +37,7 @@
\documentclass[full]{l3doc}
%</driver>
%<*driver|package>
-\GetIdInfo$Id: l3msg.dtx 6037 2015-09-23 12:41:15Z joseph $
+\GetIdInfo$Id: l3msg.dtx 6113 2015-09-28 21:30:11Z bruno $
{L3 Messages}
%</driver|package>
%<*driver>
@@ -2005,31 +2005,30 @@
% (with category code $7$) and keep tokens until that space character,
% dropping everything else until \cs{q_stop}. The \cs{exp_end:} prevents
% losing braces around the user-inserted text if any, and stops the
-% expansion of \cs{exp:w}.
+% expansion of \cs{exp:w}. One group is used to keep the settings
+% for \tn{lowercase} local and the other one is used to prevent
+% |\LaTeX3~error:| from being equal to \cs{scan_stop:}.
% \begin{macrocode}
\group_begin:
-\char_set_catcode_math_superscript:N \^
-\char_set_lccode:nn { `^ } { `\ }
-\char_set_lccode:nn { `L } { `L }
-\char_set_lccode:nn { `T } { `T }
-\char_set_lccode:nn { `X } { `X }
-\tex_lowercase:D
+\cs_set_protected:Npn \@@_tmp:w #1#2
{
- \cs_new:Npx \@@_expandable_error:n #1
+ \group_end:
+ \cs_new:Npn \@@_expandable_error:n ##1
{
- \exp_not:n
- {
- \exp:w
- \exp_after:wN \exp_after:wN
- \exp_after:wN \@@_expandable_error:w
- \exp_after:wN \exp_after:wN
- \exp_after:wN \exp_end:
- }
- \exp_not:N \use:n { \exp_not:c { LaTeX3~error: } ^ #1 } ^
+ \exp:w
+ \exp_after:wN \exp_after:wN
+ \exp_after:wN \@@_expandable_error:w
+ \exp_after:wN \exp_after:wN
+ \exp_after:wN \exp_end:
+ \use:n { #2 #1 ##1 } #1
}
- \cs_new:Npn \@@_expandable_error:w #1 ^ #2 ^ { #1 }
+ \cs_new:Npn \@@_expandable_error:w ##1 #1 ##2 #1 {##1}
}
-\group_end:
+\group_begin:
+\char_set_catcode_math_superscript:N \^
+\char_set_lccode:nn { `^ } { `\ }
+\tex_lowercase:D
+ { \group_end: \exp_args:NNc \@@_tmp:w ^ } { LaTeX3~error: }
% \end{macrocode}
% \end{macro}
% \end{macro}