summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/l3kernel/l3text.dtx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-10-05 20:55:13 +0000
committerKarl Berry <karl@freefriends.org>2020-10-05 20:55:13 +0000
commit0a6a10589966c07c10f5ddaa83aa57e4f8bcc9d4 (patch)
treeab4fba8cb51631f0b798b2242dc7bb8386009397 /Master/texmf-dist/source/latex/l3kernel/l3text.dtx
parent2d7e71c150a2b05cdfb3f5bf685e4255640b0760 (diff)
l3 (5oct20)
git-svn-id: svn://tug.org/texlive/trunk@56556 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/l3kernel/l3text.dtx')
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3text.dtx20
1 files changed, 9 insertions, 11 deletions
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3text.dtx b/Master/texmf-dist/source/latex/l3kernel/l3text.dtx
index 325b7f2763d..3672f461770 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3text.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3text.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2020-09-24}
+% \date{Released 2020-10-05}
%
% \maketitle
%
@@ -852,6 +852,7 @@
\@@_expand_loop:w
}
}
+% \end{macrocode}
% Next we exclude math commands: this is mainly as there \emph{might} be an
% \cs{ensuremath}. We also handle accents, which are basically the same issue
% but are kept separate for semantic reasons.
@@ -922,7 +923,9 @@
\exp_not:N \str_if_eq:nnTF {#1} { \exp_not:N \protect }
{ \exp_not:N \@@_expand_protect:N }
{
- \cs_if_exist:cTF { @current@cmd }
+ \bool_lazy_and:nnTF
+ { \cs_if_exist_p:N \fmtname }
+ { \str_if_eq_p:Vn \fmtname { LaTeX2e } }
{ \exp_not:N \@@_expand_encoding:N #1 }
{ \exp_not:N \@@_expand_replace:N #1 }
}
@@ -950,16 +953,11 @@
% \begin{macrocode}
\cs_new:Npn \@@_expand_encoding:N #1
{
- \cs_if_eq:NNTF #1 \@current@cmd
+ \bool_lazy_or:nnTF
+ { \cs_if_eq_p:NN #1 \@current@cmd }
+ { \cs_if_eq_p:NN #1 \@changed@cmd }
{ \exp_after:wN \@@_expand_loop:w \@@_expand_encoding_escape:NN }
- {
- \cs_if_eq:NNTF #1 \@changed@cmd
- {
- \exp_after:wN \@@_expand_loop:w
- \@@_expand_encoding_escape:NN
- }
- { \@@_expand_replace:N #1 }
- }
+ { \@@_expand_replace:N #1 }
}
\cs_new:Npn \@@_expand_encoding_escape:NN #1#2 { \exp_not:n {#1} }
% \end{macrocode}