summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/expkv-def/expkv-def.tex
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/generic/expkv-def/expkv-def.tex')
-rw-r--r--Master/texmf-dist/tex/generic/expkv-def/expkv-def.tex44
1 files changed, 25 insertions, 19 deletions
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 5eeeea3ad02..913de4162cf 100644
--- a/Master/texmf-dist/tex/generic/expkv-def/expkv-def.tex
+++ b/Master/texmf-dist/tex/generic/expkv-def/expkv-def.tex
@@ -29,14 +29,15 @@
%% 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
\else
\expandafter\endinput
\fi
-\def\ekvdVersion{0.8b}
-\def\ekvdDate{2021-09-18}
+\def\ekvdVersion{0.8c}
+\def\ekvdDate{2021-09-20}
\csname ekvd@tmp\endcsname
\expandafter\chardef\csname ekvd@tmp\endcsname=\catcode`\@
\catcode`\@=11
@@ -54,17 +55,17 @@
\def\ekvd@set{#1}%
\ekvparse\ekvd@noarg\ekvd@arg
}
-\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}}%
@@ -160,7 +161,7 @@
\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
@@ -301,14 +302,16 @@
}%
}
\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}}
\protected\def\ekvd@type@box#1#2#3%
{%
@@ -414,8 +417,8 @@
}%
}%
}
-\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}}
\protected\long\def\ekvd@type@meta#1#2#3#4#5#6#7%
@@ -473,7 +476,7 @@
{%
\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}%
@@ -835,18 +838,21 @@
\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%
{%
@@ -859,7 +865,7 @@
\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