confine \lem \rdg and \note to \app; use metalogox instead of hologo

1 files changed, 8 insertions, 4 deletions

diff --git a/ekdosis.dtx b/ekdosis.dtx
index d08ea28..a8426eb 100644
--- a/ekdosis.dtx
+++ b/ekdosis.dtx
@@ -133,7 +133,7 @@ Running "make install" installs the files in the local TeX tree.
 %<*driver>
 \documentclass{ltxdoc}
 \usepackage[letterpaper,margin=25mm,left=50mm,nohead]{geometry}
-\usepackage{hologo}
+\usepackage{metalogox}
 \usepackage{hyperxmp}
 \usepackage{uri}
 \usepackage[numbered]{hypdoc}
@@ -294,7 +294,7 @@ Running "make install" installs the files in the local TeX tree.
 %    \begin{macrocode}
 \RequirePackage{ifluatex}
 %    \end{macrocode}
-% \package{ekdosis} requires \hologo{LuaLaTeX} of course. Issue a warning
+% \package{ekdosis} requires {\LuaLaTeX} of course. Issue a warning
 % if the document is processed with another engine.
 %    \begin{macrocode}
 \ifluatex\else
@@ -349,6 +349,7 @@ Running "make install" installs the files in the local TeX tree.
 \newbool{ekd@started}
 \newbool{do@app}
 \newbool{ekd@state}
+\newif\ifekd@isinapp
 \providebool{al@rlmode}
 \newcounter{ekd@lab}
 \def\blfootnote{\gdef\@thefnmark{\relax}\@footnotetext}
@@ -372,6 +373,7 @@ Running "make install" installs the files in the local TeX tree.
     \ifbool{do@app}{\add@@apparatus}{}}%
 }
 \NewDocumentCommand{\append@app}{+m}{%
+  \ifekd@isinapp%
   \ifbool{ekd@state}{%
     \luadirect{ekdosis.appin(
       \luastring{<\zref@extract{ekd:\theekd@lab}{abspage}>},
@@ -380,17 +382,19 @@ Running "make install" installs the files in the local TeX tree.
     \luadirect{ekdosis.appin(
       \luastring{</\zref@extract{ekd:\theekd@lab}{abspage}>},
       "yes")}%
-  }{}}
+  }{}\else\fi}
 \NewDocumentCommand{\append@ln@app}{+m}%
   {\luadirect{tex.sprint(ekdosis.mdvappend(\luastringN{#1}))}}
 \NewDocumentCommand{\app}{+m}{%
+  \ekd@isinapptrue%
   \stepcounter{ekd@lab}%
   \zlabel{ekd:\theekd@lab}%
   \luadirect{%
     ekdosis.storeabspg(\luastring{\zref@extract{ekd:\theekd@lab}{abspage}},
     "pg_ii")}%
   \ifbool{ekd@state}{\add@apparatus}{}%
-  #1}
+  #1%
+  \ekd@isinappfalse}
 \newkeycommand+[\|]{\lem}[wit, alt, pre, post, prewit, postwit,
 choice nolem={false,,true}][1]{%
   #1%