summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/generic/expkv-cs/expkv-cs.tex118
1 files changed, 45 insertions, 73 deletions
diff --git a/Master/texmf-dist/tex/generic/expkv-cs/expkv-cs.tex b/Master/texmf-dist/tex/generic/expkv-cs/expkv-cs.tex
index 53b56d997d0..931c0c25ba3 100644
--- a/Master/texmf-dist/tex/generic/expkv-cs/expkv-cs.tex
+++ b/Master/texmf-dist/tex/generic/expkv-cs/expkv-cs.tex
@@ -36,8 +36,8 @@
\else
\expandafter\endinput
\fi
-\def\ekvcVersion{1.1a}
-\def\ekvcDate{2021-09-20}
+\def\ekvcVersion{1.1b}
+\def\ekvcDate{2021-11-21}
\csname ekvc@tmp\endcsname
\expandafter\chardef\csname ekvc@tmp\endcsname=\catcode`\@
\catcode`\@=11
@@ -149,7 +149,7 @@
}
\protected\long\def\ekvc@SetupSplitKeys
{%
- \ekvc@keycount=0
+ \ekvc@keycount=\ekv@zero
\let\ekvc@any@long\ekv@empty
\let\ekvc@initials\ekv@empty
\ekvparse\ekvc@SetupSplitKeys@check@unknown\ekvc@SetupSplitKeys@a
@@ -170,39 +170,25 @@
{\csname ekvc@split@p@#1\endcsname{#2}}%
{\ekvc@SetupSplitKeys@d{#1 #2}}%
}
-\protected\long\def\ekvc@SetupSplitKeys@d#1#2%
+\protected\def\ekvc@SetupSplitKeys@d
{%
- \begingroup
- \edef\ekvc@tmp
- {%
- \endgroup
- \long\def\ekv@unexpanded{\ekvc@tmp}####1####2%
- \ekv@unexpanded\expandafter
- {\csname ekvc@splitmark@\the\ekvc@keycount\endcsname}####3%
- {%
- ####2%
- \ekv@unexpanded\expandafter
- {\csname ekvc@splitmark@\the\ekvc@keycount\endcsname}{####1}%
- }%
- \unless\ifx\ekvc@long\long
- \let\ekv@unexpanded\expandafter
- {\csname ekvc@\ekvc@set(\detokenize{#1})\endcsname\ekvc@tmp}%
- \def\ekv@unexpanded{\ekvc@tmp}####1%
- {%
- \ekv@unexpanded\expandafter
- {\csname ekvc@\ekvc@set(\detokenize{#1})\endcsname}%
- {####1}%
- }%
- \fi
- \def\ekv@unexpanded{\ekvc@initials}%
- {%
- \ekv@unexpanded\expandafter{\ekvc@initials}%
- \ekv@unexpanded\expandafter
- {\csname ekvc@splitmark@\the\ekvc@keycount\endcsname{#2}}%
- }%
- }%
- \ekvc@tmp
- \ekvlet\ekvc@set{#1}\ekvc@tmp
+ \begingroup\expandafter\endgroup
+ \expandafter\ekvc@SetupSplitKeys@e
+ \csname ekvc@splitmark@\the\ekvc@keycount\endcsname
+ }
+\protected\long\def\ekvc@SetupSplitKeys@e#1#2#3%
+ {%
+ \long\def\ekvc@tmp##1##2#1##3{##2#1{##1}}%
+ \unless\ifx\ekvc@long\long
+ \expandafter\let\csname ekvc@\ekvc@set(#2)\endcsname\ekvc@tmp
+ \edef\ekvc@tmp##1%
+ {%
+ \ekv@unexpanded\expandafter{\csname ekvc@\ekvc@set(#2)\endcsname}%
+ {##1}%
+ }%
+ \fi
+ \ekvlet\ekvc@set{#2}\ekvc@tmp
+ \edef\ekvc@initials{\ekv@unexpanded\expandafter{\ekvc@initials#1{#3}}}%
\ekvc@helpers@needed
{\expandafter\ekvc@setup@splitmacro\expandafter{\the\ekvc@keycount}}%
{}%
@@ -391,38 +377,25 @@
{\csname ekvc@hash@p@#1\endcsname{#2}}%
{\ekvc@SetupHashKeys@d{#1 #2}}%
}
-\protected\long\def\ekvc@SetupHashKeys@d#1#2%
+\protected\long\def\ekvc@SetupHashKeys@d#1%
{%
- \begingroup
- \edef\ekvc@tmp
- {%
- \endgroup
- \long\def\ekv@unexpanded{\ekvc@tmp}####1####2%
- \ekv@unexpanded\expandafter{\csname ekvc@hashmark@#1\endcsname}%
- ####3%
- {%
- ####2%
- \ekv@unexpanded\expandafter{\csname ekvc@hashmark@#1\endcsname}%
- {####1}%
- }%
- \unless\ifx\ekvc@long\long
- \let\ekv@unexpanded\expandafter
- {\csname ekvc@\ekvc@set(#1)\endcsname\ekvc@tmp}%
- \def\ekv@unexpanded{\ekvc@tmp}####1%
- {%
- \ekv@unexpanded\expandafter{\csname ekvc@\ekvc@set(#1)\endcsname}%
- {####1}%
- }%
- \fi
- \def\ekv@unexpanded{\ekvc@initials}%
- {%
- \ekv@unexpanded\expandafter{\ekvc@initials}%
- \ekv@unexpanded\expandafter{\csname ekvc@hashmark@#1\endcsname{#2}}%
- }%
- }%
- \ekvc@tmp
- \ekvlet\ekvc@set{#1}\ekvc@tmp
- \ekvc@setup@hashmacro{#1}%
+ \begingroup\expandafter\endgroup
+ \expandafter\ekvc@SetupHashKeys@e\csname ekvc@hashmark@#1\endcsname{#1}%
+ }
+\protected\long\def\ekvc@SetupHashKeys@e#1#2#3%
+ {%
+ \long\def\ekvc@tmp##1##2#1##3{##2#1{##1}}%
+ \unless\ifx\ekvc@long\long
+ \expandafter\let\csname ekvc@\ekvc@set(#2)\endcsname\ekvc@tmp
+ \edef\ekvc@tmp##1%
+ {%
+ \ekv@unexpanded\expandafter{\csname ekvc@\ekvc@set(#2)\endcsname}%
+ {##1}%
+ }%
+ \fi
+ \ekvlet\ekvc@set{#2}\ekvc@tmp
+ \edef\ekvc@initials{\ekv@unexpanded\expandafter{\ekvc@initials#1{#3}}}%
+ \ekvc@setup@hashmacro{#2}%
}
\protected\long\def\ekvc@SetupHashKeys@check@unknown#1%
{%
@@ -616,20 +589,19 @@
}
\expandafter\ekvc@change@a\expandafter{\detokenize{macro:}}
\protected\def\ekvc@change@b#1#2%
- {\expandafter\ekvc@change@c\expandafter{#2{##1}}{#1}#2}
+ {\expandafter\ekvc@change@c\expandafter{#2\ekvc@stop}{#1}#2}
\ekv@exparg{\protected\long\def\ekvc@change@c#1#2#3#4}%
{%
- \expandafter\iffalse\expandafter{\expandafter\fi
+ \expandafter\iffalse\expandafter{\expandafter{\expandafter\fi
\ekvset{\string#3}{#4}%
\ekvc@change@d{#2}{#3}%
#1%
- }%
+ }}%
}
\protected\def\ekvc@change@d#1#2%
- {%
- \def\ekvc@tmp{#1\def#2####1}%
- \expandafter\ekvc@tmp\expandafter{\iffalse}\fi
- }
+ {#1\edef#2##1{\expandafter\ekvc@change@e\iffalse}\fi}
+\long\def\ekvc@change@e#1\ekvc@stop
+ {\ekv@unexpanded{#1}##1\ekv@unexpanded\expandafter{\iffalse}\fi}
\def\ekvc@change@iflong#1%
{%
\protected\def\ekvc@change@iflong##1%