expkv-def (1mar20)

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

4 files changed, 21 insertions, 21 deletions

diff --git a/Master/texmf-dist/doc/latex/expkv-def/README.md b/Master/texmf-dist/doc/latex/expkv-def/README.md
index 40265856577..513466054e8 100644
--- a/Master/texmf-dist/doc/latex/expkv-def/README.md
+++ b/Master/texmf-dist/doc/latex/expkv-def/README.md
@@ -1,7 +1,7 @@
 -------------------------------------------------------------------------------
 # expkv-def -- a key-defining frontend for expkv
 
-Version 2020-02-27 v0.1
+Version 2020-02-29 v0.1a
 
 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/latex/expkv-def/expkv-def.pdf b/Master/texmf-dist/doc/latex/expkv-def/expkv-def.pdf
index a4c589c83fe..a41b259d5fc 100644
--- a/Master/texmf-dist/doc/latex/expkv-def/expkv-def.pdf
+++ b/Master/texmf-dist/doc/latex/expkv-def/expkv-def.pdf
diff --git a/Master/texmf-dist/source/latex/expkv-def/expkv-def.dtx b/Master/texmf-dist/source/latex/expkv-def/expkv-def.dtx
index 33bcf271573..4fbde86d2cb 100644
--- a/Master/texmf-dist/source/latex/expkv-def/expkv-def.dtx
+++ b/Master/texmf-dist/source/latex/expkv-def/expkv-def.dtx
@@ -230,7 +230,7 @@ and the derived files           expkv-def.pdf
 % \pkg{l3keys}) or directory like handlers (\emph{e.g.}, |/.store in| of
 % \pkg{pgfkeys}). This was decided as a personal preference, more over in \TeX\
 % parsing for the first space is way easier than parsing for the last one.
-% \expkvd's prefixes are sorted into two categories |p|-type, which are
+% \expkvd's prefixes are sorted into two categories: |p|-type, which are
 % equivalent to \TeX's prefixes like |\long|, and |t|-type defining the type of
 % the key. For a description of the available |p|-prefixes take a look at
 % \autoref{sec:prefix:p}, the |t|-prefixes are described in
@@ -387,7 +387,7 @@ and the derived files           expkv-def.pdf
 %
 % \begin{function}{skip,eskip,gskip,xskip}
 %   \begin{syntax}
-%     dimen \key\ = \meta{cs} \prefixes12
+%     skip \key\ = \meta{cs} \prefixes12
 %   \end{syntax}
 %   The \meta{cs} should be a single control sequence, such as |\foo|.
 %   This is just like |int| but uses a skip register, |\newskip| and |\glueexpr|
@@ -396,7 +396,7 @@ and the derived files           expkv-def.pdf
 %
 % \begin{function}{toks,gtoks,apptoks,gapptoks}
 %   \begin{syntax}
-%     dimen \key\ = \meta{cs} \prefixes12
+%     toks \key\ = \meta{cs} \prefixes12
 %   \end{syntax}
 %   The \meta{cs} should be a single control sequence, such as |\foo|. 
 %   Store \val\ inside of a toks-register. The |g| variants use |\global|, the
@@ -452,7 +452,7 @@ and the derived files           expkv-def.pdf
 %   \begin{syntax}
 %     set \key\ = \marg{set} \prefixes33
 %   \end{syntax}
-%   This will define |\key| to change the set of the current |\ekvset|
+%   This will define \key\ to change the set of the current |\ekvset|
 %   invocation to \set. You can omit \set\ (including the equals sign),
 %   which is the same as using \texttt{set \key\ = \{\key\}}. The created |set|
 %   key will not take a \val. Note that just like in \expkv\ it'll not be
@@ -467,7 +467,7 @@ and the derived files           expkv-def.pdf
 %   Defines \key\ to be a |choice| key, meaning it will only accept a limited
 %   set of values. You should define each possible \val\ inside of the
 %   \val=\meta{definition} list. If a defined \val\ is passed to \key\ the
-%   \meta{dafinition} will be left in the input stream. You can make
+%   \meta{definition} will be left in the input stream. You can make
 %   individual values |protected| inside the \val=\meta{definition} list. By
 %   default a |choice| key is expandable, an undefined \val\ will throw an error
 %   in an expandable way.
@@ -583,8 +583,8 @@ and the derived files           expkv-def.pdf
 % \begin{macro}{\ekvdVersion,\ekvdDate}
 % We're on our first input, so lets store the version and date in a macro.
 %    \begin{macrocode}
-\def\ekvdVersion{0.1}
-\def\ekvdDate{2020-02-27}
+\def\ekvdVersion{0.1a}
+\def\ekvdDate{2020-02-29}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -608,7 +608,7 @@ and the derived files           expkv-def.pdf
 % \begin{macro}[internal]
 %   {\ekvd@long,\ekvd@prot,\ekvd@clear@prefixes,\ekvd@empty}
 % \expkvd\ will use |\ekvd@long| and |\ekvd@prot| to store whether a key should
-% be defined an |\long| or |\protected|, and we have to clear them for every new
+% be defined as |\long| or |\protected|, and we have to clear them for every new
 % key. By default they'll just be empty.
 %    \begin{macrocode}
 \def\ekvd@empty{}
