expkv-def (21sep21)

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

1 files changed, 52 insertions, 27 deletions

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 8aa537402e0..c9d6ebe5b7f 100644
--- a/Master/texmf-dist/source/latex/expkv-def/expkv-def.dtx
+++ b/Master/texmf-dist/source/latex/expkv-def/expkv-def.dtx
@@ -43,6 +43,7 @@ This work consists of the file  expkv-def.dtx
 and the derived files           expkv-def.pdf
                                 expkv-def.sty
                                 expkv-def.tex
+                                t-expkv-def.tex
 
 \endpreamble
 % stop docstrip adding \endinput
@@ -50,6 +51,7 @@ and the derived files           expkv-def.pdf
 \endpostamble
 \generate{\file{expkv-def.sty}{\from{expkv-def.dtx}{pkg}}}
 \generate{\file{expkv-def.tex}{\from{expkv-def.dtx}{tex}}}
+\generate{\file{t-expkv-def.tex}{\from{expkv-def.dtx}{ctx}}}
 \ifx\fmtname\nameofplainTeX
   \expandafter\endbatchfile
 \else
@@ -317,8 +319,8 @@ and the derived files           expkv-def.pdf
 % \expkvd\ provides a small \kv\ interface to define keys for \expkv. Key-types
 % are declared using prefixes, similar to static typed languages. The stylised
 % name is \expkvd\ but the files use \file{expkv-def}, this is due to CTAN-rules
-% which don't allow \string| in package names since that is the pipe symbol in *nix
-% shells.
+% which don't allow \string| in package names since that is the pipe symbol in
+% *nix shells.
 % \end{abstract}
 %
 % \tableofcontents
@@ -345,12 +347,13 @@ and the derived files           expkv-def.pdf
 % \autoref{sec:prefix:p}, the |t|-prefixes are described in
 % \autoref{sec:prefix:t}.
 %
-% \expkvd\ is usable as generic code and as a \LaTeX\ package. It'll
-% automatically load \expkv\ in the same mode as well. To use it, just use one
-% of
+% \expkvd\ is usable as generic code, as a \LaTeX\ package, and as a \ConTeXt\
+% module. It'll automatically load \expkv\ in the same mode as well. To use it,
+% just use one of
 % \begin{lstlisting}
-% \usepackage{expkv-def} % LaTeX
 % \input expkv-def       % plainTeX
+% \usepackage{expkv-def} % LaTeX
+% \usemodule[expkv-def]  % ConTeXt
 % \end{lstlisting}
 %
 % \subsection{Macros}
@@ -480,8 +483,9 @@ and the derived files           expkv-def.pdf
 %   expand the \key's code once, so will be slightly quicker, but not change if
 %   you redefine \key. |odefault| is just another name for |qdefault|. The
 %   |fdefault| version will expand the key code until a non-expandable token or
-%   a space is found, a space would be gobbled.\footnotemark{} The |edefault| on the other hand fully expands
-%   the \key-code with \meta{definition} as its argument inside of an |\edef|.
+%   a space is found, a space would be gobbled.\footnotemark{} The |edefault| on
+%   the other hand fully expands the \key-code with \meta{definition} as its
+%   argument inside of an |\edef|.
 % \end{function}
 % \footnotetext
 %   {^^A
@@ -911,6 +915,22 @@ and the derived files           expkv-def.pdf
 % \gobbledocstriptag
 %</pkg>
 %^^A=<<
+%^^A the ConTeXt module >>=
+% \subsection{The \ConTeXt\ module}
+% \gobbledocstriptag
+%<*ctx>
+%    \begin{macrocode}
+\writestatus{loading}{ConTeXt User Module / expkv-def}
+\usemodule[expkv]
+\unprotect
+\input expkv-def.tex
+\writestatus{loading}
+  {ConTeXt User Module / expkv-def / Version \ekvdVersion\space loaded}
+\protect\endinput
+%    \end{macrocode}
+% \gobbledocstriptag
+%</ctx>
+%^^A=<<
 %^^A main file >>=
 % \subsection{The Generic Code}
 % The rest of this implementation will be the generic code.
@@ -936,8 +956,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.8b}
-\def\ekvdDate{2021-09-18}
+\def\ekvdVersion{0.8c}
+\def\ekvdDate{2021-09-20}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -998,17 +1018,17 @@ and the derived files           expkv-def.pdf
 % if so calls the prefix grabbing routine, else we throw an error and ignore the
 % key.
 %    \begin{macrocode}
-\protected\def\ekvd@noarg#1%
+\protected\long\def\ekvd@noarg#1%
   {%
     \let\ekvd@ifnoarg\@firstoftwo
-    \ekvd@handle{#1}{}%
+    \expandafter\ekvd@handle\detokenize{#1}\ekvd@stop{}%
   }
-\protected\def\ekvd@arg
+\protected\long\def\ekvd@arg#1%
   {%
     \let\ekvd@ifnoarg\@secondoftwo
-    \ekvd@handle
+    \expandafter\ekvd@handle\detokenize{#1}\ekvd@stop
   }
-\protected\long\def\ekvd@handle#1#2%
+\protected\long\def\ekvd@handle#1\ekvd@stop#2%
   {%
     \ekvd@clear@prefixes
     \edef\ekvd@cur{\detokenize{#1}}%
@@ -1172,7 +1192,7 @@ and the derived files           expkv-def.pdf
             \ekvd@assert@not@long
             \ekvd@prot\edef\ekvd@tmp
               {%
-                \unexpanded\expandafter#1%
+                \ekv@unexpanded\expandafter#1%
                   {#2\csname\ekv@name\ekvd@set{#3}\endcsname{#4}}%
               }%
             \ekvd@ifalso
@@ -1358,14 +1378,16 @@ and the derived files           expkv-def.pdf
       }%
   }
 \protected\def\ekvd@t@data
-  {\ekvd@type@data\@secondoftwo\edef{####2}{\unexpanded{##1}}}
+  {\ekvd@type@data\@secondoftwo\edef{####2}{\ekv@unexpanded{##1}}}
 \protected\def\ekvd@t@edata{\ekvd@type@data\@secondoftwo\edef{####2}{##1}}
 \protected\def\ekvd@t@gdata
-  {\ekvd@type@data\@secondoftwo\xdef{####2}{\unexpanded{##1}}}
+  {\ekvd@type@data\@secondoftwo\xdef{####2}{\ekv@unexpanded{##1}}}
 \protected\def\ekvd@t@xdata{\ekvd@type@data\@secondoftwo\xdef{####2}{##1}}
-\protected\def\ekvd@t@dataT{\ekvd@type@data\@gobble\edef{}{\unexpanded{##1}}}
+\protected\def\ekvd@t@dataT
+  {\ekvd@type@data\@gobble\edef{}{\ekv@unexpanded{##1}}}
 \protected\def\ekvd@t@edataT{\ekvd@type@data\@gobble\edef{}{##1}}
-\protected\def\ekvd@t@gdataT{\ekvd@type@data\@gobble\xdef{}{\unexpanded{##1}}}
+\protected\def\ekvd@t@gdataT
+  {\ekvd@type@data\@gobble\xdef{}{\ekv@unexpanded{##1}}}
 \protected\def\ekvd@t@xdataT{\ekvd@type@data\@gobble\xdef{}{##1}}
 %    \end{macrocode}
 % \end{macro}
@@ -1513,8 +1535,8 @@ and the derived files           expkv-def.pdf
           }%
       }%
   }
-\protected\def\ekvd@t@store{\ekvd@type@store\edef{\unexpanded{##1}}}
-\protected\def\ekvd@t@gstore{\ekvd@type@store\xdef{\unexpanded{##1}}}
+\protected\def\ekvd@t@store{\ekvd@type@store\edef{\ekv@unexpanded{##1}}}
+\protected\def\ekvd@t@gstore{\ekvd@type@store\xdef{\ekv@unexpanded{##1}}}
 \protected\def\ekvd@t@estore{\ekvd@type@store\edef{##1}}
 \protected\def\ekvd@t@xstore{\ekvd@type@store\xdef{##1}}
 %    \end{macrocode}
@@ -1608,7 +1630,7 @@ and the derived files           expkv-def.pdf
   {%
     \ekvd@assert@not@long
     \ekvd@prot\edef\ekvd@tmp##1%
-      {\unexpanded{\ekvd@h@choice}{\ekvd@choice@name\ekvd@set{#1}{##1}}}%
+      {\ekv@unexpanded{\ekvd@h@choice}{\ekvd@choice@name\ekvd@set{#1}{##1}}}%
     \ekvd@ifalso
       {%
         \ekvd@assert@val{#1}%
@@ -2159,18 +2181,21 @@ and the derived files           expkv-def.pdf
 \protected\def\ekvd@err@missing@definition
   {\ekvd@errm{Missing definition for key `\ekvd@cur'}}
 \protected\def\ekvd@err@missing@definition@msg#1%
-  {\ekvd@errm{Missing definition for key `\unexpanded{#1}'}}
+  {\ekvd@errm{Missing definition for key `\ekv@unexpanded{#1}'}}
 \protected\def\ekvd@err@missing@type
   {\ekvd@errm{Missing type prefix for key `\ekvd@cur'}}
 \protected\def\ekvd@err@undefined@prefix#1%
   {%
     \ekvd@errm
-      {Undefined prefix `\unexpanded{#1}' found while processing `\ekvd@cur'}%
+      {%
+        Undefined prefix `\ekv@unexpanded{#1}' found while processing
+        `\ekvd@cur'%
+      }%
   }
 \protected\def\ekvd@err@undefined@key#1%
   {%
     \ekvd@errm
-      {Undefined key `\unexpanded{#1}' found while processing `\ekvd@cur'}%
+      {Undefined key `\ekv@unexpanded{#1}' found while processing `\ekvd@cur'}%
   }
 \protected\def\ekvd@err@undefined@noval#1%
   {%
@@ -2183,7 +2208,7 @@ and the derived files           expkv-def.pdf
 \protected\def\ekvd@err@no@prefix#1%
   {\ekvd@errm{prefix `#1' not accepted in `\ekvd@cur'}}
 \protected\def\ekvd@err@no@prefix@msg#1#2%
-  {\ekvd@errm{prefix `#2' not accepted in `\unexpanded{#1}'}}
+  {\ekvd@errm{prefix `#2' not accepted in `\ekv@unexpanded{#1}'}}
 \protected\def\ekvd@err@no@prefix@also#1%
   {\ekvd@errm{`\ekvd@cur' not allowed with a `#1' key}}
 \protected\def\ekvd@err@add@val@on@noval