|
34 | 34 | %%% From File: ltcmd.dtx
|
35 | 35 | %
|
36 | 36 | % \begin{macrocode}
|
37 |
| -\def\ltcmdversion{v1.0k} |
38 |
| -\def\ltcmddate{2022-02-28} |
| 37 | +\def\ltcmdversion{v1.0l} |
| 38 | +\def\ltcmddate{2022-03-18} |
39 | 39 | % \end{macrocode}
|
40 | 40 | %
|
41 | 41 | %<*driver>
|
|
4097 | 4097 | % \begin{macro}{\@@_cmd_type_cases:Nnnnn}
|
4098 | 4098 | % \changes{v1.0d}{2021/04/19}{Renamed \cs{__cmd_cmd_if_xparse:NTF} to
|
4099 | 4099 | % \cs{__kernel_cmd_if_xparse:NTF} for cross-module usage}
|
4100 |
| -% \changes{v1.0d}{2021/07/30}{Added \cs{@@_cmd_type_cases:Nnnnn} for |
| 4100 | +% \changes{v1.0d}{2021/07/30}{Added \cs{@@_cmd_type_cases:NnnnnF} for |
4101 | 4101 | % \cs{NewCommandCopy} and \cs{ShowCommand} support}
|
| 4102 | +% \changes{v1.0l}{2022/03/18}{Fix \cs{@@_cmd_type_cases:NnnnnF} |
| 4103 | +%" prematurely expanding macros (gh/795)} |
4102 | 4104 | % \begin{macro}{\@@_cmd_if_xparse_aux:N}
|
4103 | 4105 | %
|
4104 | 4106 | % To determine whether the command is an \pkg{xparse} command check
|
|
4119 | 4121 | \exp_args:Nf \tl_if_empty:nT { \cs_argument_spec:N #1 }
|
4120 | 4122 | {
|
4121 | 4123 | \token_if_macro:NT #1
|
4122 |
| - { |
4123 |
| - \exp_after:wN \exp_after:wN |
4124 |
| - \exp_after:wN \token_to_str:N |
4125 |
| - \exp_after:wN \use_i_delimit_by_q_stop:nw |
4126 |
| - #1 \scan_stop: \q_stop |
4127 |
| - } |
| 4124 | + { \exp_not:N \exp_not:N \exp_not:e { \tl_head:N #1 } } |
4128 | 4125 | }
|
4129 | 4126 | }
|
4130 | 4127 | {
|
4131 |
| - { \token_to_str:N \@@_start:nNNnnn } {#2} |
4132 |
| - { \token_to_str:N \@@_start_expandable:nNNNNn } {#3} |
4133 |
| - { \token_to_str:N \@@_start_env:nnnnn } {#4} |
| 4128 | + { \exp_not:N \@@_start:nNNnnn } {#2} |
| 4129 | + { \exp_not:N \@@_start_expandable:nNNNNn } {#3} |
| 4130 | + { \exp_not:N \@@_start_env:nnnnn } {#4} |
4134 | 4131 | {
|
4135 |
| - \exp_after:wN \token_to_str:N |
| 4132 | + \exp_after:wN \exp_not:N |
4136 | 4133 | \cs:w environment~
|
4137 | 4134 | \exp_last_unbraced:Ne \use_none:nnn
|
4138 | 4135 | { \cs_to_str:N #1 } ~end~aux \cs_end:
|
|
0 commit comments