@@ -641,12 +641,12 @@ and the derived files           expkv-def.pdf
 % the prefix grabbing routine, else we throw an error and ignore the key.
 %    \begin{macrocode}
 \protected\def\ekvd@noarg#1{\ekvd@{#1}\ekvd@noarg@mark}
-\protected\def\ekvd@#1#2%
+\protected\long\def\ekvd@#1#2%
   {%
     \ekvd@clear@prefixes
     \ekvd@ifspace{#1}%
       {\ekvd@prefix\ekv@mark#1\ekv@stop{#2}}%
-      {\ekvd@missing@prefix{#1}}%
+      {\ekvd@err@missing@prefix{#1}}%
   }
 %    \end{macrocode}
 % \end{macro}
@@ -996,7 +996,7 @@ and the derived files           expkv-def.pdf
     \ekvd@prot\ekvd@long\def\ekvd@tmp#2{\ekvset{#1}{#3}}%
   }
 \protected\def\ekvd@t@meta{\ekvd@type@meta{}\ekvlet{##1}}
-\protected\def\ekvd@t@nmeta#1#2%
+\protected\long\def\ekvd@t@nmeta#1#2%
   {%
     \ekvd@assert@not@long{nmeta #1}%
     \ekvd@type@meta n\ekvletNoVal{}{#1}{#2}%
@@ -1023,7 +1023,7 @@ and the derived files           expkv-def.pdf
     \expandafter\ekvd@type@meta@\expandafter{\@firstoftwo#2}{#3}{#1}%
   }
 \protected\def\ekvd@t@smeta{\ekvd@type@smeta{}\ekvlet{##1}}
-\protected\def\ekvd@t@snmeta#1#2%
+\protected\long\def\ekvd@t@snmeta#1#2%
   {%
     \ekvd@assert@not@long{snmeta #1}%
     \ekvd@type@smeta n\ekvletNoVal{}{#1}{#2}%
@@ -1062,7 +1062,7 @@ and the derived files           expkv-def.pdf
   {%
     \ekvparse\ekvd@populate@choice@noarg\ekvd@populate@choice@
   }
-\protected\def\ekvd@populate@choice@noarg#1%
+\protected\long\def\ekvd@populate@choice@noarg#1%
   {%
     \expandafter\ekvd@err@missing@definition\expandafter{\ekvd@set@choice : #1}%
   }
diff --git a/Master/texmf-dist/tex/generic/expkv-def/expkv-def.tex b/Master/texmf-dist/tex/generic/expkv-def/expkv-def.tex
index de5ebf283d8..d793230da10 100644
--- a/Master/texmf-dist/tex/generic/expkv-def/expkv-def.tex
+++ b/Master/texmf-dist/tex/generic/expkv-def/expkv-def.tex
@@ -35,8 +35,8 @@
 \else
   \expandafter\endinput
 \fi
-\def\ekvdVersion{0.1}
-\def\ekvdDate{2020-02-27}
+\def\ekvdVersion{0.1a}
+\def\ekvdDate{2020-02-29}
 \csname ekvd@tmp\endcsname
 \expandafter\chardef\csname ekvd@tmp\endcsname=\catcode`\@
 \catcode`\@=11
@@ -53,12 +53,12 @@
     \ekvparse\ekvd@noarg\ekvd@
   }
 \protected\def\ekvd@noarg#1{\ekvd@{#1}\ekvd@noarg@mark}
-\protected\def\ekvd@#1#2%
+\protected\long\def\ekvd@#1#2%
   {%
     \ekvd@clear@prefixes
     \ekvd@ifspace{#1}%
       {\ekvd@prefix\ekv@mark#1\ekv@stop{#2}}%
-      {\ekvd@missing@prefix{#1}}%
+      {\ekvd@err@missing@prefix{#1}}%
   }
 \protected\def\ekvd@prefix#1 {\ekv@strip{#1}\ekvd@prefix@\ekv@mark}
 \protected\def\ekvd@prefix@#1#2\ekv@stop
@@ -267,7 +267,7 @@
     \ekvd@prot\ekvd@long\def\ekvd@tmp#2{\ekvset{#1}{#3}}%
   }
 \protected\def\ekvd@t@meta{\ekvd@type@meta{}\ekvlet{##1}}
-\protected\def\ekvd@t@nmeta#1#2%
+\protected\long\def\ekvd@t@nmeta#1#2%
   {%
     \ekvd@assert@not@long{nmeta #1}%
     \ekvd@type@meta n\ekvletNoVal{}{#1}{#2}%
@@ -285,7 +285,7 @@
     \expandafter\ekvd@type@meta@\expandafter{\@firstoftwo#2}{#3}{#1}%
   }
 \protected\def\ekvd@t@smeta{\ekvd@type@smeta{}\ekvlet{##1}}
-\protected\def\ekvd@t@snmeta#1#2%
+\protected\long\def\ekvd@t@snmeta#1#2%
   {%
     \ekvd@assert@not@long{snmeta #1}%
     \ekvd@type@smeta n\ekvletNoVal{}{#1}{#2}%
@@ -303,7 +303,7 @@
   {%
     \ekvparse\ekvd@populate@choice@noarg\ekvd@populate@choice@
   }
-\protected\def\ekvd@populate@choice@noarg#1%
+\protected\long\def\ekvd@populate@choice@noarg#1%
   {%
     \expandafter\ekvd@err@missing@definition\expandafter{\ekvd@set@choice : #1}%
   }