From ef913777dbe1c09d286130217dba137589a2b957 Mon Sep 17 00:00:00 2001 From: PhelypeOleinik Date: Mon, 29 Aug 2022 16:28:48 -0300 Subject: [PATCH] Use the correct argument --- base/ltcmd.dtx | 10 +++++----- base/testfiles-ltcmd/ltcmd008.lvt | 4 ++-- base/testfiles-ltcmd/ltcmd008.tlg | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/base/ltcmd.dtx b/base/ltcmd.dtx index 07f7d1140..d4944fca0 100644 --- a/base/ltcmd.dtx +++ b/base/ltcmd.dtx @@ -4064,15 +4064,15 @@ { \quark_if_recursion_tail_stop_do:Nn #3 { \tl_set:Nn \ProcessedArgument { #1 = {#2} } } - \str_if_eq:nnTF {#1} { = } + \str_if_eq:nnTF {#3} { = } { \use_i_delimit_by_q_recursion_stop:nw { \tl_set:Nn \ProcessedArgument {#2} } } { \bool_lazy_or:nnTF - { \str_if_eq_p:nn {#1} { $ } } - { \str_if_eq_p:nn {#1} { \( } } + { \str_if_eq_p:nn {#3} { $ } } + { \str_if_eq_p:nn {#3} { \( } } { \@@_arg_to_keyvalue_math:nnw {#1} {#2} } { \@@_arg_to_keyvalue_loop:nnw {#1} {#2} } } @@ -4094,8 +4094,8 @@ \quark_if_recursion_tail_stop_do:Nn #3 { \tl_set:Nn \ProcessedArgument { #1 = {#2} } } \bool_lazy_or:nnTF - { \str_if_eq_p:nn {#1} { $ } } - { \str_if_eq_p:nn {#1} { \) } } + { \str_if_eq_p:nn {#3} { $ } } + { \str_if_eq_p:nn {#3} { \) } } { \@@_arg_to_keyvalue_loop:nnw {#1} {#2} } { \@@_arg_to_keyvalue_math:nnw {#1} {#2} } } diff --git a/base/testfiles-ltcmd/ltcmd008.lvt b/base/testfiles-ltcmd/ltcmd008.lvt index 40f2f49d8..f703d6c60 100644 --- a/base/testfiles-ltcmd/ltcmd008.lvt +++ b/base/testfiles-ltcmd/ltcmd008.lvt @@ -46,8 +46,8 @@ \catcode`\[=1 \catcode`\]=2 \tl_rescan:nn - { \char_set_catcode_group_begin:N \[ \char_set_catcode_group_end:N \] } + { \char_set_catcode_group_begin:N \[ \char_set_catcode_group_end:N \] } { \foo [ [ baz ] ] } } -\END \ No newline at end of file +\END diff --git a/base/testfiles-ltcmd/ltcmd008.tlg b/base/testfiles-ltcmd/ltcmd008.tlg index 9d78036a4..1d154a021 100644 --- a/base/testfiles-ltcmd/ltcmd008.tlg +++ b/base/testfiles-ltcmd/ltcmd008.tlg @@ -11,19 +11,19 @@ TEST 1: Basic definitions using ={...} TEST 2: Collecting keyvals ============================================================ (TOC-entry={bong})(baz) -(TOC-entry={bong=bang})(baz) +(bong=bang)(baz) (bong)(baz) -(TOC-entry={bong=bang})(baz) +(bong=bang)(baz) (TOC-entry={$y=mx+c$})(baz) (TOC-entry={\(y=mx+c\)})(baz) -(TOC-entry={math=$y\mathbin {=}mx+c$})(baz) +(math=$y\mathbin {=}mx+c$)(baz) ============================================================ ============================================================ TEST 3: Mixed argument types using ={...} ============================================================ (TOC-entry={bar}) (TOC-entry={baz}) -(TOC-entry={bong=bing}) +(bong=bing) ============================================================ ============================================================ TEST 4: Awkward catcodes