added 'wit' and 'alt' as keyval arguments of \lem

1 files changed, 33 insertions, 7 deletions

diff --git a/ekdosis.dtx b/ekdosis.dtx
index 709d042..c285a35 100644
--- a/ekdosis.dtx
+++ b/ekdosis.dtx
@@ -323,6 +323,7 @@ Running "make install" installs the files in the local TeX tree.
 \ExecuteOptionsX{}
 \ProcessOptionsX\relax
 \RequirePackage{luacode}
+\RequirePackage{keycommand}
 \RequirePackage{xparse}
 \RequirePackage{etoolbox}
 \RequirePackage[addpageno]{lineno}
@@ -388,15 +389,35 @@ Running "make install" installs the files in the local TeX tree.
     "pg_ii")}%
   \ifbool{ekdstate}{\add@apparatus}{}%
   \bgroup\inapptrue#1\egroup}
-\NewDocumentCommand{\lem}{o +m}{\nonotetrue#2%  
-  \nonotefalse\bgroup\inappfalse%
-  \ifbool{al@rlmode}%
-  {\IfNoValueTF{#1}%
-    {\obappend{\bgroup\setRL#2\egroup:}}%
-    {\obappend{\bgroup\setRL#2\egroup{} #1:}}}%
-  {\IfNoValueTF{#1}{\obappend{#2:}}{\obappend{#2 #1:}}}%
+\NewDocumentCommand{\noteonly}{+m}{
+  \luadirect{tex.sprint(ekdosis.ntonly(\luastringN{#1}))}
+}
+\newkeycommand+[\|]{\lem}[wit,alt][1]{%
+  |\nonotetrue|#1%
+  |\nonotefalse|%
+  \bgroup%
+  |\inappfalse|%
+  |\ifbool{al@rlmode}|%
+  {|\obappend|{%
+      \bgroup%
+      |\setRL|\ifcommandkey{alt}{\commandkey{alt}%
+        \noteonly{#1}}{#1}%
+      \egroup%
+      \ifcommandkey{wit}{\commandkey{wit}}{}:}}%
+  {|\obappend|{\ifcommandkey{alt}{\commandkey{alt}%
+        \noteonly{#1}}{#1}%
+      \ifcommandkey{wit}{\commandkey{wit}}{}:}}%
   \egroup%
 }
+  % \NewDocumentCommand{\lem}{o +m}{\nonotetrue#2%  
+  %   \nonotefalse\bgroup\inappfalse%
+  %   \ifbool{al@rlmode}%
+  %   {\IfNoValueTF{#1}%
+  %     {\obappend{\bgroup\setRL#2\egroup:}}%
+  %     {\obappend{\bgroup\setRL#2\egroup{} #1:}}}%
+  %   {\IfNoValueTF{#1}{\obappend{#2:}}{\obappend{#2 #1:}}}%
+  %   \egroup%
+  % }
 \NewDocumentCommand{\rdg}{o +m}{%
   \bgroup\inappfalse%
   \ifbool{al@rlmode}%
@@ -496,6 +517,11 @@ function isintable(table, value)
    return false
 end
 
+ekdosis.ntonly = function(str)
+   str = string.match(str, "\\note%s?%*?%b{}")
+   return str or ""
+end
+
 function appin(str, nl)
    local f = io.open(tex.jobname.."_tmp.ekd", "a+")
    if nl == "yes" then