2 files changed, 26 insertions, 7 deletions

diff --git a/Makefile b/Makefile
index 5ade50e..ebfc1bd 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@ clean:
 #       rm -f $(NAME)_*.{bib,lua}
 distclean: clean uninst
         rm -rf _minted-*
-        rm -f $(NAME).{pdf,sty,lua} README
+        rm -f $(NAME).{pdf,sty,lua} README*
         rm -f *.zip *.tar.gz
 uninst:
         rm -rf $(UTREE)/{tex,source,doc}/lualatex/$(NAME)
diff --git a/ekdosis.dtx b/ekdosis.dtx
index 3bb4f9c..cc31f61 100644
--- a/ekdosis.dtx
+++ b/ekdosis.dtx
@@ -158,6 +158,7 @@ Running "make install" installs the files in the local TeX tree.
 \newunicodechar{Ǧ}{Ǧ} %
 \usepackage{arabluatex}
 \usepackage{relsize}
+\usepackage{units}
 \usepackage{minted}
 \newminted[ekdlua]{lua}{linenos, fontsize=\relsize{-0.5},
   xleftmargin=12pt,
@@ -259,7 +260,27 @@ Running "make install" installs the files in the local TeX tree.
 % describing what the environment is supposed to do, what its
 % mandatory and optional arguments are, and so forth.
 %
-%
+% \section{Grid}
+% \begin{keyfigure}[H]{c={Grid
+%   typesetting},l={fig:grid-typesetting},t={Each square in the grid
+%   has a side length of \unit[10]{pt}. Therefore, the distance
+%   between the last line of the text and the first line of the
+%   apparatus is here approximately \unit[25]{pt}.}}
+%   \begin{tikzpicture}
+%     \draw[lightgray,thin] (0.5,0.5) grid [step=10pt] (10,5); %
+%     \path node [align=justify, text width=8cm] at (5.5,3) {%
+%     I saw my friend Peter at the station yesterday. I saw my friend
+%     Peter at the station yesterday. I saw my friend Peter at the
+%     station yesterday. I saw my friend Peter at the station
+%     yesterday.\par
+%     \rule{3cm}{0.01cm}\par\footnotesize%
+%     \textbf{1}~Peter A: John B \textbf{2}~Peter A: John B
+%     \textbf{3}~Peter A: John B \textbf{4}~Peter A: John B}; \node at
+%     (0,3) {\scriptsize $\approx$ \unit[25]{pt}}; \draw [->] (0,2.9) --
+%     (0,2);
+%   \end{tikzpicture}
+% \end{keyfigure}
+% 
 % \section{Implementation}
 %
 % \iffalse
@@ -309,8 +330,6 @@ Running "make install" installs the files in the local TeX tree.
 \RequirePackage{keyfloat}
 \RequirePackage{afterpage}
 \RequirePackage{refcount}
-\RequirePackage{calc}
-\RequirePackage{zref-savepos}
 \if@pkg@parnotes
   \RequirePackage{parnotes}
 \fi
@@ -356,7 +375,7 @@ Running "make install" installs the files in the local TeX tree.
 }
 \NewDocumentCommand{\note}{s +m}{%
   \IfBooleanTF{#1}{%
-    \if@pkg@parnotes\append{\parnote{#2}}
+    \if@pkg@parnotes\append{\parnote{#2}}%
     \else\append{\footnote{#2}}\fi}{\append{#2}}%
 }
 \NewDocumentCommand{\apparatus}{}{\luadirect{tex.sprint(appout())}}
@@ -373,9 +392,9 @@ Running "make install" installs the files in the local TeX tree.
         \if@pkg@parnotes%
         \if@parnotesroman%
         \renewcommand*{\theparnotemark}{\roman{parnotemark}}\else\fi%
-        \parnoteclear\begin{autopn}\else\fi%
+        \parnoteclear\else\fi%
         \footnotesize\apparatus%
-        \if@pkg@parnotes\end{autopn}\parnotereset\else\fi%
+        \if@pkg@parnotes\parnotes\parnotereset\else\fi%
       }%
 }{}}
 \def\add@apparatus{%