expkv-cs (18oct20)

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

1 files changed, 18 insertions, 18 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 d1f3ccc1df1..38f5d3af810 100644
--- a/Master/texmf-dist/tex/generic/expkv-cs/expkv-cs.tex
+++ b/Master/texmf-dist/tex/generic/expkv-cs/expkv-cs.tex
@@ -35,11 +35,12 @@
 \else
   \expandafter\endinput
 \fi
-\def\ekvcVersion{0.5}
-\def\ekvcDate{2020-10-11}
+\def\ekvcVersion{0.6}
+\def\ekvcDate{2020-10-18}
 \csname ekvc@tmp\endcsname
 \expandafter\chardef\csname ekvc@tmp\endcsname=\catcode`\@
 \catcode`\@=11
+\chardef\ekvc@zero0
 \newcount\ekvc@keycount
 \def\ekvc@long{}
 \def\ekvc@any@long{}
@@ -397,12 +398,11 @@
                   ####1%
                 {%
                   \unexpanded\expandafter{\csname ekvc@@safehash@#1\endcsname}%
-                  ####1\unexpanded{\ekvc@mark}{ }%
+                  ####1\unexpanded{\ekvc@mark\ekvc@zero}%
                   \unexpanded\expandafter
                     {%
-                      \csname ekvc@hashmark@#1\endcsname
-                      {\ekvc@err@missing@hash{#1} }%
-                      \ekvc@mark{}\ekvc@stop
+                      \csname ekvc@hashmark@#1\endcsname\ekvc@zero
+                      \ekvc@mark{\ekvc@err@missing@hash{#1}}\ekvc@stop
                     }%
                 }%
               \long\gdef
@@ -449,19 +449,23 @@
         \endgroup
       }%
   }
-\long\def\ekvcValue#1#2%
+\long\def\ekvcValue#1%
   {%
-    \romannumeral`\^^@%
+    \romannumeral
     \ekv@ifdefined{ekvc@safehash@#1}%
-      {\csname ekvc@safehash@#1\endcsname{#2}}%
-      {\ekvc@err@unknown@hash{#1} }% keep this space
+      {\csname ekvc@safehash@#1\endcsname}%
+      {\ekvc@err@unknown@hash{#1}\@firstoftwo\ekvc@zero}%
   }
 \long\def\ekvcValueFast#1#2{\csname ekvc@fasthash@#1\endcsname#2\ekvc@stop}
-\long\def\ekvcValueSplit#1#2#3%
+\long\def\ekvcValueSplit#1%
   {%
     \ekv@ifdefined{ekvc@safesplithash@#1}%
-      {\csname ekvc@safesplithash@#1\endcsname{#2}{#3}}%
-      {\ekvc@err@unknown@hash{#1}#3{}{#2}}%
+      {\csname ekvc@safesplithash@#1\endcsname}%
+      {\ekvc@err@unknown@hash{#1}\ekvcValueSplit@recover}%
+  }
+\long\def\ekvcValueSplit@recover#1#2%
+  {%
+    #2{#1}{}%
   }
 \long\def\ekvc@safe@found@hash#1#2\ekvc@stop#3%
   {%
@@ -475,11 +479,7 @@
   {%
     \csname ekvc@fastsplithash@#1\endcsname#2\ekvc@stop
   }
-\long\def\ekvcValueSplitFast@#1#2#3%
-  {%
-    \expandafter#3\expandafter{#1#2\ekvc@stop}%
-  }
-\long\def\ekvc@safehash@#1{\ekvc@err@empty@hash\@gobble{} }% keep this space
+\long\def\ekvc@safehash@#1{\ekvc@err@empty@hash\ekvc@zero}
 \long\def\ekvc@fasthash@#1\ekvc@stop{\ekvc@err@empty@hash}
 \long\def\ekvc@safesplithash@#1#2{\ekvc@err@empty@hash#2{#1}{}}
 \long\def\ekvc@fastsplithash@#1\ekvc@stop#2{\ekvc@err@empty@hash#2{#1}{}}