summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/expkv-cs/expkv-cs.tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-04-29 21:28:43 +0000
committerKarl Berry <karl@freefriends.org>2020-04-29 21:28:43 +0000
commit0307bcecd0d6d579124ad1b8b89540665854d665 (patch)
treeeea906cb8a965cf559c717423b578e115f375be6 /Master/texmf-dist/tex/generic/expkv-cs/expkv-cs.tex
parente1dbb2cbe7bf41890a5bd4b7e79421725e7b3938 (diff)
expkv-cs (29apr20)
git-svn-id: svn://tug.org/texlive/trunk@54939 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic/expkv-cs/expkv-cs.tex')
-rw-r--r--Master/texmf-dist/tex/generic/expkv-cs/expkv-cs.tex30
1 files changed, 25 insertions, 5 deletions
diff --git a/Master/texmf-dist/tex/generic/expkv-cs/expkv-cs.tex b/Master/texmf-dist/tex/generic/expkv-cs/expkv-cs.tex
index 4a3c369a5cf..bf925482855 100644
--- a/Master/texmf-dist/tex/generic/expkv-cs/expkv-cs.tex
+++ b/Master/texmf-dist/tex/generic/expkv-cs/expkv-cs.tex
@@ -35,14 +35,26 @@
\else
\expandafter\endinput
\fi
-\def\ekvcVersion{0.2}
-\def\ekvcDate{2020-04-05}
+\def\ekvcVersion{0.3}
+\def\ekvcDate{2020-04-29}
\csname ekvc@tmp\endcsname
\expandafter\chardef\csname ekvc@tmp\endcsname=\catcode`\@
\catcode`\@=11
\newcount\ekvc@keycount
\def\ekvc@long{}
\def\ekvc@any@long{}
+\def\ekvc@ekvset@pre@expander#1%
+ {%
+ \expandafter\ekvc@ekvset@pre@expander@a\ekvset{#1}\ekvc@stop\ekvc@stop
+ }
+\def\ekvc@ekvset@pre@expander@a
+ {%
+ \expandafter\ekvc@ekvset@pre@expander@b
+ }
+\def\ekvc@ekvset@pre@expander@b#1\ekvc@stop#2\ekvc@stop
+ {%
+ \unexpanded{#1}##1\unexpanded{#2}%
+ }
\protected\long\def\ekvcSplitAndForward#1#2#3%
{%
\ekv@ifdefined{\expandafter\@gobble\string#1}%
@@ -55,7 +67,7 @@
\ekvc@SetupSplitKeys{#3}%
\ekvc@any@long\edef#1##1%
{%
- \unexpanded{\ekvset}{\ekvc@set}{##1}%
+ \expandafter\ekvc@ekvset@pre@expander\expandafter{\ekvc@set}%
\unexpanded\expandafter
{\csname ekvc@split@\the\ekvc@keycount\endcsname}%
\unexpanded\expandafter{\ekvc@initials{}#2}%
@@ -190,7 +202,7 @@
\ekvc@SetupHashKeys{#3}%
\ekvc@any@long\edef#1##1%
{%
- \unexpanded{\ekvset}{\ekvc@set}{##1}%
+ \expandafter\ekvc@ekvset@pre@expander\expandafter{\ekvc@set}%
\unexpanded{\ekvc@hash@pack@argument}%
\unexpanded\expandafter{\ekvc@initials\ekvc@stop#2}%
}%
@@ -417,9 +429,17 @@
}
\protected\long\def\ekvc@type@meta#1#2#3#4#5#6%
{%
- #2\def\ekvc@tmp#3{\ekvset{#1}{#6}}%
+ \expandafter\ekvc@type@meta@a\expandafter{\ekvset{#1}{#6}}{#2}{#3}%
#4\ekvc@set{#5}\ekvc@tmp
}
+\protected\def\ekvc@type@meta@a
+ {%
+ \expandafter\ekvc@type@meta@b\expandafter
+ }
+\protected\long\def\ekvc@type@meta@b#1#2#3%
+ {%
+ #2\def\ekvc@tmp#3{#1}%
+ }
\protected\def\ekvc@t@alias#1#2%
{%
\ekvc@assert@not@long{alias #1}%