aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Alessi <alessi@robertalessi.net>2020-02-18 16:59:01 +0100
committerRobert Alessi <alessi@robertalessi.net>2020-02-18 16:59:01 +0100
commitee13476159a05039c3bac2af09f2d5858a05ff3c (patch)
tree3fae22e5861f7b66f385caf7fbd78b59863ef985
parentc67d7a0463454d62d3d2a5f10cc38699f8e18e66 (diff)
downloadekdosis-ee13476159a05039c3bac2af09f2d5858a05ff3c.tar.gz
done replacing 'keycommand' with 'options'
-rw-r--r--ekdosis.dtx51
1 files changed, 31 insertions, 20 deletions
diff --git a/ekdosis.dtx b/ekdosis.dtx
index edefb6e..05a1b00 100644
--- a/ekdosis.dtx
+++ b/ekdosis.dtx
@@ -346,13 +346,8 @@ Running "make install" installs the files in the local TeX tree.
346 \else\fi\fi\fi} 346 \else\fi\fi\fi}
347\ExecuteOptionsX{layout} 347\ExecuteOptionsX{layout}
348\ProcessOptionsX\relax 348\ProcessOptionsX\relax
349\newcommand{\dontusepackage}[2][]{%
350 \@namedef{ver@#2.sty}{9999/12/31}%
351 \@namedef{opt@#2.sty}{#1}}
352\dontusepackage{etex}
353\RequirePackage{luacode} 349\RequirePackage{luacode}
354\RequirePackage{paracol} 350\RequirePackage{paracol}
355\RequirePackage{keycommand}
356\RequirePackage{options} 351\RequirePackage{options}
357\RequirePackage{xparse} 352\RequirePackage{xparse}
358\RequirePackage{etoolbox} 353\RequirePackage{etoolbox}
@@ -995,22 +990,38 @@ Running "make install" installs the files in the local TeX tree.
995 \egroup% 990 \egroup%
996 \subsq@unittrue% 991 \subsq@unittrue%
997} 992}
998\newkeycommand+[\|]{\ekd@note}[pre, post][1]{% 993\options{
999 |\append@app|{\ifcommandkey{pre}{\commandkey{pre}}{}% 994 /note/.new family,
1000 #1% 995 /note/pre/.new value = {},
1001 \ifcommandkey{post}{\commandkey{post}}{}}% 996 /note/post/.new value = {}
1002} 997}
1003\newkeycommand+[\|]{\ekd@note@star}[pre, post][1]{% 998\NewDocumentCommand{\ekd@note}{O{} m}{%
1004 |\if@pkg@parnotes|% 999 \bgroup%
1005 |\append@app|{% 1000 \options{/note,#1}%
1006 \ifcommandkey{pre}{\commandkey{pre}}{}% 1001 \letoption{/note/pre}\pre@value%
1007 |\unskip\parnote|{#1}% 1002 \letoption{/note/post}\post@value%
1008 \ifcommandkey{post}{\commandkey{post}}{}% 1003 \append@app{%
1009 }% 1004 \ifoptionvoid{/note/pre}{}{\pre@value}%
1010 |\else|% 1005 #2%
1011 |\append@app|{% 1006 \ifoptionvoid{/note/post}{}{\post@value}%
1012 |\unskip\footnote|{#1}}% 1007 }
1013 |\fi|% 1008 \egroup%
1009}
1010\NewDocumentCommand{\ekd@note@star}{O{} m}{%
1011 \if@pkg@parnotes
1012 \bgroup%
1013 \options{/note,#1}%
1014 \letoption{/note/pre}\pre@value%
1015 \letoption{/note/post}\post@value%
1016 \append@app{%
1017 \ifoptionvoid{/note/pre}{}{\pre@value}%
1018 \unskip\parnote{#2}%
1019 \ifoptionvoid{/note/post}{}{\post@value}%
1020 }
1021 \egroup%
1022 \else
1023 \append@app{\unskip\footnote{#2}}%
1024 \fi%
1014} 1025}
1015\NewDocumentCommand{\note@app}{s O{} +m}{% 1026\NewDocumentCommand{\note@app}{s O{} +m}{%
1016 \ifbool{al@rlmode}{% 1027 \ifbool{al@rlmode}{%