diff options
author | Karl Berry <karl@freefriends.org> | 2018-05-13 21:56:47 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2018-05-13 21:56:47 +0000 |
commit | e6d38f40f0132914020c723840be3489c4b692f0 (patch) | |
tree | dac2c281e93cba461b3ff2c1e4b8e34aad401716 /Master/texmf-dist/source/latex/l3kernel/l3expan.dtx | |
parent | 55be422dc01e60cfae781a9a4a310a96c9e99256 (diff) |
l3 (13may18)
git-svn-id: svn://tug.org/texlive/trunk@47705 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/l3kernel/l3expan.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/l3kernel/l3expan.dtx | 33 |
1 files changed, 30 insertions, 3 deletions
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3expan.dtx b/Master/texmf-dist/source/latex/l3kernel/l3expan.dtx index 46c4acf4cec..be337acfb7b 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3expan.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3expan.dtx @@ -41,7 +41,7 @@ % }^^A % } % -% \date{Released 2018-04-30} +% \date{Released 2018-05-12} % % \maketitle % @@ -521,6 +521,7 @@ % \exp_last_unbraced:Nf, % \exp_last_unbraced:NNo, % \exp_last_unbraced:NNV, +% \exp_last_unbraced:NNf, % \exp_last_unbraced:Nco, % \exp_last_unbraced:NcV, % \exp_last_unbraced:Nno, @@ -528,8 +529,10 @@ % \exp_last_unbraced:Nfo, % \exp_last_unbraced:NNNo, % \exp_last_unbraced:NNNV, +% \exp_last_unbraced:NNNf, % \exp_last_unbraced:NnNo, % \exp_last_unbraced:NNNNo, +% \exp_last_unbraced:NNNNf, % } % \begin{syntax} % \cs{exp_last_unbraced:Nno} \meta{token} \Arg{tokens_1} \Arg{tokens_2} @@ -1424,15 +1427,18 @@ % \exp_last_unbraced:Nf, % \exp_last_unbraced:NNo, % \exp_last_unbraced:NNV, +% \exp_last_unbraced:NNf, % \exp_last_unbraced:Nco, % \exp_last_unbraced:NcV, % \exp_last_unbraced:NNNo, % \exp_last_unbraced:NNNV, +% \exp_last_unbraced:NNNf, % \exp_last_unbraced:Nno, % \exp_last_unbraced:Noo, % \exp_last_unbraced:Nfo, % \exp_last_unbraced:NnNo, % \exp_last_unbraced:NNNNo, +% \exp_last_unbraced:NNNNf, % } % \begin{macro}{\exp_last_unbraced:Nx} % Now the business end: most of these are hand-tuned for speed, but the @@ -1453,6 +1459,12 @@ \exp_after:wN #2 \exp:w \@@_eval_register:N #3 } +\cs_new:Npn \exp_last_unbraced:NNf #1#2#3 + { + \exp_after:wN #1 + \exp_after:wN #2 + \exp:w \exp_end_continue_f:w #3 + } \cs_new:Npn \exp_last_unbraced:Nco #1#2#3 { \exp_after:wN #1 \cs:w #2 \exp_after:wN \cs_end: #3 } \cs_new:Npn \exp_last_unbraced:NcV #1#2#3 @@ -1470,12 +1482,27 @@ \exp_after:wN #3 \exp:w \@@_eval_register:N #4 } +\cs_new:Npn \exp_last_unbraced:NNNf #1#2#3#4 + { + \exp_after:wN #1 + \exp_after:wN #2 + \exp_after:wN #3 + \exp:w \exp_end_continue_f:w #4 + } \cs_new:Npn \exp_last_unbraced:Nno { \::n \::o_unbraced \::: } \cs_new:Npn \exp_last_unbraced:Noo { \::o \::o_unbraced \::: } \cs_new:Npn \exp_last_unbraced:Nfo { \::f \::o_unbraced \::: } \cs_new:Npn \exp_last_unbraced:NnNo { \::n \::N \::o_unbraced \::: } \cs_new:Npn \exp_last_unbraced:NNNNo #1#2#3#4#5 { \exp_after:wN #1 \exp_after:wN #2 \exp_after:wN #3 \exp_after:wN #4 #5 } +\cs_new:Npn \exp_last_unbraced:NNNNf #1#2#3#4#5 + { + \exp_after:wN #1 + \exp_after:wN #2 + \exp_after:wN #3 + \exp_after:wN #4 + \exp:w \exp_end_continue_f:w #5 + } \cs_new_protected:Npn \exp_last_unbraced:Nx { \::x_unbraced \::: } % \end{macrocode} % \end{macro} @@ -1505,7 +1532,7 @@ % At the kernel level, we need the primitive behaviour to allow expansion % \emph{before} the brace group. % \begin{macrocode} -\cs_new_eq:NN \__kernel_exp_not:w \etex_unexpanded:D +\cs_new_eq:NN \__kernel_exp_not:w \tex_unexpanded:D % \end{macrocode} % \end{macro} % @@ -1520,7 +1547,7 @@ \cs_new:Npn \exp_not:c #1 { \exp_after:wN \exp_not:N \cs:w #1 \cs_end: } \cs_new:Npn \exp_not:o #1 { \__kernel_exp_not:w \exp_after:wN {#1} } \cs_new:Npn \exp_not:f #1 - { \etex_unexpanded:D \exp_after:wN { \exp:w \exp_end_continue_f:w #1 } } + { \tex_unexpanded:D \exp_after:wN { \exp:w \exp_end_continue_f:w #1 } } \cs_new:Npn \exp_not:V #1 { \__kernel_exp_not:w \exp_after:wN |