From 2579db312dc508bbbe9e4ba31a8a510545f69503 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 11 Oct 2020 20:49:19 +0000 Subject: expkv-opt (11oct20) git-svn-id: svn://tug.org/texlive/trunk@56633 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/generic/expkv-opt/README.md | 2 +- .../texmf-dist/doc/generic/expkv-opt/expkv-opt.pdf | Bin 260700 -> 260616 bytes .../source/generic/expkv-opt/expkv-opt.dtx | 15 ++++++++------- .../texmf-dist/tex/generic/expkv-opt/expkv-opt.sty | 13 +++++++------ 4 files changed, 16 insertions(+), 14 deletions(-) diff --git a/Master/texmf-dist/doc/generic/expkv-opt/README.md b/Master/texmf-dist/doc/generic/expkv-opt/README.md index c92161eb5ae..aa5d63cb029 100644 --- a/Master/texmf-dist/doc/generic/expkv-opt/README.md +++ b/Master/texmf-dist/doc/generic/expkv-opt/README.md @@ -1,7 +1,7 @@ ------------------------------------------------------------------------------- # expkv-opt -- parse class and package options with expkv -Version 2020-07-04 v0.1a +Version 2020-10-10 v0.1b Released under the LaTeX Project Public License v1.3c or later See http://www.latex-project.org/lppl.txt diff --git a/Master/texmf-dist/doc/generic/expkv-opt/expkv-opt.pdf b/Master/texmf-dist/doc/generic/expkv-opt/expkv-opt.pdf index 47257e50d38..140d0c79f3e 100644 Binary files a/Master/texmf-dist/doc/generic/expkv-opt/expkv-opt.pdf and b/Master/texmf-dist/doc/generic/expkv-opt/expkv-opt.pdf differ diff --git a/Master/texmf-dist/source/generic/expkv-opt/expkv-opt.dtx b/Master/texmf-dist/source/generic/expkv-opt/expkv-opt.dtx index 511cf6bf083..f9a30b79663 100644 --- a/Master/texmf-dist/source/generic/expkv-opt/expkv-opt.dtx +++ b/Master/texmf-dist/source/generic/expkv-opt/expkv-opt.dtx @@ -481,8 +481,8 @@ and the derived files expkv-opt.pdf % \begin{macro}{\ekvoVersion,\ekvoDate} % Store the packages version and date in two macros. % \begin{macrocode} -\newcommand*\ekvoVersion{0.1a} -\newcommand*\ekvoDate{2020-07-04} +\newcommand*\ekvoVersion{0.1b} +\newcommand*\ekvoDate{2020-10-10} % \end{macrocode} % \end{macro} % And we report who we are and what we need. @@ -725,11 +725,12 @@ and the derived files expkv-opt.pdf % commas isn't executed, else this is equivalent to % |\ekvparse\ekvo@set@k\ekvo@set@kv{#1}|. % \begin{macrocode} -\long\def\ekvo@parse#1% +\protected\long\def\ekvo@parse#1% {% \ekv@eq@other#1\ekv@nil\ekv@mark\ekv@parse@eq@other@a - =\ekv@mark\ekv@parse@eq@active\ekv@stop + =\ekv@mark\ekv@parse@eq@active \ekvo@set@k\ekvo@set@kv + \ekvo@tail } % \end{macrocode} % \end{macro} @@ -737,9 +738,9 @@ and the derived files expkv-opt.pdf % \begin{macro}[internal]{\ekvo@set@k,\ekvo@set@kv} % These two macros check whether the key is defined and if so call the handler % for defined keys and execute the key, else the handler for undefined keys is -% called. +% called. They have to clean up a bit of code which is left by |\ekvo@parse|. % \begin{macrocode} -\protected\def\ekvo@set@k#1% +\protected\def\ekvo@set@k#1#2\ekvo@tail {% \ekv@ifdefined{\ekvo@name{#1}N}% {% @@ -748,7 +749,7 @@ and the derived files expkv-opt.pdf }% {\ekvo@handle@undefined@k{#1}}% } -\protected\def\ekvo@set@kv#1#2% +\protected\def\ekvo@set@kv#1#2#3\ekvo@tail {% \ekv@ifdefined{\ekvo@name{#1}}% {% diff --git a/Master/texmf-dist/tex/generic/expkv-opt/expkv-opt.sty b/Master/texmf-dist/tex/generic/expkv-opt/expkv-opt.sty index 2b02c7885d9..1683a2ca995 100644 --- a/Master/texmf-dist/tex/generic/expkv-opt/expkv-opt.sty +++ b/Master/texmf-dist/tex/generic/expkv-opt/expkv-opt.sty @@ -29,8 +29,8 @@ %% and the derived files expkv-opt.pdf %% expkv-opt.sty %% -\newcommand*\ekvoVersion{0.1a} -\newcommand*\ekvoDate{2020-07-04} +\newcommand*\ekvoVersion{0.1b} +\newcommand*\ekvoDate{2020-10-10} \ProvidesPackage{expkv-opt} [% \ekvoDate\space v\ekvoVersion\space @@ -156,13 +156,14 @@ {% \expandafter\ekvo@CurrentOption@loop\expandafter{#1}\ekvo@parse } -\long\def\ekvo@parse#1% +\protected\long\def\ekvo@parse#1% {% \ekv@eq@other#1\ekv@nil\ekv@mark\ekv@parse@eq@other@a - =\ekv@mark\ekv@parse@eq@active\ekv@stop + =\ekv@mark\ekv@parse@eq@active \ekvo@set@k\ekvo@set@kv + \ekvo@tail } -\protected\def\ekvo@set@k#1% +\protected\def\ekvo@set@k#1#2\ekvo@tail {% \ekv@ifdefined{\ekvo@name{#1}N}% {% @@ -171,7 +172,7 @@ }% {\ekvo@handle@undefined@k{#1}}% } -\protected\def\ekvo@set@kv#1#2% +\protected\def\ekvo@set@kv#1#2#3\ekvo@tail {% \ekv@ifdefined{\ekvo@name{#1}}% {% -- cgit v1.2.3