moved subsq@unit@type test from \app to \lem

1 files changed, 12 insertions, 12 deletions

diff --git a/ekdosis.dtx b/ekdosis.dtx
index aac91f8..9518bf0 100644
--- a/ekdosis.dtx
+++ b/ekdosis.dtx
@@ -493,7 +493,7 @@ idno={}, msName={}, origDate={}][3]{%
     \footnotesize\apparatus\unless\ifekd@mapps\ekd@end@apparatus\fi%
     \if@pkg@parnotes\parnotes\parnotereset\else\fi%
   }%
-  \unless\ifekd@mapps\unconditional@appin{\rule{5cm}{0.5pt}\newline}\fi
+  \unless\ifekd@mapps\unconditional@appin{\rule{2truein}{0.5pt}\newline}\fi
 }
 \def\add@apparatus{%
   \test@apparatus%
@@ -516,14 +516,6 @@ idno={}, msName={}, origDate={}][3]{%
 \NewDocumentCommand{\app}{O{} > { \TrimSpaces } +m}{%
   \presetkeys[ekd]{appnote}{type=default}{}%
   \setkeys[ekd]{appnote}{#1}%
-  \ifekd@mapps%
-    \ifnum%
-      \luadirect{tex.sprint(ekdosis.get_bagunits(\luastringO{\ekdan@type}))}
-      = 1
-      \boolfalse{subsq@unit@\ekdan@type}
-    \fi%
-  \luadirect{ekdosis.increment_bagunits(\luastringO{\ekdan@type})}%
-  \fi%
   \ekd@isinapptrue%
   \stepcounter{ekd@lab}%
   \zlabel{ekd:\theekd@lab}%
@@ -534,8 +526,7 @@ idno={}, msName={}, origDate={}][3]{%
     ekdosis.storeabspg(\luastring{\zref@extract{ekd:\theekd@lab}{abspage}},
     "pg_ii")}%
   \luadirect{tex.sprint(ekdosis.removesp(\luastringN{#2}))}%
-  \ekd@isinappfalse%
-  \subsq@unittrue}
+  \ekd@isinappfalse}
 \def\current@ref@arg#1#2{{\textdir TLT\noexpand\bfseries%
     \ifnum%
     \getpagerefnumber{#1}
@@ -642,6 +633,14 @@ idno={}, msName={}, origDate={}][3]{%
   \luadirect{ekdosis.dolnlab(\luastringN{#2})}%
   \bgroup%
   \setkeys[ekd]{lemrdg,lem}{#1}%
+  \ifekd@mapps%
+    \ifnum%
+      \luadirect{tex.sprint(ekdosis.get_bagunits(\luastringO{\ekdan@type}))}
+      = 1
+      \boolfalse{subsq@unit@\ekdan@type}
+    \fi%
+  \luadirect{ekdosis.increment_bagunits(\luastringO{\ekdan@type})}%
+  \fi%
   \ifekdl@nolem\edef\lem@app{%
     \hskip .75em
     \ifekd@mapps
@@ -727,6 +726,7 @@ idno={}, msName={}, origDate={}][3]{%
   \fi%
   \egroup%
   \ekd@isinlemfalse%
+  \subsq@unittrue%
 }
 \NewDocumentCommand{\rdg}{O{} m}{%
   \bgroup%
@@ -1685,7 +1685,7 @@ function ekdosis.appout()
             if string.match(t, "<"..cur_abs_pg.."%-"..n..">.-</"..cur_abs_pg.."%-"..n..">")
             then
                -- table.insert(output, "BEGIN")
-               table.insert(output, "\\par\\rule{5cm}{0.5pt}\\newline")
+               table.insert(output, "\\par\\rule{2truein}{0.5pt}\\newline")
                for i in string.gmatch(t,
                                       "<"..cur_abs_pg.."%-"..n..">.-</"..cur_abs_pg.."%-"..n..">")
                do