1 files changed, 27 insertions, 8 deletions

diff --git a/ekdosis.dtx b/ekdosis.dtx
index bd395da..c9703da 100644
--- a/ekdosis.dtx
+++ b/ekdosis.dtx
@@ -2808,17 +2808,36 @@ texts=latin[xml:lang="la"]+\textcolor{red}{;}+
       \fi%
     }\unexpanded\expandafter{\ekd@postrefnum}%
   }%
-\define@cmdkeys[ekd]{lemrdg}[ekdlr@]{wit, alt, pre, post, prewit,
-  postwit, type}
-\define@cmdkey[ekd]{lem}[ekdl@]{sep}{}
-\presetkeys[ekd]{lem}{sep=\ekdsep}{}
-\define@boolkeys[ekd]{lem}[ekdl@]{nolem, nosep}[true]
-\define@boolkeys[ekd]{rdg}[ekdr@]{nordg}[true]
+\ekvdefinekeys{lem}{
+  code wit = \def\ekdlr@wit{#1},
+  code alt  = \def\ekdlr@alt{#1},
+  code pre = \ekdlr@pre{#1},
+  code post = \ekdlr@post{#1},
+  code prewit = \ekdlr@prewit{#1},
+  code postwit = \ekdlr@postwit{#1},
+  store type = \ekdlr@type,
+  store sep = \ekdl@sep,
+  bool nolem = \ifekdl@nolem,
+  bool nosep = \ifekdl@nosep,
+  initial type = default,
+  initial sep = \ekdsep
+ }
+\ekvdefinekeys{rdg}{
+  code wit = \def\ekdlr@wit{#1},
+  code alt  = \def\ekdlr@alt{#1},
+  code pre = \ekdlr@pre{#1},
+  code post = \ekdlr@post{#1},
+  code prewit = \ekdlr@prewit{#1},
+  code postwit = \ekdlr@postwit{#1},
+  store type = \ekdlr@type,
+  bool nordg = \ifekdr@nordg,
+  initial type = default
+ }
 \NewDocumentCommand{\lem}{O{} m}{%
   \ekd@isinlemtrue%
   \luadirect{ekdosis.dolnlab(\luastringN{#2})}%
   \bgroup%
-  \setkeys[ekd]{lemrdg,lem}{#1}%
+  \ekvset{lem}{#1}%
   \ifekd@mapps%
     \ifnum%
     \luadirect{tex.sprint(ekdosis.get_bagunits(\luastringO{\ekdan@type}))}
@@ -2918,7 +2937,7 @@ texts=latin[xml:lang="la"]+\textcolor{red}{;}+
 }
 \NewDocumentCommand{\rdg}{O{} m}{%
   \bgroup%
-  \setkeys[ekd]{lemrdg,rdg}{#1}%
+  \ekvset{rdg}{#1}%
   % \ifekdr@nordg\append@app{}\else% do we need \append@app{} here? If
   %                               % so, keep in mind \ifekd@mapps,
   %                               like so: