texlive[60572] Master/texmf-dist: expkv-def (21sep21)

commits+karl at tug.org commits+karl at tug.org
Tue Sep 21 21:46:16 CEST 2021


Revision: 60572
          http://tug.org/svn/texlive?view=revision&revision=60572
Author:   karl
Date:     2021-09-21 21:46:16 +0200 (Tue, 21 Sep 2021)
Log Message:
-----------
expkv-def (21sep21)

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

Added Paths:
-----------
    trunk/Master/texmf-dist/tex/context/third/expkv-def/
    trunk/Master/texmf-dist/tex/context/third/expkv-def/t-expkv-def.tex

Modified: trunk/Master/texmf-dist/doc/latex/expkv-def/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/expkv-def/README.md	2021-09-21 19:46:07 UTC (rev 60571)
+++ trunk/Master/texmf-dist/doc/latex/expkv-def/README.md	2021-09-21 19:46:16 UTC (rev 60572)
@@ -1,7 +1,7 @@
 -------------------------------------------------------------------------------
 # expkv-def -- a key-defining frontend for expkv
 
-Version 2021-09-18 v0.8b
+Version 2021-09-20 v0.8c
 
 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-def/expkv-def.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/source/latex/expkv-def/expkv-def.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/expkv-def/expkv-def.dtx	2021-09-21 19:46:07 UTC (rev 60571)
+++ trunk/Master/texmf-dist/source/latex/expkv-def/expkv-def.dtx	2021-09-21 19:46:16 UTC (rev 60572)
@@ -43,6 +43,7 @@
 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 @@
 \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 @@
 % \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 @@
 % \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}
+% \input expkv-def       % plainTeX
 % \usepackage{expkv-def} % LaTeX
-% \input expkv-def       % plainTeX
+% \usemodule[expkv-def]  % ConTeXt
 % \end{lstlisting}
 %
 % \subsection{Macros}
@@ -480,8 +483,9 @@
 %   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 @@
 % \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 @@
 % \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 @@
 % if so calls the prefix grabbing routine, else we throw an error and ignore the
 % key.
 %    \begin{macrocode}
-\protected\def\ekvd at noarg#1%
+\protected\long\def\ekvd at noarg#1%
   {%
     \let\ekvd at ifnoarg\@firstoftwo
-    \ekvd at handle{#1}{}%
+    \expandafter\ekvd at handle\detokenize{#1}\ekvd at stop{}%
   }
-\protected\def\ekvd at arg
+\protected\long\def\ekvd at arg#1%
   {%
     \let\ekvd at ifnoarg\@secondoftwo
-    \ekvd at handle
+    \expandafter\ekvd at handle\detokenize{#1}\ekvd at stop
   }
-\protected\long\def\ekvd at handle#1#2%
+\protected\long\def\ekvd at handle#1\ekvd at stop#2%
   {%
     \ekvd at clear@prefixes
     \edef\ekvd at cur{\detokenize{#1}}%
@@ -1172,7 +1192,7 @@
             \ekvd at assert@not at long
             \ekvd at prot\edef\ekvd at tmp
               {%
-                \unexpanded\expandafter#1%
+                \ekv at unexpanded\expandafter#1%
                   {#2\csname\ekv at name\ekvd at set{#3}\endcsname{#4}}%
               }%
             \ekvd at ifalso
@@ -1358,14 +1378,16 @@
       }%
   }
 \protected\def\ekvd at t@data
-  {\ekvd at type@data\@secondoftwo\edef{####2}{\unexpanded{##1}}}
+  {\ekvd at type@data\@secondoftwo\edef{####2}{\ekv at unexpanded{##1}}}
 \protected\def\ekvd at t@edata{\ekvd at type@data\@secondoftwo\edef{####2}{##1}}
 \protected\def\ekvd at t@gdata
-  {\ekvd at type@data\@secondoftwo\xdef{####2}{\unexpanded{##1}}}
+  {\ekvd at type@data\@secondoftwo\xdef{####2}{\ekv at unexpanded{##1}}}
 \protected\def\ekvd at t@xdata{\ekvd at type@data\@secondoftwo\xdef{####2}{##1}}
-\protected\def\ekvd at t@dataT{\ekvd at type@data\@gobble\edef{}{\unexpanded{##1}}}
+\protected\def\ekvd at t@dataT
+  {\ekvd at type@data\@gobble\edef{}{\ekv at unexpanded{##1}}}
 \protected\def\ekvd at t@edataT{\ekvd at type@data\@gobble\edef{}{##1}}
-\protected\def\ekvd at t@gdataT{\ekvd at type@data\@gobble\xdef{}{\unexpanded{##1}}}
+\protected\def\ekvd at t@gdataT
+  {\ekvd at type@data\@gobble\xdef{}{\ekv at unexpanded{##1}}}
 \protected\def\ekvd at t@xdataT{\ekvd at type@data\@gobble\xdef{}{##1}}
 %    \end{macrocode}
 % \end{macro}
@@ -1513,8 +1535,8 @@
           }%
       }%
   }
-\protected\def\ekvd at t@store{\ekvd at type@store\edef{\unexpanded{##1}}}
-\protected\def\ekvd at t@gstore{\ekvd at type@store\xdef{\unexpanded{##1}}}
+\protected\def\ekvd at t@store{\ekvd at type@store\edef{\ekv at unexpanded{##1}}}
+\protected\def\ekvd at t@gstore{\ekvd at type@store\xdef{\ekv at unexpanded{##1}}}
 \protected\def\ekvd at t@estore{\ekvd at type@store\edef{##1}}
 \protected\def\ekvd at t@xstore{\ekvd at type@store\xdef{##1}}
 %    \end{macrocode}
@@ -1608,7 +1630,7 @@
   {%
     \ekvd at assert@not at long
     \ekvd at prot\edef\ekvd at tmp##1%
-      {\unexpanded{\ekvd at h@choice}{\ekvd at choice@name\ekvd at set{#1}{##1}}}%
+      {\ekv at unexpanded{\ekvd at h@choice}{\ekvd at choice@name\ekvd at set{#1}{##1}}}%
     \ekvd at ifalso
       {%
         \ekvd at assert@val{#1}%
@@ -2159,18 +2181,21 @@
 \protected\def\ekvd at err@missing at definition
   {\ekvd at errm{Missing definition for key `\ekvd at cur'}}
 \protected\def\ekvd at err@missing at definition@msg#1%
-  {\ekvd at errm{Missing definition for key `\unexpanded{#1}'}}
+  {\ekvd at errm{Missing definition for key `\ekv at unexpanded{#1}'}}
 \protected\def\ekvd at err@missing at type
   {\ekvd at errm{Missing type prefix for key `\ekvd at cur'}}
 \protected\def\ekvd at err@undefined at prefix#1%
   {%
     \ekvd at errm
-      {Undefined prefix `\unexpanded{#1}' found while processing `\ekvd at cur'}%
+      {%
+        Undefined prefix `\ekv at unexpanded{#1}' found while processing
+        `\ekvd at cur'%
+      }%
   }
 \protected\def\ekvd at err@undefined at key#1%
   {%
     \ekvd at errm
-      {Undefined key `\unexpanded{#1}' found while processing `\ekvd at cur'}%
+      {Undefined key `\ekv at unexpanded{#1}' found while processing `\ekvd at cur'}%
   }
 \protected\def\ekvd at err@undefined at noval#1%
   {%
@@ -2183,7 +2208,7 @@
 \protected\def\ekvd at err@no at prefix#1%
   {\ekvd at errm{prefix `#1' not accepted in `\ekvd at cur'}}
 \protected\def\ekvd at err@no at prefix@msg#1#2%
-  {\ekvd at errm{prefix `#2' not accepted in `\unexpanded{#1}'}}
+  {\ekvd at errm{prefix `#2' not accepted in `\ekv at unexpanded{#1}'}}
 \protected\def\ekvd at err@no at prefix@also#1%
   {\ekvd at errm{`\ekvd at cur' not allowed with a `#1' key}}
 \protected\def\ekvd at err@add at val@on at noval

Added: trunk/Master/texmf-dist/tex/context/third/expkv-def/t-expkv-def.tex
===================================================================
--- trunk/Master/texmf-dist/tex/context/third/expkv-def/t-expkv-def.tex	                        (rev 0)
+++ trunk/Master/texmf-dist/tex/context/third/expkv-def/t-expkv-def.tex	2021-09-21 19:46:16 UTC (rev 60572)
@@ -0,0 +1,43 @@
+%%
+%% This is file `t-expkv-def.tex',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% expkv-def.dtx  (with options: `ctx')
+%% 
+%% --------------------------------------------------------------
+%% expkv-def -- a key-defining frontend for expkv
+%% E-mail: jspratte at yahoo.de
+%% Released under the LaTeX Project Public License v1.3c or later
+%% See http://www.latex-project.org/lppl.txt
+%% --------------------------------------------------------------
+%% 
+%% Copyright (C) 2020-2021 Jonathan P. Spratte
+%% 
+%% This  work may be  distributed and/or  modified under  the conditions  of the
+%% LaTeX Project Public License (LPPL),  either version 1.3c  of this license or
+%% (at your option) any later version.  The latest version of this license is in
+%% the file:
+%% 
+%%   http://www.latex-project.org/lppl.txt
+%% 
+%% This work is "maintained" (as per LPPL maintenance status) by
+%%   Jonathan P. Spratte.
+%% 
+%% 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
+%% 
+\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 of file `t-expkv-def.tex'.


Property changes on: trunk/Master/texmf-dist/tex/context/third/expkv-def/t-expkv-def.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/tex/generic/expkv-def/expkv-def.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/expkv-def/expkv-def.tex	2021-09-21 19:46:07 UTC (rev 60571)
+++ trunk/Master/texmf-dist/tex/generic/expkv-def/expkv-def.tex	2021-09-21 19:46:16 UTC (rev 60572)
@@ -29,6 +29,7 @@
 %% and the derived files           expkv-def.pdf
 %%                                 expkv-def.sty
 %%                                 expkv-def.tex
+%%                                 t-expkv-def.tex
 %% 
 \input expkv
 \expandafter\ifx\csname ekvdVersion\endcsname\relax
@@ -35,8 +36,8 @@
 \else
   \expandafter\endinput
 \fi
-\def\ekvdVersion{0.8b}
-\def\ekvdDate{2021-09-18}
+\def\ekvdVersion{0.8c}
+\def\ekvdDate{2021-09-20}
 \csname ekvd at tmp\endcsname
 \expandafter\chardef\csname ekvd at tmp\endcsname=\catcode`\@
 \catcode`\@=11
@@ -54,17 +55,17 @@
     \def\ekvd at set{#1}%
     \ekvparse\ekvd at noarg\ekvd at arg
   }
-\protected\def\ekvd at noarg#1%
+\protected\long\def\ekvd at noarg#1%
   {%
     \let\ekvd at ifnoarg\@firstoftwo
-    \ekvd at handle{#1}{}%
+    \expandafter\ekvd at handle\detokenize{#1}\ekvd at stop{}%
   }
-\protected\def\ekvd at arg
+\protected\long\def\ekvd at arg#1%
   {%
     \let\ekvd at ifnoarg\@secondoftwo
-    \ekvd at handle
+    \expandafter\ekvd at handle\detokenize{#1}\ekvd at stop
   }
-\protected\long\def\ekvd at handle#1#2%
+\protected\long\def\ekvd at handle#1\ekvd at stop#2%
   {%
     \ekvd at clear@prefixes
     \edef\ekvd at cur{\detokenize{#1}}%
@@ -160,7 +161,7 @@
             \ekvd at assert@not at long
             \ekvd at prot\edef\ekvd at tmp
               {%
-                \unexpanded\expandafter#1%
+                \ekv at unexpanded\expandafter#1%
                   {#2\csname\ekv at name\ekvd at set{#3}\endcsname{#4}}%
               }%
             \ekvd at ifalso
@@ -301,14 +302,16 @@
       }%
   }
 \protected\def\ekvd at t@data
-  {\ekvd at type@data\@secondoftwo\edef{####2}{\unexpanded{##1}}}
+  {\ekvd at type@data\@secondoftwo\edef{####2}{\ekv at unexpanded{##1}}}
 \protected\def\ekvd at t@edata{\ekvd at type@data\@secondoftwo\edef{####2}{##1}}
 \protected\def\ekvd at t@gdata
-  {\ekvd at type@data\@secondoftwo\xdef{####2}{\unexpanded{##1}}}
+  {\ekvd at type@data\@secondoftwo\xdef{####2}{\ekv at unexpanded{##1}}}
 \protected\def\ekvd at t@xdata{\ekvd at type@data\@secondoftwo\xdef{####2}{##1}}
-\protected\def\ekvd at t@dataT{\ekvd at type@data\@gobble\edef{}{\unexpanded{##1}}}
+\protected\def\ekvd at t@dataT
+  {\ekvd at type@data\@gobble\edef{}{\ekv at unexpanded{##1}}}
 \protected\def\ekvd at t@edataT{\ekvd at type@data\@gobble\edef{}{##1}}
-\protected\def\ekvd at t@gdataT{\ekvd at type@data\@gobble\xdef{}{\unexpanded{##1}}}
+\protected\def\ekvd at t@gdataT
+  {\ekvd at type@data\@gobble\xdef{}{\ekv at unexpanded{##1}}}
 \protected\def\ekvd at t@xdataT{\ekvd at type@data\@gobble\xdef{}{##1}}
 \protected\def\ekvd at type@box#1#2#3%
   {%
@@ -414,8 +417,8 @@
           }%
       }%
   }
-\protected\def\ekvd at t@store{\ekvd at type@store\edef{\unexpanded{##1}}}
-\protected\def\ekvd at t@gstore{\ekvd at type@store\xdef{\unexpanded{##1}}}
+\protected\def\ekvd at t@store{\ekvd at type@store\edef{\ekv at unexpanded{##1}}}
+\protected\def\ekvd at t@gstore{\ekvd at type@store\xdef{\ekv at unexpanded{##1}}}
 \protected\def\ekvd at t@estore{\ekvd at type@store\edef{##1}}
 \protected\def\ekvd at t@xstore{\ekvd at type@store\xdef{##1}}
 \protected\long\def\ekvd at type@meta#1#2#3#4#5#6#7%
@@ -473,7 +476,7 @@
   {%
     \ekvd at assert@not at long
     \ekvd at prot\edef\ekvd at tmp##1%
-      {\unexpanded{\ekvd at h@choice}{\ekvd at choice@name\ekvd at set{#1}{##1}}}%
+      {\ekv at unexpanded{\ekvd at h@choice}{\ekvd at choice@name\ekvd at set{#1}{##1}}}%
     \ekvd at ifalso
       {%
         \ekvd at assert@val{#1}%
@@ -835,18 +838,21 @@
 \protected\def\ekvd at err@missing at definition
   {\ekvd at errm{Missing definition for key `\ekvd at cur'}}
 \protected\def\ekvd at err@missing at definition@msg#1%
-  {\ekvd at errm{Missing definition for key `\unexpanded{#1}'}}
+  {\ekvd at errm{Missing definition for key `\ekv at unexpanded{#1}'}}
 \protected\def\ekvd at err@missing at type
   {\ekvd at errm{Missing type prefix for key `\ekvd at cur'}}
 \protected\def\ekvd at err@undefined at prefix#1%
   {%
     \ekvd at errm
-      {Undefined prefix `\unexpanded{#1}' found while processing `\ekvd at cur'}%
+      {%
+        Undefined prefix `\ekv at unexpanded{#1}' found while processing
+        `\ekvd at cur'%
+      }%
   }
 \protected\def\ekvd at err@undefined at key#1%
   {%
     \ekvd at errm
-      {Undefined key `\unexpanded{#1}' found while processing `\ekvd at cur'}%
+      {Undefined key `\ekv at unexpanded{#1}' found while processing `\ekvd at cur'}%
   }
 \protected\def\ekvd at err@undefined at noval#1%
   {%
@@ -859,7 +865,7 @@
 \protected\def\ekvd at err@no at prefix#1%
   {\ekvd at errm{prefix `#1' not accepted in `\ekvd at cur'}}
 \protected\def\ekvd at err@no at prefix@msg#1#2%
-  {\ekvd at errm{prefix `#2' not accepted in `\unexpanded{#1}'}}
+  {\ekvd at errm{prefix `#2' not accepted in `\ekv at unexpanded{#1}'}}
 \protected\def\ekvd at err@no at prefix@also#1%
   {\ekvd at errm{`\ekvd at cur' not allowed with a `#1' key}}
 \protected\def\ekvd at err@add at val@on at noval

Modified: trunk/Master/texmf-dist/tex/latex/expkv-def/expkv-def.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/expkv-def/expkv-def.sty	2021-09-21 19:46:07 UTC (rev 60571)
+++ trunk/Master/texmf-dist/tex/latex/expkv-def/expkv-def.sty	2021-09-21 19:46:16 UTC (rev 60572)
@@ -29,6 +29,7 @@
 %% and the derived files           expkv-def.pdf
 %%                                 expkv-def.sty
 %%                                 expkv-def.tex
+%%                                 t-expkv-def.tex
 %% 
 \RequirePackage{expkv}
 \def\ekvd at tmp



More information about the tex-live-commits mailing list.