texlive[58853] Master/texmf-dist: expkv (12apr21)

[commits+karl at tug.org]

Revision: 58853
          http://tug.org/svn/texlive?view=revision&revision=58853
Author:   karl
Date:     2021-04-12 22:04:17 +0200 (Mon, 12 Apr 2021)
Log Message:
-----------
expkv (12apr21)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/latex/expkv/README.md
    trunk/Master/texmf-dist/doc/latex/expkv/expkv.pdf
    trunk/Master/texmf-dist/source/latex/expkv/expkv.dtx
    trunk/Master/texmf-dist/tex/generic/expkv/expkv.tex

Modified: trunk/Master/texmf-dist/doc/latex/expkv/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/expkv/README.md	2021-04-12 20:04:05 UTC (rev 58852)
+++ trunk/Master/texmf-dist/doc/latex/expkv/README.md	2021-04-12 20:04:17 UTC (rev 58853)
@@ -1,7 +1,7 @@
 -------------------------------------------------------------------------------
 # expkv -- an expandable key=val implementation
 
-Version 2021-04-09 v1.7
+Version 2021-04-11 v1.7a
 
 Released under the LaTeX Project Public License v1.3c or later
 See http://www.latex-project.org/lppl.txt

Modified: trunk/Master/texmf-dist/doc/latex/expkv/expkv.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/source/latex/expkv/expkv.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/expkv/expkv.dtx	2021-04-12 20:04:05 UTC (rev 58852)
+++ trunk/Master/texmf-dist/source/latex/expkv/expkv.dtx	2021-04-12 20:04:17 UTC (rev 58853)
@@ -1325,8 +1325,8 @@
 % \begin{macro}{\ekvVersion,\ekvDate}
 % We're on our first input, so lets store the version and date in a macro.
 %    \begin{macrocode}
-\def\ekvVersion{1.7}
-\def\ekvDate{2021-04-09}
+\def\ekvVersion{1.7a}
+\def\ekvDate{2021-04-11}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -1380,8 +1380,8 @@
 % \begin{macro}[internal]
 %   {
 %     \@gobble,\@firstofone,\@firstoftwo,\@secondoftwo,
-%     \ekv at gobbleto@stop,\ekv at fi@gobble,\ekv at fi@firstoftwo,\ekv at fi@secondoftwo,
-%     \ekv at gobble@mark,\ekv at gobble@from at mark@to at stop
+%     \ekv at fi@gobble,\ekv at fi@firstofone,\ekv at fi@firstoftwo,\ekv at fi@secondoftwo,
+%     \ekv at gobble@mark,\ekv at gobbleto@stop,\ekv at gobble@from at mark@to at stop
 %   }
 % Since branching tests are often more versatile than |\if...\else...\fi|
 % constructs, we define helpers that are branching pretty fast. Also here are
@@ -1396,10 +1396,11 @@
 \long\def\@firstoftwo#1#2{#1}
 \long\def\@secondoftwo#1#2{#2}
 \long\def\ekv at fi@gobble\fi\@firstofone#1{\fi}
+\long\def\ekv at fi@firstofone\fi\@gobble#1{\fi#1}
 \long\def\ekv at fi@firstoftwo\fi\@secondoftwo#1#2{\fi#1}
 \long\def\ekv at fi@secondoftwo\fi\@firstoftwo#1#2{\fi#2}
+\def\ekv at gobble@mark\ekv at mark{}
 \long\def\ekv at gobbleto@stop#1\ekv at stop{}
-\def\ekv at gobble@mark\ekv at mark{}
 \long\def\ekv at gobble@from at mark@to at stop\ekv at mark#1\ekv at stop{}
 %    \end{macrocode}
 % \end{macro}

Modified: trunk/Master/texmf-dist/tex/generic/expkv/expkv.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/expkv/expkv.tex	2021-04-12 20:04:05 UTC (rev 58852)
+++ trunk/Master/texmf-dist/tex/generic/expkv/expkv.tex	2021-04-12 20:04:17 UTC (rev 58853)
@@ -39,8 +39,8 @@
   \errmessage{expkv requires e-TeX}
   \expandafter\endinput
 \fi
-\def\ekvVersion{1.7}
-\def\ekvDate{2021-04-09}
+\def\ekvVersion{1.7a}
+\def\ekvDate{2021-04-11}
 \csname ekv at tmp\endcsname
 \expandafter\chardef\csname ekv at tmp\endcsname=\catcode`\@
 \catcode`\@=11
@@ -61,10 +61,11 @@
 \long\def\@firstoftwo#1#2{#1}
 \long\def\@secondoftwo#1#2{#2}
 \long\def\ekv at fi@gobble\fi\@firstofone#1{\fi}
+\long\def\ekv at fi@firstofone\fi\@gobble#1{\fi#1}
 \long\def\ekv at fi@firstoftwo\fi\@secondoftwo#1#2{\fi#1}
 \long\def\ekv at fi@secondoftwo\fi\@firstoftwo#1#2{\fi#2}
+\def\ekv at gobble@mark\ekv at mark{}
 \long\def\ekv at gobbleto@stop#1\ekv at stop{}
-\def\ekv at gobble@mark\ekv at mark{}
 \long\def\ekv at gobble@from at mark@to at stop\ekv at mark#1\ekv at stop{}
 \long\def\ekv at ifempty#1%
   {%