From 25111608e6aa05042b0c6f83009262e1973d7a45 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Fri, 10 Apr 2020 03:06:35 +0000 Subject: CTAN sync 202004100306 --- macros/generic/expkv/README.md | 2 +- macros/generic/expkv/expkv.dtx | 30 ++++++++++++++---------------- macros/generic/expkv/expkv.pdf | Bin 388809 -> 388741 bytes 3 files changed, 15 insertions(+), 17 deletions(-) (limited to 'macros/generic/expkv') diff --git a/macros/generic/expkv/README.md b/macros/generic/expkv/README.md index 552d95d2b1..aa7b2b12aa 100644 --- a/macros/generic/expkv/README.md +++ b/macros/generic/expkv/README.md @@ -1,7 +1,7 @@ ------------------------------------------------------------------------------- # expkv -- an expandable key=val implementation -Version 2020-04-07 v1.0 +Version 2020-04-09 v1.1 Released under the LaTeX Project Public License v1.3c or later See http://www.latex-project.org/lppl.txt diff --git a/macros/generic/expkv/expkv.dtx b/macros/generic/expkv/expkv.dtx index 97e7e2a21b..6563d3c2ee 100644 --- a/macros/generic/expkv/expkv.dtx +++ b/macros/generic/expkv/expkv.dtx @@ -962,8 +962,8 @@ and the derived files expkv.pdf % \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.0} -\def\ekvDate{2020-04-07} +\def\ekvVersion{1.1} +\def\ekvDate{2020-04-09} % \end{macrocode} % \end{macro} % @@ -1310,9 +1310,8 @@ and the derived files expkv.pdf % \begin{macrocode} \long\def\ekv@set@eq@other@b ##1\ekv@nil\ekv@mark\ekv@set@eq@other@active@a\ekv@stop\ekv@mark - ##2\ekv@nil {% - \ekv@strip{##1}\ekv@set@pair{##2}% + \ekv@strip{##1}\ekv@set@pair } % \end{macrocode} % \end{macro} @@ -1330,9 +1329,9 @@ and the derived files expkv.pdf {% \ekv@set@eq@other@active@b{##1}##2=% } -\long\def\ekv@set@eq@other@active@b##1##2\ekv@nil +\long\def\ekv@set@eq@other@active@b##1% {% - \ekv@strip{##1}\ekv@set@pair{##2}% + \ekv@strip{##1}\ekv@set@pair } % \end{macrocode} % \end{macro} @@ -1352,9 +1351,9 @@ and the derived files expkv.pdf % If an active equal sign was found in |\ekv@set@eq@active| we'll have to pass % the now split \kv\ pair on to |\ekv@set@pair|. % \begin{macrocode} -\long\def\ekv@set@eq@active@##1##2\ekv@nil +\long\def\ekv@set@eq@active@##1\ekv@stop {% - \ekv@strip{##1}\ekv@set@pair{##2}% + \ekv@strip{##1}\ekv@set@pair } % \end{macrocode} % \end{macro} @@ -1469,9 +1468,8 @@ and the derived files expkv.pdf } \long\def\ekv@parse@eq@other@b ##1\ekv@nil\ekv@mark\ekv@parse@eq@other@active@a\ekv@stop\ekv@mark - ##2\ekv@nil {% - \ekv@strip{##1}\ekv@parse@pair{##2}% + \ekv@strip{##1}\ekv@parse@pair } % \end{macrocode} % \end{macro} @@ -1483,9 +1481,9 @@ and the derived files expkv.pdf {% \ekv@parse@eq@other@active@b{##1}##2=% } -\long\def\ekv@parse@eq@other@active@b##1##2\ekv@nil +\long\def\ekv@parse@eq@other@active@b##1% {% - \ekv@strip{##1}\ekv@parse@pair{##2}% + \ekv@strip{##1}\ekv@parse@pair } % \end{macrocode} % \end{macro} @@ -1498,9 +1496,9 @@ and the derived files expkv.pdf \ekv@eq@active##1\ekv@nil\ekv@mark\ekv@parse@eq@active@ #2\ekv@mark\ekv@parse@noeq\ekv@stop } -\long\def\ekv@parse@eq@active@##1##2\ekv@nil +\long\def\ekv@parse@eq@active@##1\ekv@stop {% - \ekv@strip{##1}\ekv@parse@pair{##2}% + \ekv@strip{##1}\ekv@parse@pair } % \end{macrocode} % \end{macro} @@ -1531,7 +1529,7 @@ and the derived files expkv.pdf % % \begin{macro}[internal]{\ekv@parse@pair,\ekv@parse@pair@} % \begin{macrocode} -\long\def\ekv@parse@pair##1##2% +\long\def\ekv@parse@pair##1##2\ekv@nil {% \ekv@strip{##2}\ekv@parse@pair@{##1}% } @@ -1598,7 +1596,7 @@ and the derived files expkv.pdf % defined and call the key-macro. Else it'll branch into the error messages % provided by |\ekv@set@pair|. % \begin{macrocode} -\long\def\ekv@set@pair#1#2#3% +\long\def\ekv@set@pair#1#2\ekv@nil#3% {% \expandafter\ekv@set@pair@ \csname diff --git a/macros/generic/expkv/expkv.pdf b/macros/generic/expkv/expkv.pdf index c6512d943b..f96f204571 100644 Binary files a/macros/generic/expkv/expkv.pdf and b/macros/generic/expkv/expkv.pdf differ -- cgit v1.2.3