expkv-cs (8aug20)

git-svn-id: svn://tug.org/texlive/trunk@56074 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 28 insertions, 16 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 bf925482855..ec97f9845f6 100644
--- a/Master/texmf-dist/tex/generic/expkv-cs/expkv-cs.tex
+++ b/Master/texmf-dist/tex/generic/expkv-cs/expkv-cs.tex
@@ -35,8 +35,8 @@
 \else
   \expandafter\endinput
 \fi
-\def\ekvcVersion{0.3}
-\def\ekvcDate{2020-04-29}
+\def\ekvcVersion{0.4}
+\def\ekvcDate{2020-08-08}
 \csname ekvc@tmp\endcsname
 \expandafter\chardef\csname ekvc@tmp\endcsname=\catcode`\@
 \catcode`\@=11
@@ -55,13 +55,13 @@
   {%
     \unexpanded{#1}##1\unexpanded{#2}%
   }
-\protected\long\def\ekvcSplitAndForward#1#2#3%
+\protected\long\def\ekvcSplitAndUse#1#2%
   {%
     \ekv@ifdefined{\expandafter\@gobble\string#1}%
-      {\ekvc@err@already@defined{#1}}%
-      {\ekvcSplitAndForward@{#1}{#2}{#3}}%
+      {\ekvc@err@already@defined#1}%
+      {\ekvcSplitAndUse@#1{}{#2}}%
   }
-\protected\long\def\ekvcSplitAndForward@#1#2#3%
+\protected\long\def\ekvcSplitAndUse@#1#2#3%
   {%
     \edef\ekvc@set{\string#1}%
     \ekvc@SetupSplitKeys{#3}%
@@ -73,13 +73,19 @@
         \unexpanded\expandafter{\ekvc@initials{}#2}%
       }%
   }
+\protected\long\def\ekvcSplitAndForward#1#2#3%
+  {%
+    \ekv@ifdefined{\expandafter\@gobble\string#1}%
+      {\ekvc@err@already@defined#1}%
+      {\ekvcSplitAndUse@#1{{#2}}{#3}}%
+  }
 \protected\long\def\ekvcSplit#1#2#3%
   {%
     \ekv@ifdefined{\expandafter\@gobble\string#1}%
-      {\ekvc@err@already@defined{#1}}%
+      {\ekvc@err@already@defined#1}%
       {%
         \expandafter
-        \ekvcSplitAndForward@\expandafter#1\csname ekvc@\string#1\endcsname{#2}%
+        \ekvcSplitAndUse@\expandafter#1\csname ekvc@\string#1\endcsname{#2}%
         \ifnum\ekvc@keycount=0
           \def\ekvc@tmp##1##{}%
         \else
@@ -96,12 +102,12 @@
           {#3}%
       }%
   }
-\protected\long\def\ekvc@SetupSplitKeys#1%
+\protected\long\def\ekvc@SetupSplitKeys
   {%
     \ekvc@keycount=0
     \def\ekvc@any@long{}%
     \def\ekvc@initials{}%
-    \ekvparse\ekvc@err@value@required\ekvc@SetupSplitKeys@a{#1}%
+    \ekvparse\ekvc@err@value@required\ekvc@SetupSplitKeys@a
   }
 \protected\def\ekvc@SetupSplitKeys@a#1%
   {%
@@ -190,13 +196,13 @@
         \endgroup
       }%
   }
-\protected\long\def\ekvcHashAndForward#1#2#3%
+\protected\long\def\ekvcHashAndUse#1#2%
   {%
     \ekv@ifdefined{\expandafter\@gobble\string#1}%
-      {\ekvc@err@already@defined{#1}}%
-      {\ekvcHashAndForward@{#1}{#2}{#3}}%
+      {\ekvc@err@already@defined#1}%
+      {\ekvcHashAndUse@#1{}{#2}}%
   }
-\protected\long\def\ekvcHashAndForward@#1#2#3%
+\protected\long\def\ekvcHashAndUse@#1#2#3%
   {%
     \edef\ekvc@set{\string#1}%
     \ekvc@SetupHashKeys{#3}%
@@ -207,13 +213,19 @@
         \unexpanded\expandafter{\ekvc@initials\ekvc@stop#2}%
       }%
   }
+\protected\long\def\ekvcHashAndForward#1#2#3%
+  {%
+    \ekv@ifdefined{\expandafter\@gobble\string#1}%
+      {\ekvc@err@already@defined#1}%
+      {\ekvcHashAndUse@#1{{#2}}{#3}}%
+  }
 \protected\long\def\ekvcHash#1#2#3%
   {%
     \ekv@ifdefined{\expandafter\@gobble\string#1}%
-      {\ekvc@err@already@defined{#1}}%
+      {\ekvc@err@already@defined#1}%
       {%
         \expandafter
-        \ekvcHashAndForward@\expandafter#1\csname ekvc@\string#1\endcsname{#2}%
+        \ekvcHashAndUse@\expandafter#1\csname ekvc@\string#1\endcsname{#2}%
         \ekvc@any@long\expandafter\def\csname ekvc@\string#1\endcsname##1{#3}%
       }%
   }