From 83bce5369c17e79e461fc45c3707d11990d9c9a7 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 2 May 2020 17:45:59 +0000 Subject: expkv-def missed git-svn-id: svn://tug.org/texlive/trunk@54970 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/generic/expkv-def/expkv-def.tex | 24 +++++++++++++--------- 1 file changed, 14 insertions(+), 10 deletions(-) (limited to 'Master/texmf-dist/tex/generic') diff --git a/Master/texmf-dist/tex/generic/expkv-def/expkv-def.tex b/Master/texmf-dist/tex/generic/expkv-def/expkv-def.tex index b5c5038d0d0..6237d0803f8 100644 --- a/Master/texmf-dist/tex/generic/expkv-def/expkv-def.tex +++ b/Master/texmf-dist/tex/generic/expkv-def/expkv-def.tex @@ -35,8 +35,8 @@ \else \expandafter\endinput \fi -\def\ekvdVersion{0.2a} -\def\ekvdDate{2020-04-04} +\def\ekvdVersion{0.3} +\def\ekvdDate{2020-04-29} \csname ekvd@tmp\endcsname \expandafter\chardef\csname ekvd@tmp\endcsname=\catcode`\@ \catcode`\@=11 @@ -302,13 +302,21 @@ \ekvd@assert@filledarg{#1meta #4}{#5}% {% \edef\ekvd@tmp{\ekvd@set}% - \expandafter\ekvd@type@meta@\expandafter{\ekvd@tmp}{#3}{#5}% + \expandafter\ekvd@type@meta@a\expandafter{\ekvd@tmp}{#5}{#3}% #2\ekvd@set{#4}\ekvd@tmp }% } -\protected\long\def\ekvd@type@meta@#1#2#3% +\protected\long\def\ekvd@type@meta@a#1#2% {% - \ekvd@prot\ekvd@long\def\ekvd@tmp#2{\ekvset{#1}{#3}}% + \expandafter\ekvd@type@meta@b\expandafter{\ekvset{#1}{#2}}% + } +\protected\def\ekvd@type@meta@b + {% + \expandafter\ekvd@type@meta@c\expandafter + } +\protected\long\def\ekvd@type@meta@c#1#2% + {% + \ekvd@prot\ekvd@long\def\ekvd@tmp#2{#1}% } \protected\def\ekvd@t@meta{\ekvd@type@meta{}\ekvlet{##1}} \protected\long\def\ekvd@t@nmeta#1#2% @@ -320,14 +328,10 @@ {% \ekvd@assert@twoargs{s#1meta #4}{#5}% {% - \expandafter\ekvd@type@smeta@\expandafter{\@secondoftwo#5}{#5}{#3} + \ekvd@type@meta@a#5{#3}% #2\ekvd@set{#4}\ekvd@tmp }% } -\protected\long\def\ekvd@type@smeta@#1#2#3% - {% - \expandafter\ekvd@type@meta@\expandafter{\@firstoftwo#2}{#3}{#1}% - } \protected\def\ekvd@t@smeta{\ekvd@type@smeta{}\ekvlet{##1}} \protected\long\def\ekvd@t@snmeta#1#2% {% -- cgit v1.2.3