From b3f9e9157ce0f6402d743831409df75e1c85c93b Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 3 Jun 2021 20:49:04 +0000 Subject: expkv (3jun21) git-svn-id: svn://tug.org/texlive/trunk@59452 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/generic/expkv/expkv.tex | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) (limited to 'Master/texmf-dist/tex/generic/expkv') diff --git a/Master/texmf-dist/tex/generic/expkv/expkv.tex b/Master/texmf-dist/tex/generic/expkv/expkv.tex index 7e99c8897a8..f1c4719476b 100644 --- a/Master/texmf-dist/tex/generic/expkv/expkv.tex +++ b/Master/texmf-dist/tex/generic/expkv/expkv.tex @@ -44,8 +44,8 @@ \errmessage{expkv Error: e-TeX and \noexpand\expanded required} \expandafter\endinput \fi -\def\ekvVersion{1.8} -\def\ekvDate{2021-05-24} +\def\ekvVersion{1.8a} +\def\ekvDate{2021-06-03} \csname ekv@tmp\endcsname \expandafter\chardef\csname ekv@tmp\endcsname=\catcode`\@ \catcode`\@=11 @@ -658,25 +658,24 @@ \begingroup \def\ekvoptarg#1#2{% \endgroup -\long\def\ekvoptarg##1##2##3% +\def\ekvoptarg{\romannumeral#1\ekv@optarg@a} +\long\def\ekv@optarg@a##1##2##3% {% - \romannumeral - #1% - \ekv@optarg@if\ekv@mark##3\ekv@mark\ekv@optarg\ekv@mark[\ekv@mark + \ekv@optarg@if\ekv@mark##3\ekv@mark\ekv@optarg@b\ekv@mark[\ekv@mark #2% \@firstofone{\ekv@zero##1}{##2}{##3}% - } -\long\def\ekvoptargTF##1##2##3% + }% +\def\ekvoptargTF{\romannumeral#1\ekv@optargTF@a} +\long\def\ekv@optargTF@a##1##2##3% {% - \romannumeral - #1% - \ekv@optarg@if\ekv@mark##3\ekv@mark\ekv@optargTF{##1}\ekv@mark[\ekv@mark + \ekv@optarg@if\ekv@mark##3\ekv@mark\ekv@optargTF@b{##1}\ekv@mark[\ekv@mark #2% \@firstofone{\ekv@zero##2}{##3}% } -\long\def\ekv@optarg\ekv@mark[\ekv@mark\ifnum`##1\fi\@firstofone##2##3##4##5]% +\long\def\ekv@optarg@b\ekv@mark[\ekv@mark\ifnum`##1\fi\@firstofone##2##3##4##5]% {#2##2{##5}} -\long\def\ekv@optargTF##1\ekv@mark[\ekv@mark\ifnum`##2\fi\@firstofone##3##4##5]% +\long\def\ekv@optargTF@b + ##1\ekv@mark[\ekv@mark\ifnum`##2\fi\@firstofone##3##4##5]% {#2\ekv@zero##1{##5}} } \ekv@exparg{\expandafter\ekvoptarg\expandafter{\ekv@alignsafe}}\ekv@endalignsafe -- cgit v1.2.3