diff options
author | Karl Berry <karl@freefriends.org> | 2020-12-04 22:23:08 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2020-12-04 22:23:08 +0000 |
commit | 308fffa9446e3b5d28b6e48b89be81575b565c70 (patch) | |
tree | b33f5e1cf009bf510dd974451299d08dc0ffab2a /Master/texmf-dist/source/latex/l3kernel/l3text.dtx | |
parent | c4c23071af2870bf72f421f1aae5c9544ff3a87d (diff) |
l3kernel (4dec20)
git-svn-id: svn://tug.org/texlive/trunk@57066 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.dtx | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3text.dtx b/Master/texmf-dist/source/latex/l3kernel/l3text.dtx index 893c43da59a..9ab4ae6ef52 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-10-27} +% \date{Released 2020-12-03} % % \maketitle % @@ -634,6 +634,8 @@ % \begin{macro}[EXP]{\@@_expand_protect:N} % \begin{macro}[EXP]{\@@_expand_protect:nN} % \begin{macro}[EXP]{\@@_expand_protect:Nw} +% \begin{macro}[EXP]{\@@_expand_testopt:N} +% \begin{macro}[EXP]{\@@_expand_testopt:NNn} % \begin{macro}[EXP]{\@@_expand_replace:N} % \begin{macro}[EXP]{\@@_expand_replace:n} % \begin{macro}[EXP]{\@@_expand_cs_expand:N} @@ -917,7 +919,8 @@ % \LaTeXe{}'s \cs{protect} makes life interesting. Where possible, we % simply remove it and replace with the \enquote{parent} command; of course, % the \cs{protect} might be explicit, in which case we need to leave it alone -% if it's required. +% if it's required. There is also the case of a straight \tn{@protected@testopt} +% to cover. % \begin{macrocode} \cs_new:Npx \@@_expand_cs:N #1 { @@ -927,7 +930,7 @@ \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_testopt:N #1 } { \exp_not:N \@@_expand_replace:N #1 } } } @@ -949,6 +952,17 @@ { \@@_expand_store:n { \protect #1 } } \@@_expand_loop:w } +\cs_new:Npn \@@_expand_testopt:N #1 + { + \str_if_eq:nnTF {#1} { \@protected@testopt } + { \@@_expand_testopt:NNn } + { \@@_expand_encoding:N #1 } + } +\cs_new:Npn \@@_expand_testopt:NNn #1#2#3 + { + \@@_expand_store:n {#1} + \@@_expand_loop:w + } % \end{macrocode} % Deal with encoding-specific commands % \begin{macrocode} @@ -1036,6 +1050,8 @@ % \end{macro} % \end{macro} % \end{macro} +% \end{macro} +% \end{macro} % % \begin{macro} % { |